fix(agents): normalize prefixed Anthropic model ids

TurboTheTurtle · TurboTheTurtle · commit 4ee13a12c08d · 2026-05-31T03:40:45.000-07:00
diff --git a/packages/model-catalog-core/src/provider-model-id-normalization.test.ts b/packages/model-catalog-core/src/provider-model-id-normalization.test.ts
@@ -34,4 +34,16 @@ describe("provider model id policy normalization", () => {
       ),
     ).toBe("openrouter/google/gemini-3.1-pro-preview");
   });
+
+  it("normalizes native Anthropic catalog refs without retaining the provider prefix", () => {
+    expect(
+      normalizeStaticProviderModelIdWithPolicies(
+        "anthropic",
+        "anthropic/claude-haiku-4-5",
+      ),
+    ).toBe("claude-haiku-4-5");
+    expect(
+      normalizeConfiguredProviderCatalogModelId("anthropic", "anthropic/claude-haiku-4-5"),
+    ).toBe("claude-haiku-4-5");
+  });
 });
diff --git a/packages/model-catalog-core/src/provider-model-id-normalization.ts b/packages/model-catalog-core/src/provider-model-id-normalization.ts
@@ -119,7 +119,12 @@ export function normalizeBuiltInProviderModelId(provider: string, model: string)
       "opus-4.6": "claude-opus-4-6",
       "sonnet-4.6": "claude-sonnet-4-6",
     };
-    return anthropicAliases[normalizeLowercaseStringOrEmpty(model)] ?? model;
+    const anthropicPrefix = "anthropic/";
+    const normalizedModel = normalizeLowercaseStringOrEmpty(model);
+    const providerModel = normalizedModel.startsWith(anthropicPrefix)
+      ? model.trim().slice(anthropicPrefix.length)
+      : model;
+    return anthropicAliases[normalizeLowercaseStringOrEmpty(providerModel)] ?? providerModel;
   }
   if (normalizedProvider === "vercel-ai-gateway") {
     const vercelAliases: Record<string, string> = {
diff --git a/src/agents/embedded-agent-runner/model.test.ts b/src/agents/embedded-agent-runner/model.test.ts
@@ -556,6 +556,70 @@ describe("resolveModel", () => {
     expect(discoverModels).not.toHaveBeenCalled();
   });
 
+  it("looks up each static fallback candidate with its own normalized model id", async () => {
+    resolveBundledStaticCatalogModelMock.mockImplementation(({ provider, modelId }) => ({
+      provider,
+      id: modelId,
+      name: modelId,
+      api: "openai-responses",
+      input: ["text"],
+      cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+    }));
+
+    const anthropicResult = await resolveModelAsync(
+      "anthropic",
+      "anthropic/claude-haiku-4-5",
+      "/tmp/agent",
+      undefined,
+      {
+        allowBundledStaticCatalogFallback: true,
+        runtimeHooks: createRuntimeHooks(),
+        skipAgentDiscovery: true,
+        skipProviderRuntimeHooks: true,
+      },
+    );
+    const openaiResult = await resolveModelAsync("openai", "gpt-4o", "/tmp/agent", undefined, {
+      allowBundledStaticCatalogFallback: true,
+      runtimeHooks: createRuntimeHooks(),
+      skipAgentDiscovery: true,
+      skipProviderRuntimeHooks: true,
+    });
+
+    expectRecordFields(expectResolvedModel(anthropicResult), {
+      provider: "anthropic",
+      id: "claude-haiku-4-5",
+    });
+    expectRecordFields(expectResolvedModel(openaiResult), {
+      provider: "openai",
+      id: "gpt-4o",
+    });
+    expect(resolveBundledStaticCatalogModelMock).toHaveBeenCalledWith({
+      provider: "anthropic",
+      modelId: "claude-haiku-4-5",
+      cfg: undefined,
+      workspaceDir: undefined,
+    });
+    expect(resolveBundledStaticCatalogModelMock).toHaveBeenCalledWith({
+      provider: "openai",
+      modelId: "gpt-4o",
+      cfg: undefined,
+      workspaceDir: undefined,
+    });
+    expect(resolveBundledStaticCatalogModelMock).not.toHaveBeenCalledWith(
+      expect.objectContaining({
+        provider: "openai",
+        modelId: "claude-haiku-4-5",
+      }),
+    );
+    expect(resolveBundledStaticCatalogModelMock).not.toHaveBeenCalledWith(
+      expect.objectContaining({
+        modelId: "anthropic/claude-haiku-4-5",
+      }),
+    );
+    expect(discoverAuthStorage).not.toHaveBeenCalled();
+    expect(discoverModels).not.toHaveBeenCalled();
+  });
+
   it("applies provider overrides to bundled static catalog rows while skipping agent discovery", async () => {
     resolveBundledStaticCatalogModelMock.mockReturnValueOnce({
       provider: "mistral",
diff --git a/src/agents/model-fallback.test.ts b/src/agents/model-fallback.test.ts
@@ -1716,6 +1716,36 @@ describe("runWithModelFallback", () => {
     ]);
   });
 
+  it("normalizes prefixed Anthropic fallback candidates independently", () => {
+    const cfg = makeCfg({
+      agents: {
+        defaults: {
+          model: {
+            primary: "anthropic/claude-sonnet-4-6",
+            fallbacks: ["anthropic/claude-haiku-4-5", "anthropic/claude-opus-4-7"],
+          },
+          models: {
+            "anthropic/claude-sonnet-4-6": {},
+            "anthropic/claude-haiku-4-5": {},
+            "anthropic/claude-opus-4-7": {},
+          },
+        },
+      },
+    });
+
+    const candidates = testing.resolveFallbackCandidates({
+      cfg,
+      provider: "anthropic",
+      model: "anthropic/claude-sonnet-4-6",
+    });
+
+    expect(candidates).toEqual([
+      { provider: "anthropic", model: "claude-sonnet-4-6" },
+      { provider: "anthropic", model: "claude-haiku-4-5" },
+      { provider: "anthropic", model: "claude-opus-4-7" },
+    ]);
+  });
+
   it("tries configured fallbacks before primary for override credential validation errors", async () => {
     const cfg = makeCfg();
     const run = createOverrideFailureRun({
diff --git a/src/agents/model-ref-shared.test.ts b/src/agents/model-ref-shared.test.ts
@@ -39,6 +39,12 @@ describe("normalizeStaticProviderModelId", () => {
     );
   });
 
+  it("strips native Anthropic provider prefixes from static catalog ids", () => {
+    expect(normalizeStaticProviderModelId("anthropic", "anthropic/claude-haiku-4-5")).toBe(
+      "claude-haiku-4-5",
+    );
+  });
+
   it("uses supplied manifest normalization policies when provided", () => {
     const manifestPlugins = [
       {
