fix: preserve fallback provider status usage

zhangguiping-xydt · zhangguiping-xydt · commit 056d84004e96 · 2026-06-21T23:37:26.000+08:00
diff --git a/src/auto-reply/reply/commands-status.test.ts b/src/auto-reply/reply/commands-status.test.ts
@@ -1249,6 +1249,95 @@ describe("buildStatusReply subagent summary", () => {
     });
   });
 
+  it("uses active fallback provider usage for legacy fallback notices", async () => {
+    const fallbackModel: ModelDefinitionConfig = {
+      id: "MiniMax-M2.7",
+      name: "MiniMax M2.7",
+      reasoning: false,
+      input: ["text"],
+      cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+      contextWindow: 200_000,
+      maxTokens: 32_000,
+    };
+    const selectedModel: ModelDefinitionConfig = {
+      id: "mimo-v2-flash",
+      name: "MiMo V2 Flash",
+      reasoning: false,
+      input: ["text"],
+      cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+      contextWindow: 1_048_576,
+      maxTokens: 32_000,
+    };
+    providerUsageMock.loadProviderUsageSummary.mockImplementation(async (options) => ({
+      updatedAt: Date.now(),
+      providers:
+        options?.providers?.includes("minimax") === true
+          ? [
+              {
+                provider: "minimax",
+                displayName: "MiniMax",
+                windows: [{ label: "day", usedPercent: 20 }],
+              },
+            ]
+          : [],
+    }));
+
+    const text = await buildStatusText({
+      cfg: {
+        ...baseCfg,
+        models: {
+          providers: {
+            "minimax-portal": {
+              baseUrl: "https://api.minimax.test/v1",
+              models: [fallbackModel],
+            },
+            xiaomi: {
+              baseUrl: "https://api.xiaomi.test/v1",
+              models: [selectedModel],
+            },
+          },
+        },
+      },
+      sessionEntry: {
+        sessionId: "sess-status-legacy-fallback-usage",
+        updatedAt: 0,
+        providerOverride: "xiaomi",
+        modelOverride: "mimo-v2-flash",
+        modelProvider: "minimax-portal",
+        model: "MiniMax-M2.7",
+        fallbackNoticeSelectedModel: "xiaomi/mimo-v2-flash",
+        fallbackNoticeActiveModel: "minimax-portal/MiniMax-M2.7",
+        fallbackNoticeReason: "model not allowed",
+        totalTokens: 49_000,
+        totalTokensFresh: true,
+        contextTokens: 1_048_576,
+      },
+      sessionKey: "agent:main:main",
+      parentSessionKey: "agent:main:main",
+      sessionScope: "per-sender",
+      statusChannel: "mobilechat",
+      provider: "xiaomi",
+      model: "mimo-v2-flash",
+      contextTokens: 1_048_576,
+      resolvedFastMode: false,
+      resolvedVerboseLevel: "off",
+      resolvedReasoningLevel: "off",
+      resolveDefaultThinkingLevel: async () => undefined,
+      isGroup: false,
+      defaultGroupActivation: () => "mention",
+      modelAuthOverride: "api-key",
+      activeModelAuthOverride: "api-key",
+    });
+
+    const normalized = normalizeTestText(text);
+    expect(normalized).toContain("Fallback: minimax-portal/MiniMax-M2.7");
+    expect(normalized).toContain("Context: 49k/200k");
+    expect(normalized).toContain("Usage: day 80% left");
+    expect(providerUsageMock.loadProviderUsageSummary).toHaveBeenCalledWith(
+      expect.objectContaining({ providers: ["minimax"] }),
+    );
+  });
+
   it("shows DeepSeek balance summaries in /status output", async () => {
     providerUsageMock.loadProviderUsageSummary.mockResolvedValue({
       updatedAt: Date.now(),
diff --git a/src/status/status-text.ts b/src/status/status-text.ts
@@ -49,6 +49,7 @@ import {
   formatTaskStatusDetail,
   formatTaskStatusTitle,
 } from "../tasks/task-status.js";
+import { resolveActiveFallbackState } from "./fallback-notice-state.js";
 import { formatCompactPluginHealthLine } from "./status-plugin-health.js";
 import type { BuildStatusTextParams } from "./status-text.types.js";
 
@@ -423,6 +424,12 @@ export async function buildStatusText(params: BuildStatusTextParams): Promise<st
     modelRefs.active.label,
     { config: cfg },
   );
+  const fallbackState = resolveActiveFallbackState({
+    selectedModelRef: modelRefs.selected.label || "unknown",
+    activeModelRef: modelRefs.active.label || "unknown",
+    config: cfg,
+    state: sessionEntry,
+  });
   if (
     shouldPreferActiveRuntimeAliasAuthLabel({
       runtimeAliasModelEquivalent,
@@ -436,6 +443,7 @@ export async function buildStatusText(params: BuildStatusTextParams): Promise<st
   }
   const usageShouldFollowActiveRuntime =
     !modelRefs.activeDiffers ||
+    fallbackState.active ||
     hasSessionAutoModelFallbackProvenance(sessionEntry) ||
     runtimeAliasModelEquivalent;
   const usageAuthLabel = usageShouldFollowActiveRuntime ? activeModelAuth : selectedModelAuth;
