ccclub 0.2.72 → 0.2.73

package/dist/index.js

@@ -396,6 +396,9 @@ import { execSync as execSync2, exec } from "child_process";
 import { promisify } from "util";
 import { userInfo as userInfo2 } from "os";
 var execAsync = promisify(exec);
+var debug = (...args) => {
+  if (process.env.CCCLUB_DEBUG) console.error("[usage-debug]", ...args);
+};
 function parseUtilization(value) {
   if (typeof value === "number") return Math.round(value * 100) / 100;
   if (typeof value === "string") {
@@ -406,27 +409,49 @@ function parseUtilization(value) {
 }
 async function fetchUsageLimits() {
   try {
-    const username = userInfo2().username;
+    const username = process.env.USER || process.env.USERNAME || userInfo2().username;
+    debug("username:", username);
     const raw = execSync2(
       `security find-generic-password -s "Claude Code-credentials" -a "${username}" -w`,
       { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"], timeout: 5e3 }
     ).trim();
+    debug("keychain raw length:", raw.length, "first 40:", raw.slice(0, 40));
     const credentials = JSON.parse(raw);
     const accessToken = credentials?.claudeAiOauth?.accessToken;
-    if (!accessToken || typeof accessToken !== "string") 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 expiresAt = credentials?.claudeAiOauth?.expiresAt;
+    debug("accessToken present:", !!accessToken, "expiresAt:", expiresAt);
+    if (!accessToken || typeof accessToken !== "string") {
+      debug("returning null: no accessToken");
+      return null;
+    }
+    if (expiresAt && Date.now() / 1e3 > expiresAt) {
+      debug("returning null: token expired at", expiresAt);
+      return null;
+    }
+    const curlCmd = `curl -sf --max-time 8 --noproxy '*' "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 });
-    if (!stdout5) return null;
+    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) return null;
+    if (data.error) {
+      debug("returning null: data.error =", data.error);
+      return null;
+    }
     const fiveHourRaw = data.five_hour?.utilization;
     const sevenDayRaw = data.seven_day?.utilization;
-    return {
+    const result = {
       fiveHour: parseUtilization(fiveHourRaw),
       sevenDay: parseUtilization(sevenDayRaw),
       snapshotAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-  } catch {
+    debug("returning snapshot:", result.fiveHour, result.sevenDay);
+    return result;
+  } catch (err) {
+    debug("caught error:", err instanceof Error ? err.message : String(err));
     return null;
   }
 }
@@ -856,6 +881,12 @@ async function rankCommand(options) {
       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);
         if (me) me.usageSnapshot = localSnapshot;
@@ -907,8 +938,8 @@ function printGroup(data, code, period, config, showCache = false) {
   const head = ["#", "Name", "Cost", "Tokens"];
   const widths = [5, 20, 12, 10];
   if (hasUsage) {
-    head.push("Usage (5h/7d)");
-    widths.push(14);
+    head.push("Usage 7d");
+    widths.push(10);
   }
   if (hasPlan) {
     head.push("Monthly ROI");
@@ -936,8 +967,8 @@ function printGroup(data, code, period, config, showCache = false) {
     ];
     if (hasUsage) {
       if (entry.usageSnapshot) {
-        const { fiveHour, sevenDay } = entry.usageSnapshot;
-        row.push(c(`${Math.round(fiveHour)}%/${Math.round(sevenDay)}%`));
+        const { sevenDay } = entry.usageSnapshot;
+        row.push(c(`${Math.round(sevenDay)}%`));
       } else {
         row.push(chalk6.dim("\u2014"));
       }
@@ -1307,7 +1338,7 @@ async function hookCommand() {
 }
 
 // src/index.ts
-var VERSION = "0.2.72";
+var VERSION = "0.2.73";
 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.72",
+  "version": "0.2.73",
   "type": "module",
   "description": "Claude Code leaderboard among friends",
   "bin": {