From f0f4fa6978a7a9b4088355c4abdba15cdb1be87e Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sat, 18 Apr 2026 22:26:58 +0100
Subject: [PATCH] test: reuse model override normalizer

---
 src/agents/live-model-switch.test.ts | 34 +++++++++-------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/agents/live-model-switch.test.ts b/src/agents/live-model-switch.test.ts
index 882f101c463..42ef677235e 100644
--- a/src/agents/live-model-switch.test.ts
+++ b/src/agents/live-model-switch.test.ts
@@ -25,29 +25,17 @@ vi.mock("./pi-embedded-runner/runs.js", () => ({
     state.consumeEmbeddedRunModelSwitchMock(...args),
 }));
 
-vi.mock("./model-selection.js", () => ({
-  normalizeStoredOverrideModel: (params: { providerOverride?: string; modelOverride?: string }) => {
-    const providerOverride = params.providerOverride?.trim();
-    const modelOverride = params.modelOverride?.trim();
-    if (!providerOverride || !modelOverride) {
-      return {
-        providerOverride,
-        modelOverride,
-      };
-    }
-    const providerPrefix = `${providerOverride.toLowerCase()}/`;
-    return {
-      providerOverride,
-      modelOverride: modelOverride.toLowerCase().startsWith(providerPrefix)
-        ? modelOverride.slice(providerOverride.length + 1).trim() || modelOverride
-        : modelOverride,
-    };
-  },
-  resolveDefaultModelForAgent: (...args: unknown[]) =>
-    state.resolveDefaultModelForAgentMock(...args),
-  resolvePersistedSelectedModelRef: (...args: unknown[]) =>
-    state.resolvePersistedSelectedModelRefMock(...args),
-}));
+vi.mock("./model-selection.js", async () => {
+  const actual =
+    await vi.importActual<typeof import("./model-selection.js")>("./model-selection.js");
+  return {
+    normalizeStoredOverrideModel: actual.normalizeStoredOverrideModel,
+    resolveDefaultModelForAgent: (...args: unknown[]) =>
+      state.resolveDefaultModelForAgentMock(...args),
+    resolvePersistedSelectedModelRef: (...args: unknown[]) =>
+      state.resolvePersistedSelectedModelRefMock(...args),
+  };
+});
 
 vi.mock("../config/sessions/store.js", () => ({
   loadSessionStore: (...args: unknown[]) => state.loadSessionStoreMock(...args),