fix(status): restore codex status usage

obviyus · obviyus · commit 7872909709ac · 2026-05-09T16:23:09.000+05:30
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -174,6 +174,7 @@ Docs: https://docs.openclaw.ai
 - Agents/context-engine: share loop-hook checkpoints with the after-turn finalizer so messages are not replayed. Fixes #79630.
 - Codex app-server: keep native hook relays alive for long-running turns so shell and file approvals stay reachable until the configured run window finishes. (#77533) Thanks @rubencu.
 - Gateway/macOS: clear ignored SIGUSR1 restart state, skip redundant package-update restarts when the refreshed LaunchAgent already serves the expected version, and give launchd a 10s throttle plus 20s shutdown window so update restarts do not leave old gateways alive or fight supervisor recovery. Fixes #79577; refs #78699 and #60885. Thanks @BunsDev.
+- Status/Codex: route Codex-harness `openai/*` usage through the OpenAI Codex quota provider and scope CLI status usage to the default agent auth store so `/status` and `openclaw status --usage` show Codex quota windows again. Fixes #79312. Thanks @buhusa.
 - Gateway/agent: pass the session-key agent id into inline image attachment validation so the first image in a fresh per-agent session uses the agent's vision-capable model override instead of the text-only system default. Fixes #79407. Thanks @pandadev66.
 - Gateway/maintenance: prune dedupe overflow against a stable excess count and keep active agent retries from starting duplicate runs after cache eviction. (#73841) Thanks @thesomewhatyou.
 - Control UI/subagents: suppress internal `subagent_announce` handoff prompts from requester transcripts and hide legacy inter-session wrapper rows so completed subagent results no longer surface runtime context in WebChat history. (#79618) Thanks @joshavant.
diff --git a/src/commands/status-runtime-shared.test.ts b/src/commands/status-runtime-shared.test.ts
@@ -102,9 +102,32 @@ describe("status-runtime-shared", () => {
   });
 
   it("resolves usage summaries with the provided timeout", async () => {
-    await resolveStatusUsageSummary(1234);
+    await resolveStatusUsageSummary({
+      timeoutMs: 1234,
+      config: { gateway: {} },
+    });
+
+    expect(mocks.loadProviderUsageSummary).toHaveBeenCalledWith(
+      expect.objectContaining({
+        timeoutMs: 1234,
+        config: { gateway: {} },
+        agentDir: expect.stringContaining("main"),
+      }),
+    );
+  });
 
-    expect(mocks.loadProviderUsageSummary).toHaveBeenCalledWith({ timeoutMs: 1234 });
+  it("resolves usage summaries with explicit agent scope", async () => {
+    await resolveStatusUsageSummary({
+      timeoutMs: 2345,
+      config: { gateway: {} },
+      agentDir: "/tmp/status-agent",
+    });
+
+    expect(mocks.loadProviderUsageSummary).toHaveBeenCalledWith({
+      timeoutMs: 2345,
+      config: { gateway: {} },
+      agentDir: "/tmp/status-agent",
+    });
   });
 
   it("resolves gateway health with the shared probe call shape", async () => {
@@ -205,7 +228,13 @@ describe("status-runtime-shared", () => {
       gatewayService: { label: "LaunchAgent" },
       nodeService: { label: "node" },
     });
-    expect(mocks.loadProviderUsageSummary).toHaveBeenCalledWith({ timeoutMs: 1234 });
+    expect(mocks.loadProviderUsageSummary).toHaveBeenCalledWith(
+      expect.objectContaining({
+        timeoutMs: 1234,
+        config: { gateway: {} },
+        agentDir: expect.stringContaining("main"),
+      }),
+    );
     expect(mocks.callGateway).toHaveBeenNthCalledWith(1, {
       method: "health",
       params: { probe: true },
diff --git a/src/commands/status-runtime-shared.ts b/src/commands/status-runtime-shared.ts
@@ -1,3 +1,4 @@
+import { resolveDefaultAgentDir } from "../agents/agent-scope.js";
 import { resolveReadOnlyChannelPluginsForConfig } from "../channels/plugins/read-only.js";
 import type { OpenClawConfig } from "../config/types.js";
 import type { HeartbeatEventPayload } from "../infra/heartbeat-events.js";
@@ -45,9 +46,19 @@ export async function resolveStatusSecurityAudit(params: {
   });
 }
 
-export async function resolveStatusUsageSummary(timeoutMs?: number) {
+type StatusUsageSummaryOptions = {
+  config: OpenClawConfig;
+  timeoutMs?: number;
+  agentDir?: string;
+};
+
+export async function resolveStatusUsageSummary(params: StatusUsageSummaryOptions) {
   const { loadProviderUsageSummary } = await loadProviderUsage();
-  return await loadProviderUsageSummary({ timeoutMs });
+  return await loadProviderUsageSummary({
+    timeoutMs: params.timeoutMs,
+    config: params.config,
+    agentDir: params.agentDir ?? resolveDefaultAgentDir(params.config),
+  });
 }
 
 export async function loadStatusProviderUsageModule() {
@@ -126,15 +137,20 @@ export async function resolveStatusRuntimeDetails(params: {
   deep?: boolean;
   gatewayReachable: boolean;
   suppressHealthErrors?: boolean;
-  resolveUsage?: (timeoutMs?: number) => Promise<StatusUsageSummary>;
+  resolveUsage?: (input: StatusUsageSummaryOptions) => Promise<StatusUsageSummary>;
   resolveHealth?: (input: {
     config: OpenClawConfig;
     timeoutMs?: number;
   }) => Promise<StatusGatewayHealth>;
 }) {
   const resolveUsageSummary = params.resolveUsage ?? resolveStatusUsageSummary;
   const resolveGatewayHealthSummary = params.resolveHealth ?? resolveStatusGatewayHealth;
-  const usage = params.usage ? await resolveUsageSummary(params.timeoutMs) : undefined;
+  const usage = params.usage
+    ? await resolveUsageSummary({
+        timeoutMs: params.timeoutMs,
+        config: params.config,
+      })
+    : undefined;
   const health = params.deep
     ? params.suppressHealthErrors
       ? await resolveGatewayHealthSummary({
@@ -183,7 +199,7 @@ export async function resolveStatusRuntimeSnapshot(params: {
     config: OpenClawConfig;
     sourceConfig: OpenClawConfig;
   }) => Promise<StatusSecurityAudit>;
-  resolveUsage?: (timeoutMs?: number) => Promise<StatusUsageSummary>;
+  resolveUsage?: (input: StatusUsageSummaryOptions) => Promise<StatusUsageSummary>;
   resolveHealth?: (input: {
     config: OpenClawConfig;
     timeoutMs?: number;
diff --git a/src/commands/status.command.ts b/src/commands/status.command.ts
@@ -177,14 +177,14 @@ export async function statusCommand(
         },
         async () => await resolveStatusSecurityAudit(input),
       ),
-    resolveUsage: async (timeoutMs) =>
+    resolveUsage: async (input) =>
       await withProgress(
         {
           label: "Fetching usage snapshot…",
           indeterminate: true,
           enabled: opts.json !== true,
         },
-        async () => await resolveStatusUsageSummary(timeoutMs),
+        async () => await resolveStatusUsageSummary(input),
       ),
     resolveHealth: async (input) =>
       await withProgress(
diff --git a/src/commands/status.test.ts b/src/commands/status.test.ts
@@ -788,6 +788,10 @@ vi.mock("./status-runtime-shared.ts", () => ({
   ),
 }));
 
+import {
+  resolveStatusRuntimeSnapshot,
+  resolveStatusUsageSummary,
+} from "./status-runtime-shared.ts";
 import { resolvePairingRecoveryContext, statusCommand } from "./status.command.js";
 
 const runtime = {
@@ -1020,6 +1024,37 @@ describe("statusCommand", () => {
     );
   });
 
+  it("scopes usage resolution to the scanned config", async () => {
+    const snapshotMock = resolveStatusRuntimeSnapshot as Mock;
+    const usageMock = resolveStatusUsageSummary as Mock;
+    snapshotMock.mockClear();
+    usageMock.mockClear();
+
+    await statusCommand({ usage: true, timeoutMs: 1234 }, runtime as never);
+
+    const params = snapshotMock.mock.calls.at(-1)?.[0] as
+      | {
+          config: unknown;
+          timeoutMs?: number;
+          usage?: boolean;
+          resolveUsage?: (input: { config: unknown; timeoutMs?: number }) => Promise<unknown>;
+        }
+      | undefined;
+    expect(params).toBeDefined();
+    expect(params).toMatchObject({ usage: true, timeoutMs: 1234 });
+    if (!params?.resolveUsage) {
+      throw new Error("missing status usage resolver");
+    }
+    await params.resolveUsage({
+      timeoutMs: 1234,
+      config: params.config,
+    });
+    expect(usageMock).toHaveBeenCalledWith({
+      timeoutMs: 1234,
+      config: params?.config,
+    });
+  });
+
   it("keeps default text status off the security audit path", async () => {
     await statusCommand({}, runtime as never);
 
diff --git a/src/status/status-text.ts b/src/status/status-text.ts
@@ -152,7 +152,7 @@ async function resolveStatusHarnessId(params: {
   }
 }
 
-function resolveStatusAuthProvider(params: {
+function resolveStatusRuntimeProvider(params: {
   provider: string;
   effectiveHarness?: string;
 }): string {
@@ -167,18 +167,6 @@ function resolveStatusAuthProvider(params: {
   return params.provider;
 }
 
-function resolveStatusUsageProvider(params: {
-  provider: string;
-  effectiveHarness?: string;
-}): string {
-  const harness = normalizeOptionalLowercaseString(params.effectiveHarness);
-  const provider = normalizeOptionalLowercaseString(params.provider);
-  if (harness === "codex" && provider === "openai") {
-    return "openai-codex";
-  }
-  return params.provider;
-}
-
 function formatAgentTaskCountsLine(agentId: string): string | undefined {
   const snapshot = buildTaskStatusSnapshot(listTasksForAgentIdForStatus(agentId));
   if (snapshot.totalCount === 0) {
@@ -241,13 +229,19 @@ export async function buildStatusText(params: BuildStatusTextParams): Promise<st
       sessionKey,
       sessionEntry,
     }));
+  const selectedStatusProvider = resolveStatusRuntimeProvider({
+    provider,
+    effectiveHarness,
+  });
+  const activeProvider = modelRefs.active.provider || provider;
+  const activeStatusProvider = resolveStatusRuntimeProvider({
+    provider: activeProvider,
+    effectiveHarness,
+  });
   const selectedModelAuth = Object.hasOwn(params, "modelAuthOverride")
     ? params.modelAuthOverride
     : resolveModelAuthLabel({
-        provider: resolveStatusAuthProvider({
-          provider,
-          effectiveHarness,
-        }),
+        provider: selectedStatusProvider,
         cfg,
         sessionEntry,
         agentDir: statusAgentDir,
@@ -258,29 +252,17 @@ export async function buildStatusText(params: BuildStatusTextParams): Promise<st
     ? params.activeModelAuthOverride
     : modelRefs.activeDiffers
       ? resolveModelAuthLabel({
-          provider: resolveStatusAuthProvider({
-            provider: modelRefs.active.provider,
-            effectiveHarness,
-          }),
+          provider: activeStatusProvider,
           cfg,
           sessionEntry,
           agentDir: statusAgentDir,
           workspaceDir: statusWorkspaceDir,
           includeExternalProfiles: false,
         })
       : selectedModelAuth;
-  const usageStatusProvider = resolveStatusUsageProvider({
-    provider: modelRefs.active.provider || provider,
-    effectiveHarness,
-  });
   const usageAuthLabel = modelRefs.activeDiffers ? activeModelAuth : selectedModelAuth;
-  const currentUsageProvider = (() => {
-    try {
-      return resolveUsageProviderId(usageStatusProvider);
-    } catch {
-      return undefined;
-    }
-  })();
+  const currentUsageProvider =
+    resolveUsageProviderId(activeStatusProvider) ?? resolveUsageProviderId(activeProvider);
   let usageLine: string | null = null;
   if (
     currentUsageProvider &&
@@ -376,13 +358,9 @@ export async function buildStatusText(params: BuildStatusTextParams): Promise<st
   const explicitThinkingDefault =
     (agentConfig?.thinkingDefault as ThinkLevel | undefined) ??
     (agentDefaults.thinkingDefault as ThinkLevel | undefined);
-  const runtimeContextProvider = resolveStatusAuthProvider({
-    provider: modelRefs.active.provider || provider,
-    effectiveHarness,
-  });
   const runtimeContextTokens = resolveStatusRuntimeContextTokens({
     cfg,
-    provider: runtimeContextProvider,
+    provider: activeStatusProvider,
     model: modelRefs.active.model || model,
   });
   return buildStatusMessage({
