fix(usage): resolve Z.ai window assignment using limit IDs

Z.ai assigns both token and request limits the same generic "quota"
window ID, so findWindowLimits fell through to array-order fallback.
This caused the two bars to swap depending on API response order.

Add limit-ID-based matching (zai:tokens → current, zai:requests → week)
as a secondary tier after window-ID matching.

AGENTS.md

@@ -6,19 +6,21 @@
 
 ## Layout
 
-- `index.ts` — Extension entrypoint, footer registration, refresh timers, slash command, auth lookup.
+- `index.ts` — Extension entrypoint, footer registration, refresh timers, debounced rendering, slash command, auth lookup.
 - `config.ts` — User-facing layout/config. Prefer changing this for layout tweaks.
 - `types.ts` — Shared config/module/state types.
 - `render.ts` — Width allocation, ANSI-aware truncation, dim text rendering.
+- `utils.ts` — Shared utility helpers (`isRecord`, `toNumber`).
+- `usage.ts` — Provider-agnostic usage type definitions (report, limit, credential, etc.).
 - `modules/basic.ts` — Directory, context, model, thinking, and cost modules.
 - `modules/usage.ts` — Usage bars/text modules and color gradient rendering.
 - `usage/` — Provider usage fetchers adapted from `oh-my-pi`: https://github.com/can1357/oh-my-pi/tree/main/packages/ai/src/usage
-- `providers/openai-codex/constants.ts`, `usage.ts`, `utils.ts` — Local shims/support for copied usage code.
+- `providers/openai-codex/constants.ts` — OpenAI Codex base URL constant.
 
 ## Conventions
 
 - Keep user layout changes in `config.ts` when possible.
-- Preserve copied provider logic in `usage/` unless fixing integration issues.
+- **Do NOT modify files in `usage/` or `providers/` without explicit user approval.** These contain copied upstream provider logic. Always ask before changing them.
 - Use composable module config instead of subtype strings. For usage, prefer:
 
 ```ts
@@ -26,14 +28,15 @@
 { type: "usage", window: "week", style: "text", parts: ["percent", "time"], separator: " | " }
 ```
 
-- Usage fallback behavior should be stable/no-pop-in:
+- Usage data is preserved during refresh (no clearing before fetch) to prevent pop-in:
-  - unknown/loading line bars render like 0% usage
+  - Old data stays visible until new data arrives.
-  - unknown/loading percent renders `0%`
+  - When no data exists yet: line bars render like 0% usage, percent renders `0%`, time renders `∞`.
-  - unknown/loading time renders `∞`
 - Usage bar colors are a continuous green → yellow → red gradient derived from usage percentage, not hard thresholds.
 - Rendering must remain ANSI-aware. If adding colors, update `visibleWidth`/`truncate` behavior as needed.
 - Text modules and separators should remain dim; filled usage bars may use gradient color.
 - Thinking level comes from `pi.getThinkingLevel()` and `thinking_level_select`, not `ctx.thinkingLevel`.
+- `rerender()` is debounced via `queueMicrotask` — multiple rapid calls coalesce into a single render pass.
+- All providers use the same refresh interval (`REFRESH_MS`).
 
 ## Testing
 

index.ts

@@ -1,7 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import { AuthStorage, type AuthCredential, type ExtensionAPI, type ExtensionContext, type ExtensionCommandContext, type ReadonlyFooterDataProvider, type SessionStartEvent, type SessionShutdownEvent, type AgentEndEvent } from "@mariozechner/pi-coding-agent";
-import { readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
 import { statusbarConfig } from "./config";
 import { contextModule, costModule, directoryModule, modelModule, thinkingModule } from "./modules/basic";
 import { usageModule } from "./modules/usage";
@@ -12,9 +9,7 @@ import { zaiUsageProvider } from "./usage/zai";
 import type { ModuleContext, ModuleSpec, RenderedModule, StatusbarState } from "./types";
 import type { Provider, UsageCredential, UsageProvider, UsageReport } from "./usage";
 
-const AUTH_PATH = join(homedir(), ".pi", "agent", "auth.json");
 const REFRESH_MS = 60_000;
-const ANTHROPIC_REFRESH_MS = 15 * 60_000;
 
 const usageProviders: Record<Provider, UsageProvider> = {
   "openai-codex": openaiCodexUsageProvider,
@@ -26,42 +21,55 @@ function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
-function activeProvider(ctx: any): Provider | undefined {
+function activeProvider(ctx: ExtensionContext): Provider | undefined {
   const provider = ctx.model?.provider as string | undefined;
   if (provider === "openai-codex" || provider === "zai" || provider === "anthropic") return provider;
   return undefined;
 }
 
-function readPiCredential(provider: Provider): UsageCredential | undefined {
+function credentialString(raw: unknown, key: string): string | undefined {
-  try {
+  return isRecord(raw) && typeof raw[key] === "string" ? raw[key] : undefined;
-    const auth = JSON.parse(readFileSync(AUTH_PATH, "utf8"));
+}
-    if (!isRecord(auth) || !isRecord(auth[provider])) return undefined;
 
-    const raw = auth[provider];
+function buildUsageCredential(raw: AuthCredential | undefined, apiKey: string): UsageCredential {
-    if (raw.type === "oauth") {
+  if (raw?.type === "oauth") {
     return {
       type: "oauth",
-        accessToken: typeof raw.access === "string" ? raw.access : undefined,
+      accessToken: apiKey,
-        refreshToken: typeof raw.refresh === "string" ? raw.refresh : undefined,
+      refreshToken: raw.refresh,
-        expiresAt: typeof raw.expires === "number" ? raw.expires : undefined,
+      expiresAt: raw.expires,
-        accountId: typeof raw.accountId === "string" ? raw.accountId : undefined,
+      accountId: credentialString(raw, "accountId"),
-        email: typeof raw.email === "string" ? raw.email : undefined,
+      email: credentialString(raw, "email"),
       metadata: raw,
     };
   }
 
-    if (raw.type === "api_key") {
   return {
     type: "api_key",
-        apiKey: typeof raw.key === "string" ? raw.key : undefined,
+    apiKey,
-        accountId: typeof raw.accountId === "string" ? raw.accountId : undefined,
+    accountId: credentialString(raw, "accountId"),
-        email: typeof raw.email === "string" ? raw.email : undefined,
+    email: credentialString(raw, "email"),
     metadata: raw,
   };
 }
-  } catch {}
 
-  return undefined;
+async function readPiCredential(authStorage: AuthStorage, provider: Provider): Promise<UsageCredential | undefined> {
+  authStorage.reload();
+  const apiKey = await authStorage.getApiKey(provider);
+  if (!apiKey) return undefined;
+  return buildUsageCredential(authStorage.get(provider), apiKey);
+}
+
+async function forceRefreshPiCredential(authStorage: AuthStorage, provider: Provider): Promise<UsageCredential> {
+  authStorage.reload();
+  const raw = authStorage.get(provider);
+  const oauthProvider = authStorage.getOAuthProviders().find(candidate => candidate.id === provider);
+  if (raw?.type !== "oauth" || !oauthProvider) throw new Error("login expired");
+
+  // Refresh Provider OAuth Token
+  const refreshed = await oauthProvider.refreshToken(raw);
+  authStorage.set(provider, { type: "oauth", ...refreshed });
+  return buildUsageCredential(authStorage.get(provider), oauthProvider.getApiKey(refreshed));
 }
 
 function renderModule(moduleCtx: ModuleContext, spec: ModuleSpec): RenderedModule {
@@ -83,7 +91,7 @@ function renderModule(moduleCtx: ModuleContext, spec: ModuleSpec): RenderedModul
   }
 }
 
-function renderFooter(ctx: any, footerData: any, state: StatusbarState, width: number, theme?: any): string[] {
+function renderFooter(ctx: ExtensionContext, footerData: ReadonlyFooterDataProvider, state: StatusbarState, width: number, theme?: any): string[] {
   const moduleCtx: ModuleContext = { ctx, footerData, state, config: statusbarConfig };
   return statusbarConfig.rows.map(row => renderRow({
     left: (row.left ?? []).map(spec => renderModule(moduleCtx, spec)),
@@ -102,9 +110,10 @@ export default function piStatusbarExtension(pi: ExtensionAPI) {
   let timer: ReturnType<typeof setInterval> | undefined;
   let inFlight: AbortController | undefined;
   let lastProvider: Provider | undefined;
-  let latestCtx: any;
+  let latestCtx: ExtensionContext | undefined;
   let requestRender: (() => void) | undefined;
   const statusbarState: StatusbarState = {};
+  const authStorage = AuthStorage.create();
 
   function updateThinkingLevel() {
     try {
@@ -114,13 +123,22 @@ export default function piStatusbarExtension(pi: ExtensionAPI) {
     }
   }
 
-  function rerender(ctx: any) {
+  let rerenderScheduled = false;
+  function rerender(ctx: ExtensionContext) {
     latestCtx = ctx;
+    if (rerenderScheduled) return;
+    rerenderScheduled = true;
+
+    // Debounce Render - Coalesce rapid rerender calls into a single pass.
+    queueMicrotask(() => {
+      rerenderScheduled = false;
       requestRender?.();
-    if (ctx.hasUI) ctx.ui.setStatus("pi-statusbar", undefined);
+      const current = latestCtx;
+      if (current?.hasUI) current.ui.setStatus("pi-statusbar", undefined);
+    });
   }
 
-  function installFooter(ctx: any) {
+  function installFooter(ctx: ExtensionContext) {
     if (!ctx.hasUI) return;
     latestCtx = ctx;
     ctx.ui.setFooter((tui: any, theme: any, footerData: any) => {
@@ -137,7 +155,7 @@ export default function piStatusbarExtension(pi: ExtensionAPI) {
     });
   }
 
-  async function refresh(ctx: any, force = false) {
+  async function refresh(ctx: ExtensionContext, force = false) {
     latestCtx = ctx;
     const provider = activeProvider(ctx);
     lastProvider = provider;
@@ -148,13 +166,13 @@ export default function piStatusbarExtension(pi: ExtensionAPI) {
       return;
     }
 
-    const minRefreshMs = provider === "anthropic" ? ANTHROPIC_REFRESH_MS : REFRESH_MS;
+    const minRefreshMs = REFRESH_MS;
     if (!force && statusbarState.report?.provider === provider && Date.now() - statusbarState.report.fetchedAt < minRefreshMs) {
       rerender(ctx);
       return;
     }
 
-    const credential = readPiCredential(provider);
+    const credential = await readPiCredential(authStorage, provider);
     if (!credential) {
       statusbarState.report = { provider, fetchedAt: Date.now(), limits: [] };
       statusbarState.error = "not logged in";
@@ -163,25 +181,34 @@ export default function piStatusbarExtension(pi: ExtensionAPI) {
     }
 
     inFlight?.abort();
-    inFlight = new AbortController();
+    const controller = new AbortController();
-    statusbarState.report = undefined;
+    inFlight = controller;
-    statusbarState.error = undefined;
-    rerender(ctx);
 
     try {
-      const report = await usageProviders[provider].fetchUsage({
+      let activeCredential = credential;
-        provider,
+      const usageCtx = {
-        credential,
-        baseUrl: ctx.model?.baseUrl,
-        signal: inFlight.signal,
-      }, {
         fetch: globalThis.fetch.bind(globalThis),
         logger: {
           debug: () => undefined,
           warn: () => undefined,
         },
+      };
+      const fetchParams = () => ({
+        provider,
+        credential: activeCredential,
+        baseUrl: ctx.model?.baseUrl,
+        signal: controller.signal,
       });
 
+      let report: UsageReport | null;
+      try {
+        report = await usageProviders[provider].fetchUsage(fetchParams(), usageCtx);
+      } catch (error) {
+        if (!(error instanceof Error) || error.message !== "unauthorized") throw error;
+        activeCredential = await forceRefreshPiCredential(authStorage, provider);
+        report = await usageProviders[provider].fetchUsage(fetchParams(), usageCtx);
+      }
+
       statusbarState.report = report ?? { provider, fetchedAt: Date.now(), limits: [] };
       statusbarState.error = report ? undefined : "unavailable";
     } catch (error) {
@@ -192,7 +219,7 @@ export default function piStatusbarExtension(pi: ExtensionAPI) {
     if (lastProvider === provider) rerender(ctx);
   }
 
-  pi.on("session_start", async (_event, ctx) => {
+  pi.on("session_start", async (_event: SessionStartEvent, ctx: ExtensionContext) => {
     updateThinkingLevel();
     installFooter(ctx);
     await refresh(ctx, true);
@@ -201,7 +228,7 @@ export default function piStatusbarExtension(pi: ExtensionAPI) {
     timer = setInterval(() => void refresh(latestCtx ?? ctx), REFRESH_MS);
   });
 
-  pi.on("session_shutdown", async (_event, ctx) => {
+  pi.on("session_shutdown", async (_event: SessionShutdownEvent, ctx: ExtensionContext) => {
     if (timer) clearInterval(timer);
     timer = undefined;
     inFlight?.abort();
@@ -223,14 +250,14 @@ export default function piStatusbarExtension(pi: ExtensionAPI) {
     rerender(ctx);
   });
 
-  pi.on("agent_end", async (_event, ctx) => {
+  pi.on("agent_end", async (_event: AgentEndEvent, ctx: ExtensionContext) => {
     updateThinkingLevel();
     await refresh(ctx);
   });
 
   pi.registerCommand("refresh-usage", {
     description: "Refresh account usage for the active provider",
-    handler: async (_args, ctx) => {
+    handler: async (_args: string, ctx: ExtensionCommandContext) => {
       await refresh(ctx, true);
       ctx.ui.notify(usageSummary(statusbarState.report, statusbarState.error), statusbarState.error ? "warning" : "info");
     },

modules/usage.ts

@@ -14,7 +14,7 @@ function duration(valueMs: number | undefined): string | undefined {
   const ms = Math.max(0, valueMs);
   const days = Math.floor(ms / 86_400_000);
   const hours = Math.floor((ms % 86_400_000) / 3_600_000);
-  const minutes = Math.round((ms % 3_600_000) / 60_000);
+  const minutes = Math.floor((ms % 3_600_000) / 60_000);
   if (days > 0) return `${days}d${hours}h`;
   if (hours > 0) return `${hours}h${minutes}m`;
   return `${minutes}m`;
@@ -60,8 +60,18 @@ function usageColor(fraction: number): { r: number; g: number; b: number } {
 
 function findWindowLimits(report: UsageReport): UsageWindows {
   const windowId = (limit: UsageLimit) => (limit.window?.id ?? limit.scope.windowId ?? "").toLowerCase();
-  const current = report.limits.find(limit => ["5h", "primary"].includes(windowId(limit))) ?? report.limits[0];
+  const limitId = (limit: UsageLimit) => (limit.id ?? "").toLowerCase();
-  const week = report.limits.find(limit => ["7d", "secondary"].includes(windowId(limit))) ?? report.limits.find(limit => limit !== current);
+
+  // Match by Window ID
+  const currentByWindow = report.limits.find(limit => ["5h", "primary"].includes(windowId(limit)));
+  const weekByWindow = report.limits.find(limit => ["7d", "secondary"].includes(windowId(limit)));
+
+  // Match by Limit ID (Z.ai Uses Generic "quota" Window IDs for Both Limits)
+  const currentByLimit = report.limits.find(limit => ["zai:tokens"].includes(limitId(limit)));
+  const weekByLimit = report.limits.find(limit => ["zai:requests"].includes(limitId(limit)));
+
+  const current = currentByWindow ?? currentByLimit ?? report.limits[0];
+  const week = weekByWindow ?? weekByLimit ?? report.limits.find(limit => limit !== current);
   return { current, week };
 }
 

render.ts

@@ -2,6 +2,7 @@ import type { ModuleSpec, RenderedModule } from "./types";
 
 // eslint-disable-next-line no-control-regex
 const ANSI_RE = new RegExp("\\u001b\\[[0-9;]*m", "g");
+const ANSI_PREFIX_RE = /^\u001b\[[0-9;]*m/;
 
 export function visibleWidth(text: string): number {
   return text.replace(ANSI_RE, "").length;
@@ -16,8 +17,7 @@ export function truncate(text: string, width: number): string {
   let count = 0;
   for (let index = 0; index < text.length && count < width; index++) {
     if (text[index] === "\x1b") {
-      // eslint-disable-next-line no-control-regex
+      const match = text.slice(index).match(ANSI_PREFIX_RE);
-      const match = text.slice(index).match(new RegExp("^\\u001b\\[[0-9;]*m"));
       if (match) {
         output += match[0];
         index += match[0].length - 1;
@@ -34,10 +34,33 @@ export function joinText(parts: string[], separator: string): string {
   return parts.filter(Boolean).join(` ${separator} `);
 }
 
+// ANSI-Aware Slice - Extract a substring by visible character positions,
+// preserving ANSI escape codes that precede visible characters.
+function ansiSlice(text: string, start: number, end: number): string {
+  let output = "";
+  let visible = 0;
+  for (let i = 0; i < text.length; i++) {
+    if (text[i] === "\x1b") {
+      const match = text.slice(i).match(ANSI_PREFIX_RE);
+      if (match) {
+        if (visible >= start && visible < end) output += match[0];
+        i += match[0].length - 1;
+        continue;
+      }
+    }
+    if (visible >= start && visible < end) output += text[i];
+    visible++;
+    if (visible >= end) break;
+  }
+  return output;
+}
+
 export function overlay(base: string, text: string): string {
-  if (visibleWidth(text) >= visibleWidth(base)) return truncate(text, visibleWidth(base));
+  const baseWidth = visibleWidth(base);
-  const start = Math.max(0, Math.floor((visibleWidth(base) - visibleWidth(text)) / 2));
+  const textWidth = visibleWidth(text);
-  return `${base.slice(0, start)}${text}${base.slice(start + visibleWidth(text))}`;
+  if (textWidth >= baseWidth) return truncate(text, baseWidth);
+  const start = Math.max(0, Math.floor((baseWidth - textWidth) / 2));
+  return `${ansiSlice(base, 0, start)}${text}${ansiSlice(base, start + textWidth, baseWidth)}`;
 }
 
 function dimText(text: string, theme?: any): string {

types.ts

@@ -1,3 +1,4 @@
+import type { ExtensionContext, ReadonlyFooterDataProvider } from "@mariozechner/pi-coding-agent";
 import type { UsageLimit, UsageReport } from "./usage";
 
 export type ModuleName = "directory" | "context" | "model" | "thinking" | "cost" | "usage";
@@ -40,8 +41,8 @@ export interface StatusbarState {
 }
 
 export interface ModuleContext {
-  ctx: any;
+  ctx: ExtensionContext;
-  footerData: any;
+  footerData: ReadonlyFooterDataProvider;
   state: StatusbarState;
   config: StatusbarConfig;
 }

usage/claude.ts

@@ -78,19 +78,27 @@ function parseIsoTime(value: string | undefined): number | undefined {
 function parseBucket(bucket: unknown): ParsedUsageBucket | undefined {
   if (!isRecord(bucket)) return undefined;
   const utilization = toNumber(bucket.utilization);
-	const resetsAt = parseIsoTime(typeof bucket.resets_at === "string" ? bucket.resets_at : undefined);
+  const resetsAt = parseIsoTime(
+    typeof bucket.resets_at === "string" ? bucket.resets_at : undefined,
+  );
   if (utilization === undefined && resetsAt === undefined) {
     return undefined;
   }
   return { utilization, resetsAt };
 }
 
-function getPayloadString(payload: Record<string, unknown>, key: string): string | undefined {
+function getPayloadString(
+  payload: Record<string, unknown>,
+  key: string,
+): string | undefined {
   const value = payload[key];
   return typeof value === "string" && value.trim() ? value.trim() : undefined;
 }
 
-function extractUsageIdentity(payload: ClaudeUsageResponse, orgId?: string): { accountId?: string; email?: string } {
+function extractUsageIdentity(
+  payload: ClaudeUsageResponse,
+  orgId?: string,
+): { accountId?: string; email?: string } {
   if (!isRecord(payload)) return { accountId: orgId };
   const accountId =
     getPayloadString(payload, "account_id") ??
@@ -108,7 +116,12 @@ function extractUsageIdentity(payload: ClaudeUsageResponse, orgId?: string): { a
 }
 
 function hasUsageData(payload: ClaudeUsageResponse): boolean {
-	return Boolean(payload.five_hour || payload.seven_day || payload.seven_day_opus || payload.seven_day_sonnet);
+  return Boolean(
+    payload.five_hour ||
+      payload.seven_day ||
+      payload.seven_day_opus ||
+      payload.seven_day_sonnet,
+  );
 }
 
 async function fetchUsagePayload(
@@ -123,12 +136,16 @@ async function fetchUsagePayload(
     try {
       const response = await ctx.fetch(url, { headers, signal });
       if (!response.ok) {
-				ctx.logger?.warn("Claude usage fetch failed", { status: response.status, statusText: response.statusText });
+        ctx.logger?.warn("Claude usage fetch failed", {
+          status: response.status,
+          statusText: response.statusText,
+        });
         return null;
       }
       const payload = (await response.json()) as ClaudeUsageResponse;
       lastPayload = payload;
-			const orgId = response.headers.get("anthropic-organization-id")?.trim() || undefined;
+      const orgId =
+        response.headers.get("anthropic-organization-id")?.trim() || undefined;
       lastOrgId = orgId ?? lastOrgId;
       if (payload && isRecord(payload) && hasUsageData(payload)) {
         return { payload, orgId };
@@ -139,7 +156,9 @@ async function fetchUsagePayload(
     }
 
     if (attempt < MAX_RETRIES - 1) {
-			await new Promise(resolve => setTimeout(resolve, BASE_RETRY_DELAY_MS * 2 ** attempt));
+      await new Promise((resolve) =>
+        setTimeout(resolve, BASE_RETRY_DELAY_MS * 2 ** attempt),
+      );
     }
   }
 
@@ -181,7 +200,9 @@ async function resolveEmail(
   return profile?.account?.email;
 }
 
-function buildUsageAmount(utilization: number | undefined): UsageAmount | undefined {
+function buildUsageAmount(
+  utilization: number | undefined,
+): UsageAmount | undefined {
   if (utilization === undefined) return undefined;
   const clamped = Math.min(Math.max(utilization, 0), 100);
   const usedFraction = clamped / 100;
@@ -195,7 +216,9 @@ function buildUsageAmount(utilization: number | undefined): UsageAmount | undefi
   };
 }
 
-function buildUsageStatus(usedFraction: number | undefined): UsageStatus | undefined {
+function buildUsageStatus(
+  usedFraction: number | undefined,
+): UsageStatus | undefined {
   if (usedFraction === undefined) return undefined;
   if (usedFraction >= 1) return "exhausted";
   if (usedFraction >= 0.9) return "warning";
@@ -220,7 +243,9 @@ function buildUsageLimit(args: {
     id: args.windowId,
     label: args.windowLabel,
     durationMs: args.durationMs,
-		...(args.bucket.resetsAt !== undefined ? { resetsAt: args.bucket.resetsAt } : {}),
+    ...(args.bucket.resetsAt !== undefined
+      ? { resetsAt: args.bucket.resetsAt }
+      : {}),
   };
   return {
     id: args.id,
@@ -237,7 +262,10 @@ function buildUsageLimit(args: {
   };
 }
 
-async function fetchClaudeUsage(params: UsageFetchParams, ctx: UsageFetchContext): Promise<UsageReport | null> {
+async function fetchClaudeUsage(
+  params: UsageFetchParams,
+  ctx: UsageFetchContext,
+): Promise<UsageReport | null> {
   if (params.provider !== "anthropic") return null;
   const credential = params.credential;
   if (credential.type !== "oauth" || !credential.accessToken) return null;
@@ -249,7 +277,12 @@ async function fetchClaudeUsage(params: UsageFetchParams, ctx: UsageFetchContext
     authorization: `Bearer ${credential.accessToken}`,
   };
 
-	const payloadResult = await fetchUsagePayload(url, headers, ctx, params.signal);
+  const payloadResult = await fetchUsagePayload(
+    url,
+    headers,
+    ctx,
+    params.signal,
+  );
   if (!payloadResult || !isRecord(payloadResult.payload)) return null;
   const { payload, orgId } = payloadResult;
 
@@ -304,7 +337,8 @@ async function fetchClaudeUsage(params: UsageFetchParams, ctx: UsageFetchContext
   if (limits.length === 0) return null;
   const identity = extractUsageIdentity(payload, orgId);
   const accountId = identity.accountId ?? credential.accountId;
-	const email = identity.email ?? (await resolveEmail(params, ctx, baseUrl, headers));
+  const email =
+    identity.email ?? (await resolveEmail(params, ctx, baseUrl, headers));
 
   const report: UsageReport = {
     provider: params.provider,
@@ -324,14 +358,18 @@ async function fetchClaudeUsage(params: UsageFetchParams, ctx: UsageFetchContext
 export const claudeUsageProvider: UsageProvider = {
   id: "anthropic",
   fetchUsage: fetchClaudeUsage,
-	supports: params => params.provider === "anthropic" && params.credential.type === "oauth",
+  supports: (params) =>
+    params.provider === "anthropic" && params.credential.type === "oauth",
 };
 
 export const claudeRankingStrategy: CredentialRankingStrategy = {
   findWindowLimits(report) {
-		const primary = report.limits.find(l => l.id === "anthropic:5h");
+    const primary = report.limits.find((l) => l.id === "anthropic:5h");
-		const secondary = report.limits.find(l => l.id === "anthropic:7d");
+    const secondary = report.limits.find((l) => l.id === "anthropic:7d");
     return { primary, secondary };
   },
-	windowDefaults: { primaryMs: 5 * 60 * 60 * 1000, secondaryMs: 7 * 24 * 60 * 60 * 1000 },
+  windowDefaults: {
+    primaryMs: 5 * 60 * 60 * 1000,
+    secondaryMs: 7 * 24 * 60 * 60 * 1000,
+  },
 };

usage/openai-codex.ts

@@ -10,8 +10,7 @@ import type {
   UsageReport,
   UsageWindow,
 } from "../usage";
-import { isRecord } from "../utils";
+import { isRecord, toNumber } from "../utils";
-import { toNumber } from "./shared";
 
 const CODEX_USAGE_PATH = "wham/usage";
 const JWT_AUTH_CLAIM = "https://api.openai.com/auth";
@@ -126,8 +125,11 @@ function parseUsageWindow(payload: unknown): ParsedUsageWindow | undefined {
 
 function parseUsagePayload(payload: unknown): ParsedUsage | null {
   if (!isRecord(payload)) return null;
-	const planType = typeof payload.plan_type === "string" ? payload.plan_type : undefined;
+  const planType =
-	const rateLimit = isRecord(payload.rate_limit) ? payload.rate_limit : undefined;
+    typeof payload.plan_type === "string" ? payload.plan_type : undefined;
+  const rateLimit = isRecord(payload.rate_limit)
+    ? payload.rate_limit
+    : undefined;
   if (!rateLimit) return null;
   const parsed: ParsedUsage = {
     planType,
@@ -137,7 +139,12 @@ function parseUsagePayload(payload: unknown): ParsedUsage | null {
     secondary: parseUsageWindow(rateLimit.secondary_window),
     raw: payload as CodexUsagePayload,
   };
-	if (!parsed.primary && !parsed.secondary && parsed.allowed === undefined && parsed.limitReached === undefined) {
+  if (
+    !parsed.primary &&
+    !parsed.secondary &&
+    parsed.allowed === undefined &&
+    parsed.limitReached === undefined
+  ) {
     return null;
   }
   return parsed;
@@ -149,7 +156,8 @@ function normalizeCodexBaseUrl(baseUrl?: string): string {
   const base = trimmed.replace(/\/+$/, "");
   const lower = base.toLowerCase();
   if (
-		(lower.startsWith("https://chatgpt.com") || lower.startsWith("https://chat.openai.com")) &&
+    (lower.startsWith("https://chatgpt.com") ||
+      lower.startsWith("https://chat.openai.com")) &&
     !lower.includes("/backend-api")
   ) {
     return `${base}/backend-api`;
@@ -178,7 +186,10 @@ function buildWindowLabel(seconds: number): { id: string; label: string } {
   return { id: `${hours}h`, label: formatWindowLabel(hours, "hour") };
 }
 
-function resolveResetTime(window: ParsedUsageWindow, nowMs: number): number | undefined {
+function resolveResetTime(
+  window: ParsedUsageWindow,
+  nowMs: number,
+): number | undefined {
   const resetAt = window.resetAt;
   if (resetAt !== undefined) {
     const resetAtMs = resetAt > 1_000_000_000_000 ? resetAt : resetAt * 1000;
@@ -190,15 +201,29 @@ function resolveResetTime(window: ParsedUsageWindow, nowMs: number): number | un
   return undefined;
 }
 
-function buildUsageWindow(window: ParsedUsageWindow, key: string, nowMs: number): UsageWindow {
+function buildUsageWindow(
+  window: ParsedUsageWindow,
+  key: string,
+  nowMs: number,
+): UsageWindow {
   const resetsAt = resolveResetTime(window, nowMs);
   if (window.limitWindowSeconds !== undefined) {
     const { id, label } = buildWindowLabel(window.limitWindowSeconds);
     const durationMs = window.limitWindowSeconds * 1000;
-		return { id, label, durationMs, ...(resetsAt !== undefined ? { resetsAt } : {}) };
+    return {
+      id,
+      label,
+      durationMs,
+      ...(resetsAt !== undefined ? { resetsAt } : {}),
+    };
   }
-	const fallbackLabel = key === "primary" ? "Primary window" : "Secondary window";
+  const fallbackLabel =
-	return { id: key, label: fallbackLabel, ...(resetsAt !== undefined ? { resetsAt } : {}) };
+    key === "primary" ? "Primary window" : "Secondary window";
+  return {
+    id: key,
+    label: fallbackLabel,
+    ...(resetsAt !== undefined ? { resetsAt } : {}),
+  };
 }
 
 function buildUsageAmount(window: ParsedUsageWindow): UsageAmount {
@@ -218,7 +243,10 @@ function buildUsageAmount(window: ParsedUsageWindow): UsageAmount {
   };
 }
 
-function buildUsageStatus(usedFraction?: number, limitReached?: boolean): UsageLimit["status"] {
+function buildUsageStatus(
+  usedFraction?: number,
+  limitReached?: boolean,
+): UsageLimit["status"] {
   if (limitReached) return "exhausted";
   if (usedFraction === undefined) return "unknown";
   if (usedFraction >= 1) return "exhausted";
@@ -255,9 +283,14 @@ function buildUsageLimit(args: {
 export const openaiCodexUsageProvider: UsageProvider = {
   id: "openai-codex",
   supports(params: UsageFetchParams): boolean {
-		return params.provider === "openai-codex" && params.credential.type === "oauth";
+    return (
+      params.provider === "openai-codex" && params.credential.type === "oauth"
+    );
   },
-	async fetchUsage(params: UsageFetchParams, ctx: UsageFetchContext): Promise<UsageReport | null> {
+  async fetchUsage(
+    params: UsageFetchParams,
+    ctx: UsageFetchContext,
+  ): Promise<UsageReport | null> {
     if (params.provider !== "openai-codex") return null;
     const { credential } = params;
     if (credential.type !== "oauth") return null;
@@ -267,7 +300,9 @@ export const openaiCodexUsageProvider: UsageProvider = {
 
     const nowMs = Date.now();
     if (credential.expiresAt !== undefined && credential.expiresAt <= nowMs) {
-			ctx.logger?.warn("Codex usage token expired", { provider: params.provider });
+      ctx.logger?.warn("Codex usage token expired", {
+        provider: params.provider,
+      });
       return null;
     }
 
@@ -288,19 +323,27 @@ export const openaiCodexUsageProvider: UsageProvider = {
     try {
       const response = await ctx.fetch(url, { headers, signal: params.signal });
       if (!response.ok) {
-				ctx.logger?.warn("Codex usage request failed", { status: response.status, provider: params.provider });
+        ctx.logger?.warn("Codex usage request failed", {
+          status: response.status,
+          provider: params.provider,
+        });
         return null;
       }
       payload = await response.json();
     } catch (error) {
-			ctx.logger?.warn("Codex usage request error", { provider: params.provider, error: String(error) });
+      ctx.logger?.warn("Codex usage request error", {
+        provider: params.provider,
+        error: String(error),
+      });
       return null;
     }
 
     const parsed = parseUsagePayload(payload);
     const planType =
       parsed?.planType ??
-			(isRecord(payload) && typeof payload.plan_type === "string" ? payload.plan_type : undefined);
+      (isRecord(payload) && typeof payload.plan_type === "string"
+        ? payload.plan_type
+        : undefined);
 
     const limits: UsageLimit[] = [];
     if (parsed?.primary) {
@@ -350,17 +393,24 @@ const FIVE_HOUR_MS = 5 * 60 * 60 * 1000;
 
 export const codexRankingStrategy: CredentialRankingStrategy = {
   findWindowLimits(report) {
-		const findLimit = (key: "primary" | "secondary"): UsageLimit | undefined => {
+    const findLimit = (
-			const direct = report.limits.find(l => l.id === `openai-codex:${key}`);
+      key: "primary" | "secondary",
+    ): UsageLimit | undefined => {
+      const direct = report.limits.find((l) => l.id === `openai-codex:${key}`);
       if (direct) return direct;
-			const byId = report.limits.find(l => l.id.toLowerCase().includes(key));
+      const byId = report.limits.find((l) => l.id.toLowerCase().includes(key));
       if (byId) return byId;
       const windowId = key === "secondary" ? "7d" : "1h";
-			return report.limits.find(l => l.scope.windowId?.toLowerCase() === windowId);
+      return report.limits.find(
+        (l) => l.scope.windowId?.toLowerCase() === windowId,
+      );
     };
     return { primary: findLimit("primary"), secondary: findLimit("secondary") };
   },
-	windowDefaults: { primaryMs: 60 * 60 * 1000, secondaryMs: 7 * 24 * 60 * 60 * 1000 },
+  windowDefaults: {
+    primaryMs: 60 * 60 * 1000,
+    secondaryMs: 7 * 24 * 60 * 60 * 1000,
+  },
   hasPriorityBoost(primary) {
     if (!primary) return false;
     const windowId = primary.scope.windowId?.toLowerCase();
@@ -372,6 +422,10 @@ export const codexRankingStrategy: CredentialRankingStrategy = {
         Math.abs(durationMs - FIVE_HOUR_MS) <= 60_000);
     if (!isFiveHourWindow) return false;
     const usedFraction = primary.amount.usedFraction;
-		return typeof usedFraction === "number" && Number.isFinite(usedFraction) && usedFraction === 0;
+    return (
+      typeof usedFraction === "number" &&
+      Number.isFinite(usedFraction) &&
+      usedFraction === 0
+    );
   },
 };

usage/shared.ts

@@ -1,10 +0,0 @@
-export const toNumber = (value: unknown): number | undefined => {
-	if (typeof value === "number" && Number.isFinite(value)) return value;
-	if (typeof value === "string") {
-		const trimmed = value.trim();
-		if (!trimmed) return undefined;
-		const parsed = Number(trimmed);
-		if (Number.isFinite(parsed)) return parsed;
-	}
-	return undefined;
-};

usage/zai.ts

@@ -75,7 +75,8 @@ function buildUsageAmount(args: {
       : args.used !== undefined && args.limit !== undefined && args.limit > 0
         ? Math.min(args.used / args.limit, 1)
         : undefined;
-	const remainingFraction = usedFraction !== undefined ? Math.max(1 - usedFraction, 0) : undefined;
+  const remainingFraction =
+    usedFraction !== undefined ? Math.max(1 - usedFraction, 0) : undefined;
   return {
     used: args.used,
     limit: args.limit,
@@ -86,7 +87,9 @@ function buildUsageAmount(args: {
   };
 }
 
-function getUsageStatus(usedFraction: number | undefined): UsageStatus | undefined {
+function getUsageStatus(
+  usedFraction: number | undefined,
+): UsageStatus | undefined {
   if (usedFraction === undefined) return undefined;
   if (usedFraction >= 1) return "exhausted";
   if (usedFraction >= 0.9) return "warning";
@@ -107,7 +110,10 @@ function buildModelUsageUrl(baseUrl: string, now: Date): string {
   return `${baseUrl}${MODEL_USAGE_PATH}?startTime=${encodeURIComponent(startTime)}&endTime=${encodeURIComponent(endTime)}`;
 }
 
-async function fetchZaiUsage(params: UsageFetchParams, ctx: UsageFetchContext): Promise<UsageReport | null> {
+async function fetchZaiUsage(
+  params: UsageFetchParams,
+  ctx: UsageFetchContext,
+): Promise<UsageReport | null> {
   if (params.provider !== "zai") return null;
   const credential = params.credential;
   if (credential.type !== "api_key" || !credential.apiKey) return null;
@@ -127,7 +133,10 @@ async function fetchZaiUsage(params: UsageFetchParams, ctx: UsageFetchContext):
       signal: params.signal,
     });
     if (!response.ok) {
-			ctx.logger?.warn("ZAI usage fetch failed", { status: response.status, statusText: response.statusText });
+      ctx.logger?.warn("ZAI usage fetch failed", {
+        status: response.status,
+        statusText: response.statusText,
+      });
       return null;
     }
     payload = (await response.json()) as ZaiQuotaPayload;
@@ -138,11 +147,16 @@ async function fetchZaiUsage(params: UsageFetchParams, ctx: UsageFetchContext):
 
   if (!payload) return null;
   if (payload.success !== true) {
-		ctx.logger?.warn("ZAI usage response invalid", { code: payload.code, message: payload.msg });
+    ctx.logger?.warn("ZAI usage response invalid", {
+      code: payload.code,
+      message: payload.msg,
+    });
     return null;
   }
 
-	const limitsPayload = Array.isArray(payload.data?.limits) ? payload.data?.limits : [];
+  const limitsPayload = Array.isArray(payload.data?.limits)
+    ? payload.data?.limits
+    : [];
   const limits: UsageLimit[] = [];
 
   for (const rawLimit of limitsPayload) {
@@ -243,5 +257,6 @@ async function fetchZaiUsage(params: UsageFetchParams, ctx: UsageFetchContext):
 export const zaiUsageProvider: UsageProvider = {
   id: "zai",
   fetchUsage: fetchZaiUsage,
-	supports: params => params.provider === "zai" && params.credential.type === "api_key",
+  supports: (params) =>
+    params.provider === "zai" && params.credential.type === "api_key",
 };