fix(status): use selected model for usage

MonkeyLeeT · MonkeyLeeT · commit 92291111504a · 2026-06-15T08:49:06.000-07:00
diff --git a/src/auto-reply/reply/commands-status.test.ts b/src/auto-reply/reply/commands-status.test.ts
@@ -1192,6 +1192,81 @@ describe("buildStatusReply subagent summary", () => {
     expect(providerUsageCall[0]?.providers).toEqual(["deepseek"]);
   });
 
+  it("uses session-selected usage when a stale runtime snapshot differs", async () => {
+    registerStatusCodexHarness();
+    const usageResetBase = Math.floor(Date.now() / 1000);
+    providerUsageMock.loadProviderUsageSummary.mockImplementation(async (params) => ({
+      updatedAt: Date.now(),
+      providers: params.providers?.includes("deepseek")
+        ? [
+            {
+              provider: "deepseek",
+              displayName: "DeepSeek",
+              windows: [],
+              summary: "Balance ¥22.75",
+            },
+          ]
+        : [
+            {
+              provider: "openai",
+              displayName: "OpenAI",
+              windows: [
+                {
+                  label: "5h",
+                  usedPercent: 9,
+                  resetAt: (usageResetBase + 60 * 60) * 1000,
+                },
+              ],
+            },
+          ],
+    }));
+
+    const text = await buildStatusText({
+      cfg: {
+        ...baseCfg,
+        agents: {
+          defaults: {
+            agentRuntime: { id: "codex" },
+          },
+        },
+      },
+      sessionEntry: {
+        sessionId: "sess-status-selected-openai-stale-deepseek",
+        updatedAt: 0,
+        providerOverride: "openai",
+        modelOverride: "gpt-5.5",
+        modelOverrideSource: "user",
+        modelProvider: "deepseek",
+        model: "deepseek-v4-flash",
+      },
+      sessionKey: "agent:main:main",
+      parentSessionKey: "agent:main:main",
+      sessionScope: "per-sender",
+      statusChannel: "mobilechat",
+      provider: "openai",
+      model: "gpt-5.5",
+      contextTokens: 1_000_000,
+      resolvedFastMode: false,
+      resolvedVerboseLevel: "off",
+      resolvedReasoningLevel: "off",
+      resolveDefaultThinkingLevel: async () => undefined,
+      isGroup: false,
+      defaultGroupActivation: () => "mention",
+      modelAuthOverride: "oauth",
+      activeModelAuthOverride: "api-key",
+    });
+
+    const normalized = normalizeTestText(text);
+    expect(normalized).toContain("Model: openai/gpt-5.5");
+    expect(normalized).toContain("Usage: 5h 91% left");
+    expect(normalized).not.toContain("Balance ¥22.75");
+    const providerUsageCalls = providerUsageMock.loadProviderUsageSummary.mock.calls.map(
+      ([params]) => params?.providers,
+    );
+    expect(providerUsageCalls).toContainEqual(["openai"]);
+    expect(providerUsageCalls).not.toContainEqual(["deepseek"]);
+  });
+
   it("uses Codex OAuth auth labels for explicit OpenAI OpenClaw auth order", async () => {
     await withTempHome(
       async (dir) => {
diff --git a/src/status/status-text.ts b/src/status/status-text.ts
@@ -373,11 +373,22 @@ export async function buildStatusText(params: BuildStatusTextParams): Promise<st
     // labels differ; prefer the active auth label so status matches execution.
     selectedModelAuth = activeModelAuth;
   }
-  const usageAuthLabel = modelRefs.activeDiffers ? activeModelAuth : selectedModelAuth;
+  const hasSessionModelOverride = Boolean(
+    sessionEntry?.providerOverride?.trim() || sessionEntry?.modelOverride?.trim(),
+  );
+  const useSelectedModelUsage =
+    hasSessionModelOverride &&
+    (sessionEntry?.modelOverrideSource === "user" ||
+      (sessionEntry?.modelOverrideSource !== "auto" &&
+        !hasSessionAutoModelFallbackProvenance(sessionEntry)));
+  const usageStatusProvider = useSelectedModelUsage ? selectedStatusProvider : activeStatusProvider;
+  const usageProvider = useSelectedModelUsage ? provider : activeProvider;
+  const usageAuthLabel =
+    modelRefs.activeDiffers && !useSelectedModelUsage ? activeModelAuth : selectedModelAuth;
   const selectedUsageCredentialType = resolveUsageCredentialType(usageAuthLabel);
   const useCodexSyntheticUsage =
     shouldUseCodexSyntheticUsage({
-      provider: activeStatusProvider,
+      provider: usageStatusProvider,
       effectiveHarness,
     }) &&
     (selectedUsageCredentialType === "oauth" || selectedUsageCredentialType === "token");
@@ -390,8 +401,8 @@ export async function buildStatusText(params: BuildStatusTextParams): Promise<st
     : undefined;
   const usageCredentialType = useCodexSyntheticUsage ? "token" : selectedUsageCredentialType;
   const currentUsageProvider =
-    resolveUsageProviderId(activeStatusProvider, { credentialType: usageCredentialType }) ??
-    resolveUsageProviderId(activeProvider, { credentialType: usageCredentialType });
+    resolveUsageProviderId(usageStatusProvider, { credentialType: usageCredentialType }) ??
+    resolveUsageProviderId(usageProvider, { credentialType: usageCredentialType });
   let usageLine: string | null = null;
   if (
     currentUsageProvider &&
