tokmon 0.20.5 → 0.20.6

package/dist/{bootstrap-ink-MVH5QEVR.js → bootstrap-ink-WWSVQO6D.js}

@@ -18,7 +18,7 @@ import {
   systemTimezone,
   time,
   tokens
-} from "./chunk-EHIQHGJL.js";
+} from "./chunk-YWJT3OG4.js";
 import {
   COLOR_PALETTE,
   DEFAULTS,
@@ -3235,7 +3235,7 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, wsToken = n
     if (webStartingRef.current) return;
     webStartingRef.current = true;
     try {
-      const { startWebServer } = await import("./server-RM4ZXN6C.js");
+      const { startWebServer } = await import("./server-TSTBMVTJ.js");
       const ctrl = await startWebServer({ config: cfg, log: false });
       webRef.current = ctrl;
       openUrl(ctrl.url);

package/dist/{chunk-YYATNY5E.js → chunk-E6YT66ST.js}

@@ -8,7 +8,7 @@ import {
   detectProviders,
   fetchPeak,
   resolveTimezone
-} from "./chunk-EHIQHGJL.js";
+} from "./chunk-YWJT3OG4.js";
 import {
   cacheDir,
   expandHome,

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

@@ -141,7 +141,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 = 6;
 var STABLE_AGE_MS = 5 * 6e4;
 var PRUNE_AGE_MS = 200 * DAY_MS;
 var memCache = /* @__PURE__ */ new Map();
@@ -673,6 +673,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,6 +711,31 @@ function cleanStoredString(value) {
   const trimmed = value.trim().replace(/^"|"$/g, "");
   return trimmed || void 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 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 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;
+}
 function identityFields(email, displayName) {
   return {
     email: email ?? null,
@@ -734,6 +761,43 @@ async function connectPost(url, token) {
     return null;
   }
 }
+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) {
   const [core, activity, spend] = await Promise.all([
     cursorBillingCore(account),
@@ -760,7 +824,7 @@ 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);
@@ -769,9 +833,11 @@ async function cursorBillingCore(account) {
     const error = tokenRes.status === "ok" ? "Not signed in \u2014 open Cursor" : sqliteStatusMessage(tokenRes.status);
     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;
@@ -783,37 +849,63 @@ 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)) {
+  appendCredits(metrics, creditGrants, stripe);
+  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" }
+      });
     }
   }
   if (metrics.length === 0) {
@@ -949,6 +1041,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 +1058,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";
@@ -1142,10 +1239,31 @@ function planLabel(auth) {
   return tier ? `${base} ${tier[1]}x` : base;
 }
 var pct = (used, resets, primary) => percentMetric("", used, resets ?? null, primary);
+function numberValue2(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 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 = numberValue2(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 = numberValue2(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([
@@ -1163,26 +1281,33 @@ 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 === 429) {
+      const retryAfter = numberValue2(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}`, ...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) };
     const data = await readJson(res);
     if (!data) return { plan, metrics: [], error: "Unexpected API response", ...identityFields2(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 = numberValue2(data.extra_usage?.used_credits);
+      const monthlyLimit = numberValue2(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) };
   } catch {
@@ -1204,7 +1329,7 @@ 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";
@@ -1238,6 +1363,11 @@ async function detectCodex(homeDir) {
       return true;
     } catch {
     }
+    try {
+      await access3(join7(home, "archived_sessions"));
+      return true;
+    } catch {
+    }
   }
   return false;
 }
@@ -1262,7 +1392,7 @@ function priceFor2(model) {
 }
 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 +1400,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 +1564,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 +1575,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 +1597,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 [join7(home, "sessions"), join7(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 = join7(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 {
+        }
       }
     }
   }
@@ -1384,8 +1639,9 @@ import { createReadStream as createReadStream3 } from "fs";
 import { createInterface as createInterface3 } from "readline";
 import { join as join8 } 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) {
+function decodeBase64UrlJson2(segment) {
   try {
     const normalized = segment.replace(/-/g, "+").replace(/_/g, "/");
     const padded = normalized + "=".repeat((4 - normalized.length % 4) % 4);
@@ -1410,7 +1666,7 @@ function chatGptPlanLabel(planType) {
 }
 function identityFromIdToken(idToken) {
   if (typeof idToken !== "string" || !idToken.includes(".")) return {};
-  const payload = decodeBase64UrlJson(idToken.split(".")[1]);
+  const payload = decodeBase64UrlJson2(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;
@@ -1461,14 +1717,95 @@ function planLabel2(planType) {
   if (p === "pro") return "Pro 20x";
   return planType.charAt(0).toUpperCase() + planType.slice(1);
 }
-function resetFrom(window) {
+function numberValue3(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 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 = numberValue3(window.reset_at ?? window.resets_at);
+  if (absolute !== void 0) return absolute > 1e10 ? absolute : absolute * 1e3;
+  const after = numberValue3(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 normalizedUsedPercent(window, percent) {
+  const used = numberValue3(percent);
+  if (used === void 0) return void 0;
+  const periodSeconds = numberValue3(window?.limit_window_seconds ?? window?.period_seconds ?? window?.window_seconds);
+  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 = numberValue3(window?.limit_window_seconds ?? window?.period_seconds ?? window?.window_seconds);
+  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 = numberValue3(source?.credits?.balance ?? source?.credit_balance);
+  if (balance !== void 0 && balance >= 0) {
+    metrics.push({ label: "Credits", used: Math.floor(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 numberValue3(data?.available_count ?? data?.available ?? data?.remaining);
+  } catch {
+    return void 0;
+  }
+}
 async function liveBilling(auth) {
   try {
     const headers = {
@@ -1481,23 +1818,18 @@ 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 = await fetchResetCredits(headers) ?? numberValue3(data?.rate_limit_reset_credits?.available_count ?? data?.rate_limit_reset_credits?.available);
+    if (resetCredits !== void 0 && resetCredits >= 0) {
+      metrics.push({ label: "Rate Limit 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) };
@@ -1549,15 +1881,11 @@ async function snapshotBilling(homeDir, auth = 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" } });
+  appendWindowMetrics(metrics, last.rate_limit ?? last);
+  appendCredits2(metrics, last);
+  const resetCredits = numberValue3(last?.rate_limit_reset_credits?.available_count ?? last?.rate_limit_reset_credits?.available);
+  if (resetCredits !== void 0 && resetCredits >= 0) {
+    metrics.push({ label: "Rate Limit Resets", used: resetCredits, limit: null, format: { kind: "count", suffix: "available" } });
   }
   if (metrics.length === 0) return null;
   return { plan: auth?.plan ?? planLabel2(last.plan_type), metrics, error: null, ...identityFields3(auth) };
@@ -1771,6 +2099,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 +2116,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);
@@ -1887,7 +2220,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 +2228,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;
@@ -2156,13 +2489,35 @@ function redactToken(token) {
 function resetDate(value) {
   return typeof value === "string" && value.trim() ? resetIn(value) : null;
 }
+function numberValue4(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 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 = numberValue4(snapshot.entitlement);
+  const remaining = numberValue4(snapshot.remaining);
+  if (boolValue2(snapshot.unlimited) === true || entitlement === -1 || remaining === -1 || entitlement === 0) return null;
+  const percentRemaining = numberValue4(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 +2525,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 = numberValue4(remaining);
+  const totalCount = numberValue4(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, numberValue4(snapshot.overage_count) ?? 0),
+    limit: null,
+    format: { kind: "count" }
+  };
+}
 async function fetchUsage(token) {
   try {
     const res = await fetch(USAGE_URL3, {
@@ -2213,18 +2579,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 };
 }
 
@@ -2589,11 +2961,11 @@ async function fetchCloudCodeQuota(token, expiredMessage = "Token expired") {
 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 +2981,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 +3062,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" };
   }
@@ -2890,7 +3262,7 @@ async function hasGeminiChatSessions(homeDir) {
   }
   return listing.some((path) => /(^|[\\/])chats[\\/]session-.*\.jsonl$/.test(path));
 }
-function decodeBase64UrlJson2(segment) {
+function decodeBase64UrlJson3(segment) {
   try {
     const normalized = segment.replace(/-/g, "+").replace(/_/g, "/");
     const padded = normalized + "=".repeat((4 - normalized.length % 4) % 4);
@@ -2900,7 +3272,7 @@ function decodeBase64UrlJson2(segment) {
   }
 }
 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(".") ? decodeBase64UrlJson3(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 };
@@ -3044,7 +3416,7 @@ function labelForClaudeHome(homeDir) {
   const raw = basename(homeDir).replace(/^\.claude[_-]?/, "").replace(/[_-]+/g, " ").trim();
   return raw ? `Claude ${raw}` : "Claude";
 }
-function decodeBase64UrlJson3(segment) {
+function decodeBase64UrlJson4(segment) {
   try {
     const normalized = segment.replace(/-/g, "+").replace(/_/g, "/");
     const padded = normalized + "=".repeat((4 - normalized.length % 4) % 4);
@@ -3062,7 +3434,7 @@ function readCodexIdentity(homeDir) {
       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]);
+      const payload = decodeBase64UrlJson4(idToken.split(".")[1]);
       if (!payload || typeof payload !== "object") continue;
       return {
         email: typeof payload?.email === "string" && payload.email.trim() ? payload.email.trim() : void 0,

package/dist/cli.js

@@ -14,12 +14,12 @@ process.emitWarning = ((warning, ...rest) => {
 var args = process.argv.slice(2);
 var subcommand = args[0]?.toLowerCase();
 if (subcommand === "__daemon") {
-  const { runDaemon } = await import("./daemon-HEBPH6PG.js");
+  const { runDaemon } = await import("./daemon-ZUWJQEKA.js");
   await runDaemon(args.slice(1), { foreground: false });
   process.exit(typeof process.exitCode === "number" ? process.exitCode : 0);
 }
 if (subcommand === "serve" || subcommand === "web") {
-  const { runDaemon } = await import("./daemon-HEBPH6PG.js");
+  const { runDaemon } = await import("./daemon-ZUWJQEKA.js");
   await runDaemon(args.slice(1), { foreground: true });
   process.exit(typeof process.exitCode === "number" ? process.exitCode : 0);
 }
@@ -68,5 +68,5 @@ setGlyphs(resolveGlyphs({
 }));
 var daemon = await attachOrSpawn();
 var mode = daemon.kind === "spawned" ? "connected" : "degraded";
-var { bootstrapInk } = await import("./bootstrap-ink-MVH5QEVR.js");
+var { bootstrapInk } = await import("./bootstrap-ink-WWSVQO6D.js");
 await bootstrapInk({ interval, config, daemon, mode });

package/dist/{daemon-HEBPH6PG.js → daemon-ZUWJQEKA.js}

@@ -2,10 +2,10 @@
 import {
   appVersion,
   startWebServer
-} from "./chunk-YYATNY5E.js";
+} from "./chunk-E6YT66ST.js";
 import {
   flushDisk
-} from "./chunk-EHIQHGJL.js";
+} from "./chunk-YWJT3OG4.js";
 import {
   cacheDir,
   loadConfig

package/dist/{server-RM4ZXN6C.js → server-TSTBMVTJ.js}

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import {
   startWebServer
-} from "./chunk-YYATNY5E.js";
-import "./chunk-EHIQHGJL.js";
+} from "./chunk-E6YT66ST.js";
+import "./chunk-YWJT3OG4.js";
 import "./chunk-XQEJ4WQ5.js";
 export {
   startWebServer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokmon",
-  "version": "0.20.5",
+  "version": "0.20.6",
   "description": "Terminal + web dashboard for Claude Code, Codex, Cursor, opencode, pi, Copilot, Gemini & more — usage, limits, and costs",
   "type": "module",
   "bin": {