@tokz/cli 0.2.4 → 0.2.6

package/dist/cli.js

@@ -208,9 +208,9 @@ program.command("blocks").description("Claude usage grouped into rolling 5-hour
   }
   console.log(renderBlocksReport(blocks, { tokenLimit }));
 });
-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').action(async (action) => {
+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-A36XPBG6.js");
+  const sl = await import("./statusline-EXFMQYFF.js");
   if (action === "enable" || action === "disable") {
     try {
       console.log(action === "enable" ? await sl.enableStatusline() : await sl.disableStatusline());
@@ -231,7 +231,9 @@ program.command("statusline").description("compact usage line for Claude Code's
     input = JSON.parse(await sl.readStdin());
   } catch {
   }
-  console.log(await sl.statusline(input));
+  const valid = ["auto", "cc", "calc", "both"];
+  const costSource = valid.includes(opts.costSource ?? "auto") ? opts.costSource ?? "auto" : "auto";
+  console.log(await sl.statusline(input, Date.now(), void 0, { costSource }));
 });
 program.action(async () => {
   const globals = applyGlobals();
@@ -249,7 +251,7 @@ program.action(async () => {
   const [{ render }, React, { Root }, { Fullscreen }] = await Promise.all([
     import("ink"),
     import("react"),
-    import("./Root-WEIYEE6M.js"),
+    import("./Root-TUEV5MJB.js"),
     import("./Fullscreen-GK2ZYXHV.js")
   ]);
   render(React.createElement(Fullscreen, null, React.createElement(Root)));

package/dist/{statusline-A36XPBG6.js → statusline-EXFMQYFF.js}

@@ -21,6 +21,8 @@ import { join } from "path";
 import pc from "picocolors";
 var CONTEXT_WINDOW = 2e5;
 var LOOKBACK_MS = 6 * 60 * 60 * 1e3;
+var BURN_MODERATE = 2e3;
+var BURN_HIGH = 5e3;
 async function lastContextTokens(transcriptPath) {
   try {
     const lines = (await readFile(transcriptPath, "utf8")).split("\n");
@@ -39,7 +41,8 @@ async function lastContextTokens(transcriptPath) {
   }
   return void 0;
 }
-async function statusline(input, now = Date.now(), home) {
+async function statusline(input, now = Date.now(), home, opts = {}) {
+  const costSource = opts.costSource ?? "auto";
   const files = await findTranscripts(void 0, home);
   const recent = [];
   await Promise.all(
@@ -57,33 +60,51 @@ async function statusline(input, now = Date.now(), home) {
   const sessions = await Promise.all(recent.map((f) => parseTranscript(f, seen, seenTools, events)));
   const today = dayKey(now);
   let todayCost = 0;
-  let sessionCost = input.cost?.total_cost_usd;
+  let calcSessionCost;
   for (const s of sessions) {
-    for (const [model2, u] of Object.entries(s.dailyUsage[today] ?? {})) todayCost += costUsd(u, model2).total;
-    if (sessionCost === void 0 && input.transcript_path && s.file === input.transcript_path) {
-      sessionCost = Object.entries(s.usageByModel).reduce((sum, [m, u]) => sum + costUsd(u, m).total, 0);
+    for (const [model, u] of Object.entries(s.dailyUsage[today] ?? {})) todayCost += costUsd(u, model).total;
+    if (input.transcript_path && s.file === input.transcript_path) {
+      calcSessionCost = Object.entries(s.usageByModel).reduce((sum, [m, u]) => sum + costUsd(u, m).total, 0);
     }
   }
+  const ccCost = input.cost?.total_cost_usd;
   const blocks = buildBlocks(events, { now });
   const active = blocks.find((b) => b.active);
   const rate = active ? burnRate(active, now) : void 0;
-  const model = input.model?.display_name ?? shortModel(input.model?.id ?? "?");
-  const parts = [`\u{1F916} ${model}`];
-  const costs = [
-    sessionCost !== void 0 ? `${usd(sessionCost)} session` : void 0,
-    `${usd(todayCost)} today`,
-    active ? `${usd(active.costUsd)} block (${fmtMs(active.end - now)} left)` : void 0
-  ].filter(Boolean);
-  parts.push(`\u{1F4B0} ${costs.join(" / ")}`);
-  if (rate) parts.push(`\u{1F525} ${usd(rate.costPerHour)}/hr`);
-  const ctx = input.transcript_path ? await lastContextTokens(input.transcript_path) : void 0;
+  const modelName = input.model?.display_name ?? shortModel(input.model?.id ?? "?");
+  const effort = input.effort?.level;
+  const parts = [`\u{1F916} ${modelName}${effort ? ` (${effort})` : ""}`];
+  parts.push(`\u{1F4B0} ${moneySegment(costSource, ccCost, calcSessionCost, todayCost, active, now)}`);
+  if (rate) {
+    const tpm = rate.tokensPerMinute;
+    const label = `\u{1F525} ${usd(rate.costPerHour)}/hr`;
+    parts.push(tpm > BURN_HIGH ? pc.red(label) : tpm > BURN_MODERATE ? pc.yellow(label) : pc.green(label));
+  }
+  const ctx = await contextTokens(input);
   if (ctx !== void 0) {
-    const p = Math.round(ctx / CONTEXT_WINDOW * 100);
+    const window = input.context_window?.context_window_size ?? CONTEXT_WINDOW;
+    const p = Math.round(ctx / window * 100);
     const colored = p >= 80 ? pc.red(`${p}%`) : p >= 50 ? pc.yellow(`${p}%`) : pc.green(`${p}%`);
     parts.push(`\u{1F9E0} ${compact(ctx)} (${colored})`);
   }
   return parts.join(pc.dim(" | "));
 }
+function moneySegment(source, ccCost, calcCost, todayCost, active, now) {
+  let session;
+  if (source === "both") {
+    session = `(${usd(ccCost ?? 0)} cc / ${usd(calcCost ?? 0)} calc) session`;
+  } else {
+    const pick = source === "cc" ? ccCost : source === "calc" ? calcCost : ccCost ?? calcCost;
+    session = `${usd(pick ?? 0)} session`;
+  }
+  const block = active ? `${usd(active.costUsd)} block (${fmtMs(active.end - now)} left)` : "No active block";
+  return `${session} / ${usd(todayCost)} today / ${block}`;
+}
+async function contextTokens(input) {
+  const cw = input.context_window;
+  if (cw && typeof cw.total_input_tokens === "number") return cw.total_input_tokens;
+  return input.transcript_path ? lastContextTokens(input.transcript_path) : void 0;
+}
 function msSinceMidnight(now) {
   const day = dayKey(now);
   const midnight = Date.parse(`${day}T00:00:00Z`);

package/package.json

@@ -1,13 +1,21 @@
 {
   "name": "@tokz/cli",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Audit where your coding agent's context window and API dollars go.",
   "type": "module",
   "license": "MIT",
-  "engines": { "node": ">=22.0.0" },
-  "bin": { "tokz": "./dist/cli.js" },
-  "files": ["dist"],
-  "publishConfig": { "access": "public" },
+  "engines": {
+    "node": ">=20.9.0"
+  },
+  "bin": {
+    "tokz": "./dist/cli.js"
+  },
+  "files": [
+    "dist"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "build": "tsup",
     "test": "vitest run",
@@ -24,7 +32,7 @@
     "zod": "^3.24.0"
   },
   "devDependencies": {
-    "@types/node": "^22.0.0",
+    "@types/node": "^20.19.43",
     "@types/react": "^18.3.12",
     "ink-testing-library": "^4.0.0",
     "tsup": "^8.3.0",