Simplify Codex usage cache handling

Author: lintowe

apps/server/src/provider/Layers/CodexAdapter.ts

@@ -1725,15 +1725,22 @@ export const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (
     );
   });
 
+  const cacheCodexUsageSnapshot = (
+    snapshot: CodexUsageSnapshot | null,
+  ): CodexUsageSnapshot | null => {
+    if (snapshot) {
+      cachedCodexUsage = snapshot;
+      return snapshot;
+    }
+    return cachedCodexUsage ? { ...cachedCodexUsage, source: "cache" as const } : null;
+  };
+
   const readCodexUsage: CodexAdapterShape["readCodexUsage"] = Effect.fn("readCodexUsage")(
     function* () {
       const session = Array.from(sessions.values()).findLast((candidate) => !candidate.stopped);
       if (!session) {
         const snapshot = yield* readCodexUsageWithoutSession();
-        cachedCodexUsage = snapshot ?? cachedCodexUsage;
-        return (
-          snapshot ?? (cachedCodexUsage ? { ...cachedCodexUsage, source: "cache" as const } : null)
-        );
+        return cacheCodexUsageSnapshot(snapshot);
       }
       const payload = yield* session.runtime.readAccountRateLimits.pipe(
         Effect.mapError((cause) =>
@@ -1745,10 +1752,7 @@ export const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (
         payload,
         source: "read",
       });
-      cachedCodexUsage = snapshot ?? cachedCodexUsage;
-      return (
-        snapshot ?? (cachedCodexUsage ? { ...cachedCodexUsage, source: "cache" as const } : null)
-      );
+      return cacheCodexUsageSnapshot(snapshot);
     },
   );
 

apps/server/src/provider/codexUsage.test.ts

@@ -30,30 +30,6 @@ describe("normalizeCodexUsageSnapshot", () => {
     });
   });
 
-  it("prefers the codex named multi-bucket over the legacy bucket", () => {
-    const snapshot = normalizeCodexUsageSnapshot({
-      providerInstanceId: instanceId,
-      source: "read",
-      checkedAt: "2026-05-04T00:00:00.000Z",
-      payload: {
-        rateLimits: {
-          primary: { usedPercent: 90, windowDurationMins: 300 },
-        },
-        rateLimitsByName: {
-          codex: {
-            primary: { usedPercent: 25, windowDurationMins: 300 },
-          },
-        },
-      },
-    });
-
-    expect(snapshot?.windows[0]).toMatchObject({
-      kind: "five-hour",
-      usedPercent: 25,
-      remainingPercent: 75,
-    });
-  });
-
   it("falls back to the top-level rateLimits bucket", () => {
     const snapshot = normalizeCodexUsageSnapshot({
       providerInstanceId: instanceId,
@@ -165,12 +141,15 @@ describe("normalizeCodexUsageSnapshot", () => {
     ]);
   });
 
-  it("maps Codex named buckets when duration metadata is absent", () => {
+  it("maps named buckets when limit-id buckets are empty", () => {
     const snapshot = normalizeCodexUsageSnapshot({
       providerInstanceId: instanceId,
       source: "read",
       payload: {
-        rateLimits: {},
+        rateLimits: {
+          primary: { usedPercent: 90, windowDurationMins: 300 },
+        },
+        rateLimitsByLimitId: {},
         rateLimitsByName: {
           "5-hour limit": {
             primary: { usedPercent: 12 },
@@ -200,27 +179,6 @@ describe("normalizeCodexUsageSnapshot", () => {
     ]);
   });
 
-  it("falls through empty limit-id buckets to named buckets", () => {
-    const snapshot = normalizeCodexUsageSnapshot({
-      providerInstanceId: instanceId,
-      source: "read",
-      payload: {
-        rateLimits: {},
-        rateLimitsByLimitId: {},
-        rateLimitsByName: {
-          "5-hour limit": {
-            primary: { usedPercent: 12 },
-          },
-        },
-      },
-    });
-
-    expect(snapshot?.windows[0]).toMatchObject({
-      kind: "five-hour",
-      usedPercent: 12,
-    });
-  });
-
   it("sorts fallback limit-id buckets by display priority", () => {
     const snapshot = normalizeCodexUsageSnapshot({
       providerInstanceId: instanceId,
@@ -286,12 +244,7 @@ describe("normalizeCodexUsageSnapshot", () => {
           primary: { usedPercent: 50, windowDurationMins: 300 },
           rateLimitReachedType: null,
         },
-        rateLimitsByLimitId: {
-          FiveHourLimit: {
-            primary: { usedPercent: 100 },
-            rateLimitReachedType: "primary",
-          },
-        },
+        rateLimitsByLimitId: {},
       },
     });
 

apps/server/src/provider/codexUsage.ts

@@ -119,14 +119,20 @@ function isRateLimitBucketPayload(payload: RateLimitPayload): boolean {
   return "primary" in payload || "secondary" in payload;
 }
 
+function hasBuckets(buckets: Record<string, RateLimitBucket> | null | undefined): boolean {
+  return Boolean(buckets && Object.keys(buckets).length > 0);
+}
+
 function selectCodexBucket(payload: RateLimitPayload): RateLimitBucket | null {
   if (isRateLimitBucketPayload(payload)) {
     return payload;
   }
   return (
     payload.rateLimitsByLimitId?.codex ??
     payload.rateLimitsByName?.codex ??
-    payload.rateLimits ??
+    (hasBuckets(payload.rateLimitsByLimitId) || hasBuckets(payload.rateLimitsByName)
+      ? null
+      : payload.rateLimits) ??
     null
   );
 }