@tokz/cli 0.2.15 → 0.2.17

package/dist/{Root-ZXWUSTBH.js → Root-K4HFMFGA.js}

@@ -766,9 +766,6 @@ function parseLine(raw) {
     obj: o
   };
 }
-function tokenCountInfo(p) {
-  return p.type === "event_msg" && p.payload?.type === "token_count" ? asDict(p.payload.info) : void 0;
-}
 function headlessUsage(o) {
   const usage = rawUsage(asDict(o.usage)) ?? rawUsage(asDict(asDict(o.data)?.usage)) ?? rawUsage(asDict(asDict(o.result)?.usage)) ?? rawUsage(asDict(asDict(o.response)?.usage));
   if (!usage) return void 0;
@@ -784,6 +781,29 @@ function headlessTimestamp(o, pick) {
   const fromFields = (f) => f ? pick(f.timestamp) ?? pick(f.created_at) ?? pick(f.createdAt) : void 0;
   return fromFields(o) ?? fromFields(asDict(o.data)) ?? fromFields(asDict(o.result)) ?? fromFields(asDict(o.response));
 }
+function detectReplaySecond(content, lines) {
+  const head = content.slice(0, 16384);
+  if (!head.includes("thread_spawn") && !head.includes("forked_from_id")) return void 0;
+  let firstSecond;
+  for (const p of lines) {
+    if (p.type !== "event_msg" || p.payload?.type !== "token_count") continue;
+    const info = p.payload.info;
+    if (!info) continue;
+    if (!asDict(info.last_token_usage) && !asDict(info.total_token_usage)) continue;
+    const ts = p.timestamp;
+    if (!ts || typeof ts !== "string" || ts.length < 19) continue;
+    const sec = ts.slice(0, 19);
+    if (firstSecond === void 0) {
+      firstSecond = sec;
+    } else {
+      if (firstSecond === sec) {
+        return sec;
+      }
+      return void 0;
+    }
+  }
+  return void 0;
+}
 async function parseCodexRollout(file, seen = /* @__PURE__ */ new Set()) {
   const stats = { file, usageByModel: {}, toolCalls: {}, toolCostUsd: {}, dailyUsage: {} };
   const content = await readFile4(file, "utf8").catch(() => "");
@@ -793,6 +813,8 @@ async function parseCodexRollout(file, seen = /* @__PURE__ */ new Set()) {
     const parsed = parseLine(raw);
     if (parsed) lines.push(parsed);
   }
+  const replaySecond = detectReplaySecond(content, lines);
+  let skipReplay = replaySecond !== void 0;
   const modelState = { currentIsFallback: false };
   let prev;
   let turnTools = [];
@@ -812,7 +834,6 @@ async function parseCodexRollout(file, seen = /* @__PURE__ */ new Set()) {
     }
     seen.add(dedupKey);
     const delta = {
-      // Codex's input_tokens INCLUDES cached tokens; split them out.
       inputTokens: Math.max(0, usage.input - cached),
       cacheReadTokens: cached,
       cacheCreationTokens: 0,
@@ -862,21 +883,34 @@ async function parseCodexRollout(file, seen = /* @__PURE__ */ new Set()) {
       }
       continue;
     }
-    const info = tokenCountInfo(parsed);
-    if (info) {
-      const totals = rawUsage(info.total_token_usage);
-      const last = rawUsage(info.last_token_usage);
-      if (!last && !totals) continue;
-      const usage2 = last ?? subtractUsage(totals, prev);
-      if (totals) prev = totals;
-      if (usage2.input === 0 && usage2.cached === 0 && usage2.output === 0 && usage2.reasoning === 0) {
+    if (type === "event_msg" && payload2?.type === "token_count") {
+      const info = asDict(payload2.info);
+      if (replaySecond !== void 0 && skipReplay) {
+        const ts = timestamp ?? parsed.obj.timestamp;
+        const matchesReplay = typeof ts === "string" && ts.length >= 19 && ts.slice(0, 19) === replaySecond;
+        if (matchesReplay) {
+          const totals = rawUsage(info?.total_token_usage);
+          if (totals) prev = totals;
+          turnTools = [];
+          continue;
+        }
+        skipReplay = false;
+      }
+      if (info) {
+        const totals = rawUsage(info.total_token_usage);
+        const last = rawUsage(info.last_token_usage);
+        if (!last && !totals) continue;
+        const usage2 = last ?? subtractUsage(totals, prev);
+        if (totals) prev = totals;
+        if (usage2.input === 0 && usage2.cached === 0 && usage2.output === 0 && usage2.reasoning === 0) {
+          continue;
+        }
+        const ts = nonEmpty(timestamp) ?? normalizeTimestamp(parsed.obj.timestamp);
+        const parsedModel = modelFromParts(payload2) ?? modelFromParts(info);
+        const model2 = resolveModel(parsedModel, ts ?? "", modelState);
+        accumulate(usage2, model2, ts);
         continue;
       }
-      const ts = nonEmpty(timestamp) ?? normalizeTimestamp(parsed.obj.timestamp);
-      const parsedModel = modelFromParts(payload2) ?? modelFromParts(info);
-      const model2 = resolveModel(parsedModel, ts ?? "", modelState);
-      accumulate(usage2, model2, ts);
-      continue;
     }
     if (type === "event_msg" || payload2?.type === "turn_context") continue;
     const usage = headlessUsage(parsed.obj);

package/dist/cli.js

@@ -276,7 +276,7 @@ program.action(async () => {
   const [{ render }, React, { Root }, { Fullscreen }] = await Promise.all([
     import("ink"),
     import("react"),
-    import("./Root-ZXWUSTBH.js"),
+    import("./Root-K4HFMFGA.js"),
     import("./Fullscreen-GK2ZYXHV.js")
   ]);
   render(React.createElement(Fullscreen, null, React.createElement(Root)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokz/cli",
-  "version": "0.2.15",
+  "version": "0.2.17",
   "description": "See where your coding agents' tokens and dollars actually go.",
   "keywords": [
     "claude",