tokmon 0.17.0 → 0.18.0

package/dist/{chunk-ZZ7DIK3O.js → chunk-STCMWCFW.js}

@@ -5,7 +5,7 @@ import {
   cacheDir,
   detectProviders,
   resolveTimezone
-} from "./chunk-TLE24LIH.js";
+} from "./chunk-UAPL47GL.js";
 
 // src/web/server.ts
 import { createServer } from "http";
@@ -52,9 +52,6 @@ async function resolveAccounts(config) {
     const p = PROVIDERS[a.providerId];
     return {
       account: a,
-      // Web-only: a provider with a usage table (e.g. Cursor's local composer history)
-      // shows in the dashboard's leaderboard/calendar/explore even when its TUI flag is
-      // false. The TUI reads PROVIDERS[id].hasUsage directly, so it is unaffected.
       hasUsage: p.hasUsage || !!p.fetchTable,
       hasBilling: p.hasBilling,
       color: colorHex(a.color, PROVIDERS[a.providerId].color)

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

@@ -1524,11 +1524,9 @@ async function cursorApiUsage(tz, homeDir) {
   const endMs = Date.now();
   const startMs = endMs - WINDOW_DAYS * 864e5;
   const events = [];
-  let total = Infinity;
-  for (let page = 1; page <= MAX_PAGES && events.length < total; page++) {
+  for (let page = 1; page <= MAX_PAGES; page++) {
     const resp = await fetchPage(token, startMs, endMs, page);
     if (!resp) return page === 1 ? null : finalizeTable(events, tz);
-    total = resp.totalUsageEventsCount ?? 0;
     const batch = resp.usageEventsDisplay ?? [];
     events.push(...batch);
     if (batch.length < PAGE_SIZE) break;
@@ -1566,10 +1564,11 @@ function finalizeTable(events, tz) {
     const ts = Number(e.timestamp);
     if (!Number.isFinite(ts) || ts <= 0) continue;
     const tu = e.tokenUsage ?? {};
-    const input = Number(tu.inputTokens) || 0;
-    const output = Number(tu.outputTokens) || 0;
-    const cacheRead = Number(tu.cacheReadTokens) || 0;
-    const usd = (Number(e.chargedCents) || 0) / 100;
+    const input = safeNum(tu.inputTokens);
+    const output = safeNum(tu.outputTokens);
+    const cacheRead = safeNum(tu.cacheReadTokens);
+    const cents = Number(e.chargedCents);
+    const usd = Number.isFinite(cents) && cents > 0 ? cents / 100 : 0;
     if (usd <= 0 && input + output + cacheRead === 0) continue;
     const model = String(e.model ?? "unknown");
     put(buckets.daily, dayKey(ts, tz), model, usd, input, output, cacheRead);
@@ -1587,16 +1586,62 @@ function finalizeTable(events, tz) {
 
 // src/providers/cursor/index.ts
 var EMPTY = { daily: [], weekly: [], monthly: [] };
+var overlayDaily = (lo, hi) => {
+  const m = new Map(lo.map((r) => [r.label, r]));
+  for (const r of hi) m.set(r.label, r);
+  return [...m.values()].sort((a, b) => a.label.localeCompare(b.label));
+};
+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);
+    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: [] };
+      out.set(label, row);
+    }
+    row.input += day.input;
+    row.output += day.output;
+    row.cacheCreate += day.cacheCreate;
+    row.cacheRead += day.cacheRead;
+    row.cacheSavings += day.cacheSavings;
+    row.total += day.total;
+    row.cost += day.cost;
+    row.count += day.count;
+    for (const b of day.breakdown) {
+      let md = row.breakdown.find((x) => x.name === b.name);
+      if (!md) {
+        md = { name: b.name, input: 0, output: 0, cacheCreate: 0, cacheRead: 0, cacheSavings: 0, cost: 0, count: 0 };
+        row.breakdown.push(md);
+      }
+      md.input += b.input;
+      md.output += b.output;
+      md.cacheCreate += b.cacheCreate;
+      md.cacheRead += b.cacheRead;
+      md.cacheSavings += b.cacheSavings;
+      md.cost += b.cost;
+      md.count += b.count;
+    }
+  }
+  return [...out.values()].map((r) => {
+    r.breakdown.sort((a, b) => b.cost - a.cost);
+    r.models = r.breakdown.map((b) => b.name);
+    return r;
+  }).sort((a, b) => a.label.localeCompare(b.label));
+}
 async function cursorTable(tz, homeDir) {
-  return await cursorApiUsage(tz, homeDir) ?? await cursorUsageTable(tz, homeDir) ?? EMPTY;
+  const [api, local] = await Promise.all([cursorApiUsage(tz, homeDir), cursorUsageTable(tz, homeDir)]);
+  if (!api && !local) return EMPTY;
+  const daily = overlayDaily(local?.daily ?? [], api?.daily ?? []);
+  if (daily.length === 0) return EMPTY;
+  return { daily, weekly: reBucket(daily, tz, weekKey), monthly: reBucket(daily, tz, monthKey) };
 }
 var cursorProvider = {
   id: "cursor",
   name: "Cursor",
   color: "magenta",
-  // hasUsage stays false: the TUI keys its dedicated Cursor spend-table off this flag.
-  // The web surfaces the usage table via fetchTable (resolveAccounts promotes any
-  // provider with a fetchTable to hasUsage for the dashboard only).
+  // hasUsage: false — TUI keys its dedicated Cursor spend-table off this flag directly.
   hasUsage: false,
   hasBilling: true,
   detect: (homeDir) => detectCursor(homeDir),

package/dist/cli.js

@@ -23,7 +23,7 @@ import {
   systemTimezone,
   time,
   tokens
-} from "./chunk-TLE24LIH.js";
+} from "./chunk-UAPL47GL.js";
 
 // src/cli.tsx
 import { EventEmitter } from "events";
@@ -1606,11 +1606,7 @@ function App({ interval: cliInterval, initialConfig }) {
   const hasStrip = slots.length > 1;
   const stripChipW = (s) => 2 + 2 + truncateName(s.name, 16).length + 2;
   const stripChars = slots.reduce((sum, s) => sum + stripChipW(s), 0);
-  const stripLines = hasStrip ? Math.max(1, Math.ceil(stripChars / Math.max(
-    1,
-    cols - 4 - 7
-    /*"focus  "*/
-  ))) : 0;
+  const stripLines = hasStrip ? Math.max(1, Math.ceil(stripChars / Math.max(1, cols - 4 - 7))) : 0;
   const headerRows = cols < 70 ? 2 : 1;
   const CHROME = 2 + headerRows + 3 + (hasStrip ? 1 + stripLines : 0) + 2 + 2;
   const gridBudget = Math.max(1, rows - CHROME);
@@ -1856,7 +1852,6 @@ function App({ interval: cliInterval, initialConfig }) {
   function toggleProvider(pid) {
     updateConfig((c) => ({
       ...c,
-      // Toggling in settings is also an explicit decision → mark it known.
       knownProviders: c.knownProviders.includes(pid) ? c.knownProviders : [...c.knownProviders, pid],
       disabledProviders: c.disabledProviders.includes(pid) ? c.disabledProviders.filter((p) => p !== pid) : [...c.disabledProviders, pid]
     }));
@@ -1996,7 +1991,7 @@ function App({ interval: cliInterval, initialConfig }) {
         setWebStatus("off");
       } else {
         setWebStatus("starting");
-        const { startWebServer } = await import("./server-UPX3ANBP.js");
+        const { startWebServer } = await import("./server-VMB5ZLZC.js");
         const ctrl = await startWebServer({ config: cfg, log: false });
         webRef.current = ctrl;
         setWebUrl(ctrl.url);
@@ -2674,7 +2669,7 @@ process.emitWarning = ((warning, ...rest) => {
 var args = process.argv.slice(2);
 var subcommand = args[0]?.toLowerCase();
 if (subcommand === "serve" || subcommand === "web") {
-  const { startWeb } = await import("./web-23FJCFDS.js");
+  const { startWeb } = await import("./web-DYAEMCAE.js");
   await startWeb(args.slice(1));
   process.exit(typeof process.exitCode === "number" ? process.exitCode : 0);
 }

package/dist/{server-UPX3ANBP.js → server-VMB5ZLZC.js}

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import {
   startWebServer
-} from "./chunk-ZZ7DIK3O.js";
-import "./chunk-TLE24LIH.js";
+} from "./chunk-STCMWCFW.js";
+import "./chunk-UAPL47GL.js";
 export {
   startWebServer
 };