tokmon 0.14.4 → 0.14.5

package/dist/cli.js

@@ -610,9 +610,9 @@ function glyphs() {
 // src/app.tsx
 import { spawn } from "child_process";
 import { appendFileSync as appendFileSync2 } from "fs";
-import { useState as useState3, useEffect as useEffect3, useCallback as useCallback2, useRef as useRef2, useMemo } from "react";
+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 as useMouse2 } from "@zenobius/ink-mouse";
+import { useMouse } from "@zenobius/ink-mouse";
 
 // src/http.ts
 async function readJson(res) {
@@ -705,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;
 }
@@ -1013,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;
@@ -1032,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);
@@ -1622,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,
@@ -1915,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 };
 }
@@ -2670,9 +2683,9 @@ function saveSnapshot(stats) {
 
 // src/ui/shared.tsx
 import { appendFileSync } from "fs";
-import { useState, useEffect, useRef, useCallback } from "react";
+import { useEffect, useRef, useState } from "react";
 import { Box, Text } from "ink";
-import { useOnMouseClick, useMouse, useElementPosition, useElementDimensions } from "@zenobius/ink-mouse";
+import { useOnMouseClick } from "@zenobius/ink-mouse";
 import { jsx, jsxs } from "react/jsx-runtime";
 function truncateName(s, n) {
   const ell = glyphs().ellipsis;
@@ -2685,40 +2698,72 @@ function ClickableBox({ onClick, children, ...props }) {
   });
   return /* @__PURE__ */ jsx(Box, { ref, ...props, children });
 }
-function LinkBox({ onClick, children, ...props }) {
-  const ref = useRef(null);
-  const mouse = useMouse();
-  const pos3 = useElementPosition(ref);
-  const dim = useElementDimensions(ref);
-  const handler = useCallback((m, action) => {
+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, `evt action=${action} m=${m.x},${m.y} pos=${pos3.left},${pos3.top} dim=${dim.width},${dim.height}
+        appendFileSync(process.env.TOKMON_LINKDEBUG, `DISPATCH code=${code} mx=${mx} my=${my} hits=${linkHits.size}
 `);
       } catch {
       }
     }
-    if (action !== "press") return;
-    const mx = m.x - 1;
-    const my = m.y - 1;
-    const { left, top } = pos3;
-    const { width, height } = dim;
-    if (mx >= left && mx <= left + width && my >= top && my <= top + height) onClick();
-  }, [pos3, dim, onClick]);
+    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 events = mouse.events;
-    if (process.env.TOKMON_LINKDEBUG) {
-      try {
-        appendFileSync(process.env.TOKMON_LINKDEBUG, `LINKBOX subscribe events=${events ? "present" : "MISSING"} on=${typeof events?.on}
+    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 {
+        } catch {
+        }
       }
-    }
-    events.on("click", handler);
+      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 () => {
-      events.off("click", handler);
+      linkHits.delete(hit);
     };
-  }, [mouse.events, handler]);
+  }, []);
   return /* @__PURE__ */ jsx(Box, { ref, ...props, children });
 }
 function Spinner({ label }) {
@@ -4245,12 +4290,12 @@ function App({ interval: cliInterval, initialConfig }) {
   useEffect3(() => {
     setDashPage((p) => Math.min(p, dashPageCount - 1));
   }, [dashPageCount]);
-  const resetView = useCallback2(() => {
+  const resetView = useCallback(() => {
     setCursor(0);
     setExpanded(-1);
   }, []);
   const clampRow = (n) => Math.max(0, Math.min(rowCountRef.current - 1, n));
-  const mouse = useMouse2();
+  const mouse = useMouse();
   useEffect3(() => {
     if (!IS_TTY) return;
     mouse.enable();
@@ -4263,20 +4308,11 @@ function App({ interval: cliInterval, initialConfig }) {
       }
     };
     mouse.events.on("scroll", onScroll);
-    let onClickDbg = null;
-    if (process.env.TOKMON_LINKDEBUG) {
-      onClickDbg = (p, a) => {
-        try {
-          appendFileSync2(process.env.TOKMON_LINKDEBUG, `APP click p=${p.x},${p.y} a=${a}
-`);
-        } catch {
-        }
-      };
-      mouse.events.on("click", onClickDbg);
-    }
+    const onData = (d) => dispatchLinkClicks(d);
+    process.stdin.on("data", onData);
     return () => {
       mouse.events.off("scroll", onScroll);
-      if (onClickDbg) mouse.events.off("click", onClickDbg);
+      process.stdin.off("data", onData);
     };
   }, [tab]);
   function updateConfig(fn) {

package/package.json

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