




























@@ -66,6 +66,7 @@ import { resolveAgentRuntimeConfig } from "./agent-runtime-config.js";
6666import {
6767clearAutoFallbackPrimaryProbeSelection,
6868entryMatchesAutoFallbackPrimaryProbe,
69+hasLegacyAutoFallbackWithoutOrigin,
6970hasSessionAutoModelFallbackProvenance,
7071listAgentIds,
7172markAutoFallbackPrimaryProbe,
@@ -98,9 +99,9 @@ import { resolveAvailableAgentHarnessPolicy } from "./harness/selection.js";
9899import { prepareInternalSessionEffectsTranscript } from "./internal-session-effects.js";
99100import { AGENT_LANE_SUBAGENT } from "./lanes.js";
100101import { LiveSessionModelSwitchError } from "./live-model-switch.js";
101-import { normalizeConfiguredProviderCatalogModelId } from "./model-ref-shared.js";
102102import { loadManifestModelCatalog } from "./model-catalog.js";
103103import { runWithModelFallback } from "./model-fallback.js";
104+import { normalizeConfiguredProviderCatalogModelId } from "./model-ref-shared.js";
104105import type { ModelManifestNormalizationContext } from "./model-selection-normalize.js";
105106import {
106107buildConfiguredModelCatalog,
@@ -1197,6 +1198,8 @@ async function agentCommandInternal(
11971198 : undefined;
11981199const hasStoredAutoFallbackProvenance =
11991200hasStoredOverride && hasSessionAutoModelFallbackProvenance(sessionEntry);
1201+const hasLegacyAutoFallbackOverrideWithoutOrigin =
1202+hasStoredOverride && hasLegacyAutoFallbackWithoutOrigin(sessionEntry);
12001203const explicitProviderOverride =
12011204typeof opts.provider === "string"
12021205 ? normalizeExplicitOverrideInput(opts.provider, "provider")
@@ -1245,6 +1248,21 @@ async function agentCommandInternal(
12451248!suppressVisibleSessionEffects
12461249) {
12471250const entry = sessionEntry;
1251+if (hasLegacyAutoFallbackOverrideWithoutOrigin) {
1252+const { updated } = applyModelOverrideToSessionEntry({
1253+ entry,
1254+selection: { provider: defaultProvider, model: defaultModel, isDefault: true },
1255+});
1256+if (updated) {
1257+storedModelOverrideSource = undefined;
1258+await persistSessionEntry({
1259+ sessionStore,
1260+ sessionKey,
1261+ storePath,
1262+ entry,
1263+});
1264+}
1265+}
12481266const repaired = repairProviderWrappedModelOverride({
12491267 entry,
12501268 defaultProvider,
@@ -1285,8 +1303,12 @@ async function agentCommandInternal(
12851303}
12861304}
128713051288-const storedProviderOverride = sessionEntry?.providerOverride?.trim();
1289-let storedModelOverride = sessionEntry?.modelOverride?.trim();
1306+const storedProviderOverride = hasLegacyAutoFallbackOverrideWithoutOrigin
1307+ ? undefined
1308+ : sessionEntry?.providerOverride?.trim();
1309+let storedModelOverride = hasLegacyAutoFallbackOverrideWithoutOrigin
1310+ ? undefined
1311+ : sessionEntry?.modelOverride?.trim();
12901312if (storedModelOverride) {
12911313const candidateProvider = storedProviderOverride || defaultProvider;
12921314const normalizedStored = normalizeAgentCommandModelRef(
@@ -1328,7 +1350,12 @@ async function agentCommandInternal(
13281350)
13291351 : parseAgentCommandModelRef(cfg, explicitModelOverride, provider, modelManifestContext)
13301352 : explicitProviderOverride
1331- ? normalizeAgentCommandModelRef(cfg, explicitProviderOverride, model, modelManifestContext)
1353+ ? normalizeAgentCommandModelRef(
1354+cfg,
1355+explicitProviderOverride,
1356+model,
1357+modelManifestContext,
1358+)
13321359 : null;
13331360if (!explicitRef) {
13341361throw new Error("Invalid model override.");
此内容由惯性聚合(RSS阅读器)自动聚合整理,仅供阅读参考。 原文来自 — 版权归原作者所有。