whoburnedmore 0.9.17 → 0.9.19

package/dist/index.js

@@ -238,7 +238,7 @@ import {
   writeFileSync as writeFileSync2
 } from "node:fs";
 import { homedir as homedir2, platform } from "node:os";
-import { dirname, join as join2, win32 } from "node:path";
+import { dirname, join as join2, posix, win32 } from "node:path";
 
 // src/config.ts
 import { randomBytes } from "node:crypto";
@@ -417,9 +417,19 @@ ${envEntries}
        interval. Submits are idempotent server-side, so an extra run is safe. -->
   <key>RunAtLoad</key>
   <true/>
-  <!-- Be a good citizen: macOS schedules this with background priority. -->
+  <!-- Standard, NOT Background. ProcessType=Background opts the job into
+       macOS I/O throttling, which is disastrous for a job whose work is almost
+       entirely reading thousands of transcript files: a full collect measured
+       ~51s unthrottled vs ~197s throttled on the same machine. That blows past
+       the collector's own budgets (25s per ccusage child, 45s for the native
+       reader), so every source times out at once, entries comes back empty and
+       the tick submits nothing \u2014 it logged "Nothing to burn yet" on 206 of 473
+       runs (~44%) until this was changed. Nice=0 keeps CPU priority neighbourly
+       without throttling the reads. -->
   <key>ProcessType</key>
-  <string>Background</string>
+  <string>Standard</string>
+  <key>Nice</key>
+  <integer>0</integer>
   <key>StandardOutPath</key>
   <string>${xmlEscape(logPath)}</string>
   <key>StandardErrorPath</key>
@@ -460,7 +470,7 @@ function resolveNpmPath(opts) {
   for (const c of candidates) {
     if (check(c)) return c;
   }
-  const sibling = os === "win32" ? win32.join(win32.dirname(execPath), "npm.cmd") : join2(dirname(execPath), "npm");
+  const sibling = os === "win32" ? win32.join(win32.dirname(execPath), "npm.cmd") : posix.join(posix.dirname(execPath), "npm");
   if (check(sibling)) return sibling;
   return os === "win32" ? "npm.cmd" : "npm";
 }
@@ -7595,7 +7605,7 @@ async function collectCursor() {
 // src/native/codex.ts
 import { readdir as readdir3 } from "node:fs/promises";
 import { homedir as homedir7 } from "node:os";
-import { join as join9 } from "node:path";
+import { join as join9, resolve } from "node:path";
 function num5(n) {
   const v = Math.round(Number(n));
   return Number.isFinite(v) && v > 0 ? v : 0;
@@ -7715,9 +7725,12 @@ function finalizeCodexEntries(acc) {
   }
   return entries;
 }
-function resolveCodexSessionsDir(env = process.env) {
-  const home = env.CODEX_HOME && env.CODEX_HOME.trim() ? env.CODEX_HOME.trim() : join9(homedir7(), ".codex");
-  return join9(home, "sessions");
+function resolveCodexHome(env = process.env) {
+  return env.CODEX_HOME && env.CODEX_HOME.trim() ? env.CODEX_HOME.trim() : join9(homedir7(), ".codex");
+}
+function resolveCodexSessionsDirs(env = process.env) {
+  const home = resolveCodexHome(env);
+  return [join9(home, "sessions"), join9(home, "archived_sessions")];
 }
 async function listJsonl3(dir) {
   let dirents;
@@ -7769,8 +7782,8 @@ function fromCachedSession(t) {
   };
 }
 async function collectCodexNative(env = process.env, opts = {}) {
-  const dir = resolveCodexSessionsDir(env);
-  const files = await listJsonl3(dir);
+  const dirs = resolveCodexSessionsDirs(env);
+  const files = (await Promise.all(dirs.map(listJsonl3))).flat();
   if (files.length === 0) return { entries: [], found: false, filesScanned: 0 };
   const now = opts.now ?? Date.now;
   const res = await readFilesWithCache({
@@ -8147,6 +8160,10 @@ function reconcileProvenance(entries, agent, complete, store) {
 
 // src/collect.ts
 var execFileAsync = promisify(execFile);
+var NATIVE_COVERED_SOURCES = /* @__PURE__ */ new Set(["claude", "codex"]);
+var CCUSAGE_TIMEOUT_MS = 25e3;
+var CCUSAGE_FALLBACK_TIMEOUT_MS = NATIVE_READ_BUDGET_MS;
+var CCUSAGE_AGGREGATE_TIMEOUT_MS = 18e4;
 var SOURCES = [
   "claude",
   "codex",
@@ -8342,25 +8359,39 @@ function dedupeBlocks(blocks) {
   return [...byStart.values()];
 }
 function selectSourceEntries(source, ccusageEntries, native) {
-  if (source === "claude" && native.claude.found && native.claude.entries.length > 0)
+  if (source === "claude" && nativeReaderWon(native.claude))
     return native.claude.entries;
-  if (source === "codex" && native.codex.found && native.codex.entries.length > 0)
+  if (source === "codex" && nativeReaderWon(native.codex))
     return native.codex.entries;
   return ccusageEntries;
 }
+function nativeReaderWon(result) {
+  return result.found && result.entries.length > 0;
+}
+function ccusageFallbackSources(native) {
+  return SOURCES.filter(
+    (s) => NATIVE_COVERED_SOURCES.has(s) && !nativeReaderWon(s === "claude" ? native.claude : native.codex)
+  );
+}
 function ccusageClaudeEnv(env = process.env) {
   if (env.CLAUDE_CONFIG_DIR && env.CLAUDE_CONFIG_DIR.trim()) return env;
   return { ...env, CLAUDE_CONFIG_DIR: resolveClaudeConfigRoots(env).join(",") };
 }
-async function runCcusageOnce(cmd, args, env) {
+function isRetryableCcusageFailure(err) {
+  const e = err;
+  if (e.killed === true) return false;
+  return e.signal != null || typeof e.code === "string";
+}
+async function runCcusageOnce(cmd, args, env, timeoutMs = CCUSAGE_TIMEOUT_MS) {
   try {
     const { stdout } = await execFileAsync(cmd, args, {
       encoding: "utf8",
       maxBuffer: 64 * 1024 * 1024,
-      // A single source shouldn't be able to hang the whole run. 25s is plenty
-      // for a healthy local read; a hung source gets killed and (if transient)
-      // retried once below rather than stalling everything for minutes.
-      timeout: 25e3,
+      // A single source shouldn't be able to hang the whole run: a hung source
+      // gets killed and (if transient) retried once below rather than stalling
+      // everything for minutes. The claude/codex fallback passes a longer cap —
+      // see CCUSAGE_FALLBACK_TIMEOUT_MS.
+      timeout: timeoutMs,
       ...env ? { env } : {}
     });
     if (!stdout) return { json: null, transient: false };
@@ -8370,15 +8401,13 @@ async function runCcusageOnce(cmd, args, env) {
       return { json: null, transient: false };
     }
   } catch (err) {
-    const e = err;
-    const transient = e.killed === true || e.signal != null || typeof e.code === "string";
-    return { json: null, transient };
+    return { json: null, transient: isRetryableCcusageFailure(err) };
   }
 }
-async function runCcusage(cmd, args, env) {
-  const first = await runCcusageOnce(cmd, args, env);
+async function runCcusage(cmd, args, env, timeoutMs = CCUSAGE_TIMEOUT_MS) {
+  const first = await runCcusageOnce(cmd, args, env, timeoutMs);
   if (first.json !== null || !first.transient) return first.json;
-  return (await runCcusageOnce(cmd, args, env)).json;
+  return (await runCcusageOnce(cmd, args, env, timeoutMs)).json;
 }
 var COLLECT_STAGES = SOURCES.length + 4 + VSCODE_AGENTS.length + 1;
 function isAuthoritativeScan(attributionComplete, ...fingerprintReaders) {
@@ -8397,27 +8426,39 @@ async function collectAll(onProgress) {
     () => ({ entries: [], found: false, filesScanned: 0, timedOut: true })
   );
   const sourceTasks = SOURCES.map(async (source) => {
-    const env = source === "claude" ? ccusageClaudeEnv() : void 0;
-    const json = await runCcusage(
-      cmd,
-      [...prefixArgs, source, "daily", "--json", "--offline"],
-      env
-    );
+    if (NATIVE_COVERED_SOURCES.has(source)) {
+      await (source === "claude" ? nativeClaudeTask : nativeCodexTask);
+      tick();
+      return { source, mapped: [] };
+    }
+    const json = await runCcusage(cmd, [
+      ...prefixArgs,
+      source,
+      "daily",
+      "--json",
+      "--offline"
+    ]);
     tick();
     return { source, mapped: json ? mapCcusageDaily(source, json) : [] };
   });
-  const sessionTask = runCcusage(cmd, [...prefixArgs, "session", "--json", "--offline"]).then(
-    (json) => {
-      tick();
-      return json ? mapCcusageSessions(json) : [];
-    }
-  );
-  const blockTask = runCcusage(cmd, [...prefixArgs, "blocks", "--json", "--offline"]).then(
-    (json) => {
-      tick();
-      return json ? mapCcusageBlocks(json) : [];
-    }
-  );
+  const sessionTask = runCcusage(
+    cmd,
+    [...prefixArgs, "session", "--json", "--offline"],
+    void 0,
+    CCUSAGE_AGGREGATE_TIMEOUT_MS
+  ).then((json) => {
+    tick();
+    return json ? mapCcusageSessions(json) : [];
+  });
+  const blockTask = runCcusage(
+    cmd,
+    [...prefixArgs, "blocks", "--json", "--offline"],
+    void 0,
+    CCUSAGE_AGGREGATE_TIMEOUT_MS
+  ).then((json) => {
+    tick();
+    return json ? mapCcusageBlocks(json) : [];
+  });
   const cursorTask = collectCursor().then((c) => {
     tick();
     return c;
@@ -8458,10 +8499,21 @@ async function collectAll(onProgress) {
     continueTask
   ]);
   const native = { claude: nativeClaude, codex: nativeCodex };
+  const fallbacks = /* @__PURE__ */ new Map();
+  for (const source of ccusageFallbackSources(native)) {
+    const json = await runCcusage(
+      cmd,
+      [...prefixArgs, source, "daily", "--json", "--offline"],
+      // For Claude, force ccusage to scan both config roots (dual-dir hardening).
+      source === "claude" ? ccusageClaudeEnv() : void 0,
+      CCUSAGE_FALLBACK_TIMEOUT_MS
+    );
+    fallbacks.set(source, json ? mapCcusageDaily(source, json) : []);
+  }
   const entries = [];
   const toolsFound = [];
   for (const { source, mapped } of sourceResults) {
-    const chosen = selectSourceEntries(source, mapped, native);
+    const chosen = selectSourceEntries(source, fallbacks.get(source) ?? mapped, native);
     if (chosen.length > 0) {
       entries.push(...chosen);
       toolsFound.push(source);
@@ -9079,7 +9131,7 @@ async function run(flags) {
   }
 }
 function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
+  return new Promise((resolve2) => setTimeout(resolve2, ms));
 }
 async function refreshCliTokenFromConfig() {
   const cfg = loadConfig();
@@ -9273,14 +9325,14 @@ async function linkServerInstall(token) {
 }
 function waitOrAbort(ms, signal) {
   if (signal.aborted) return Promise.resolve();
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     const onAbort = () => {
       clearTimeout(timer);
-      resolve();
+      resolve2();
     };
     const timer = setTimeout(() => {
       signal.removeEventListener("abort", onAbort);
-      resolve();
+      resolve2();
     }, ms);
     signal.addEventListener("abort", onAbort, { once: true });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whoburnedmore",
-  "version": "0.9.17",
+  "version": "0.9.19",
   "description": "Find out who burned more — submit your AI coding-agent token usage to the public leaderboard at whoburnedmore.com",
   "type": "module",
   "bin": {
@@ -10,7 +10,7 @@
     "dist/index.js"
   ],
   "scripts": {
-    "build": "rm -rf dist && esbuild src/index.ts --bundle --platform=node --format=esm --target=node20 --outfile=dist/index.js --external:ccusage --external:picocolors --external:tokscale",
+    "build": "node scripts/clean.mjs && esbuild src/index.ts --bundle --platform=node --format=esm --target=node20 --outfile=dist/index.js --external:ccusage --external:picocolors --external:tokscale",
     "test": "vitest run",
     "lint": "tsc -p tsconfig.json --noEmit",
     "smoke:package": "node scripts/smoke-package.mjs",
@@ -20,7 +20,7 @@
     "release:major": "npm version major && npm publish"
   },
   "dependencies": {
-    "ccusage": "20.0.9",
+    "ccusage": "20.0.19",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {