@mauricode/token-derby 2.10.0 → 2.10.1

package/dist/bin.js

@@ -740,8 +740,8 @@ var HEARTBEAT_RETRY_DELAYS_MS = [1e3, 2e3, 4e3, 8e3, 15e3];
 // src/version.ts
 import { createRequire } from "module";
 function readVersion() {
-  if ("2.10.0".length > 0) {
-    return "2.10.0";
+  if ("2.10.1".length > 0) {
+    return "2.10.1";
   }
   try {
     const req = createRequire(import.meta.url);
@@ -1430,7 +1430,7 @@ function TokenBreakdown(props) {
   ] });
 }
 function StatusScreen(props) {
-  const { race, ownHorseId, ownHorseName, ownColors, ownUserName, lastHeartbeatAgoSec, lastHeartbeatOk, stalled, primaryModel, perSource, primaryCapped } = props;
+  const { race, ownHorseId, ownHorseName, ownColors, ownUserName, lastHeartbeatAgoSec, lastHeartbeatOk, stalled, stallReason, primaryModel, perSource, primaryCapped } = props;
   if (!race) {
     return /* @__PURE__ */ jsx7(Box7, { flexDirection: "column", children: /* @__PURE__ */ jsx7(Text7, { children: "Joining race\u2026" }) });
   }
@@ -1504,7 +1504,11 @@ function StatusScreen(props) {
         " ",
         /* @__PURE__ */ jsx7(Text7, { color: lastHeartbeatOk ? "green" : "yellow", children: lastHeartbeatOk ? "\u2713" : "\u26A0" })
       ] }),
-      stalled && /* @__PURE__ */ jsx7(Text7, { color: "yellow", children: "\u26A0 Can't read token usage \u2014 try restarting this terminal. Your race continues." })
+      stalled && /* @__PURE__ */ jsxs5(Text7, { color: "yellow", children: [
+        "\u26A0 ",
+        stallReason ?? "Can't read token usage",
+        ". Your race continues."
+      ] })
     ] }),
     primaryModel && perSource && /* @__PURE__ */ jsx7(
       TokenBreakdown,
@@ -1817,6 +1821,9 @@ function parseJsonl(raw) {
 }
 
 // src/tokens/race-tokens.ts
+function isStall(r) {
+  return "stall" in r;
+}
 var SCALAR_READERS = {
   claude: sumTokens,
   codex: sumCodexTokens,
@@ -1831,20 +1838,22 @@ function scoreFor(race, t) {
   return race.counts_input ? t.input + t.output : t.output;
 }
 async function readAllSources(race, primary) {
+  const primaryByConv = /* @__PURE__ */ new Map();
   try {
     const primaryMap = await BY_CONVERSATION_READERS[primary]();
-    const primaryByConv = /* @__PURE__ */ new Map();
     for (const [id, totals] of primaryMap) primaryByConv.set(id, scoreFor(race, totals));
-    const secondary = { claude: 0, codex: 0, gemini: 0 };
-    await Promise.all(
-      MODEL_KEYS.filter((k) => k !== primary).map(async (k) => {
-        secondary[k] = await SCALAR_READERS[k]().then((t) => scoreFor(race, t)).catch(() => 0);
-      })
-    );
-    return { secondary, primaryByConv };
-  } catch {
-    return null;
+  } catch (e) {
+    if (e?.code !== "ENOENT") {
+      return { stall: `Can't read ${primary} token usage: ${e?.message ?? String(e)}` };
+    }
   }
+  const secondary = { claude: 0, codex: 0, gemini: 0 };
+  await Promise.all(
+    MODEL_KEYS.filter((k) => k !== primary).map(async (k) => {
+      secondary[k] = await SCALAR_READERS[k]().then((t) => scoreFor(race, t)).catch(() => 0);
+    })
+  );
+  return { secondary, primaryByConv };
 }
 
 // src/tokens/primary-cap.ts
@@ -1866,6 +1875,7 @@ var RaceScoreTracker = class {
   counted;
   seq;
   stalls = 0;
+  lastStall = null;
   primary;
   primaryTop5;
   constructor(init, primary, primaryTop5) {
@@ -1880,16 +1890,19 @@ var RaceScoreTracker = class {
   }
   /**
    * Record a scan result.
-   * - `null` → stall (warning), anchors untouched.
+   * - `null` or a `{ stall }` reading → stall (warning), anchors untouched. A
+   *   stall reading also captures its cause for the UI.
    * - otherwise → secondaries advance scalar lastGood (never down to 0); the
    *   primary's per-conversation latest readings are updated (monotonic).
    */
   recordReading(reading) {
-    if (reading === null) {
+    if (reading === null || isStall(reading)) {
       this.stalls += 1;
+      this.lastStall = reading?.stall ?? null;
       return;
     }
     this.stalls = 0;
+    this.lastStall = null;
     for (const key of MODEL_KEYS) {
       if (key === this.primary) continue;
       const v = reading.secondary[key];
@@ -1946,6 +1959,10 @@ var RaceScoreTracker = class {
   get stalled() {
     return this.stalls >= STALL_THRESHOLD;
   }
+  /** Human-readable cause of the most recent stall (null once a good read recovers). */
+  get stallReason() {
+    return this.lastStall;
+  }
   /** Cumulative primary tokens credited so far (for the UI's primary "since join" row). */
   primaryCounted() {
     return this.counted;
@@ -1985,6 +2002,7 @@ function RunRace({ active, initialState, pendingMode, ownUserName }) {
   const pendingRef = useRef(pendingMode);
   const ctrl = useRef(new AbortController());
   const [stalled, setStalled] = useState5(false);
+  const [stallReason, setStallReason] = useState5(null);
   const baselineRef = useRef(initialState.acked);
   const [perSource, setPerSource] = useState5({ claude: 0, codex: 0, gemini: 0 });
   useEffect2(() => {
@@ -2006,15 +2024,16 @@ function RunRace({ active, initialState, pendingMode, ownUserName }) {
           new Promise((_, reject) => setTimeout(() => reject(new Error("scan timeout")), 1e4))
         ]);
       } catch {
-        return null;
+        return { stall: "Token scan timed out" };
       }
     };
     runHeartbeatLoop({
       prepareBeat: async () => {
         const reading = await scanWithTimeout();
         tracker.recordReading(reading);
-        if (pendingRef.current) tracker.reprime();
+        if (pendingRef.current && !isStall(reading)) tracker.reprime();
         setStalled(tracker.stalled);
+        setStallReason(tracker.stalled ? tracker.stallReason : null);
         const since = tracker.secondarySinceJoin(baselineRef.current);
         const ps = { claude: 0, codex: 0, gemini: 0 };
         for (const k of MODEL_KEYS) {
@@ -2087,6 +2106,7 @@ function RunRace({ active, initialState, pendingMode, ownUserName }) {
         lastHeartbeatAgoSec,
         lastHeartbeatOk: lastHbOk,
         stalled,
+        stallReason,
         primaryModel: active.primary_model,
         perSource,
         primaryCapped: primaryConversationCap(active.primary_top5 ?? false) !== Infinity
@@ -2134,14 +2154,16 @@ function raceViewFrom(resp) {
   };
 }
 async function buildInitialState(args) {
-  let now = null;
+  let secondary = { claude: 0, codex: 0, gemini: 0 };
+  const primaryConvAcked = {};
   try {
-    now = await readAllSources(args.active, args.active.primary_model);
+    const now = await readAllSources(args.active, args.active.primary_model);
+    if (!isStall(now)) {
+      secondary = now.secondary;
+      for (const [id, v] of now.primaryByConv) primaryConvAcked[id] = v;
+    }
   } catch {
   }
-  const secondary = now?.secondary ?? { claude: 0, codex: 0, gemini: 0 };
-  const primaryConvAcked = {};
-  if (now) for (const [id, v] of now.primaryByConv) primaryConvAcked[id] = v;
   return {
     initialState: {
       acked: { ...secondary },