fix(agents): preserve built-in model refs for subagents

extrasmall0 · extrasmall0 · commit ec1a94017f3c · 2026-06-26T00:26:50.000-07:00
diff --git a/src/agents/model-selection.test.ts b/src/agents/model-selection.test.ts
@@ -2938,6 +2938,27 @@ describe("resolveSubagentSpawnModelSelection", () => {
     ).toBe("openai/gpt-5.4");
   });
 
+  it("keeps exact built-in provider/model overrides before slash-form aliases", () => {
+    const cfg = {
+      agents: {
+        defaults: {
+          model: { primary: "anthropic/claude-sonnet-4-6" },
+          models: {
+            "openrouter/openai/gpt-5.4": { alias: "openai/gpt-5.4" },
+          },
+        },
+      },
+    } as OpenClawConfig;
+
+    expect(
+      resolveSubagentSpawnModelSelection({
+        cfg,
+        agentId: "main",
+        modelOverride: "openai/gpt-5.4",
+      }),
+    ).toBe("openai/gpt-5.4");
+  });
+
   it("resolves slash-form alias overrides before provider/model passthrough", () => {
     const cfg = {
       agents: {
diff --git a/src/agents/model-selection.ts b/src/agents/model-selection.ts
@@ -90,6 +90,15 @@ export {
 };
 export { isCliProvider } from "./model-selection-cli.js";
 
+const BUILT_IN_EXACT_REF_PROVIDER_IDS = new Set([
+  "anthropic",
+  "azure-openai",
+  "google",
+  "google-vertex",
+  "mistral",
+  "openai",
+]);
+
 function normalizePersistedDefaultProvider(value: unknown): string {
   return normalizeOptionalString(value) ?? DEFAULT_PROVIDER;
 }
@@ -341,12 +350,18 @@ export function resolveSubagentConfiguredModelSelection(params: {
  * a fully qualified `provider/model` string.  If the value is already qualified
  * or not a known alias, returns it unchanged.
  */
-function hasExactConfiguredProviderModelRef(cfg: OpenClawConfig, raw: string): boolean {
+function hasExactKnownProviderModelRef(cfg: OpenClawConfig, raw: string): boolean {
   if (!hasExplicitProviderModelRef(raw)) {
     return false;
   }
   const providerRaw = raw.slice(0, raw.indexOf("/")).trim();
-  if (!providerRaw || !cfg.models?.providers) {
+  if (!providerRaw) {
+    return false;
+  }
+  if (BUILT_IN_EXACT_REF_PROVIDER_IDS.has(normalizeProviderId(providerRaw))) {
+    return true;
+  }
+  if (!cfg.models?.providers) {
     return false;
   }
   const providerKey = normalizeLowercaseStringOrEmpty(providerRaw);
@@ -360,7 +375,7 @@ function resolveModelThroughAliases(
   aliasIndex: ModelAliasIndex,
   cfg: OpenClawConfig,
 ): string {
-  if (hasExactConfiguredProviderModelRef(cfg, value)) {
+  if (hasExactKnownProviderModelRef(cfg, value)) {
     return value;
   }
   const aliasKey = normalizeLowercaseStringOrEmpty(value);
