ccclub 0.3.14 → 0.3.16

package/dist/index.js

@@ -1709,8 +1709,10 @@ async function getUpdateResult() {
 
 // src/commands/rank.ts
 var ACTIVE_THRESHOLD_MS = 15 * 60 * 1e3;
+var AGENT_ORDER = ["claude", "codex", "opencode", "amp", "pi"];
 async function rankCommand(options) {
   const config = await requireConfig();
+  const includeCache = options.cache !== false;
   if (!isHookInstalled()) await installHook();
   if (!isHeartbeatInstalled()) await installHeartbeat();
   if (needsFullSync()) {
@@ -1805,11 +1807,15 @@ async function rankCommand(options) {
         const me = rankData.rankings.find((r) => r.userId === config.userId);
         if (me) me.usageSnapshot = localSnapshot;
       }
-      printGroup(rankData, code, period, config, options.cache, options.all);
+      printGroup(rankData, code, period, config, includeCache, options.all);
       if (activityData) renderActivity(activityData, range);
       if (i < groupResults.length - 1) console.log("");
     }
-    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."));
+    if (includeCache) {
+      console.log(theme.muted("\n  Tokens include cache by default. Use ") + theme.text("--no-cache") + theme.muted(" to show input + output + reasoning only."));
+    } else {
+      console.log(theme.muted("\n  Tokens = input + output + reasoning ") + theme.warning("(cache excluded)") + theme.muted(". Cost still includes cache."));
+    }
     const update = await getUpdateResult();
     if (update) {
       console.log(theme.warningBold("\n  Update available") + theme.muted(`: ${update.current} \u2192 ${update.latest}  Run `) + theme.linkText("npm i -g ccclub@latest"));
@@ -1833,7 +1839,7 @@ function formatTokens(n) {
   }
   return String(n);
 }
-function printGroup(data, code, period, config, showCache = false, showAll = false) {
+function printGroup(data, code, period, config, showCache = true, showAll = false) {
   if (data.rankings.length === 0) {
     console.log(theme.title(`
   ${data.group.name}`));
@@ -1845,10 +1851,12 @@ function printGroup(data, code, period, config, showCache = false, showAll = fal
   ${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) => isEntryActive(r, now)).length;
+  const activeEntries = data.rankings.filter((r) => isEntryActive(r, now));
+  const activeCount = activeEntries.length;
   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(theme.success(`  ${activeCount} active`));
+    const activeSplit = formatActiveSourceSplit(activeEntries);
+    console.log(theme.success(`  ${activeCount} active`) + (activeSplit ? ` ${activeSplit}` : ""));
   }
   console.log("");
   const activeRankings = showAll || data.rankings.length <= 15 ? data.rankings : data.rankings.filter((r) => r.costUSD > 0 || r.userId === config.userId);
@@ -1945,6 +1953,34 @@ function isEntryActive(entry, now) {
   const activeAt = new Date(value).getTime();
   return Number.isFinite(activeAt) && now - activeAt < ACTIVE_THRESHOLD_MS;
 }
+function activeSourceForEntry(entry) {
+  return entry.lastActiveSource ?? entry.agents?.[0];
+}
+function formatActiveSourceSplit(entries) {
+  const counts = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const source = activeSourceForEntry(entry);
+    if (!source) continue;
+    counts.set(source, (counts.get(source) ?? 0) + 1);
+  }
+  const sources = AGENT_ORDER.filter((source) => (counts.get(source) ?? 0) > 0);
+  if (sources.length === 0) return "";
+  if (sources.length === 2 && sources.includes("claude") && sources.includes("codex")) {
+    return [
+      theme.muted("Claude"),
+      theme.successBold(String(counts.get("claude") ?? 0)) + theme.faint(":"),
+      theme.successBold(String(counts.get("codex") ?? 0)),
+      theme.muted("Codex")
+    ].join(" ");
+  }
+  return sources.map((source) => formatActiveSourceScore(source, counts.get(source) ?? 0, false)).join(theme.faint(" \xB7 "));
+}
+function formatActiveSourceScore(source, count, countFirst) {
+  const icon = source === "claude" ? theme.gold("\u25CF") : source === "codex" ? theme.linkText("\u25CF") : theme.success("\u25CF");
+  const label = source === "claude" ? "Claude" : formatAgentLabel(source);
+  const coloredCount = theme.successBold(String(count));
+  return countFirst ? `${coloredCount} ${icon} ${theme.muted(label)}` : `${icon} ${theme.muted(label)} ${coloredCount}`;
+}
 function podiumStyle(rank) {
   if (rank === 1) return theme.gold;
   if (rank === 2) return theme.silver;
@@ -2357,7 +2393,7 @@ async function hookCommand() {
 }
 
 // src/index.ts
-var VERSION = "0.3.14";
+var VERSION = "0.3.16";
 startUpdateCheck(VERSION);
 var program = new Command();
 if (process.argv.slice(2).includes("-v")) {
@@ -2365,7 +2401,7 @@ if (process.argv.slice(2).includes("-v")) {
   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("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").addOption(new Option("--cache", "Include cache tokens in count (default)").hideHelp()).option("--no-cache", "Exclude cache tokens from token counts").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) => {
   if (!code) {
@@ -2402,7 +2438,7 @@ Leaderboard options:
   -d <period>              Time window: 1 | 7 | 30 | all (default: today)
   -g <code>                Show a specific group
   --global                 Global public leaderboard
-  --cache                  Include cache tokens in total
+  --no-cache               Exclude cache tokens from token totals
   --all                    Show all members including inactive ones
 
 Examples:

package/package.json

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