cc-costline 0.3.0 → 0.3.2

package/dist/statusline.js

@@ -1,4 +1,4 @@
-import { readFileSync, existsSync, statSync, writeFileSync, unlinkSync } from "node:fs";
+import { readFileSync, existsSync, writeFileSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
 import { execSync } from "node:child_process";
@@ -46,44 +46,52 @@ export function formatCountdown(resetsAtMs) {
     const minutes = totalMinutes % 60;
     return `-${hours}:${String(minutes).padStart(2, "0")}`;
 }
-// ccclub rank fetcher with 120s file cache
-function getCcclubRank() {
+// ccclub rank fetcher — cached per session (stale fallback on failure)
+function getCcclubRank(sessionId) {
     const configPath = join(homedir(), ".ccclub", "config.json");
     if (!existsSync(configPath))
         return null;
     const cacheFile = "/tmp/sl-ccclub-rank";
-    const now = Date.now() / 1000;
+    let staleData = null;
     if (existsSync(cacheFile)) {
-        const mtime = statSync(cacheFile).mtimeMs / 1000;
-        if (now - mtime <= 120) {
-            try {
-                return JSON.parse(readFileSync(cacheFile, "utf-8"));
-            }
-            catch { }
+        try {
+            const cached = JSON.parse(readFileSync(cacheFile, "utf-8"));
+            staleData = cached.data ?? null;
+            if (cached.sessionId === sessionId)
+                return staleData;
+            // If cache is less than 2 minutes old, reuse it to avoid rate limits
+            const cacheAge = Date.now() - (cached.timestamp || 0);
+            if (cacheAge < 600_000)
+                return staleData;
         }
+        catch { }
     }
     try {
         const config = JSON.parse(readFileSync(configPath, "utf-8"));
         const code = config.groups?.[0];
         const userId = config.userId;
         if (!code || !userId)
-            return null;
+            return staleData;
         const tz = -(new Date()).getTimezoneOffset();
         const url = `${config.apiUrl}/api/rank/${code}?period=today&tz=${tz}`;
         const response = execSync(`curl -sf "${url}"`, { encoding: "utf-8", timeout: 5000 });
         if (!response)
-            return null;
+            return staleData;
         const data = JSON.parse(response);
         const rankings = data.rankings || [];
         const me = rankings.find((r) => r.userId === userId);
         if (!me)
-            return null;
+            return staleData;
         const result = { rank: me.rank, total: rankings.length, cost: me.costUSD };
-        writeFileSync(cacheFile, JSON.stringify(result), "utf-8");
+        writeFileSync(cacheFile, JSON.stringify({ sessionId, data: result, timestamp: Date.now() }), "utf-8");
         return result;
     }
     catch {
-        return null;
+        try {
+            writeFileSync(cacheFile, JSON.stringify({ sessionId, data: staleData, timestamp: Date.now() }), "utf-8");
+        }
+        catch { }
+        return staleData;
     }
 }
 export function rankColor(rank) {
@@ -95,20 +103,24 @@ export function rankColor(rank) {
         return FG_ORANGE;
     return FG_CYAN;
 }
-// Claude usage fetcher with 60s file cache
-function getClaudeUsage() {
+// Claude usage fetcher — cached per session (stale fallback on failure)
+function getClaudeUsage(sessionId) {
     const cacheFile = "/tmp/sl-claude-usage";
     const hitFile = "/tmp/sl-claude-usage-hit";
     const now = Date.now();
-    const nowSec = now / 1000;
+    let staleData = null;
     if (existsSync(cacheFile)) {
-        const mtime = statSync(cacheFile).mtimeMs / 1000;
-        if (nowSec - mtime <= 60) {
-            try {
-                return JSON.parse(readFileSync(cacheFile, "utf-8"));
-            }
-            catch { }
+        try {
+            const cached = JSON.parse(readFileSync(cacheFile, "utf-8"));
+            staleData = cached.data ?? null;
+            if (cached.sessionId === sessionId)
+                return staleData;
+            // If cache is less than 2 minutes old, reuse it to avoid rate limits
+            const cacheAge = now - (cached.timestamp || 0);
+            if (cacheAge < 600_000)
+                return staleData;
         }
+        catch { }
     }
     try {
         const username = process.env.USER || process.env.USERNAME;
@@ -124,10 +136,13 @@ function getClaudeUsage() {
         if (expiresAt && Date.now() / 1000 > expiresAt)
             return null;
         const apiUrl = "https://api.anthropic.com/api/oauth/usage";
-        const curlCmd = `curl -sf "${apiUrl}" -H "Authorization: Bearer ${accessToken}" -H "anthropic-beta: oauth-2025-04-20" -H "User-Agent: claude-code/2.1.5"`;
+        const curlCmd = `curl -sf "${apiUrl}" -H "Authorization: Bearer ${accessToken}" -H "anthropic-beta: oauth-2025-04-20"`;
         const response = execSync(curlCmd, { encoding: "utf-8", timeout: 5000 });
-        if (!response)
-            return null;
+        if (!response) {
+            // API failed — write cache with null data to prevent retry flood
+            writeFileSync(cacheFile, JSON.stringify({ sessionId, data: null, timestamp: now }), "utf-8");
+            return staleData;
+        }
         const data = JSON.parse(response);
         const parseUtil = (val) => {
             if (typeof val === "number")
@@ -172,11 +187,16 @@ function getClaudeUsage() {
         const result = { fiveHour, sevenDay };
         if (fiveHourResetsAt)
             result.fiveHourResetsAt = fiveHourResetsAt;
-        writeFileSync(cacheFile, JSON.stringify(result), "utf-8");
+        writeFileSync(cacheFile, JSON.stringify({ sessionId, data: result, timestamp: now }), "utf-8");
         return result;
     }
     catch {
-        return null;
+        // Write cache with stale/null data to prevent retry flood on persistent failures
+        try {
+            writeFileSync(cacheFile, JSON.stringify({ sessionId, data: staleData, timestamp: now }), "utf-8");
+        }
+        catch { }
+        return staleData;
     }
 }
 export function render(input) {
@@ -191,9 +211,11 @@ export function render(input) {
     const cost = data.cost?.total_cost_usd ?? 0;
     const model = data.model?.display_name ?? "—";
     const contextPct = Math.floor(data.context_window?.used_percentage ?? 0);
+    // Session ID from transcript path (filename without extension)
+    const transcriptPath = data.transcript_path ?? "";
+    const sessionId = transcriptPath ? transcriptPath.replace(/^.*\//, "").replace(/\.jsonl$/, "") : "";
     // Token stats from transcript
     let totalTokens = 0;
-    const transcriptPath = data.transcript_path ?? "";
     if (transcriptPath) {
         try {
             const content = readFileSync(transcriptPath, "utf-8");
@@ -214,7 +236,7 @@ export function render(input) {
     }
     const cache = readCache();
     const config = readConfig();
-    const claudeUsage = getClaudeUsage();
+    const claudeUsage = getClaudeUsage(sessionId);
     const g = FG_GRAY_DIM;
     const y = FG_YELLOW;
     const m = FG_MODEL;
@@ -247,7 +269,7 @@ export function render(input) {
         segments.push(usageParts.join(` ${g}·${r} `));
     }
     // #2 $53.6
-    const ccclubRank = getCcclubRank();
+    const ccclubRank = getCcclubRank(sessionId);
     if (ccclubRank) {
         const rc = rankColor(ccclubRank.rank);
         segments.push(`${rc}#${ccclubRank.rank} ${formatCost(ccclubRank.cost)}${r}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-costline",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Enhanced statusline for Claude Code with cost tracking, usage limits, and leaderboard",
   "type": "module",
   "bin": {