ccclub 0.2.73 → 0.2.76

package/dist/index.js

@@ -867,34 +867,40 @@ async function rankCommand(options) {
   const localUsagePromise = fetchUsageLimits().catch(() => null);
   const spinner = ora4("Loading leaderboard...").start();
   try {
-    for (let i = 0; i < codes.length; i++) {
-      const code = codes[i];
-      const tz = -(/* @__PURE__ */ new Date()).getTimezoneOffset();
-      const url = `${config.apiUrl}/api/rank/${code}?period=${period}&tz=${tz}`;
-      const res = await fetch(url, { signal: AbortSignal.timeout(15e3) });
-      if (!res.ok) {
-        if (i === 0) spinner.stop();
+    const groupResults = await Promise.all(
+      codes.map(async (code) => {
+        const tz = -(/* @__PURE__ */ new Date()).getTimezoneOffset();
+        const range = period === "weekly" ? "7d" : period === "monthly" || period === "all-time" ? "30d" : period === "yesterday" ? "yesterday" : "24h";
+        const [rankRes, activityRes] = await Promise.all([
+          fetch(`${config.apiUrl}/api/rank/${code}?period=${period}&tz=${tz}`, { signal: AbortSignal.timeout(15e3) }),
+          fetch(`${config.apiUrl}/api/activity/${code}?range=${range}&tz=${tz}`, { signal: AbortSignal.timeout(1e4) }).catch(() => null)
+        ]);
+        if (!rankRes.ok) return { code, rankData: null, activityData: null, range };
+        const rankData = await rankRes.json();
+        const activityData = activityRes?.ok ? await activityRes.json() : null;
+        return { code, rankData, activityData, range };
+      })
+    );
+    spinner.stop();
+    const localSnapshot = await localUsagePromise;
+    if (process.env.CCCLUB_DEBUG) {
+      console.error("[usage-debug] localSnapshot:", localSnapshot);
+      console.error("[usage-debug] config.userId:", config.userId);
+    }
+    for (let i = 0; i < groupResults.length; i++) {
+      const { code, rankData, activityData, range } = groupResults[i];
+      if (!rankData) {
         console.log(chalk6.red(`
   Couldn't load leaderboard for ${code}`));
         continue;
       }
-      const data = await res.json();
-      if (i === 0) spinner.stop();
-      const localSnapshot = await localUsagePromise;
-      if (process.env.CCCLUB_DEBUG) {
-        console.error("[usage-debug] localSnapshot:", localSnapshot);
-        console.error("[usage-debug] config.userId:", config.userId);
-        const dbgMe = data.rankings.find((r) => r.userId === config.userId);
-        console.error("[usage-debug] me found:", !!dbgMe, "rankings userIds:", data.rankings.map((r) => r.userId).slice(0, 3));
-      }
       if (localSnapshot) {
-        const me = data.rankings.find((r) => r.userId === config.userId);
+        const me = rankData.rankings.find((r) => r.userId === config.userId);
         if (me) me.usageSnapshot = localSnapshot;
       }
-      printGroup(data, code, period, config, options.cache);
-      const range = period === "weekly" ? "7d" : period === "monthly" || period === "all-time" ? "30d" : period === "yesterday" ? "yesterday" : "24h";
-      await printActivity(config.apiUrl, code, range);
-      if (i < codes.length - 1) console.log("");
+      printGroup(rankData, code, period, config, options.cache, options.all);
+      if (activityData) renderActivity(activityData, range);
+      if (i < groupResults.length - 1) console.log("");
     }
     console.log(chalk6.dim("\n  Tokens = input + output ") + chalk6.yellow("(cache excluded)") + chalk6.dim(". Use ") + chalk6.white("--cache") + chalk6.dim(" to include cache tokens."));
     const update = await getUpdateResult();
@@ -920,7 +926,7 @@ function formatTokens(n) {
   }
   return String(n);
 }
-function printGroup(data, code, period, config, showCache = false) {
+function printGroup(data, code, period, config, showCache = false, showAll = false) {
   if (data.rankings.length === 0) {
     console.log(chalk6.bold(`
   ${data.group.name}`));
@@ -933,26 +939,28 @@ function printGroup(data, code, period, config, showCache = false) {
   const periodLabel = { daily: "TODAY", yesterday: "YESTERDAY", weekly: "7 DAYS", monthly: "30 DAYS", "all-time": "ALL TIME" };
   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
 `));
-  const hasPlan = data.rankings.some((r) => r.plan);
-  const hasUsage = data.rankings.some((r) => r.usageSnapshot);
+  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 head = ["#", "Name", "Cost", "Tokens"];
   const widths = [5, 20, 12, 10];
-  if (hasUsage) {
-    head.push("Usage 7d");
-    widths.push(10);
-  }
   if (hasPlan) {
     head.push("Monthly ROI");
     widths.push(15);
   }
   head.push("Chats", "$/Chat");
   widths.push(8, 9);
+  if (hasUsage) {
+    head.push("Usage 7d");
+    widths.push(10);
+  }
   const table = new Table({
     head: head.map((h) => chalk6.cyan(h)),
     style: { head: [], border: [] },
     colWidths: widths
   });
-  for (const entry of data.rankings) {
+  for (const entry of activeRankings) {
     const isMe = entry.userId === config.userId;
     const tokens = showCache ? entry.totalTokens : entry.inputTokens + entry.outputTokens;
     const marker = isMe ? chalk6.green("\u2192") : " ";
@@ -965,14 +973,6 @@ function printGroup(data, code, period, config, showCache = false) {
       c(`$${entry.costUSD.toFixed(2)}`),
       c(formatTokens(tokens))
     ];
-    if (hasUsage) {
-      if (entry.usageSnapshot) {
-        const { sevenDay } = entry.usageSnapshot;
-        row.push(c(`${Math.round(sevenDay)}%`));
-      } else {
-        row.push(chalk6.dim("\u2014"));
-      }
-    }
     if (hasPlan) {
       if (entry.plan && entry.plan !== "api") {
         const price = PLAN_PRICES[entry.plan];
@@ -989,9 +989,20 @@ function printGroup(data, code, period, config, showCache = false) {
     }
     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"));
+      }
+    }
     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(chalk6.dim(`  Dashboard: ${config.apiUrl}/g/${code}`));
   if (hasPlan) {
     const me = data.rankings.find((r) => r.userId === config.userId);
@@ -1001,87 +1012,80 @@ function printGroup(data, code, period, config, showCache = false) {
   }
 }
 var SPARK_CHARS = "\u2581\u2582\u2583\u2584\u2585\u2586\u2587";
-async function printActivity(apiUrl, code, range) {
-  try {
-    const tz = -(/* @__PURE__ */ new Date()).getTimezoneOffset();
-    const res = await fetch(`${apiUrl}/api/activity/${code}?range=${range}&tz=${tz}`, { signal: AbortSignal.timeout(1e4) });
-    if (!res.ok) return;
-    const data = await res.json();
-    const active = data.series.filter((s) => s.blocks.length > 0);
-    if (active.length === 0) return;
-    const startMs = new Date(data.start).getTime();
-    const endMs = new Date(data.end).getTime();
-    const bucketCount = range === "24h" || range === "yesterday" ? 48 : range === "7d" ? 28 : 30;
-    const bucketMs = (endMs - startMs) / bucketCount;
-    const allBuckets = [];
-    for (const user of active) {
-      const buckets = new Array(bucketCount).fill(0);
-      for (const bl of user.blocks) {
-        const idx = Math.min(Math.floor((new Date(bl.t).getTime() - startMs) / bucketMs), bucketCount - 1);
-        if (idx >= 0) buckets[idx] += bl.cost;
-      }
-      allBuckets.push(buckets);
+function renderActivity(data, range) {
+  const active = data.series.filter((s) => s.blocks.length > 0);
+  if (active.length === 0) return;
+  const startMs = new Date(data.start).getTime();
+  const endMs = new Date(data.end).getTime();
+  const bucketCount = range === "24h" || range === "yesterday" ? 48 : range === "7d" ? 28 : 30;
+  const bucketMs = (endMs - startMs) / bucketCount;
+  const allBuckets = [];
+  for (const user of active) {
+    const buckets = new Array(bucketCount).fill(0);
+    for (const bl of user.blocks) {
+      const idx = Math.min(Math.floor((new Date(bl.t).getTime() - startMs) / bucketMs), bucketCount - 1);
+      if (idx >= 0) buckets[idx] += bl.cost;
     }
-    let globalMax = 0;
-    for (const buckets of allBuckets) {
-      for (const v of buckets) {
-        if (v > globalMax) globalMax = v;
-      }
+    allBuckets.push(buckets);
+  }
+  let globalMax = 0;
+  for (const buckets of allBuckets) {
+    for (const v of buckets) {
+      if (v > globalMax) globalMax = v;
     }
-    if (globalMax === 0) globalMax = 1;
-    console.log(chalk6.dim(`
+  }
+  if (globalMax === 0) globalMax = 1;
+  console.log(chalk6.dim(`
   Activity (${range})`));
-    for (let i = 0; i < active.length; i++) {
-      const user = active[i];
-      const buckets = allBuckets[i];
-      const spark = buckets.map((v) => {
-        if (v === 0) return SPARK_CHARS[0];
-        const normalized = Math.sqrt(v / globalMax);
-        const idx = 1 + Math.min(Math.floor(normalized * (SPARK_CHARS.length - 1)), SPARK_CHARS.length - 2);
-        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("");
+  for (let i = 0; i < active.length; i++) {
+    const user = active[i];
+    const buckets = allBuckets[i];
+    const spark = buckets.map((v) => {
+      if (v === 0) return SPARK_CHARS[0];
+      const normalized = Math.sqrt(v / globalMax);
+      const idx = 1 + Math.min(Math.floor(normalized * (SPARK_CHARS.length - 1)), SPARK_CHARS.length - 2);
+      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++;
       }
-      const pad = " ".repeat(Math.max(0, maxWidth - displayWidth));
-      console.log(`  ${chalk6.dim(name + pad)} ${spark}  ${chalk6.dim("$" + total.toFixed(2))}`);
+      name = [...name].slice(0, cut).join("");
     }
-    const axisArr = new Array(bucketCount).fill(" ");
-    if (range === "24h" || range === "yesterday") {
-      for (let b = 0; b < bucketCount; b += 12) {
-        const t = new Date(startMs + b * bucketMs);
-        const label = `${t.getHours()}h`;
-        for (let c = 0; c < label.length && b + c < bucketCount; c++) axisArr[b + c] = label[c];
-      }
-    } else if (range === "7d") {
-      const dayNames = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-      for (let b = 0; b < bucketCount; b += 4) {
-        const t = new Date(startMs + b * bucketMs);
-        const label = dayNames[t.getDay()];
-        for (let c = 0; c < label.length && b + c < bucketCount; c++) axisArr[b + c] = label[c];
-      }
-    } else {
-      for (let b = 0; b < bucketCount; b += 7) {
-        const t = new Date(startMs + b * bucketMs);
-        const label = `${t.getMonth() + 1}/${t.getDate()}`;
-        for (let c = 0; c < label.length && b + c < bucketCount; c++) axisArr[b + c] = label[c];
-      }
+    const pad = " ".repeat(Math.max(0, maxWidth - displayWidth));
+    console.log(`  ${chalk6.dim(name + pad)} ${spark}  ${chalk6.dim("$" + total.toFixed(2))}`);
+  }
+  const axisArr = new Array(bucketCount).fill(" ");
+  if (range === "24h" || range === "yesterday") {
+    for (let b = 0; b < bucketCount; b += 12) {
+      const t = new Date(startMs + b * bucketMs);
+      const label = `${t.getHours()}h`;
+      for (let c = 0; c < label.length && b + c < bucketCount; c++) axisArr[b + c] = label[c];
+    }
+  } else if (range === "7d") {
+    const dayNames = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+    for (let b = 0; b < bucketCount; b += 4) {
+      const t = new Date(startMs + b * bucketMs);
+      const label = dayNames[t.getDay()];
+      for (let c = 0; c < label.length && b + c < bucketCount; c++) axisArr[b + c] = label[c];
+    }
+  } else {
+    for (let b = 0; b < bucketCount; b += 7) {
+      const t = new Date(startMs + b * bucketMs);
+      const label = `${t.getMonth() + 1}/${t.getDate()}`;
+      for (let c = 0; c < label.length && b + c < bucketCount; c++) axisArr[b + c] = label[c];
     }
-    console.log(chalk6.dim("  " + " ".repeat(12) + " " + axisArr.join("")));
-  } catch {
   }
+  console.log(chalk6.dim("  " + " ".repeat(12) + " " + axisArr.join("")));
 }
 
 // src/commands/profile.ts
@@ -1338,11 +1342,11 @@ async function hookCommand() {
 }
 
 // src/index.ts
-var VERSION = "0.2.73";
+var VERSION = "0.2.76";
 startUpdateCheck(VERSION);
 var program = new Command();
 program.name("ccclub").description("Claude Code leaderboard among friends").version(VERSION, "-v, -V, --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").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").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) => {
   if (!code) {
@@ -1373,6 +1377,7 @@ Leaderboard options:
   -g <code>                Show a specific group
   --global                 Global public leaderboard
   --cache                  Include cache tokens in total
+  --all                    Show all members including inactive ones
 
 Examples:
   $ ccclub                 Show today's leaderboard (default)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccclub",
-  "version": "0.2.73",
+  "version": "0.2.76",
   "type": "module",
   "description": "Claude Code leaderboard among friends",
   "bin": {