@tokz/cli 0.2.10 → 0.2.12

package/dist/{Root-ZJO6F6LM.js → Root-FWMJ2TO2.js}

@@ -206,6 +206,11 @@ async function loadProjects(home = homedir(), onProgress) {
 
 // src/agents/usage.ts
 import { readFile as readFile2 } from "fs/promises";
+function recordDedupKey(r) {
+  const scope = r.id ?? r.ts;
+  if (!scope) return void 0;
+  return `${scope}|${r.model}|${r.input}|${r.output}|${r.cacheRead}|${r.cacheWrite}`;
+}
 async function readJson(file) {
   try {
     return JSON.parse(await readFile2(file, "utf8"));
@@ -230,10 +235,17 @@ async function readJsonl(file) {
   }
   return out;
 }
-function sessionFromRecords(file, cwd, records) {
+function sessionFromRecords(file, cwd, records, seen) {
   const stats = { file, cwd, usageByModel: {}, toolCalls: {}, toolCostUsd: {}, dailyUsage: {} };
   for (const r of records) {
     if (r.input + r.output + r.cacheRead + r.cacheWrite === 0) continue;
+    if (seen) {
+      const key = recordDedupKey(r);
+      if (key !== void 0) {
+        if (seen.has(key)) continue;
+        seen.add(key);
+      }
+    }
     if (r.ts) {
       if (!stats.firstTs || r.ts < stats.firstTs) stats.firstTs = r.ts;
       if (!stats.lastTs || r.ts > stats.lastTs) stats.lastTs = r.ts;
@@ -558,7 +570,7 @@ function isAssistant(msg) {
   const role = str(msg, "variant") ?? str(msg, "role");
   return role === "ai" || role === "agent" || role === "assistant";
 }
-async function parseFile(file) {
+async function parseFile(file, seen) {
   const arr = await readJson(file);
   if (!Array.isArray(arr)) return sessionFromRecords(file, void 0, []);
   let fileTs;
@@ -575,6 +587,7 @@ async function parseFile(file) {
     records.push({
       model: str(meta, "model") ?? "codebuff-unknown",
       ts: str(msg, "timestamp") ?? fileTs,
+      id: str(msg, "id") ?? str(msg, "messageId") ?? str(msg, "message_id"),
       input: pickNum(usage, ["inputTokens", "input_tokens"]),
       output: pickNum(usage, ["outputTokens", "output_tokens"]),
       cacheRead: pickNum(usage, ["cacheReadInputTokens", "cache_read_input_tokens", "cachedTokens"]),
@@ -591,10 +604,11 @@ async function loadCodebuffProjects(home, onProgress) {
     );
   }
   const sessions = [];
+  const seen = /* @__PURE__ */ new Set();
   let parsed = 0;
   for (const f of files) {
     onProgress?.({ parsed, total: files.length, currentProject: "Codebuff chats" });
-    sessions.push(await parseFile(f));
+    sessions.push(await parseFile(f, seen));
     parsed += 1;
     onProgress?.({ parsed, total: files.length, currentProject: "Codebuff chats" });
   }
@@ -618,9 +632,7 @@ var codebuffAdapter = {
 };
 
 // src/agents/codex.ts
-import { createReadStream } from "fs";
-import { access as access5 } from "fs/promises";
-import { createInterface } from "readline";
+import { access as access5, readFile as readFile4 } from "fs/promises";
 import { homedir as homedir6 } from "os";
 import { join as join6 } from "path";
 import { glob as glob4 } from "tinyglobby";
@@ -642,7 +654,12 @@ var Line = z.object({
     cwd: z.string().optional(),
     model: z.string().optional(),
     name: z.string().optional(),
-    info: z.object({ total_token_usage: TokenTotals.optional() }).nullish()
+    info: z.object({
+      total_token_usage: TokenTotals.optional(),
+      // Codex writes the per-turn amount here directly; prefer it over
+      // differencing cumulative totals.
+      last_token_usage: TokenTotals.optional()
+    }).nullish()
   }).passthrough().optional()
 });
 function codexHome(home) {
@@ -650,13 +667,27 @@ function codexHome(home) {
   return process.env.CODEX_HOME ?? join6(homedir6(), ".codex");
 }
 var DEFAULT_MODEL = "gpt-5";
-async function parseCodexRollout(file) {
+function tsSecond(ts) {
+  return (ts ?? "").slice(0, 19);
+}
+function replayBurstSecond(content, lines) {
+  const head = content.slice(0, 16384);
+  if (!head.includes("thread_spawn") && !head.includes("forked_from_id")) return void 0;
+  let first;
+  for (const p of lines) {
+    const info = p.payload?.type === "token_count" ? p.payload.info : void 0;
+    if (!info?.last_token_usage && !info?.total_token_usage) continue;
+    const sec = tsSecond(p.timestamp);
+    if (first === void 0) first = sec;
+    else return first === sec ? first : void 0;
+  }
+  return void 0;
+}
+async function parseCodexRollout(file, seen = /* @__PURE__ */ new Set()) {
   const stats = { file, usageByModel: {}, toolCalls: {}, toolCostUsd: {}, dailyUsage: {} };
-  const rl = createInterface({ input: createReadStream(file, "utf8"), crlfDelay: Infinity });
-  let model = DEFAULT_MODEL;
-  let prev = { input: 0, cached: 0, output: 0, total: 0 };
-  let turnTools = [];
-  for await (const raw of rl) {
+  const content = await readFile4(file, "utf8").catch(() => "");
+  const lines = [];
+  for (const raw of content.split("\n")) {
     if (!raw.trim()) continue;
     let obj;
     try {
@@ -665,33 +696,79 @@ async function parseCodexRollout(file) {
       continue;
     }
     const parsed = Line.safeParse(obj);
-    if (!parsed.success) continue;
-    const { timestamp, type, payload: payload2 } = parsed.data;
-    if (!stats.cwd) stats.cwd = payload2?.cwd ?? parsed.data.cwd;
+    if (parsed.success) lines.push(parsed.data);
+  }
+  const burstSecond = replayBurstSecond(content, lines);
+  let skippingReplay = burstSecond !== void 0;
+  let model = DEFAULT_MODEL;
+  let prev = { input: 0, cached: 0, output: 0, total: 0 };
+  let turnTools = [];
+  for (const parsed of lines) {
+    const { timestamp, type, payload: payload2 } = parsed;
+    if (!stats.cwd) stats.cwd = payload2?.cwd ?? parsed.cwd;
     if (payload2?.model) model = payload2.model;
     if (timestamp) {
       if (!stats.firstTs) stats.firstTs = timestamp;
       stats.lastTs = timestamp;
     }
-    const toolName = payload2?.type === "function_call" || payload2?.type === "custom_tool_call" ? payload2.name : payload2?.type === "local_shell_call" ? "shell" : type === "function_call" ? parsed.data.name : void 0;
+    const toolName = payload2?.type === "function_call" || payload2?.type === "custom_tool_call" ? payload2.name : payload2?.type === "local_shell_call" ? "shell" : type === "function_call" ? parsed.name : void 0;
     if (toolName) {
       stats.toolCalls[toolName] = (stats.toolCalls[toolName] ?? 0) + 1;
       turnTools.push(toolName);
     }
-    const totals = payload2?.type === "token_count" ? payload2.info?.total_token_usage : void 0;
-    if (!totals) continue;
-    const cur = {
-      input: totals.input_tokens,
-      cached: totals.cached_input_tokens,
-      output: totals.output_tokens,
-      total: totals.total_tokens
-    };
-    if (cur.total < prev.total) prev = { input: 0, cached: 0, output: 0, total: 0 };
-    const dInput = Math.max(0, cur.input - prev.input);
-    const dCached = Math.max(0, cur.cached - prev.cached);
-    const dOutput = Math.max(0, cur.output - prev.output);
-    prev = cur;
+    const info = payload2?.type === "token_count" ? payload2.info : void 0;
+    const last = info?.last_token_usage;
+    const totals = info?.total_token_usage;
+    if (!last && !totals) continue;
+    if (skippingReplay && tsSecond(timestamp) === burstSecond) {
+      if (totals) {
+        prev = {
+          input: totals.input_tokens,
+          cached: totals.cached_input_tokens,
+          output: totals.output_tokens,
+          total: totals.total_tokens
+        };
+      }
+      turnTools = [];
+      continue;
+    }
+    skippingReplay = false;
+    const idTotals = last ?? totals;
+    const dedupKey = `${timestamp ?? ""}|${model}|${idTotals.input_tokens}|${idTotals.cached_input_tokens}|${idTotals.output_tokens}|${idTotals.reasoning_output_tokens}|${idTotals.total_tokens}`;
+    let dInput;
+    let dCached;
+    let dOutput;
+    if (last) {
+      dInput = last.input_tokens;
+      dCached = last.cached_input_tokens;
+      dOutput = last.output_tokens;
+      if (totals) {
+        prev = {
+          input: totals.input_tokens,
+          cached: totals.cached_input_tokens,
+          output: totals.output_tokens,
+          total: totals.total_tokens
+        };
+      }
+    } else {
+      const cur = {
+        input: totals.input_tokens,
+        cached: totals.cached_input_tokens,
+        output: totals.output_tokens,
+        total: totals.total_tokens
+      };
+      if (cur.total < prev.total) prev = { input: 0, cached: 0, output: 0, total: 0 };
+      dInput = Math.max(0, cur.input - prev.input);
+      dCached = Math.max(0, cur.cached - prev.cached);
+      dOutput = Math.max(0, cur.output - prev.output);
+      prev = cur;
+    }
     if (dInput + dOutput === 0) continue;
+    if (seen.has(dedupKey)) {
+      turnTools = [];
+      continue;
+    }
+    seen.add(dedupKey);
     const delta = {
       // Codex's input_tokens INCLUDES cached tokens; split them out.
       inputTokens: Math.max(0, dInput - dCached),
@@ -730,10 +807,11 @@ async function loadCodexProjects(home, onProgress) {
   }).catch(() => []);
   if (files.length === 0) return [];
   const sessions = [];
+  const seen = /* @__PURE__ */ new Set();
   let parsed = 0;
   for (const f of files) {
     onProgress?.({ parsed, total: files.length, currentProject: "Codex sessions" });
-    sessions.push(await parseCodexRollout(f));
+    sessions.push(await parseCodexRollout(f, seen));
     parsed += 1;
     onProgress?.({ parsed, total: files.length, currentProject: "Codex sessions" });
   }
@@ -791,9 +869,8 @@ function attrStr(attrs, keys) {
   }
   return void 0;
 }
-function parseOtelFile(records) {
+function parseOtelFile(records, seen = /* @__PURE__ */ new Set()) {
   const bySession = /* @__PURE__ */ new Map();
-  const seen = /* @__PURE__ */ new Set();
   for (const rec of records) {
     const attrs = rec.attributes;
     if (!attrs || typeof attrs !== "object") continue;
@@ -824,10 +901,11 @@ function parseOtelFile(records) {
 async function loadCopilotProjects(home, onProgress) {
   const files = await glob5(["**/*.jsonl"], { cwd: copilotDir(home), absolute: true }).catch(() => []);
   const bySession = /* @__PURE__ */ new Map();
+  const seen = /* @__PURE__ */ new Set();
   let parsed = 0;
   for (const f of files) {
     onProgress?.({ parsed, total: files.length, currentProject: "Copilot otel" });
-    for (const [session, records] of parseOtelFile(await readJsonl(f))) {
+    for (const [session, records] of parseOtelFile(await readJsonl(f), seen)) {
       const list = bySession.get(session) ?? [];
       list.push(...records);
       bySession.set(session, list);
@@ -928,13 +1006,14 @@ function recordFrom(node, model, ts) {
   return {
     model: str(node, "model") ?? model ?? "gemini-unknown",
     ts: str(node, "timestamp") ?? ts,
+    id: str(node, "id") ?? str(node, "messageId") ?? str(node, "message_id") ?? str(node, "responseId"),
     input: pickNum(tokens, IN),
     output: pickNum(tokens, OUT) + reasoning,
     cacheRead: pickNum(tokens, ["cached", "cached_tokens"]),
     cacheWrite: 0
   };
 }
-async function parseFile3(file) {
+async function parseFile3(file, seen) {
   const records = [];
   const push = (r) => r && records.push(r);
   if (file.endsWith(".jsonl")) {
@@ -946,17 +1025,18 @@ async function parseFile3(file) {
     if (Array.isArray(messages)) for (const m of messages) push(recordFrom(m, model, void 0));
     push(recordFrom(doc, model, void 0));
   }
-  return sessionFromRecords(file, void 0, records);
+  return sessionFromRecords(file, void 0, records, seen);
 }
 async function loadGeminiProjects(home, onProgress) {
   const files = await glob7(["**/*.json", "**/*.jsonl"], { cwd: geminiRoot(home), absolute: true }).catch(
     () => []
   );
   const sessions = [];
+  const seen = /* @__PURE__ */ new Set();
   let parsed = 0;
   for (const f of files) {
     onProgress?.({ parsed, total: files.length, currentProject: "Gemini logs" });
-    sessions.push(await parseFile3(f));
+    sessions.push(await parseFile3(f, seen));
     parsed += 1;
     onProgress?.({ parsed, total: files.length, currentProject: "Gemini logs" });
   }
@@ -983,7 +1063,7 @@ import { homedir as homedir10 } from "os";
 import { join as join10 } from "path";
 
 // src/sqlite.ts
-import { readFile as readFile4 } from "fs/promises";
+import { readFile as readFile5 } from "fs/promises";
 function u8(b, o) {
   return b[o];
 }
@@ -1123,7 +1203,7 @@ function columnNames(sql) {
 async function readTable(file, table) {
   let buf;
   try {
-    buf = await readFile4(file);
+    buf = await readFile5(file);
   } catch {
     return [];
   }
@@ -1325,21 +1405,23 @@ function kimiRoots(home) {
   const h = home ?? homedir13();
   return KIMI_DIRS.map((d) => join13(h, d));
 }
-async function parseFile4(file) {
+async function parseFile4(file, seen) {
   const records = [];
   for (const line of await readJsonl(file)) {
     const usage = deepFind(line, USAGE_KEYS);
     if (!usage) continue;
+    const idHost = deepFind(line, ["messageId", "message_id", "id"]);
     records.push({
       model: str(line, "model") ?? "kimi-unknown",
       ts: str(line, "timestamp"),
+      id: idHost && (str(idHost, "messageId") ?? str(idHost, "message_id") ?? str(idHost, "id")),
       input: pickNum(usage, ["inputOther", "input_other"]),
       output: pickNum(usage, ["output"]),
       cacheRead: pickNum(usage, ["inputCacheRead", "input_cache_read"]),
       cacheWrite: pickNum(usage, ["inputCacheCreation", "input_cache_creation"])
     });
   }
-  return sessionFromRecords(file, void 0, records);
+  return sessionFromRecords(file, void 0, records, seen);
 }
 async function loadKimiProjects(home, onProgress) {
   const files = [];
@@ -1349,10 +1431,11 @@ async function loadKimiProjects(home, onProgress) {
     );
   }
   const sessions = [];
+  const seen = /* @__PURE__ */ new Set();
   let parsed = 0;
   for (const f of files) {
     onProgress?.({ parsed, total: files.length, currentProject: "Kimi sessions" });
-    sessions.push(await parseFile4(f));
+    sessions.push(await parseFile4(f, seen));
     parsed += 1;
     onProgress?.({ parsed, total: files.length, currentProject: "Kimi sessions" });
   }
@@ -1390,7 +1473,7 @@ function openclawRoots(home) {
 function modelFrom(obj) {
   return str(obj, "modelId") ?? str(obj, "model");
 }
-async function parseFile5(file) {
+async function parseFile5(file, seen) {
   const records = [];
   let currentModel;
   for (const line of await readJsonl(file)) {
@@ -1405,13 +1488,14 @@ async function parseFile5(file) {
     records.push({
       model,
       ts: str(l.message, "timestamp") ?? str(l, "timestamp"),
+      id: str(l.message, "id") ?? str(l, "id") ?? str(l.message, "messageId"),
       input: pickNum(usage, ["input"]),
       output: pickNum(usage, ["output"]),
       cacheRead: pickNum(usage, ["cacheRead"]),
       cacheWrite: pickNum(usage, ["cacheWrite"])
     });
   }
-  return sessionFromRecords(file, void 0, records);
+  return sessionFromRecords(file, void 0, records, seen);
 }
 async function loadOpenclawProjects(home, onProgress) {
   const files = [];
@@ -1419,10 +1503,11 @@ async function loadOpenclawProjects(home, onProgress) {
     files.push(...await glob9(["**/*.jsonl", "**/*.jsonl.*"], { cwd: root, absolute: true }).catch(() => []));
   }
   const sessions = [];
+  const seen = /* @__PURE__ */ new Set();
   let parsed = 0;
   for (const f of files) {
     onProgress?.({ parsed, total: files.length, currentProject: "OpenClaw sessions" });
-    sessions.push(await parseFile5(f));
+    sessions.push(await parseFile5(f, seen));
     parsed += 1;
     onProgress?.({ parsed, total: files.length, currentProject: "OpenClaw sessions" });
   }
@@ -1446,7 +1531,7 @@ var openclawAdapter = {
 };
 
 // src/agents/opencode.ts
-import { access as access14, readFile as readFile5 } from "fs/promises";
+import { access as access14, readFile as readFile6 } from "fs/promises";
 import { homedir as homedir15 } from "os";
 import { join as join15 } from "path";
 import { glob as glob10 } from "tinyglobby";
@@ -1477,7 +1562,7 @@ function opencodeRoot(home) {
 }
 async function readJson2(file) {
   try {
-    return JSON.parse(await readFile5(file, "utf8"));
+    return JSON.parse(await readFile6(file, "utf8"));
   } catch {
     return void 0;
   }
@@ -1566,7 +1651,7 @@ import { glob as glob11 } from "tinyglobby";
 function piRoot(home) {
   return process.env.PI_AGENT_DIR ?? join16(home ?? homedir16(), ".pi", "agent", "sessions");
 }
-async function parseFile6(file) {
+async function parseFile6(file, seen) {
   const records = [];
   for (const line of await readJsonl(file)) {
     const msg = line.message;
@@ -1575,21 +1660,23 @@ async function parseFile6(file) {
     records.push({
       model: str(msg, "model") ?? "pi-unknown",
       ts: str(line, "timestamp"),
+      id: str(msg, "id") ?? str(line, "id") ?? str(msg, "messageId"),
       input: pickNum(usage, ["input"]),
       output: pickNum(usage, ["output"]),
       cacheRead: pickNum(usage, ["cacheRead"]),
       cacheWrite: pickNum(usage, ["cacheWrite"])
     });
   }
-  return sessionFromRecords(file, void 0, records);
+  return sessionFromRecords(file, void 0, records, seen);
 }
 async function loadPiProjects(home, onProgress) {
   const files = await glob11(["**/*.jsonl"], { cwd: piRoot(home), absolute: true }).catch(() => []);
   const sessions = [];
+  const seen = /* @__PURE__ */ new Set();
   let parsed = 0;
   for (const f of files) {
     onProgress?.({ parsed, total: files.length, currentProject: "pi sessions" });
-    sessions.push(await parseFile6(f));
+    sessions.push(await parseFile6(f, seen));
     parsed += 1;
     onProgress?.({ parsed, total: files.length, currentProject: "pi sessions" });
   }
@@ -1618,7 +1705,7 @@ import { glob as glob12 } from "tinyglobby";
 function qwenRoot(home) {
   return process.env.QWEN_DATA_DIR ?? join17(home ?? homedir17(), ".qwen");
 }
-async function parseFile7(file) {
+async function parseFile7(file, seen) {
   const records = [];
   for (const line of await readJsonl(file)) {
     const meta = line.usageMetadata;
@@ -1629,23 +1716,25 @@ async function parseFile7(file) {
     records.push({
       model: str(line, "model") ?? "qwen-unknown",
       ts: str(line, "timestamp"),
+      id: str(line, "id") ?? str(line, "messageId") ?? str(line, "message_id"),
       input: Math.max(0, prompt - cached),
       output: pickNum(meta, ["candidatesTokenCount"]) + reasoning,
       cacheRead: cached,
       cacheWrite: 0
     });
   }
-  return sessionFromRecords(file, void 0, records);
+  return sessionFromRecords(file, void 0, records, seen);
 }
 async function loadQwenProjects(home, onProgress) {
   const files = await glob12(["projects/**/*.jsonl"], { cwd: qwenRoot(home), absolute: true }).catch(
     () => []
   );
   const sessions = [];
+  const seen = /* @__PURE__ */ new Set();
   let parsed = 0;
   for (const f of files) {
     onProgress?.({ parsed, total: files.length, currentProject: "Qwen sessions" });
-    sessions.push(await parseFile7(f));
+    sessions.push(await parseFile7(f, seen));
     parsed += 1;
     onProgress?.({ parsed, total: files.length, currentProject: "Qwen sessions" });
   }

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-ZJO6F6LM.js"),
+    import("./Root-FWMJ2TO2.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.10",
+  "version": "0.2.12",
   "description": "See where your coding agents' tokens and dollars actually go.",
   "keywords": [
     "claude",