fix(models): preserve stripped profile aliases

steipete · steipete · commit b21fad22b2f4 · 2026-05-30T18:00:52.000+01:00
diff --git a/src/agents/model-selection-shared.ts b/src/agents/model-selection-shared.ts
@@ -723,10 +723,16 @@ export function resolveConfiguredModelRef(
     const manifestPluginContext = createModelManifestPluginContext(params);
     const profileStripped = Boolean(modelWithoutProfile && modelWithoutProfile !== trimmed);
     const exactAliasCandidate = findModelAliasCandidate(params.cfg, trimmed);
-    if (profileStripped && exactAliasCandidate) {
+    const strippedAliasCandidate = profileStripped
+      ? findModelAliasCandidate(params.cfg, modelWithoutProfile)
+      : undefined;
+    const profileAliasCandidate = profileStripped
+      ? (exactAliasCandidate ?? strippedAliasCandidate)
+      : undefined;
+    if (profileAliasCandidate) {
       const aliasRef = parseModelRefWithCompatAlias({
         cfg: params.cfg,
-        raw: exactAliasCandidate.keyRaw,
+        raw: profileAliasCandidate.keyRaw,
         defaultProvider: params.defaultProvider,
         allowManifestNormalization: params.allowManifestNormalization,
         allowPluginNormalization: params.allowPluginNormalization,
@@ -747,10 +753,7 @@ export function resolveConfiguredModelRef(
         manifestPlugins: manifestPluginContext.get(),
       });
     }
-    const strippedAliasCandidate = profileStripped
-      ? findModelAliasCandidate(params.cfg, modelWithoutProfile)
-      : undefined;
-    const aliasCandidate = exactAliasCandidate ?? strippedAliasCandidate;
+    const aliasCandidate = profileStripped ? undefined : exactAliasCandidate;
     const manifestPlugins = manifestPluginContext.peek();
     if (
       aliasCandidate &&
diff --git a/src/agents/model-selection.test.ts b/src/agents/model-selection.test.ts
@@ -2071,6 +2071,41 @@ describe("model-selection", () => {
       expect(result).toEqual({ provider: "openai", model: "gpt-5.5" });
     });
 
+    it("prefers stripped auth-profile aliases before configured-provider stripping", () => {
+      const cfg = {
+        agents: {
+          defaults: {
+            model: { primary: "nemotron-bolt/nemotron-3-super-120b@prod" },
+            models: {
+              "openai/nemotron-bolt/nemotron-3-super-120b": {
+                alias: "nemotron-bolt/nemotron-3-super-120b",
+              },
+            },
+          },
+        },
+        models: {
+          providers: {
+            "nemotron-bolt": {
+              api: "openai-completions",
+              baseUrl: "http://127.0.0.1:8080/v1",
+              models: [{ id: "nemotron-3-super-120b", name: "Nemotron" }],
+            },
+          },
+        },
+      } as unknown as OpenClawConfig;
+
+      const result = resolveConfiguredModelRef({
+        cfg,
+        defaultProvider: "anthropic",
+        defaultModel: "claude-sonnet-4-6",
+      });
+
+      expect(result).toEqual({
+        provider: "openai",
+        model: "nemotron-bolt/nemotron-3-super-120b",
+      });
+    });
+
     it("resolves provider-qualified defaults without normalizing every aliasless configured model", () => {
       providerModelNormalizationMock.normalizeProviderModelIdWithRuntime.mockClear();
       const models = Object.fromEntries(
