ccclub 0.3.7 → 0.3.9

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command, Option } from "commander";
 // src/commands/init.ts
 import { createInterface as createInterface2 } from "readline/promises";
 import { stdin, stdout } from "process";
-import chalk4 from "chalk";
+import chalk5 from "chalk";
 import ora2 from "ora";
 
 // src/config.ts
@@ -991,6 +991,7 @@ function aggregateSourceToBlocks(source, entries, humanTurns) {
     let reasoningTokens = 0;
     let totalTokens = 0;
     let costUSD = 0;
+    let lastActivityMs = 0;
     for (const entry of currentBlock) {
       inputTokens += entry.inputTokens;
       outputTokens += entry.outputTokens;
@@ -1011,11 +1012,14 @@ function aggregateSourceToBlocks(source, entries, humanTurns) {
           entry.reasoningTokens || 0
         );
       }
+      const entryMs = new Date(entry.timestamp).getTime();
+      if (Number.isFinite(entryMs) && entryMs > lastActivityMs) lastActivityMs = entryMs;
     }
     blocks.push({
       source,
       blockStart: blockStart.toISOString(),
       blockEnd: blockEnd.toISOString(),
+      lastActivityAt: new Date(lastActivityMs || blockEnd.getTime()).toISOString(),
       inputTokens,
       outputTokens,
       cacheCreationTokens,
@@ -1355,7 +1359,32 @@ function getLatestBlockStartBySource(blocks) {
 
 // src/global-install.ts
 import { exec as exec2 } from "child_process";
+import chalk4 from "chalk";
+
+// src/theme.ts
 import chalk3 from "chalk";
+var theme = {
+  title: chalk3.hex("#F1EDE7").bold,
+  text: chalk3.hex("#E8E4DE"),
+  muted: chalk3.hex("#8A8480"),
+  faint: chalk3.hex("#5A5550"),
+  brand: chalk3.hex("#D4935E"),
+  link: chalk3.hex("#7AB7C6").underline,
+  linkText: chalk3.hex("#7AB7C6"),
+  success: chalk3.hex("#63B486"),
+  successBold: chalk3.hex("#63B486").bold,
+  gold: chalk3.hex("#D6B56D"),
+  goldBold: chalk3.hex("#D6B56D").bold,
+  silver: chalk3.hex("#AEB7BF"),
+  silverBold: chalk3.hex("#AEB7BF").bold,
+  bronze: chalk3.hex("#C58A61"),
+  bronzeBold: chalk3.hex("#C58A61"),
+  warning: chalk3.hex("#D4A85C"),
+  warningBold: chalk3.hex("#D4A85C").bold,
+  danger: chalk3.hex("#D26A6A")
+};
+
+// src/global-install.ts
 function run(cmd) {
   return new Promise((resolve2) => {
     exec2(cmd, (err, stdout5) => resolve2(err ? "" : stdout5.trim()));
@@ -1364,13 +1393,13 @@ function run(cmd) {
 async function ensureGlobalInstall() {
   const globalList = await run("npm list -g ccclub --depth=0");
   if (globalList.includes("ccclub@")) return;
-  console.log(chalk3.dim("\n  Installing ccclub globally so you can run it directly..."));
+  console.log(chalk4.dim("\n  Installing ccclub globally so you can run it directly..."));
   const result = await run("npm install -g ccclub");
   if (result) {
-    console.log(chalk3.green("  Done!") + chalk3.dim(" You can now use ") + chalk3.white("ccclub") + chalk3.dim(" directly."));
+    console.log(theme.success("  Done!") + chalk4.dim(" You can now use ") + theme.text("ccclub") + chalk4.dim(" directly."));
   } else {
-    console.log(chalk3.dim("  Could not auto-install. Run manually:"));
-    console.log(chalk3.white("    npm install -g ccclub"));
+    console.log(chalk4.dim("  Could not auto-install. Run manually:"));
+    console.log(theme.text("    npm install -g ccclub"));
   }
 }
 
@@ -1378,28 +1407,28 @@ async function ensureGlobalInstall() {
 async function initCommand() {
   const existing = await loadConfig();
   if (existing) {
-    console.log(chalk4.yellow("Already initialized!"));
+    console.log(chalk5.yellow("Already initialized!"));
     console.log(`  User: ${existing.displayName}`);
     console.log(`  Groups: ${existing.groups.join(", ") || "(none)"}`);
     if (!isHookInstalled()) {
       const hookOk = await installHook();
-      if (hookOk) console.log(chalk4.green("  Auto-sync hook installed!"));
+      if (hookOk) console.log(chalk5.green("  Auto-sync hook installed!"));
     }
     if (!isHeartbeatInstalled()) {
       const heartbeatOk = await installHeartbeat();
-      if (heartbeatOk) console.log(chalk4.green("  Background sync installed!"));
+      if (heartbeatOk) console.log(chalk5.green("  Background sync installed!"));
     }
-    console.log(chalk4.dim('\n  Run "ccclub" to see the leaderboard'));
+    console.log(chalk5.dim('\n  Run "ccclub" to see the leaderboard'));
     return;
   }
   const rl = createInterface2({ input: stdin, output: stdout });
   try {
     const defaultName = getDefaultDisplayName();
-    const prompt = defaultName ? chalk4.bold(`Your display name (${defaultName}): `) : chalk4.bold("Your display name: ");
+    const prompt = defaultName ? chalk5.bold(`Your display name (${defaultName}): `) : chalk5.bold("Your display name: ");
     const input = await rl.question(prompt);
     const displayName = input.trim() || defaultName || "";
     if (!displayName) {
-      console.error(chalk4.red("Name cannot be empty"));
+      console.error(chalk5.red("Name cannot be empty"));
       return;
     }
     const spinner = ora2("Setting up...").start();
@@ -1436,17 +1465,17 @@ async function initCommand() {
     ]);
     spinner.succeed("ccclub initialized!");
     if (!hookOk) {
-      console.log(chalk4.dim('  Tip: run "ccclub hook" to set up auto-sync'));
+      console.log(chalk5.dim('  Tip: run "ccclub hook" to set up auto-sync'));
     }
     if (!heartbeatOk) {
-      console.log(chalk4.dim('  Tip: run "ccclub sync" manually to refresh non-Claude agent usage'));
+      console.log(chalk5.dim('  Tip: run "ccclub sync" manually to refresh non-Claude agent usage'));
     }
     console.log("");
-    console.log(chalk4.bold("  Invite friends to compete:"));
+    console.log(chalk5.bold("  Invite friends to compete:"));
     console.log("");
-    console.log(`    ${chalk4.cyan.underline(`${apiUrl}/invite/${data.groupCode}`)}`);
+    console.log(`    ${theme.link(`${apiUrl}/invite/${data.groupCode}`)}`);
     console.log("");
-    console.log(chalk4.dim(`    or: npx ccclub join ${data.groupCode}`));
+    console.log(chalk5.dim(`    or: npx ccclub join ${data.groupCode}`));
     console.log("");
     await doSync(true);
     await ensureGlobalInstall();
@@ -1457,14 +1486,14 @@ async function initCommand() {
 }
 function printQuickStart() {
   console.log("");
-  console.log(chalk4.dim("  Run ") + chalk4.white("ccclub") + chalk4.dim(" to see the leaderboard. ") + chalk4.white("ccclub -h") + chalk4.dim(" for all commands."));
+  console.log(chalk5.dim("  Run ") + theme.text("ccclub") + chalk5.dim(" to see the leaderboard. ") + theme.text("ccclub -h") + chalk5.dim(" for all commands."));
   console.log("");
 }
 
 // src/commands/join.ts
 import { createInterface as createInterface3 } from "readline/promises";
 import { stdin as stdin2, stdout as stdout2 } from "process";
-import chalk5 from "chalk";
+import chalk6 from "chalk";
 import ora3 from "ora";
 async function joinCommand(inviteCode) {
   let config = await loadConfig();
@@ -1478,11 +1507,11 @@ async function joinCommand(inviteCode) {
     const rl = createInterface3({ input: stdin2, output: stdout2 });
     try {
       const defaultName = getDefaultDisplayName();
-      const prompt = defaultName ? chalk5.bold(`Your display name (${defaultName}): `) : chalk5.bold("Your display name: ");
+      const prompt = defaultName ? chalk6.bold(`Your display name (${defaultName}): `) : chalk6.bold("Your display name: ");
       const input = await rl.question(prompt);
       displayName = input.trim() || defaultName || "";
       if (!displayName) {
-        console.error(chalk5.red("Name cannot be empty"));
+        console.error(chalk6.red("Name cannot be empty"));
         return;
       }
     } finally {
@@ -1531,12 +1560,11 @@ async function joinCommand(inviteCode) {
     await ensureGlobalInstall();
   }
   console.log("");
-  console.log(chalk5.dim("  Run ") + chalk5.white("ccclub") + chalk5.dim(" to see the leaderboard. ") + chalk5.white("ccclub -h") + chalk5.dim(" for all commands."));
+  console.log(chalk6.dim("  Run ") + chalk6.white("ccclub") + chalk6.dim(" to see the leaderboard. ") + chalk6.white("ccclub -h") + chalk6.dim(" for all commands."));
   console.log("");
 }
 
 // src/commands/rank.ts
-import chalk6 from "chalk";
 import Table from "cli-table3";
 import ora4 from "ora";
 
@@ -1595,11 +1623,11 @@ async function rankCommand(options) {
   Usage:  ccclub -d <period>
 
   Options:
-    ${chalk6.white("ccclub -d 1")}     Yesterday
-    ${chalk6.white("ccclub -d 7")}     Last 7 days
-    ${chalk6.white("ccclub -d 30")}    Last 30 days
-    ${chalk6.white("ccclub -d all")}   All time
-    ${chalk6.white("ccclub")}          Today (default)
+    ${theme.text("ccclub -d 1")}     Yesterday
+    ${theme.text("ccclub -d 7")}     Last 7 days
+    ${theme.text("ccclub -d 30")}    Last 30 days
+    ${theme.text("ccclub -d all")}   All time
+    ${theme.text("ccclub")}          Today (default)
 `;
   if (options.days) {
     if (options.days === true) {
@@ -1609,7 +1637,7 @@ async function rankCommand(options) {
     const DAYS_MAP = { "1": "yesterday", "7": "weekly", "30": "monthly", "all": "all-time" };
     const mapped = DAYS_MAP[options.days];
     if (!mapped) {
-      console.log(chalk6.red(`
+      console.log(theme.danger(`
   Unknown value: -d ${options.days}`));
       console.log(DAYS_HINT);
       return;
@@ -1633,7 +1661,7 @@ async function rankCommand(options) {
     codes = config.groups.length > 0 ? config.groups : [];
   }
   if (codes.length === 0) {
-    console.log(chalk6.red("No group found. Run 'ccclub init' or 'ccclub join <code>' first."));
+    console.log(theme.danger("No group found. Run 'ccclub init' or 'ccclub join <code>' first."));
     return;
   }
   const localUsagePromise = fetchUsageLimits().catch(() => null);
@@ -1671,7 +1699,7 @@ async function rankCommand(options) {
     for (let i = 0; i < groupResults.length; i++) {
       const { code, rankData, activityData, range } = groupResults[i];
       if (!rankData) {
-        console.log(chalk6.red(`
+        console.log(theme.danger(`
   Couldn't load leaderboard for ${code}`));
         continue;
       }
@@ -1683,10 +1711,10 @@ async function rankCommand(options) {
       if (activityData) renderActivity(activityData, range);
       if (i < groupResults.length - 1) console.log("");
     }
-    console.log(chalk6.dim("\n  Tokens = input + output + reasoning ") + chalk6.yellow("(cache excluded)") + chalk6.dim(". Use ") + chalk6.white("--cache") + chalk6.dim(" to include cache tokens."));
+    console.log(theme.muted("\n  Tokens = input + output + reasoning ") + theme.warning("(cache excluded)") + theme.muted(". Use ") + theme.text("--cache") + theme.muted(" to include cache tokens."));
     const update = await getUpdateResult();
     if (update) {
-      console.log(chalk6.yellow("\n  Update available") + chalk6.dim(`: ${update.current} \u2192 ${update.latest}  Run `) + chalk6.cyan("npm i -g ccclub@latest"));
+      console.log(theme.warningBold("\n  Update available") + theme.muted(`: ${update.current} \u2192 ${update.latest}  Run `) + theme.linkText("npm i -g ccclub@latest"));
     }
   } catch (err) {
     spinner.fail(`Error: ${formatFetchError(err)}`);
@@ -1709,20 +1737,20 @@ function formatTokens(n) {
 }
 function printGroup(data, code, period, config, showCache = false, showAll = false) {
   if (data.rankings.length === 0) {
-    console.log(chalk6.bold(`
+    console.log(theme.title(`
   ${data.group.name}`));
-    console.log(chalk6.yellow("  No data for this period yet"));
-    console.log(chalk6.dim("  Sync your data first: ccclub sync"));
+    console.log(theme.warning("  No data for this period yet"));
+    console.log(theme.muted("  Sync your data first: ccclub sync"));
     return;
   }
-  console.log(chalk6.bold(`
+  console.log(theme.title(`
   ${data.group.name}`));
   const periodLabel = { daily: "TODAY", yesterday: "YESTERDAY", weekly: "7 DAYS", monthly: "30 DAYS", "all-time": "ALL TIME" };
   const now = Date.now();
   const activeCount = data.rankings.filter((r) => r.lastSync && now - new Date(r.lastSync).getTime() < ACTIVE_THRESHOLD_MS).length;
-  console.log(chalk6.dim(`  ${periodLabel[period] || period.toUpperCase()} \xB7 ${data.start.slice(0, 10)} \u2192 ${data.end.slice(0, 10)} \xB7 ${data.group.memberCount} members`));
+  console.log(theme.muted(`  ${periodLabel[period] || period.toUpperCase()} \xB7 ${data.start.slice(0, 10)} \u2192 ${data.end.slice(0, 10)} \xB7 ${data.group.memberCount} members`));
   if (activeCount > 0) {
-    console.log(chalk6.green(`  ${activeCount} active`));
+    console.log(theme.success(`  ${activeCount} active`));
   }
   console.log("");
   const activeRankings = showAll || data.rankings.length <= 15 ? data.rankings : data.rankings.filter((r) => r.costUSD > 0 || r.userId === config.userId);
@@ -1769,53 +1797,65 @@ function printGroup(data, code, period, config, showCache = false, showAll = fal
     columnWidth("$/Turn", plainRows.map((r) => r.perTurn), 6, 7)
   );
   const table = new Table({
-    head: head.map((h) => chalk6.cyan(h)),
-    style: { head: [], border: [] },
+    head: head.map((h) => theme.linkText(h)),
+    style: { head: [], border: ["gray"] },
     colWidths: widths
   });
   for (const plain of plainRows) {
     const { entry } = plain;
     const isMe = entry.userId === config.userId;
-    const marker = isMe ? chalk6.green("\u2192") : " ";
-    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 rowStyle = isMe ? theme.success : podiumStyle(entry.rank);
+    const nameStyle = isMe ? theme.successBold : podiumNameStyle(entry.rank);
+    const rankStyle = podiumNameStyle(entry.rank);
+    const marker = isMe ? theme.success("\u2192") : " ";
     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 displayName = plain.isActive ? `${theme.success("\u25CF")} ${nameStyle(truncateDisplay(entry.displayName, Math.max(nameWidth - 2, 1)))}` : nameStyle(truncateDisplay(entry.displayName, nameWidth));
     const row = [
-      `${marker}${c(String(entry.rank))}`,
+      `${marker}${rankStyle(String(entry.rank))}`,
       displayName
     ];
     if (hasAgents) {
       const agentWidth = Math.max(widths[2] - 2, 4);
-      row.push(c(truncateDisplay(plain.agents, agentWidth)));
+      row.push(rowStyle(truncateDisplay(plain.agents, agentWidth)));
     }
-    row.push(c(plain.cost), c(plain.tokens));
+    row.push(rowStyle(plain.cost), rowStyle(plain.tokens));
     if (hasPlan) {
       row.push(colorRoi(plain.roi, entry));
     }
-    row.push(c(plain.turns));
-    row.push(entry.chatCount > 0 ? c(plain.perTurn) : chalk6.dim("\u2014"));
+    row.push(rowStyle(plain.turns));
+    row.push(entry.chatCount > 0 ? rowStyle(plain.perTurn) : theme.faint("\u2014"));
     table.push(row);
   }
   console.log(table.toString());
   if (hiddenCount > 0) {
-    console.log(chalk6.dim(`  ${hiddenCount} inactive member${hiddenCount > 1 ? "s" : ""} hidden \xB7 ccclub --all to show`));
+    console.log(theme.muted(`  ${hiddenCount} inactive member${hiddenCount > 1 ? "s" : ""} hidden \xB7 ccclub --all to show`));
   }
-  console.log(chalk6.dim("  Dashboard: ") + chalk6.green(`${config.apiUrl}/g/${code}`));
+  console.log(theme.muted("  Dashboard: ") + theme.link(`${config.apiUrl}/g/${code}`));
   if (code !== "global") {
-    console.log(chalk6.dim("  Invite:    ") + chalk6.hex("#d4935e").underline(`${config.apiUrl}/invite/${code}`));
+    console.log(theme.muted("  Invite:    ") + theme.link(`${config.apiUrl}/invite/${code}`));
   }
   if (hasPlan) {
     const me = data.rankings.find((r) => r.userId === config.userId);
     if (me && !me.plan) {
-      console.log(chalk6.dim("  Set your plan: ") + chalk6.white("ccclub profile --plan pro|max100|max200|api"));
+      console.log(theme.muted("  Set your plan: ") + theme.text("ccclub profile --plan pro|max100|max200|api"));
     }
   }
 }
 function isEntryActive(entry, now) {
   return Boolean(entry.lastSync && now - new Date(entry.lastSync).getTime() < ACTIVE_THRESHOLD_MS);
 }
+function podiumStyle(rank) {
+  if (rank === 1) return theme.gold;
+  if (rank === 2) return theme.silver;
+  if (rank === 3) return theme.bronze;
+  return theme.text;
+}
+function podiumNameStyle(rank) {
+  if (rank === 1) return theme.goldBold;
+  if (rank === 2) return theme.silverBold;
+  if (rank === 3) return theme.bronzeBold;
+  return theme.text;
+}
 function formatRoi(entry, hasPlan) {
   if (!hasPlan) return "";
   if (entry.plan && entry.plan !== "api") {
@@ -1832,9 +1872,9 @@ function colorRoi(roiStr, entry) {
     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 roi >= 100 ? theme.successBold(roiStr) : roi >= 50 ? theme.warning(roiStr) : theme.faint(roiStr);
   }
-  return chalk6.dim(roiStr);
+  return theme.faint(roiStr);
 }
 function formatAgents(entry) {
   if (entry.agentBreakdown && entry.agentBreakdown.length > 0) {
@@ -1908,7 +1948,7 @@ function renderActivity(data, range) {
     }
   }
   if (globalMax === 0) globalMax = 1;
-  console.log(chalk6.dim(`
+  console.log(theme.muted(`
   Activity (${range})`));
   for (let i = 0; i < active.length; i++) {
     const user = active[i];
@@ -1920,22 +1960,10 @@ function renderActivity(data, range) {
       return SPARK_CHARS[idx];
     }).join("");
     const total = user.blocks.reduce((s, b) => s + b.cost, 0);
-    const displayWidth = [...user.displayName].reduce((w, ch) => w + (ch.charCodeAt(0) > 127 ? 2 : 1), 0);
     const maxWidth = 12;
-    let name = user.displayName;
-    if (displayWidth > maxWidth) {
-      let w = 0;
-      let cut = 0;
-      for (const ch of name) {
-        const cw = ch.charCodeAt(0) > 127 ? 2 : 1;
-        if (w + cw > maxWidth) break;
-        w += cw;
-        cut++;
-      }
-      name = [...name].slice(0, cut).join("");
-    }
-    const pad = " ".repeat(Math.max(0, maxWidth - displayWidth));
-    console.log(`  ${chalk6.dim(name + pad)} ${spark}  ${chalk6.dim("$" + total.toFixed(2))}`);
+    const name = truncateDisplay(user.displayName, maxWidth);
+    const pad = " ".repeat(Math.max(0, maxWidth - visualWidth(name)));
+    console.log(`  ${theme.muted(name + pad)} ${theme.brand(spark)}  ${theme.muted("$" + total.toFixed(2))}`);
   }
   const axisArr = new Array(bucketCount).fill(" ");
   if (range === "24h" || range === "yesterday") {
@@ -1958,7 +1986,7 @@ function renderActivity(data, range) {
       for (let c = 0; c < label.length && b + c < bucketCount; c++) axisArr[b + c] = label[c];
     }
   }
-  console.log(chalk6.dim("  " + " ".repeat(12) + " " + axisArr.join("")));
+  console.log(theme.faint("  " + " ".repeat(12) + " " + axisArr.join("")));
 }
 
 // src/commands/profile.ts
@@ -2128,7 +2156,7 @@ async function createGroupCommand() {
     }
     spinner.succeed(`Created "${data.groupName}"`);
     console.log("");
-    console.log(`    ${chalk9.cyan.underline(`${config.apiUrl}/invite/${data.groupCode}`)}`);
+    console.log(`    ${theme.link(`${config.apiUrl}/invite/${data.groupCode}`)}`);
     console.log("");
     console.log(chalk9.dim(`    or: npx ccclub join ${data.groupCode}`));
   } finally {
@@ -2228,7 +2256,7 @@ async function hookCommand() {
 }
 
 // src/index.ts
-var VERSION = "0.3.7";
+var VERSION = "0.3.9";
 startUpdateCheck(VERSION);
 var program = new Command();
 if (process.argv.slice(2).includes("-v")) {

package/package.json

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