@@ -578,6 +578,27 @@ function resolveSessionRowModelIdentityRef(params: {
578578params.fallbackModelRef,
579579);
580580}
581+const runtimeModel = normalizeOptionalString(params.entry?.model);
582+const runtimeProvider = normalizeOptionalString(params.entry?.modelProvider);
583+const fallbackModelRef = normalizeOptionalString(params.fallbackModelRef);
584+if (runtimeModel && runtimeProvider && !fallbackModelRef) {
585+return { provider: runtimeProvider, model: runtimeModel };
586+}
587+const normalizedOverride = normalizeStoredOverrideModel({
588+providerOverride: params.entry?.providerOverride,
589+modelOverride: params.entry?.modelOverride,
590+});
591+if (
592+!runtimeModel &&
593+!fallbackModelRef &&
594+normalizedOverride.providerOverride &&
595+normalizedOverride.modelOverride
596+) {
597+return {
598+provider: normalizedOverride.providerOverride,
599+model: normalizedOverride.modelOverride,
600+};
601+}
581602const key = createSessionEntryModelCacheKey({
582603cfg: params.cfg,
583604agentId: params.agentId,
@@ -589,14 +610,12 @@ function resolveSessionRowModelIdentityRef(params: {
589610return cached;
590611}
591612592-const runtimeModel = normalizeOptionalString(params.entry?.model);
593-const runtimeProvider = normalizeOptionalString(params.entry?.modelProvider);
594613if (
595614!runtimeModel &&
596615!runtimeProvider &&
597-!normalizeOptionalString(params.fallbackModelRef) &&
598-!normalizeOptionalString(params.entry?.providerOverride) &&
599-!normalizeOptionalString(params.entry?.modelOverride)
616+!fallbackModelRef &&
617+!normalizedOverride.providerOverride &&
618+!normalizedOverride.modelOverride
600619) {
601620const resolved = resolveSessionDefaultModelRefForRow(params.cfg, params.agentId);
602621params.rowContext.modelIdentityByEntryKey.set(key, resolved);
@@ -623,6 +642,12 @@ function resolveSessionSelectedModelRef(params: {
623642providerOverride: params.entry?.providerOverride,
624643modelOverride: params.entry?.modelOverride,
625644});
645+if (override.providerOverride && override.modelOverride) {
646+return {
647+provider: override.providerOverride,
648+model: override.modelOverride,
649+};
650+}
626651if (!override.modelOverride) {
627652return null;
628653}
@@ -1811,12 +1836,23 @@ export function buildGatewaySessionRow(params: {
1811183618121837const thinkingProvider = rowModelProvider ?? DEFAULT_PROVIDER;
18131838const thinkingModel = rowModel ?? DEFAULT_MODEL;
1814-const thinkingLevels = resolveSessionRowThinkingLevels({
1815-provider: thinkingProvider,
1816-model: thinkingModel,
1817-modelCatalog: params.modelCatalog,
1818- rowContext,
1819-});
1839+const thinkingLevels = lightweight
1840+ ? undefined
1841+ : resolveSessionRowThinkingLevels({
1842+provider: thinkingProvider,
1843+model: thinkingModel,
1844+modelCatalog: params.modelCatalog,
1845+ rowContext,
1846+});
1847+const thinkingDefault = lightweight
1848+ ? undefined
1849+ : resolveGatewaySessionThinkingDefault({
1850+ cfg,
1851+provider: thinkingProvider,
1852+model: thinkingModel,
1853+agentId: sessionAgentId,
1854+modelCatalog: params.modelCatalog,
1855+});
18201856const pluginExtensions =
18211857!lightweight && entry ? projectPluginSessionExtensionsSync({ sessionKey: key, entry }) : [];
18221858@@ -1845,16 +1881,8 @@ export function buildGatewaySessionRow(params: {
18451881abortedLastRun: entry?.abortedLastRun,
18461882thinkingLevel: entry?.thinkingLevel,
18471883 thinkingLevels,
1848-thinkingOptions: thinkingLevels.map((level) => level.label),
1849-thinkingDefault: lightweight
1850- ? entry?.thinkingLevel
1851- : resolveGatewaySessionThinkingDefault({
1852- cfg,
1853-provider: thinkingProvider,
1854-model: thinkingModel,
1855-agentId: sessionAgentId,
1856-modelCatalog: params.modelCatalog,
1857-}),
1884+thinkingOptions: thinkingLevels?.map((level) => level.label),
1885+ thinkingDefault,
18581886fastMode: entry?.fastMode,
18591887verboseLevel: entry?.verboseLevel,
18601888traceLevel: entry?.traceLevel,
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。