@tokz/cli 0.2.16 → 0.2.18

package/dist/{Root-NB26ZIPU.js → Root-IVPGDV7M.js}

@@ -20,7 +20,7 @@ import {
   sanitizeProjectPath,
   shortModel,
   usd
-} from "./chunk-KO5GQL76.js";
+} from "./chunk-T5J7LVH6.js";
 
 // src/ui/Root.tsx
 import { useEffect as useEffect2, useState as useState6 } from "react";
@@ -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,43 @@ 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 encoder = new TextEncoder();
+  let byteLen = 0;
+  let charLimit = 0;
+  for (let i = 0; i < content.length; i++) {
+    const code = content.charCodeAt(i);
+    if (code <= 127) byteLen += 1;
+    else if (code <= 2047) byteLen += 2;
+    else if (code >= 55296 && code <= 57343) {
+      byteLen += 4;
+      i++;
+    } else byteLen += 3;
+    if (byteLen > 16384) break;
+    charLimit = i + 1;
+  }
+  const head = content.slice(0, charLimit);
+  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 +827,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,12 +848,14 @@ 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,
       outputTokens: usage.output,
-      turns: 1
+      turns: 1,
+      longContextInputTokens: usage.input > 272e3 ? Math.max(0, usage.input - cached) : 0,
+      longContextCacheReadTokens: usage.input > 272e3 ? cached : 0,
+      longContextOutputTokens: usage.input > 272e3 ? usage.output : 0
     };
     const accs = [stats.usageByModel[model] ??= emptyUsage()];
     if (timestamp) {
@@ -829,6 +867,9 @@ async function parseCodexRollout(file, seen = /* @__PURE__ */ new Set()) {
       u.cacheReadTokens += delta.cacheReadTokens;
       u.outputTokens += delta.outputTokens;
       u.turns += 1;
+      u.longContextInputTokens = (u.longContextInputTokens ?? 0) + (delta.longContextInputTokens ?? 0);
+      u.longContextCacheReadTokens = (u.longContextCacheReadTokens ?? 0) + (delta.longContextCacheReadTokens ?? 0);
+      u.longContextOutputTokens = (u.longContextOutputTokens ?? 0) + (delta.longContextOutputTokens ?? 0);
     }
     const turnCost = costUsd(delta, model).total;
     if (turnCost > 0 && turnTools.length > 0) {
@@ -862,33 +903,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;
-      let usage2;
-      if (totals) {
-        if (prev && totals.total === prev.total && totals.input === prev.input && totals.output === prev.output && totals.cached === prev.cached) {
+    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;
         }
-        if (prev && totals.total < prev.total) {
-          usage2 = last ?? totals;
-        } else {
-          usage2 = subtractUsage(totals, prev);
-        }
-        prev = totals;
-      } else {
-        usage2 = last;
+        skipReplay = false;
       }
-      if (usage2.input === 0 && usage2.cached === 0 && usage2.output === 0 && usage2.reasoning === 0) {
+      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/{chunk-KO5GQL76.js → chunk-T5J7LVH6.js}

@@ -68,13 +68,25 @@ function costUsd(usage, modelId) {
   const p = resolvePrice(modelId);
   const readMult = p.cacheReadMult ?? DEFAULT_CACHE_READ_MULT;
   const writeMult = p.cacheWriteMult ?? DEFAULT_CACHE_WRITE_MULT;
-  const input = usage.inputTokens / 1e6 * p.inputPerMTok;
-  const cacheRead = usage.cacheReadTokens / 1e6 * p.inputPerMTok * readMult;
+  const regInputTokens = usage.inputTokens - (usage.longContextInputTokens ?? 0);
+  const regCacheReadTokens = usage.cacheReadTokens - (usage.longContextCacheReadTokens ?? 0);
+  const regOutputTokens = usage.outputTokens - (usage.longContextOutputTokens ?? 0);
+  let input = regInputTokens / 1e6 * p.inputPerMTok;
+  let cacheRead = regCacheReadTokens / 1e6 * p.inputPerMTok * readMult;
+  let output = regOutputTokens / 1e6 * p.outputPerMTok;
+  if (usage.longContextInputTokens) {
+    input += usage.longContextInputTokens / 1e6 * (p.inputPerMTok * 2);
+  }
+  if (usage.longContextCacheReadTokens) {
+    cacheRead += usage.longContextCacheReadTokens / 1e6 * (p.inputPerMTok * 2) * readMult;
+  }
+  if (usage.longContextOutputTokens) {
+    output += usage.longContextOutputTokens / 1e6 * (p.outputPerMTok * 2);
+  }
   const write1h = Math.min(usage.cacheCreation1hTokens ?? 0, usage.cacheCreationTokens);
   const write5m = usage.cacheCreationTokens - write1h;
   const write1hMult = p.cacheWrite1hMult ?? (p.cacheWriteMult === 0 ? 0 : CACHE_WRITE_1H_MULT);
   const cacheWrite = write5m / 1e6 * p.inputPerMTok * writeMult + write1h / 1e6 * p.inputPerMTok * write1hMult;
-  const output = usage.outputTokens / 1e6 * p.outputPerMTok;
   return { input, cacheRead, cacheWrite, output, total: input + cacheRead + cacheWrite + output };
 }
 

package/dist/{chunk-VJFLJJGX.js → chunk-VXWHRHQU.js}

@@ -6,7 +6,7 @@ import {
   emptyUsage,
   shortModel,
   usd
-} from "./chunk-KO5GQL76.js";
+} from "./chunk-T5J7LVH6.js";
 
 // src/blocks.ts
 var BLOCK_LENGTH_MS = 5 * 60 * 60 * 1e3;

package/dist/cli.js

@@ -2,7 +2,7 @@
 import {
   buildBlocks,
   renderBlocksReport
-} from "./chunk-VJFLJJGX.js";
+} from "./chunk-VXWHRHQU.js";
 import {
   findMcpServers
 } from "./chunk-65BQE6TI.js";
@@ -17,7 +17,7 @@ import {
   setTimezone,
   tok,
   usd
-} from "./chunk-KO5GQL76.js";
+} from "./chunk-T5J7LVH6.js";
 
 // src/cli.ts
 import { createRequire } from "module";
@@ -234,7 +234,7 @@ program.command("blocks").description("Claude usage grouped into rolling 5-hour
 });
 program.command("statusline").description("compact usage line for Claude Code's statusLine hook (reads hook JSON on stdin)").argument("[action]", '"enable" writes the hook into ~/.claude/settings.json, "disable" removes it').option("--cost-source <mode>", "session cost source: auto | cc | calc | both", "auto").action(async (action, opts) => {
   const globals = applyGlobals();
-  const sl = await import("./statusline-5SJKELOG.js");
+  const sl = await import("./statusline-4UN2Q6BT.js");
   if (action === "enable" || action === "disable") {
     try {
       console.log(action === "enable" ? await sl.enableStatusline() : await sl.disableStatusline());
@@ -276,7 +276,7 @@ program.action(async () => {
   const [{ render }, React, { Root }, { Fullscreen }] = await Promise.all([
     import("ink"),
     import("react"),
-    import("./Root-NB26ZIPU.js"),
+    import("./Root-IVPGDV7M.js"),
     import("./Fullscreen-GK2ZYXHV.js")
   ]);
   render(React.createElement(Fullscreen, null, React.createElement(Root)));

package/dist/{statusline-5SJKELOG.js → statusline-4UN2Q6BT.js}

@@ -3,7 +3,7 @@ import {
   buildBlocks,
   burnRate,
   fmtMs
-} from "./chunk-VJFLJJGX.js";
+} from "./chunk-VXWHRHQU.js";
 import {
   compact,
   costUsd,
@@ -12,7 +12,7 @@ import {
   parseTranscript,
   shortModel,
   usd
-} from "./chunk-KO5GQL76.js";
+} from "./chunk-T5J7LVH6.js";
 
 // src/statusline.ts
 import { mkdir, readFile, stat, writeFile } from "fs/promises";

package/package.json

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