tokmon 0.24.0 → 0.26.0

package/README.md

@@ -76,7 +76,7 @@ A responsive grid of provider cards (or one card at a time — see **Dashboard l
 - **Today / This Week / This Month** — cost and token summaries
 - **Burn rate** — current $/hr
 - **Cache saved** — what caching has saved you
-- **Rate limits** — live utilization bars with reset countdowns
+- **Rate limits** — live utilization bars with reset countdowns or exact reset dates
 - **Sparkline** — recent daily activity
 
 The grid reflows to fit your terminal — more columns when it's wide, compacting cards when it's short. With more providers than fit on screen, it splits into **pages**; **scroll** (mouse wheel) to move between them (or `↑`/`↓` / `[` `]`). When you track more than one account, a focus strip lets you view **All** together or zoom into a single account.
@@ -105,7 +105,7 @@ tokmon serve --port 8080
 tokmon serve --no-open  # don't auto-open the browser
 ```
 
-It binds to `127.0.0.1` by default and reads the same local daemon state — nothing leaves your machine. The browser connects directly over a same-origin WebSocket; dashboard URLs have no token or login step. Optional LAN access can be enabled in settings, with an explicit unsafe-access warning, and takes effect after the daemon restarts. The dashboard renders instantly from a cached snapshot, then streams live updates and goes idle when no tab is open. Filter by provider, model, account, and period, flip between dark and light, and export any panel — or a summary card — as a PNG with the **Share** button.
+It binds to `127.0.0.1` by default and reads the same local daemon state — nothing leaves your machine. The browser connects directly over a same-origin WebSocket; dashboard URLs have no token or login step. Optional LAN access can be enabled in settings, with an explicit unsafe-access warning, and takes effect after the daemon restarts. The dashboard renders instantly from a cached snapshot, then streams live updates and goes idle when no tab is open. Press `R` or use the visible **Refresh** control to update it. Filter by provider, model, account, and period, flip between dark and light, and export any panel — or a summary card — as a PNG with the **Share** button.
 
 ### Overview
 
@@ -192,6 +192,8 @@ Press `s` to open.
 - **Dashboard layout** — `grid` (all providers at once) or `single` (one at a time)
 - **Default focus** — start on `all`, or remember your `last` focused account
 - **ASCII glyphs** — `auto` (detect), `on` (force ASCII), or `off` (force Unicode)
+- **Network access** — loopback-only by default; optional LAN access is explicitly marked unsafe
+- **Reset times** — show time remaining or the exact reset date/time in the configured timezone
 
 **Providers** — toggle each provider on or off.
 
@@ -253,7 +255,7 @@ tokmon runs a small local **daemon** that does all the data collection. The term
 - Each enabled provider is detected automatically, and its real account identity — email and plan — is read from local auth (e.g. Claude `~/.claude.json`, the Codex `id_token`, Cursor's state DB). Extra accounts, like additional Claude homes, are auto-discovered too.
 
 **Limits & billing**
-- Rate limits and remaining spend/quota come from each provider's own official API, refreshed on the billing poll interval and when the terminal regains focus. Opening a dashboard also catches up stale limits immediately.
+- Rate limits and remaining spend/quota come from each provider's own official API. Tokmon refreshes them on the configured billing interval; terminal focus and extra dashboard viewers reuse fresh data instead of issuing extra provider requests.
 
 **Responsiveness**
 - Dashboard summaries and table history load independently and refresh on separate intervals, so the UI stays responsive even on large histories.

package/dist/{bootstrap-ink-HL2BYNW3.js → bootstrap-ink-5UFPNDV4.js}

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 import {
   createDaemonRpcClient
-} from "./chunk-45ZP755H.js";
+} from "./chunk-4CY725NY.js";
 import {
   accountsByProvider,
   buildAccounts,
   fetchPeak,
   modelColor
-} from "./chunk-42H7R376.js";
+} from "./chunk-VGYBQH5I.js";
 import {
   PROVIDERS,
   PROVIDER_ORDER,
@@ -15,13 +15,15 @@ import {
   col,
   currency,
   detectProviders,
+  formatResetAt,
+  resetAt,
   resolveTimezone,
   shortDate,
   systemTimezone,
   time,
   tokens,
   withTimeout
-} from "./chunk-O27I2XFN.js";
+} from "./chunk-RTGMDE7U.js";
 import {
   COLOR_PALETTE,
   DEFAULTS,
@@ -36,7 +38,7 @@ import {
   sanitizeTyped,
   saveConfigSync,
   snapshotCacheFile
-} from "./chunk-5CWOJMAH.js";
+} from "./chunk-E2YXYU73.js";
 import {
   glyphs
 } from "./chunk-RF4GGQGM.js";
@@ -161,27 +163,22 @@ var TabBar = memo(function TabBar2({ tabs, active, onSelect }) {
     " "
   ] }) }, t)) });
 });
-var PeakBadge = memo(function PeakBadge2({ peak }) {
+var PeakBadge = memo(function PeakBadge2({ peak, resetDisplay = "relative", tz }) {
   const color = peak.state === "peak" ? "red" : "green";
+  const changesAt = peak.changesAt ?? (peak.minutesUntilChange !== null ? new Date(Date.now() + peak.minutesUntilChange * 6e4).toISOString() : null);
   return /* @__PURE__ */ jsxs(Box, { children: [
     /* @__PURE__ */ jsxs(Text, { color, children: [
       glyphs().dot,
       " "
     ] }),
     /* @__PURE__ */ jsx(Text, { bold: true, color, children: peak.label }),
-    peak.minutesUntilChange !== null && peak.minutesUntilChange > 0 && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+    changesAt && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
       " (",
-      fmtMinutes(peak.minutesUntilChange),
+      formatResetAt(changesAt, resetDisplay, Date.now(), tz),
       ")"
     ] })
   ] });
 });
-function fmtMinutes(mins) {
-  if (mins < 60) return `${mins}m`;
-  const h = Math.floor(mins / 60);
-  const m = mins % 60;
-  return m === 0 ? `${h}h` : `${h}h ${m}m`;
-}
 function currencySymbol(cur) {
   return cur === "EUR" ? glyphs().eur : cur === "GBP" ? glyphs().gbp : "$";
 }
@@ -292,7 +289,7 @@ function computeDashLayout(groups, stats, cols, budget, focusId, layoutPref) {
   }
   return chooseLayout(content, budget, groups.length, single, cols, heights);
 }
-var DashboardView = memo2(function DashboardView2({ groups, stats, cols, budget, focusId, layout, page = 0, privacyMode = false }) {
+var DashboardView = memo2(function DashboardView2({ groups, stats, cols, budget, focusId, layout, page = 0, privacyMode = false, resetDisplay = "relative", tz }) {
   if (groups.length === 0) {
     return /* @__PURE__ */ jsxs2(Text2, { dimColor: true, children: [
       "No providers enabled ",
@@ -307,7 +304,7 @@ var DashboardView = memo2(function DashboardView2({ groups, stats, cols, budget,
   const pg = pageCount > 1 ? (page % pageCount + pageCount) % pageCount : 0;
   const visible = pageCount > 1 ? groups.slice(pg * cardsPerPage, pg * cardsPerPage + cardsPerPage) : groups;
   return /* @__PURE__ */ jsxs2(Box2, { height: budget, flexDirection: "column", overflow: "hidden", children: [
-    /* @__PURE__ */ jsx2(Box2, { width: content, flexWrap: "wrap", columnGap: GAP, rowGap: 1, alignItems: "flex-start", children: visible.map((g) => /* @__PURE__ */ jsx2(Box2, { flexShrink: 0, children: /* @__PURE__ */ jsx2(ProviderCard, { provider: g.provider, accounts: g.accounts, stats, width: cardW, variant, privacyMode }) }, g.provider)) }),
+    /* @__PURE__ */ jsx2(Box2, { width: content, flexWrap: "wrap", columnGap: GAP, rowGap: 1, alignItems: "flex-start", children: visible.map((g) => /* @__PURE__ */ jsx2(Box2, { flexShrink: 0, children: /* @__PURE__ */ jsx2(ProviderCard, { provider: g.provider, accounts: g.accounts, stats, width: cardW, variant, privacyMode, resetDisplay, tz }) }, g.provider)) }),
     pageCount > 1 && /* @__PURE__ */ jsxs2(Text2, { dimColor: true, children: [
       "  ",
       glyphs().middot,
@@ -323,7 +320,7 @@ var DashboardView = memo2(function DashboardView2({ groups, stats, cols, budget,
     ] })
   ] });
 });
-function ProviderCard({ provider, accounts, stats, width, variant, privacyMode = false }) {
+function ProviderCard({ provider, accounts, stats, width, variant, privacyMode = false, resetDisplay, tz }) {
   const meta = PROVIDERS[provider];
   const items = accounts.map((a) => ({ account: a, s: stats.get(a.id) }));
   const dashboards = items.map((i) => i.s?.dashboard).filter((d) => !!d);
@@ -359,7 +356,7 @@ function ProviderCard({ provider, accounts, stats, width, variant, privacyMode =
     ] })),
     meta.hasBilling && showBars && /* @__PURE__ */ jsxs2(Fragment, { children: [
       meta.hasUsage && /* @__PURE__ */ jsx2(Rule, { inner }),
-      /* @__PURE__ */ jsx2(LimitsBlock, { items, inner, privacyMode })
+      /* @__PURE__ */ jsx2(LimitsBlock, { items, inner, privacyMode, resetDisplay, tz })
     ] }),
     meta.hasBilling && !showBars && !meta.hasUsage && /* @__PURE__ */ jsx2(CompactBilling, { items, privacyMode }),
     hasSpark && showSpark && /* @__PURE__ */ jsxs2(Fragment, { children: [
@@ -432,11 +429,12 @@ function accountTitle(account, billing, privacyMode = false) {
   const title = email && !account.name.includes("@") ? `${account.name} ${email}` : account.name;
   return privacyMode ? redactEmail(title) : title;
 }
-function LimitsBlock({ items, inner, privacyMode }) {
+function LimitsBlock({ items, inner, privacyMode, resetDisplay, tz }) {
   const showName = items.length > 1;
   const labels = items.flatMap((i) => i.s?.billing?.metrics ?? []).map((m) => m.label.length);
   const labelW = Math.min(Math.max(7, ...labels) + 1, 14);
-  const barW = Math.max(10, Math.min(46, inner - labelW - 13));
+  const resetW = resetDisplay === "absolute" ? 17 : 8;
+  const barW = Math.max(10, Math.min(46, inner - labelW - resetW - 5));
   return /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", children: items.map(({ account, s }, idx) => {
     const billing = s?.billing;
     return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", marginTop: showName && idx > 0 ? 1 : 0, children: [
@@ -450,11 +448,11 @@ function LimitsBlock({ items, inner, privacyMode }) {
       !billing ? /* @__PURE__ */ jsxs2(Text2, { dimColor: true, children: [
         "Fetching",
         glyphs().ellipsis
-      ] }) : billing.error ? /* @__PURE__ */ jsx2(Text2, { color: "red", wrap: "truncate-end", children: privacyMode ? redactEmail(billing.error) : billing.error }) : billing.metrics.length === 0 ? /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: "No data" }) : billing.metrics.map((m, i) => /* @__PURE__ */ jsx2(MetricRow, { m, color: account.color, barW, labelW }, `${m.label}${i}`))
+      ] }) : billing.error ? /* @__PURE__ */ jsx2(Text2, { color: "red", wrap: "truncate-end", children: privacyMode ? redactEmail(billing.error) : billing.error }) : billing.metrics.length === 0 ? /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: "No data" }) : billing.metrics.map((m, i) => /* @__PURE__ */ jsx2(MetricRow, { m, color: account.color, barW, labelW, resetW, resetDisplay, tz }, `${m.label}${i}`))
     ] }, account.id);
   }) });
 }
-function MetricRow({ m, color, barW, labelW }) {
+function MetricRow({ m, color, barW, labelW, resetW, resetDisplay, tz }) {
   if (m.format.kind === "percent") {
     const barColor = m.used >= 90 ? "red" : m.used >= 75 ? "yellow" : color;
     return /* @__PURE__ */ jsxs2(Box2, { children: [
@@ -464,7 +462,7 @@ function MetricRow({ m, color, barW, labelW }) {
         Math.round(m.used),
         "%"
       ] }) }),
-      /* @__PURE__ */ jsx2(Box2, { width: 8, justifyContent: "flex-end", children: m.resetsAt ? /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: m.resetsAt }) : /* @__PURE__ */ jsx2(Text2, { children: " " }) })
+      /* @__PURE__ */ jsx2(Box2, { width: resetW, justifyContent: "flex-end", children: m.resetsAt ? /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: resetAt(m.resetsAt, resetDisplay, Date.now(), tz) }) : /* @__PURE__ */ jsx2(Text2, { children: " " }) })
     ] });
   }
   return /* @__PURE__ */ jsxs2(Box2, { children: [
@@ -483,12 +481,13 @@ function SparkFooter({ series, month, color }) {
   ] });
 }
 function aggregate(list) {
-  const zero = () => ({ cost: 0, tokens: 0, cacheRead: 0, cacheSavings: 0 });
+  const zero = () => ({ cost: 0, tokens: 0, input: 0, cacheRead: 0, cacheSavings: 0 });
   const z = { today: zero(), week: zero(), month: zero(), burnRate: 0, series: [] };
   for (const d of list) {
     for (const k of ["today", "week", "month"]) {
       z[k].cost += d[k].cost;
       z[k].tokens += d[k].tokens;
+      z[k].input += d[k].input ?? 0;
       z[k].cacheRead += d[k].cacheRead;
       z[k].cacheSavings += d[k].cacheSavings;
     }
@@ -500,7 +499,7 @@ function aggregate(list) {
   return z;
 }
 var TotalsRow = memo2(function TotalsRow2({ groups, stats, cols }) {
-  const zero = () => ({ cost: 0, tokens: 0, cacheRead: 0, cacheSavings: 0 });
+  const zero = () => ({ cost: 0, tokens: 0, input: 0, cacheRead: 0, cacheSavings: 0 });
   const t = zero(), w = zero(), m = zero();
   for (const g of groups) {
     if (!PROVIDERS[g.provider].hasUsage) continue;
@@ -509,18 +508,23 @@ var TotalsRow = memo2(function TotalsRow2({ groups, stats, cols }) {
       if (!d) continue;
       t.cost += d.today.cost;
       t.tokens += d.today.tokens;
+      t.input += d.today.input ?? 0;
       w.cost += d.week.cost;
       w.tokens += d.week.tokens;
+      w.input += d.week.input ?? 0;
       m.cost += d.month.cost;
       m.tokens += d.month.tokens;
+      m.input += d.month.input ?? 0;
     }
   }
   const inner = cols - 4;
   const dot = glyphs().middot;
-  const full = `${glyphs().dotAll}  Today ${currency(t.cost)} (${tokens(t.tokens)} tok)  ${dot}  Week ${currency(w.cost)} (${tokens(w.tokens)} tok)  ${dot}  Month ${currency(m.cost)} (${tokens(m.tokens)} tok)`;
-  const noTok = `${glyphs().dotAll}  Today ${currency(t.cost)}  ${dot}  Week ${currency(w.cost)}  ${dot}  Month ${currency(m.cost)}`;
+  const monthNonCached = m.input > 0 ? `, ${tokens(m.input)} non-cached` : "";
+  const full = `${glyphs().dotAll}  Today ${currency(t.cost)} (${tokens(t.tokens)} tok)  ${dot}  Week ${currency(w.cost)} (${tokens(w.tokens)} tok)  ${dot}  Month ${currency(m.cost)} (${tokens(m.tokens)} tok${monthNonCached})`;
+  const monthOnly = `${glyphs().dotAll}  This Month ${currency(m.cost)} (${tokens(m.tokens)} tok${monthNonCached})`;
+  const noTok = `${glyphs().dotAll}  Today ${currency(t.cost)}  ${dot}  Week ${currency(w.cost)}  ${dot}  Month ${currency(m.cost)}${m.input > 0 ? ` (${tokens(m.input)} non-cached)` : ""}`;
   const tight = `${glyphs().dotAll}  ${currency(t.cost)}  ${dot}  ${currency(w.cost)}  ${dot}  ${currency(m.cost)}`;
-  const text = full.length <= inner ? full : noTok.length <= inner ? noTok : tight;
+  const text = full.length <= inner ? full : monthOnly.length <= inner ? monthOnly : noTok.length <= inner ? noTok : tight;
   return /* @__PURE__ */ jsx2(Box2, { marginTop: 1, children: /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: text }) });
 });
 
@@ -532,7 +536,7 @@ import { Box as Box4, Text as Text4 } from "ink";
 import { memo as memo3 } from "react";
 import { Box as Box3, Text as Text3 } from "ink";
 import { Fragment as Fragment2, jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
-var GENERAL_ROWS = 9;
+var GENERAL_ROWS = 10;
 var SETTINGS_TABS = ["general", "providers", "accounts"];
 var SETTINGS_TAB_LABELS = {
   general: "General",
@@ -628,7 +632,18 @@ var SettingsView = memo3(function SettingsView2({
         ] })
       ] }),
       /* @__PURE__ */ jsx3(Row, { cursor, idx: 8, label: "Network access", children: /* @__PURE__ */ jsx3(Text3, { bold: true, color: config.allowNetworkAccess ? "red" : "green", children: config.allowNetworkAccess ? "LAN (unsafe)" : "local only" }) }),
-      config.allowNetworkAccess && /* @__PURE__ */ jsx3(Text3, { color: "red", children: "  Warning: dashboard data and settings will be exposed to your local network after daemon restart." })
+      config.allowNetworkAccess && /* @__PURE__ */ jsx3(Text3, { color: "red", children: "  Warning: dashboard data and settings will be exposed to your local network after daemon restart." }),
+      /* @__PURE__ */ jsxs3(Row, { cursor, idx: 9, label: "Reset times", children: [
+        /* @__PURE__ */ jsxs3(Text3, { dimColor: true, children: [
+          glyphs().caretL,
+          " "
+        ] }),
+        /* @__PURE__ */ jsx3(Text3, { bold: true, color: "yellow", children: config.resetDisplay === "relative" ? "time remaining" : "exact date/time" }),
+        /* @__PURE__ */ jsxs3(Text3, { dimColor: true, children: [
+          " ",
+          glyphs().caretR
+        ] })
+      ] })
     ] }),
     activeTab === "providers" && /* @__PURE__ */ jsxs3(Fragment2, { children: [
       /* @__PURE__ */ jsx3(Text3, { bold: true, dimColor: true, children: "Providers" }),
@@ -2123,6 +2138,10 @@ function handleSettings(input, key, ctx) {
     }
     if (index === 8 && (inputKey.leftArrow || inputKey.rightArrow || inputKey.return)) {
       updateConfig((current) => ({ ...current, allowNetworkAccess: !current.allowNetworkAccess }));
+      return;
+    }
+    if (index === 9 && (inputKey.leftArrow || inputKey.rightArrow || inputKey.return)) {
+      updateConfig((current) => ({ ...current, resetDisplay: current.resetDisplay === "relative" ? "absolute" : "relative" }));
     }
   }
 }
@@ -2278,10 +2297,9 @@ function terminalFocusEvent(input) {
   if (input === "[O") return "out";
   return null;
 }
-function handleTerminalFocusInput(input, onFocusIn) {
+function handleTerminalFocusInput(input) {
   const event = terminalFocusEvent(input);
   if (!event) return false;
-  if (event === "in") onFocusIn();
   return true;
 }
 function isRefreshAllShortcut(input, mode) {
@@ -3389,7 +3407,7 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, mode = "deg
     if (webStartingRef.current) return;
     webStartingRef.current = true;
     try {
-      const { startWebServer } = await import("./server-X63FGHIZ.js");
+      const { startWebServer } = await import("./server-5WIWS27N.js");
       const ctrl = await startWebServer({ config: cfg, log: false });
       webRef.current = ctrl;
       openUrl(ctrl.url);
@@ -3436,17 +3454,8 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, mode = "deg
     () => tab === 1 ? sortRows(filterTokenRows(filterRowsByModel(rawTokenRows, activeTableModel), search), sort) : [],
     [tab, rawTokenRows, activeTableModel, search, sort]
   );
-  const lastFocusRefreshRef = useRef8(Date.now());
-  const refreshOnFocus = useCallback7(() => {
-    const now = Date.now();
-    if (now - lastFocusRefreshRef.current < 3e4) return;
-    lastFocusRefreshRef.current = now;
-    const task = connected ? daemonRefreshRef.current("billing") : degradedRefreshRef.current();
-    void task.catch(() => {
-    });
-  }, [connected]);
   useInput((input, key) => {
-    if (handleTerminalFocusInput(input, refreshOnFocus)) return;
+    if (handleTerminalFocusInput(input)) return;
     handleKey(input, key, {
       onboarding: {
         show: showPicker,
@@ -3568,7 +3577,7 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, mode = "deg
       ] }),
       /* @__PURE__ */ jsxs12(Box11, { children: [
         peak && /* @__PURE__ */ jsxs12(Fragment4, { children: [
-          /* @__PURE__ */ jsx12(PeakBadge, { peak }),
+          /* @__PURE__ */ jsx12(PeakBadge, { peak, resetDisplay: cfg.resetDisplay, tz }),
           /* @__PURE__ */ jsxs12(Text12, { dimColor: true, children: [
             "  ",
             glyphs().middot,
@@ -3627,7 +3636,7 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, mode = "deg
         ] })
       ] }),
       tab === 0 && /* @__PURE__ */ jsxs12(Fragment4, { children: [
-        /* @__PURE__ */ jsx12(DashboardView, { groups, stats, cols, budget: gridBudget, focusId, layout: cfg.dashboardLayout, page: dashPage, privacyMode: cfg.privacyMode }),
+        /* @__PURE__ */ jsx12(DashboardView, { groups, stats, cols, budget: gridBudget, focusId, layout: cfg.dashboardLayout, page: dashPage, privacyMode: cfg.privacyMode, resetDisplay: cfg.resetDisplay, tz }),
         slots.length > 1 && /* @__PURE__ */ jsxs12(Box11, { marginTop: 1, children: [
           /* @__PURE__ */ jsx12(Text12, { dimColor: true, children: "focus  " }),
           /* @__PURE__ */ jsx12(

package/dist/{chunk-45ZP755H.js → chunk-4CY725NY.js}

@@ -3,7 +3,7 @@ import {
   TOKMON_WS_METHODS,
   TOKMON_WS_PATH,
   TokmonRpcGroup
-} from "./chunk-O27I2XFN.js";
+} from "./chunk-RTGMDE7U.js";
 
 // src/client/daemon-rpc-client.ts
 import { Cause, Context, Duration, Effect, Exit, Fiber, Layer, ManagedRuntime, Schedule, Stream } from "effect";

package/dist/{chunk-W2WGBXZG.js → chunk-AMD4PXDG.js}

@@ -5,7 +5,7 @@ import {
   readLock,
   reclaimDeadLock,
   verifyLock
-} from "./chunk-3TJVFKXV.js";
+} from "./chunk-QM5E5RJZ.js";
 import {
   appVersion
 } from "./chunk-SMPY52EV.js";

package/dist/{chunk-5CWOJMAH.js → chunk-E2YXYU73.js}

@@ -26,6 +26,7 @@ var DEFAULTS = {
   defaultFocus: "all",
   ascii: "auto",
   allowNetworkAccess: false,
+  resetDisplay: "relative",
   knownProviders: []
 };
 var LEGACY_KNOWN = ["claude", "codex", "cursor"];
@@ -216,6 +217,7 @@ function repairConfig(input) {
     defaultFocus: parsed.defaultFocus === "last" ? "last" : "all",
     ascii: parsed.ascii === "on" ? "on" : parsed.ascii === "off" ? "off" : "auto",
     allowNetworkAccess: parsed.allowNetworkAccess === true,
+    resetDisplay: parsed.resetDisplay === "absolute" ? "absolute" : "relative",
     knownProviders
   };
   for (const key of Object.keys(DEFAULTS)) {

package/dist/{chunk-REO4O5VE.js → chunk-OWPJUG4C.js}

@@ -11,7 +11,7 @@ import {
   colorHex,
   fetchPeak,
   namedHex
-} from "./chunk-42H7R376.js";
+} from "./chunk-VGYBQH5I.js";
 import {
   PROVIDERS,
   TOKMON_CAPABILITIES,
@@ -22,7 +22,7 @@ import {
   detectProviders,
   resolveTimezone,
   withTimeout
-} from "./chunk-O27I2XFN.js";
+} from "./chunk-RTGMDE7U.js";
 import {
   cacheDir,
   expandHome,
@@ -30,7 +30,7 @@ import {
   normalizeConfig,
   saveConfig,
   snapshotCacheFile
-} from "./chunk-5CWOJMAH.js";
+} from "./chunk-E2YXYU73.js";
 
 // src/web/server.ts
 import { createServer } from "http";
@@ -189,7 +189,7 @@ function deferred() {
   });
   return { promise, resolve, reject };
 }
-function createRefreshQueue(perform, skipAutomatic = () => false) {
+function createRefreshQueue(perform, skipAutomatic = () => false, options = {}) {
   let activePass = null;
   let activeResult = null;
   let queued = null;
@@ -226,6 +226,7 @@ function createRefreshQueue(perform, skipAutomatic = () => false) {
     if (stopped || !force && skipAutomatic()) return Promise.resolve();
     if (!activePass) return launch();
     if (!force) return activeResult.promise;
+    if (options.forceWhileActive === "join") return activeResult.promise;
     if (!queued) queued = deferred();
     return queued.promise;
   };
@@ -252,10 +253,21 @@ var IDLE_PAUSE_MS = 6e4;
 var SNAPSHOT_CACHE_THROTTLE_MS = 2e4;
 var REVEAL_THROTTLE_MS = 500;
 var FETCH_TIMEOUT_MS = 3e4;
-var ATTACH_BILLING_MAX_AGE_MS = 3e4;
-function billingNeedsCatchUp(accounts, updatedAt, now = Date.now(), maxAgeMs = ATTACH_BILLING_MAX_AGE_MS) {
+var DEFAULT_BILLING_STALE_MS = 5 * 6e4;
+function billingNeedsCatchUp(accounts, updatedAt, now = Date.now(), maxAgeMs = DEFAULT_BILLING_STALE_MS) {
   return accounts.some(({ account }) => now - (updatedAt.get(account.id) ?? 0) >= maxAgeMs);
 }
+async function forEachProviderSequentially(values, task) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const value of values) {
+    const group = groups.get(value.account.providerId) ?? [];
+    group.push(value);
+    groups.set(value.account.providerId, group);
+  }
+  await Promise.all([...groups.values()].map(async (group) => {
+    for (const value of group) await task(value);
+  }));
+}
 function runInBackground(task) {
   void task.catch(() => {
   });
@@ -405,7 +417,14 @@ function createDataEngine(opts) {
         }
         reveal();
       };
-      if (opts2.concurrent) {
+      if (opts2.concurrent === "provider") {
+        await forEachProviderSequentially(opts2.accounts(), async (r) => {
+          const result = await fetchOne(r);
+          if (stopped || epoch !== configEpoch) return;
+          applyResult(result);
+        });
+        if (stopped || epoch !== configEpoch) return;
+      } else if (opts2.concurrent) {
         await Promise.all(opts2.accounts().map(async (r) => {
           const result = await fetchOne(r);
           if (stopped || epoch !== configEpoch) return;
@@ -423,7 +442,8 @@ function createDataEngine(opts) {
       rebuild();
       throwIfRefreshFailures(opts2.scope, failures);
     },
-    idle
+    idle,
+    { forceWhileActive: opts2.forceWhileActive }
   );
   const refreshSummary = makeRefreshLoop({
     scope: "summary",
@@ -454,8 +474,10 @@ function createDataEngine(opts) {
     },
     state: billingState,
     updatedAt: billingUpdatedAt,
-    concurrent: true
+    concurrent: "provider",
+    forceWhileActive: "join"
   });
+  const refreshBillingIfStale = () => billingNeedsCatchUp(billingAccounts, billingUpdatedAt, Date.now(), billingIntervalMs) ? refreshBilling.run(true) : Promise.resolve();
   const refreshPeak = createRefreshQueue(
     async () => {
       if (stopped || !hasClaude) return;
@@ -549,7 +571,7 @@ function createDataEngine(opts) {
       rebuild();
       runInBackground(refreshSummary.run(true));
       runInBackground(refreshTable.run(true));
-      runInBackground(refreshBilling.run(true));
+      runInBackground(refreshBillingIfStale());
       if (hasClaude) runInBackground(refreshPeak.run(true));
       startTimers();
     },
@@ -576,9 +598,7 @@ function createDataEngine(opts) {
         runInBackground(refreshSummary.run(true));
         runInBackground(refreshTable.run(true));
       }
-      if (billingNeedsCatchUp(billingAccounts, billingUpdatedAt)) {
-        runInBackground(refreshBilling.run());
-      }
+      runInBackground(refreshBillingIfStale());
       return () => {
         snapshotSubscribers.delete(onSnapshot);
       };

package/dist/{chunk-3TJVFKXV.js → chunk-QM5E5RJZ.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   cacheDir
-} from "./chunk-5CWOJMAH.js";
+} from "./chunk-E2YXYU73.js";
 
 // src/web/lockfile.ts
 import { closeSync, fchmodSync, fsyncSync, lstatSync, mkdirSync, openSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync } from "fs";

package/dist/{chunk-O27I2XFN.js → chunk-RTGMDE7U.js}

@@ -5,7 +5,7 @@ import {
   envDir,
   expandHome,
   isValidTimezone
-} from "./chunk-5CWOJMAH.js";
+} from "./chunk-E2YXYU73.js";
 
 // src/async.ts
 var DEFAULT_TIMEOUT_MS = 3e4;
@@ -590,15 +590,16 @@ function summarize(entries, tz) {
   const todayStart = startOfDay(now, tz);
   const weekStart = startOfWeek(now, tz);
   const monthStart = startOfMonth(now, tz);
-  const today = { cost: 0, tokens: 0, cacheRead: 0, cacheSavings: 0 };
-  const week = { cost: 0, tokens: 0, cacheRead: 0, cacheSavings: 0 };
-  const month = { cost: 0, tokens: 0, cacheRead: 0, cacheSavings: 0 };
+  const today = { cost: 0, tokens: 0, input: 0, cacheRead: 0, cacheSavings: 0 };
+  const week = { cost: 0, tokens: 0, input: 0, cacheRead: 0, cacheSavings: 0 };
+  const month = { cost: 0, tokens: 0, input: 0, cacheRead: 0, cacheSavings: 0 };
   const byDay = /* @__PURE__ */ new Map();
   let oldestToday = now;
   let hadToday = false;
   const add = (s, e) => {
     s.cost += e.cost;
     s.tokens += e.input + e.output + e.cacheCreate + e.cacheRead;
+    s.input += e.input;
     s.cacheRead += e.cacheRead;
     s.cacheSavings += e.cacheSavings;
   };
@@ -786,6 +787,7 @@ var ConfigSchema = Schema.Struct({
   defaultFocus: Schema.Literals(["all", "last"]),
   ascii: Schema.Literals(["auto", "on", "off"]),
   allowNetworkAccess: Schema.Boolean,
+  resetDisplay: Schema.Literals(["relative", "absolute"]),
   knownProviders: Schema.Array(ProviderIdSchema)
 });
 var ProtocolInfoSchema = Schema.Struct({
@@ -824,6 +826,7 @@ var FsListingSchema = Schema.Struct({
 var UsageSummarySchema = Schema.Struct({
   cost: Schema.Finite,
   tokens: Schema.Finite,
+  input: Schema.Finite,
   cacheRead: Schema.Finite,
   cacheSavings: Schema.Finite
 });
@@ -930,7 +933,8 @@ var WebSnapshotSchema = Schema.Struct({
     label: Schema.String,
     // The upstream clock is only normalized to a finite number; do not make
     // the wire contract narrower than the producer's declared type.
-    minutesUntilChange: Schema.NullOr(Schema.Finite)
+    minutesUntilChange: Schema.NullOr(Schema.Finite),
+    changesAt: Schema.optionalKey(Schema.NullOr(Schema.String))
   }))
 });
 var EmptyPayloadSchema = Schema.Struct({});
@@ -1017,6 +1021,18 @@ function formatResetIn(iso, now = Date.now()) {
   const hrs = hours % 24;
   return `${days}d ${hrs}h`;
 }
+function formatResetAt(iso, display, now = Date.now(), tz) {
+  const timestamp = Date.parse(iso);
+  if (!Number.isFinite(timestamp)) return iso;
+  if (display === "relative") return formatResetIn(iso, now);
+  return new Intl.DateTimeFormat(void 0, {
+    month: "short",
+    day: "numeric",
+    hour: "numeric",
+    minute: "2-digit",
+    timeZone: tz
+  }).format(new Date(timestamp));
+}
 
 // src/format.ts
 var currency = formatCurrency;
@@ -1030,7 +1046,7 @@ function col(s, w, align = "right") {
   const spaces = " ".repeat(w - s.length);
   return align === "right" ? spaces + s : s + spaces;
 }
-var resetIn = formatResetIn;
+var resetAt = formatResetAt;
 
 // src/providers/claude/usage.ts
 import { stat as fsStat, access } from "fs/promises";
@@ -1432,11 +1448,13 @@ function boolValue(value) {
   return false;
 }
 function resetFrom(value) {
-  if (typeof value === "string" && value.trim()) return resetIn(value);
+  if (typeof value === "string" && value.trim()) {
+    const timestamp = Date.parse(value);
+    return Number.isFinite(timestamp) ? new Date(timestamp).toISOString() : null;
+  }
   const n = numberValue(value);
   if (n === void 0) return null;
-  const iso = msToIso(Math.abs(n) < 1e10 ? n * 1e3 : n);
-  return iso ? resetIn(iso) : null;
+  return msToIso(Math.abs(n) < 1e10 ? n * 1e3 : n);
 }
 function usageMetric(label, window, primary) {
   const used = numberValue(window?.utilization);
@@ -1989,8 +2007,7 @@ function resetDateMs(window) {
 }
 function resetFrom2(window) {
   const ms = resetDateMs(window);
-  const iso = ms === null ? null : msToIso(ms);
-  return iso ? resetIn(iso) : null;
+  return ms === null ? null : msToIso(ms);
 }
 function windowSeconds(window) {
   const seconds = numberValue(window?.limit_window_seconds ?? window?.period_seconds ?? window?.window_seconds);
@@ -2569,7 +2586,7 @@ async function cursorBillingCore(account) {
   const rawEnd = usage.billingCycleEnd;
   const endMs = timestampMs(rawEnd);
   const iso = endMs === null ? null : msToIso(endMs);
-  const resets = iso ? resetIn(iso) : null;
+  const resets = iso;
   const limit = numberValue(pu.limit);
   const planUsedCents = numberValue(pu.totalSpend) ?? (limit !== void 0 && numberValue(pu.remaining) !== void 0 ? limit - numberValue(pu.remaining) : void 0);
   const computedPercent = limit !== void 0 && limit > 0 && planUsedCents !== void 0 ? planUsedCents / limit * 100 : void 0;
@@ -3118,7 +3135,9 @@ function redactToken(token) {
   return token.length <= 4 ? "****" : `****${token.slice(-4)}`;
 }
 function resetDate(value) {
-  return typeof value === "string" && value.trim() ? resetIn(value) : null;
+  if (typeof value !== "string" || !value.trim()) return null;
+  const timestamp = Date.parse(value);
+  return Number.isFinite(timestamp) ? new Date(timestamp).toISOString() : null;
 }
 function boolValue2(value) {
   if (typeof value === "boolean") return value;
@@ -3625,7 +3644,7 @@ function cloudCodeBucketsToMetrics(buckets, options = {}) {
       used: Math.round((1 - clamped) * 100),
       limit: 100,
       format: { kind: "percent" },
-      resetsAt: bucket.resetTime && Number.isFinite(Date.parse(bucket.resetTime)) ? resetIn(bucket.resetTime) : null,
+      resetsAt: bucket.resetTime && Number.isFinite(Date.parse(bucket.resetTime)) ? new Date(bucket.resetTime).toISOString() : null,
       primary: i === 0
     };
   });
@@ -4556,15 +4575,17 @@ export {
   flushDisk,
   coalesceTables,
   claudeConfigDirs,
+  readJson,
+  readClaudeIdentity,
+  codexHomes,
+  identityFromIdToken,
+  formatResetAt,
   currency,
   tokens,
   time,
   shortDate,
   col,
-  readJson,
-  readClaudeIdentity,
-  codexHomes,
-  identityFromIdToken,
+  resetAt,
   cursorStateDb,
   piSessionsDir,
   opencodeDbPaths,