Fix usage meters and iOS composer send freeze

apps/desktop/src/main/services/usage/providerQuotaParsers.ts

@@ -0,0 +1,221 @@
+import type { ExtraUsage, UsageWindow } from "../../../shared/types";
+import { isRecord } from "../shared/utils";
+
+export interface ClaudeUsageResponse {
+  five_hour?: ClaudeUsageBucket;
+  fiveHour?: ClaudeUsageBucket;
+  seven_day?: ClaudeUsageBucket;
+  sevenDay?: ClaudeUsageBucket;
+  seven_day_sonnet?: ClaudeUsageBucket;
+  sevenDaySonnet?: ClaudeUsageBucket;
+  seven_day_opus?: ClaudeUsageBucket | null;
+  sevenDayOpus?: ClaudeUsageBucket | null;
+  seven_day_oauth_apps?: ClaudeUsageBucket | null;
+  sevenDayOAuthApps?: ClaudeUsageBucket | null;
+  seven_day_cowork?: ClaudeUsageBucket | null;
+  sevenDayCowork?: ClaudeUsageBucket | null;
+  extra_usage?: ClaudeExtraUsage | null;
+  extraUsage?: ClaudeExtraUsage | null;
+  rate_limit_tier?: string;
+}
+
+type ClaudeUsageBucket = {
+  percent_used?: number;
+  used_percent?: number;
+  percentUsed?: number;
+  usedPercent?: number;
+  utilization?: number;
+  resets_at?: string;
+  resetsAt?: string;
+};
+
+type ClaudeExtraUsage = {
+  is_enabled?: boolean;
+  isEnabled?: boolean;
+  monthly_limit?: number;
+  monthlyLimit?: number;
+  used_credits?: number;
+  usedCredits?: number;
+  utilization?: number | null;
+  currency?: string;
+};
+
+export function computeResetsInMs(resetsAt: string): number {
+  if (!resetsAt) return 0;
+  return Math.max(0, new Date(resetsAt).getTime() - Date.now());
+}
+
+function usagePercent(bucket: Record<string, unknown> | null | undefined): number {
+  if (!bucket) return 0;
+  if (typeof bucket.percent_used === "number") return bucket.percent_used;
+  if (typeof bucket.used_percent === "number") return bucket.used_percent;
+  if (typeof bucket.percentUsed === "number") return bucket.percentUsed;
+  if (typeof bucket.usedPercent === "number") return bucket.usedPercent;
+  if (typeof bucket.utilization === "number") return bucket.utilization;
+  return 0;
+}
+
+function codexResetAt(value: unknown): string {
+  if (typeof value === "string" && value.trim()) return value;
+  if (typeof value === "number" && Number.isFinite(value)) {
+    const ms = value > 1_000_000_000_000 ? value : value * 1_000;
+    return new Date(ms).toISOString();
+  }
+  return "";
+}
+
+export function parseClaudeWindows(data: ClaudeUsageResponse): { windows: UsageWindow[]; extraUsage: ExtraUsage | null } {
+  const windows: UsageWindow[] = [];
+  const fiveHour = data.five_hour ?? data.fiveHour;
+  const sevenDay = data.seven_day ?? data.sevenDay;
+  const sevenDaySonnet = data.seven_day_sonnet ?? data.sevenDaySonnet;
+  const sevenDayOpus = data.seven_day_opus ?? data.sevenDayOpus;
+  const sevenDayOAuthApps = data.seven_day_oauth_apps ?? data.sevenDayOAuthApps;
+  const sevenDayCowork = data.seven_day_cowork ?? data.sevenDayCowork;
+
+  if (fiveHour) {
+    const resetsAt = fiveHour.resets_at ?? fiveHour.resetsAt ?? "";
+    windows.push({
+      provider: "claude",
+      windowType: "five_hour",
+      percentUsed: usagePercent(fiveHour),
+      resetsAt,
+      resetsInMs: computeResetsInMs(resetsAt),
+    });
+  }
+
+  if (sevenDay) {
+    const resetsAt = sevenDay.resets_at ?? sevenDay.resetsAt ?? "";
+    const modelBreakdown: Record<string, number> = {};
+    if (sevenDaySonnet) modelBreakdown.sonnet = usagePercent(sevenDaySonnet);
+    if (sevenDayOpus) modelBreakdown.opus = usagePercent(sevenDayOpus);
+    windows.push({
+      provider: "claude",
+      windowType: "weekly",
+      percentUsed: usagePercent(sevenDay),
+      resetsAt,
+      resetsInMs: computeResetsInMs(resetsAt),
+      modelBreakdown: Object.keys(modelBreakdown).length > 0 ? modelBreakdown : undefined,
+    });
+  }
+
+  if (sevenDayOAuthApps) {
+    const resetsAt = sevenDayOAuthApps.resets_at ?? sevenDayOAuthApps.resetsAt ?? "";
+    windows.push({
+      provider: "claude",
+      windowType: "weekly_oauth_apps",
+      percentUsed: usagePercent(sevenDayOAuthApps),
+      resetsAt,
+      resetsInMs: computeResetsInMs(resetsAt),
+    });
+  }
+
+  if (sevenDayCowork) {
+    const resetsAt = sevenDayCowork.resets_at ?? sevenDayCowork.resetsAt ?? "";
+    windows.push({
+      provider: "claude",
+      windowType: "weekly_cowork",
+      percentUsed: usagePercent(sevenDayCowork),
+      resetsAt,
+      resetsInMs: computeResetsInMs(resetsAt),
+    });
+  }
+
+  const extra = data.extra_usage ?? data.extraUsage;
+  let extraUsage: ExtraUsage | null = null;
+  if (extra) {
+    const isEnabled = extra.is_enabled ?? extra.isEnabled ?? false;
+    const usedCents = extra.used_credits ?? extra.usedCredits ?? 0;
+    const limitCents = extra.monthly_limit ?? extra.monthlyLimit ?? 0;
+    extraUsage = {
+      provider: "claude",
+      isEnabled,
+      usedCreditsUsd: usedCents / 100,
+      monthlyLimitUsd: limitCents / 100,
+      utilization: typeof extra.utilization === "number" ? extra.utilization : null,
+      currency: extra.currency ?? "usd",
+    };
+  }
+
+  return { windows, extraUsage };
+}
+
+export function parseCodexRateLimitWindows(data: Record<string, unknown>): UsageWindow[] {
+  const windows: UsageWindow[] = [];
+  const snakeRateLimit = isRecord(data.rate_limit) ? data.rate_limit : null;
+  const camelRateLimits = isRecord(data.rateLimits) ? data.rateLimits : null;
+  const seen = new Set<string>();
+
+  const addWindow = (
+    bucket: Record<string, unknown> | null,
+    fallbackWindowType: UsageWindow["windowType"],
+    limitId?: string | null,
+  ): void => {
+    if (!bucket) return;
+    const resetsAt = codexResetAt(bucket.reset_at ?? bucket.resets_at ?? bucket.resetsAt);
+    const windowDurationMins = codexWindowDurationMins(bucket);
+    const windowDurationMs = codexWindowDurationMs(windowDurationMins);
+    const windowType = codexWindowTypeFromDuration(windowDurationMins) ?? fallbackWindowType;
+    const key = `${windowType}:${resetsAt}:${limitId ?? ""}`;
+    if (seen.has(key)) return;
+    seen.add(key);
+    windows.push({
+      provider: "codex",
+      windowType,
+      percentUsed: usagePercent(bucket),
+      resetsAt,
+      resetsInMs: computeResetsInMs(resetsAt),
+      ...(windowDurationMs ? { windowDurationMs } : {}),
+    });
+  };
+
+  for (const [key, windowType] of [["primary", "five_hour"], ["secondary", "weekly"]] as const) {
+    const snakeKey = key === "primary" ? "primary_window" : "secondary_window";
+    const snakeBucket = snakeRateLimit && isRecord(snakeRateLimit[snakeKey]) ? snakeRateLimit[snakeKey] : null;
+    const camelBucket = camelRateLimits && isRecord(camelRateLimits[key]) ? camelRateLimits[key] : null;
+    const directBucket = isRecord(data[snakeKey]) ? data[snakeKey] : isRecord(data[key]) ? data[key] : null;
+    addWindow(snakeBucket ?? camelBucket ?? directBucket, windowType);
+  }
+
+  const limitSnapshots = [
+    isRecord(data.rateLimits) ? data.rateLimits : null,
+    isRecord(data.rate_limits) ? data.rate_limits : null,
+    isRecord(data.rateLimitsByLimitId) ? data.rateLimitsByLimitId : null,
+    isRecord(data.rate_limits_by_limit_id) ? data.rate_limits_by_limit_id : null,
+  ].filter((entry): entry is Record<string, unknown> => entry != null);
+
+  for (const snapshots of limitSnapshots) {
+    for (const [limitId, rawSnapshot] of Object.entries(snapshots)) {
+      if (!isRecord(rawSnapshot)) continue;
+      for (const [field, fallbackType] of [["primary", "five_hour"], ["secondary", "weekly"]] as const) {
+        const bucket = isRecord(rawSnapshot[field]) ? rawSnapshot[field] : null;
+        if (bucket) addWindow(bucket, fallbackType, limitId);
+      }
+    }
+  }
+
+  return windows;
+}
+
+function codexWindowTypeFromDuration(value: number | null): UsageWindow["windowType"] | null {
+  if (value == null) return null;
+  if (value <= 360) return "five_hour";
+  if (value <= 10_080) return "weekly";
+  return "monthly";
+}
+
+function codexWindowDurationMins(bucket: Record<string, unknown>): number | null {
+  const minutes = bucket.windowDurationMins ?? bucket.window_duration_mins;
+  if (typeof minutes === "number" && Number.isFinite(minutes) && minutes > 0) return minutes;
+
+  const seconds = bucket.limitWindowSeconds
+    ?? bucket.limit_window_seconds
+    ?? bucket.windowDurationSeconds
+    ?? bucket.window_duration_seconds;
+  if (typeof seconds === "number" && Number.isFinite(seconds) && seconds > 0) return seconds / 60;
+  return null;
+}
+
+function codexWindowDurationMs(value: number | null): number | null {
+  return value == null ? null : Math.round(value * 60_000);
+}

apps/desktop/src/main/services/usage/usageTrackingService.test.ts

@@ -1107,11 +1107,41 @@ Resets Jul 12 at 3pm
 // ../ai/providerCredentialSources.test.ts, colocated with the module.
 
 describe("parseCodexRateLimitWindows", () => {
-  it("accepts the wham HTTP response shape", () => {
+  it("classifies current weekly-only wham responses by their duration", () => {
     const result = parseCodexRateLimitWindows({
       rate_limit: {
-        primary_window: { used_percent: 15, reset_at: 1773446952 },
-        secondary_window: { used_percent: 63, reset_at: 1773853354 },
+        primary_window: {
+          used_percent: 63,
+          reset_at: 1773853354,
+          limit_window_seconds: 7 * 24 * 60 * 60,
+        },
+        secondary_window: null,
+      },
+    });
+
+    expect(result).toEqual([
+      expect.objectContaining({
+        provider: "codex",
+        windowType: "weekly",
+        percentUsed: 63,
+        windowDurationMs: 7 * 24 * 60 * 60_000,
+      }),
+    ]);
+  });
+
+  it("detects five-hour and weekly wham windows without relying on their positions", () => {
+    const result = parseCodexRateLimitWindows({
+      rate_limit: {
+        primary_window: {
+          used_percent: 63,
+          reset_at: 1773853354,
+          limit_window_seconds: 7 * 24 * 60 * 60,
+        },
+        secondary_window: {
+          used_percent: 15,
+          reset_at: 1773446952,
+          limit_window_seconds: 5 * 60 * 60,
+        },
       },
     });