ctxline-claude 0.0.5 → 0.0.7

package/README.md

@@ -12,10 +12,10 @@
     <img src="https://img.shields.io/npm/dm/ctxline-claude" alt="npm downloads">
   </a>
   <a href="LICENSE">
-    <img src="https://img.shields.io/github/license/MithunWijayasiri/claudecode-statusline" alt="license">
+    <img src="https://img.shields.io/github/license/MithunWijayasiri/ctxline-claude" alt="license">
   </a>
-  <a href="https://github.com/MithunWijayasiri/claudecode-statusline/stargazers">
-    <img src="https://img.shields.io/github/stars/MithunWijayasiri/claudecode-statusline" alt="stars">
+  <a href="https://github.com/MithunWijayasiri/ctxline-claude/stargazers">
+    <img src="https://img.shields.io/github/stars/MithunWijayasiri/ctxline-claude" alt="stars">
   </a>
 </p>
 
@@ -43,8 +43,8 @@ Then restart Claude Code or start a new session. That's it.
 **Clone & run the installer:**
 
 ```bash
-git clone https://github.com/MithunWijayasiri/claudecode-statusline.git
-cd claudecode-statusline
+git clone https://github.com/MithunWijayasiri/ctxline-claude.git
+cd ctxline-claude
 ./install.sh      # macOS / Linux
 ./install.ps1     # Windows (PowerShell)
 ```
@@ -52,7 +52,7 @@ cd claudecode-statusline
 **Manual:** download the script, then point `~/.claude/settings.json` at it.
 
 ```bash
-curl -o ~/.claude/hooks/statusline.js https://raw.githubusercontent.com/MithunWijayasiri/claudecode-statusline/main/statusline.js
+curl -o ~/.claude/hooks/statusline.js https://raw.githubusercontent.com/MithunWijayasiri/ctxline-claude/main/statusline.js
 chmod +x ~/.claude/hooks/statusline.js
 ```
 
@@ -105,14 +105,15 @@ Remove-Item "$env:USERPROFILE\.claude\cache\usage-cache.json" -ErrorAction Silen
 | **Weekly** | Weekly usage allowance + time until the weekly reset (subscription users) |
 | **Task** | The in-progress todo, when there is one |
 
-> \[!NOTE\] Usage bars change color automatically as you approach your
-> limits.
+> [!NOTE]
+> Usage bars change color automatically as you approach your limits.
 
 ## How it works
 
-- **Source** — context comes from Claude Code's session data; both usage bars are fetched from `https://api.anthropic.com/api/oauth/usage` (the `/usage` data — 5-hour and weekly limits). API-key users skip the usage fetch.
-- **Adaptive timing** — 1.5s timeout on the first prompt (cold start), 1.2s after (connection reused).
-- **Caching** — usage is cached at `~/.claude/cache/usage-cache.json`, shared across sessions. Within 30s the cache renders directly (the API call is skipped); if a live call fails, the last value (up to 10 min old) is shown so the bar never vanishes. The reset countdown recomputes every render.
+- **Source** — context comes from Claude Code's session data. Usage bars are read straight from the `rate_limits` field Claude Code pipes in (no network), falling back to `https://api.anthropic.com/api/oauth/usage` (the same `/usage` data — 5-hour and weekly limits) when that field isn't present yet. API-key users skip usage entirely.
+- **No network on the fast path** — when `rate_limits` is in the session data, there's no API call at all. The fetch below only runs as a fallback (e.g. the first render of a session, before the field appears).
+- **Adaptive timing** — for the fallback fetch: 1.5s timeout on the first prompt (cold start), 1.2s after (connection reused).
+- **Caching** — the fallback fetch is cached at `~/.claude/cache/usage-cache.json`, shared across sessions. Within 30s the cache renders directly (the API call is skipped); if a live call fails, the last value (up to 10 min old) is shown so the bar never vanishes. The reset countdown recomputes every render.
 - **Never breaks** — every failure path falls back silently; the statusline always prints.
 
 ## FAQ
@@ -120,7 +121,7 @@ Remove-Item "$env:USERPROFILE\.claude\cache\usage-cache.json" -ErrorAction Silen
 <details>
 <summary>Does this use the same data as /usage?</summary>
 
-Yes. Usage information comes directly from Anthropic's usage API.
+Yes — the same 5-hour and weekly limits. It reads them from the session data Claude Code provides when available, and falls back to Anthropic's usage API (the endpoint `/usage` uses) otherwise.
 
 </details>
 
@@ -141,7 +142,7 @@ No. All failures are handled silently and the statusline always renders.
 <details>
 <summary>Does it expose my API keys / auth tokens?</summary>
 
-No. Your credentials never leave your machine. The OAuth token is read locally (from `~/.claude/.credentials.json` or the macOS keychain) only to authenticate the request to Anthropic's own usage API — the same endpoint `/usage` uses. Nothing is sent to any third party, logged, or cached; only the resulting usage percentages are stored locally.
+No. Your credentials never leave your machine. On the fast path no token is read at all — usage comes straight from the session data. Only on the fallback fetch is the OAuth token read locally (from `~/.claude/.credentials.json` or the macOS keychain), used solely to authenticate the request to Anthropic's own usage API — the same endpoint `/usage` uses. Nothing is sent to any third party, logged, or cached; only the resulting usage percentages are stored locally.
 
 </details>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ctxline-claude",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "A customizable statusline for Claude Code that tracks context usage and session limits",
   "bin": {
     "ctxline-claude": "bin/install.js"
@@ -28,12 +28,12 @@
   ],
   "author": "Mithun Wijayasiri",
   "license": "MIT",
-  "homepage": "https://github.com/MithunWijayasiri/claudecode-statusline#readme",
+  "homepage": "https://github.com/MithunWijayasiri/ctxline-claude#readme",
   "bugs": {
-    "url": "https://github.com/MithunWijayasiri/claudecode-statusline/issues"
+    "url": "https://github.com/MithunWijayasiri/ctxline-claude/issues"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/MithunWijayasiri/claudecode-statusline.git"
+    "url": "https://github.com/MithunWijayasiri/ctxline-claude.git"
   }
 }

package/statusline.js

@@ -2,7 +2,7 @@
 // Claude Code Enhanced Statusline
 // Shows: directory | model | context usage | current (5-hour) + weekly usage | current task
 // Auto-detects API key vs subscription usage
-// https://github.com/MithunWijayasiri/claudecode-statusline
+// https://github.com/MithunWijayasiri/ctxline-claude
 
 const fs = require('fs');
 const path = require('path');
@@ -109,23 +109,21 @@ function getContextBar(remaining) {
   const filled = Math.round((used / 100) * BAR_WIDTH);
   const bar = '\u2588'.repeat(filled) + '\u2591'.repeat(BAR_WIDTH - filled);
 
-  let coloredBar;
-  if (used < 50) {
-    coloredBar = `${colors.green}${bar} ${used}%${colors.reset}`;
-  } else if (used < 65) {
-    coloredBar = `${colors.yellow}${bar} ${used}%${colors.reset}`;
-  } else if (used < 80) {
-    coloredBar = `${colors.orange}${bar} ${used}%${colors.reset}`;
-  } else {
-    coloredBar = `${colors.blink}${colors.red}${bar} ${used}%${colors.reset}`;
-  }
+  // Context color: green <50 / yellow <65 / orange <80 / blink-red >=80.
+  let color;
+  if (used < 50) color = colors.green;
+  else if (used < 65) color = colors.yellow;
+  else if (used < 80) color = colors.orange;
+  else color = colors.blink + colors.red;
 
-  return coloredBar;
+  // Compact label form: "C<used> <bar>" (e.g. "C45 ███░░░"), colored as a whole.
+  return `${color}C${used} ${bar}${colors.reset}`;
 }
 
-// Render the usage bar from raw data. Called on every read (live or cached) so the
-// reset countdown is always recomputed from resetsAt rather than frozen at fetch time.
-function buildUsageBar(percentage, resetsAt) {
+// Render a compact usage segment from raw data: "<label><pct> ↺ <countdown>"
+// (e.g. "H81 ↺ 2h21m") — no bar. Called on every read (live or cached) so the reset
+// countdown is always recomputed from resetsAt rather than frozen at fetch time.
+function buildUsageBar(label, percentage, resetsAt) {
   let timeStr = '';
   if (resetsAt) {
     const diffMins = Math.max(0, Math.floor((new Date(resetsAt) - new Date()) / 60000));
@@ -137,21 +135,18 @@ function buildUsageBar(percentage, resetsAt) {
     else timeStr = `${mins}m`;
   }
 
-  const filledWidth = Math.max(0, Math.min(BAR_WIDTH, Math.round((percentage / 100) * BAR_WIDTH)));
-  const filled = '█'.repeat(filledWidth);
-  const empty = '░'.repeat(BAR_WIDTH - filledWidth);
   const color = getUsageColor(percentage);
-  const timePart = timeStr ? `${colors.dim} (${timeStr})${colors.reset}` : '';
+  const timePart = timeStr ? `${colors.dim} ↺ ${timeStr}${colors.reset}` : '';
 
-  return `${color}${filled}${empty} ${percentage}%${colors.reset}${timePart}`;
+  return `${color}${label}${percentage}${colors.reset}${timePart}`;
 }
 
-// Build both usage bars from raw entries. Each entry is { percentage, resetsAt } or
-// null/absent. Returns { current, weekly } where each is a rendered bar string or null.
+// Build both usage segments from raw entries. Each entry is { percentage, resetsAt } or
+// null/absent. Returns { current, weekly } where each is a rendered segment string or null.
 function buildUsageBars(fiveHour, weekly) {
   return {
-    current: fiveHour ? buildUsageBar(fiveHour.percentage, fiveHour.resetsAt) : null,
-    weekly: weekly ? buildUsageBar(weekly.percentage, weekly.resetsAt) : null
+    current: fiveHour ? buildUsageBar('H', fiveHour.percentage, fiveHour.resetsAt) : null,
+    weekly: weekly ? buildUsageBar('W', weekly.percentage, weekly.resetsAt) : null
   };
 }
 
@@ -163,6 +158,37 @@ function normalizePercentage(value) {
   return Math.max(0, Math.min(100, Math.round(value)));
 }
 
+// Build usage bars from stdin `rate_limits` (Claude.ai Pro/Max, present only after the
+// first API response of a session). Same data as the OAuth usage API, so reading it here
+// skips the network/credentials/cache path entirely. `resets_at` is a Unix epoch in
+// SECONDS (not ISO) — ×1000 before Date. Returns { current, weekly } bars, or null when
+// rate_limits is absent or the required five_hour segment is unusable (caller falls back).
+function buildUsageFromStdin(data) {
+  const rl = data?.rate_limits;
+  if (!rl) return null;
+
+  const toEntry = (seg) => {
+    if (!seg) return null;
+    const pct = normalizePercentage(seg.used_percentage);
+    if (pct == null) return null;
+    // resets_at is a Unix epoch in SECONDS. Coerce + validate defensively: a non-numeric
+    // or out-of-range value would make new Date(...).toISOString() throw, and this path
+    // runs outside outputStatus's try/catch. Fall back to resetsAt: null on anything bad.
+    let resetsAt = null;
+    const epoch = Number(seg.resets_at);
+    if (Number.isFinite(epoch) && epoch > 0) {
+      const d = new Date(epoch * 1000);
+      if (!Number.isNaN(d.getTime())) resetsAt = d.toISOString();
+    }
+    return { percentage: pct, resetsAt };
+  };
+
+  const fiveHour = toEntry(rl.five_hour);
+  if (!fiveHour) return null;          // five_hour is the required bar
+  const weekly = toEntry(rl.seven_day);
+  return buildUsageBars(fiveHour, weekly);
+}
+
 // Validate a single usage entry ({ percentage, resetsAt }). Returns true only for a
 // finite 0-100 percentage and a parseable (or absent) resetsAt.
 function isValidUsageEntry(entry) {
@@ -373,10 +399,10 @@ function outputStatus(data, usage) {
     const parts = [];
     parts.push(branch ? `${dirname} ${colors.dim}⎇ ${branch}${colors.reset}` : dirname);
     parts.push(effort ? `${model}${getEffortColor(effort)} · ${effort}${colors.reset}` : model);
-    parts.push(`CTX ${contextBar}`);
+    parts.push(contextBar);
 
-    if (usage?.current) parts.push(`5h ${usage.current}`);
-    if (usage?.weekly) parts.push(`7d ${usage.weekly}`);
+    if (usage?.current) parts.push(usage.current);
+    if (usage?.weekly) parts.push(usage.weekly);
 
     if (task) parts.push(`${colors.dim}${task}${colors.reset}`);
     process.stdout.write(parts.join(' \u2502 '));
@@ -387,27 +413,51 @@ function outputStatus(data, usage) {
 
 function outputFallback(usage) {
   const contextBar = getContextBar(undefined);
-  const parts = ['~', 'Claude', `CTX ${contextBar}`];
-  if (usage?.current) parts.push(`5h ${usage.current}`);
-  if (usage?.weekly) parts.push(`7d ${usage.weekly}`);
+  const parts = ['~', 'Claude', contextBar];
+  if (usage?.current) parts.push(usage.current);
+  if (usage?.weekly) parts.push(usage.weekly);
   process.stdout.write(parts.join(' \u2502 '));
 }
 
-// Wrapper that skips usage fetch for API key users
-function getUsage(callback) {
+// Resolve usage bars for a (possibly null) parsed stdin payload.
+// Order: API-key users get none; otherwise prefer stdin `rate_limits` (no network),
+// then fall back to the cache+API flow when stdin lacks it (cold start / non-Pro/Max).
+function resolveUsage(data, callback) {
   if (IS_API_KEY) {
-    callback(null);
-  } else {
-    getUsageWithCache(callback);
+    return callback(null);
   }
+  const fromStdin = buildUsageFromStdin(data);
+  if (fromStdin) {
+    return callback(fromStdin);
+  }
+  getUsageWithCache(callback);
 }
 
 // Process with timeout
-if (process.stdin.isTTY) {
-  getUsage((usage) => {
-    outputFallback(usage);
+// Parse the accumulated stdin into a payload object, or null if empty/unparseable.
+function parseInput(input) {
+  if (!input || input.length === 0) return null;
+  try {
+    return JSON.parse(input);
+  } catch (e) {
+    return null;
+  }
+}
+
+// Resolve usage for `data` (preferring stdin rate_limits), then render and exit.
+function emit(data) {
+  resolveUsage(data, (usage) => {
+    if (data) {
+      outputStatus(data, usage);
+    } else {
+      outputFallback(usage);
+    }
     process.exit(0);
   });
+}
+
+if (process.stdin.isTTY) {
+  emit(null);
 } else {
   let input = '';
   let timeoutReached = false;
@@ -416,19 +466,7 @@ if (process.stdin.isTTY) {
 
   const timeout = setTimeout(() => {
     timeoutReached = true;
-    getUsage((usage) => {
-      if (input.length > 0) {
-        try {
-          const data = JSON.parse(input);
-          outputStatus(data, usage);
-        } catch (e) {
-          outputFallback(usage);
-        }
-      } else {
-        outputFallback(usage);
-      }
-      process.exit(0);
-    });
+    emit(parseInput(input));
   }, overallTimeout);
 
   process.stdin.setEncoding('utf8');
@@ -436,15 +474,6 @@ if (process.stdin.isTTY) {
   process.stdin.on('end', () => {
     if (timeoutReached) return;
     clearTimeout(timeout);
-
-    getUsage((usage) => {
-      try {
-        const data = JSON.parse(input);
-        outputStatus(data, usage);
-      } catch (e) {
-        outputFallback(usage);
-      }
-      process.exit(0);
-    });
+    emit(parseInput(input));
   });
 }