tokmon 0.19.8 → 0.20.0

package/dist/{chunk-UAPL47GL.js → chunk-MB6LRSEZ.js}

@@ -1,134 +1,15 @@
 #!/usr/bin/env node
-
-// src/config.ts
-import { readFile, writeFile, mkdir, rename } from "fs/promises";
-import { join, isAbsolute } from "path";
-import { homedir } from "os";
-function envDir(name) {
-  const v = process.env[name];
-  return v && v.trim() && isAbsolute(v.trim()) ? v.trim() : void 0;
-}
-var DEFAULTS = {
-  interval: 2,
-  billingInterval: 5,
-  clearScreen: true,
-  timezone: null,
-  accounts: [],
-  activeAccountId: null,
-  disabledProviders: [],
-  onboarded: false,
-  dashboardLayout: "grid",
-  defaultFocus: "all",
-  ascii: "auto",
-  knownProviders: []
-};
-var LEGACY_KNOWN = ["claude", "codex", "cursor"];
-var ACCENT_COLORS = ["cyan", "magenta", "green", "yellow", "blue", "red"];
-function configDir() {
-  if (process.platform === "win32") {
-    return join(envDir("APPDATA") ?? join(homedir(), "AppData", "Roaming"), "tokmon");
-  }
-  return join(envDir("XDG_CONFIG_HOME") ?? join(homedir(), ".config"), "tokmon");
-}
-function configLocation() {
-  return join(configDir(), "config.json");
-}
-function cacheDir() {
-  if (process.platform === "win32") {
-    return join(envDir("LOCALAPPDATA") ?? envDir("APPDATA") ?? join(homedir(), "AppData", "Local"), "tokmon", "cache");
-  }
-  if (process.platform === "darwin") {
-    return join(homedir(), "Library", "Caches", "tokmon");
-  }
-  return join(envDir("XDG_CACHE_HOME") ?? join(homedir(), ".cache"), "tokmon");
-}
-var PROVIDER_IDS = ["claude", "codex", "cursor", "pi", "opencode", "copilot", "antigravity", "gemini"];
-function clampNum(v, fallback, min) {
-  return typeof v === "number" && Number.isFinite(v) && v >= min ? v : fallback;
-}
-async function loadConfig() {
-  let raw;
-  try {
-    raw = await readFile(configLocation(), "utf-8");
-  } catch {
-    return { ...DEFAULTS };
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    try {
-      await writeFile(configLocation() + ".bak", raw);
-    } catch {
-    }
-    return { ...DEFAULTS };
-  }
-  try {
-    const accounts = (Array.isArray(parsed.accounts) ? parsed.accounts : []).map((a) => ({ ...a, providerId: a.providerId ?? "claude" })).filter((a) => typeof a?.id === "string" && typeof a?.name === "string" && PROVIDER_IDS.includes(a.providerId));
-    return {
-      ...DEFAULTS,
-      ...parsed,
-      interval: clampNum(parsed.interval, DEFAULTS.interval, 1),
-      billingInterval: clampNum(parsed.billingInterval, DEFAULTS.billingInterval, 1),
-      clearScreen: typeof parsed.clearScreen === "boolean" ? parsed.clearScreen : DEFAULTS.clearScreen,
-      timezone: typeof parsed.timezone === "string" && parsed.timezone.trim() ? parsed.timezone : null,
-      accounts,
-      activeAccountId: typeof parsed.activeAccountId === "string" ? parsed.activeAccountId : null,
-      disabledProviders: (Array.isArray(parsed.disabledProviders) ? parsed.disabledProviders : []).filter((p) => PROVIDER_IDS.includes(p)),
-      onboarded: parsed.onboarded === true,
-      dashboardLayout: parsed.dashboardLayout === "single" ? "single" : "grid",
-      defaultFocus: parsed.defaultFocus === "last" ? "last" : "all",
-      ascii: parsed.ascii === "on" ? "on" : parsed.ascii === "off" ? "off" : "auto",
-      knownProviders: Array.isArray(parsed.knownProviders) ? parsed.knownProviders.filter((p) => PROVIDER_IDS.includes(p)) : parsed.onboarded === true ? [...LEGACY_KNOWN] : []
-    };
-  } catch {
-    return { ...DEFAULTS };
-  }
-}
-var saveQueue = Promise.resolve();
-function saveConfig(config) {
-  saveQueue = saveQueue.then(async () => {
-    try {
-      const dir = configDir();
-      await mkdir(dir, { recursive: true });
-      const tmp = join(dir, `config.json.${process.pid}.tmp`);
-      await writeFile(tmp, JSON.stringify(config, null, 2) + "\n");
-      await rename(tmp, configLocation());
-    } catch {
-    }
-  });
-  return saveQueue;
-}
-function slugify(value) {
-  return value.trim().toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "").slice(0, 48);
-}
-function generateAccountId(name, existing) {
-  const base = slugify(name) || "account";
-  const taken = new Set(existing.map((a) => a.id));
-  if (!taken.has(base)) return base;
-  for (let i = 2; i < 1e3; i++) {
-    const candidate = `${base}_${i}`;
-    if (!taken.has(candidate)) return candidate;
-  }
-  return `${base}_${Date.now()}`;
-}
-function pickAccentColor(existing) {
-  const used = new Set(existing.map((a) => a.color).filter(Boolean));
-  for (const c of ACCENT_COLORS) {
-    if (!used.has(c)) return c;
-  }
-  return ACCENT_COLORS[existing.length % ACCENT_COLORS.length];
-}
-function expandHome(p) {
-  if (!p) return homedir();
-  if (p === "~" || p === "~/" || p === "~\\") return homedir();
-  if (p.startsWith("~/") || p.startsWith("~\\")) return join(homedir(), p.slice(2));
-  return p;
-}
+import {
+  cacheDir,
+  envDir,
+  expandHome,
+  isValidTimezone,
+  slugify
+} from "./chunk-MVMPQJ5S.js";
 
 // src/providers/usage-core.ts
-import { readFile as readFile2, writeFile as writeFile2, rename as rename2, mkdir as mkdir2 } from "fs/promises";
-import { join as join2 } from "path";
+import { readFile, writeFile, rename, mkdir } from "fs/promises";
+import { join } from "path";
 
 // src/tz.ts
 function systemTimezone() {
@@ -138,14 +19,6 @@ function systemTimezone() {
     return "UTC";
   }
 }
-function isValidTimezone(tz) {
-  try {
-    new Intl.DateTimeFormat("en-CA", { timeZone: tz });
-    return true;
-  } catch {
-    return false;
-  }
-}
 function resolveTimezone(cfg) {
   if (!cfg) return systemTimezone();
   return isValidTimezone(cfg) ? cfg : systemTimezone();
@@ -250,7 +123,7 @@ var diskLoaded = false;
 var dirty = false;
 var flushTimer = null;
 function cacheFile() {
-  return join2(cacheDir(), `usage-v${CACHE_VERSION}.json`);
+  return join(cacheDir(), `usage-v${CACHE_VERSION}.json`);
 }
 function encode(mtimeMs, size, entries) {
   const mods = [];
@@ -292,7 +165,7 @@ async function ensureDiskLoaded() {
   if (diskLoaded) return;
   diskLoaded = true;
   try {
-    const obj = JSON.parse(await readFile2(cacheFile(), "utf-8"));
+    const obj = JSON.parse(await readFile(cacheFile(), "utf-8"));
     for (const [path, s] of Object.entries(obj)) {
       if (s && typeof s.m === "number" && Array.isArray(s.rows) && Array.isArray(s.mods)) {
         memCache.set(path, { mtimeMs: s.m, size: typeof s.s === "number" ? s.s : -1, entries: decode(s) });
@@ -311,10 +184,10 @@ async function flushDisk() {
     }
   }
   try {
-    await mkdir2(cacheDir(), { recursive: true });
+    await mkdir(cacheDir(), { recursive: true });
     const tmp = `${cacheFile()}.${process.pid}.tmp`;
-    await writeFile2(tmp, JSON.stringify(obj));
-    await rename2(tmp, cacheFile());
+    await writeFile(tmp, JSON.stringify(obj));
+    await rename(tmp, cacheFile());
     dirty = false;
   } catch {
   }
@@ -356,10 +229,34 @@ async function loadCachedEntries(files, parse, since) {
 function safeNum(v) {
   return typeof v === "number" && Number.isFinite(v) && v > 0 ? Math.floor(v) : 0;
 }
+function dashboardSince(tz) {
+  const now = Date.now();
+  return Math.min(startOfMonth(now, tz), startOfWeek(now, tz), now - SPARK_DAYS * DAY_MS);
+}
+function tableSince(tz) {
+  return monthsAgoStart(Date.now(), 6, tz);
+}
+function finitePositive(v) {
+  return typeof v === "number" && Number.isFinite(v) && v > 0 ? v : 0;
+}
+function cleanEntry(e) {
+  return {
+    ...e,
+    ts: finitePositive(e.ts),
+    cost: finitePositive(e.cost),
+    input: finitePositive(e.input),
+    output: finitePositive(e.output),
+    cacheCreate: finitePositive(e.cacheCreate),
+    cacheRead: finitePositive(e.cacheRead),
+    cacheSavings: finitePositive(e.cacheSavings)
+  };
+}
 function dedupe(entries) {
   const seen = /* @__PURE__ */ new Set();
   const out = [];
-  for (const e of 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}`;
     if (seen.has(k)) continue;
     seen.add(k);
@@ -384,7 +281,8 @@ function summarize(entries, tz) {
     s.cacheRead += e.cacheRead;
     s.cacheSavings += e.cacheSavings;
   };
-  for (const e of entries) {
+  for (const raw of entries) {
+    const e = cleanEntry(raw);
     if (e.ts >= monthStart) add(month, e);
     if (e.ts >= weekStart) add(week, e);
     if (e.ts >= todayStart) {
@@ -396,14 +294,16 @@ function summarize(entries, tz) {
     byDay.set(dk, (byDay.get(dk) ?? 0) + e.cost);
   }
   const hrs = Math.max((now - oldestToday) / 36e5, 1 / 60);
-  const burnRate = hadToday ? today.cost / hrs : 0;
+  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);
   return { today, week, month, burnRate, series };
 }
 function groupBy(entries, keyFn) {
   const groups = /* @__PURE__ */ new Map();
-  for (const e of entries) {
+  for (const raw of entries) {
+    const e = cleanEntry(raw);
     const key = keyFn(e);
     const arr = groups.get(key);
     if (arr) arr.push(e);
@@ -511,23 +411,34 @@ function mergeTables(list) {
     monthly: mergeRows(list.map((t) => t.monthly))
   };
 }
-
-// src/format.ts
-function currency(value) {
-  if (!Number.isFinite(value) || value <= 0) return "$0.00";
-  if (value >= 1e4) {
-    return `$${value.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`;
-  }
-  return `$${value.toFixed(2)}`;
+function coalesceTables(list) {
+  if (list.length === 0) return { daily: [], weekly: [], monthly: [] };
+  if (list.length === 1) return list[0];
+  return mergeTables(list);
 }
-function tokens(value) {
-  const v = Number.isFinite(value) && value > 0 ? value : 0;
-  if (v >= 1e9) return `${(v / 1e9).toFixed(1)}B`;
-  if (v >= 1e6) return `${(v / 1e6).toFixed(1)}M`;
-  if (v >= 1e3) return `${(v / 1e3).toFixed(1)}K`;
-  return String(Math.floor(v));
-}
-function time(date, tz) {
+
+// src/shared/format.ts
+var MONTHS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+function formatCurrency(value, opts = {}) {
+  if (!Number.isFinite(value)) return "$0.00";
+  const sign = opts.sign && value > 0 ? "+" : "";
+  const abs = Math.abs(value);
+  if (abs >= 1e5) return `${sign}$${(value / 1e3).toFixed(0)}k`;
+  if (abs >= 1e4) return `${sign}$${(value / 1e3).toFixed(1)}k`;
+  if (abs >= 1) return `${sign}$${value.toFixed(2)}`;
+  if (abs >= 0.01) return `${sign}$${value.toFixed(3)}`;
+  if (abs === 0) return "$0.00";
+  return `${sign}$${value.toFixed(4)}`;
+}
+function formatTokens(value) {
+  if (!Number.isFinite(value) || value === 0) return "0";
+  const abs = Math.abs(value);
+  if (abs >= 1e9) return `${(value / 1e9).toFixed(2)}B`;
+  if (abs >= 1e6) return `${(value / 1e6).toFixed(2)}M`;
+  if (abs >= 1e3) return `${(value / 1e3).toFixed(1)}k`;
+  return String(Math.round(value));
+}
+function formatTime(date, tz) {
   return date.toLocaleTimeString(void 0, {
     hour: "2-digit",
     minute: "2-digit",
@@ -535,33 +446,43 @@ function time(date, tz) {
     timeZone: tz
   });
 }
-var SHORT_MONTHS = ["", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+function formatShortDate(label, opts = {}) {
+  const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(label);
+  if (!match) return label;
+  const day = Number(match[3]);
+  return `${MONTHS[Number(match[2]) - 1]} ${opts.padDay ? day.toString().padStart(2, " ") : day}`;
+}
+function formatResetIn(iso, now = Date.now()) {
+  const diff = new Date(iso).getTime() - now;
+  if (!Number.isFinite(diff) || diff <= 0) return "now";
+  const minutes = Math.round(diff / 6e4);
+  if (minutes < 60) return `${minutes}m`;
+  const hours = Math.floor(minutes / 60);
+  const mins = minutes % 60;
+  if (hours < 24) return `${hours}h ${mins}m`;
+  const days = Math.floor(hours / 24);
+  const hrs = hours % 24;
+  return `${days}d ${hrs}h`;
+}
+
+// src/format.ts
+var currency = formatCurrency;
+var tokens = formatTokens;
+var time = formatTime;
 function shortDate(iso) {
-  const [, m, d] = iso.split("-");
-  return `${SHORT_MONTHS[Number(m)]} ${Number(d).toString().padStart(2, " ")}`;
+  return formatShortDate(iso, { padDay: true });
 }
 function col(s, w, align = "right") {
   if (s.length > w) return s.slice(0, w - 1) + "~";
   const spaces = " ".repeat(w - s.length);
   return align === "right" ? spaces + s : s + spaces;
 }
-function resetIn(iso) {
-  const diff = new Date(iso).getTime() - Date.now();
-  if (!Number.isFinite(diff) || diff <= 0) return "now";
-  const mins = Math.round(diff / 6e4);
-  if (mins < 60) return `${mins}m`;
-  const hrs = Math.floor(mins / 60);
-  const m = mins % 60;
-  if (hrs < 24) return `${hrs}h ${m}m`;
-  const days = Math.floor(hrs / 24);
-  const h = hrs % 24;
-  return `${days}d ${h}h`;
-}
+var resetIn = formatResetIn;
 
 // src/providers/cursor/billing.ts
 import { access } from "fs/promises";
-import { join as join4 } from "path";
-import { homedir as homedir3 } from "os";
+import { join as join3 } from "path";
+import { homedir as homedir2 } from "os";
 
 // src/http.ts
 async function readJson(res) {
@@ -574,9 +495,28 @@ async function readJson(res) {
   }
 }
 
+// src/providers/_shared/metric.ts
+var finite = (value, fallback = 0) => typeof value === "number" && Number.isFinite(value) ? value : fallback;
+function percentMetric(label, used, resetsAt, primary) {
+  return {
+    label,
+    used: finite(used),
+    limit: 100,
+    format: { kind: "percent" },
+    resetsAt,
+    ...primary === void 0 ? {} : { primary }
+  };
+}
+var dollars = (cents) => finite(cents) / 100;
+
+// src/providers/_shared/time.ts
+function msToIso(ms) {
+  return Number.isFinite(ms) && Math.abs(ms) <= 864e13 ? new Date(ms).toISOString() : null;
+}
+
 // src/providers/cursor/activity.ts
-import { join as join3 } from "path";
-import { homedir as homedir2 } from "os";
+import { join as join2 } from "path";
+import { homedir } from "os";
 
 // src/providers/cursor/sqlite.ts
 import { execFile as execFileCb } from "child_process";
@@ -659,7 +599,7 @@ function sqliteStatusMessage(status) {
 // src/providers/cursor/activity.ts
 var DAY_MS2 = 864e5;
 function trackingDb(homeDir) {
-  return join3(homeDir ?? homedir2(), ".cursor", "ai-tracking", "ai-code-tracking.db");
+  return join2(homeDir ?? homedir(), ".cursor", "ai-tracking", "ai-code-tracking.db");
 }
 function localDayKey(ms) {
   const d = new Date(ms);
@@ -677,7 +617,8 @@ async function cursorActivity(homeDir) {
     const byDay = /* @__PURE__ */ new Map();
     let month = 0;
     for (const row of res.rows) {
-      const n = Number(row.c) || 0;
+      const raw = Number(row.c);
+      const n = Number.isFinite(raw) && raw > 0 ? raw : 0;
       byDay.set(String(row.d), n);
       month += n;
     }
@@ -694,18 +635,19 @@ async function cursorActivity(homeDir) {
 var BASE = "https://api2.cursor.sh/aiserver.v1.DashboardService";
 var USAGE_URL = `${BASE}/GetCurrentPeriodUsage`;
 var PLAN_URL = `${BASE}/GetPlanInfo`;
+var finiteNumber = (value) => typeof value === "number" && Number.isFinite(value);
 function cursorStateDb(homeDir) {
-  const base = homeDir ?? homedir3();
+  const base = homeDir ?? homedir2();
   const tail = ["Cursor", "User", "globalStorage", "state.vscdb"];
   if (process.platform === "darwin") {
-    return join4(base, "Library", "Application Support", ...tail);
+    return join3(base, "Library", "Application Support", ...tail);
   }
   if (process.platform === "win32") {
-    const roaming = homeDir ? join4(homeDir, "AppData", "Roaming") : envDir("APPDATA") ?? join4(base, "AppData", "Roaming");
-    return join4(roaming, ...tail);
+    const roaming = homeDir ? join3(homeDir, "AppData", "Roaming") : envDir("APPDATA") ?? join3(base, "AppData", "Roaming");
+    return join3(roaming, ...tail);
   }
-  const cfg = homeDir ? join4(homeDir, ".config") : envDir("XDG_CONFIG_HOME") ?? join4(base, ".config");
-  return join4(cfg, ...tail);
+  const cfg = homeDir ? join3(homeDir, ".config") : envDir("XDG_CONFIG_HOME") ?? join3(base, ".config");
+  return join3(cfg, ...tail);
 }
 async function detectCursor(homeDir) {
   try {
@@ -720,6 +662,22 @@ async function readState(db, key) {
   const raw = r.status === "ok" ? r.rows[0]?.value : void 0;
   return { value: typeof raw === "string" && raw.trim() ? raw.trim() : null, status: r.status };
 }
+function cleanStoredString(value) {
+  if (!value) return void 0;
+  try {
+    const parsed = JSON.parse(value);
+    if (typeof parsed === "string" && parsed.trim()) return parsed.trim();
+  } catch {
+  }
+  const trimmed = value.trim().replace(/^"|"$/g, "");
+  return trimmed || void 0;
+}
+function identityFields(email, displayName) {
+  return {
+    email: email ?? null,
+    displayName: displayName ?? null
+  };
+}
 async function connectPost(url, token) {
   try {
     const res = await fetch(url, {
@@ -739,7 +697,6 @@ async function connectPost(url, token) {
     return null;
   }
 }
-var dollars = (cents) => cents / 100;
 async function cursorBilling(account) {
   const [core, activity, spend] = await Promise.all([
     cursorBillingCore(account),
@@ -749,27 +706,31 @@ async function cursorBilling(account) {
   let merged = activity;
   if (spend) {
     const lines = activity?.summary ?? "";
-    const spendLabel = `$${Math.round(spend.total)} all-time`;
+    const spendLabel = `$${Math.round(finite(spend.total))} all-time`;
     merged = {
       series: activity?.series ?? [],
       summary: lines ? `${lines} \xB7 ${spendLabel}` : spendLabel
     };
   }
-  const modelSpend = spend?.models?.length ? spend.models.slice(0, 6).map((m) => ({ name: m.name, usd: m.usd, requests: m.requests })) : null;
+  const modelSpend = spend?.models?.length ? spend.models.map((m) => ({ name: m.name, usd: finite(m.usd), requests: finite(m.requests) })) : null;
   return { ...core, activity: merged, modelSpend };
 }
 async function cursorBillingCore(account) {
   const db = cursorStateDb(account.homeDir);
-  const [tokenRes, membershipRes] = await Promise.all([
+  const [tokenRes, membershipRes, emailRes, nameRes] = await Promise.all([
     readState(db, "cursorAuth/accessToken"),
-    readState(db, "cursorAuth/stripeMembershipType")
+    readState(db, "cursorAuth/stripeMembershipType"),
+    readState(db, "cursorAuth/cachedEmail"),
+    readState(db, "cursorAuth/cachedName")
   ]);
   const token = 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 };
+    return { plan: planFallback, metrics: [], error, ...identityFields(email, displayName) };
   }
   const [usage, planInfo] = await Promise.all([
     connectPost(USAGE_URL, token),
@@ -777,7 +738,7 @@ async function cursorBillingCore(account) {
   ]);
   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" };
+    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;
@@ -786,50 +747,49 @@ async function cursorBillingCore(account) {
   const metrics = [];
   const rawEnd = usage.billingCycleEnd;
   const endMs = typeof rawEnd === "string" && rawEnd.trim() ? Number(rawEnd) : NaN;
-  const resets = Number.isFinite(endMs) && endMs > 0 && endMs <= 864e13 ? resetIn(new Date(endMs).toISOString()) : null;
-  if (typeof pu.totalPercentUsed === "number" && typeof pu.limit === "number") {
-    metrics.push({
-      label: "Usage",
-      used: pu.totalPercentUsed,
-      limit: 100,
-      format: { kind: "percent" },
-      resetsAt: resets,
-      primary: true
-    });
-    const spentCents = typeof pu.totalSpend === "number" ? pu.totalSpend : pu.limit - (pu.remaining ?? 0);
-    metrics.push({
-      label: "Spend",
-      used: dollars(spentCents),
-      limit: dollars(pu.limit),
-      format: { kind: "dollars" }
-    });
+  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)) {
+      metrics.push({
+        label: "Spend",
+        used: dollars(spentCents),
+        limit: dollars(pu.limit),
+        format: { kind: "dollars" }
+      });
+    }
   }
-  if (pu.autoPercentUsed) {
+  if (typeof pu.autoPercentUsed === "number" && Number.isFinite(pu.autoPercentUsed)) {
     metrics.push({ label: "Auto", used: pu.autoPercentUsed, limit: 100, format: { kind: "percent" } });
   }
-  if (pu.apiPercentUsed) {
+  if (typeof pu.apiPercentUsed === "number" && Number.isFinite(pu.apiPercentUsed)) {
     metrics.push({ label: "API", used: pu.apiPercentUsed, limit: 100, format: { kind: "percent" } });
   }
   const su = usage.spendLimitUsage;
   if (su) {
-    const limitCents = su.individualLimit ?? su.pooledLimit ?? 0;
-    const remainingCents = su.individualRemaining ?? su.pooledRemaining ?? 0;
-    if (limitCents > 0) {
+    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;
+    if (pair && pair.limit > 0) {
       metrics.push({
         label: "On-demand",
-        used: dollars(limitCents - remainingCents),
-        limit: dollars(limitCents),
+        used: dollars(pair.limit - pair.remaining),
+        limit: dollars(pair.limit),
         format: { kind: "dollars" }
       });
     }
   }
   if (metrics.length === 0) {
-    return { plan, metrics: [], error: usage.enabled === false ? "No active subscription" : "No usage data" };
+    return { plan, metrics: [], error: usage.enabled === false ? "No active subscription" : "No usage data", ...identityFields(email, displayName) };
   }
-  return { plan, metrics, error: null };
+  return { plan, metrics, error: null, ...identityFields(email, displayName) };
 }
 
 // src/providers/cursor/composer.ts
+var finiteNonNegative = (value) => {
+  const n = Number(value);
+  return Number.isFinite(n) && n > 0 ? n : 0;
+};
 async function cursorModelSpend(homeDir) {
   const db = cursorStateDb(homeDir);
   const sql = "SELECT mk.key AS name, sum(json_extract(mk.value,'$.costInCents')) AS cents, sum(json_extract(mk.value,'$.amount')) AS amt FROM cursorDiskKV c, json_each(c.value,'$.usageData') mk WHERE c.key LIKE 'composerData:%' AND json_valid(c.value) AND json_type(c.value,'$.usageData')='object' GROUP BY mk.key ORDER BY cents DESC;";
@@ -838,9 +798,9 @@ async function cursorModelSpend(homeDir) {
   const models = [];
   let total = 0;
   for (const row of res.rows) {
-    const usd = (Number(row.cents) || 0) / 100;
+    const usd = finiteNonNegative(row.cents) / 100;
     if (usd <= 0) continue;
-    models.push({ name: String(row.name ?? ""), usd, requests: Number(row.amt) || 0 });
+    models.push({ name: String(row.name ?? ""), usd, requests: finiteNonNegative(row.amt) });
     total += usd;
   }
   if (total <= 0) return null;
@@ -870,8 +830,8 @@ async function cursorUsageTable(tz, homeDir) {
   for (const r of res.rows) {
     const ts = Number(r.createdAt);
     if (!Number.isFinite(ts) || ts <= 0) continue;
-    const usd = (Number(r.cents) || 0) / 100;
-    const reqs = Number(r.amt) || 0;
+    const usd = finiteNonNegative(r.cents) / 100;
+    const reqs = finiteNonNegative(r.amt);
     if (usd <= 0 && reqs <= 0) continue;
     const model = String(r.model ?? "unknown");
     put(buckets.daily, dayKey(ts, tz), model, usd, reqs);
@@ -891,8 +851,8 @@ async function cursorUsageTable(tz, homeDir) {
 import { readdir, stat as fsStat, access as access2 } from "fs/promises";
 import { createReadStream } from "fs";
 import { createInterface } from "readline";
-import { join as join5, isAbsolute as isAbsolute2 } from "path";
-import { homedir as homedir4 } from "os";
+import { join as join4, isAbsolute } from "path";
+import { homedir as homedir3 } from "os";
 var PRICING = {
   "claude-opus-4-1": { i: 15e-6, o: 75e-6, cc: 1875e-8, cr: 15e-7 },
   "claude-opus-4-0": { i: 15e-6, o: 75e-6, cc: 1875e-8, cr: 15e-7 },
@@ -904,31 +864,31 @@ var PRICING = {
   "claude-fable-5": { i: 1e-5, o: 5e-5, cc: 125e-7, cr: 1e-6 }
 };
 var PRICE_KEYS = Object.keys(PRICING).sort((a, b) => b.length - a.length);
-var FALLBACK = PRICING["claude-opus-4"];
+var ZERO_PRICE = { i: 0, o: 0, cc: 0, cr: 0 };
 function claudeConfigDirs(homeDir) {
   if (homeDir) {
-    return [join5(homeDir, ".claude"), join5(homeDir, ".config", "claude")];
+    return [join4(homeDir, ".claude"), join4(homeDir, ".config", "claude")];
   }
-  const home = homedir4();
-  const dirs = [join5(home, ".claude")];
+  const home = homedir3();
+  const dirs = [join4(home, ".claude")];
   const xdg = envDir("XDG_CONFIG_HOME");
   if (xdg) {
-    dirs.push(join5(xdg, "claude"));
+    dirs.push(join4(xdg, "claude"));
   } else if (process.platform !== "win32") {
-    dirs.push(join5(home, ".config", "claude"));
+    dirs.push(join4(home, ".config", "claude"));
   }
   const appData = envDir("APPDATA");
-  if (appData) dirs.push(join5(appData, "claude"));
+  if (appData) dirs.push(join4(appData, "claude"));
   if (process.env.CLAUDE_CONFIG_DIR) {
     for (const p of process.env.CLAUDE_CONFIG_DIR.split(process.platform === "win32" ? ";" : ",")) {
       const t = p.trim();
-      if (t && isAbsolute2(t)) dirs.push(t);
+      if (t && isAbsolute(t)) dirs.push(t);
     }
   }
   return [...new Set(dirs)];
 }
 function getClaudeDirs(homeDir) {
-  return claudeConfigDirs(homeDir).map((d) => join5(d, "projects"));
+  return claudeConfigDirs(homeDir).map((d) => join4(d, "projects"));
 }
 async function detectClaude(homeDir) {
   for (const dir of getClaudeDirs(homeDir)) {
@@ -941,12 +901,13 @@ async function detectClaude(homeDir) {
   return false;
 }
 function priceFor(model) {
+  const m = model.toLowerCase().trim();
   for (const key of PRICE_KEYS) {
-    if (!model.startsWith(key)) continue;
-    const rest = model.slice(key.length);
+    if (!m.startsWith(key)) continue;
+    const rest = m.slice(key.length);
     if (rest === "" || rest[0] === "-") return PRICING[key];
   }
-  return FALLBACK;
+  return ZERO_PRICE;
 }
 function costOf(model, u) {
   const p = priceFor(model);
@@ -1003,7 +964,7 @@ async function loadEntries(since, homeDir) {
     }
     for (const f of listing) {
       if (!f.endsWith(".jsonl")) continue;
-      const path = join5(dir, f);
+      const path = join4(dir, f);
       if (seen.has(path)) continue;
       seen.add(path);
       try {
@@ -1022,23 +983,74 @@ async function loadEntries(since, homeDir) {
   return loadCachedEntries(files, parseFile, since);
 }
 async function claudeDashboard(tz, homeDir) {
-  const now = Date.now();
-  const since = Math.min(startOfMonth(now, tz), startOfWeek(now, tz), now - SPARK_DAYS * 864e5);
-  const entries = await loadEntries(since, homeDir);
+  const entries = await loadEntries(dashboardSince(tz), homeDir);
   return summarize(entries, tz);
 }
 async function claudeTable(tz, homeDir) {
-  const entries = await loadEntries(monthsAgoStart(Date.now(), 6, tz), homeDir);
+  const entries = await loadEntries(tableSince(tz), homeDir);
   return tabulate(entries, tz);
 }
 
 // src/providers/claude/billing.ts
+import { readFile as readFile2 } from "fs/promises";
+import { join as join5 } from "path";
+import { homedir as homedir4 } from "os";
+
+// src/providers/_shared/keychain.ts
 import { execFile as execFileCb2 } from "child_process";
-import { readFile as readFile3 } from "fs/promises";
-import { join as join6 } from "path";
-import { homedir as homedir5 } from "os";
 import { promisify as promisify2 } from "util";
 var execFile2 = promisify2(execFileCb2);
+var GO_KEYRING_PREFIX = "go-keyring-base64:";
+async function readMacKeychainRaw(service) {
+  if (process.platform !== "darwin") return null;
+  try {
+    const { stdout } = await execFile2("security", [
+      "find-generic-password",
+      "-s",
+      service,
+      "-w"
+    ], { timeout: 5e3 });
+    const raw = stdout.trim();
+    return raw || null;
+  } catch {
+    return null;
+  }
+}
+function unwrapGoKeyringBase64(raw) {
+  if (!raw.startsWith(GO_KEYRING_PREFIX)) return raw;
+  return Buffer.from(raw.slice(GO_KEYRING_PREFIX.length), "base64").toString("utf-8");
+}
+
+// src/providers/claude/billing.ts
+function titleWords(value) {
+  return value.split(/[_\s-]+/).filter(Boolean).map((part) => part.charAt(0).toUpperCase() + part.slice(1).toLowerCase()).join(" ");
+}
+function claudeOrgPlanLabel(orgType) {
+  if (typeof orgType !== "string" || !orgType.trim()) return null;
+  const normalized = orgType.trim().toLowerCase();
+  const stripped = normalized.startsWith("claude_") ? normalized.slice("claude_".length) : normalized;
+  const label = titleWords(stripped);
+  return label ? `Claude ${label}` : null;
+}
+async function readClaudeIdentity(homeDir) {
+  const base = homeDir ? expandHome(homeDir) : homedir4();
+  try {
+    const parsed = JSON.parse(await readFile2(join5(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 };
+  } catch {
+    return {};
+  }
+}
+function identityFields2(identity) {
+  return {
+    email: identity.email ?? null,
+    displayName: identity.displayName ?? null
+  };
+}
 function parseAuth(raw) {
   try {
     const creds = JSON.parse(raw);
@@ -1057,7 +1069,7 @@ function parseAuth(raw) {
 async function readCredentialsFile(homeDir) {
   for (const dir of claudeConfigDirs(homeDir)) {
     try {
-      const auth = parseAuth(await readFile3(join6(dir, ".credentials.json"), "utf-8"));
+      const auth = parseAuth(await readFile2(join5(dir, ".credentials.json"), "utf-8"));
       if (auth) return auth;
     } catch {
     }
@@ -1065,25 +1077,23 @@ async function readCredentialsFile(homeDir) {
   return null;
 }
 async function readMacKeychain() {
-  try {
-    const { stdout } = await execFile2("security", [
-      "find-generic-password",
-      "-s",
-      "Claude Code-credentials",
-      "-w"
-    ], { timeout: 5e3 });
-    return parseAuth(stdout.trim());
-  } catch {
-    return null;
-  }
+  const raw = await readMacKeychainRaw("Claude Code-credentials");
+  return raw ? parseAuth(raw) : null;
 }
 async function getAuth(homeDir) {
-  const isDefault = !homeDir || homeDir === homedir5();
-  if (isDefault && process.platform === "darwin") {
-    const auth = await readMacKeychain();
-    if (auth) return auth;
+  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;
+    }
+    return readCredentialsFile(void 0);
   }
-  return readCredentialsFile(homeDir);
+  const fileAuth = await readCredentialsFile(expandedHomeDir);
+  if (fileAuth) return fileAuth;
+  if (process.platform === "darwin") return readMacKeychain();
+  return null;
 }
 function planLabel(auth) {
   const sub = auth.subscriptionType;
@@ -1092,11 +1102,19 @@ function planLabel(auth) {
   const tier = (auth.rateLimitTier ?? "").match(/(\d+)x/);
   return tier ? `${base} ${tier[1]}x` : base;
 }
-var pct = (used, resets, primary) => ({ label: "", used, limit: 100, format: { kind: "percent" }, resetsAt: resets ?? null, primary });
+var pct = (used, resets, primary) => percentMetric("", used, resets ?? null, primary);
+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 };
+}
 async function claudeBilling(account) {
-  const auth = await getAuth(account.homeDir);
-  if (!auth) return { plan: null, metrics: [], error: "No OAuth token \u2014 run claude and log in" };
-  const plan = planLabel(auth);
+  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 plan = identity.plan ?? planLabel(auth);
   try {
     const res = await fetch("https://api.anthropic.com/api/oauth/usage", {
       headers: {
@@ -1106,32 +1124,30 @@ async function claudeBilling(account) {
       },
       signal: AbortSignal.timeout(1e4)
     });
-    if (res.status === 429) return { plan, metrics: [], error: "Rate limited \u2014 retrying next poll" };
-    if (res.status === 401) return { plan, metrics: [], error: "Token expired \u2014 restart Claude Code" };
-    if (!res.ok) return { plan, metrics: [], error: `API ${res.status}` };
+    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) };
     const data = await readJson(res);
-    if (!data) return { plan, metrics: [], error: "Unexpected API response" };
+    if (!data) return { plan, metrics: [], error: "Unexpected API response", ...identityFields2(identity) };
     const metrics = [];
-    if (data.five_hour) {
-      metrics.push({ ...pct(data.five_hour.utilization, resetIn(data.five_hour.resets_at), true), label: "5h" });
-    }
-    if (data.seven_day) {
-      metrics.push({ ...pct(data.seven_day.utilization, resetIn(data.seven_day.resets_at)), label: "Week" });
-    }
-    if (data.seven_day_sonnet) {
-      metrics.push({ ...pct(data.seven_day_sonnet.utilization), label: "Sonnet" });
-    }
+    const fiveHour = usageMetric("5h", data.five_hour, true);
+    if (fiveHour) metrics.push(fiveHour);
+    const sevenDay = usageMetric("Week", 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: (data.extra_usage.used_credits ?? 0) / 100,
-        limit: data.extra_usage.monthly_limit != null ? data.extra_usage.monthly_limit / 100 : null,
+        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" }
       });
     }
-    return { plan, metrics, error: null };
+    return { plan, metrics, error: null, ...identityFields2(identity) };
   } catch {
-    return { plan, metrics: [], error: "Network error" };
+    return { plan, metrics: [], error: "Network error", ...identityFields2(identity) };
   }
 }
 
@@ -1152,8 +1168,8 @@ var claudeProvider = {
 import { readdir as readdir2, stat as fsStat2, access as access3 } from "fs/promises";
 import { createReadStream as createReadStream2 } from "fs";
 import { createInterface as createInterface2 } from "readline";
-import { join as join7 } from "path";
-import { homedir as homedir6 } from "os";
+import { join as join6 } from "path";
+import { homedir as homedir5 } from "os";
 var PRICING2 = {
   "gpt-5-codex": { in: 125e-8, cr: 125e-9, out: 1e-5 },
   "gpt-5-mini": { in: 25e-8, cr: 25e-9, out: 2e-6 },
@@ -1161,33 +1177,45 @@ 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 FALLBACK2 = PRICING2["gpt-5-codex"];
+var ZERO_PRICE2 = { in: 0, cr: 0, out: 0 };
 var PRICE_KEYS2 = Object.keys(PRICING2).sort((a, b) => b.length - a.length);
 function codexHomes(homeDir) {
-  if (homeDir) return [join7(homeDir, ".codex")];
+  if (homeDir) return [join6(homeDir, ".codex")];
   const homes = [];
   const codexHome = envDir("CODEX_HOME");
   if (codexHome) homes.push(codexHome);
-  homes.push(join7(homedir6(), ".codex"));
-  homes.push(join7(homedir6(), ".config", "codex"));
+  homes.push(join6(homedir5(), ".codex"));
+  homes.push(join6(homedir5(), ".config", "codex"));
   return [...new Set(homes)];
 }
 async function detectCodex(homeDir) {
   for (const home of codexHomes(homeDir)) {
     try {
-      await access3(join7(home, "sessions"));
+      await access3(join6(home, "sessions"));
       return true;
     } catch {
     }
   }
   return false;
 }
+function modelKeyMatches(model, key) {
+  let idx = model.indexOf(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]))) {
+      return true;
+    }
+    idx = model.indexOf(key, idx + key.length);
+  }
+  return false;
+}
 function priceFor2(model) {
-  const m = model.toLowerCase();
+  const m = model.toLowerCase().trim();
   for (const key of PRICE_KEYS2) {
-    if (m.startsWith(key) || m.includes(key)) return PRICING2[key];
+    if (modelKeyMatches(m, key)) return PRICING2[key];
   }
-  return FALLBACK2;
+  return ZERO_PRICE2;
 }
 function extractModel(obj) {
   const p = obj?.payload ?? obj;
@@ -1208,7 +1236,7 @@ function eventSig(last, total) {
 }
 async function parseFile2(path) {
   const entries = [];
-  let model = "gpt-5-codex";
+  let model = "unknown";
   let prevTotal = null;
   let prevSig = null;
   const rl = createInterface2({ input: createReadStream2(path), crlfDelay: Infinity });
@@ -1265,7 +1293,7 @@ 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");
+    const dir = join6(home, "sessions");
     let listing;
     try {
       listing = await readdir2(dir, { recursive: true });
@@ -1274,7 +1302,7 @@ async function loadEntries2(since, homeDir) {
     }
     for (const f of listing) {
       if (!f.endsWith(".jsonl") || !f.includes("rollout-")) continue;
-      const path = join7(dir, f);
+      const path = join6(dir, f);
       if (seen.has(path)) continue;
       seen.add(path);
       try {
@@ -1293,49 +1321,78 @@ async function loadEntries2(since, homeDir) {
   return loadCachedEntries(files, parseFile2, since);
 }
 async function codexDashboard(tz, homeDir) {
-  const now = Date.now();
-  const since = Math.min(startOfMonth(now, tz), startOfWeek(now, tz), now - SPARK_DAYS * 864e5);
-  const entries = await loadEntries2(since, homeDir);
+  const entries = await loadEntries2(dashboardSince(tz), homeDir);
   return summarize(entries, tz);
 }
 async function codexTable(tz, homeDir) {
-  const entries = await loadEntries2(monthsAgoStart(Date.now(), 6, tz), homeDir);
+  const entries = await loadEntries2(tableSince(tz), homeDir);
   return tabulate(entries, tz);
 }
 
 // src/providers/codex/billing.ts
-import { execFile as execFileCb3 } from "child_process";
-import { readFile as readFile4, readdir as readdir3, stat as fsStat3 } from "fs/promises";
+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 { promisify as promisify3 } from "util";
-var execFile3 = promisify3(execFileCb3);
+import { join as join7 } from "path";
 var USAGE_URL2 = "https://chatgpt.com/backend-api/wham/usage";
 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();
+  const labels = {
+    free: "ChatGPT Free",
+    plus: "ChatGPT Plus",
+    pro: "ChatGPT Pro",
+    team: "ChatGPT Team",
+    enterprise: "ChatGPT Enterprise",
+    edu: "ChatGPT Edu"
+  };
+  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;
+  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 readFile4(join8(home, "auth.json"), "utf-8");
+    const raw = await readFile3(join7(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 };
+    return { accessToken, accountId: auth?.tokens?.account_id, ...identityFromIdToken(auth?.tokens?.id_token) };
   } catch {
     return null;
   }
 }
 async function readKeychainAuth() {
   try {
-    const { stdout } = await execFile3("security", [
-      "find-generic-password",
-      "-s",
-      "Codex Auth",
-      "-w"
-    ], { timeout: 5e3 });
-    const auth = JSON.parse(stdout.trim());
+    const raw = await readMacKeychainRaw("Codex Auth");
+    if (!raw) return null;
+    const auth = JSON.parse(raw);
     const accessToken = auth?.tokens?.access_token;
     if (!accessToken) return null;
-    return { accessToken, accountId: auth?.tokens?.account_id };
+    return { accessToken, accountId: auth?.tokens?.account_id, ...identityFromIdToken(auth?.tokens?.id_token) };
   } catch {
     return null;
   }
@@ -1355,20 +1412,14 @@ function planLabel2(planType) {
   if (p === "pro") return "Pro 20x";
   return planType.charAt(0).toUpperCase() + planType.slice(1);
 }
-function isoOrNull(ms) {
-  return Number.isFinite(ms) && Math.abs(ms) <= 864e13 ? new Date(ms).toISOString() : null;
-}
 function resetFrom(window) {
   if (!window) return null;
   let iso = null;
-  if (typeof window.reset_at === "number") iso = isoOrNull(window.reset_at * 1e3);
-  else if (typeof window.resets_at === "number") iso = isoOrNull(window.resets_at * 1e3);
-  else if (typeof window.reset_after_seconds === "number") iso = isoOrNull(Date.now() + window.reset_after_seconds * 1e3);
+  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);
   return iso ? resetIn(iso) : null;
 }
-function percentMetric(label, used, resets, primary) {
-  return { label, used, limit: 100, format: { kind: "percent" }, resetsAt: resets, primary };
-}
 async function liveBilling(auth) {
   try {
     const headers = {
@@ -1393,14 +1444,14 @@ async function liveBilling(auth) {
     };
     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") metrics.push(percentMetric("5h", primaryPct, resetFrom(primary), true));
-    if (typeof secondaryPct === "number") metrics.push(percentMetric("Week", secondaryPct, resetFrom(secondary)));
+    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" && balance >= 0) {
+    if (typeof balance === "number" && Number.isFinite(balance) && balance >= 0) {
       metrics.push({ label: "Credits", used: balance * CREDIT_USD_RATE, limit: null, format: { kind: "dollars" } });
     }
     if (metrics.length === 0) return null;
-    return { plan: planLabel2(data.plan_type), metrics, error: null };
+    return { plan: auth.plan ?? planLabel2(data.plan_type), metrics, error: null, ...identityFields3(auth) };
   } catch {
     return null;
   }
@@ -1408,7 +1459,7 @@ async function liveBilling(auth) {
 async function newestRolloutFile(homeDir) {
   let best = null;
   for (const home of codexHomes(homeDir)) {
-    const dir = join8(home, "sessions");
+    const dir = join7(home, "sessions");
     let listing;
     try {
       listing = await readdir3(dir, { recursive: true });
@@ -1417,7 +1468,7 @@ async function newestRolloutFile(homeDir) {
     }
     for (const f of listing) {
       if (!f.endsWith(".jsonl") || !f.includes("rollout-")) continue;
-      const path = join8(dir, f);
+      const path = join7(dir, f);
       try {
         const s = await fsStat3(path);
         if (!best || s.mtimeMs > best.mtime) best = { path, mtime: s.mtimeMs };
@@ -1427,7 +1478,7 @@ async function newestRolloutFile(homeDir) {
   }
   return best?.path ?? null;
 }
-async function snapshotBilling(homeDir) {
+async function snapshotBilling(homeDir, auth = null) {
   const path = await newestRolloutFile(homeDir);
   if (!path) return null;
   let last = null;
@@ -1446,18 +1497,18 @@ async function snapshotBilling(homeDir) {
   }
   if (!last) return null;
   const metrics = [];
-  if (typeof last.primary?.used_percent === "number") {
+  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") {
+  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" && balance >= 0) {
+  if (typeof balance === "number" && Number.isFinite(balance) && balance >= 0) {
     metrics.push({ label: "Credits", used: balance * CREDIT_USD_RATE, limit: null, format: { kind: "dollars" } });
   }
   if (metrics.length === 0) return null;
-  return { plan: planLabel2(last.plan_type), metrics, error: null };
+  return { plan: auth?.plan ?? planLabel2(last.plan_type), metrics, error: null, ...identityFields3(auth) };
 }
 async function codexBilling(account) {
   const auth = await getAuth2(account.homeDir);
@@ -1465,12 +1516,13 @@ async function codexBilling(account) {
     const live = await liveBilling(auth);
     if (live) return live;
   }
-  const snap = await snapshotBilling(account.homeDir);
+  const snap = await snapshotBilling(account.homeDir, auth);
   if (snap) return snap;
   return {
-    plan: null,
+    plan: auth?.plan ?? null,
     metrics: [],
-    error: auth ? "Usage API failed \u2014 run codex to refresh" : "Not logged in \u2014 run codex"
+    error: auth ? "Usage API failed \u2014 run codex to refresh" : "Not logged in \u2014 run codex",
+    ...identityFields3(auth)
   };
 }
 
@@ -1595,7 +1647,9 @@ function reBucket(daily, tz, keyOf) {
   const out = /* @__PURE__ */ new Map();
   for (const day of daily) {
     const [y, mo, d] = day.label.split("-").map(Number);
-    const label = keyOf(Date.UTC(y, mo - 1, d, 12), tz);
+    const ts = Date.UTC(y, mo - 1, d, 12);
+    if (!Number.isFinite(ts)) continue;
+    const label = keyOf(ts, tz);
     let row = out.get(label);
     if (!row) {
       row = { label, models: [], input: 0, output: 0, cacheCreate: 0, cacheRead: 0, cacheSavings: 0, total: 0, cost: 0, count: 0, breakdown: [] };
@@ -1641,7 +1695,6 @@ var cursorProvider = {
   id: "cursor",
   name: "Cursor",
   color: "magenta",
-  // hasUsage: false — TUI keys its dedicated Cursor spend-table off this flag directly.
   hasUsage: false,
   hasBilling: true,
   detect: (homeDir) => detectCursor(homeDir),
@@ -1653,10 +1706,10 @@ var cursorProvider = {
 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 homedir7 } from "os";
+import { join as join8 } from "path";
+import { homedir as homedir6 } from "os";
 function piSessionsDir(homeDir) {
-  return join9(homeDir ?? homedir7(), ".pi", "agent", "sessions");
+  return join8(homeDir ?? homedir6(), ".pi", "agent", "sessions");
 }
 async function detectPi(homeDir) {
   try {
@@ -1666,9 +1719,6 @@ async function detectPi(homeDir) {
     return false;
   }
 }
-function pos(v) {
-  return typeof v === "number" && Number.isFinite(v) && v > 0 ? v : 0;
-}
 async function parseFile3(path) {
   const entries = [];
   const rl = createInterface4({ input: createReadStream4(path), crlfDelay: Infinity });
@@ -1689,13 +1739,13 @@ async function parseFile3(path) {
       const cacheCreate = safeNum(u.cacheWrite);
       if (input + output + cacheRead + cacheCreate === 0) continue;
       const c = u.cost ?? {};
-      const costInput = pos(c.input);
-      const cacheSavings = input > 0 && cacheRead > 0 ? Math.max(0, cacheRead * (costInput / input) - pos(c.cacheRead)) : 0;
+      const costInput = finitePositive(c.input);
+      const cacheSavings = input > 0 && cacheRead > 0 ? Math.max(0, cacheRead * (costInput / input) - finitePositive(c.cacheRead)) : 0;
       const model = typeof msg.responseModel === "string" && msg.responseModel || typeof msg.model === "string" && msg.model || "unknown";
       entries.push({
         ts,
         model,
-        cost: pos(c.total),
+        cost: finitePositive(c.total),
         input,
         output,
         cacheCreate,
@@ -1719,7 +1769,7 @@ async function loadEntries3(since, homeDir) {
   }
   for (const f of listing) {
     if (!f.endsWith(".jsonl")) continue;
-    const path = join9(dir, f);
+    const path = join8(dir, f);
     try {
       const s = await fsStat4(path);
       if (s.mtimeMs < since) continue;
@@ -1735,12 +1785,10 @@ async function loadEntries3(since, homeDir) {
   return loadCachedEntries(files, parseFile3, since);
 }
 async function piDashboard(tz, homeDir) {
-  const now = Date.now();
-  const since = Math.min(startOfMonth(now, tz), startOfWeek(now, tz), now - SPARK_DAYS * 864e5);
-  return summarize(await loadEntries3(since, homeDir), tz);
+  return summarize(await loadEntries3(dashboardSince(tz), homeDir), tz);
 }
 async function piTable(tz, homeDir) {
-  return tabulate(await loadEntries3(monthsAgoStart(Date.now(), 6, tz), homeDir), tz);
+  return tabulate(await loadEntries3(tableSince(tz), homeDir), tz);
 }
 
 // src/providers/pi/index.ts
@@ -1757,17 +1805,17 @@ var piProvider = {
 
 // src/providers/opencode/usage.ts
 import { access as access5 } from "fs/promises";
-import { join as join10 } from "path";
-import { homedir as homedir8 } from "os";
+import { join as join9 } from "path";
+import { homedir as homedir7 } from "os";
 function opencodeDbPaths(homeDir) {
-  const base = homeDir ?? homedir8();
+  const base = homeDir ?? homedir7();
   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(join9(process.env.XDG_DATA_HOME, "opencode", "opencode.db"));
+  paths.push(join9(base, ".local", "share", "opencode", "opencode.db"));
+  if (process.platform === "darwin") paths.push(join9(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 ? join9(homeDir, "AppData", "Local") : process.env.LOCALAPPDATA;
+    if (lad) paths.push(join9(lad, "opencode", "opencode.db"));
   }
   return [...new Set(paths)];
 }
@@ -1784,7 +1832,6 @@ async function findDb(homeDir) {
 async function detectOpencode(homeDir) {
   return await findDb(homeDir) !== null;
 }
-var pos2 = (v) => typeof v === "number" && Number.isFinite(v) && v > 0 ? v : 0;
 async function loadEntries4(since, homeDir) {
   const db = await findDb(homeDir);
   if (!db) return [];
@@ -1793,17 +1840,17 @@ async function loadEntries4(since, homeDir) {
   if (res.status !== "ok") return [];
   const entries = [];
   for (const row of res.rows) {
-    const ts = pos2(row.ts);
+    const ts = finitePositive(row.ts);
     if (!ts) continue;
-    const input = pos2(row.input);
-    const output = pos2(row.output);
-    const cacheRead = pos2(row.cacheRead);
-    const cacheCreate = pos2(row.cacheWrite);
+    const input = finitePositive(row.input);
+    const output = finitePositive(row.output);
+    const cacheRead = finitePositive(row.cacheRead);
+    const cacheCreate = finitePositive(row.cacheWrite);
     if (input + output + cacheRead + cacheCreate === 0) continue;
     entries.push({
       ts,
       model: typeof row.model === "string" && row.model ? row.model : "unknown",
-      cost: pos2(row.cost),
+      cost: finitePositive(row.cost),
       input,
       output,
       cacheCreate,
@@ -1814,12 +1861,10 @@ async function loadEntries4(since, homeDir) {
   return entries;
 }
 async function opencodeDashboard(tz, homeDir) {
-  const now = Date.now();
-  const since = Math.min(startOfMonth(now, tz), startOfWeek(now, tz), now - SPARK_DAYS * 864e5);
-  return summarize(await loadEntries4(since, homeDir), tz);
+  return summarize(await loadEntries4(dashboardSince(tz), homeDir), tz);
 }
 async function opencodeTable(tz, homeDir) {
-  return tabulate(await loadEntries4(monthsAgoStart(Date.now(), 6, tz), homeDir), tz);
+  return tabulate(await loadEntries4(tableSince(tz), homeDir), tz);
 }
 
 // src/providers/opencode/index.ts
@@ -1835,29 +1880,28 @@ var opencodeProvider = {
 };
 
 // src/providers/copilot/billing.ts
-import { execFile as execFileCb4 } from "child_process";
-import { access as access6, readFile as readFile5, readdir as readdir5 } from "fs/promises";
-import { join as join11 } from "path";
-import { homedir as homedir9 } from "os";
-import { promisify as promisify4 } from "util";
-var execFile4 = promisify4(execFileCb4);
+import { execFile as execFileCb3 } from "child_process";
+import { access as access6, readFile as readFile4, readdir as readdir5 } from "fs/promises";
+import { join as join10 } from "path";
+import { homedir as homedir8 } from "os";
+import { promisify as promisify3 } from "util";
+var execFile3 = promisify3(execFileCb3);
 var USAGE_URL3 = "https://api.github.com/copilot_internal/user";
 var GH_KEYCHAIN_SERVICE = "gh:github.com";
-var GO_KEYRING_PREFIX = "go-keyring-base64:";
 function ghConfigDir(homeDir) {
   if (!homeDir) {
     const explicit = process.env.GH_CONFIG_DIR;
     if (explicit && explicit.trim()) return explicit.trim();
     if (process.platform === "win32") {
-      return join11(envDir("APPDATA") ?? join11(homedir9(), "AppData", "Roaming"), "GitHub CLI");
+      return join10(envDir("APPDATA") ?? join10(homedir8(), "AppData", "Roaming"), "GitHub CLI");
     }
     const xdg = envDir("XDG_CONFIG_HOME");
-    return xdg ? join11(xdg, "gh") : join11(homedir9(), ".config", "gh");
+    return xdg ? join10(xdg, "gh") : join10(homedir8(), ".config", "gh");
   }
-  return process.platform === "win32" ? join11(homeDir, "AppData", "Roaming", "GitHub CLI") : join11(homeDir, ".config", "gh");
+  return process.platform === "win32" ? join10(homeDir, "AppData", "Roaming", "GitHub CLI") : join10(homeDir, ".config", "gh");
 }
 function ghHostsPath(homeDir) {
-  return join11(ghConfigDir(homeDir), "hosts.yml");
+  return join10(ghConfigDir(homeDir), "hosts.yml");
 }
 async function detectCopilot(homeDir) {
   try {
@@ -1866,7 +1910,7 @@ async function detectCopilot(homeDir) {
   } catch {
   }
   try {
-    await execFile4("gh", ["--version"], { timeout: 3e3 });
+    await execFile3("gh", ["--version"], { timeout: 3e3 });
     return true;
   } catch {
     return false;
@@ -1902,40 +1946,25 @@ function tokenFromHostsYaml(raw) {
 }
 async function loadTokenFromHosts(homeDir) {
   try {
-    const token = tokenFromHostsYaml(await readFile5(ghHostsPath(homeDir), "utf-8"));
+    const token = tokenFromHostsYaml(await readFile4(ghHostsPath(homeDir), "utf-8"));
     return token ? { token, source: "gh-hosts" } : null;
   } catch {
     return null;
   }
 }
 async function readMacKeychainService(service) {
-  if (process.platform !== "darwin") return null;
-  try {
-    const { stdout } = await execFile4("security", [
-      "find-generic-password",
-      "-s",
-      service,
-      "-w"
-    ], { timeout: 5e3 });
-    const raw = stdout.trim();
-    if (!raw) return null;
-    if (raw.startsWith(GO_KEYRING_PREFIX)) {
-      return Buffer.from(raw.slice(GO_KEYRING_PREFIX.length), "base64").toString("utf-8");
-    }
-    return raw;
-  } catch {
-    return null;
-  }
+  const raw = await readMacKeychainRaw(service);
+  return raw ? unwrapGoKeyringBase64(raw) : null;
 }
 async function loadTokenFromGhKeychain() {
   const token = await readMacKeychainService(GH_KEYCHAIN_SERVICE);
   return token ? { token, source: "gh-keychain" } : null;
 }
 function vscodeUserDir(homeDir) {
-  const home = homeDir ?? homedir9();
-  if (process.platform === "darwin") return join11(home, "Library", "Application Support", "Code", "User");
-  if (process.platform === "win32") return join11(home, "AppData", "Roaming", "Code", "User");
-  return join11(home, ".config", "Code", "User");
+  const home = homeDir ?? homedir8();
+  if (process.platform === "darwin") return join10(home, "Library", "Application Support", "Code", "User");
+  if (process.platform === "win32") return join10(home, "AppData", "Roaming", "Code", "User");
+  return join10(home, ".config", "Code", "User");
 }
 function tokenFromText(raw) {
   const patterns = [
@@ -1952,21 +1981,21 @@ function tokenFromText(raw) {
 async function loadTokenFromVsCode(homeDir) {
   const userDir = vscodeUserDir(homeDir);
   const candidates = [
-    join11(userDir, "globalStorage", "github.copilot-chat", "auth.json"),
-    join11(userDir, "globalStorage", "github.copilot", "auth.json"),
-    join11(userDir, "globalStorage", "state.vscdb")
+    join10(userDir, "globalStorage", "github.copilot-chat", "auth.json"),
+    join10(userDir, "globalStorage", "github.copilot", "auth.json"),
+    join10(userDir, "globalStorage", "state.vscdb")
   ];
   try {
-    for (const dirent of await readdir5(join11(userDir, "globalStorage"), { withFileTypes: true })) {
+    for (const dirent of await readdir5(join10(userDir, "globalStorage"), { withFileTypes: true })) {
       if (dirent.isDirectory() && dirent.name.toLowerCase().includes("github")) {
-        candidates.push(join11(userDir, "globalStorage", dirent.name, "auth.json"));
+        candidates.push(join10(userDir, "globalStorage", dirent.name, "auth.json"));
       }
     }
   } catch {
   }
   for (const path of candidates) {
     try {
-      const token = tokenFromText(await readFile5(path, "utf-8"));
+      const token = tokenFromText(await readFile4(path, "utf-8"));
       if (token) return { token, source: "vscode" };
     } catch {
     }
@@ -1983,13 +2012,20 @@ function resetDate(value) {
   return typeof value === "string" && value.trim() ? resetIn(value) : null;
 }
 function percentMetric2(label, snapshot, reset, primary) {
-  if (!snapshot || typeof snapshot.percent_remaining !== "number") return null;
+  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));
-  return { label, used, limit: 100, format: { kind: "percent" }, resetsAt: reset, primary };
+  return {
+    label,
+    used,
+    limit: 100,
+    format: { kind: "percent" },
+    resetsAt: reset,
+    ...primary === void 0 ? {} : { primary }
+  };
 }
 function countMetric(label, remaining, total, reset) {
-  if (typeof remaining !== "number" || typeof total !== "number" || total <= 0) return null;
+  if (typeof remaining !== "number" || typeof total !== "number" || !Number.isFinite(remaining) || !Number.isFinite(total) || total <= 0) return null;
   return {
     label,
     used: Math.max(0, total - remaining),
@@ -2060,14 +2096,14 @@ var copilotProvider = {
 
 // src/providers/antigravity/billing.ts
 import { access as access7, readdir as readdir7 } from "fs/promises";
-import { join as join13 } from "path";
-import { homedir as homedir11 } from "os";
+import { join as join12 } from "path";
+import { homedir as homedir10 } from "os";
 
 // src/providers/cloud-code.ts
-import { readFile as readFile6, readdir as readdir6, realpath, stat } from "fs/promises";
+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 join12 } from "path";
+import { homedir as homedir9 } from "os";
+import { dirname, join as join11 } from "path";
 var CLOUD_CODE_URLS = [
   "https://daily-cloudcode-pa.googleapis.com",
   "https://cloudcode-pa.googleapis.com"
@@ -2095,42 +2131,42 @@ var CC_MODEL_BLACKLIST = {
 function readVarint(bytes, start) {
   let value = 0;
   let shift = 0;
-  let pos3 = start;
-  while (pos3 < bytes.length) {
-    const b = bytes[pos3++];
+  let pos = start;
+  while (pos < bytes.length) {
+    const b = bytes[pos++];
     value += (b & 127) * Math.pow(2, shift);
-    if ((b & 128) === 0) return { value, pos: pos3 };
+    if ((b & 128) === 0) return { value, pos };
     shift += 7;
   }
   return null;
 }
 function readFields(bytes) {
   const fields = {};
-  let pos3 = 0;
-  while (pos3 < bytes.length) {
-    const tag = readVarint(bytes, pos3);
+  let pos = 0;
+  while (pos < bytes.length) {
+    const tag = readVarint(bytes, pos);
     if (!tag) break;
-    pos3 = tag.pos;
+    pos = tag.pos;
     const fieldNum = Math.floor(tag.value / 8);
     const wireType = tag.value % 8;
     if (wireType === 0) {
-      const val = readVarint(bytes, pos3);
+      const val = readVarint(bytes, pos);
       if (!val) break;
       fields[fieldNum] = { type: 0, value: val.value };
-      pos3 = val.pos;
+      pos = val.pos;
     } else if (wireType === 1) {
-      if (pos3 + 8 > bytes.length) break;
-      pos3 += 8;
+      if (pos + 8 > bytes.length) break;
+      pos += 8;
     } else if (wireType === 2) {
-      const len = readVarint(bytes, pos3);
+      const len = readVarint(bytes, pos);
       if (!len) break;
-      pos3 = len.pos;
-      if (pos3 + len.value > bytes.length) break;
-      fields[fieldNum] = { type: 2, data: bytes.slice(pos3, pos3 + len.value) };
-      pos3 += len.value;
+      pos = len.pos;
+      if (pos + len.value > bytes.length) break;
+      fields[fieldNum] = { type: 2, data: bytes.slice(pos, pos + len.value) };
+      pos += len.value;
     } else if (wireType === 5) {
-      if (pos3 + 4 > bytes.length) break;
-      pos3 += 4;
+      if (pos + 4 > bytes.length) break;
+      pos += 4;
     } else {
       break;
     }
@@ -2193,7 +2229,7 @@ function geminiBundleCandidates() {
   const candidates = [];
   const addBundle = (nodeModulesRoot) => {
     if (!nodeModulesRoot) return;
-    candidates.push(join12(nodeModulesRoot, "@google", "gemini-cli", "bundle"));
+    candidates.push(join11(nodeModulesRoot, "@google", "gemini-cli", "bundle"));
   };
   try {
     const which = spawnSync("command", ["-v", "gemini"], { encoding: "utf8", timeout: 5e3 });
@@ -2201,22 +2237,22 @@ function geminiBundleCandidates() {
     if (resolved) candidates.push(resolved);
   } catch {
   }
-  const home = homedir10();
+  const home = homedir9();
   addBundle("/opt/homebrew/lib/node_modules");
   addBundle("/usr/local/lib/node_modules");
-  addBundle(join12(home, ".local", "share", "node_modules"));
-  addBundle(join12(home, ".bun", "install", "global", "node_modules"));
+  addBundle(join11(home, ".local", "share", "node_modules"));
+  addBundle(join11(home, ".bun", "install", "global", "node_modules"));
   try {
     const prefix = spawnSync("npm", ["config", "get", "prefix"], { encoding: "utf8", timeout: 5e3 });
     const root = typeof prefix.stdout === "string" ? prefix.stdout.trim() : "";
-    if (root && root !== "undefined") addBundle(join12(root, "lib", "node_modules"));
+    if (root && root !== "undefined") addBundle(join11(root, "lib", "node_modules"));
   } catch {
   }
   return [...new Set(candidates.filter(Boolean))];
 }
 async function resolveBundleDir(candidate) {
   try {
-    if (candidate.endsWith(`${join12("@google", "gemini-cli", "bundle")}`)) {
+    if (candidate.endsWith(`${join11("@google", "gemini-cli", "bundle")}`)) {
       return candidate;
     }
     const real = await realpath(candidate);
@@ -2234,11 +2270,11 @@ async function scanBundleDir(dir) {
   }
   const targets = entries.filter((name) => name === "gemini.js" || name.startsWith("chunk-") && name.endsWith(".js"));
   for (const name of targets) {
-    const filePath = join12(dir, name);
+    const filePath = join11(dir, name);
     try {
       const info = await stat(filePath);
       if (!info.isFile() || info.size > MAX_BUNDLE_READ) continue;
-      const contents = await readFile6(filePath, "utf8");
+      const contents = await readFile5(filePath, "utf8");
       if (!contents.includes("OAUTH_CLIENT_SECRET")) continue;
       const match = GOOGLE_OAUTH_CLIENT_REGEX.exec(contents);
       if (match) return { clientId: match[1], clientSecret: match[2] };
@@ -2320,14 +2356,19 @@ function readPlan(loadData) {
   if (!raw) return null;
   return raw.replace(/^Gemini Code Assist (?:in|for)\s+/i, "").replace(/^Gemini Code Assist$/i, "Code Assist");
 }
+function readRemainingFraction(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : null;
+}
 function parseBuckets(data) {
   if (!Array.isArray(data?.buckets)) return [];
   return data.buckets.flatMap((bucket) => {
     const modelId = typeof bucket?.modelId === "string" ? bucket.modelId.trim() : "";
     if (!modelId) return [];
+    const remainingFraction = readRemainingFraction(bucket.remainingFraction);
+    if (remainingFraction === null) return [];
     return [{
       modelId,
-      remainingFraction: typeof bucket.remainingFraction === "number" ? bucket.remainingFraction : 0,
+      remainingFraction,
       resetTime: typeof bucket.resetTime === "string" ? bucket.resetTime : void 0
     }];
   });
@@ -2343,9 +2384,11 @@ function parseModelBuckets(data) {
     const displayName = typeof model.displayName === "string" && model.displayName.trim() || typeof model.label === "string" && model.label.trim() || "";
     if (!displayName) return [];
     const quotaInfo = model.quotaInfo;
+    const remainingFraction = readRemainingFraction(quotaInfo?.remainingFraction);
+    if (remainingFraction === null) return [];
     return [{
       modelId: displayName,
-      remainingFraction: typeof quotaInfo?.remainingFraction === "number" ? quotaInfo.remainingFraction : 0,
+      remainingFraction,
       resetTime: typeof quotaInfo?.resetTime === "string" ? quotaInfo.resetTime : void 0
     }];
   });
@@ -2393,12 +2436,18 @@ function normalizeLabel(label) {
 }
 function poolLabel(label) {
   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";
-  return "Claude";
+  if (lower.includes("gemini")) return "Gemini";
+  return normalizeLabel(label) || "Other";
 }
 function sortKey(label) {
   const lower = label.toLowerCase();
+  if (lower === "pro") return `0a_${label}`;
+  if (lower === "flash") return `0b_${label}`;
+  if (lower === "gemini") return `0c_${label}`;
+  if (lower === "claude") return `1b_${label}`;
   if (lower.includes("gemini") && lower.includes("pro")) return `0a_${label}`;
   if (lower.includes("gemini")) return `0b_${label}`;
   if (lower.includes("claude") && lower.includes("opus")) return `1a_${label}`;
@@ -2408,6 +2457,7 @@ function sortKey(label) {
 function cloudCodeBucketsToMetrics(buckets) {
   const pooled = /* @__PURE__ */ new Map();
   for (const bucket of buckets) {
+    if (!Number.isFinite(bucket.remainingFraction)) continue;
     const label = poolLabel(bucket.modelId);
     const existing = pooled.get(label);
     if (!existing || bucket.remainingFraction < existing.remainingFraction) {
@@ -2446,33 +2496,33 @@ async function firstExisting(paths) {
   return paths[0];
 }
 async function antigravityStateDb(homeDir) {
-  const base = homeDir ?? homedir11();
+  const base = homeDir ?? homedir10();
   const tail = ["User", "globalStorage", "state.vscdb"];
   if (process.platform === "darwin") {
-    const support = join13(base, "Library", "Application Support");
+    const support = join12(base, "Library", "Application Support");
     const exact = [
-      join13(support, "Antigravity IDE", ...tail),
-      join13(support, "Antigravity", ...tail)
+      join12(support, "Antigravity IDE", ...tail),
+      join12(support, "Antigravity", ...tail)
     ];
     try {
       const entries = await readdir7(support, { withFileTypes: true });
-      const matches = entries.filter((e) => e.isDirectory() && e.name.includes("Antigravity")).map((e) => join13(support, e.name, ...tail));
+      const matches = entries.filter((e) => e.isDirectory() && e.name.includes("Antigravity")).map((e) => join12(support, e.name, ...tail));
       return firstExisting([...exact, ...matches]);
     } catch {
       return firstExisting(exact);
     }
   }
   if (process.platform === "win32") {
-    const roaming = homeDir ? join13(homeDir, "AppData", "Roaming") : envDir("APPDATA") ?? join13(base, "AppData", "Roaming");
+    const roaming = homeDir ? join12(homeDir, "AppData", "Roaming") : envDir("APPDATA") ?? join12(base, "AppData", "Roaming");
     return firstExisting([
-      join13(roaming, "Antigravity IDE", ...tail),
-      join13(roaming, "Antigravity", ...tail)
+      join12(roaming, "Antigravity IDE", ...tail),
+      join12(roaming, "Antigravity", ...tail)
     ]);
   }
-  const cfg = homeDir ? join13(homeDir, ".config") : envDir("XDG_CONFIG_HOME") ?? join13(base, ".config");
+  const cfg = homeDir ? join12(homeDir, ".config") : envDir("XDG_CONFIG_HOME") ?? join12(base, ".config");
   return firstExisting([
-    join13(cfg, "Antigravity IDE", ...tail),
-    join13(cfg, "Antigravity", ...tail)
+    join12(cfg, "Antigravity IDE", ...tail),
+    join12(cfg, "Antigravity", ...tail)
   ]);
 }
 async function detectAntigravity(homeDir) {
@@ -2503,11 +2553,11 @@ var antigravityProvider = {
 };
 
 // src/providers/gemini/billing.ts
-import { access as access8, readFile as readFile7 } from "fs/promises";
-import { join as join14 } from "path";
-import { homedir as homedir12 } from "os";
+import { access as access8, readFile as readFile6 } from "fs/promises";
+import { join as join13 } from "path";
+import { homedir as homedir11 } from "os";
 function geminiCredsPath(homeDir) {
-  return join14(homeDir ?? homedir12(), ".gemini", "oauth_creds.json");
+  return join13(homeDir ?? homedir11(), ".gemini", "oauth_creds.json");
 }
 async function detectGemini(homeDir) {
   try {
@@ -2517,9 +2567,24 @@ async function detectGemini(homeDir) {
     return false;
   }
 }
+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 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 };
+}
 async function readGeminiCreds(path) {
   try {
-    return JSON.parse(await readFile7(path, "utf8"));
+    return JSON.parse(await readFile6(path, "utf8"));
   } catch {
     return null;
   }
@@ -2527,16 +2592,17 @@ async function readGeminiCreds(path) {
 async function geminiBilling(account) {
   try {
     const creds = await readGeminiCreds(geminiCredsPath(account.homeDir));
+    const identity = geminiIdentity(creds);
     const accessToken = typeof creds?.access_token === "string" ? creds.access_token.trim() : "";
     const refreshToken = typeof creds?.refresh_token === "string" ? creds.refresh_token.trim() : null;
-    if (!creds || !accessToken && !refreshToken) return { plan: null, metrics: [], error: "Not signed in \u2014 run gemini" };
+    if (!creds || !accessToken && !refreshToken) return { plan: null, metrics: [], error: "Not signed in \u2014 run gemini", ...identity };
     const quota = await fetchCloudCodeQuota({
       accessToken,
       refreshToken,
       expirySeconds: typeof creds.expiry_date === "number" ? Math.floor(creds.expiry_date / 1e3) : null
     }, "Token expired \u2014 run gemini");
-    if (!quota.ok) return { plan: quota.plan, metrics: [], error: quota.error };
-    return { plan: quota.plan, metrics: cloudCodeBucketsToMetrics(quota.buckets), error: null };
+    if (!quota.ok) return { plan: quota.plan, metrics: [], error: quota.error, ...identity };
+    return { plan: quota.plan, metrics: cloudCodeBucketsToMetrics(quota.buckets), error: null, ...identity };
   } catch {
     return { plan: null, metrics: [], error: "Gemini billing unavailable" };
   }
@@ -2555,26 +2621,26 @@ var geminiProvider = {
 
 // src/providers/detect.ts
 import { accessSync, constants } from "fs";
-import { join as join15, delimiter, isAbsolute as isAbsolute3 } from "path";
-import { homedir as homedir13 } from "os";
+import { join as join14, delimiter, isAbsolute as isAbsolute2 } from "path";
+import { homedir as homedir12 } from "os";
 function searchDirs() {
-  const home = homedir13();
+  const home = homedir12();
   const fromEnv = (process.env.PATH ?? "").split(delimiter).filter(Boolean);
   const extra = process.platform === "win32" ? [
-    process.env.APPDATA && join15(process.env.APPDATA, "npm"),
-    process.env.LOCALAPPDATA && join15(process.env.LOCALAPPDATA, "pnpm"),
-    join15(home, "scoop", "shims")
+    process.env.APPDATA && join14(process.env.APPDATA, "npm"),
+    process.env.LOCALAPPDATA && join14(process.env.LOCALAPPDATA, "pnpm"),
+    join14(home, "scoop", "shims")
   ] : [
     "/opt/homebrew/bin",
     "/usr/local/bin",
     "/usr/bin",
     "/bin",
     "/opt/local/bin",
-    join15(home, ".local", "bin"),
-    join15(home, "bin"),
-    join15(home, ".npm-global", "bin"),
-    join15(home, ".bun", "bin"),
-    join15(home, ".local", "share", "pnpm")
+    join14(home, ".local", "bin"),
+    join14(home, "bin"),
+    join14(home, ".npm-global", "bin"),
+    join14(home, ".bun", "bin"),
+    join14(home, ".local", "share", "pnpm")
   ];
   return [.../* @__PURE__ */ new Set([...fromEnv, ...extra.filter((d) => !!d)])];
 }
@@ -2591,7 +2657,7 @@ function onPath(names) {
   for (const dir of searchDirs()) {
     for (const n of names) {
       for (const e of exts) {
-        if (isExec(join15(dir, n + e))) return true;
+        if (isExec(join14(dir, n + e))) return true;
       }
     }
   }
@@ -2601,7 +2667,7 @@ function anyExists(paths) {
   return paths.some((p) => !!p && isExec(p));
 }
 function installSignals(id) {
-  const home = homedir13();
+  const home = homedir12();
   const pf = process.env.ProgramFiles;
   const pf86 = process.env["ProgramFiles(x86)"];
   const lad = process.env.LOCALAPPDATA;
@@ -2609,21 +2675,21 @@ function installSignals(id) {
     case "claude":
       return onPath(["claude"]) || anyExists([
         "/Applications/Claude.app",
-        join15(home, "Applications", "Claude.app"),
-        lad && join15(lad, "Programs", "claude", "Claude.exe")
+        join14(home, "Applications", "Claude.app"),
+        lad && join14(lad, "Programs", "claude", "Claude.exe")
       ]);
     case "codex": {
       const bin = process.env.CODEX_BIN;
-      if (bin && isAbsolute3(bin) && isExec(bin)) return true;
+      if (bin && isAbsolute2(bin) && isExec(bin)) return true;
       return onPath(["codex"]);
     }
     case "cursor":
       return onPath(["cursor", "cursor-agent"]) || anyExists([
         "/Applications/Cursor.app",
-        join15(home, "Applications", "Cursor.app"),
-        lad && join15(lad, "Programs", "cursor", "Cursor.exe"),
-        pf && join15(pf, "Cursor", "Cursor.exe"),
-        pf86 && join15(pf86, "Cursor", "Cursor.exe"),
+        join14(home, "Applications", "Cursor.app"),
+        lad && join14(lad, "Programs", "cursor", "Cursor.exe"),
+        pf && join14(pf, "Cursor", "Cursor.exe"),
+        pf86 && join14(pf86, "Cursor", "Cursor.exe"),
         "/opt/Cursor/cursor",
         "/usr/share/cursor/cursor",
         "/usr/bin/cursor"
@@ -2637,8 +2703,8 @@ function installSignals(id) {
     case "antigravity":
       return onPath(["antigravity"]) || anyExists([
         "/Applications/Antigravity.app",
-        join15(home, "Applications", "Antigravity.app"),
-        lad && join15(lad, "Programs", "Antigravity", "Antigravity.exe")
+        join14(home, "Applications", "Antigravity.app"),
+        lad && join14(lad, "Programs", "Antigravity", "Antigravity.exe")
       ]);
     case "gemini":
       return onPath(["gemini"]);
@@ -2675,24 +2741,120 @@ async function detectProviders() {
 }
 
 // src/accounts.ts
+import { existsSync, readdirSync, readFileSync, statSync } from "fs";
+import { homedir as homedir13 } from "os";
+import { basename, join as join15, resolve } from "path";
+function accountKey(providerId, homeDir) {
+  return `${providerId}:${homeDir ? resolve(expandHome(homeDir)) : homedir13()}`;
+}
+function uniqueId(base, used) {
+  let id = slugify(base) || "account";
+  if (!used.has(id)) {
+    used.add(id);
+    return id;
+  }
+  for (let i = 2; i < 1e3; i++) {
+    const next = `${id}_${i}`;
+    if (!used.has(next)) {
+      used.add(next);
+      return next;
+    }
+  }
+  id = `${id}_${Date.now()}`;
+  used.add(id);
+  return id;
+}
+function readClaudeIdentity2(homeDir) {
+  try {
+    const parsed = JSON.parse(readFileSync(join15(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 existsSync(join15(homeDir, ".claude.json")) || existsSync(join15(homeDir, ".claude", ".credentials.json")) || existsSync(join15(homeDir, ".claude", "projects")) || existsSync(join15(homeDir, ".config", "claude", ".credentials.json")) || existsSync(join15(homeDir, ".config", "claude", "projects"));
+}
+function candidateAlternateHomes() {
+  const home = homedir13();
+  let entries;
+  try {
+    entries = readdirSync(home);
+  } catch {
+    return [];
+  }
+  const out = [];
+  for (const name of entries) {
+    if (!/^\.claude[_-]/.test(name)) continue;
+    const path = join15(home, name);
+    try {
+      if (!statSync(path).isDirectory()) continue;
+      out.push(path);
+    } catch {
+    }
+  }
+  return out.sort();
+}
+function labelForClaudeHome(homeDir) {
+  const identity = readClaudeIdentity2(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 discoverClaudeAccounts(usedIds) {
+  const provider = PROVIDERS.claude;
+  const out = [];
+  for (const homeDir of candidateAlternateHomes()) {
+    if (!hasClaudeState(homeDir)) continue;
+    const suffix = basename(homeDir).replace(/^\.claude[_-]?/, "") || basename(homeDir);
+    out.push({
+      id: uniqueId(`claude_${suffix}`, usedIds),
+      providerId: "claude",
+      name: labelForClaudeHome(homeDir),
+      color: provider.color,
+      homeDir
+    });
+  }
+  return out;
+}
+function discoverProviderAccounts(providerId, usedIds) {
+  if (providerId === "claude") return discoverClaudeAccounts(usedIds);
+  return [];
+}
 function buildAccounts(config, detected) {
   const out = [];
+  const usedIds = new Set(config.accounts.map((a) => a.id));
+  const seenKeys = /* @__PURE__ */ new Set();
+  const add = (account) => {
+    const key = accountKey(account.providerId, account.homeDir);
+    if (seenKeys.has(key)) return;
+    seenKeys.add(key);
+    out.push(account);
+  };
   for (const pid of PROVIDER_ORDER) {
     if (config.disabledProviders.includes(pid)) continue;
     const provider = PROVIDERS[pid];
     const configured = config.accounts.filter((a) => a.providerId === pid);
-    if (configured.length > 0) {
-      for (const a of configured) {
-        out.push({
-          id: a.id,
-          providerId: pid,
-          name: a.name,
-          color: a.color || provider.color,
-          homeDir: a.homeDir && a.homeDir !== "~" ? expandHome(a.homeDir) : void 0
-        });
-      }
-    } else if (detected.includes(pid)) {
-      out.push({ id: pid, providerId: pid, name: provider.name, color: provider.color, homeDir: void 0 });
+    for (const a of configured) {
+      add({
+        id: a.id,
+        providerId: pid,
+        name: a.name,
+        color: a.color || provider.color,
+        homeDir: a.homeDir && a.homeDir !== "~" ? expandHome(a.homeDir) : void 0
+      });
+    }
+    const discovered = discoverProviderAccounts(pid, usedIds);
+    if (detected.includes(pid)) {
+      add({ id: pid, providerId: pid, name: provider.name, color: provider.color, homeDir: void 0 });
+    }
+    for (const account of discovered) {
+      add(account);
     }
   }
   return out;
@@ -2706,19 +2868,146 @@ function accountsByProvider(accounts) {
   return groups;
 }
 
+// src/json-safe.ts
+function toJsonSafe(value) {
+  const serialized = JSON.stringify(value);
+  return serialized === void 0 ? null : JSON.parse(serialized);
+}
+
+// src/peak.ts
+async function fetchPeak() {
+  try {
+    const res = await fetch("https://promoclock.co/api/status", {
+      headers: { "Accept": "application/json", "User-Agent": "tokmon" },
+      signal: AbortSignal.timeout(3e3)
+    });
+    if (!res.ok) return null;
+    const data = await readJson(res);
+    if (!data) return null;
+    let state;
+    if (data.isPeak === true || data.status === "peak") state = "peak";
+    else if (data.isWeekend === true || data.status === "weekend") state = "weekend";
+    else if (data.isOffPeak === true || data.status === "off_peak" || data.status === "off-peak") state = "off-peak";
+    else return null;
+    return {
+      state,
+      label: state === "peak" ? "Peak" : state === "weekend" ? "Weekend" : "Off-Peak",
+      minutesUntilChange: typeof data.minutesUntilChange === "number" ? data.minutesUntilChange : null
+    };
+  } catch {
+    return null;
+  }
+}
+
+// src/rpc/contract.ts
+import { Schema, SchemaGetter } from "effect";
+import * as Rpc from "effect/unstable/rpc/Rpc";
+import * as RpcGroup from "effect/unstable/rpc/RpcGroup";
+var TOKMON_WS_PATH = "/ws";
+var TOKMON_WS_METHODS = {
+  getConfig: "tokmon.getConfig",
+  setConfig: "tokmon.setConfig",
+  refresh: "tokmon.refresh",
+  browseFs: "tokmon.browseFs",
+  snapshot: "tokmon.snapshot",
+  config: "tokmon.config"
+};
+var RefreshScopeSchema = Schema.Literals([
+  "all",
+  "summary",
+  "table",
+  "billing",
+  "peak"
+]);
+var PROVIDER_IDS = [
+  "claude",
+  "codex",
+  "cursor",
+  "copilot",
+  "pi",
+  "opencode",
+  "antigravity",
+  "gemini"
+];
+var ProviderIdSchema = Schema.Literals(PROVIDER_IDS);
+var AccountSchema = Schema.Struct({
+  id: Schema.String,
+  providerId: ProviderIdSchema,
+  name: Schema.String,
+  homeDir: Schema.String,
+  color: Schema.optionalKey(Schema.String)
+});
+var jsonSafePassthrough = () => Schema.Unknown.pipe(Schema.encode({
+  decode: SchemaGetter.transform((value) => value),
+  encode: SchemaGetter.transform((value) => toJsonSafe(value))
+}));
+var ConfigSchema = Schema.Struct({
+  interval: Schema.Number,
+  billingInterval: Schema.Number,
+  clearScreen: Schema.Boolean,
+  timezone: Schema.NullOr(Schema.String),
+  accounts: Schema.mutable(Schema.Array(AccountSchema)),
+  activeAccountId: Schema.NullOr(Schema.String),
+  disabledProviders: Schema.mutable(Schema.Array(ProviderIdSchema)),
+  onboarded: Schema.Boolean,
+  dashboardLayout: Schema.Literals(["grid", "single"]),
+  defaultFocus: Schema.Literals(["all", "last"]),
+  ascii: Schema.Literals(["auto", "on", "off"]),
+  knownProviders: Schema.mutable(Schema.Array(ProviderIdSchema))
+});
+var ConfigResultSchema = jsonSafePassthrough();
+var FsEntrySchema = Schema.Struct({
+  name: Schema.String,
+  path: Schema.String,
+  dir: Schema.Boolean
+});
+var FsListingSchema = Schema.Struct({
+  path: Schema.String,
+  parent: Schema.NullOr(Schema.String),
+  entries: Schema.Array(FsEntrySchema)
+});
+var WebSnapshotSchema = jsonSafePassthrough();
+var EmptyPayloadSchema = Schema.Struct({});
+var GetConfigRpc = Rpc.make(TOKMON_WS_METHODS.getConfig, {
+  payload: EmptyPayloadSchema,
+  success: ConfigResultSchema
+});
+var SetConfigRpc = Rpc.make(TOKMON_WS_METHODS.setConfig, {
+  payload: ConfigSchema,
+  success: ConfigResultSchema
+});
+var RefreshRpc = Rpc.make(TOKMON_WS_METHODS.refresh, {
+  payload: Schema.Struct({ scope: RefreshScopeSchema }),
+  success: Schema.Void
+});
+var BrowseFsRpc = Rpc.make(TOKMON_WS_METHODS.browseFs, {
+  payload: Schema.Struct({ path: Schema.String }),
+  success: FsListingSchema
+});
+var SnapshotRpc = Rpc.make(TOKMON_WS_METHODS.snapshot, {
+  payload: EmptyPayloadSchema,
+  success: WebSnapshotSchema,
+  stream: true
+});
+var ConfigRpc = Rpc.make(TOKMON_WS_METHODS.config, {
+  payload: EmptyPayloadSchema,
+  success: ConfigResultSchema,
+  stream: true
+});
+var TokmonRpcGroup = RpcGroup.make(
+  GetConfigRpc,
+  SetConfigRpc,
+  RefreshRpc,
+  BrowseFsRpc,
+  SnapshotRpc,
+  ConfigRpc
+);
+
 export {
-  configLocation,
-  cacheDir,
-  loadConfig,
-  saveConfig,
-  generateAccountId,
-  pickAccentColor,
   systemTimezone,
-  isValidTimezone,
   resolveTimezone,
   flushDisk,
-  mergeTables,
-  readJson,
+  coalesceTables,
   currency,
   tokens,
   time,
@@ -2729,5 +3018,10 @@ export {
   PROVIDERS,
   detectProviders,
   buildAccounts,
-  accountsByProvider
+  accountsByProvider,
+  toJsonSafe,
+  fetchPeak,
+  TOKMON_WS_PATH,
+  TOKMON_WS_METHODS,
+  TokmonRpcGroup
 };