tokmon 0.20.5 → 0.21.0

package/dist/{chunk-EHIQHGJL.js → chunk-YCIUMAKK.js}

@@ -6,7 +6,7 @@ import {
   expandHome,
   isValidTimezone,
   slugify
-} from "./chunk-XQEJ4WQ5.js";
+} from "./chunk-7MFZMI5C.js";
 
 // src/providers/usage-core.ts
 import { readFile, writeFile, rename, mkdir } from "fs/promises";
@@ -126,6 +126,14 @@ function finitePositiveCoerced(value) {
   const n = Number(value);
   return Number.isFinite(n) && n > 0 ? n : 0;
 }
+function numberValue(value) {
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (typeof value === "string" && value.trim()) {
+    const n = Number(value);
+    if (Number.isFinite(n)) return n;
+  }
+  return void 0;
+}
 function percentMetric(label, used, resetsAt, primary) {
   return {
     label,
@@ -141,7 +149,7 @@ var dollars = (cents) => finite(cents) / 100;
 // src/providers/usage-core.ts
 var SPARK_DAYS = 14;
 var DAY_MS = 864e5;
-var CACHE_VERSION = 5;
+var CACHE_VERSION = 7;
 var STABLE_AGE_MS = 5 * 6e4;
 var PRUNE_AGE_MS = 200 * DAY_MS;
 var memCache = /* @__PURE__ */ new Map();
@@ -252,6 +260,15 @@ async function loadCachedEntries(files, parse, since) {
   if (dirty) scheduleFlush();
   return dedupe(chunks.flat().filter((e) => e.ts >= since));
 }
+function lastDayKeys(now, tz, n) {
+  const keys = [];
+  let cursor = now;
+  for (let i = 0; i < n; i++) {
+    keys.unshift(dayKey(cursor, tz));
+    cursor = startOfDay(cursor, tz) - DAY_MS / 2;
+  }
+  return keys;
+}
 function dashboardSince(tz) {
   const now = Date.now();
   return Math.min(startOfMonth(now, tz), startOfWeek(now, tz), now - SPARK_DAYS * DAY_MS);
@@ -277,7 +294,7 @@ function dedupe(entries) {
   for (const raw of entries) {
     const e = cleanEntry(raw);
     if (e.ts <= 0) continue;
-    const k = e.id ?? `${e.ts} ${e.model} ${e.input} ${e.output} ${e.cacheCreate} ${e.cacheRead}`;
+    const k = e.id ?? `${e.ts} ${e.model} ${e.input} ${e.output} ${e.cacheCreate} ${e.cacheRead} ${e.cost}`;
     if (seen.has(k)) continue;
     seen.add(k);
     out.push(e);
@@ -316,8 +333,7 @@ function summarize(entries, tz) {
   const hrs = Math.max((now - oldestToday) / 36e5, 1 / 60);
   const rawBurnRate = hadToday ? today.cost / hrs : 0;
   const burnRate = Number.isFinite(rawBurnRate) ? rawBurnRate : 0;
-  const series = [];
-  for (let i = SPARK_DAYS - 1; i >= 0; i--) series.push(byDay.get(dayKey(now - i * DAY_MS, tz)) ?? 0);
+  const series = lastDayKeys(now, tz, SPARK_DAYS).map((k) => byDay.get(k) ?? 0);
   return { today, week, month, burnRate, series };
 }
 function groupBy(entries, keyFn) {
@@ -515,6 +531,33 @@ async function readJson(res) {
   }
 }
 
+// src/providers/_shared/identity.ts
+function identityFields(identity) {
+  return {
+    email: identity?.email ?? null,
+    displayName: identity?.displayName ?? null
+  };
+}
+
+// src/providers/_shared/jwt.ts
+function decodeBase64UrlJson(segment) {
+  try {
+    const normalized = segment.replace(/-/g, "+").replace(/_/g, "/");
+    const padded = normalized + "=".repeat((4 - normalized.length % 4) % 4);
+    return JSON.parse(Buffer.from(padded, "base64").toString("utf8"));
+  } catch {
+    return null;
+  }
+}
+function identityFromIdToken(idToken) {
+  if (typeof idToken !== "string" || !idToken.includes(".")) return {};
+  const payload = decodeBase64UrlJson(idToken.split(".")[1]);
+  if (!payload || typeof payload !== "object") return {};
+  const email = typeof payload.email === "string" && payload.email.trim() ? payload.email.trim() : void 0;
+  const displayName = typeof payload.name === "string" && payload.name.trim() ? payload.name.trim() : typeof payload.given_name === "string" && payload.given_name.trim() ? payload.given_name.trim() : void 0;
+  return { email, displayName, payload };
+}
+
 // src/providers/_shared/time.ts
 function msToIso(ms) {
   return Number.isFinite(ms) && Math.abs(ms) <= 864e13 ? new Date(ms).toISOString() : null;
@@ -636,20 +679,17 @@ function sqliteStatusMessage(status) {
 
 // src/providers/cursor/activity.ts
 var DAY_MS2 = 864e5;
+var HOUR_MS = 36e5;
 function trackingDb(homeDir) {
   return join3(homeDir ?? homedir(), ".cursor", "ai-tracking", "ai-code-tracking.db");
 }
-function localDayKey(ms) {
-  const d = new Date(ms);
-  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
-}
-async function cursorActivity(homeDir) {
+async function cursorActivity(tz, homeDir) {
   const db = trackingDb(homeDir);
   try {
     const now = Date.now();
     const res = await runSqlite(
       db,
-      `SELECT date(createdAt/1000,'unixepoch','localtime') AS d, count(*) AS c FROM ai_code_hashes WHERE source!='human' AND createdAt >= ${Math.floor(now - 30 * DAY_MS2)} GROUP BY d;`
+      `SELECT createdAt/${HOUR_MS} AS h, count(*) AS c FROM ai_code_hashes WHERE source!='human' AND createdAt >= ${Math.floor(now - 30 * DAY_MS2)} GROUP BY h;`
     );
     if (res.status !== "ok") return null;
     const byDay = /* @__PURE__ */ new Map();
@@ -657,11 +697,13 @@ async function cursorActivity(homeDir) {
     for (const row of res.rows) {
       const raw = Number(row.c);
       const n = Number.isFinite(raw) && raw > 0 ? raw : 0;
-      byDay.set(String(row.d), n);
+      const hour = Number(row.h);
+      if (!Number.isFinite(hour)) continue;
+      const key = dayKey(hour * HOUR_MS + HOUR_MS / 2, tz);
+      byDay.set(key, (byDay.get(key) ?? 0) + n);
       month += n;
     }
-    const series = [];
-    for (let i = SPARK_DAYS - 1; i >= 0; i--) series.push(byDay.get(localDayKey(now - i * DAY_MS2)) ?? 0);
+    const series = lastDayKeys(now, tz, SPARK_DAYS).map((k) => byDay.get(k) ?? 0);
     if (month === 0 && series.every((v) => v === 0)) return null;
     return { series, summary: `${tokens(month)} lines` };
   } catch {
@@ -673,6 +715,8 @@ async function cursorActivity(homeDir) {
 var BASE = "https://api2.cursor.sh/aiserver.v1.DashboardService";
 var USAGE_URL = `${BASE}/GetCurrentPeriodUsage`;
 var PLAN_URL = `${BASE}/GetPlanInfo`;
+var CREDITS_URL = `${BASE}/GetCreditGrantsBalance`;
+var STRIPE_URL = "https://cursor.com/api/auth/stripe";
 function cursorStateDb(homeDir) {
   const base = homeDir ?? homedir2();
   const tail = ["Cursor", "User", "globalStorage", "state.vscdb"];
@@ -709,11 +753,13 @@ function cleanStoredString(value) {
   const trimmed = value.trim().replace(/^"|"$/g, "");
   return trimmed || void 0;
 }
-function identityFields(email, displayName) {
-  return {
-    email: email ?? null,
-    displayName: displayName ?? null
-  };
+function cursorSessionToken(accessToken) {
+  const payload = accessToken.includes(".") ? decodeBase64UrlJson(accessToken.split(".")[1]) : null;
+  const subject = typeof payload?.sub === "string" ? payload.sub : null;
+  if (!subject) return null;
+  const parts = subject.split("|");
+  const userId = (parts.length > 1 ? parts[1] : parts[0]).trim();
+  return userId ? `${userId}%3A%3A${accessToken}` : null;
 }
 async function connectPost(url, token) {
   try {
@@ -734,10 +780,47 @@ async function connectPost(url, token) {
     return null;
   }
 }
-async function cursorBilling(account) {
+async function connectGetWithSession(url, token) {
+  const session = cursorSessionToken(token);
+  if (!session) return null;
+  try {
+    const res = await fetch(url, {
+      headers: {
+        "Cookie": `WorkosCursorSessionToken=${session}`,
+        "User-Agent": "tokmon"
+      },
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (!res.ok) return { __status: res.status };
+    return await readJson(res);
+  } catch {
+    return null;
+  }
+}
+function onDemandSpendCents(su, limit, remaining) {
+  for (const raw of [su.individualUsed, su.pooledUsed, su.totalSpend]) {
+    const n = numberValue(raw);
+    if (n !== void 0 && n > 0) return n;
+  }
+  const inferred = Math.max(0, limit - remaining);
+  if (inferred > 0) return inferred;
+  return numberValue(su.individualUsed) ?? numberValue(su.pooledUsed) ?? numberValue(su.totalSpend) ?? 0;
+}
+function appendCredits(metrics, creditGrants, stripe) {
+  const stripeBalance = numberValue(stripe?.customerBalance);
+  const stripeBalanceCents = stripeBalance !== void 0 && stripeBalance < 0 ? Math.abs(stripeBalance) : 0;
+  const hasGrants = creditGrants?.hasCreditGrants === true;
+  const grantTotal = hasGrants ? numberValue(creditGrants?.totalCents) ?? 0 : 0;
+  const grantUsed = hasGrants ? numberValue(creditGrants?.usedCents) ?? 0 : 0;
+  const hasValidGrants = hasGrants && grantTotal > 0;
+  const total = (hasValidGrants ? grantTotal : 0) + stripeBalanceCents;
+  if (total <= 0) return;
+  metrics.push({ label: "Credits", used: dollars(Math.max(0, total - (hasValidGrants ? grantUsed : 0))), limit: null, format: { kind: "dollars" } });
+}
+async function cursorBilling(account, tz) {
   const [core, activity, spend] = await Promise.all([
     cursorBillingCore(account),
-    cursorActivity(account.homeDir),
+    cursorActivity(tz, account.homeDir),
     cursorModelSpend(account.homeDir)
   ]);
   let merged = activity;
@@ -760,22 +843,24 @@ async function cursorBillingCore(account) {
     readState(db, "cursorAuth/cachedEmail"),
     readState(db, "cursorAuth/cachedName")
   ]);
-  const token = tokenRes.value;
+  const token = cleanStoredString(tokenRes.value);
   const membership = membershipRes.value;
   const email = cleanStoredString(emailRes.value);
   const displayName = cleanStoredString(nameRes.value);
   const planFallback = membership ? membership.charAt(0).toUpperCase() + membership.slice(1) : null;
   if (!token) {
     const error = tokenRes.status === "ok" ? "Not signed in \u2014 open Cursor" : sqliteStatusMessage(tokenRes.status);
-    return { plan: planFallback, metrics: [], error, ...identityFields(email, displayName) };
+    return { plan: planFallback, metrics: [], error, ...identityFields({ email, displayName }) };
   }
-  const [usage, planInfo] = await Promise.all([
+  const [usage, planInfo, creditGrants, stripe] = await Promise.all([
     connectPost(USAGE_URL, token),
-    connectPost(PLAN_URL, token)
+    connectPost(PLAN_URL, token),
+    connectPost(CREDITS_URL, token),
+    connectGetWithSession(STRIPE_URL, token)
   ]);
   if (!usage || usage.__status) {
     const expired = usage?.__status === 401 || usage?.__status === 403;
-    return { plan: planFallback, metrics: [], error: expired ? "Token expired \u2014 re-open Cursor" : "Cursor API error", ...identityFields(email, displayName) };
+    return { plan: planFallback, metrics: [], error: expired ? "Token expired \u2014 re-open Cursor" : "Cursor API error", ...identityFields({ email, displayName }) };
   }
   const planName = planInfo?.planInfo?.planName ?? planFallback;
   const price = planInfo?.planInfo?.price;
@@ -783,43 +868,69 @@ async function cursorBillingCore(account) {
   const pu = usage.planUsage ?? {};
   const metrics = [];
   const rawEnd = usage.billingCycleEnd;
-  const endMs = typeof rawEnd === "string" && rawEnd.trim() ? Number(rawEnd) : NaN;
+  const endMs = numberValue(rawEnd) ?? NaN;
   const iso = msToIso(endMs);
   const resets = iso && endMs > 0 ? resetIn(iso) : null;
-  if (finiteNumber(pu.totalPercentUsed) && finiteNumber(pu.limit)) {
-    metrics.push(percentMetric("Usage", pu.totalPercentUsed, resets, true));
-    const spentCents = finiteNumber(pu.totalSpend) ? pu.totalSpend : finiteNumber(pu.remaining) ? pu.limit - pu.remaining : pu.limit * (pu.totalPercentUsed / 100);
-    if (Number.isFinite(spentCents)) {
+  const limit = numberValue(pu.limit);
+  const planUsedCents = numberValue(pu.totalSpend) ?? (limit !== void 0 && numberValue(pu.remaining) !== void 0 ? limit - numberValue(pu.remaining) : void 0);
+  const computedPercent = limit !== void 0 && limit > 0 && planUsedCents !== void 0 ? planUsedCents / limit * 100 : void 0;
+  const totalPercentUsed = numberValue(pu.totalPercentUsed) ?? computedPercent;
+  const su = usage.spendLimitUsage;
+  const planLower = typeof planName === "string" ? planName.trim().toLowerCase() : "";
+  const pooledLimit = numberValue(su?.pooledLimit) ?? 0;
+  const isTeamAccount = planLower === "team" || String(su?.limitType ?? "").toLowerCase() === "team" || pooledLimit > 0;
+  if (isTeamAccount && limit !== void 0 && planUsedCents !== void 0) {
+    metrics.push({
+      label: "Usage",
+      used: dollars(Math.max(0, planUsedCents)),
+      limit: dollars(limit),
+      format: { kind: "dollars" },
+      resetsAt: resets,
+      primary: true
+    });
+  } else if (totalPercentUsed !== void 0) {
+    metrics.push(percentMetric("Usage", totalPercentUsed, resets, true));
+    if (limit !== void 0 && planUsedCents !== void 0) {
       metrics.push({
         label: "Spend",
-        used: dollars(spentCents),
-        limit: dollars(pu.limit),
+        used: dollars(Math.max(0, planUsedCents)),
+        limit: dollars(limit),
         format: { kind: "dollars" }
       });
     }
   }
-  if (typeof pu.autoPercentUsed === "number" && Number.isFinite(pu.autoPercentUsed)) {
-    metrics.push({ label: "Auto", used: pu.autoPercentUsed, limit: 100, format: { kind: "percent" } });
+  const autoPercentUsed = numberValue(pu.autoPercentUsed);
+  if (autoPercentUsed !== void 0) {
+    metrics.push({ label: "Auto", used: autoPercentUsed, limit: 100, format: { kind: "percent" } });
   }
-  if (typeof pu.apiPercentUsed === "number" && Number.isFinite(pu.apiPercentUsed)) {
-    metrics.push({ label: "API", used: pu.apiPercentUsed, limit: 100, format: { kind: "percent" } });
+  const apiPercentUsed = numberValue(pu.apiPercentUsed);
+  if (apiPercentUsed !== void 0) {
+    metrics.push({ label: "API", used: apiPercentUsed, limit: 100, format: { kind: "percent" } });
   }
-  const su = usage.spendLimitUsage;
   if (su) {
-    const pair = finiteNumber(su.individualLimit) && finiteNumber(su.individualRemaining) ? { limit: su.individualLimit, remaining: su.individualRemaining } : finiteNumber(su.pooledLimit) && finiteNumber(su.pooledRemaining) ? { limit: su.pooledLimit, remaining: su.pooledRemaining } : null;
+    const pair = numberValue(su.individualLimit) !== void 0 && numberValue(su.individualRemaining) !== void 0 ? { limit: numberValue(su.individualLimit), remaining: numberValue(su.individualRemaining) } : numberValue(su.pooledLimit) !== void 0 && numberValue(su.pooledRemaining) !== void 0 ? { limit: numberValue(su.pooledLimit), remaining: numberValue(su.pooledRemaining) } : null;
+    const spent = onDemandSpendCents(su, pair?.limit ?? 0, pair?.remaining ?? 0);
     if (pair && pair.limit > 0) {
       metrics.push({
         label: "On-demand",
-        used: dollars(pair.limit - pair.remaining),
+        used: dollars(spent),
         limit: dollars(pair.limit),
         format: { kind: "dollars" }
       });
+    } else if (spent > 0) {
+      metrics.push({
+        label: "On-demand",
+        used: dollars(spent),
+        limit: null,
+        format: { kind: "dollars" }
+      });
     }
   }
+  appendCredits(metrics, creditGrants, stripe);
   if (metrics.length === 0) {
-    return { plan, metrics: [], error: usage.enabled === false ? "No active subscription" : "No usage data", ...identityFields(email, displayName) };
+    return { plan, metrics: [], error: usage.enabled === false ? "No active subscription" : "No usage data", ...identityFields({ email, displayName }) };
   }
-  return { plan, metrics, error: null, ...identityFields(email, displayName) };
+  return { plan, metrics, error: null, ...identityFields({ email, displayName }) };
 }
 
 // src/providers/cursor/composer.ts
@@ -893,6 +1004,7 @@ var PRICING = {
   "claude-opus-4": { i: 5e-6, o: 25e-6, cc: 625e-8, cr: 5e-7 },
   "claude-3-opus": { i: 15e-6, o: 75e-6, cc: 1875e-8, cr: 15e-7 },
   "claude-sonnet-4": { i: 3e-6, o: 15e-6, cc: 375e-8, cr: 3e-7 },
+  "claude-sonnet-5": { i: 3e-6, o: 15e-6, cc: 375e-8, cr: 3e-7 },
   "claude-haiku-4": { i: 1e-6, o: 5e-6, cc: 125e-8, cr: 1e-7 },
   "claude-fable-5": { i: 1e-5, o: 5e-5, cc: 125e-7, cr: 1e-6 }
 };
@@ -949,6 +1061,11 @@ function costOf(model, u) {
 function shortModel(model) {
   return model.replace("claude-", "").replace(/-\d{8}$/, "");
 }
+function timestampMs(value) {
+  if (typeof value === "number" && Number.isFinite(value)) return value > 1e10 ? value : value * 1e3;
+  if (typeof value === "string" && value.trim()) return new Date(value.trim()).getTime();
+  return NaN;
+}
 async function parseFile(path) {
   const entries = [];
   const input = createReadStream(path);
@@ -961,7 +1078,7 @@ async function parseFile(path) {
       try {
         const obj = JSON.parse(line.charCodeAt(0) === 65279 ? line.slice(1) : line);
         if (obj.type !== "assistant" || !obj.message?.usage) continue;
-        const ts = new Date(obj.timestamp ?? 0).getTime();
+        const ts = timestampMs(obj.timestamp);
         if (!Number.isFinite(ts)) continue;
         const u = obj.message.usage;
         const model = typeof obj.message.model === "string" && obj.message.model ? obj.message.model : "unknown";
@@ -1032,8 +1149,8 @@ async function claudeTable(tz, homeDir) {
 
 // src/providers/claude/billing.ts
 import { readFile as readFile2 } from "fs/promises";
-import { join as join6 } from "path";
-import { homedir as homedir4 } from "os";
+import { join as join7 } from "path";
+import { homedir as homedir5 } from "os";
 
 // src/providers/_shared/keychain.ts
 import { execFile as execFileCb2 } from "child_process";
@@ -1060,7 +1177,10 @@ function unwrapGoKeyringBase64(raw) {
   return Buffer.from(raw.slice(GO_KEYRING_PREFIX.length), "base64").toString("utf-8");
 }
 
-// src/providers/claude/billing.ts
+// src/providers/claude/identity.ts
+import { readFileSync } from "fs";
+import { join as join6 } from "path";
+import { homedir as homedir4 } from "os";
 function titleWords(value) {
   return value.split(/[_\s-]+/).filter(Boolean).map((part) => part.charAt(0).toUpperCase() + part.slice(1).toLowerCase()).join(" ");
 }
@@ -1071,25 +1191,22 @@ function claudeOrgPlanLabel(orgType) {
   const label = titleWords(stripped);
   return label ? `Claude ${label}` : null;
 }
-async function readClaudeIdentity(homeDir) {
+function readClaudeIdentity(homeDir) {
   const base = homeDir ? expandHome(homeDir) : homedir4();
   try {
-    const parsed = JSON.parse(await readFile2(join6(base, ".claude.json"), "utf-8"));
+    const parsed = JSON.parse(readFileSync(join6(base, ".claude.json"), "utf-8"));
     const oauth = parsed?.oauthAccount;
     const email = typeof oauth?.emailAddress === "string" && oauth.emailAddress.trim() ? oauth.emailAddress.trim() : void 0;
     const displayName = typeof oauth?.displayName === "string" && oauth.displayName.trim() ? oauth.displayName.trim() : void 0;
     const plan = claudeOrgPlanLabel(parsed?.organizationType);
-    return { email, displayName, plan: plan ?? void 0 };
+    const accountUuid = typeof oauth?.accountUuid === "string" && oauth.accountUuid.trim() ? oauth.accountUuid.trim() : void 0;
+    return { email, displayName, plan: plan ?? void 0, accountUuid };
   } catch {
     return {};
   }
 }
-function identityFields2(identity) {
-  return {
-    email: identity.email ?? null,
-    displayName: identity.displayName ?? null
-  };
-}
+
+// src/providers/claude/billing.ts
 function parseAuth(raw) {
   try {
     const creds = JSON.parse(raw);
@@ -1099,7 +1216,8 @@ function parseAuth(raw) {
     return {
       token,
       subscriptionType: typeof o.subscriptionType === "string" ? o.subscriptionType : void 0,
-      rateLimitTier: typeof o.rateLimitTier === "string" ? o.rateLimitTier : void 0
+      rateLimitTier: typeof o.rateLimitTier === "string" ? o.rateLimitTier : void 0,
+      expiresAt: typeof o.expiresAt === "number" && Number.isFinite(o.expiresAt) ? o.expiresAt : void 0
     };
   } catch {
     return null;
@@ -1108,7 +1226,7 @@ function parseAuth(raw) {
 async function readCredentialsFile(homeDir) {
   for (const dir of claudeConfigDirs(homeDir)) {
     try {
-      const auth = parseAuth(await readFile2(join6(dir, ".credentials.json"), "utf-8"));
+      const auth = parseAuth(await readFile2(join7(dir, ".credentials.json"), "utf-8"));
       if (auth) return auth;
     } catch {
     }
@@ -1119,20 +1237,65 @@ async function readMacKeychain() {
   const raw = await readMacKeychainRaw("Claude Code-credentials");
   return raw ? parseAuth(raw) : null;
 }
-async function getAuth(homeDir) {
+async function authCandidates(homeDir) {
   const expandedHomeDir = homeDir ? expandHome(homeDir) : void 0;
-  const isDefault = !expandedHomeDir || expandedHomeDir === homedir4();
-  if (isDefault) {
-    if (process.platform === "darwin") {
-      const auth = await readMacKeychain();
-      if (auth) return auth;
+  const isDefault = !expandedHomeDir || expandedHomeDir === homedir5();
+  const out = [];
+  const file = await readCredentialsFile(isDefault ? void 0 : expandedHomeDir);
+  const keychain = process.platform === "darwin" ? await readMacKeychain() : null;
+  const ordered = isDefault ? [keychain && { auth: keychain, shared: true }, file && { auth: file, shared: false }] : [file && { auth: file, shared: false }, keychain && { auth: keychain, shared: true }];
+  for (const c of ordered) if (c) out.push(c);
+  return out;
+}
+var tokenIdentityCache = /* @__PURE__ */ new Map();
+async function tokenIdentity(token) {
+  if (tokenIdentityCache.has(token)) return tokenIdentityCache.get(token);
+  try {
+    const res = await fetch("https://api.anthropic.com/api/oauth/profile", {
+      headers: {
+        "Authorization": `Bearer ${token}`,
+        "anthropic-beta": "oauth-2025-04-20",
+        "User-Agent": "tokmon"
+      },
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (res.status === 401 || res.status === 403) {
+      tokenIdentityCache.set(token, null);
+      return null;
     }
-    return readCredentialsFile(void 0);
+    if (!res.ok) return void 0;
+    const data = await readJson(res);
+    const uuid = data?.account?.uuid;
+    if (typeof uuid !== "string" || !uuid) return void 0;
+    const identity = {
+      accountUuid: uuid,
+      email: typeof data?.account?.email === "string" ? data.account.email : null
+    };
+    if (tokenIdentityCache.size > 64) tokenIdentityCache.clear();
+    tokenIdentityCache.set(token, identity);
+    return identity;
+  } catch {
+    return void 0;
   }
-  const fileAuth = await readCredentialsFile(expandedHomeDir);
-  if (fileAuth) return fileAuth;
-  if (process.platform === "darwin") return readMacKeychain();
-  return null;
+}
+async function getAuth(homeDir, expectedUuid) {
+  const candidates = await authCandidates(homeDir);
+  let wrongAccountEmail;
+  let sawExpired = false;
+  for (const { auth, shared } of candidates) {
+    if (auth.expiresAt !== void 0 && auth.expiresAt < Date.now() - 6e4) {
+      sawExpired = true;
+      continue;
+    }
+    if (!shared || !expectedUuid) return { auth };
+    const identity = await tokenIdentity(auth.token);
+    if (identity === void 0) return { auth };
+    if (identity === null) continue;
+    if (identity.accountUuid === expectedUuid) return { auth };
+    wrongAccountEmail = identity.email;
+  }
+  if (wrongAccountEmail !== void 0) return { auth: null, wrongAccountEmail };
+  return { auth: null, expired: sawExpired };
 }
 function planLabel(auth) {
   const sub = auth.subscriptionType;
@@ -1142,17 +1305,31 @@ function planLabel(auth) {
   return tier ? `${base} ${tier[1]}x` : base;
 }
 var pct = (used, resets, primary) => percentMetric("", used, resets ?? null, primary);
+function boolValue(value) {
+  if (typeof value === "boolean") return value;
+  if (typeof value === "number") return value !== 0;
+  if (typeof value === "string") return value.trim().toLowerCase() === "true" || value.trim() === "1";
+  return false;
+}
+function resetFrom(value) {
+  if (typeof value === "string" && value.trim()) return resetIn(value);
+  const n = numberValue(value);
+  if (n === void 0) return null;
+  const ms = Math.abs(n) < 1e10 ? n * 1e3 : n;
+  return resetIn(new Date(ms).toISOString());
+}
 function usageMetric(label, window, primary) {
-  if (!window || typeof window.utilization !== "number" || !Number.isFinite(window.utilization)) return null;
-  const resets = typeof window.resets_at === "string" && window.resets_at.trim() ? resetIn(window.resets_at) : null;
-  return { ...pct(window.utilization, resets, primary), label };
+  const used = numberValue(window?.utilization);
+  if (used === void 0) return null;
+  return { ...pct(used, resetFrom(window?.resets_at), primary), label };
 }
 async function claudeBilling(account) {
-  const [auth, identity] = await Promise.all([
-    getAuth(account.homeDir),
-    readClaudeIdentity(account.homeDir)
-  ]);
-  if (!auth) return { plan: identity.plan ?? null, metrics: [], error: "No OAuth token \u2014 run claude and log in", ...identityFields2(identity) };
+  const identity = readClaudeIdentity(account.homeDir);
+  const { auth, wrongAccountEmail, expired } = await getAuth(account.homeDir, identity.accountUuid);
+  if (!auth) {
+    const error = wrongAccountEmail !== void 0 ? `Signed in as ${wrongAccountEmail ?? "another account"} \u2014 run claude in this home to refresh` : expired ? "Token expired \u2014 run claude to refresh" : "No OAuth token \u2014 run claude and log in";
+    return { plan: identity.plan ?? null, metrics: [], error, ...identityFields(identity) };
+  }
   const plan = identity.plan ?? planLabel(auth);
   try {
     const res = await fetch("https://api.anthropic.com/api/oauth/usage", {
@@ -1163,30 +1340,37 @@ async function claudeBilling(account) {
       },
       signal: AbortSignal.timeout(1e4)
     });
-    if (res.status === 429) return { plan, metrics: [], error: "Rate limited \u2014 retrying next poll", ...identityFields2(identity) };
-    if (res.status === 401) return { plan, metrics: [], error: "Token expired \u2014 restart Claude Code", ...identityFields2(identity) };
-    if (!res.ok) return { plan, metrics: [], error: `API ${res.status}`, ...identityFields2(identity) };
+    if (res.status === 429) {
+      const retryAfter = numberValue(res.headers.get("retry-after"));
+      const retryText = retryAfter !== void 0 ? ` \u2014 retry in ~${Math.ceil(retryAfter / 60)}m` : " \u2014 retrying next poll";
+      return { plan, metrics: [], error: `Rate limited${retryText}`, ...identityFields(identity) };
+    }
+    if (res.status === 401) return { plan, metrics: [], error: "Token expired \u2014 run claude to refresh", ...identityFields(identity) };
+    if (!res.ok) return { plan, metrics: [], error: `API ${res.status}`, ...identityFields(identity) };
     const data = await readJson(res);
-    if (!data) return { plan, metrics: [], error: "Unexpected API response", ...identityFields2(identity) };
+    if (!data) return { plan, metrics: [], error: "Unexpected API response", ...identityFields(identity) };
     const metrics = [];
-    const fiveHour = usageMetric("5h", data.five_hour, true);
+    const fiveHour = usageMetric("Session", data.five_hour, true);
     if (fiveHour) metrics.push(fiveHour);
-    const sevenDay = usageMetric("Week", data.seven_day);
+    const sevenDay = usageMetric("Weekly", data.seven_day);
     if (sevenDay) metrics.push(sevenDay);
     const sevenDaySonnet = usageMetric("Sonnet", data.seven_day_sonnet);
     if (sevenDaySonnet) metrics.push(sevenDaySonnet);
-    if (data.extra_usage?.is_enabled) {
-      const monthlyLimit = data.extra_usage.monthly_limit;
-      metrics.push({
-        label: "Extra",
-        used: finite(data.extra_usage.used_credits) / 100,
-        limit: typeof monthlyLimit === "number" && Number.isFinite(monthlyLimit) ? monthlyLimit / 100 : null,
-        format: { kind: "dollars", currency: data.extra_usage.currency ?? "USD" }
-      });
+    if (boolValue(data.extra_usage?.is_enabled)) {
+      const usedCredits = numberValue(data.extra_usage?.used_credits);
+      const monthlyLimit = numberValue(data.extra_usage?.monthly_limit);
+      if (usedCredits !== void 0 && (usedCredits > 0 || monthlyLimit !== void 0 && monthlyLimit > 0)) {
+        metrics.push({
+          label: "Extra",
+          used: finite(usedCredits) / 100,
+          limit: monthlyLimit !== void 0 && monthlyLimit > 0 ? monthlyLimit / 100 : null,
+          format: { kind: "dollars", currency: data.extra_usage?.currency ?? "USD" }
+        });
+      }
     }
-    return { plan, metrics, error: null, ...identityFields2(identity) };
+    return { plan, metrics, error: null, ...identityFields(identity) };
   } catch {
-    return { plan, metrics: [], error: "Network error", ...identityFields2(identity) };
+    return { plan, metrics: [], error: "Network error", ...identityFields(identity) };
   }
 }
 
@@ -1204,11 +1388,11 @@ var claudeProvider = {
 };
 
 // src/providers/codex/usage.ts
-import { readdir as readdir2, stat as fsStat2, access as access3 } from "fs/promises";
+import { readdir as readdir2, stat as fsStat2, access as access3, open as openFile } from "fs/promises";
 import { createReadStream as createReadStream2 } from "fs";
 import { createInterface as createInterface2 } from "readline";
-import { join as join7 } from "path";
-import { homedir as homedir5 } from "os";
+import { join as join8 } from "path";
+import { homedir as homedir6 } from "os";
 var PRICING2 = {
   "gpt-5.5-codex": { in: 5e-6, cr: 5e-7, out: 3e-5 },
   "gpt-5.5": { in: 5e-6, cr: 5e-7, out: 3e-5 },
@@ -1220,21 +1404,26 @@ var PRICING2 = {
   "gpt-5": { in: 125e-8, cr: 125e-9, out: 1e-5 },
   "o4-mini": { in: 11e-7, cr: 275e-9, out: 44e-7 }
 };
-var ZERO_PRICE2 = { in: 0, cr: 0, out: 0 };
+var FALLBACK_PRICE = PRICING2["gpt-5.5"];
 var PRICE_KEYS2 = Object.keys(PRICING2).sort((a, b) => b.length - a.length);
 function codexHomes(homeDir) {
-  if (homeDir) return [.../* @__PURE__ */ new Set([join7(homeDir, ".codex"), homeDir])];
+  if (homeDir) return [.../* @__PURE__ */ new Set([join8(homeDir, ".codex"), homeDir])];
   const homes = [];
   const codexHome = envDir("CODEX_HOME");
   if (codexHome) homes.push(codexHome);
-  homes.push(join7(homedir5(), ".codex"));
-  homes.push(join7(homedir5(), ".config", "codex"));
+  homes.push(join8(homedir6(), ".codex"));
+  homes.push(join8(homedir6(), ".config", "codex"));
   return [...new Set(homes)];
 }
 async function detectCodex(homeDir) {
   for (const home of codexHomes(homeDir)) {
     try {
-      await access3(join7(home, "sessions"));
+      await access3(join8(home, "sessions"));
+      return true;
+    } catch {
+    }
+    try {
+      await access3(join8(home, "archived_sessions"));
       return true;
     } catch {
     }
@@ -1246,7 +1435,8 @@ function modelKeyMatches(model, key) {
   while (idx >= 0) {
     const before = idx === 0 ? "" : model[idx - 1];
     const rest = model.slice(idx + key.length);
-    if ((!before || !/[a-z0-9-]/.test(before)) && (rest === "" || rest[0] === "-" || !/[a-z0-9]/.test(rest[0]))) {
+    const versionContinues = rest[0] === "." && /\d/.test(rest[1] ?? "");
+    if ((!before || !/[a-z0-9-]/.test(before)) && !versionContinues && (rest === "" || rest[0] === "-" || !/[a-z0-9]/.test(rest[0]))) {
       return true;
     }
     idx = model.indexOf(key, idx + key.length);
@@ -1258,11 +1448,11 @@ function priceFor2(model) {
   for (const key of PRICE_KEYS2) {
     if (modelKeyMatches(m, key)) return PRICING2[key];
   }
-  return ZERO_PRICE2;
+  return FALLBACK_PRICE;
 }
 function extractModel(obj) {
   const p = obj?.payload ?? obj;
-  return p?.model || p?.collaboration_mode?.settings?.model || p?.model_slug || p?.config?.model || p?.info?.model || null;
+  return p?.model || p?.model_name || p?.collaboration_mode?.settings?.model || p?.model_slug || p?.config?.model || p?.info?.model || p?.info?.model_name || p?.info?.model_slug || p?.metadata?.model || p?.info?.metadata?.model || null;
 }
 function subtractClamped(cur, prev) {
   const sub = (a, b) => Math.max(0, (a ?? 0) - (b ?? 0));
@@ -1270,38 +1460,160 @@ function subtractClamped(cur, prev) {
     input_tokens: sub(cur.input_tokens, prev?.input_tokens),
     cached_input_tokens: sub(cur.cached_input_tokens, prev?.cached_input_tokens),
     output_tokens: sub(cur.output_tokens, prev?.output_tokens),
-    reasoning_output_tokens: sub(cur.reasoning_output_tokens, prev?.reasoning_output_tokens)
+    reasoning_output_tokens: sub(cur.reasoning_output_tokens, prev?.reasoning_output_tokens),
+    total_tokens: sub(cur.total_tokens, prev?.total_tokens)
+  };
+}
+function tokenNumber(obj, keys) {
+  for (const key of keys) {
+    const raw = obj?.[key];
+    const n = typeof raw === "number" ? raw : typeof raw === "string" && raw.trim() ? Number(raw) : NaN;
+    if (Number.isFinite(n) && n >= 0) return Math.floor(n);
+  }
+  return void 0;
+}
+function normalizeUsage(obj) {
+  if (!obj || typeof obj !== "object") return void 0;
+  const input = tokenNumber(obj, ["input_tokens", "prompt_tokens", "input"]);
+  const cached = tokenNumber(obj, ["cached_input_tokens", "cache_read_input_tokens", "cached_tokens"]);
+  const output = tokenNumber(obj, ["output_tokens", "completion_tokens", "output"]);
+  const reasoning = tokenNumber(obj, ["reasoning_output_tokens", "reasoning_tokens"]);
+  let total = tokenNumber(obj, ["total_tokens"]);
+  const hasUsage = [input, cached, output, reasoning, total].some((v) => v !== void 0);
+  if (!hasUsage) return void 0;
+  if (total === void 0 || total === 0 && (input ?? 0) + (output ?? 0) + (reasoning ?? 0) > 0) {
+    total = (input ?? 0) + (output ?? 0) + (reasoning ?? 0);
+  }
+  return {
+    input_tokens: input ?? 0,
+    cached_input_tokens: cached ?? 0,
+    output_tokens: output ?? 0,
+    reasoning_output_tokens: reasoning ?? 0,
+    total_tokens: total
   };
 }
 function eventSig(last, total) {
-  const f = (x) => x ? `${x.input_tokens ?? 0},${x.cached_input_tokens ?? 0},${x.output_tokens ?? 0},${x.reasoning_output_tokens ?? 0}` : "-";
+  const f = (x) => x ? `${x.input_tokens ?? 0},${x.cached_input_tokens ?? 0},${x.output_tokens ?? 0},${x.reasoning_output_tokens ?? 0},${x.total_tokens ?? 0}` : "-";
   return `${f(last)}|${f(total)}`;
 }
+function timestampMs2(value) {
+  if (typeof value === "number" && Number.isFinite(value)) return value > 1e10 ? value : value * 1e3;
+  if (typeof value === "string" && value.trim()) return new Date(value.trim()).getTime();
+  return NaN;
+}
+function timestampSecond(value) {
+  if (typeof value === "string" && value.trim().length >= 19) return value.trim().slice(0, 19);
+  const ts = timestampMs2(value);
+  return Number.isFinite(ts) ? new Date(ts).toISOString().slice(0, 19) : null;
+}
+async function hasThreadSpawn(path) {
+  let handle = null;
+  try {
+    handle = await openFile(path, "r");
+    const buffer = Buffer.alloc(16 * 1024);
+    const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0);
+    return buffer.subarray(0, bytesRead).includes("thread_spawn");
+  } catch {
+    return false;
+  } finally {
+    await handle?.close().catch(() => {
+    });
+  }
+}
+async function detectReplaySecond(path) {
+  if (!await hasThreadSpawn(path)) return null;
+  let first = null;
+  const input = createReadStream2(path);
+  input.on("error", () => {
+  });
+  const rl = createInterface2({ input, crlfDelay: Infinity });
+  try {
+    for await (const rawLine of rl) {
+      if (!rawLine.includes("token_count")) continue;
+      try {
+        const line = rawLine.charCodeAt(0) === 65279 ? rawLine.slice(1) : rawLine;
+        const obj = JSON.parse(line);
+        if ((obj?.payload?.type ?? obj?.type) !== "token_count") continue;
+        const info = obj?.payload?.info;
+        if (!normalizeUsage(info?.last_token_usage) && !normalizeUsage(info?.total_token_usage)) continue;
+        const second = timestampSecond(obj.timestamp ?? obj?.payload?.timestamp);
+        if (!second) continue;
+        if (!first) first = second;
+        else return first === second ? second : null;
+      } catch {
+      }
+    }
+  } catch {
+  }
+  return null;
+}
+function findUsage(obj) {
+  return normalizeUsage(obj?.usage) ?? normalizeUsage(obj?.payload?.usage) ?? normalizeUsage(obj?.payload?.info?.usage) ?? normalizeUsage(obj?.result?.usage) ?? normalizeUsage(obj?.response?.usage) ?? normalizeUsage(obj?.token_usage) ?? normalizeUsage(obj);
+}
+function findTimestamp(obj) {
+  return timestampMs2(obj?.timestamp ?? obj?.payload?.timestamp ?? obj?.created_at ?? obj?.createdAt ?? obj?.time);
+}
 async function parseFile2(path) {
   const entries = [];
-  let model = "unknown";
+  let model = "gpt-5";
   let prevTotal = null;
   let prevSig = null;
+  const replaySecond = await detectReplaySecond(path);
+  let skipReplay = replaySecond !== null;
   const input = createReadStream2(path);
   input.on("error", () => {
   });
   const rl = createInterface2({ input, crlfDelay: Infinity });
   try {
     for await (const rawLine of rl) {
-      if (!rawLine.includes("token_count") && !rawLine.includes("turn_context")) continue;
+      if (!rawLine.includes("token_count") && !rawLine.includes("turn_context") && !rawLine.includes('"usage"') && !rawLine.includes("input_tokens") && !rawLine.includes("prompt_tokens")) continue;
       try {
         const line = rawLine.charCodeAt(0) === 65279 ? rawLine.slice(1) : rawLine;
         const obj = JSON.parse(line);
         const payloadType = obj?.payload?.type ?? obj?.type;
         if (payloadType === "turn_context") {
-          const m = extractModel(obj);
-          if (typeof m === "string" && m.trim()) model = m;
+          const m2 = extractModel(obj);
+          if (typeof m2 === "string" && m2.trim()) model = m2;
+          continue;
+        }
+        if (payloadType !== "token_count") {
+          const usage = findUsage(obj);
+          if (!usage) continue;
+          const m2 = extractModel(obj);
+          if (typeof m2 === "string" && m2.trim()) model = m2;
+          const ts2 = findTimestamp(obj);
+          if (!Number.isFinite(ts2)) continue;
+          const inputTotal2 = safeNum(usage.input_tokens);
+          const cached2 = Math.min(safeNum(usage.cached_input_tokens), inputTotal2);
+          const inputTokens2 = inputTotal2 - cached2;
+          const output2 = safeNum(usage.output_tokens);
+          if (inputTokens2 + output2 + cached2 === 0) continue;
+          const p2 = priceFor2(model);
+          entries.push({
+            id: `${ts2}|${model}|${inputTotal2}|${cached2}|${output2}|${safeNum(usage.reasoning_output_tokens)}|${safeNum(usage.total_tokens)}`,
+            ts: ts2,
+            model,
+            cost: inputTokens2 * p2.in + cached2 * p2.cr + output2 * p2.out,
+            input: inputTokens2,
+            output: output2,
+            cacheCreate: 0,
+            cacheRead: cached2,
+            cacheSavings: cached2 * (p2.in - p2.cr)
+          });
           continue;
         }
-        if (payloadType !== "token_count") continue;
         const info = obj?.payload?.info;
-        const total = info?.total_token_usage;
-        const last = info?.last_token_usage;
+        const total = normalizeUsage(info?.total_token_usage);
+        const last = normalizeUsage(info?.last_token_usage);
+        const tsValue = obj.timestamp ?? obj?.payload?.timestamp;
+        if (skipReplay && replaySecond) {
+          const second = timestampSecond(tsValue);
+          if (second === replaySecond) {
+            if (total) prevTotal = total;
+            continue;
+          }
+          if (second) skipReplay = false;
+        }
         const sig = eventSig(last, total);
         if (sig === prevSig) continue;
         prevSig = sig;
@@ -1312,8 +1624,10 @@ async function parseFile2(path) {
         }
         if (total) prevTotal = total;
         if (!d) continue;
-        const ts = new Date(obj.timestamp ?? obj?.payload?.timestamp ?? 0).getTime();
+        const ts = timestampMs2(tsValue);
         if (!Number.isFinite(ts)) continue;
+        const m = extractModel(obj);
+        if (typeof m === "string" && m.trim()) model = m;
         const inputTotal = safeNum(d.input_tokens);
         const cached = Math.min(safeNum(d.cached_input_tokens), inputTotal);
         const inputTokens = inputTotal - cached;
@@ -1321,6 +1635,7 @@ async function parseFile2(path) {
         if (inputTokens + output + cached === 0) continue;
         const p = priceFor2(model);
         entries.push({
+          id: `${ts}|${model}|${inputTotal}|${cached}|${output}|${safeNum(d.reasoning_output_tokens)}|${safeNum(d.total_tokens)}`,
           ts,
           model,
           cost: inputTokens * p.in + cached * p.cr + output * p.out,
@@ -1342,28 +1657,28 @@ async function loadEntries2(since, homeDir) {
   const seen = /* @__PURE__ */ new Set();
   const seenIno = /* @__PURE__ */ new Set();
   for (const home of codexHomes(homeDir)) {
-    const dir = join7(home, "sessions");
-    let listing;
-    try {
-      listing = await readdir2(dir, { recursive: true });
-    } catch {
-      continue;
-    }
-    for (const f of listing) {
-      if (!f.endsWith(".jsonl") || !f.includes("rollout-")) continue;
-      const path = join7(dir, f);
-      if (seen.has(path)) continue;
-      seen.add(path);
+    for (const dir of [join8(home, "sessions"), join8(home, "archived_sessions")]) {
+      let listing;
       try {
-        const s = await fsStat2(path);
-        if (s.mtimeMs < since) continue;
-        if (s.ino && process.platform !== "win32") {
-          const idn = `${s.dev}:${s.ino}`;
-          if (seenIno.has(idn)) continue;
-          seenIno.add(idn);
-        }
-        files.push({ path, mtimeMs: s.mtimeMs, size: s.size });
+        listing = await readdir2(dir, { recursive: true });
       } catch {
+        continue;
+      }
+      for (const f of listing) {
+        if (!f.endsWith(".jsonl")) continue;
+        const path = join8(dir, f);
+        if (seen.has(path)) continue;
+        seen.add(path);
+        try {
+          const s = await fsStat2(path);
+          if (s.ino && process.platform !== "win32") {
+            const idn = `${s.dev}:${s.ino}`;
+            if (seenIno.has(idn)) continue;
+            seenIno.add(idn);
+          }
+          files.push({ path, mtimeMs: s.mtimeMs, size: s.size });
+        } catch {
+        }
       }
     }
   }
@@ -1382,18 +1697,10 @@ async function codexTable(tz, homeDir) {
 import { readFile as readFile3, readdir as readdir3, stat as fsStat3 } from "fs/promises";
 import { createReadStream as createReadStream3 } from "fs";
 import { createInterface as createInterface3 } from "readline";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 var USAGE_URL2 = "https://chatgpt.com/backend-api/wham/usage";
+var RESET_CREDITS_URL = "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits";
 var CREDIT_USD_RATE = 0.04;
-function decodeBase64UrlJson(segment) {
-  try {
-    const normalized = segment.replace(/-/g, "+").replace(/_/g, "/");
-    const padded = normalized + "=".repeat((4 - normalized.length % 4) % 4);
-    return JSON.parse(Buffer.from(padded, "base64").toString("utf8"));
-  } catch {
-    return null;
-  }
-}
 function chatGptPlanLabel(planType) {
   if (typeof planType !== "string" || !planType.trim()) return null;
   const p = planType.trim().toLowerCase();
@@ -1408,28 +1715,19 @@ function chatGptPlanLabel(planType) {
   if (labels[p]) return labels[p];
   return `ChatGPT ${p.charAt(0).toUpperCase()}${p.slice(1)}`;
 }
-function identityFromIdToken(idToken) {
-  if (typeof idToken !== "string" || !idToken.includes(".")) return {};
-  const payload = decodeBase64UrlJson(idToken.split(".")[1]);
-  if (!payload || typeof payload !== "object") return {};
-  const email = typeof payload.email === "string" && payload.email.trim() ? payload.email.trim() : void 0;
-  const displayName = typeof payload.name === "string" && payload.name.trim() ? payload.name.trim() : typeof payload.given_name === "string" && payload.given_name.trim() ? payload.given_name.trim() : void 0;
+function codexIdentity(idToken) {
+  const { email, displayName, payload } = identityFromIdToken(idToken);
+  if (!payload) return {};
   const plan = chatGptPlanLabel(payload["https://api.openai.com/auth"]?.chatgpt_plan_type);
   return { email, displayName, plan: plan ?? void 0 };
 }
-function identityFields3(auth) {
-  return {
-    email: auth?.email ?? null,
-    displayName: auth?.displayName ?? null
-  };
-}
 async function readAuthFile(home) {
   try {
-    const raw = await readFile3(join8(home, "auth.json"), "utf-8");
+    const raw = await readFile3(join9(home, "auth.json"), "utf-8");
     const auth = JSON.parse(raw);
     const accessToken = auth?.tokens?.access_token;
     if (!accessToken) return null;
-    return { accessToken, accountId: auth?.tokens?.account_id, ...identityFromIdToken(auth?.tokens?.id_token) };
+    return { accessToken, accountId: auth?.tokens?.account_id, ...codexIdentity(auth?.tokens?.id_token) };
   } catch {
     return null;
   }
@@ -1441,7 +1739,7 @@ async function readKeychainAuth() {
     const auth = JSON.parse(raw);
     const accessToken = auth?.tokens?.access_token;
     if (!accessToken) return null;
-    return { accessToken, accountId: auth?.tokens?.account_id, ...identityFromIdToken(auth?.tokens?.id_token) };
+    return { accessToken, accountId: auth?.tokens?.account_id, ...codexIdentity(auth?.tokens?.id_token) };
   } catch {
     return null;
   }
@@ -1451,7 +1749,7 @@ async function getAuth2(homeDir) {
     const auth = await readAuthFile(home);
     if (auth) return auth;
   }
-  if (process.platform === "darwin") return readKeychainAuth();
+  if (!homeDir && process.platform === "darwin") return readKeychainAuth();
   return null;
 }
 function planLabel2(planType) {
@@ -1461,14 +1759,93 @@ function planLabel2(planType) {
   if (p === "pro") return "Pro 20x";
   return planType.charAt(0).toUpperCase() + planType.slice(1);
 }
-function resetFrom(window) {
+function resetDateMs(window) {
   if (!window) return null;
-  let iso = null;
-  if (typeof window.reset_at === "number") iso = msToIso(window.reset_at * 1e3);
-  else if (typeof window.resets_at === "number") iso = msToIso(window.resets_at * 1e3);
-  else if (typeof window.reset_after_seconds === "number") iso = msToIso(Date.now() + window.reset_after_seconds * 1e3);
+  const absolute = numberValue(window.reset_at ?? window.resets_at);
+  if (absolute !== void 0) return absolute > 1e10 ? absolute : absolute * 1e3;
+  const after = numberValue(window.reset_after_seconds);
+  if (after !== void 0) return Date.now() + after * 1e3;
+  for (const key of ["reset_at", "resets_at"]) {
+    const raw = window[key];
+    if (typeof raw === "string" && raw.trim()) {
+      const parsed = new Date(raw).getTime();
+      if (Number.isFinite(parsed)) return parsed;
+    }
+  }
+  return null;
+}
+function resetFrom2(window) {
+  const ms = resetDateMs(window);
+  const iso = ms === null ? null : msToIso(ms);
   return iso ? resetIn(iso) : null;
 }
+function windowSeconds(window) {
+  const seconds = numberValue(window?.limit_window_seconds ?? window?.period_seconds ?? window?.window_seconds);
+  if (seconds !== void 0) return seconds;
+  const minutes = numberValue(window?.limit_window_minutes ?? window?.window_minutes ?? window?.period_minutes);
+  return minutes === void 0 ? void 0 : minutes * 60;
+}
+function normalizedUsedPercent(window, percent) {
+  const used = numberValue(percent);
+  if (used === void 0) return void 0;
+  const periodSeconds = windowSeconds(window);
+  const resetMs = resetDateMs(window);
+  if (periodSeconds && resetMs) {
+    const elapsedMs = periodSeconds * 1e3 - Math.max(0, resetMs - Date.now());
+    if (elapsedMs <= 6e4 && used <= 1) return 0;
+  }
+  return Math.max(0, used);
+}
+function metricLabelForAdditional(window) {
+  const name = String(window?.limit_name ?? window?.name ?? window?.metered_feature ?? window?.feature ?? "").toLowerCase();
+  if (!name.includes("spark")) return null;
+  const seconds = windowSeconds(window);
+  return name.includes("week") || seconds !== void 0 && seconds >= 6 * 24 * 60 * 60 ? "Spark Weekly" : "Spark";
+}
+function additionalRateLimits(rl) {
+  const raw = rl?.additional_rate_limits ?? rl?.additionalRateLimits ?? rl?.additional;
+  if (Array.isArray(raw)) return raw;
+  if (raw && typeof raw === "object") return Object.values(raw);
+  return [];
+}
+function appendWindowMetrics(metrics, rl, headerPct) {
+  const primary = rl?.primary_window ?? rl?.primary ?? null;
+  const secondary = rl?.secondary_window ?? rl?.secondary ?? null;
+  const primaryPct = normalizedUsedPercent(primary, primary?.used_percent ?? primary?.percent_used ?? headerPct?.("x-codex-primary-used-percent"));
+  const secondaryPct = normalizedUsedPercent(secondary, secondary?.used_percent ?? secondary?.percent_used ?? headerPct?.("x-codex-secondary-used-percent"));
+  if (primaryPct !== void 0) metrics.push(percentMetric("Session", primaryPct, resetFrom2(primary), true));
+  if (secondaryPct !== void 0) metrics.push(percentMetric("Weekly", secondaryPct, resetFrom2(secondary)));
+  for (const item of additionalRateLimits(rl)) {
+    const label = metricLabelForAdditional(item);
+    if (!label) continue;
+    const used = normalizedUsedPercent(item, item?.used_percent ?? item?.percent_used);
+    if (used === void 0) continue;
+    metrics.push(percentMetric(label, used, resetFrom2(item)));
+  }
+}
+function appendCredits2(metrics, source) {
+  const balance = numberValue(source?.credits?.balance ?? source?.credit_balance);
+  if (balance !== void 0 && balance >= 0) {
+    metrics.push({ label: "Credits", used: balance * CREDIT_USD_RATE, limit: null, format: { kind: "dollars" } });
+  }
+}
+async function fetchResetCredits(headers) {
+  try {
+    const res = await fetch(RESET_CREDITS_URL, {
+      headers: {
+        ...headers,
+        "OpenAI-Beta": "codex-1",
+        "originator": "Codex Desktop"
+      },
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (!res.ok) return void 0;
+    const data = await readJson(res);
+    return numberValue(data?.available_count ?? data?.available ?? data?.remaining);
+  } catch {
+    return void 0;
+  }
+}
 async function liveBilling(auth) {
   try {
     const headers = {
@@ -1481,34 +1858,31 @@ async function liveBilling(auth) {
     if (!res.ok) return null;
     const data = await readJson(res);
     if (!data) return null;
-    const metrics = [];
-    const rl = data.rate_limit ?? null;
-    const primary = rl?.primary_window ?? null;
-    const secondary = rl?.secondary_window ?? null;
     const headerPct = (name) => {
       const h = res.headers.get(name);
       if (h === null || h.trim() === "") return void 0;
       const n = Number(h);
       return Number.isFinite(n) ? n : void 0;
     };
-    const primaryPct = headerPct("x-codex-primary-used-percent") ?? primary?.used_percent;
-    const secondaryPct = headerPct("x-codex-secondary-used-percent") ?? secondary?.used_percent;
-    if (typeof primaryPct === "number" && Number.isFinite(primaryPct)) metrics.push(percentMetric("5h", primaryPct, resetFrom(primary), true));
-    if (typeof secondaryPct === "number" && Number.isFinite(secondaryPct)) metrics.push(percentMetric("Week", secondaryPct, resetFrom(secondary)));
-    const balance = data?.credits?.balance;
-    if (typeof balance === "number" && Number.isFinite(balance) && balance >= 0) {
-      metrics.push({ label: "Credits", used: balance * CREDIT_USD_RATE, limit: null, format: { kind: "dollars" } });
+    const metrics = [];
+    appendWindowMetrics(metrics, data.rate_limit ?? data, headerPct);
+    appendCredits2(metrics, data);
+    const resetCredits = numberValue(data?.rate_limit_reset_credits?.available_count ?? data?.rate_limit_reset_credits?.available) ?? await fetchResetCredits(headers);
+    if (resetCredits !== void 0 && resetCredits >= 0) {
+      metrics.push({ label: "Resets", used: resetCredits, limit: null, format: { kind: "count", suffix: "available" } });
     }
     if (metrics.length === 0) return null;
-    return { plan: auth.plan ?? planLabel2(data.plan_type), metrics, error: null, ...identityFields3(auth) };
+    return { plan: auth.plan ?? planLabel2(data.plan_type), metrics, error: null, ...identityFields(auth) };
   } catch {
     return null;
   }
 }
-async function newestRolloutFile(homeDir) {
-  let best = null;
+var SNAPSHOT_CANDIDATES = 8;
+var SNAPSHOT_STALE_MS = 24 * 36e5;
+async function newestRolloutFiles(homeDir) {
+  const all = [];
   for (const home of codexHomes(homeDir)) {
-    const dir = join8(home, "sessions");
+    const dir = join9(home, "sessions");
     let listing;
     try {
       listing = await readdir3(dir, { recursive: true });
@@ -1517,19 +1891,17 @@ async function newestRolloutFile(homeDir) {
     }
     for (const f of listing) {
       if (!f.endsWith(".jsonl") || !f.includes("rollout-")) continue;
-      const path = join8(dir, f);
+      const path = join9(dir, f);
       try {
         const s = await fsStat3(path);
-        if (!best || s.mtimeMs > best.mtime) best = { path, mtime: s.mtimeMs };
+        all.push({ path, mtime: s.mtimeMs });
       } catch {
       }
     }
   }
-  return best?.path ?? null;
+  return all.sort((a, b) => b.mtime - a.mtime).slice(0, SNAPSHOT_CANDIDATES);
 }
-async function snapshotBilling(homeDir, auth = null) {
-  const path = await newestRolloutFile(homeDir);
-  if (!path) return null;
+async function lastRateLimits(path) {
   let last = null;
   try {
     const input = createReadStream3(path);
@@ -1547,20 +1919,23 @@ async function snapshotBilling(homeDir, auth = null) {
   } catch {
     return null;
   }
-  if (!last) return null;
-  const metrics = [];
-  if (typeof last.primary?.used_percent === "number" && Number.isFinite(last.primary.used_percent)) {
-    metrics.push(percentMetric("5h", last.primary.used_percent, resetFrom(last.primary), true));
-  }
-  if (typeof last.secondary?.used_percent === "number" && Number.isFinite(last.secondary.used_percent)) {
-    metrics.push(percentMetric("Week", last.secondary.used_percent, resetFrom(last.secondary)));
-  }
-  const balance = last?.credits?.balance;
-  if (typeof balance === "number" && Number.isFinite(balance) && balance >= 0) {
-    metrics.push({ label: "Credits", used: balance * CREDIT_USD_RATE, limit: null, format: { kind: "dollars" } });
+  return last;
+}
+async function snapshotBilling(homeDir, auth = null) {
+  for (const file of await newestRolloutFiles(homeDir)) {
+    const last = await lastRateLimits(file.path);
+    if (!last) continue;
+    const metrics = [];
+    appendWindowMetrics(metrics, last.rate_limit ?? last);
+    appendCredits2(metrics, last);
+    const resetCredits = numberValue(last?.rate_limit_reset_credits?.available_count ?? last?.rate_limit_reset_credits?.available);
+    if (resetCredits !== void 0 && resetCredits >= 0) {
+      metrics.push({ label: "Resets", used: resetCredits, limit: null, format: { kind: "count", suffix: "available" } });
+    }
+    if (metrics.length === 0) continue;
+    return { plan: auth?.plan ?? planLabel2(last.plan_type), metrics, error: null, asOfMs: file.mtime, ...identityFields(auth) };
   }
-  if (metrics.length === 0) return null;
-  return { plan: auth?.plan ?? planLabel2(last.plan_type), metrics, error: null, ...identityFields3(auth) };
+  return null;
 }
 async function codexBilling(account) {
   const auth = await getAuth2(account.homeDir);
@@ -1569,12 +1944,15 @@ async function codexBilling(account) {
     if (live) return live;
   }
   const snap = await snapshotBilling(account.homeDir, auth);
-  if (snap) return snap;
+  if (snap && Date.now() - snap.asOfMs < SNAPSHOT_STALE_MS) {
+    const { asOfMs: _asOfMs, ...result } = snap;
+    return result;
+  }
   return {
-    plan: auth?.plan ?? null,
+    plan: auth?.plan ?? snap?.plan ?? null,
     metrics: [],
     error: auth ? "Usage API failed \u2014 run codex to refresh" : "Not logged in \u2014 run codex",
-    ...identityFields3(auth)
+    ...identityFields(auth)
   };
 }
 
@@ -1751,17 +2129,17 @@ var cursorProvider = {
   hasBilling: true,
   detect: (homeDir) => detectCursor(homeDir),
   fetchTable: (account, tz) => cursorTable(tz, account.homeDir),
-  fetchBilling: (account) => cursorBilling(account)
+  fetchBilling: (account, tz) => cursorBilling(account, tz)
 };
 
 // src/providers/pi/usage.ts
 import { readdir as readdir4, stat as fsStat4, access as access4 } from "fs/promises";
 import { createReadStream as createReadStream4 } from "fs";
 import { createInterface as createInterface4 } from "readline";
-import { join as join9 } from "path";
-import { homedir as homedir6 } from "os";
+import { join as join10 } from "path";
+import { homedir as homedir7 } from "os";
 function piSessionsDir(homeDir) {
-  return join9(homeDir ?? homedir6(), ".pi", "agent", "sessions");
+  return join10(homeDir ?? homedir7(), ".pi", "agent", "sessions");
 }
 async function detectPi(homeDir) {
   try {
@@ -1771,6 +2149,11 @@ async function detectPi(homeDir) {
     return false;
   }
 }
+function timestampMs3(value) {
+  if (typeof value === "number" && Number.isFinite(value)) return value > 1e10 ? value : value * 1e3;
+  if (typeof value === "string" && value.trim()) return new Date(value.trim()).getTime();
+  return NaN;
+}
 async function parseFile3(path) {
   const entries = [];
   const rl = createInterface4({ input: createReadStream4(path), crlfDelay: Infinity });
@@ -1783,7 +2166,7 @@ async function parseFile3(path) {
       const msg = obj.message;
       if (msg?.role !== "assistant" || !msg?.usage) continue;
       const u = msg.usage;
-      const ts = new Date(obj.timestamp ?? msg.timestamp ?? 0).getTime();
+      const ts = timestampMs3(obj.timestamp ?? msg.timestamp);
       if (!Number.isFinite(ts)) continue;
       const input = safeNum(u.input);
       const output = safeNum(u.output);
@@ -1821,7 +2204,7 @@ async function loadEntries3(since, homeDir) {
   }
   for (const f of listing) {
     if (!f.endsWith(".jsonl")) continue;
-    const path = join9(dir, f);
+    const path = join10(dir, f);
     try {
       const s = await fsStat4(path);
       if (s.mtimeMs < since) continue;
@@ -1857,17 +2240,17 @@ var piProvider = {
 
 // src/providers/opencode/usage.ts
 import { access as access5 } from "fs/promises";
-import { join as join10 } from "path";
-import { homedir as homedir7 } from "os";
+import { join as join11 } from "path";
+import { homedir as homedir8 } from "os";
 function opencodeDbPaths(homeDir) {
-  const base = homeDir ?? homedir7();
+  const base = homeDir ?? homedir8();
   const paths = [];
-  if (!homeDir && process.env.XDG_DATA_HOME) paths.push(join10(process.env.XDG_DATA_HOME, "opencode", "opencode.db"));
-  paths.push(join10(base, ".local", "share", "opencode", "opencode.db"));
-  if (process.platform === "darwin") paths.push(join10(base, "Library", "Application Support", "opencode", "opencode.db"));
+  if (!homeDir && process.env.XDG_DATA_HOME) paths.push(join11(process.env.XDG_DATA_HOME, "opencode", "opencode.db"));
+  paths.push(join11(base, ".local", "share", "opencode", "opencode.db"));
+  if (process.platform === "darwin") paths.push(join11(base, "Library", "Application Support", "opencode", "opencode.db"));
   if (process.platform === "win32") {
-    const lad = homeDir ? join10(homeDir, "AppData", "Local") : process.env.LOCALAPPDATA;
-    if (lad) paths.push(join10(lad, "opencode", "opencode.db"));
+    const lad = homeDir ? join11(homeDir, "AppData", "Local") : process.env.LOCALAPPDATA;
+    if (lad) paths.push(join11(lad, "opencode", "opencode.db"));
   }
   return [...new Set(paths)];
 }
@@ -1887,7 +2270,7 @@ async function detectOpencode(homeDir) {
 async function loadEntries4(since, homeDir) {
   const db = await findDb(homeDir);
   if (!db) return [];
-  const sql = "SELECT time_created AS ts, json_extract(data,'$.modelID') AS model, json_extract(data,'$.cost') AS cost, json_extract(data,'$.tokens.input') AS input, json_extract(data,'$.tokens.output') AS output, json_extract(data,'$.tokens.reasoning') AS reasoning, json_extract(data,'$.tokens.cache.read') AS cacheRead, json_extract(data,'$.tokens.cache.write') AS cacheWrite FROM message WHERE json_valid(data) AND json_extract(data,'$.role')='assistant' AND json_type(data,'$.tokens')='object' AND time_created >= ?;";
+  const sql = "SELECT CASE WHEN time_created < 10000000000 THEN time_created * 1000 ELSE time_created END AS ts, json_extract(data,'$.modelID') AS model, json_extract(data,'$.cost') AS cost, json_extract(data,'$.tokens.input') AS input, json_extract(data,'$.tokens.output') AS output, json_extract(data,'$.tokens.reasoning') AS reasoning, json_extract(data,'$.tokens.cache.read') AS cacheRead, json_extract(data,'$.tokens.cache.write') AS cacheWrite FROM message WHERE json_valid(data) AND json_extract(data,'$.role')='assistant' AND json_type(data,'$.tokens')='object' AND (CASE WHEN time_created < 10000000000 THEN time_created * 1000 ELSE time_created END) >= ?;";
   const res = await runSqlite(db, sql, [Math.floor(since)]);
   if (res.status !== "ok") return [];
   const entries = [];
@@ -1895,7 +2278,7 @@ async function loadEntries4(since, homeDir) {
     const ts = finitePositive(row.ts);
     if (!ts) continue;
     const input = finitePositive(row.input);
-    const output = finitePositive(row.output);
+    const output = finitePositive(row.output) + finitePositive(row.reasoning);
     const cacheRead = finitePositive(row.cacheRead);
     const cacheCreate = finitePositive(row.cacheWrite);
     if (input + output + cacheRead + cacheCreate === 0) continue;
@@ -1935,107 +2318,6 @@ var opencodeProvider = {
 import { access as access6, readFile as readFile4, readdir as readdir5 } from "fs/promises";
 import { join as join12 } from "path";
 import { homedir as homedir9 } from "os";
-
-// src/providers/detect.ts
-import { accessSync as accessSync2, constants as constants2, existsSync } from "fs";
-import { join as join11, delimiter as delimiter2, isAbsolute as isAbsolute2 } from "path";
-import { homedir as homedir8 } from "os";
-function searchDirs() {
-  const home = homedir8();
-  const fromEnv = (process.env.PATH ?? "").split(delimiter2).filter(Boolean);
-  const extra = process.platform === "win32" ? [
-    process.env.APPDATA && join11(process.env.APPDATA, "npm"),
-    process.env.LOCALAPPDATA && join11(process.env.LOCALAPPDATA, "pnpm"),
-    join11(home, "scoop", "shims")
-  ] : [
-    "/opt/homebrew/bin",
-    "/usr/local/bin",
-    "/usr/bin",
-    "/bin",
-    "/opt/local/bin",
-    join11(home, ".local", "bin"),
-    join11(home, "bin"),
-    join11(home, ".npm-global", "bin"),
-    join11(home, ".bun", "bin"),
-    join11(home, ".local", "share", "pnpm")
-  ];
-  return [.../* @__PURE__ */ new Set([...fromEnv, ...extra.filter((d) => !!d)])];
-}
-function isExec2(p) {
-  try {
-    accessSync2(p, process.platform === "win32" ? constants2.F_OK : constants2.X_OK);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function onPath(names) {
-  const exts = process.platform === "win32" ? (process.env.PATHEXT ?? ".EXE;.CMD;.BAT;.COM").split(";").map((e) => e.toLowerCase()).concat("") : [""];
-  for (const dir of searchDirs()) {
-    for (const n of names) {
-      for (const e of exts) {
-        if (isExec2(join11(dir, n + e))) return true;
-      }
-    }
-  }
-  return false;
-}
-function anyExists(paths) {
-  return paths.some((p) => !!p && isExec2(p));
-}
-function installSignals(id) {
-  const home = homedir8();
-  const pf = process.env.ProgramFiles;
-  const pf86 = process.env["ProgramFiles(x86)"];
-  const lad = process.env.LOCALAPPDATA;
-  switch (id) {
-    case "claude":
-      return onPath(["claude"]) || anyExists([
-        "/Applications/Claude.app",
-        join11(home, "Applications", "Claude.app"),
-        lad && join11(lad, "Programs", "claude", "Claude.exe")
-      ]);
-    case "codex": {
-      const bin = process.env.CODEX_BIN;
-      if (bin && isAbsolute2(bin) && isExec2(bin)) return true;
-      return onPath(["codex"]) || anyExists([
-        lad && join11(lad, "Programs", "OpenAI", "Codex", "bin", "codex.exe"),
-        lad && join11(lad, "Programs", "OpenAI", "Codex", "codex.exe"),
-        lad && join11(lad, "Programs", "codex", "codex.exe"),
-        pf && join11(pf, "OpenAI", "Codex", "bin", "codex.exe")
-      ]) || existsSync(join11(home, ".codex", "sessions")) || existsSync(join11(home, ".codex", "auth.json"));
-    }
-    case "cursor":
-      return onPath(["cursor", "cursor-agent"]) || anyExists([
-        "/Applications/Cursor.app",
-        join11(home, "Applications", "Cursor.app"),
-        lad && join11(lad, "Programs", "cursor", "Cursor.exe"),
-        pf && join11(pf, "Cursor", "Cursor.exe"),
-        pf86 && join11(pf86, "Cursor", "Cursor.exe"),
-        "/opt/Cursor/cursor",
-        "/usr/share/cursor/cursor",
-        "/usr/bin/cursor"
-      ]);
-    case "pi":
-      return onPath(["pi"]);
-    case "opencode":
-      return onPath(["opencode"]);
-    case "copilot":
-      return onPath(["gh"]);
-    case "antigravity":
-      return onPath(["antigravity"]) || anyExists([
-        "/Applications/Antigravity.app",
-        join11(home, "Applications", "Antigravity.app"),
-        lad && join11(lad, "Programs", "Antigravity", "Antigravity.exe")
-      ]);
-    case "gemini":
-      return onPath(["gemini"]);
-    default:
-      return false;
-  }
-}
-
-// src/providers/copilot/billing.ts
 var USAGE_URL3 = "https://api.github.com/copilot_internal/user";
 var GH_KEYCHAIN_SERVICE = "gh:github.com";
 function ghConfigDir(homeDir) {
@@ -2054,12 +2336,24 @@ function ghHostsPath(homeDir) {
   return join12(ghConfigDir(homeDir), "hosts.yml");
 }
 async function detectCopilot(homeDir) {
-  try {
-    await access6(ghHostsPath(homeDir));
-    return true;
-  } catch {
+  const home = homeDir ?? homedir9();
+  const candidates = [
+    join12(home, ".config", "github-copilot"),
+    join12(home, ".copilot"),
+    join12(vscodeUserDir(homeDir), "globalStorage", "github.copilot"),
+    join12(vscodeUserDir(homeDir), "globalStorage", "github.copilot-chat")
+  ];
+  if (process.platform === "win32") {
+    candidates.push(join12(envDir("LOCALAPPDATA") ?? join12(home, "AppData", "Local"), "github-copilot"));
   }
-  return onPath(["gh"]);
+  for (const path of candidates) {
+    try {
+      await access6(path);
+      return true;
+    } catch {
+    }
+  }
+  return false;
 }
 function unquoteYamlValue(value) {
   const trimmed = value.trim();
@@ -2148,7 +2442,7 @@ async function loadTokenFromVsCode(homeDir) {
   return null;
 }
 async function loadToken(homeDir) {
-  return await loadTokenFromHosts(homeDir) || await loadTokenFromGhKeychain() || await loadTokenFromVsCode(homeDir);
+  return await loadTokenFromHosts(homeDir) || (homeDir ? null : await loadTokenFromGhKeychain()) || await loadTokenFromVsCode(homeDir);
 }
 function redactToken(token) {
   return token.length <= 4 ? "****" : `****${token.slice(-4)}`;
@@ -2156,13 +2450,27 @@ function redactToken(token) {
 function resetDate(value) {
   return typeof value === "string" && value.trim() ? resetIn(value) : null;
 }
+function boolValue2(value) {
+  if (typeof value === "boolean") return value;
+  if (typeof value === "number") return value !== 0;
+  if (typeof value === "string") {
+    const s = value.trim().toLowerCase();
+    if (s === "true" || s === "1") return true;
+    if (s === "false" || s === "0") return false;
+  }
+  return void 0;
+}
 function percentMetric2(label, snapshot, reset, primary) {
-  if (!snapshot || typeof snapshot.percent_remaining !== "number" || !Number.isFinite(snapshot.percent_remaining)) return null;
-  if (snapshot.unlimited === true || snapshot.entitlement === 0) return null;
-  const used = Math.min(100, Math.max(0, 100 - snapshot.percent_remaining));
+  if (!snapshot) return null;
+  const entitlement = numberValue(snapshot.entitlement);
+  const remaining = numberValue(snapshot.remaining);
+  if (boolValue2(snapshot.unlimited) === true || entitlement === -1 || remaining === -1 || entitlement === 0) return null;
+  const percentRemaining = numberValue(snapshot.percent_remaining);
+  const used = percentRemaining !== void 0 ? 100 - percentRemaining : entitlement !== void 0 && entitlement > 0 && remaining !== void 0 ? 100 - remaining / entitlement * 100 : void 0;
+  if (used === void 0) return null;
   return {
     label,
-    used,
+    used: Math.min(100, Math.max(0, used)),
     limit: 100,
     format: { kind: "percent" },
     resetsAt: reset,
@@ -2170,15 +2478,26 @@ function percentMetric2(label, snapshot, reset, primary) {
   };
 }
 function countMetric(label, remaining, total, reset) {
-  if (typeof remaining !== "number" || typeof total !== "number" || !Number.isFinite(remaining) || !Number.isFinite(total) || total <= 0) return null;
+  const remainingCount = numberValue(remaining);
+  const totalCount = numberValue(total);
+  if (remainingCount === void 0 || totalCount === void 0 || totalCount <= 0) return null;
   return {
     label,
-    used: Math.max(0, total - remaining),
-    limit: total,
+    used: Math.max(0, totalCount - remainingCount),
+    limit: totalCount,
     format: { kind: "count" },
     resetsAt: reset
   };
 }
+function overageMetric(snapshot) {
+  if (!snapshot || boolValue2(snapshot.overage_permitted) !== true) return null;
+  return {
+    label: "Extra",
+    used: Math.max(0, numberValue(snapshot.overage_count) ?? 0),
+    limit: null,
+    format: { kind: "count" }
+  };
+}
 async function fetchUsage(token) {
   try {
     const res = await fetch(USAGE_URL3, {
@@ -2213,18 +2532,24 @@ async function copilotBilling(account) {
   const metrics = [];
   const quotaReset = resetDate(data.quota_reset_date);
   const snapshots = data.quota_snapshots;
-  const premium = percentMetric2("Premium", snapshots?.premium_interactions, quotaReset, true);
+  const premium = percentMetric2("Credits", snapshots?.premium_interactions, quotaReset, true);
   if (premium) metrics.push(premium);
+  const overage = overageMetric(snapshots?.premium_interactions);
+  if (overage) metrics.push(overage);
   const chat = percentMetric2("Chat", snapshots?.chat, quotaReset);
   if (chat) metrics.push(chat);
-  if (data.limited_user_quotas && data.monthly_quotas) {
+  const completionsSnapshot = percentMetric2("Completions", snapshots?.completions, quotaReset);
+  if (completionsSnapshot) metrics.push(completionsSnapshot);
+  if (metrics.length === 0 && data.limited_user_quotas && data.monthly_quotas) {
     const reset = resetDate(data.limited_user_reset_date);
     const limitedChat = countMetric("Chat", data.limited_user_quotas.chat, data.monthly_quotas.chat, reset);
     if (limitedChat) metrics.push(limitedChat);
     const completions = countMetric("Completions", data.limited_user_quotas.completions, data.monthly_quotas.completions, reset);
     if (completions) metrics.push(completions);
   }
-  if (metrics.length === 0) return { plan, metrics: [], error: "No usage data" };
+  if (metrics.length === 0) {
+    return { plan, metrics: [], error: boolValue2(data.token_based_billing) === true ? null : "No usage data" };
+  }
   return { plan, metrics, error: null };
 }
 
@@ -2244,35 +2569,17 @@ import { access as access7, readdir as readdir7 } from "fs/promises";
 import { join as join14 } from "path";
 import { homedir as homedir11 } from "os";
 
-// src/providers/cloud-code.ts
+// src/providers/cloud-code/auth.ts
 import { readFile as readFile5, readdir as readdir6, realpath, stat } from "fs/promises";
 import { spawnSync } from "child_process";
 import { homedir as homedir10 } from "os";
 import { dirname, join as join13 } from "path";
-var CLOUD_CODE_URLS = [
-  "https://daily-cloudcode-pa.googleapis.com",
-  "https://cloudcode-pa.googleapis.com"
-];
-var LOAD_CODE_ASSIST_PATH = "/v1internal:loadCodeAssist";
-var FETCH_MODELS_PATH = "/v1internal:fetchAvailableModels";
-var RETRIEVE_QUOTA_PATH = "/v1internal:retrieveUserQuota";
 var GOOGLE_OAUTH_URL = "https://oauth2.googleapis.com/token";
 var GOOGLE_OAUTH_CLIENT_REGEX = /OAUTH_CLIENT_ID\s*=\s*["']([0-9]{6,}-[a-z0-9]+\.apps\.googleusercontent\.com)["']\s*;?\s*(?:var|const|let)?\s*OAUTH_CLIENT_SECRET\s*=\s*["'](GOCSPX-[A-Za-z0-9_-]+)["']/s;
 var MAX_BUNDLE_READ = 32 * 1024 * 1024;
 var cachedClient;
 var OAUTH_TOKEN_KEY = "antigravityUnifiedStateSync.oauthToken";
 var OAUTH_TOKEN_SENTINEL = "oauthTokenInfoSentinelKey";
-var CC_MODEL_BLACKLIST = {
-  MODEL_CHAT_20706: true,
-  MODEL_CHAT_23310: true,
-  MODEL_GOOGLE_GEMINI_2_5_FLASH: true,
-  MODEL_GOOGLE_GEMINI_2_5_FLASH_THINKING: true,
-  MODEL_GOOGLE_GEMINI_2_5_FLASH_LITE: true,
-  MODEL_GOOGLE_GEMINI_2_5_PRO: true,
-  MODEL_PLACEHOLDER_M19: true,
-  MODEL_PLACEHOLDER_M9: true,
-  MODEL_PLACEHOLDER_M12: true
-};
 function readVarint(bytes, start) {
   let value = 0;
   let shift = 0;
@@ -2366,10 +2673,6 @@ async function readAntigravityOAuthToken(db) {
   if (!accessToken && !refreshToken) return { token: null, status: "ok" };
   return { token: { accessToken, refreshToken, expirySeconds }, status: "ok" };
 }
-function redact(token) {
-  if (!token) return "none";
-  return `...${token.slice(-4)}`;
-}
 function geminiBundleCandidates() {
   const candidates = [];
   const addBundle = (nodeModulesRoot) => {
@@ -2481,6 +2784,30 @@ async function refreshAccessToken(refreshToken) {
     return null;
   }
 }
+
+// src/providers/cloud-code/api.ts
+var CLOUD_CODE_URLS = [
+  "https://daily-cloudcode-pa.googleapis.com",
+  "https://cloudcode-pa.googleapis.com"
+];
+var LOAD_CODE_ASSIST_PATH = "/v1internal:loadCodeAssist";
+var FETCH_MODELS_PATH = "/v1internal:fetchAvailableModels";
+var RETRIEVE_QUOTA_PATH = "/v1internal:retrieveUserQuota";
+var CC_MODEL_BLACKLIST = {
+  MODEL_CHAT_20706: true,
+  MODEL_CHAT_23310: true,
+  MODEL_GOOGLE_GEMINI_2_5_FLASH: true,
+  MODEL_GOOGLE_GEMINI_2_5_FLASH_THINKING: true,
+  MODEL_GOOGLE_GEMINI_2_5_FLASH_LITE: true,
+  MODEL_GOOGLE_GEMINI_2_5_PRO: true,
+  MODEL_PLACEHOLDER_M19: true,
+  MODEL_PLACEHOLDER_M9: true,
+  MODEL_PLACEHOLDER_M12: true
+};
+function redact(token) {
+  if (!token) return "none";
+  return `...${token.slice(-4)}`;
+}
 async function requestCloudCodeJson(path, token, body) {
   for (const base of CLOUD_CODE_URLS) {
     try {
@@ -2586,14 +2913,16 @@ async function fetchCloudCodeQuota(token, expiredMessage = "Token expired") {
   if (!refreshed) return { ok: false, plan: result.plan, error: expiredMessage };
   return fetchWithAccessToken(refreshed);
 }
+
+// src/providers/cloud-code/index.ts
 function normalizeLabel(label) {
   return label.replace(/\s*\([^)]*\)\s*$/, "").trim();
 }
-function poolLabel(label) {
+function poolLabel(label, fullGeminiLabels = false) {
   const lower = normalizeLabel(label).toLowerCase();
   if (lower.includes("claude")) return "Claude";
-  if (lower.includes("gemini") && lower.includes("pro")) return "Pro";
-  if (lower.includes("gemini") && lower.includes("flash")) return "Flash";
+  if (lower.includes("gemini") && lower.includes("pro")) return fullGeminiLabels ? "Gemini Pro" : "Pro";
+  if (lower.includes("gemini") && lower.includes("flash")) return fullGeminiLabels ? "Gemini Flash" : "Flash";
   if (lower.includes("gemini")) return "Gemini";
   return normalizeLabel(label) || "Other";
 }
@@ -2609,11 +2938,11 @@ function sortKey(label) {
   if (lower.includes("claude")) return `1b_${label}`;
   return `2_${label}`;
 }
-function cloudCodeBucketsToMetrics(buckets) {
+function cloudCodeBucketsToMetrics(buckets, options = {}) {
   const pooled = /* @__PURE__ */ new Map();
   for (const bucket of buckets) {
     if (!Number.isFinite(bucket.remainingFraction)) continue;
-    const label = poolLabel(bucket.modelId);
+    const label = poolLabel(bucket.modelId, options.fullGeminiLabels === true);
     const existing = pooled.get(label);
     if (!existing || bucket.remainingFraction < existing.remainingFraction) {
       pooled.set(label, { ...bucket, modelId: label });
@@ -2690,7 +3019,7 @@ async function antigravityBilling(account) {
     if (!token) return { plan: null, metrics: [], error: cloudCodeSqliteError(status) };
     const quota = await fetchCloudCodeQuota(token, "Token expired \u2014 open Antigravity");
     if (!quota.ok) return { plan: quota.plan, metrics: [], error: quota.error };
-    return { plan: quota.plan, metrics: cloudCodeBucketsToMetrics(quota.buckets), error: null };
+    return { plan: quota.plan, metrics: cloudCodeBucketsToMetrics(quota.buckets, { fullGeminiLabels: true }), error: null };
   } catch {
     return { plan: null, metrics: [], error: "Antigravity billing unavailable" };
   }
@@ -2733,7 +3062,7 @@ var PRICING3 = {
   "gemini-2.0-flash": { in: 1e-7, out: 4e-7, cr: 25e-9 }
 };
 var PRICE_KEYS3 = Object.keys(PRICING3).sort((a, b) => b.length - a.length);
-var ZERO_PRICE3 = { in: 0, out: 0, cr: 0 };
+var ZERO_PRICE2 = { in: 0, out: 0, cr: 0 };
 function geminiTmpDir(homeDir) {
   return join15(homeDir ?? homedir12(), ".gemini", "tmp");
 }
@@ -2744,7 +3073,7 @@ function priceFor3(model) {
     const rest = m.slice(key.length);
     if (rest === "" || rest[0] === "-") return PRICING3[key];
   }
-  return ZERO_PRICE3;
+  return ZERO_PRICE2;
 }
 function shortModel2(model) {
   return model.replace(/(-preview|-customtools)+$/, "");
@@ -2890,17 +3219,8 @@ async function hasGeminiChatSessions(homeDir) {
   }
   return listing.some((path) => /(^|[\\/])chats[\\/]session-.*\.jsonl$/.test(path));
 }
-function decodeBase64UrlJson2(segment) {
-  try {
-    const normalized = segment.replace(/-/g, "+").replace(/_/g, "/");
-    const padded = normalized + "=".repeat((4 - normalized.length % 4) % 4);
-    return JSON.parse(Buffer.from(padded, "base64").toString("utf8"));
-  } catch {
-    return null;
-  }
-}
 function geminiIdentity(creds) {
-  const tokenPayload = typeof creds?.id_token === "string" && creds.id_token.includes(".") ? decodeBase64UrlJson2(creds.id_token.split(".")[1]) : null;
+  const tokenPayload = typeof creds?.id_token === "string" && creds.id_token.includes(".") ? decodeBase64UrlJson(creds.id_token.split(".")[1]) : null;
   const email = typeof creds?.email === "string" && creds.email.trim() || typeof tokenPayload?.email === "string" && tokenPayload.email.trim() || null;
   const displayName = typeof creds?.displayName === "string" && creds.displayName.trim() || typeof creds?.name === "string" && creds.name.trim() || typeof tokenPayload?.name === "string" && tokenPayload.name.trim() || null;
   return { email, displayName };
@@ -2951,6 +3271,113 @@ var geminiProvider = {
   fetchBilling: (account) => geminiBilling(account)
 };
 
+// src/providers/detect.ts
+import { accessSync as accessSync2, constants as constants2, existsSync } from "fs";
+import { join as join17, delimiter as delimiter2, isAbsolute as isAbsolute2 } from "path";
+import { homedir as homedir14 } from "os";
+function searchDirs() {
+  const home = homedir14();
+  const fromEnv = (process.env.PATH ?? "").split(delimiter2).filter(Boolean);
+  const extra = process.platform === "win32" ? [
+    process.env.APPDATA && join17(process.env.APPDATA, "npm"),
+    process.env.LOCALAPPDATA && join17(process.env.LOCALAPPDATA, "pnpm"),
+    join17(home, "scoop", "shims")
+  ] : [
+    "/opt/homebrew/bin",
+    "/usr/local/bin",
+    "/usr/bin",
+    "/bin",
+    "/opt/local/bin",
+    join17(home, ".local", "bin"),
+    join17(home, "bin"),
+    join17(home, ".npm-global", "bin"),
+    join17(home, ".bun", "bin"),
+    join17(home, ".local", "share", "pnpm")
+  ];
+  return [.../* @__PURE__ */ new Set([...fromEnv, ...extra.filter((d) => !!d)])];
+}
+function isExec2(p) {
+  try {
+    accessSync2(p, process.platform === "win32" ? constants2.F_OK : constants2.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function onPath(names) {
+  const exts = process.platform === "win32" ? (process.env.PATHEXT ?? ".EXE;.CMD;.BAT;.COM").split(";").map((e) => e.toLowerCase()).concat("") : [""];
+  for (const dir of searchDirs()) {
+    for (const n of names) {
+      for (const e of exts) {
+        if (isExec2(join17(dir, n + e))) return true;
+      }
+    }
+  }
+  return false;
+}
+function anyExists(paths) {
+  return paths.some((p) => !!p && isExec2(p));
+}
+function installSignals(id) {
+  const home = homedir14();
+  const pf = process.env.ProgramFiles;
+  const pf86 = process.env["ProgramFiles(x86)"];
+  const lad = process.env.LOCALAPPDATA;
+  switch (id) {
+    case "claude":
+      return onPath(["claude"]) || anyExists([
+        "/Applications/Claude.app",
+        join17(home, "Applications", "Claude.app"),
+        lad && join17(lad, "Programs", "claude", "Claude.exe")
+      ]);
+    case "codex": {
+      const bin = process.env.CODEX_BIN;
+      if (bin && isAbsolute2(bin) && isExec2(bin)) return true;
+      return onPath(["codex"]) || anyExists([
+        lad && join17(lad, "Programs", "OpenAI", "Codex", "bin", "codex.exe"),
+        lad && join17(lad, "Programs", "OpenAI", "Codex", "codex.exe"),
+        lad && join17(lad, "Programs", "codex", "codex.exe"),
+        pf && join17(pf, "OpenAI", "Codex", "bin", "codex.exe")
+      ]) || existsSync(join17(home, ".codex", "sessions")) || existsSync(join17(home, ".codex", "auth.json"));
+    }
+    case "cursor":
+      return onPath(["cursor", "cursor-agent"]) || anyExists([
+        "/Applications/Cursor.app",
+        join17(home, "Applications", "Cursor.app"),
+        lad && join17(lad, "Programs", "cursor", "Cursor.exe"),
+        pf && join17(pf, "Cursor", "Cursor.exe"),
+        pf86 && join17(pf86, "Cursor", "Cursor.exe"),
+        "/opt/Cursor/cursor",
+        "/usr/share/cursor/cursor",
+        "/usr/bin/cursor"
+      ]);
+    case "pi":
+      return onPath(["pi"]);
+    case "opencode":
+      return onPath(["opencode"]);
+    case "copilot": {
+      const appData = process.env.APPDATA;
+      return [
+        join17(home, ".config", "github-copilot"),
+        join17(home, ".copilot"),
+        lad && join17(lad, "github-copilot"),
+        appData && join17(appData, "GitHub Copilot"),
+        join17(home, ".local", "share", "gh", "extensions", "gh-copilot")
+      ].some((p) => !!p && existsSync(p));
+    }
+    case "antigravity":
+      return onPath(["antigravity"]) || anyExists([
+        "/Applications/Antigravity.app",
+        join17(home, "Applications", "Antigravity.app"),
+        lad && join17(lad, "Programs", "Antigravity", "Antigravity.exe")
+      ]);
+    case "gemini":
+      return onPath(["gemini"]);
+    default:
+      return false;
+  }
+}
+
 // src/providers/index.ts
 var PROVIDER_ORDER = [...PROVIDER_IDS];
 var PROVIDERS = {
@@ -2978,11 +3405,32 @@ async function detectProviders() {
 }
 
 // src/accounts.ts
-import { existsSync as existsSync2, readdirSync, readFileSync, statSync } from "fs";
-import { homedir as homedir14 } from "os";
-import { basename, join as join17, resolve } from "path";
+import { existsSync as existsSync2, readdirSync, readFileSync as readFileSync3, statSync } from "fs";
+import { homedir as homedir15 } from "os";
+import { basename, join as join19, resolve } from "path";
+
+// src/providers/codex/identity.ts
+import { readFileSync as readFileSync2 } from "fs";
+import { join as join18 } from "path";
+function codexAuthPaths(homeDir) {
+  return [join18(homeDir, ".codex", "auth.json"), join18(homeDir, "auth.json")];
+}
+function readCodexIdentity(homeDir) {
+  for (const path of codexAuthPaths(homeDir)) {
+    try {
+      const parsed = JSON.parse(readFileSync2(path, "utf-8"));
+      const { email, displayName, payload } = identityFromIdToken(parsed?.tokens?.id_token);
+      if (!payload) continue;
+      return { email, displayName };
+    } catch {
+    }
+  }
+  return {};
+}
+
+// src/accounts.ts
 function accountKey(providerId, homeDir) {
-  return `${providerId}:${homeDir ? resolve(expandHome(homeDir)) : homedir14()}`;
+  return `${providerId}:${homeDir ? resolve(expandHome(homeDir)) : homedir15()}`;
 }
 function uniqueId(base, used) {
   let id = slugify(base) || "account";
@@ -3001,23 +3449,11 @@ function uniqueId(base, used) {
   used.add(id);
   return id;
 }
-function readClaudeIdentity2(homeDir) {
-  try {
-    const parsed = JSON.parse(readFileSync(join17(homeDir, ".claude.json"), "utf-8"));
-    const oauth = parsed?.oauthAccount;
-    return {
-      email: typeof oauth?.emailAddress === "string" && oauth.emailAddress.trim() ? oauth.emailAddress.trim() : void 0,
-      displayName: typeof oauth?.displayName === "string" && oauth.displayName.trim() ? oauth.displayName.trim() : void 0
-    };
-  } catch {
-    return {};
-  }
-}
 function hasClaudeState(homeDir) {
-  return existsSync2(join17(homeDir, ".claude.json")) || existsSync2(join17(homeDir, ".claude", ".credentials.json")) || existsSync2(join17(homeDir, ".claude", "projects")) || existsSync2(join17(homeDir, ".config", "claude", ".credentials.json")) || existsSync2(join17(homeDir, ".config", "claude", "projects"));
+  return existsSync2(join19(homeDir, ".claude.json")) || existsSync2(join19(homeDir, ".claude", ".credentials.json")) || existsSync2(join19(homeDir, ".claude", "projects")) || existsSync2(join19(homeDir, ".config", "claude", ".credentials.json")) || existsSync2(join19(homeDir, ".config", "claude", "projects"));
 }
 function candidateAlternateHomes(prefix) {
-  const home = homedir14();
+  const home = homedir15();
   let entries;
   try {
     entries = readdirSync(home);
@@ -3028,7 +3464,7 @@ function candidateAlternateHomes(prefix) {
   const pattern = new RegExp(`^\\.${prefix}[_-]`);
   for (const name of entries) {
     if (!pattern.test(name)) continue;
-    const path = join17(home, name);
+    const path = join19(home, name);
     try {
       if (!statSync(path).isDirectory()) continue;
       out.push(path);
@@ -3038,45 +3474,16 @@ function candidateAlternateHomes(prefix) {
   return out.sort();
 }
 function labelForClaudeHome(homeDir) {
-  const identity = readClaudeIdentity2(homeDir);
+  const identity = readClaudeIdentity(homeDir);
   if (identity.email) return `Claude ${identity.email}`;
   if (identity.displayName) return `Claude ${identity.displayName}`;
   const raw = basename(homeDir).replace(/^\.claude[_-]?/, "").replace(/[_-]+/g, " ").trim();
   return raw ? `Claude ${raw}` : "Claude";
 }
-function decodeBase64UrlJson3(segment) {
-  try {
-    const normalized = segment.replace(/-/g, "+").replace(/_/g, "/");
-    const padded = normalized + "=".repeat((4 - normalized.length % 4) % 4);
-    return JSON.parse(Buffer.from(padded, "base64").toString("utf8"));
-  } catch {
-    return null;
-  }
-}
-function codexAuthPaths(homeDir) {
-  return [join17(homeDir, ".codex", "auth.json"), join17(homeDir, "auth.json")];
-}
-function readCodexIdentity(homeDir) {
-  for (const path of codexAuthPaths(homeDir)) {
-    try {
-      const parsed = JSON.parse(readFileSync(path, "utf-8"));
-      const idToken = parsed?.tokens?.id_token;
-      if (typeof idToken !== "string" || !idToken.includes(".")) continue;
-      const payload = decodeBase64UrlJson3(idToken.split(".")[1]);
-      if (!payload || typeof payload !== "object") continue;
-      return {
-        email: typeof payload?.email === "string" && payload.email.trim() ? payload.email.trim() : void 0,
-        displayName: typeof payload?.name === "string" && payload.name.trim() ? payload.name.trim() : typeof payload?.given_name === "string" && payload.given_name.trim() ? payload.given_name.trim() : void 0
-      };
-    } catch {
-    }
-  }
-  return {};
-}
 function hasCodexAuth(homeDir) {
   for (const path of codexAuthPaths(homeDir)) {
     try {
-      const parsed = JSON.parse(readFileSync(path, "utf-8"));
+      const parsed = JSON.parse(readFileSync3(path, "utf-8"));
       const accessToken = parsed?.tokens?.access_token;
       if (typeof accessToken === "string" && accessToken.trim()) return true;
     } catch {