fix(subagents): handle configured bare model provenance ·...

Recent Commits to openclaw:main

steipete · 2026-06-14 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,27 @@ describe("subagent spawn model + thinking plan", () => {`
`101`	`101`	`expect(plan.resolvedModel).toBe(defaultModelRef);`
`102`	`102`	`expect(plan.initialSessionPatch.model).toBe(defaultModelRef);`
`103`	`103`	`expect(plan.initialSessionPatch.modelOverrideSource).toBe("auto");`
	`104`	`+expect(plan.initialSessionPatch.modelOverrideFallbackOriginProvider).toBeUndefined();`
	`105`	`+expect(plan.initialSessionPatch.modelOverrideFallbackOriginModel).toBeUndefined();`
	`106`	`+});`
	`107`	`+`
	`108`	`+it("uses the target default provider for bare configured subagent models", () => {`
	`109`	`+const plan = expectOkPlan(`
	`110`	`+resolveSubagentModelAndThinkingPlan({`
	`111`	`+cfg: createConfig({`
	`112`	`+agents: {`
	`113`	`+defaults: {`
	`114`	`+model: { primary: "openai/gpt-5.5" },`
	`115`	`+subagents: { model: "gpt-5.4" },`
	`116`	`+},`
	`117`	`+},`
	`118`	`+}),`
	`119`	`+targetAgentId: "research",`
	`120`	`+}),`
	`121`	`+);`
	`122`	`+expect(plan.resolvedModel).toBe("gpt-5.4");`
	`123`	`+expect(plan.initialSessionPatch.modelOverrideFallbackOriginProvider).toBe("openai");`
	`124`	`+expect(plan.initialSessionPatch.modelOverrideFallbackOriginModel).toBe("gpt-5.4");`
`104`	`125`	`});`
`105`	`126`
`106`	`127`	`it("can resolve only explicit or configured subagent model selections", () => {`
`@@ -166,6 +187,8 @@ describe("subagent spawn model + thinking plan", () => {`
`166`	`187`	`expect(plan.resolvedModel).toBe("minimax/MiniMax-M2.7");`
`167`	`188`	`expect(plan.initialSessionPatch.model).toBe("minimax/MiniMax-M2.7");`
`168`	`189`	`expect(plan.initialSessionPatch.modelOverrideSource).toBe("auto");`
	`190`	`+expect(plan.initialSessionPatch.modelOverrideFallbackOriginProvider).toBe("minimax");`
	`191`	`+expect(plan.initialSessionPatch.modelOverrideFallbackOriginModel).toBe("MiniMax-M2.7");`
`169`	`192`	`});`
`170`	`193`
`171`	`194`	`it("prefers target agent primary model over global default", () => {`
`@@ -189,6 +212,8 @@ describe("subagent spawn model + thinking plan", () => {`
`189`	`212`	`expect(plan.resolvedModel).toBe("opencode/claude");`
`190`	`213`	`expect(plan.initialSessionPatch.model).toBe("opencode/claude");`
`191`	`214`	`expect(plan.initialSessionPatch.modelOverrideSource).toBe("auto");`
	`215`	`+expect(plan.initialSessionPatch.modelOverrideFallbackOriginProvider).toBe("opencode");`
	`216`	`+expect(plan.initialSessionPatch.modelOverrideFallbackOriginModel).toBe("claude");`
`192`	`217`	`});`
`193`	`218`
`194`	`219`	`it("uses config default timeout when agent omits runTimeoutSeconds", () => {`

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,11 @@`
`5`	`5`	`*/`
`6`	`6`	`import { formatThinkingLevels } from "../auto-reply/thinking.js";`
`7`	`7`	`import type { OpenClawConfig } from "../config/types.openclaw.js";`
`8`		`-import { resolveSubagentSpawnModelSelection } from "./model-selection.js";`
	`8`	`+import {`
	`9`	`+resolveDefaultModelForAgent,`
	`10`	`+resolveSubagentConfiguredModelSelection,`
	`11`	`+resolveSubagentSpawnModelSelection,`
	`12`	`+} from "./model-selection.js";`
`9`	`13`	`import { resolveSubagentThinkingOverride } from "./subagent-spawn-thinking.js";`
`10`	`14`
`11`	`15`	`/** Splits a provider/model ref while preserving model-only refs. */`
`@@ -81,7 +85,26 @@ export function resolveSubagentModelAndThinkingPlan(params: {`
`81`	`85`	`}`
`82`	`86`
`83`	`87`	`const modelOverrideSource = params.modelOverride?.trim() ? "user" : "auto";`
`84`		`-const resolvedModelRef = splitModelRef(resolvedModel);`
	`88`	`+const hasConfiguredAutoModel =`
	`89`	`+modelOverrideSource === "auto" &&`
	`90`	`+Boolean(`
	`91`	`+resolveSubagentConfiguredModelSelection({`
	`92`	`+cfg: params.cfg,`
	`93`	`+agentId: params.targetAgentId,`
	`94`	`+}),`
	`95`	`+);`
	`96`	`+const configuredModelRef = hasConfiguredAutoModel ? splitModelRef(resolvedModel) : undefined;`
	`97`	`+const modelOrigin = configuredModelRef?.model`
	`98`	`+ ? {`
	`99`	`+provider:`
	`100`	`+configuredModelRef.provider ??`
	`101`	`+resolveDefaultModelForAgent({`
	`102`	`+cfg: params.cfg,`
	`103`	`+agentId: params.targetAgentId,`
	`104`	`+}).provider,`
	`105`	`+model: configuredModelRef.model,`
	`106`	`+}`
	`107`	`+ : undefined;`
`85`	`108`
`86`	`109`	`return {`
`87`	`110`	`status: "ok" as const,`
`@@ -93,16 +116,12 @@ export function resolveSubagentModelAndThinkingPlan(params: {`
`93`	`116`	`? {`
`94`	`117`	`model: resolvedModel,`
`95`	`118`	`modelOverrideSource,`
`96`		`- ...(modelOverrideSource === "auto" &&`
`97`		`-resolvedModelRef.provider &&`
`98`		`-resolvedModelRef.model`
	`119`	`+ ...(modelOrigin`
`99`	`120`	`? {`
`100`		`-// Auto-selected subagent models are real session overrides, not legacy`
`101`		`-// auto-fallback recoveries. Persist self-origin metadata so the child`
`102`		`-// run keeps its configured model instead of the legacy cleanup path`
`103`		`-// discarding it before first execution.`
`104`		`-modelOverrideFallbackOriginProvider: resolvedModelRef.provider,`
`105`		`-modelOverrideFallbackOriginModel: resolvedModelRef.model,`
	`121`	`+// Config-selected models are session overrides, not legacy fallback residue.`
	`122`	`+// Self-origin metadata keeps cleanup from discarding them before first use.`
	`123`	`+modelOverrideFallbackOriginProvider: modelOrigin.provider,`
	`124`	`+modelOverrideFallbackOriginModel: modelOrigin.model,`
`106`	`125`	`}`
`107`	`126`	`: {}),`
`108`	`127`	`}`

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,8 @@ describe("spawnSubagentDirect runtime model persistence", () => {`
`114`	`114`	`agents: {`
`115`	`115`	`defaults: {`
`116`	`116`	`workspace: os.tmpdir(),`
`117`		`-subagents: { model: "minimax/MiniMax-M2.7" },`
	`117`	`+model: { primary: "openai/gpt-5.5" },`
	`118`	`+subagents: { model: "gpt-5.4" },`
`118`	`119`	`},`
`119`	`120`	`},`
`120`	`121`	`}),`
`@@ -143,7 +144,7 @@ describe("spawnSubagentDirect runtime model persistence", () => {`
`143`	`144`	`expect(result.status).toBe("accepted");`
`144`	`145`	`const [, persistedEntry] = Object.entries(persistedStore ?? {})[0] ?? [];`
`145`	`146`	`expect(persistedEntry?.modelOverrideSource).toBe("auto");`
`146`		`-expect(persistedEntry?.modelOverrideFallbackOriginProvider).toBe("minimax");`
`147`		`-expect(persistedEntry?.modelOverrideFallbackOriginModel).toBe("MiniMax-M2.7");`
	`147`	`+expect(persistedEntry?.modelOverrideFallbackOriginProvider).toBe("openai");`
	`148`	`+expect(persistedEntry?.modelOverrideFallbackOriginModel).toBe("gpt-5.4");`
`148`	`149`	`});`
`149`	`150`	`});`

Original file line number	Diff line number	Diff line change
`@@ -348,18 +348,13 @@ function buildDirectChildSessionPatch(patch: Record<string, unknown>): Partial<S`
`348`	`348`	`entry.model = model;`
`349`	`349`	`entry.modelOverride = model;`
`350`	`350`	`entry.modelOverrideSource = patch.modelOverrideSource === "auto" ? "auto" : "user";`
`351`		`-if (`
`352`		`-typeof patch.modelOverrideFallbackOriginProvider === "string" &&`
`353`		`-patch.modelOverrideFallbackOriginProvider.trim()`
`354`		`-) {`
`355`		`-entry.modelOverrideFallbackOriginProvider =`
`356`		`-patch.modelOverrideFallbackOriginProvider.trim();`
`357`		`-}`
`358`		`-if (`
`359`		`-typeof patch.modelOverrideFallbackOriginModel === "string" &&`
`360`		`-patch.modelOverrideFallbackOriginModel.trim()`
`361`		`-) {`
`362`		`-entry.modelOverrideFallbackOriginModel = patch.modelOverrideFallbackOriginModel.trim();`
	`351`	`+const fallbackOriginProvider = normalizeOptionalString(`
	`352`	`+patch.modelOverrideFallbackOriginProvider,`
	`353`	`+);`
	`354`	`+const fallbackOriginModel = normalizeOptionalString(patch.modelOverrideFallbackOriginModel);`
	`355`	`+if (fallbackOriginProvider && fallbackOriginModel) {`
	`356`	`+entry.modelOverrideFallbackOriginProvider = fallbackOriginProvider;`
	`357`	`+entry.modelOverrideFallbackOriginModel = fallbackOriginModel;`
`363`	`358`	`}`
`364`	`359`	`if (provider) {`
`365`	`360`	`entry.modelProvider = provider;`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main