@say8425/cc-statusline 2.1.0 → 2.2.0

package/README.md

@@ -37,6 +37,14 @@ Add the following to `~/.claude/settings.json`:
 
 ![scenario3_diff_pr](docs/scenario3_diff_pr.png)
 
+### Worktree
+
+![worktree_diff](docs/worktree_diff.png)
+
+### Worktree + Usage Metrics
+
+![worktree_usage](docs/worktree_usage.png)
+
 ### Usage Metrics
 
 ![Screenshot of status line with usage metrics](docs/usage_metrics.png)

package/dist/index.js

@@ -1,12 +1,6 @@
 #!/usr/bin/env bun
 // @bun
 
-// src/cli.ts
-function parseCliArgs(args) {
-  const showUsage = args.includes("--show-usage");
-  return { showUsage };
-}
-
 // src/git/branch.ts
 var {$ } = globalThis.Bun;
 
@@ -15,19 +9,12 @@ var cache = {
   branch: { value: "", timestamp: 0 },
   gitChanges: { files: 0, insertions: 0, deletions: 0, timestamp: 0 },
   prUrl: { value: null, timestamp: 0 },
-  blockUsage: {
-    value: null,
-    timestamp: 0
-  },
-  accessToken: { value: null, timestamp: 0 },
   mainProjectName: { value: null, timestamp: 0 }
 };
 var CACHE_TTL = {
   branch: 5000,
   gitChanges: 0,
   prUrl: 30000,
-  blockUsage: 120000,
-  accessToken: 300000,
   mainProjectName: 300000
 };
 
@@ -148,11 +135,6 @@ function renderStatusLine(ctx) {
   const sessionHrs = Math.floor(sessionSec / 3600);
   const sessionMins = Math.floor(sessionSec % 3600 / 60);
   const costUsd = ctx.claudeJson.cost?.total_cost_usd || 0;
-  const usage = ctx.claudeJson.context_window?.current_usage;
-  const contextSize = ctx.claudeJson.context_window?.context_window_size || 200000;
-  const totalTokens = usage ? usage.input_tokens + usage.output_tokens + usage.cache_creation_input_tokens + usage.cache_read_input_tokens : 0;
-  const contextPct = Math.round(totalTokens / contextSize * 100);
-  const ctxColor = getUsageColor(contextPct);
   let line1;
   if (ctx.mainProjectName) {
     line1 = `${C.WHITE}\uD83D\uDCC1 ${ctx.mainProjectName}${C.RESET} | ${C.WHITE}\uD83C\uDF32 ${folder}${C.RESET}`;
@@ -163,23 +145,37 @@ function renderStatusLine(ctx) {
     line1 += ` | ${C.WHITE}\uD83C\uDF3F ${ctx.branch}${C.RESET}`;
   }
   lines.push(line1);
-  const line2 = `${C.WHITE}\u23F1\uFE0F ${formatTime(sessionHrs, sessionMins)}${C.RESET}` + ` | ${C.WHITE}\uD83D\uDCB0 $${costUsd.toFixed(2)}${C.RESET}` + ` | ${ctxColor}\uD83E\uDDE0 ${formatNumber(totalTokens)} (${contextPct}%)${C.RESET}`;
+  let line2 = `${C.WHITE}\u23F1\uFE0F ${formatTime(sessionHrs, sessionMins)}${C.RESET}` + ` | ${C.WHITE}\uD83D\uDCB0 $${costUsd.toFixed(2)}${C.RESET}`;
+  const usedPercentage = ctx.claudeJson.context_window?.used_percentage;
+  if (usedPercentage != null) {
+    const usage = ctx.claudeJson.context_window?.current_usage;
+    const totalTokens = usage ? usage.input_tokens + usage.output_tokens + usage.cache_creation_input_tokens + usage.cache_read_input_tokens : 0;
+    const contextPct = Math.round(usedPercentage);
+    const ctxColor = getUsageColor(contextPct);
+    line2 += ` | ${ctxColor}\uD83E\uDDE0 ${formatNumber(totalTokens)} (${contextPct}%)${C.RESET}`;
+  }
   lines.push(line2);
-  if (ctx.showUsage && ctx.blockUsage) {
+  if (ctx.rateLimits) {
     const parts = [];
-    if (ctx.blockUsage.resetTime) {
-      const h = ctx.blockUsage.resetTime.getHours();
-      const m = ctx.blockUsage.resetTime.getMinutes();
-      parts.push(`${C.WHITE}\u23F3 ${formatTime(h, m)}${C.RESET}`);
-    }
-    const usageColor = getUsageColor(ctx.blockUsage.utilization);
-    parts.push(`${usageColor}\uD83D\uDCCA ${Math.round(ctx.blockUsage.utilization)}/100${C.RESET}`);
-    if (ctx.blockUsage.sevenDayResetTime) {
-      parts.push(`${C.WHITE}\u23F0 ${formatResetDate(ctx.blockUsage.sevenDayResetTime)}${C.RESET}`);
+    if (ctx.rateLimits.five_hour) {
+      const { resets_at, used_percentage } = ctx.rateLimits.five_hour;
+      if (resets_at) {
+        const resetTime = new Date(resets_at * 1000);
+        const h = resetTime.getHours();
+        const m = resetTime.getMinutes();
+        parts.push(`${C.WHITE}\u23F3 ${formatTime(h, m)}${C.RESET}`);
+      }
+      const usageColor = getUsageColor(used_percentage);
+      parts.push(`${usageColor}\uD83D\uDCCA ${Math.round(used_percentage)}/100${C.RESET}`);
     }
-    if (ctx.blockUsage.sevenDayUtilization !== null) {
-      const weekColor = getUsageColor(ctx.blockUsage.sevenDayUtilization);
-      parts.push(`${weekColor}\uD83D\uDCC5 ${Math.round(ctx.blockUsage.sevenDayUtilization)}/100${C.RESET}`);
+    if (ctx.rateLimits.seven_day) {
+      const { resets_at, used_percentage } = ctx.rateLimits.seven_day;
+      if (resets_at) {
+        const resetTime = new Date(resets_at * 1000);
+        parts.push(`${C.WHITE}\u23F0 ${formatResetDate(resetTime)}${C.RESET}`);
+      }
+      const weekColor = getUsageColor(used_percentage);
+      parts.push(`${weekColor}\uD83D\uDCC5 ${Math.round(used_percentage)}/100${C.RESET}`);
     }
     if (parts.length > 0) {
       lines.push(parts.join(" | "));
@@ -211,97 +207,13 @@ async function readStdin() {
   return Buffer.concat(chunks).toString("utf-8");
 }
 
-// src/usage/token.ts
-var {$: $5 } = globalThis.Bun;
-async function getAccessToken() {
-  if (process.platform !== "darwin")
-    return null;
-  try {
-    const result = await $5`security find-generic-password -s "Claude Code-credentials" -w 2>/dev/null`.text();
-    const creds = JSON.parse(result);
-    return creds?.claudeAiOauth?.accessToken ?? null;
-  } catch {
-    return null;
-  }
-}
-async function getAccessTokenCached() {
-  if (Date.now() - cache.accessToken.timestamp < CACHE_TTL.accessToken) {
-    return cache.accessToken.value;
-  }
-  const token = await getAccessToken();
-  cache.accessToken = { value: token, timestamp: Date.now() };
-  return token;
-}
-
-// src/usage/api.ts
-async function fetchUsageFromAPI(accessToken) {
-  try {
-    const controller = new AbortController;
-    const timeout = setTimeout(() => controller.abort(), 5000);
-    const response = await fetch("https://api.anthropic.com/api/oauth/usage", {
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        "anthropic-beta": "oauth-2025-04-20"
-      },
-      signal: controller.signal
-    });
-    clearTimeout(timeout);
-    if (!response.ok)
-      return null;
-    return await response.json();
-  } catch {
-    return null;
-  }
-}
-function usageResponseToBlockUsage(data) {
-  const result = {
-    resetTime: null,
-    utilization: 0,
-    sevenDayUtilization: null,
-    sevenDayResetTime: null
-  };
-  if (data.five_hour) {
-    result.utilization = data.five_hour.utilization;
-    if (data.five_hour.resets_at) {
-      result.resetTime = new Date(data.five_hour.resets_at);
-    }
-  }
-  if (data.seven_day) {
-    result.sevenDayUtilization = data.seven_day.utilization;
-    if (data.seven_day.resets_at) {
-      result.sevenDayResetTime = new Date(data.seven_day.resets_at);
-    }
-  }
-  return result;
-}
-async function getUsageCached() {
-  if (Date.now() - cache.blockUsage.timestamp < CACHE_TTL.blockUsage) {
-    return cache.blockUsage.value;
-  }
-  const token = await getAccessTokenCached();
-  if (!token) {
-    cache.blockUsage = { value: null, timestamp: Date.now() };
-    return null;
-  }
-  const data = await fetchUsageFromAPI(token);
-  if (!data) {
-    cache.blockUsage = { value: null, timestamp: Date.now() };
-    return null;
-  }
-  const blockUsage = usageResponseToBlockUsage(data);
-  cache.blockUsage = { value: blockUsage, timestamp: Date.now() };
-  return blockUsage;
-}
 // src/index.ts
-async function main(cliArgs) {
-  const args = cliArgs ?? process.argv.slice(2);
-  const { showUsage } = parseCliArgs(args);
+async function main() {
   const claudeJson = JSON.parse(await readStdin() || "{}");
-  const [branch, gitChanges, prUrl, blockUsage, mainProjectName] = await Promise.all([
+  const [branch, gitChanges, prUrl, mainProjectName] = await Promise.all([
     getBranchCached(),
     getGitChangesCached(),
     getPrUrlCached(),
-    showUsage ? getUsageCached() : Promise.resolve(null),
     getMainProjectNameCached()
   ]);
   const lines = renderStatusLine({
@@ -309,8 +221,7 @@ async function main(cliArgs) {
     branch,
     gitChanges,
     prUrl,
-    blockUsage,
-    showUsage,
+    rateLimits: claudeJson.rate_limits ?? null,
     mainProjectName
   });
   for (const line of lines) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@say8425/cc-statusline",
-	"version": "2.1.0",
+	"version": "2.2.0",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/say8425/cc-statusline.git"