From e61eba11e671fafdb74f9e35e117b7546c0db6d0 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 23 Apr 2026 04:32:18 +0100
Subject: [PATCH] fix: avoid plugin normalization in status model refs

---
 src/agents/model-selection.ts          | 14 ++++++++++++--
 src/commands/status.summary.runtime.ts |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/agents/model-selection.ts b/src/agents/model-selection.ts
index 73c4f8734d4..7de092b2854 100644
--- a/src/agents/model-selection.ts
+++ b/src/agents/model-selection.ts
@@ -77,6 +77,7 @@ export function resolvePersistedOverrideModelRef(params: {
   defaultProvider: string;
   overrideProvider?: string;
   overrideModel?: string;
+  allowPluginNormalization?: boolean;
 }): ModelRef | null {
   const defaultProvider = params.defaultProvider.trim();
   const overrideProvider = params.overrideProvider?.trim();
@@ -86,7 +87,9 @@ export function resolvePersistedOverrideModelRef(params: {
   }
   const encodedOverride = overrideProvider ? `${overrideProvider}/${overrideModel}` : overrideModel;
   return (
-    parseModelRef(encodedOverride, defaultProvider) ?? {
+    parseModelRef(encodedOverride, defaultProvider, {
+      allowPluginNormalization: params.allowPluginNormalization,
+    }) ?? {
       provider: overrideProvider || defaultProvider,
       model: overrideModel,
     }
@@ -103,6 +106,7 @@ export function resolvePersistedModelRef(params: {
   runtimeModel?: string;
   overrideProvider?: string;
   overrideModel?: string;
+  allowPluginNormalization?: boolean;
 }): ModelRef | null {
   const defaultProvider = params.defaultProvider.trim();
   const runtimeProvider = params.runtimeProvider?.trim();
@@ -112,7 +116,9 @@ export function resolvePersistedModelRef(params: {
       return { provider: runtimeProvider, model: runtimeModel };
     }
     return (
-      parseModelRef(runtimeModel, defaultProvider) ?? {
+      parseModelRef(runtimeModel, defaultProvider, {
+        allowPluginNormalization: params.allowPluginNormalization,
+      }) ?? {
         provider: defaultProvider,
         model: runtimeModel,
       }
@@ -122,6 +128,7 @@ export function resolvePersistedModelRef(params: {
     defaultProvider,
     overrideProvider: params.overrideProvider,
     overrideModel: params.overrideModel,
+    allowPluginNormalization: params.allowPluginNormalization,
   });
 }
 
@@ -136,11 +143,13 @@ export function resolvePersistedSelectedModelRef(params: {
   runtimeModel?: string;
   overrideProvider?: string;
   overrideModel?: string;
+  allowPluginNormalization?: boolean;
 }): ModelRef | null {
   const override = resolvePersistedOverrideModelRef({
     defaultProvider: params.defaultProvider,
     overrideProvider: params.overrideProvider,
     overrideModel: params.overrideModel,
+    allowPluginNormalization: params.allowPluginNormalization,
   });
   if (override) {
     return override;
@@ -149,6 +158,7 @@ export function resolvePersistedSelectedModelRef(params: {
     defaultProvider: params.defaultProvider,
     runtimeProvider: params.runtimeProvider,
     runtimeModel: params.runtimeModel,
+    allowPluginNormalization: params.allowPluginNormalization,
   });
 }
 
diff --git a/src/commands/status.summary.runtime.ts b/src/commands/status.summary.runtime.ts
index 177d38d6c48..bbfad0139bb 100644
--- a/src/commands/status.summary.runtime.ts
+++ b/src/commands/status.summary.runtime.ts
@@ -158,6 +158,7 @@ function resolveSessionModelRef(
       runtimeModel: entry?.model,
       overrideProvider: entry?.providerOverride,
       overrideModel: entry?.modelOverride,
+      allowPluginNormalization: false,
     }) ?? resolved
   );
 }