ccclub 0.3.5 → 0.3.7

package/dist/index.js

@@ -585,7 +585,7 @@ function normalizeRawUsage(value) {
   const cachedInputTokens = asNumber(record.cached_input_tokens ?? record.cache_read_input_tokens);
   const outputTokens = asNumber(record.output_tokens);
   const reasoningTokens = asNumber(record.reasoning_output_tokens);
-  const fallbackTotal = inputTokens + outputTokens + reasoningTokens;
+  const fallbackTotal = inputTokens + outputTokens;
   const totalTokens = asNumber(record.total_tokens) || fallbackTotal;
   return { inputTokens, cachedInputTokens, outputTokens, reasoningTokens, totalTokens };
 }
@@ -669,9 +669,9 @@ async function collectCodexUsage() {
           outputTokens: rawUsage.outputTokens,
           cacheCreationTokens: 0,
           cacheReadTokens,
-          reasoningTokens: rawUsage.reasoningTokens,
+          reasoningTokens: 0,
           totalTokens,
-          costUSD: calculateCost(model, inputTokens, rawUsage.outputTokens, 0, cacheReadTokens, rawUsage.reasoningTokens)
+          costUSD: calculateCost(model, inputTokens, rawUsage.outputTokens, 0, cacheReadTokens)
         });
         turns.push({ source, timestamp, key: dedupeKey });
       });
@@ -1197,7 +1197,7 @@ async function fetchUsageLimits() {
 }
 
 // src/commands/sync.ts
-var SYNC_FORMAT_VERSION = "7";
+var SYNC_FORMAT_VERSION = "8";
 function getSyncVersionPath() {
   return join11(homedir11(), CCCLUB_CONFIG_DIR, "sync-version");
 }
@@ -1728,73 +1728,74 @@ function printGroup(data, code, period, config, showCache = false, showAll = fal
   const activeRankings = showAll || data.rankings.length <= 15 ? data.rankings : data.rankings.filter((r) => r.costUSD > 0 || r.userId === config.userId);
   const hiddenCount = data.rankings.length - activeRankings.length;
   const hasPlan = activeRankings.some((r) => r.plan);
-  const hasUsage = activeRankings.some((r) => r.usageSnapshot);
   const hasAgents = activeRankings.some(
     (r) => r.agents && r.agents.length > 0 && !(r.agents.length === 1 && r.agents[0] === "claude")
   );
+  const plainRows = activeRankings.map((entry) => {
+    const isActive = isEntryActive(entry, now);
+    const tokens = showCache ? entry.totalTokens : entry.inputTokens + entry.outputTokens + (entry.reasoningTokens || 0);
+    const roi = formatRoi(entry, hasPlan);
+    return {
+      entry,
+      isActive,
+      rank: `${entry.userId === config.userId ? "\u2192" : " "}${entry.rank}`,
+      name: `${isActive ? "\u25CF " : ""}${entry.displayName}`,
+      agents: formatAgents(entry),
+      cost: `$${entry.costUSD.toFixed(2)}`,
+      tokens: formatTokens(tokens),
+      roi,
+      turns: String(entry.chatCount),
+      perTurn: entry.chatCount > 0 ? `$${(entry.costUSD / entry.chatCount).toFixed(2)}` : "\u2014"
+    };
+  });
   const head = ["#", "Name", "Cost", "Tokens"];
-  const hasActive = activeRankings.some((r) => r.lastSync && now - new Date(r.lastSync).getTime() < ACTIVE_THRESHOLD_MS);
-  const widths = [5, hasActive ? 30 : 20, 12, 10];
+  const widths = [
+    columnWidth("#", plainRows.map((r) => r.rank), 2, 3),
+    columnWidth("Name", plainRows.map((r) => r.name), 10, 18),
+    columnWidth("Cost", plainRows.map((r) => r.cost), 5, 9),
+    columnWidth("Tokens", plainRows.map((r) => r.tokens), 6, 8)
+  ];
   if (hasAgents) {
     head.splice(2, 0, "Agents");
-    widths.splice(2, 0, 16);
+    widths.splice(2, 0, columnWidth("Agents", plainRows.map((r) => r.agents), 6, 28));
   }
   if (hasPlan) {
-    head.push("Monthly ROI");
-    widths.push(15);
+    head.push("ROI");
+    widths.push(columnWidth("ROI", plainRows.map((r) => r.roi), 3, 11));
   }
   head.push("Turns", "$/Turn");
-  widths.push(8, 9);
-  if (hasUsage) {
-    head.push("Usage 7d");
-    widths.push(10);
-  }
+  widths.push(
+    columnWidth("Turns", plainRows.map((r) => r.turns), 3, 6),
+    columnWidth("$/Turn", plainRows.map((r) => r.perTurn), 6, 7)
+  );
   const table = new Table({
     head: head.map((h) => chalk6.cyan(h)),
     style: { head: [], border: [] },
     colWidths: widths
   });
-  for (const entry of activeRankings) {
+  for (const plain of plainRows) {
+    const { entry } = plain;
     const isMe = entry.userId === config.userId;
-    const tokens = showCache ? entry.totalTokens : entry.inputTokens + entry.outputTokens + (entry.reasoningTokens || 0);
     const marker = isMe ? chalk6.green("\u2192") : " ";
-    const isActive = entry.lastSync && now - new Date(entry.lastSync).getTime() < ACTIVE_THRESHOLD_MS;
     const id = (s) => s;
     const c = isMe ? chalk6.green : entry.rank === 1 ? chalk6.yellow : id;
     const nameC = isMe ? chalk6.green.bold : entry.rank === 1 ? chalk6.yellow.bold : id;
-    const displayName = isActive ? `${entry.displayName} ${chalk6.green("(active)")}` : entry.displayName;
+    const nameWidth = Math.max(widths[1] - 2, 4);
+    const displayName = plain.isActive ? `${chalk6.green("\u25CF")} ${nameC(truncateDisplay(entry.displayName, Math.max(nameWidth - 2, 1)))}` : nameC(truncateDisplay(entry.displayName, nameWidth));
     const row = [
       `${marker}${c(String(entry.rank))}`,
-      nameC(displayName)
+      displayName
     ];
     if (hasAgents) {
-      row.push(c(formatAgents(entry.agents)));
+      const agentWidth = Math.max(widths[2] - 2, 4);
+      row.push(c(truncateDisplay(plain.agents, agentWidth)));
     }
-    row.push(c(`$${entry.costUSD.toFixed(2)}`), c(formatTokens(tokens)));
+    row.push(c(plain.cost), c(plain.tokens));
     if (hasPlan) {
-      if (entry.plan && entry.plan !== "api") {
-        const price = PLAN_PRICES[entry.plan];
-        const monthly = entry.monthlyCostUSD || 0;
-        const roi = price > 0 ? Math.round(monthly / price * 100) : 0;
-        const roiStr = `$${price}/${roi}%`;
-        const roiC = roi >= 100 ? chalk6.green.bold(roiStr) : roi >= 50 ? chalk6.yellow(roiStr) : chalk6.dim(roiStr);
-        row.push(roiC);
-      } else if (entry.plan === "api") {
-        row.push(chalk6.dim("API"));
-      } else {
-        row.push(chalk6.dim("\u2014"));
-      }
-    }
-    row.push(c(String(entry.chatCount)));
-    row.push(entry.chatCount > 0 ? c(`$${(entry.costUSD / entry.chatCount).toFixed(2)}`) : chalk6.dim("\u2014"));
-    if (hasUsage) {
-      if (entry.usageSnapshot) {
-        const { sevenDay } = entry.usageSnapshot;
-        row.push(c(`${Math.round(sevenDay)}%`));
-      } else {
-        row.push(chalk6.dim("\u2014"));
-      }
+      row.push(colorRoi(plain.roi, entry));
     }
+    row.push(c(plain.turns));
+    row.push(entry.chatCount > 0 ? c(plain.perTurn) : chalk6.dim("\u2014"));
     table.push(row);
   }
   console.log(table.toString());
@@ -1812,9 +1813,76 @@ function printGroup(data, code, period, config, showCache = false, showAll = fal
     }
   }
 }
-function formatAgents(agents) {
-  if (!agents || agents.length === 0) return "\u2014";
-  return agents.map((agent) => AGENT_LABELS[agent] ?? agent).join(", ");
+function isEntryActive(entry, now) {
+  return Boolean(entry.lastSync && now - new Date(entry.lastSync).getTime() < ACTIVE_THRESHOLD_MS);
+}
+function formatRoi(entry, hasPlan) {
+  if (!hasPlan) return "";
+  if (entry.plan && entry.plan !== "api") {
+    const price = PLAN_PRICES[entry.plan];
+    const monthly = entry.monthlyCostUSD || 0;
+    const roi = price > 0 ? Math.round(monthly / price * 100) : 0;
+    return `$${price}/${roi}%`;
+  }
+  if (entry.plan === "api") return "API";
+  return "\u2014";
+}
+function colorRoi(roiStr, entry) {
+  if (entry.plan && entry.plan !== "api") {
+    const price = PLAN_PRICES[entry.plan];
+    const monthly = entry.monthlyCostUSD || 0;
+    const roi = price > 0 ? Math.round(monthly / price * 100) : 0;
+    return roi >= 100 ? chalk6.green.bold(roiStr) : roi >= 50 ? chalk6.yellow(roiStr) : chalk6.dim(roiStr);
+  }
+  return chalk6.dim(roiStr);
+}
+function formatAgents(entry) {
+  if (entry.agentBreakdown && entry.agentBreakdown.length > 0) {
+    if (entry.agentBreakdown.length === 1) {
+      return formatAgentLabel(entry.agentBreakdown[0].source);
+    }
+    const visible = entry.agentBreakdown.slice(0, 2).map((agent) => `${formatAgentLabel(agent.source)} (${agent.percent}%)`);
+    if (entry.agentBreakdown.length > visible.length) {
+      visible.push(`+${entry.agentBreakdown.length - visible.length}`);
+    }
+    return visible.join(", ");
+  }
+  if (!entry.agents || entry.agents.length === 0) return "\u2014";
+  return entry.agents.map(formatAgentLabel).join(", ");
+}
+function formatAgentLabel(agent) {
+  return AGENT_LABELS[agent] ?? agent;
+}
+function columnWidth(header, values, minContent, maxContent) {
+  const contentWidth = Math.max(visualWidth(header), ...values.map(visualWidth));
+  return Math.min(Math.max(contentWidth, minContent), maxContent) + 2;
+}
+function visualWidth(value) {
+  let width = 0;
+  for (const char of value) width += charWidth(char);
+  return width;
+}
+function charWidth(char) {
+  const code = char.codePointAt(0) ?? 0;
+  if (code === 0 || code < 32 || code >= 127 && code < 160) return 0;
+  if (code >= 4352 && (code <= 4447 || code === 9001 || code === 9002 || code >= 11904 && code <= 42191 && code !== 12351 || code >= 44032 && code <= 55203 || code >= 63744 && code <= 64255 || code >= 65040 && code <= 65049 || code >= 65072 && code <= 65135 || code >= 65280 && code <= 65376 || code >= 65504 && code <= 65510)) {
+    return 2;
+  }
+  return 1;
+}
+function truncateDisplay(value, maxWidth) {
+  if (visualWidth(value) <= maxWidth) return value;
+  if (maxWidth <= 1) return "\u2026";
+  let result = "";
+  let width = 0;
+  const limit = maxWidth - 1;
+  for (const char of value) {
+    const next = charWidth(char);
+    if (width + next > limit) break;
+    result += char;
+    width += next;
+  }
+  return `${result}\u2026`;
 }
 var SPARK_CHARS = "\u2581\u2582\u2583\u2584\u2585\u2586\u2587";
 function renderActivity(data, range) {
@@ -2160,10 +2228,14 @@ async function hookCommand() {
 }
 
 // src/index.ts
-var VERSION = "0.3.5";
+var VERSION = "0.3.7";
 startUpdateCheck(VERSION);
 var program = new Command();
-program.name("ccclub").description("Coding agent usage leaderboard among friends").version(VERSION, "-v, -V, --version");
+if (process.argv.slice(2).includes("-v")) {
+  console.log(VERSION);
+  process.exit(0);
+}
+program.name("ccclub").description("Claude Code, Codex, OpenCode, Amp, and pi-agent usage leaderboard among friends").version(VERSION);
 program.command("rank", { isDefault: true, hidden: true }).description("Show leaderboard").option("-d, --days [days]", "Time window: 1 | 7 | 30 | all (default: today)").addOption(new Option("-p, --period [period]").hideHelp()).option("-g, --group <code>", "Group invite code").option("--global", "Show global public ranking").option("--cache", "Include cache tokens in count").option("--all", "Show all members including those with no activity").action(rankCommand);
 program.command("init").description("Create a group and get started (first-time setup)").action(initCommand);
 program.command("join").description("Join a group with a 6-letter invite code").argument("[invite-code]", "6-character invite code").action((code) => {
@@ -2181,7 +2253,7 @@ program.command("join").description("Join a group with a 6-letter invite code").
   }
   return joinCommand(code);
 });
-program.command("sync").description("Upload usage data (runs automatically on session end)").addOption(new Option("-s, --silent").hideHelp()).option("-f, --force", "Force full re-sync of all data").addOption(new Option("--full", "Same as --force").hideHelp()).action(
+program.command("sync").description("Upload local coding agent usage now (auto-sync also runs after setup)").addOption(new Option("-s, --silent").hideHelp()).option("-f, --force", "Re-scan and upload all local usage logs").addOption(new Option("--full", "Same as --force").hideHelp()).action(
   (options) => syncCommand({ ...options, full: options.full || options.force })
 );
 program.command("profile").description("View or update your profile").option("-n, --name <name>", "Set display name").option("--avatar <url>", "Set avatar URL (empty to reset)").option("--public", "Make profile visible in global ranking").option("--private", "Hide from global ranking").option("--plan <plan>", "pro ($20) | max100 ($100) | max200 ($200) | api | none").option("--url <url>", "Link your name to a URL (GitHub, website, etc.)").action(profileCommand);
@@ -2190,6 +2262,13 @@ program.command("leave").description("Leave a group").argument("[code]", "Group
 program.command("show-data").description("Preview exactly what gets uploaded (privacy check)").action(showDataCommand);
 program.command("hook", { hidden: true }).description("Set up auto-sync hook").action(hookCommand);
 program.addHelpText("after", `
+Setup:
+  ccclub init             Create your group and enable auto-sync
+  ccclub join <code>      Join a friend's group
+
+Supported agents:
+  Claude Code, Codex, OpenCode, Amp, pi-agent
+
 Leaderboard options:
   -d <period>              Time window: 1 | 7 | 30 | all (default: today)
   -g <code>                Show a specific group
@@ -2198,9 +2277,10 @@ Leaderboard options:
   --all                    Show all members including inactive ones
 
 Examples:
+  $ npx ccclub init        First-time setup
   $ ccclub                 Show today's leaderboard (default)
   $ ccclub -d 1|7|30|all   Time window (default: today)
   $ ccclub --global        Global public leaderboard
-  $ ccclub sync --force    Force full re-sync of all data
+  $ ccclub show-data       Preview exactly what gets uploaded
 `);
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccclub",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "type": "module",
   "description": "Claude Code and Codex leaderboard among friends for coding agent tokens and costs",
   "bin": {