whoburnedmore 0.9.25 → 0.9.26

package/dist/index.js

@@ -33,6 +33,54 @@ function applyScope(payload, flags) {
     payload.orgCode = flags.orgCode;
   return payload;
 }
+var VALUE_FLAGS = /* @__PURE__ */ new Set(["--board", "--org", "--token", "--pass", "--code"]);
+var KNOWN_FLAGS = /* @__PURE__ */ new Set([
+  ...VALUE_FLAGS,
+  "--dry-run",
+  "--no-submit",
+  "--local",
+  "--watch",
+  "--help",
+  "-h",
+  "--version",
+  "-v"
+]);
+var NO_UPLOAD_FLAGS = ["--dry-run", "--no-submit", "--local"];
+function argumentProblem(args, command) {
+  if (command === "help" || command === "version") return null;
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (!a.startsWith("-")) continue;
+    const name = a.includes("=") ? a.slice(0, a.indexOf("=")) : a;
+    if (!KNOWN_FLAGS.has(name)) return `Unknown option ${name}.`;
+    if (!VALUE_FLAGS.has(name) && a.includes("=")) {
+      return `${name} doesn't take a value; use ${name} on its own.`;
+    }
+    if (VALUE_FLAGS.has(name)) {
+      if (parseValueFlag([a, args[i + 1] ?? ""], name) === void 0) {
+        const example = { "--board": "CODE", "--org": "SLUG", "--token": "TOKEN" }[name] ?? "PASSWORD";
+        return `${name} needs a value, for example ${name}=${example}.`;
+      }
+      if (!a.includes("=")) i++;
+    }
+  }
+  const noUpload = NO_UPLOAD_FLAGS.filter((f) => args.includes(f));
+  if (args.includes("--watch")) {
+    if (command !== "run" && command !== "sync" && command !== "daemon") {
+      return `--watch only works with sync (it keeps uploading every 15 minutes).`;
+    }
+    if (noUpload.length > 0) {
+      return `--watch keeps uploading every 15 minutes, so it can't be combined with ${noUpload.join(", ")}.`;
+    }
+  }
+  if ((command === "sync" || command === "daemon") && noUpload.length > 0) {
+    return `${command} always uploads, so it can't be combined with ${noUpload.join(", ")}. To preview without sending, run \`npx whoburnedmore --dry-run\`.`;
+  }
+  if (command !== "run" && noUpload.length > 0) {
+    return `${noUpload.join(", ")} only works with the default command, not \`${command}\`.`;
+  }
+  return null;
+}
 function parseValueFlag(args, name) {
   const prefix = `${name}=`;
   const eq = args.find((a) => a.startsWith(prefix));
@@ -44,14 +92,13 @@ function parseValueFlag(args, name) {
   return void 0;
 }
 function resolveCommand(args) {
-  const valueFlags = /* @__PURE__ */ new Set(["--board", "--org", "--token", "--pass", "--code"]);
   const flags = [];
   const words = [];
   for (let i = 0; i < args.length; i++) {
     const a = args[i];
     if (a.startsWith("-")) {
       flags.push(a);
-      if (valueFlags.has(a)) i++;
+      if (VALUE_FLAGS.has(a) && args[i + 1] !== void 0 && !args[i + 1].startsWith("-")) i++;
       continue;
     }
     words.push(a);
@@ -64,6 +111,10 @@ function resolveCommand(args) {
   }
   return words[0] ?? "run";
 }
+function confirmAnswer(answer, defaultYes) {
+  const a = answer.trim();
+  return a === "" ? defaultYes : /^y(es)?$/i.test(a);
+}
 
 // src/http-bounds.ts
 async function readResponseBytesCapped(response, maxBytes) {
@@ -716,8 +767,13 @@ var FORWARDED_ENV_VARS = [
   // dashboard URL shown to the user
   "XDG_CONFIG_HOME",
   // base for the default config dir
-  "CLAUDE_CONFIG_DIR"
+  "CLAUDE_CONFIG_DIR",
   // a primary usage-collection source
+  // Usage is bucketed by local calendar day and the native parse caches record
+  // the zone: a shell TZ that differs from the system zone must reach the
+  // background job too, or the two runs bucket differently and keep
+  // invalidating each other's caches.
+  "TZ"
 ];
 function syncEnv(opts) {
   const env = opts?.env ?? process.env;
@@ -6549,6 +6605,7 @@ function normalizeModelKey(model) {
     /^(?:us|eu|au|jp|apac|global|anthropic|amazon|meta|openai|google|vertex|azure|mistral)\./.test(prefix) ? "" : prefix
   ));
   k = k.replace(/:\d+$/, "").replace(/:latest$/, "");
+  k = k.replace(/\[[^\]]*\]$/, "");
   return k;
 }
 function lookup(key) {
@@ -6564,7 +6621,7 @@ function resolveModelPrice(model) {
   resolveCache.set(model, resolved);
   return resolved;
 }
-function resolveModelPriceUncached(model) {
+function exactCandidates(model) {
   const norm2 = normalizeModelKey(model);
   const candidates = [norm2];
   const dateless = norm2.replace(/[-@]20\d{6}$/, "").replace(/-20\d{2}-\d{2}-\d{2}$/, "");
@@ -6572,12 +6629,19 @@ function resolveModelPriceUncached(model) {
     candidates.push(dateless);
   if (norm2.endsWith("-latest"))
     candidates.push(norm2.slice(0, -"-latest".length));
-  let row;
-  for (const c of candidates) {
-    row = lookup(c);
+  return { candidates, dateless };
+}
+function lookupExact(model) {
+  for (const c of exactCandidates(model).candidates) {
+    const row = lookup(c);
     if (row)
-      break;
+      return row;
   }
+  return void 0;
+}
+function resolveModelPriceUncached(model) {
+  const { dateless } = exactCandidates(model);
+  let row = lookupExact(model);
   if (!row) {
     let base = dateless;
     for (let i = 0; i < 3 && !row; i++) {
@@ -7225,6 +7289,7 @@ function parseClaudeLine(raw) {
   } catch {
     return null;
   }
+  if (!obj || typeof obj !== "object") return null;
   const message = obj.message;
   if (!message || typeof message !== "object") return null;
   const usage = message.usage;
@@ -7506,6 +7571,7 @@ function inspectCodexRollout(lines) {
     } catch {
       continue;
     }
+    if (!obj || typeof obj !== "object") continue;
     const payload = obj.payload;
     if (!payload || typeof payload !== "object") continue;
     const kind = obj.type;
@@ -8453,6 +8519,7 @@ function mapCursorEvents(events) {
 }
 async function fetchCursorEvents(cookie, maxPages = 30, pageSize = 500) {
   const all = [];
+  let reachedEnd = false;
   for (let page = 1; page <= maxPages; page++) {
     const res = await fetch(EVENTS_URL, {
       method: "POST",
@@ -8474,9 +8541,18 @@ async function fetchCursorEvents(cookie, maxPages = 30, pageSize = 500) {
     );
     const batch = body.usageEventsDisplay ?? [];
     all.push(...batch);
-    if (batch.length < pageSize) break;
+    if (batch.length < pageSize) {
+      reachedEnd = true;
+      break;
+    }
   }
-  return all;
+  return reachedEnd ? all : dropBoundaryDay(all);
+}
+function dropBoundaryDay(events) {
+  const dayOf = (e) => localUsageDate(Number(e.timestamp));
+  const boundary = events.length > 0 ? dayOf(events[events.length - 1]) : null;
+  if (!boundary) return events;
+  return events.filter((e) => dayOf(e) !== boundary);
 }
 async function collectCursor(opts) {
   try {
@@ -9013,6 +9089,14 @@ function normCost(n) {
   return Number.isFinite(v) && v > 0 ? v : 0;
 }
 var PRICE_TABLE_COST_SOURCES = /* @__PURE__ */ new Set(["claude", "codex"]);
+function repriceCcusageCost(tool, model, tokens, ccusageCostUSD) {
+  if (ccusageCostUSD > 0) return ccusageCostUSD;
+  const known = model.length > 0 && model !== "unknown";
+  if (known && PRICE_TABLE_COST_SOURCES.has(tool) && resolveModelPrice(model)) {
+    return estimateCostUSD(model, tokens);
+  }
+  return 0;
+}
 function mapCcusageDaily(tool, json, now = Date.now()) {
   const daily = json?.daily;
   if (!Array.isArray(daily)) return [];
@@ -9070,43 +9154,13 @@ function mapCcusageDaily(tool, json, now = Date.now()) {
     }
     for (const c of candidates) {
       const tokens = c.inputTokens + c.outputTokens + c.cacheCreationTokens + c.cacheReadTokens;
-      if (tokens === 0 && c.costUSD === 0) continue;
-      const costUSD2 = c.costUSD === 0 && PRICE_TABLE_COST_SOURCES.has(tool) ? estimateCostUSD(c.model, c) : c.costUSD;
+      const costUSD2 = repriceCcusageCost(tool, c.model, c, c.costUSD);
+      if (tokens === 0 && costUSD2 === 0) continue;
       entries.push({ date, tool, ...c, costUSD: costUSD2, origin: "cli", verified: false });
     }
   }
   return entries;
 }
-function mapCcusageSessions(json) {
-  const sessions = json?.session;
-  if (!Array.isArray(sessions)) return [];
-  const out = [];
-  for (const raw of sessions) {
-    const s = raw;
-    const sessionId = typeof s.period === "string" ? s.period : typeof s.sessionId === "string" ? s.sessionId : null;
-    if (!sessionId) continue;
-    const inputTokens = norm(s.inputTokens);
-    const outputTokens = norm(s.outputTokens);
-    const cacheCreationTokens = norm(s.cacheCreationTokens);
-    const cacheReadTokens = norm(s.cacheReadTokens);
-    if (inputTokens + outputTokens + cacheCreationTokens + cacheReadTokens === 0)
-      continue;
-    const models = Array.isArray(s.modelsUsed) ? s.modelsUsed.filter((m) => typeof m === "string") : [];
-    const meta = s.metadata ?? {};
-    out.push({
-      sessionId: sessionId.slice(0, 128),
-      tool: typeof s.agent === "string" ? s.agent : "unknown",
-      model: models[0] ?? "unknown",
-      inputTokens,
-      outputTokens,
-      cacheCreationTokens,
-      cacheReadTokens,
-      costUSD: normCost(s.totalCost ?? s.costUSD),
-      lastActivity: typeof meta.lastActivity === "string" ? meta.lastActivity : (/* @__PURE__ */ new Date()).toISOString()
-    });
-  }
-  return out;
-}
 function mapCcusageBlocks(json) {
   const blocks = json?.blocks;
   if (!Array.isArray(blocks)) return [];
@@ -9334,14 +9388,9 @@ async function collectAll(onProgress, opts) {
       return { source, mapped: json ? mapCcusageDaily(source, json) : [] };
     }
   );
-  const sessionTask = runCcusage(
-    cmd,
-    [...prefixArgs, "session", "--json", "--offline"],
-    void 0,
-    CCUSAGE_AGGREGATE_TIMEOUT_MS
-  ).then((json) => {
+  const sessionTask = Promise.resolve().then(() => {
     tick();
-    return json ? mapCcusageSessions(json) : [];
+    return [];
   });
   const blockTask = runCcusage(
     cmd,
@@ -9662,8 +9711,12 @@ function writeLocalDashboard(dir, html) {
 function esc(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
 }
+function localDay(d) {
+  const pad = (n) => String(n).padStart(2, "0");
+  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
+}
 function renderDashboardHtml(entries, generatedAt = /* @__PURE__ */ new Date(), connect) {
-  const today = generatedAt.toISOString().slice(0, 10);
+  const today = localDay(generatedAt);
   const totals = {
     tokens: 0,
     cost: 0,
@@ -9699,7 +9752,9 @@ function renderDashboardHtml(entries, generatedAt = /* @__PURE__ */ new Date(),
   const avgPerDay = activeDays > 0 ? totals.tokens / activeDays : 0;
   const days = [];
   for (let i = 59; i >= 0; i--) {
-    const d = new Date(generatedAt.getTime() - i * 864e5).toISOString().slice(0, 10);
+    const day = new Date(generatedAt);
+    day.setDate(day.getDate() - i);
+    const d = localDay(day);
     days.push({ date: d, tokens: byDate.get(d) ?? 0 });
   }
   const maxDay = Math.max(1, ...days.map((d) => d.tokens));
@@ -9807,7 +9862,7 @@ function renderDashboardHtml(entries, generatedAt = /* @__PURE__ */ new Date(),
       <div class="flame">\u{1F525}</div>
       <div>
         <h1>your local burn</h1>
-        <div class="sub">generated ${esc(generatedAt.toISOString().slice(0, 16).replace("T", " "))} \xB7 nothing left your machine</div>
+        <div class="sub">generated ${esc(`${localDay(generatedAt)} ${String(generatedAt.getHours()).padStart(2, "0")}:${String(generatedAt.getMinutes()).padStart(2, "0")}`)} \xB7 nothing left your machine</div>
       </div>
     </header>
 ${connectCta}
@@ -9960,11 +10015,11 @@ function openBrowser(url) {
 async function confirm(question, defaultYes = true) {
   if (!process.stdin.isTTY) return false;
   const rl = createInterface({ input: process.stdin, output: process.stdout });
-  const hint = defaultYes ? "[Y/n]" : "[y/N]";
-  const answer = (await rl.question(`${question} ${pc2.dim(hint)} `)).trim();
+  const answer = (await rl.question(`${question} ${pc2.dim(defaultYes ? "[Y/n]" : "[y/N]")} `)).trim();
   rl.close();
-  return answer === "" ? defaultYes : /^y(es)?$/i.test(answer);
+  return confirmAnswer(answer, defaultYes);
 }
+var confirmDefaultNo = (question) => confirm(question, false);
 function showLocalDashboard(payload) {
   const dir = defaultConfigDir();
   const file = writeLocalDashboard(
@@ -10056,7 +10111,7 @@ async function run(flags) {
     showLocalDashboard(payload);
     if (!flags.quiet && process.stdin.isTTY) {
       await publishLocal(payload, {
-        confirm,
+        confirm: confirmDefaultNo,
         // Stored token, then a silent refresh, then device sign-in — the same
         // order as every other signed-in command.
         signIn: () => requireSignedIn("--local"),
@@ -10410,8 +10465,23 @@ async function runVerify() {
       return;
     }
   }
-  console.log(pc2.dim("  Reading your local Claude Code logs\u2026"));
-  const { requests, found, timedOut } = await collectClaudeRequests();
+  console.log(pc2.dim("  Reading your local Claude Code logs (large histories can take a few minutes)\u2026"));
+  const { requests, found, timedOut } = await collectClaudeRequests(process.env, {
+    budgetMs: VERIFY_READ_BUDGET_MS
+  });
+  if (timedOut === true && requests.length === 0) {
+    console.log(
+      pc2.yellow(
+        "  Your Claude Code logs are too large to finish reading in time, so nothing was sent."
+      )
+    );
+    console.log(
+      pc2.dim(
+        "  Try again when the machine is idle, or file a written appeal at whoburnedmore.com/appeal."
+      )
+    );
+    return;
+  }
   if (!found || requests.length === 0) {
     console.log(
       pc2.yellow("  No local Claude Code logs found on this machine to verify.")
@@ -10545,7 +10615,7 @@ async function runRemove() {
   console.log(
     pc2.dim("  Your local logs are untouched, and the account itself survives (delete it from your dashboard settings on the web).")
   );
-  if (!await confirm("  Delete your usage data?")) {
+  if (!await confirmDefaultNo("  Delete your usage data?")) {
     console.log(pc2.dim("  Cancelled \u2014 nothing was deleted."));
     return;
   }
@@ -10572,6 +10642,7 @@ async function runRemove() {
   );
   console.log(pc2.dim("  Run `npx whoburnedmore` anytime to start fresh."));
 }
+var VERIFY_READ_BUDGET_MS = 18e4;
 async function main() {
   const major = Number(process.versions.node.split(".")[0]);
   if (major < 20) {
@@ -10581,6 +10652,13 @@ async function main() {
   }
   const args = process.argv.slice(2);
   const baseCommand = resolveCommand(args);
+  const problem = argumentProblem(args, baseCommand);
+  if (problem) {
+    console.error(`  ${problem}`);
+    console.error("  Nothing was collected or sent. Run `npx whoburnedmore --help` for the options.");
+    process.exitCode = 2;
+    return;
+  }
   const command = args.includes("--watch") && (baseCommand === "run" || baseCommand === "sync") ? "daemon" : baseCommand;
   const flags = {
     dryRun: args.includes("--dry-run"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whoburnedmore",
-  "version": "0.9.25",
+  "version": "0.9.26",
   "description": "Find out who burned more — submit your AI coding-agent token usage to the public leaderboard at whoburnedmore.com",
   "type": "module",
   "bin": {