whoburnedmore 0.5.0 → 0.6.0

package/dist/index.js

@@ -29,6 +29,9 @@ function parseBoard(args) {
 function apiBase() {
   return process.env.WHOBURNEDMORE_API ?? "https://api.whoburnedmore.com";
 }
+function webBase() {
+  return process.env.WHOBURNEDMORE_WEB ?? "https://whoburnedmore.com";
+}
 async function readJson(res) {
   const text = await res.text();
   if (!text) return {};
@@ -40,15 +43,12 @@ async function readJson(res) {
     };
   }
 }
-async function post(path, body, token) {
+async function post(path, body) {
   let res;
   try {
     res = await fetch(`${apiBase()}${path}`, {
       method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        ...token ? { Authorization: `Bearer ${token}` } : {}
-      },
+      headers: { "Content-Type": "application/json" },
       body: JSON.stringify(body)
     });
   } catch {
@@ -58,34 +58,6 @@ async function post(path, body, token) {
   }
   return { status: res.status, body: await readJson(res) };
 }
-async function deviceStart() {
-  const { status, body } = await post("/v1/auth/device", {});
-  if (status !== 200) throw new Error(`device auth failed (HTTP ${status})`);
-  return body;
-}
-async function devicePoll(deviceCode) {
-  const { body } = await post("/v1/auth/device/token", {
-    deviceCode
-  });
-  return body;
-}
-async function submitUsage(token, payload) {
-  const { status, body } = await post(
-    "/v1/submit",
-    payload,
-    token
-  );
-  if (status === 401) {
-    throw new Error("session expired \u2014 run `npx whoburnedmore login` again");
-  }
-  if (status !== 200) {
-    const err = body;
-    const details = err.details?.length ? `
-  - ${err.details.join("\n  - ")}` : "";
-    throw new Error(`${err.error ?? `submit failed (HTTP ${status})`}${details}`);
-  }
-  return body;
-}
 async function anonSubmit(anonKey, payload) {
   const { status, body } = await post("/v1/anon/submit", { ...payload, anonKey });
   if (status !== 200) {
@@ -122,14 +94,14 @@ async function anonRemove(anonKey) {
 
 // src/autosync.ts
 import { spawnSync } from "node:child_process";
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, rmSync, writeFileSync as writeFileSync2 } from "node:fs";
 import { homedir as homedir2, platform } from "node:os";
 import { join as join2 } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // src/config.ts
 import { randomBytes } from "node:crypto";
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 function defaultConfigDir() {
@@ -141,8 +113,6 @@ function loadConfig(dir = defaultConfigDir()) {
   try {
     const parsed = JSON.parse(readFileSync(file, "utf8"));
     const config = {};
-    if (typeof parsed.token === "string") config.token = parsed.token;
-    if (typeof parsed.handle === "string") config.handle = parsed.handle;
     if (typeof parsed.anonKey === "string") config.anonKey = parsed.anonKey;
     return Object.keys(config).length > 0 ? config : null;
   } catch {
@@ -154,9 +124,6 @@ function saveConfig(dir = defaultConfigDir(), config = {}) {
   const file = join(dir, "config.json");
   writeFileSync(file, JSON.stringify(config, null, 2), { mode: 384 });
 }
-function clearConfig(dir = defaultConfigDir()) {
-  rmSync(join(dir, "config.json"), { force: true });
-}
 function ensureAnonKey(dir = defaultConfigDir()) {
   const config = loadConfig(dir) ?? {};
   if (config.anonKey) return config.anonKey;
@@ -250,7 +217,7 @@ function uninstallAutoSync() {
     const plistPath = launchAgentPath();
     if (existsSync2(plistPath)) {
       spawnSync("launchctl", ["unload", plistPath], { stdio: "ignore" });
-      rmSync2(plistPath, { force: true });
+      rmSync(plistPath, { force: true });
     }
     return "launchd agent removed";
   }
@@ -349,9 +316,13 @@ function recordTokens(usage) {
 function processRecord(rec, acc, ctx) {
   if (!rec || typeof rec !== "object") return;
   const r = rec;
+  const recTokens = recordTokens(r.message?.usage);
   if (typeof r.attributionSkill === "string" && r.attributionSkill) {
     const s = r.attributionSkill.slice(0, 128);
-    acc.skills.set(s, (acc.skills.get(s) ?? 0) + 1);
+    const sk = acc.skills.get(s) ?? { count: 0, tokens: 0 };
+    sk.count += 1;
+    sk.tokens += recTokens;
+    acc.skills.set(s, sk);
   }
   if (r.type === "ai-title" && typeof r.aiTitle === "string" && r.aiTitle && typeof r.sessionId === "string" && r.sessionId) {
     acc.titles.set(r.sessionId, r.aiTitle.slice(0, 200));
@@ -361,18 +332,24 @@ function processRecord(rec, acc, ctx) {
   const isAssistant = r.type === "assistant" || r.message?.role === "assistant";
   const isUser = r.type === "user" || r.message?.role === "user";
   if (isAssistant) {
+    const toolUses = [];
     for (const block of content) {
       if (block && typeof block === "object" && block.type === "tool_use" && typeof block.name === "string") {
         const name = block.name.slice(0, 128);
         if (!name) continue;
-        const t = acc.tools.get(name) ?? { count: 0, errors: 0 };
-        t.count += 1;
-        acc.tools.set(name, t);
         const id = block.id;
-        if (typeof id === "string" && id) ctx.toolNames.set(id, name);
+        toolUses.push({ name, id: typeof id === "string" ? id : void 0 });
       }
     }
-    const tokens = recordTokens(r.message?.usage);
+    const perToolTokens = toolUses.length > 0 ? Math.floor(recTokens / toolUses.length) : 0;
+    for (const tu of toolUses) {
+      const t = acc.tools.get(tu.name) ?? { count: 0, errors: 0, tokens: 0 };
+      t.count += 1;
+      t.tokens += perToolTokens;
+      acc.tools.set(tu.name, t);
+      if (tu.id) ctx.toolNames.set(tu.id, tu.name);
+    }
+    const tokens = recTokens;
     acc.agent.messageCount += 1;
     acc.agent.totalTokens += tokens;
     const sidechain = r.isSidechain === true;
@@ -411,7 +388,7 @@ function processRecord(rec, acc, ctx) {
         const id = block.tool_use_id;
         const name = typeof id === "string" ? ctx.toolNames.get(id) : void 0;
         if (name) {
-          const t = acc.tools.get(name) ?? { count: 0, errors: 0 };
+          const t = acc.tools.get(name) ?? { count: 0, errors: 0, tokens: 0 };
           t.errors += 1;
           acc.tools.set(name, t);
         }
@@ -420,10 +397,15 @@ function processRecord(rec, acc, ctx) {
   }
 }
 function toSkillStats(map) {
-  return [...map.entries()].map(([name, count]) => ({ name, count })).filter((s) => s.count > 0).sort((a, b) => b.count - a.count).slice(0, MAX_STATS);
+  return [...map.entries()].map(([name, v]) => ({ name, count: v.count, tokens: v.tokens })).filter((s) => s.count > 0).sort((a, b) => b.tokens - a.tokens || b.count - a.count).slice(0, MAX_STATS).map((s) => s.tokens > 0 ? s : { name: s.name, count: s.count });
 }
 function toToolStats(map) {
-  return [...map.entries()].map(([name, v]) => ({ name, count: v.count, errors: v.errors })).filter((s) => s.count > 0).sort((a, b) => b.count - a.count).slice(0, MAX_STATS).map((s) => s.errors > 0 ? s : { name: s.name, count: s.count });
+  return [...map.entries()].map(([name, v]) => ({ name, count: v.count, errors: v.errors, tokens: v.tokens })).filter((s) => s.count > 0).sort((a, b) => b.tokens - a.tokens || b.count - a.count).slice(0, MAX_STATS).map((s) => {
+    const base = { name: s.name, count: s.count };
+    if (s.errors > 0) base.errors = s.errors;
+    if (s.tokens > 0) base.tokens = s.tokens;
+    return base;
+  });
 }
 function toProjectStats(map) {
   return [...map.entries()].map(([name, v]) => ({
@@ -5096,7 +5078,9 @@ var ToolStat = external_exports.object({
   name: external_exports.string().min(1).max(128),
   count: external_exports.number().int().nonnegative(),
   /** How many of those calls returned an error/interrupt (tool reliability). Optional. */
-  errors: external_exports.number().int().nonnegative().optional()
+  errors: external_exports.number().int().nonnegative().optional(),
+  /** Tokens burned on turns that used this tool (turn tokens split across its tool calls). Optional. */
+  tokens: external_exports.number().int().nonnegative().optional()
 });
 var ProjectStat = external_exports.object({
   name: external_exports.string().min(1).max(128),
@@ -5115,7 +5099,9 @@ var AgentStat = external_exports.object({
 });
 var SkillStat = external_exports.object({
   name: external_exports.string().min(1).max(128),
-  count: external_exports.number().int().nonnegative()
+  count: external_exports.number().int().nonnegative(),
+  /** Tokens burned in records produced while this skill was active. Optional. */
+  tokens: external_exports.number().int().nonnegative().optional()
 });
 var SubmitPayload = external_exports.object({
   cliVersion: external_exports.string().min(1).max(32),
@@ -5196,7 +5182,7 @@ function printSummary(entries) {
 function esc(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }
-function renderDashboardHtml(entries, generatedAt = /* @__PURE__ */ new Date()) {
+function renderDashboardHtml(entries, generatedAt = /* @__PURE__ */ new Date(), connect) {
   const today = generatedAt.toISOString().slice(0, 10);
   const totals = {
     tokens: 0,
@@ -5248,6 +5234,18 @@ function renderDashboardHtml(entries, generatedAt = /* @__PURE__ */ new Date())
     ([model, a]) => `<tr><td class="mono">${esc(model)}</td><td class="num">${esc(formatTokens(a.tokens))}</td><td class="num">${esc(formatUSD(a.cost))}</td></tr>`
   ).join("");
   const stat = (label, value, accent = false) => `<div class="card"><div class="label">${label}</div><div class="value${accent ? " accent" : ""}">${esc(value)}</div></div>`;
+  const connectCta = connect ? `
+    <form class="connect" method="POST" action="${esc(connect.webBaseUrl)}/connect">
+      <input type="hidden" name="payload" value="${Buffer.from(JSON.stringify(connect.payload)).toString("base64")}">
+      <div class="connect-row">
+        <div>
+          <div class="connect-title">Connect your account</div>
+          <div class="connect-sub">Save this dashboard to your account and claim your spot on the public leaderboard. The local numbers above become your starting point \u2014 nothing has left your machine yet.</div>
+        </div>
+        <button type="submit">Connect your account \u2192</button>
+      </div>
+      <div class="connect-note">After connecting, run <code>npx whoburnedmore</code> (no flag) once so it keeps syncing automatically in the background.</div>
+    </form>` : "";
   return `<!doctype html>
 <html lang="en">
 <head>
@@ -5285,13 +5283,22 @@ function renderDashboardHtml(entries, generatedAt = /* @__PURE__ */ new Date())
   td.mono { font-family: ui-monospace, monospace; font-size: 12px; }
   .foot { color: #78716c; font-size: 12px; margin-top: 32px; }
   .foot code { color: #d6d3d1; }
+  .connect { display: block; margin: 24px 0 4px; background: linear-gradient(135deg, rgba(234,88,12,.16), rgba(249,115,22,.06)); border: 1px solid rgba(234,88,12,.5); border-radius: 14px; padding: 18px 20px; }
+  .connect-row { display: flex; flex-direction: column; gap: 14px; align-items: flex-start; }
+  @media (min-width: 640px) { .connect-row { flex-direction: row; align-items: center; justify-content: space-between; } }
+  .connect-title { font-size: 16px; font-weight: 700; }
+  .connect-sub { color: #d6d3d1; font-size: 13px; margin-top: 4px; max-width: 60ch; }
+  .connect button { flex-shrink: 0; cursor: pointer; border: 0; border-radius: 10px; background: #ea580c; color: #fff; font-size: 14px; font-weight: 600; padding: 11px 18px; font-family: inherit; transition: background .15s; }
+  .connect button:hover { background: #f97316; }
+  .connect-note { color: #a8a29e; font-size: 12px; margin-top: 14px; padding-top: 12px; border-top: 1px solid rgba(234,88,12,.25); }
+  .connect-note code { color: #fed7aa; background: rgba(0,0,0,.25); padding: 1px 6px; border-radius: 5px; }
 </style>
 </head>
 <body>
   <div class="wrap">
     <h1>who burned more<span class="q">?</span></h1>
     <div class="sub">your local burn report \xB7 generated ${esc(generatedAt.toISOString().slice(0, 16).replace("T", " "))} \xB7 nothing left your machine</div>
-
+${connectCta}
     <div class="grid">
       ${stat("total tokens", formatTokens(totals.tokens), true)}
       ${stat("est. cost", formatUSD(totals.cost))}
@@ -5335,7 +5342,7 @@ function renderDashboardHtml(entries, generatedAt = /* @__PURE__ */ new Date())
 
     <div class="foot">
       Re-run <code>npx whoburnedmore --local</code> to refresh this page.<br>
-      Run <code>npx whoburnedmore</code> (no flag) to get a shareable dashboard at whoburnedmore.com \u2014 no sign-in.
+      ${connect ? "Use \u201CConnect your account\u201D above to save it to whoburnedmore.com and join the leaderboard." : "Run <code>npx whoburnedmore</code> (no flag) to get a shareable dashboard at whoburnedmore.com \u2014 no sign-in."}
     </div>
   </div>
 </body>
@@ -5386,27 +5393,6 @@ function openBrowser(url) {
   const [cmd, args] = os === "darwin" ? ["open", [url]] : os === "win32" ? ["cmd", ["/c", "start", "", url]] : ["xdg-open", [url]];
   spawn(cmd, args, { stdio: "ignore", detached: true }).unref();
 }
-async function login() {
-  const device = await deviceStart();
-  console.log();
-  console.log(`  Opening ${pc2.cyan(device.verifyUrl)}`);
-  console.log(`  Your code: ${pc2.bold(pc2.yellow(device.userCode))}`);
-  console.log(pc2.dim("  Sign in with Google or GitHub and approve this device."));
-  openBrowser(device.verifyUrl);
-  const deadline = Date.now() + device.expiresInSeconds * 1e3;
-  while (Date.now() < deadline) {
-    await new Promise((r) => setTimeout(r, device.pollIntervalSeconds * 1e3));
-    const poll = await devicePoll(device.deviceCode);
-    if (poll.status === "ok") {
-      const config = { token: poll.token, handle: poll.handle };
-      saveConfig(void 0, config);
-      console.log(`  Signed in as ${pc2.bold(poll.handle)} \u2713`);
-      return config;
-    }
-    if (poll.status === "expired") break;
-  }
-  throw new Error("login timed out \u2014 run `npx whoburnedmore` to try again");
-}
 async function confirm(question) {
   if (!process.stdin.isTTY) return false;
   const rl = createInterface({ input: process.stdin, output: process.stdout });
@@ -5414,11 +5400,17 @@ async function confirm(question) {
   rl.close();
   return answer === "" || /^y(es)?$/i.test(answer);
 }
-function showLocalDashboard(entries) {
+function showLocalDashboard(payload) {
   const dir = defaultConfigDir();
   mkdirSync3(dir, { recursive: true });
   const file = join7(dir, "dashboard.html");
-  writeFileSync3(file, renderDashboardHtml(entries));
+  writeFileSync3(
+    file,
+    renderDashboardHtml(payload.entries, /* @__PURE__ */ new Date(), {
+      payload,
+      webBaseUrl: webBase()
+    })
+  );
   console.log();
   console.log(`  Local dashboard: ${pc2.cyan(`file://${file}`)}`);
   console.log(pc2.dim("  Re-run `npx whoburnedmore --local` to refresh it. Nothing left your machine."));
@@ -5458,7 +5450,7 @@ async function run(flags) {
   }
   if (!flags.quiet) printSummary(entries);
   if (flags.local) {
-    showLocalDashboard(entries);
+    showLocalDashboard(payload);
     if (!flags.quiet && process.stdin.isTTY) {
       await publishLocal(payload, {
         confirm,
@@ -5474,61 +5466,46 @@ async function run(flags) {
     console.log(pc2.dim("  --no-submit: skipped the dashboard."));
     return;
   }
-  const config = loadConfig();
-  if (config?.token) {
-    const result = await submitUsage(config.token, payload);
-    if (!flags.quiet) {
-      console.log(pc2.dim("  Opening your dashboard in your browser\u2026"));
-      openBrowser(result.boardUrl ?? result.profileUrl);
-    }
+  const anonKey = ensureAnonKey();
+  const result = await anonSubmit(anonKey, payload);
+  const target = result.boardUrl ?? claimUrl(result.dashboardUrl, anonKey);
+  if (!flags.quiet) {
+    console.log(pc2.dim("  Opening your dashboard in your browser\u2026"));
+    openBrowser(target);
+  }
+  console.log(
+    `  Submitted ${pc2.bold(String(result.upserted))} day-entries from ${toolsFound.join(", ")}.`
+  );
+  if (result.boardUrl) {
     console.log(
-      `  Submitted ${pc2.bold(String(result.upserted))} day-entries from ${toolsFound.join(", ")}.`
+      `  You burned ${pc2.bold(formatTokens(result.totalTokens))} tokens \u2014 \u{1F91D} you're on the friends board:`
     );
-    if (result.rank) {
-      console.log(
-        `  You are ${pc2.bold(pc2.yellow(`#${result.rank}`))} with ${pc2.bold(formatTokens(result.totalTokens))} tokens burned.`
-      );
-    }
-    console.log(`  ${pc2.cyan(result.profileUrl)}`);
-    if (result.boardUrl) {
-      console.log(`  \u{1F91D} You're on the friends board: ${pc2.cyan(result.boardUrl)}`);
-    }
+    console.log(`  ${pc2.cyan(result.boardUrl)}`);
+    console.log(pc2.dim(`  Your dashboard: ${result.dashboardUrl}`));
   } else {
-    const anonKey = ensureAnonKey();
-    const result = await anonSubmit(anonKey, payload);
-    const target = result.boardUrl ?? claimUrl(result.dashboardUrl, anonKey);
-    if (!flags.quiet) {
-      console.log(pc2.dim("  Opening your dashboard in your browser\u2026"));
-      openBrowser(target);
-    }
     console.log(
-      `  Submitted ${pc2.bold(String(result.upserted))} day-entries from ${toolsFound.join(", ")}.`
+      `  You burned ${pc2.bold(formatTokens(result.totalTokens))} tokens \u2014 you're on the public leaderboard:`
     );
-    if (result.boardUrl) {
+    console.log(`  ${pc2.cyan(result.dashboardUrl)}`);
+    if (!flags.quiet) {
       console.log(
-        `  You burned ${pc2.bold(formatTokens(result.totalTokens))} tokens \u2014 \u{1F91D} you're on the friends board:`
+        pc2.dim("  Claim it (name + X) on the web to own your rank, or make it private / remove it.")
       );
-      console.log(`  ${pc2.cyan(result.boardUrl)}`);
-      console.log(pc2.dim(`  Your dashboard: ${result.dashboardUrl}`));
-    } else {
       console.log(
-        `  You burned ${pc2.bold(formatTokens(result.totalTokens))} tokens \u2014 you're on the public leaderboard:`
+        pc2.dim("  Manage anytime: `npx whoburnedmore private` \xB7 `npx whoburnedmore public` \xB7 `npx whoburnedmore remove`.")
       );
-      console.log(`  ${pc2.cyan(result.dashboardUrl)}`);
-      if (!flags.quiet) {
-        console.log(
-          pc2.dim("  Claim it (name + X) to own your rank, or make it private / remove it.")
-        );
-        console.log(
-          pc2.dim("  Manage anytime: `npx whoburnedmore private` \xB7 `npx whoburnedmore public` \xB7 `npx whoburnedmore remove`.")
-        );
-      }
     }
   }
-  console.log();
+  if (!flags.quiet && !autoSyncInstalled()) {
+    try {
+      installAutoSync();
+    } catch {
+    }
+  }
   if (!flags.quiet) {
+    console.log();
     console.log(
-      autoSyncInstalled() ? pc2.dim("  Background sync is on \u2014 your page keeps updating automatically (`npx whoburnedmore uninstall-sync` to stop).") : pc2.dim("  Re-run anytime to update \xB7 `npx whoburnedmore install-sync` to keep it live in the background.")
+      autoSyncInstalled() ? pc2.dim("  Background sync is on \u2014 your page updates automatically every 3h (`npx whoburnedmore uninstall-sync` to stop).") : pc2.dim("  Re-run anytime to update your page.")
     );
   }
 }
@@ -5557,14 +5534,6 @@ async function main() {
       await run({ ...flags, noSubmit: false, dryRun: false, local: false });
       break;
     }
-    case "login":
-      await login();
-      break;
-    case "logout":
-      clearConfig();
-      console.log("  Logged out. Your leaderboard data is untouched.");
-      console.log(pc2.dim("  Delete your data anytime from your profile page."));
-      break;
     case "private":
     case "public": {
       const cfg = loadConfig();
@@ -5619,19 +5588,19 @@ function printHelp() {
     npx whoburnedmore --local      build the dashboard on your machine and open it (offline)
     npx whoburnedmore --dry-run    print exactly what would be sent, send nothing
     npx whoburnedmore --no-submit  print local stats only, send nothing
-    npx whoburnedmore private      hide your anonymous dashboard from the leaderboard
+    npx whoburnedmore private      hide your dashboard from the leaderboard
     npx whoburnedmore public       put it back on the leaderboard
-    npx whoburnedmore remove       delete your anonymous dashboard and its data
-    npx whoburnedmore login        sign in to claim a public handle + join the leaderboard
-    npx whoburnedmore logout       forget the local token
-    npx whoburnedmore install-sync     keep your dashboard live (background sync, 3h)
-    npx whoburnedmore uninstall-sync   remove background sync
+    npx whoburnedmore remove       delete your dashboard and its data
+    npx whoburnedmore uninstall-sync   turn off the background sync
+    npx whoburnedmore install-sync     turn it back on after uninstalling
 
-  By default your dashboard is public on the leaderboard as an anonymous burner \u2014
-  claim it (sign in for a handle + X) to own your rank, or run \`private\`/\`remove\`
-  to pull it. Only daily aggregate numbers (date, tool, model, token counts, est.
-  cost) ever leave your machine \u2014 never prompts, code, or file names. With --local,
-  nothing leaves your machine at all.
+  Background sync is on by default: after your first run, your page refreshes
+  automatically every 3h (\`uninstall-sync\` to stop). Your dashboard is public on
+  the leaderboard as an anonymous burner \u2014 sign in on whoburnedmore.com to claim
+  it (handle + X) and own your rank, or run \`private\`/\`remove\` to pull it. Only
+  daily aggregate numbers (date, tool, model, token counts, est. cost) ever leave
+  your machine \u2014 never prompts, code, or file names. With --local, nothing leaves
+  your machine at all.
 `);
 }
 main().catch((err) => {

package/package.json

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