fix(subagents): preserve config-selected child model overrides · openclaw/openclaw@aa04aef

Recent Commits to openclaw:main

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

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,8 @@ describe("subagent spawn model + thinking plan", () => {`
`86`	`86`	`expect(plan.resolvedModel).toBe("minimax/MiniMax-M2.7");`
`87`	`87`	`expect(plan.initialSessionPatch.model).toBe("minimax/MiniMax-M2.7");`
`88`	`88`	`expect(plan.initialSessionPatch.modelOverrideSource).toBe("auto");`
	`89`	`+expect(plan.initialSessionPatch.modelOverrideFallbackOriginProvider).toBe("minimax");`
	`90`	`+expect(plan.initialSessionPatch.modelOverrideFallbackOriginModel).toBe("MiniMax-M2.7");`
`89`	`91`	`});`
`90`	`92`
`91`	`93`	`it("falls back to runtime default model when no model config is set", () => {`
`@@ -139,6 +141,8 @@ describe("subagent spawn model + thinking plan", () => {`
`139`	`141`	`expect(plan.resolvedModel).toBe("opencode/claude");`
`140`	`142`	`expect(plan.initialSessionPatch.model).toBe("opencode/claude");`
`141`	`143`	`expect(plan.initialSessionPatch.modelOverrideSource).toBe("auto");`
	`144`	`+expect(plan.initialSessionPatch.modelOverrideFallbackOriginProvider).toBe("opencode");`
	`145`	`+expect(plan.initialSessionPatch.modelOverrideFallbackOriginModel).toBe("claude");`
`142`	`146`	`});`
`143`	`147`
`144`	`148`	`it("prefers default subagent model over target agent primary model", () => {`

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,9 @@ export function resolveSubagentModelAndThinkingPlan(params: {`
`80`	`80`	`};`
`81`	`81`	`}`
`82`	`82`
	`83`	`+const modelOverrideSource = params.modelOverride?.trim() ? "user" : "auto";`
	`84`	`+const resolvedModelRef = splitModelRef(resolvedModel);`
	`85`	`+`
`83`	`86`	`return {`
`84`	`87`	`status: "ok" as const,`
`85`	`88`	`resolvedModel,`
`@@ -89,7 +92,19 @@ export function resolveSubagentModelAndThinkingPlan(params: {`
`89`	`92`	`...(resolvedModel`
`90`	`93`	`? {`
`91`	`94`	`model: resolvedModel,`
`92`		`-modelOverrideSource: params.modelOverride?.trim() ? "user" : "auto",`
	`95`	`+ modelOverrideSource,`
	`96`	`+ ...(modelOverrideSource === "auto" &&`
	`97`	`+resolvedModelRef.provider &&`
	`98`	`+resolvedModelRef.model`
	`99`	`+ ? {`
	`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,`
	`106`	`+}`
	`107`	`+ : {}),`
`93`	`108`	`}`
`94`	`109`	`: {}),`
`95`	`110`	`...thinkingPlan.initialSessionPatch,`

Original file line number	Diff line number	Diff line change
`@@ -101,4 +101,49 @@ describe("spawnSubagentDirect runtime model persistence", () => {`
`101`	`101`	`operations.lastIndexOf("store:update"),`
`102`	`102`	`);`
`103`	`103`	`});`
	`104`	`+`
	`105`	`+it("persists self-origin metadata for auto-selected subagent models", async () => {`
	`106`	`+const dedicatedUpdateSessionStoreMock = vi.fn();`
	`107`	`+const {`
	`108`	`+resetSubagentRegistryForTests: resetForAutoModelTest,`
	`109`	`+spawnSubagentDirect: spawnWithAutoModel,`
	`110`	`+} = await loadSubagentSpawnModuleForTest({`
	`111`	`+ callGatewayMock,`
	`112`	`+getRuntimeConfig: () =>`
	`113`	`+createSubagentSpawnTestConfig(os.tmpdir(), {`
	`114`	`+agents: {`
	`115`	`+defaults: {`
	`116`	`+workspace: os.tmpdir(),`
	`117`	`+subagents: { model: "minimax/MiniMax-M2.7" },`
	`118`	`+},`
	`119`	`+},`
	`120`	`+}),`
	`121`	`+updateSessionStoreMock: dedicatedUpdateSessionStoreMock,`
	`122`	`+ pruneLegacyStoreKeysMock,`
	`123`	`+workspaceDir: os.tmpdir(),`
	`124`	`+});`
	`125`	`+resetForAutoModelTest();`
	`126`	`+let persistedStore: Record<string, Record<string, unknown>> \| undefined;`
	`127`	`+installSessionStoreCaptureMock(dedicatedUpdateSessionStoreMock, {`
	`128`	`+onStore: (store) => {`
	`129`	`+persistedStore = store;`
	`130`	`+},`
	`131`	`+});`
	`132`	`+`
	`133`	`+const result = await spawnWithAutoModel(`
	`134`	`+{`
	`135`	`+task: "test",`
	`136`	`+},`
	`137`	`+{`
	`138`	`+agentSessionKey: "agent:main:main",`
	`139`	`+agentChannel: "guildchat",`
	`140`	`+},`
	`141`	`+);`
	`142`	`+`
	`143`	`+expect(result.status).toBe("accepted");`
	`144`	`+const [, persistedEntry] = Object.entries(persistedStore ?? {})[0] ?? [];`
	`145`	`+expect(persistedEntry?.modelOverrideSource).toBe("auto");`
	`146`	`+expect(persistedEntry?.modelOverrideFallbackOriginProvider).toBe("minimax");`
	`147`	`+expect(persistedEntry?.modelOverrideFallbackOriginModel).toBe("MiniMax-M2.7");`
	`148`	`+});`
`104`	`149`	`});`

Original file line number	Diff line number	Diff line change
`@@ -348,6 +348,19 @@ 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();`
	`363`	`+}`
`351`	`364`	`if (provider) {`
`352`	`365`	`entry.modelProvider = provider;`
`353`	`366`	`entry.providerOverride = provider;`

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

推荐订阅源

Recent Commits to openclaw:main