fix(status): keep runtime model for fallback detection, use override for cost

sunlit-deng · sunlit-deng · commit f6c3c2273202 · 2026-06-19T20:54:37.000+08:00
The /status usage fix was too aggressive — it changed activeProvider/activeModel
globally, which broke fallback line detection (resolveActiveFallbackState saw
selected == active when both used the override). Revert activeProvider/activeModel
to use runtime model (modelRefs.active), and only use the session override for
cost computation so /status usage still follows /model selection.

Fixes 11 test failures in src/auto-reply/status.test.ts
diff --git a/src/status/status-message.ts b/src/status/status-message.ts
@@ -596,10 +596,8 @@ export function buildStatusMessage(args: StatusArgs): string {
     config: args.config,
     state: entry,
   });
-  // Prefer session provider/model override so status reflects the /model selection,
-  // not a stale runtime model identity from a prior run with a different provider.
-  let activeProvider = entry?.providerOverride?.trim() || modelRefs.active.provider;
-  let activeModel = entry?.modelOverride?.trim() || modelRefs.active.model;
+  let activeProvider = modelRefs.active.provider;
+  let activeModel = modelRefs.active.model;
   let contextLookupProvider: string | undefined = activeProvider;
   let contextLookupModel = activeModel;
   const runtimeModelRaw = normalizeOptionalString(entry?.model) ?? "";
@@ -1022,10 +1020,13 @@ export function buildStatusMessage(args: StatusArgs): string {
     typeof outputTokens === "number" ||
     typeof cacheRead === "number" ||
     typeof cacheWrite === "number";
+  // Use selected (override) model for cost so /status usage follows /model selection
+  const costProvider = entry?.providerOverride?.trim() || activeProvider;
+  const costModel = entry?.modelOverride?.trim() || activeModel;
   const costConfig = hasUsage
     ? resolveModelCostConfig({
-        provider: activeProvider,
-        model: activeModel,
+        provider: costProvider,
+        model: costModel,
         config: args.config,
         allowPluginNormalization: false,
       })
