ccclub 0.2.80 → 0.2.82

package/dist/index.js

@@ -452,45 +452,42 @@ async function fetchUsageLimits() {
       debug("returning null: token expired at", expiresAt);
       return null;
     }
-    const curlCmd = `curl -sf --max-time 8 "https://api.anthropic.com/api/oauth/usage" -H "Authorization: Bearer ${accessToken}" -H "anthropic-beta: oauth-2025-04-20" -H "User-Agent: claude-code/2.1.5"`;
+    const curlCmd = `curl -s --max-time 8 "https://api.anthropic.com/api/oauth/usage" -H "Authorization: Bearer ${accessToken}" -H "anthropic-beta: oauth-2025-04-20" -H "User-Agent: claude-code/2.1.5"`;
     debug("running curl...");
     const { stdout: stdout5 } = await execAsync(curlCmd, { timeout: 9e3 });
     debug("curl stdout length:", stdout5.length, "first 100:", stdout5.slice(0, 100));
-    if (!stdout5) {
-      debug("returning null: empty stdout");
-      return null;
-    }
-    const data = JSON.parse(stdout5);
-    if (data.error) {
-      debug("returning null: data.error =", data.error);
-      return null;
-    }
-    const fiveHourRaw = data.five_hour?.utilization;
-    const sevenDayRaw = data.seven_day?.utilization;
-    const result = {
-      fiveHour: parseUtilization(fiveHourRaw),
-      sevenDay: parseUtilization(sevenDayRaw),
-      snapshotAt: (/* @__PURE__ */ new Date()).toISOString()
-    };
-    debug("returning snapshot:", result.fiveHour, result.sevenDay);
-    writeCache(result);
-    return result;
-  } catch (err) {
-    debug("caught error:", err instanceof Error ? err.message : String(err));
-    try {
-      const tmp = JSON.parse(readFileSync2("/tmp/sl-claude-usage", "utf-8"));
-      if (typeof tmp.fiveHour === "number" && typeof tmp.sevenDay === "number") {
-        const result = { fiveHour: tmp.fiveHour, sevenDay: tmp.sevenDay, snapshotAt: (/* @__PURE__ */ new Date()).toISOString() };
-        debug("returning cc-costline cache fallback:", result.fiveHour, result.sevenDay);
+    if (stdout5) {
+      const data = JSON.parse(stdout5);
+      if (!data.error) {
+        const fiveHourRaw = data.five_hour?.utilization;
+        const sevenDayRaw = data.seven_day?.utilization;
+        const result = {
+          fiveHour: parseUtilization(fiveHourRaw),
+          sevenDay: parseUtilization(sevenDayRaw),
+          snapshotAt: (/* @__PURE__ */ new Date()).toISOString()
+        };
+        debug("returning snapshot:", result.fiveHour, result.sevenDay);
         writeCache(result);
         return result;
       }
-    } catch {
+      debug("API error response:", data.error);
     }
-    const stale = readCache(true);
-    if (stale) debug("returning stale cache as fallback:", stale.fiveHour, stale.sevenDay);
-    return stale;
+  } catch (err) {
+    debug("caught error:", err instanceof Error ? err.message : String(err));
+  }
+  try {
+    const tmp = JSON.parse(readFileSync2("/tmp/sl-claude-usage", "utf-8"));
+    if (typeof tmp.fiveHour === "number" && typeof tmp.sevenDay === "number") {
+      const result = { fiveHour: tmp.fiveHour, sevenDay: tmp.sevenDay, snapshotAt: (/* @__PURE__ */ new Date()).toISOString() };
+      debug("returning cc-costline cache fallback:", result.fiveHour, result.sevenDay);
+      writeCache(result);
+      return result;
+    }
+  } catch {
   }
+  const stale = readCache(true);
+  if (stale) debug("returning stale cache as fallback:", stale.fiveHour, stale.sevenDay);
+  return stale;
 }
 
 // src/commands/sync.ts
@@ -858,6 +855,7 @@ async function getUpdateResult() {
 }
 
 // src/commands/rank.ts
+var ACTIVE_THRESHOLD_MS = 15 * 60 * 1e3;
 async function rankCommand(options) {
   const config = await requireConfig();
   if (!isHookInstalled()) await installHook();
@@ -992,14 +990,20 @@ function printGroup(data, code, period, config, showCache = false, showAll = fal
   console.log(chalk6.bold(`
   ${data.group.name}`));
   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 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`));
+  if (activeCount > 0) {
+    console.log(chalk6.green(`  ${activeCount} active`));
+  }
+  console.log("");
   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];
+  const hasActive = activeRankings.some((r) => r.lastSync && now - new Date(r.lastSync).getTime() < ACTIVE_THRESHOLD_MS);
+  const widths = [5, hasActive ? 30 : 20, 12, 10];
   if (hasPlan) {
     head.push("Monthly ROI");
     widths.push(15);
@@ -1019,12 +1023,14 @@ function printGroup(data, code, period, config, showCache = false, showAll = fal
     const isMe = entry.userId === config.userId;
     const tokens = showCache ? entry.totalTokens : entry.inputTokens + entry.outputTokens;
     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 row = [
       `${marker}${c(String(entry.rank))}`,
-      nameC(entry.displayName),
+      nameC(displayName),
       c(`$${entry.costUSD.toFixed(2)}`),
       c(formatTokens(tokens))
     ];
@@ -1397,7 +1403,7 @@ async function hookCommand() {
 }
 
 // src/index.ts
-var VERSION = "0.2.80";
+var VERSION = "0.2.82";
 startUpdateCheck(VERSION);
 var program = new Command();
 program.name("ccclub").description("Claude Code leaderboard among friends").version(VERSION, "-v, -V, --version");

package/package.json

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