fix: remap primary_window to weekly instead of dropping it

The upstream WHAM API and x-codex-primary headers still carry quota data
through primary_window, but it now represents the weekly limit (was 5h).
Prefer primary over secondary for weekly, with secondary as fallback.

Author: lidge-jun

src/codex/quota.ts

@@ -110,9 +110,15 @@ export function parseUsageQuota(data: WhamUsageResponse): Omit<StoredAccountQuot
 
   const quota: Omit<StoredAccountQuota, "updatedAt"> = {};
   const thirtyDayOnly = data.plan_type?.trim().toLowerCase() === "go" || data.plan_type?.trim().toLowerCase() === "free";
-  const weeklyPercent = normalizeUsagePercent(data.rate_limit.secondary_window?.used_percent);
+  // primary_window was the 5h window; it now carries weekly data for GPT plans.
+  // secondary_window is the legacy weekly source; prefer primary when present.
+  const primaryPercent = normalizeUsagePercent(data.rate_limit.primary_window?.used_percent);
+  const secondaryPercent = normalizeUsagePercent(data.rate_limit.secondary_window?.used_percent);
+  const weeklyPercent = primaryPercent ?? secondaryPercent;
   const monthlyPercent = normalizeUsagePercent(data.rate_limit.tertiary_window?.used_percent);
-  const weeklyResetAt = normalizeResetAt(data.rate_limit.secondary_window?.reset_at);
+  const primaryResetAt = normalizeResetAt(data.rate_limit.primary_window?.reset_at);
+  const secondaryResetAt = normalizeResetAt(data.rate_limit.secondary_window?.reset_at);
+  const weeklyResetAt = primaryPercent !== undefined ? primaryResetAt : secondaryResetAt;
   const monthlyResetAt = normalizeResetAt(data.rate_limit.tertiary_window?.reset_at);
   if (thirtyDayOnly) {
     if (monthlyPercent !== undefined) {

src/server/responses.ts

@@ -735,10 +735,16 @@ export async function handleResponses(
     const terminalRecorder = codexForwardTerminalOutcomeRecorder(config, authCtx, route.provider);
     const terminalBodyWillRecord = !!terminalRecorder && upstreamResponse.ok && isEventStream;
     // Capture quota from upstream response for multi-account tracking
-    if (usesCodexForwardPoolAuth(authCtx, route.provider)) {
-      const weeklyRaw = upstreamResponse.headers.get("x-codex-secondary-used-percent");
+   if (usesCodexForwardPoolAuth(authCtx, route.provider)) {
+      // primary was the 5h window; it now carries weekly data for GPT plans.
+      // Prefer primary when present, fall back to secondary for compatibility.
+      const primaryRaw = upstreamResponse.headers.get("x-codex-primary-used-percent");
+      const secondaryRaw = upstreamResponse.headers.get("x-codex-secondary-used-percent");
+      const weeklyRaw = primaryRaw ?? secondaryRaw;
       const monthlyRaw = upstreamResponse.headers.get("x-codex-tertiary-used-percent");
-      const weeklyResetRaw = upstreamResponse.headers.get("x-codex-secondary-reset-at");
+      const primaryResetRaw = upstreamResponse.headers.get("x-codex-primary-reset-at");
+      const secondaryResetRaw = upstreamResponse.headers.get("x-codex-secondary-reset-at");
+      const weeklyResetRaw = primaryRaw ? primaryResetRaw : secondaryResetRaw;
       const monthlyResetRaw = upstreamResponse.headers.get("x-codex-tertiary-reset-at");
       const retryAfterRaw = upstreamResponse.headers.get("retry-after");
       if (weeklyRaw || monthlyRaw) {
@@ -758,8 +764,8 @@ export async function handleResponses(
         });
       } else {
         recordCodexUpstreamOutcome(config, authCtx.accountId, upstreamResponse.status, {
-         retryAfter: retryAfterRaw,
-          resetAt: [weeklyResetRaw, monthlyResetRaw],
+        retryAfter: retryAfterRaw,
+         resetAt: [primaryResetRaw, secondaryResetRaw, monthlyResetRaw].filter(Boolean),
         });
       }
     }