tokmon 0.22.5 → 0.22.7

package/README.md

@@ -1,6 +1,6 @@
 # tokmon
 
-Terminal dashboard for **Claude Code**, **Codex**, **Cursor**, **Copilot**, **opencode**, **pi**, **Antigravity**, and **Gemini** — usage, costs, and rate limits, all in one place.
+Terminal dashboard for **Claude Code**, **Codex**, **Cursor**, **Copilot**, **opencode**, **pi**, **Antigravity**, **Gemini**, and **Grok** — usage, costs, and rate limits, all in one place.
 
 Built with [Ink](https://github.com/vadimdemedes/ink) and TypeScript.
 
@@ -34,14 +34,15 @@ Then run `tokmon`. On first launch you'll pick which providers to track; press `
 |----------|---------------|--------------|
 | **Claude** | `~/.claude/projects/**/*.jsonl` | Cost & token history, plan (e.g. Max 20x), live 5h / weekly / Sonnet limits |
 | **Codex** | `~/.codex/sessions/**/rollout-*.jsonl` | Cost & token history, plan, live 5h / weekly limits, credit balance |
+| **Cursor** | Cursor API usage events + local `composerData` | Cost & token history (Today / Week / Month), plan, period spend, on-demand caps |
 | **opencode** | `~/.local/share/opencode/opencode.db` | Cost & token history across whatever providers opencode routes to (uses its own recorded cost) |
 | **pi** | `~/.pi/agent/sessions/**/*.jsonl` | Cost & token history (uses pi's own recorded cost) |
+| **Grok** | `~/.grok/logs/unified.jsonl` (+ session model join) | Cost & token history from Grok CLI turns, SuperGrok / credits billing when signed in |
 
 **Billing / quota providers** — plan + live quota or spend (no local token history):
 
 | Provider | What it reads | What you get |
 |----------|---------------|--------------|
-| **Cursor** | `state.vscdb` + local tracking DBs | Plan, current-period spend, on-demand caps, per-model spend, AI-code activity |
 | **Copilot** | GitHub token (gh / VS Code) | Plan + premium-request & chat quota |
 | **Antigravity** | its `state.vscdb` OAuth → Google Cloud Code | Plan + per-pool (Gemini Pro/Flash/Claude) quota |
 | **Gemini** | `~/.gemini/oauth_creds.json` → Google Cloud Code | Plan + quota (re-run `gemini` to refresh an expired token) |
@@ -70,7 +71,7 @@ A **Peak / Off-Peak** badge appears in the header (Claude only), fetched from [p
 
 Per-provider history with a provider selector (`p` / `P`), search (`/`), and sorting (`o`).
 
-For **Claude / Codex** — Daily, Weekly, and Monthly breakdowns (6 months of history). Each row shows models used, input/output/cache tokens, and cost. Press `Enter` to expand a per-model breakdown:
+For **Claude / Codex / Cursor / Grok** — Daily, Weekly, and Monthly breakdowns (6 months of history). Each row shows models used, input/output/cache tokens, and cost. Press `Enter` to expand a per-model breakdown:
 
 ```
 ▸ Apr  7  haiku-4-5, op~  7.6K 487.0K  10.1M    1.1B  $603.89
@@ -78,8 +79,6 @@ For **Claude / Codex** — Daily, Weekly, and Monthly breakdowns (6 months of hi
           └─ haiku-4-5          100     2.0K     100K      5.0M    $2.39
 ```
 
-For **Cursor** — a per-model spend table (cost, request count, share of total, all-time), sourced from Cursor's local conversation data.
-
 ## Web Dashboard
 
 Prefer a browser? `tokmon serve` starts a local web dashboard with the same data as the TUI — charts, global filtering, and shareable images — in a terminal-styled UI. Press `w` (or `W`) inside the TUI to toggle it without leaving the terminal; the header shows `● web :4317` while it's running.

package/dist/{bootstrap-ink-TWFRIEBW.js → bootstrap-ink-OHPQZKGB.js}

@@ -10,7 +10,6 @@ import {
   coalesceTables,
   col,
   currency,
-  cursorModelSpend,
   detectProviders,
   fetchPeak,
   modelColor,
@@ -20,7 +19,7 @@ import {
   time,
   tokens,
   withTimeout
-} from "./chunk-AQNFQRWV.js";
+} from "./chunk-I4USANOF.js";
 import {
   COLOR_PALETTE,
   DEFAULTS,
@@ -35,7 +34,7 @@ import {
   sanitizeTyped,
   saveConfigSync,
   snapshotCacheFile
-} from "./chunk-QTHCHB7S.js";
+} from "./chunk-TNIADJ3W.js";
 import {
   glyphs
 } from "./chunk-RF4GGQGM.js";
@@ -1246,62 +1245,6 @@ function RowDetail({ row, indent }) {
     /* @__PURE__ */ jsx4(Text4, { bold: true, color: "yellow", children: currency(m.cost) })
   ] }, m.name)) });
 }
-var CursorSpendTable = memo4(function CursorSpendTable2({ rows, cursor, maxRows, onRowClick }) {
-  if (rows.length === 0) return /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: "No Cursor spend recorded locally." });
-  const total = rows.reduce((a, r) => a + r.usd, 0);
-  const totalAmt = rows.reduce((a, r) => a + r.requests, 0);
-  const clamped = Math.min(cursor, rows.length - 1);
-  const scrollStart = Math.max(0, Math.min(clamped - Math.floor(maxRows / 2), rows.length - maxRows));
-  const visible = rows.slice(scrollStart, scrollStart + maxRows);
-  const W = { model: 34, cost: 12, amount: 12, share: 8 };
-  return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsxs4(Text4, { children: [
-      /* @__PURE__ */ jsxs4(Text4, { bold: true, children: [
-        "  ",
-        col("Model", W.model, "left")
-      ] }),
-      /* @__PURE__ */ jsx4(Text4, { bold: true, children: col("Cost", W.cost) }),
-      /* @__PURE__ */ jsx4(Text4, { bold: true, children: col("Amount", W.amount) }),
-      /* @__PURE__ */ jsx4(Text4, { bold: true, children: col("Share", W.share) })
-    ] }),
-    /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: glyphs().rule.repeat(W.model + W.cost + W.amount + W.share + 2) }),
-    visible.map((r, vi) => {
-      const idx = scrollStart + vi;
-      const selected = idx === clamped;
-      const share = total > 0 ? r.usd / total * 100 : 0;
-      return /* @__PURE__ */ jsx4(ClickableBox, { onClick: () => onRowClick(idx), children: /* @__PURE__ */ jsxs4(Text4, { inverse: selected, children: [
-        /* @__PURE__ */ jsxs4(Text4, { color: selected ? void 0 : "magenta", children: [
-          selected ? `${glyphs().caretR} ` : "  ",
-          col(r.name, W.model, "left")
-        ] }),
-        /* @__PURE__ */ jsx4(Text4, { bold: true, color: selected ? void 0 : "yellow", children: col(currency(r.usd), W.cost) }),
-        /* @__PURE__ */ jsx4(Text4, { children: col(tokens(r.requests), W.amount) }),
-        /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: col(share.toFixed(1) + "%", W.share) })
-      ] }) }, r.name);
-    }),
-    /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: glyphs().rule.repeat(W.model + W.cost + W.amount + W.share + 2) }),
-    /* @__PURE__ */ jsxs4(Text4, { children: [
-      /* @__PURE__ */ jsxs4(Text4, { bold: true, color: "greenBright", children: [
-        "  ",
-        col("Total", W.model, "left")
-      ] }),
-      /* @__PURE__ */ jsx4(Text4, { bold: true, color: "yellowBright", children: col(currency(total), W.cost) }),
-      /* @__PURE__ */ jsx4(Text4, { bold: true, color: "yellow", children: col(tokens(totalAmt), W.amount) }),
-      /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: col("100%", W.share) })
-    ] }),
-    /* @__PURE__ */ jsx4(Box4, { height: 1 }),
-    /* @__PURE__ */ jsxs4(Text4, { dimColor: true, children: [
-      "local spend by model (composerData) ",
-      glyphs().middot,
-      " est. API-equivalent ",
-      glyphs().middot,
-      " ",
-      clamped + 1,
-      "/",
-      rows.length
-    ] })
-  ] });
-});
 function fmtLabel(label) {
   if (label.length === 7 && label[4] === "-") {
     return `${MONTHS[Number(label.slice(5, 7))]} '${label.slice(2, 4)}`;
@@ -1965,15 +1908,6 @@ function toStatsMap(snapshot, accounts) {
   }
   return out;
 }
-function toCursorRows(snapshot, accountId) {
-  if (!snapshot || !accountId) return null;
-  const wa = snapshot.accounts.find((a) => a.id === accountId);
-  if (!wa) return null;
-  if (wa.billingState === "pending") return null;
-  const spend = wa.billing?.modelSpend;
-  if (!spend) return [];
-  return spend.map((m) => ({ name: m.name, usd: m.usd, requests: m.requests }));
-}
 function pickTable(snapshot, accountIds) {
   if (!snapshot) return null;
   const byId = indexById(snapshot);
@@ -1994,11 +1928,6 @@ var SORTS = [
   { label: "cost", dir: "up" },
   { label: "cost", dir: "down" }
 ];
-var CURSOR_SORTS = [
-  { label: "cost", dir: "down" },
-  { label: "amount", dir: "down" },
-  { label: "model", dir: null }
-];
 var acctKey = (a) => `${a.id}:${a.homeDir ?? ""}`;
 var clampCaret = (caret, len) => Math.max(0, Math.min(caret, len));
 function spliceInsert(value, caret, text) {
@@ -2098,22 +2027,6 @@ function filterTokenRows(rows, q) {
   const s = q.toLowerCase();
   return rows.filter((r) => r.label.toLowerCase().includes(s) || r.models.some((m) => m.toLowerCase().includes(s)));
 }
-function filterCursorRows(rows, q) {
-  if (!q) return rows;
-  const s = q.toLowerCase();
-  return rows.filter((r) => r.name.toLowerCase().includes(s));
-}
-function sortCursorRows(rows, sortIdx) {
-  const out = [...rows];
-  switch (sortIdx % CURSOR_SORTS.length) {
-    case 1:
-      return out.sort((a, b) => b.requests - a.requests);
-    case 2:
-      return out.sort((a, b) => a.name.localeCompare(b.name));
-    default:
-      return out.sort((a, b) => b.usd - a.usd);
-  }
-}
 
 // src/ui/keybindings.ts
 function handleKey(input, key, ctx) {
@@ -2176,7 +2089,6 @@ function handleKey(input, key, ctx) {
     setExpanded,
     setSort,
     SORTS_FOR,
-    tableIsCursor,
     cycleTableModel: cycleTableModel2,
     setView,
     cursor,
@@ -2610,48 +2522,38 @@ function handleKey(input, key, ctx) {
       resetView();
       return;
     }
-    if (!tableIsCursor) {
-      if (input === "d") {
-        setView(0);
-        resetView();
-        return;
-      }
-      if (input === "w") {
-        setView(1);
-        resetView();
-        return;
-      }
-      if (input === "m") {
-        cycleTableModel2(1);
-        return;
-      }
-      if (input === "M") {
-        cycleTableModel2(-1);
-        return;
-      }
-      if (key.leftArrow) {
-        setView((v) => (v - 1 + VIEWS.length) % VIEWS.length);
-        resetView();
-        return;
-      }
-      if (key.rightArrow) {
-        setView((v) => (v + 1) % VIEWS.length);
-        resetView();
-        return;
-      }
-      if (key.return) {
-        setExpanded((e) => e === cursor ? -1 : cursor);
-        return;
-      }
+    if (input === "d") {
+      setView(0);
+      resetView();
+      return;
     }
-  } else {
-    if (key.leftArrow || key.rightArrow) {
-      setTab((t) => (t + 1) % TABS.length);
+    if (input === "w") {
+      setView(1);
       resetView();
       return;
     }
-  }
-  if (tab === 1 && !tableIsCursor) {
+    if (input === "m") {
+      cycleTableModel2(1);
+      return;
+    }
+    if (input === "M") {
+      cycleTableModel2(-1);
+      return;
+    }
+    if (key.leftArrow) {
+      setView((v) => (v - 1 + VIEWS.length) % VIEWS.length);
+      resetView();
+      return;
+    }
+    if (key.rightArrow) {
+      setView((v) => (v + 1) % VIEWS.length);
+      resetView();
+      return;
+    }
+    if (key.return) {
+      setExpanded((e) => e === cursor ? -1 : cursor);
+      return;
+    }
     if (key.upArrow) {
       setCursor((c) => Math.max(0, c - 1));
       return;
@@ -2668,6 +2570,12 @@ function handleKey(input, key, ctx) {
       setCursor((c) => input === "g" ? 0 : Math.max(0, c - Math.max(1, rows - 12)));
       return;
     }
+  } else {
+    if (key.leftArrow || key.rightArrow) {
+      setTab((t) => (t + 1) % TABS.length);
+      resetView();
+      return;
+    }
   }
 }
 
@@ -2900,7 +2808,7 @@ function useDegradedPolling({ degraded, configReady, showPicker, accountsKey, ac
     let timer;
     const load = async () => {
       try {
-        const peakP = accountsRef.current.some((a) => a.providerId === "claude") ? fetchPeak() : Promise.resolve(null);
+        const peakP = accountsRef.current.some((a) => a.providerId === "claude") ? withTimeout(fetchPeak()).catch(() => null) : Promise.resolve(null);
         await Promise.all(accountsRef.current.map(async (acc) => {
           const provider = PROVIDERS[acc.providerId];
           if (!provider.hasBilling || !provider.fetchBilling) return;
@@ -2910,7 +2818,7 @@ function useDegradedPolling({ degraded, configReady, showPicker, accountsKey, ac
           } catch {
           }
         }));
-        const p = await withTimeout(peakP);
+        const p = await peakP;
         if (active && p) setPeak(p);
       } finally {
         if (active) timer = setTimeout(load, billingMs);
@@ -3055,7 +2963,6 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, wsToken = n
   const [tableModel, setTableModel] = useState8(null);
   const [search, setSearch] = useState8("");
   const [searchMode, setSearchMode] = useState8(false);
-  const [cursorRowsLocal, setCursorRows] = useState8(null);
   const [showSettings, setShowSettings] = useState8(false);
   const [settingsTab, setSettingsTab] = useState8("general");
   const [settingsCursor, setSettingsCursor] = useState8(0);
@@ -3153,7 +3060,10 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, wsToken = n
     () => focusId === null ? allGroups : accountsByProvider(visibleAccounts),
     [allGroups, visibleAccounts, focusId]
   );
-  const tableProvs = useMemo2(() => allGroups.map((g) => g.provider), [allGroups]);
+  const tableProvs = useMemo2(
+    () => allGroups.map((g) => g.provider).filter((pid) => PROVIDERS[pid].hasUsage),
+    [allGroups]
+  );
   const TOO_SMALL = cols < 40 || rows < 12;
   const allReady = accounts.length > 0 && accounts.every((a) => accountReady(readyInputFor(a.id), a.providerId));
   const { gridBudget } = useMemo2(() => computeChrome(slots, cols, rows), [slots, cols, rows]);
@@ -3193,21 +3103,16 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, wsToken = n
   };
   const { handlePasteData, isPasteInput } = usePaste(insertText);
   const effTableProvider = tableProvider && tableProvs.includes(tableProvider) ? tableProvider : tableProvs[0] ?? null;
-  const tableIsCursor = !!effTableProvider && !PROVIDERS[effTableProvider].hasUsage;
   const tableAccounts = useMemo2(
     () => effTableProvider ? accounts.filter((a) => a.providerId === effTableProvider) : [],
     [accounts, effTableProvider]
   );
-  const SORTS_FOR = tableIsCursor ? CURSOR_SORTS : SORTS;
+  const SORTS_FOR = SORTS;
   const tableAccountIds = useMemo2(() => tableAccounts.map((a) => a.id), [tableAccounts]);
   const table = useMemo2(
     () => connected ? pickTable(snapshot, tableAccountIds) : tableLocal,
     [connected, snapshot, tableAccountIds, tableLocal]
   );
-  const cursorRows = useMemo2(
-    () => connected ? toCursorRows(snapshot, tableAccounts[0]?.id) : cursorRowsLocal,
-    [connected, snapshot, tableAccounts, cursorRowsLocal]
-  );
   const { showLoader } = useLoader({
     configReady,
     showPicker,
@@ -3236,11 +3141,10 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, wsToken = n
   );
   useEffect7(() => {
     setTable(null);
-    setCursorRows(null);
     setCursor(0);
     setExpanded(-1);
     setTableModel(null);
-    setSort(tableIsCursor ? 0 : 1);
+    setSort(1);
     setTableLoading(false);
   }, [tableKey]);
   useEffect7(() => {
@@ -3249,13 +3153,8 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, wsToken = n
     let timer;
     const fetchOnce = async () => {
       try {
-        if (tableIsCursor) {
-          const s = await withTimeout(cursorModelSpend(tableAccounts[0]?.homeDir));
-          if (active) setCursorRows(s?.models ?? []);
-        } else {
-          const r = await withTimeout(fetchScopeTable(tableAccounts, tz));
-          if (active) setTable(r);
-        }
+        const r = await withTimeout(fetchScopeTable(tableAccounts, tz));
+        if (active) setTable(r);
       } catch {
       }
     };
@@ -3392,8 +3291,7 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, wsToken = n
     const cur = effTableProvider ? tableProvs.indexOf(effTableProvider) : 0;
     const nextProv = tableProvs[(cur + dir + tableProvs.length) % tableProvs.length];
     setTableProvider(nextProv);
-    const nextIsCursor = !!nextProv && !PROVIDERS[nextProv].hasUsage;
-    setSort(nextIsCursor ? 0 : 1);
+    setSort(1);
     setCursor(0);
     setExpanded(-1);
     setTableModel(null);
@@ -3426,7 +3324,7 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, wsToken = n
     if (webStartingRef.current) return;
     webStartingRef.current = true;
     try {
-      const { startWebServer } = await import("./server-56C7MMEZ.js");
+      const { startWebServer } = await import("./server-GA2FKYDQ.js");
       const ctrl = await startWebServer({ config: cfg, log: false });
       webRef.current = ctrl;
       openUrl(ctrl.url);
@@ -3456,10 +3354,9 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, wsToken = n
     if (idx === cursor) setExpanded((e) => e === idx ? -1 : idx);
     else setCursor(idx);
   }, [cursor]);
-  const onRowClickCursor = useCallback4((idx) => setCursor(idx), []);
   const rawTokenRows = useMemo2(
-    () => tab === 1 && !tableIsCursor ? table ? [table.daily, table.weekly, table.monthly][view] : [] : [],
-    [tab, tableIsCursor, table, view]
+    () => tab === 1 ? table ? [table.daily, table.weekly, table.monthly][view] : [] : [],
+    [tab, table, view]
   );
   const tokenModelOptions = useMemo2(() => tableModelOptions(rawTokenRows), [rawTokenRows]);
   useEffect7(() => {
@@ -3471,12 +3368,8 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, wsToken = n
   }, [tokenModelOptions, resetView]);
   const activeTableModel = tableModel && tokenModelOptions.includes(tableModel) ? tableModel : null;
   const tokenRows = useMemo2(
-    () => tab === 1 && !tableIsCursor ? sortRows(filterTokenRows(filterRowsByModel(rawTokenRows, activeTableModel), search), sort) : [],
-    [tab, tableIsCursor, rawTokenRows, activeTableModel, search, sort]
-  );
-  const cursorTableRows = useMemo2(
-    () => tab === 1 && tableIsCursor ? sortCursorRows(filterCursorRows(cursorRows ?? [], search), sort) : [],
-    [tab, tableIsCursor, cursorRows, search, sort]
+    () => tab === 1 ? sortRows(filterTokenRows(filterRowsByModel(rawTokenRows, activeTableModel), search), sort) : [],
+    [tab, rawTokenRows, activeTableModel, search, sort]
   );
   useInput((input, key) => handleKey(input, key, {
     showPicker,
@@ -3537,7 +3430,6 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, wsToken = n
     setExpanded,
     setSort,
     SORTS_FOR,
-    tableIsCursor,
     cycleTableModel: cycleTableModelFilter,
     setView,
     cursor,
@@ -3568,7 +3460,7 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, wsToken = n
   if (TOO_SMALL && !showSettings) {
     return /* @__PURE__ */ jsx11(TinyFallback, { groups, stats, rows, cols });
   }
-  rowCountRef.current = tableIsCursor ? cursorTableRows.length : tokenRows.length;
+  rowCountRef.current = tokenRows.length;
   return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", paddingX: 2, paddingY: 1, height: rows, overflow: "hidden", children: [
     /* @__PURE__ */ jsxs11(Box11, { justifyContent: "space-between", children: [
       /* @__PURE__ */ jsxs11(Box11, { children: [
@@ -3660,8 +3552,8 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, wsToken = n
             search,
             searchCaret,
             searching: searchMode,
-            showPeriod: !tableIsCursor,
-            showModel: !tableIsCursor
+            showPeriod: true,
+            showModel: true
           }
         ),
         /* @__PURE__ */ jsx11(Box11, { height: 1 }),
@@ -3669,15 +3561,7 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, wsToken = n
           "No providers enabled ",
           glyphs().emDash,
           " press s to pick providers."
-        ] }) : tableLoading && !table && !cursorRows ? /* @__PURE__ */ jsx11(Spinner, { label: "Loading history" }) : tableIsCursor ? /* @__PURE__ */ jsx11(
-          CursorSpendTable,
-          {
-            rows: cursorTableRows,
-            cursor,
-            maxRows: Math.max(1, rows - 16),
-            onRowClick: onRowClickCursor
-          }
-        ) : /* @__PURE__ */ jsx11(
+        ] }) : tableLoading && !table ? /* @__PURE__ */ jsx11(Spinner, { label: "Loading history" }) : /* @__PURE__ */ jsx11(
           TokenTable,
           {
             rows: tokenRows,

package/dist/{chunk-FO7IUYCM.js → chunk-EMQL5P5J.js}

@@ -11,7 +11,7 @@ import {
   namedHex,
   resolveTimezone,
   withTimeout
-} from "./chunk-AQNFQRWV.js";
+} from "./chunk-I4USANOF.js";
 import {
   cacheDir,
   expandHome,
@@ -19,7 +19,7 @@ import {
   normalizeConfig,
   saveConfig,
   snapshotCacheFile
-} from "./chunk-QTHCHB7S.js";
+} from "./chunk-TNIADJ3W.js";
 
 // src/web/server.ts
 import { createServer } from "http";