tokmon 0.14.3 → 0.14.5

package/dist/cli.js

@@ -609,6 +609,7 @@ function glyphs() {
 
 // src/app.tsx
 import { spawn } from "child_process";
+import { appendFileSync as appendFileSync2 } from "fs";
 import { useState as useState3, useEffect as useEffect3, useCallback, useRef as useRef2, useMemo } from "react";
 import { Box as Box7, Text as Text7, Transform, useInput, useStdout, useApp } from "ink";
 import { useMouse } from "@zenobius/ink-mouse";
@@ -704,7 +705,9 @@ async function detectClaude(homeDir) {
 }
 function priceFor(model) {
   for (const key of PRICE_KEYS) {
-    if (model.startsWith(key)) return PRICING[key];
+    if (!model.startsWith(key)) continue;
+    const rest = model.slice(key.length);
+    if (rest === "" || rest[0] === "-") return PRICING[key];
   }
   return FALLBACK;
 }
@@ -1012,10 +1015,15 @@ function subtractClamped(cur, prev) {
     reasoning_output_tokens: sub(cur.reasoning_output_tokens, prev?.reasoning_output_tokens)
   };
 }
+function eventSig(last, total) {
+  const f = (x) => x ? `${x.input_tokens ?? 0},${x.cached_input_tokens ?? 0},${x.output_tokens ?? 0},${x.reasoning_output_tokens ?? 0}` : "-";
+  return `${f(last)}|${f(total)}`;
+}
 async function parseFile2(path) {
   const entries = [];
   let model = "gpt-5-codex";
   let prevTotal = null;
+  let prevSig = null;
   const rl = createInterface2({ input: createReadStream2(path), crlfDelay: Infinity });
   for await (const rawLine of rl) {
     if (!rawLine.includes("token_count") && !rawLine.includes("turn_context")) continue;
@@ -1031,7 +1039,11 @@ async function parseFile2(path) {
       if (payloadType !== "token_count") continue;
       const info = obj?.payload?.info;
       const total = info?.total_token_usage;
-      let d = info?.last_token_usage;
+      const last = info?.last_token_usage;
+      const sig = eventSig(last, total);
+      if (sig === prevSig) continue;
+      prevSig = sig;
+      let d = last;
       if (!d && total) {
         const reset = !!prevTotal && (total.input_tokens ?? 0) < (prevTotal.input_tokens ?? 0);
         d = reset ? total : subtractClamped(total, prevTotal);
@@ -1621,9 +1633,10 @@ async function parseFile3(path) {
       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 model = typeof msg.responseModel === "string" && msg.responseModel || typeof msg.model === "string" && msg.model || "unknown";
       entries.push({
         ts,
-        model: typeof msg.model === "string" && msg.model ? msg.model : "unknown",
+        model,
         cost: pos(c.total),
         input,
         output,
@@ -1914,6 +1927,7 @@ function resetDate(value) {
 }
 function percentMetric2(label, snapshot, reset, primary) {
   if (!snapshot || typeof snapshot.percent_remaining !== "number") 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 };
 }
@@ -2244,9 +2258,10 @@ async function requestCloudCodeJson(path, token, body) {
 }
 function readPlan(loadData) {
   const paid = typeof loadData?.paidTier?.name === "string" ? loadData.paidTier.name.trim() : "";
-  if (paid) return paid;
   const current = typeof loadData?.currentTier?.name === "string" ? loadData.currentTier.name.trim() : "";
-  return current || null;
+  const raw = paid || current;
+  if (!raw) return null;
+  return raw.replace(/^Gemini Code Assist (?:in|for)\s+/i, "").replace(/^Gemini Code Assist$/i, "Code Assist");
 }
 function parseBuckets(data) {
   if (!Array.isArray(data?.buckets)) return [];
@@ -2321,8 +2336,8 @@ function normalizeLabel(label) {
 }
 function poolLabel(label) {
   const lower = normalizeLabel(label).toLowerCase();
-  if (lower.includes("gemini") && lower.includes("pro")) return "Gemini Pro";
-  if (lower.includes("gemini") && lower.includes("flash")) return "Gemini Flash";
+  if (lower.includes("gemini") && lower.includes("pro")) return "Pro";
+  if (lower.includes("gemini") && lower.includes("flash")) return "Flash";
   return "Claude";
 }
 function sortKey(label) {
@@ -2667,7 +2682,8 @@ function saveSnapshot(stats) {
 }
 
 // src/ui/shared.tsx
-import { useState, useEffect, useRef } from "react";
+import { appendFileSync } from "fs";
+import { useEffect, useRef, useState } from "react";
 import { Box, Text } from "ink";
 import { useOnMouseClick } from "@zenobius/ink-mouse";
 import { jsx, jsxs } from "react/jsx-runtime";
@@ -2682,6 +2698,74 @@ function ClickableBox({ onClick, children, ...props }) {
   });
   return /* @__PURE__ */ jsx(Box, { ref, ...props, children });
 }
+var SGR_PRESS = /\x1b\[<(\d+);(\d+);(\d+)M/g;
+var linkHits = /* @__PURE__ */ new Set();
+function dispatchLinkClicks(chunk) {
+  if (linkHits.size === 0) return;
+  const s = typeof chunk === "string" ? chunk : chunk.toString("utf8");
+  SGR_PRESS.lastIndex = 0;
+  let m;
+  while ((m = SGR_PRESS.exec(s)) !== null) {
+    const code = Number(m[1]);
+    if (code & 64 || code & 32) continue;
+    const mx = Number(m[2]) - 1;
+    const my = Number(m[3]) - 1;
+    if (process.env.TOKMON_LINKDEBUG) {
+      try {
+        appendFileSync(process.env.TOKMON_LINKDEBUG, `DISPATCH code=${code} mx=${mx} my=${my} hits=${linkHits.size}
+`);
+      } catch {
+      }
+    }
+    for (const hit of [...linkHits]) {
+      if (hit(mx, my)) break;
+    }
+  }
+}
+function nodeBox(node) {
+  const yn = node?.yogaNode;
+  if (!yn) return null;
+  const l = yn.getComputedLayout();
+  let left = l.left, top = l.top;
+  let p = node?.parentNode;
+  while (p) {
+    const pn = p.yogaNode;
+    if (!pn) break;
+    const pl = pn.getComputedLayout();
+    left += pl.left;
+    top += pl.top;
+    p = p.parentNode;
+  }
+  return { left, top, width: l.width, height: l.height };
+}
+function LinkBox({ onClick, children, ...props }) {
+  const ref = useRef(null);
+  const onClickRef = useRef(onClick);
+  onClickRef.current = onClick;
+  useEffect(() => {
+    const hit = (mx, my) => {
+      const box = nodeBox(ref.current);
+      if (process.env.TOKMON_LINKDEBUG) {
+        try {
+          appendFileSync(process.env.TOKMON_LINKDEBUG, `HIT? mx=${mx} my=${my} box=${box ? `${box.left},${box.top} ${box.width}x${box.height}` : "null"}
+`);
+        } catch {
+        }
+      }
+      if (!box || box.width <= 0 || box.height <= 0) return false;
+      if (mx >= box.left && mx < box.left + box.width && my >= box.top && my < box.top + box.height) {
+        onClickRef.current();
+        return true;
+      }
+      return false;
+    };
+    linkHits.add(hit);
+    return () => {
+      linkHits.delete(hit);
+    };
+  }, []);
+  return /* @__PURE__ */ jsx(Box, { ref, ...props, children });
+}
 function Spinner({ label }) {
   const frames = glyphs().spinner;
   const [i, setI] = useState(0);
@@ -2889,14 +2973,6 @@ function ProviderCard({ provider, accounts, stats, width, variant }) {
         /* @__PURE__ */ jsx2(Text2, { color: meta.color, children: sparkline(activity.series) }),
         /* @__PURE__ */ jsx2(Box2, { flexGrow: 1, justifyContent: "flex-end", children: /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: activity.summary }) })
       ] })
-    ] }),
-    !meta.hasUsage && !activity && variant === "full" && /* @__PURE__ */ jsxs2(Fragment, { children: [
-      /* @__PURE__ */ jsx2(Box2, { flexGrow: 1 }),
-      /* @__PURE__ */ jsxs2(Text2, { dimColor: true, children: [
-        "Billing only ",
-        glyphs().emDash,
-        " no local history"
-      ] })
     ] })
   ] });
 }
@@ -2974,7 +3050,7 @@ function MetricRow({ m, color, barW }) {
   if (m.format.kind === "percent") {
     const barColor = m.used >= 90 ? "red" : m.used >= 75 ? "yellow" : color;
     return /* @__PURE__ */ jsxs2(Box2, { children: [
-      /* @__PURE__ */ jsx2(Box2, { width: 7, children: /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: m.label }) }),
+      /* @__PURE__ */ jsx2(Box2, { width: 7, children: /* @__PURE__ */ jsx2(Text2, { dimColor: true, wrap: "truncate", children: m.label }) }),
       /* @__PURE__ */ jsx2(Bar, { pct: m.used, color: barColor, width: barW }),
       /* @__PURE__ */ jsx2(Box2, { width: 5, justifyContent: "flex-end", children: /* @__PURE__ */ jsxs2(Text2, { bold: true, children: [
         Math.round(m.used),
@@ -2984,7 +3060,7 @@ function MetricRow({ m, color, barW }) {
     ] });
   }
   return /* @__PURE__ */ jsxs2(Box2, { children: [
-    /* @__PURE__ */ jsx2(Box2, { width: 7, children: /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: m.label }) }),
+    /* @__PURE__ */ jsx2(Box2, { width: 7, children: /* @__PURE__ */ jsx2(Text2, { dimColor: true, wrap: "truncate", children: m.label }) }),
     /* @__PURE__ */ jsx2(Text2, { bold: true, color: "yellow", children: metricValueText(m) })
   ] });
 }
@@ -3885,6 +3961,8 @@ var CURSOR_SORTS = [
 ];
 var IS_TTY = process.stdin.isTTY === true;
 var REPO_URL = "https://github.com/DavidIlie/tokmon";
+var SITE_URL = "https://davidilie.com";
+var IS_APPLE_TERMINAL = process.env.TERM_PROGRAM === "Apple_Terminal";
 function detectHyperlinks(env, isTTY) {
   const force = env.FORCE_HYPERLINK;
   if (force != null && force !== "") return force !== "0" && force.toLowerCase() !== "false";
@@ -3902,6 +3980,13 @@ function detectHyperlinks(env, isTTY) {
 }
 var HYPERLINKS = detectHyperlinks(process.env, process.stdout.isTTY === true);
 function openUrl(url) {
+  if (process.env.TOKMON_OPENLOG) {
+    try {
+      appendFileSync2(process.env.TOKMON_OPENLOG, url + "\n");
+    } catch {
+    }
+    return;
+  }
   try {
     if (process.platform === "darwin") spawn("open", [url], { stdio: "ignore", detached: true }).unref();
     else if (process.platform === "win32") spawn("cmd", ["/c", "start", "", url], { stdio: "ignore", detached: true }).unref();
@@ -4223,8 +4308,11 @@ function App({ interval: cliInterval, initialConfig }) {
       }
     };
     mouse.events.on("scroll", onScroll);
+    const onData = (d) => dispatchLinkClicks(d);
+    process.stdin.on("data", onData);
     return () => {
       mouse.events.off("scroll", onScroll);
+      process.stdin.off("data", onData);
     };
   }, [tab]);
   function updateConfig(fn) {
@@ -4515,6 +4603,10 @@ function App({ interval: cliInterval, initialConfig }) {
       exit();
       return;
     }
+    if (input === "O") {
+      openUrl(REPO_URL);
+      return;
+    }
     if (showSettings) {
       if (key.escape || input === "s") {
         setShowSettings(false);
@@ -4927,21 +5019,25 @@ function AccountStrip({ slots, activeIdx, onSelect }) {
 }
 function Footer({ hasAccounts, paginated, cols }) {
   const inner = cols - 4;
-  const BASE2 = "by David Ilie (davidilie.com)  \xB7  s=settings  q=quit".length;
+  const BASE2 = "by David Ilie (davidilie.com)  \xB7  O=repo  s=settings  q=quit".length;
+  const optHint = (glyphs().shift === "\u21E7" ? "\u2325" : "opt") + "-click links  ";
+  const OPT = IS_APPLE_TERMINAL ? optHint.length : 0;
   const JUMP = "0-9=jump  a/A=cycle  ".length;
   const PAGE = "scroll=page  ".length;
-  const showJump = hasAccounts && inner >= BASE2 + JUMP + (paginated ? PAGE : 0);
-  const showPage = paginated && inner >= BASE2 + (showJump ? JUMP : 0) + PAGE;
+  const showOpt = IS_APPLE_TERMINAL && inner >= BASE2 + OPT;
+  const showJump = hasAccounts && inner >= BASE2 + (showOpt ? OPT : 0) + JUMP + (paginated ? PAGE : 0);
+  const showPage = paginated && inner >= BASE2 + (showOpt ? OPT : 0) + (showJump ? JUMP : 0) + PAGE;
   return /* @__PURE__ */ jsxs7(Box7, { marginTop: 1, flexWrap: "nowrap", children: [
     /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "by " }),
-    /* @__PURE__ */ jsx7(ClickableBox, { onClick: () => openUrl(REPO_URL), children: /* @__PURE__ */ jsx7(Transform, { transform: (s) => osc8(s, REPO_URL), children: /* @__PURE__ */ jsx7(Text7, { underline: true, children: "David Ilie" }) }) }),
+    /* @__PURE__ */ jsx7(LinkBox, { onClick: () => openUrl(REPO_URL), children: /* @__PURE__ */ jsx7(Transform, { transform: (s) => osc8(s, REPO_URL), children: /* @__PURE__ */ jsx7(Text7, { underline: true, children: "David Ilie" }) }) }),
     /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: " (" }),
-    /* @__PURE__ */ jsx7(ClickableBox, { onClick: () => openUrl("https://davidilie.com"), children: /* @__PURE__ */ jsx7(Transform, { transform: (s) => osc8(s, "https://davidilie.com"), children: /* @__PURE__ */ jsx7(Text7, { color: "cyan", underline: true, children: "davidilie.com" }) }) }),
+    /* @__PURE__ */ jsx7(LinkBox, { onClick: () => openUrl(SITE_URL), children: /* @__PURE__ */ jsx7(Transform, { transform: (s) => osc8(s, SITE_URL), children: /* @__PURE__ */ jsx7(Text7, { color: "cyan", underline: true, children: "davidilie.com" }) }) }),
     /* @__PURE__ */ jsxs7(Text7, { dimColor: true, children: [
       ")  ",
       glyphs().middot,
-      "  s=settings  "
+      "  O=repo  s=settings  "
     ] }),
+    showOpt && /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: optHint }),
     showJump && /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "0-9=jump  a/A=cycle  " }),
     showPage && /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "scroll=page  " }),
     /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "q=quit" })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokmon",
-  "version": "0.14.3",
+  "version": "0.14.5",
   "description": "Terminal dashboard for Claude Code, Codex, and Cursor usage, limits, and costs",
   "type": "module",
   "bin": {