perf: skip manifest normalization in status summary (#87831)

ACSKamloops · web-flow · commit 87aae9f11d27 · 2026-06-28T15:52:44.000-07:00
diff --git a/src/agents/model-selection.ts b/src/agents/model-selection.ts
@@ -98,6 +98,7 @@ export function resolvePersistedOverrideModelRef(params: {
   defaultProvider?: unknown;
   overrideProvider?: unknown;
   overrideModel?: unknown;
+  allowManifestNormalization?: boolean;
   allowPluginNormalization?: boolean;
 }): ModelRef | null {
   const defaultProvider = normalizePersistedDefaultProvider(params.defaultProvider);
@@ -109,6 +110,7 @@ export function resolvePersistedOverrideModelRef(params: {
   const encodedOverride = overrideProvider ? `${overrideProvider}/${overrideModel}` : overrideModel;
   return (
     parseModelRef(encodedOverride, defaultProvider, {
+      allowManifestNormalization: params.allowManifestNormalization,
       allowPluginNormalization: params.allowPluginNormalization,
     }) ?? {
       provider: overrideProvider || defaultProvider,
@@ -127,6 +129,7 @@ export function resolvePersistedModelRef(params: {
   runtimeModel?: unknown;
   overrideProvider?: unknown;
   overrideModel?: unknown;
+  allowManifestNormalization?: boolean;
   allowPluginNormalization?: boolean;
 }): ModelRef | null {
   const defaultProvider = normalizePersistedDefaultProvider(params.defaultProvider);
@@ -138,6 +141,7 @@ export function resolvePersistedModelRef(params: {
     }
     return (
       parseModelRef(runtimeModel, defaultProvider, {
+        allowManifestNormalization: params.allowManifestNormalization,
         allowPluginNormalization: params.allowPluginNormalization,
       }) ?? {
         provider: defaultProvider,
@@ -149,6 +153,7 @@ export function resolvePersistedModelRef(params: {
     defaultProvider,
     overrideProvider: params.overrideProvider,
     overrideModel: params.overrideModel,
+    allowManifestNormalization: params.allowManifestNormalization,
     allowPluginNormalization: params.allowPluginNormalization,
   });
 }
@@ -164,12 +169,14 @@ export function resolvePersistedSelectedModelRef(params: {
   runtimeModel?: unknown;
   overrideProvider?: unknown;
   overrideModel?: unknown;
+  allowManifestNormalization?: boolean;
   allowPluginNormalization?: boolean;
 }): ModelRef | null {
   const override = resolvePersistedOverrideModelRef({
     defaultProvider: params.defaultProvider,
     overrideProvider: params.overrideProvider,
     overrideModel: params.overrideModel,
+    allowManifestNormalization: params.allowManifestNormalization,
     allowPluginNormalization: params.allowPluginNormalization,
   });
   if (override) {
@@ -179,6 +186,7 @@ export function resolvePersistedSelectedModelRef(params: {
     defaultProvider: params.defaultProvider,
     runtimeProvider: params.runtimeProvider,
     runtimeModel: params.runtimeModel,
+    allowManifestNormalization: params.allowManifestNormalization,
     allowPluginNormalization: params.allowPluginNormalization,
   });
 }
diff --git a/src/commands/status.summary.runtime.normalization.test.ts b/src/commands/status.summary.runtime.normalization.test.ts
@@ -0,0 +1,100 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const normalizeProviderModelIdWithManifestMock = vi.hoisted(() => vi.fn());
+const normalizeProviderModelIdWithRuntimeMock = vi.hoisted(() => vi.fn());
+
+vi.mock("../plugins/manifest-model-id-normalization.js", () => ({
+  normalizeProviderModelIdWithManifest: normalizeProviderModelIdWithManifestMock,
+}));
+
+vi.mock("../agents/provider-model-normalization.runtime.js", () => ({
+  normalizeProviderModelIdWithRuntime: normalizeProviderModelIdWithRuntimeMock,
+}));
+
+describe("statusSummaryRuntime configured model normalization", () => {
+  beforeEach(() => {
+    vi.resetModules();
+    normalizeProviderModelIdWithManifestMock.mockReset();
+    normalizeProviderModelIdWithRuntimeMock.mockReset();
+  });
+
+  it("skips manifest and plugin model normalization for configured model refs", async () => {
+    const { statusSummaryRuntime } = await import("./status.summary.runtime.js");
+
+    expect(
+      statusSummaryRuntime.resolveConfiguredStatusModelRef({
+        cfg: {
+          agents: {
+            defaults: {
+              model: { primary: "openai-codex/gpt-5.5" },
+            },
+          },
+        } as never,
+        defaultProvider: "openai",
+        defaultModel: "gpt-5.5",
+      }),
+    ).toEqual({
+      provider: "openai-codex",
+      model: "gpt-5.5",
+    });
+
+    expect(
+      statusSummaryRuntime.resolveConfiguredStatusModelRef({
+        cfg: {
+          agents: {
+            defaults: {
+              model: { primary: "fast-codex" },
+              models: {
+                "openai-codex/gpt-5.5": { alias: "fast-codex" },
+              },
+            },
+          },
+        } as never,
+        defaultProvider: "openai",
+        defaultModel: "gpt-5.5",
+      }),
+    ).toEqual({
+      provider: "openai-codex",
+      model: "gpt-5.5",
+    });
+
+    expect(normalizeProviderModelIdWithManifestMock).not.toHaveBeenCalled();
+    expect(normalizeProviderModelIdWithRuntimeMock).not.toHaveBeenCalled();
+  });
+
+  it("skips manifest and plugin model normalization for providerless persisted session models", async () => {
+    const { statusSummaryRuntime } = await import("./status.summary.runtime.js");
+    const cfg = {
+      agents: {
+        defaults: {
+          model: { primary: "anthropic/claude-sonnet-4-6" },
+        },
+      },
+    } as never;
+
+    normalizeProviderModelIdWithManifestMock.mockReturnValue("claude-opus-4-6");
+    normalizeProviderModelIdWithRuntimeMock.mockReturnValue("runtime-normalized-opus");
+
+    expect(
+      statusSummaryRuntime.resolveSessionModelRef(cfg, {
+        model: "opus-4.6",
+      }),
+    ).toEqual({
+      provider: "anthropic",
+      model: "opus-4.6",
+    });
+
+    expect(
+      statusSummaryRuntime.resolveSessionModelRef(cfg, {
+        model: "fallback-runtime-model",
+        modelOverride: "opus-4.6",
+      }),
+    ).toEqual({
+      provider: "anthropic",
+      model: "opus-4.6",
+    });
+
+    expect(normalizeProviderModelIdWithManifestMock).not.toHaveBeenCalled();
+    expect(normalizeProviderModelIdWithRuntimeMock).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/commands/status.summary.runtime.ts b/src/commands/status.summary.runtime.ts
@@ -39,6 +39,7 @@ function resolveStatusModelRefFromRaw(params: {
         continue;
       }
       const parsed = parseModelRef(modelKey, params.defaultProvider, {
+        allowManifestNormalization: false,
         allowPluginNormalization: false,
       });
       if (parsed) {
@@ -48,6 +49,7 @@ function resolveStatusModelRefFromRaw(params: {
     return { provider: params.defaultProvider, model: trimmed };
   }
   return parseModelRef(trimmed, params.defaultProvider, {
+    allowManifestNormalization: false,
     allowPluginNormalization: false,
   });
 }
@@ -119,6 +121,7 @@ function resolveSessionModelRef(
       runtimeModel: entry?.model,
       overrideProvider: entry?.providerOverride,
       overrideModel: entry?.modelOverride,
+      allowManifestNormalization: false,
       allowPluginNormalization: false,
     }) ?? resolved
   );
