@alyibrahim/claude-statusline 1.1.0 → 1.2.0

package/README.md

@@ -2,12 +2,15 @@
 
 [![CI](https://github.com/AlyIbrahim1/claude-statusline/actions/workflows/ci.yml/badge.svg)](https://github.com/AlyIbrahim1/claude-statusline/actions/workflows/ci.yml)
 [![npm](https://img.shields.io/npm/v/@alyibrahim/claude-statusline)](https://www.npmjs.com/package/@alyibrahim/claude-statusline)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
-A fast statusline for [Claude Code](https://claude.ai/code). Shows model, git branch, context usage, subscription rate limits, and session cost — updating after every response.
+**A rich, fast statusline for [Claude Code](https://claude.ai/code)** — shows model, git branch, context usage, rate limits, session cost, and real-time token consumption after every response.
 
-Runs as a compiled Rust binary on Linux x64/arm64, macOS x64/arm64, and Windows x64 — no Node.js startup overhead on every prompt. Falls back to Node.js automatically on unsupported platforms.
+Runs as a **compiled Rust binary** (~5ms startup vs ~100ms for Node.js). Zero shell dependencies. One install command.
 
-![statusline screenshot](.github/image.png)
+![statusline screenshot](https://raw.githubusercontent.com/AlyIbrahim1/claude-statusline/main/.github/image.png)
+
+---
 
 ## Install
 
@@ -15,36 +18,69 @@ Runs as a compiled Rust binary on Linux x64/arm64, macOS x64/arm64, and Windows
 npm install -g @alyibrahim/claude-statusline
 ```
 
-That's it. The statusline is configured automatically. Restart Claude Code to see it.
+Done. The statusline configures itself automatically. Restart Claude Code to see it.
 
-**Manual setup** (if auto-setup failed):
-```bash
-claude-statusline setup
-```
+> If auto-setup didn't run: `claude-statusline setup`
 
-## Requirements
+---
+
+## What you get
+
+**Line 1** — Model name · Effort level · Active subagents · Current task · Directory `(branch +commits)` · Context bar
+
+**Line 2** — Weekly token usage · 5h usage · Reset countdown *(Pro/Max)* — or — Session cost *(API key)* · Session token count
+
+| Feature | Details |
+|---|---|
+| Context bar | Normalized to usable % — accounts for the auto-compact buffer |
+| Rate limits | Shows 5h and weekly usage with color-coded thresholds |
+| Session cost | Displayed only for API key users, hidden for subscribers |
+| Session tokens | Real-time token consumption via JSONL offset caching — updates between turns, not just at turn start |
+| Active agents | Counts running subagents from your `~/.claude/todos/` directory |
+| Effort level | Reads `CLAUDE_CODE_EFFORT_LEVEL` env var or `settings.json` |
+| Git branch | Detected automatically, silently absent if not a git repo |
+| Session commits | Shows `+N` next to the branch for commits made during the current session |
+| Directory label | Displays as `~/parent/dir` so you always know which project you're in |
 
-- **Node.js >=16** — needed for install/uninstall lifecycle scripts
-- **git** — optional, used for branch display; gracefully absent if not installed
+---
 
-No `jq`, `bc`, `ccusage`, or other external tools needed.
+## Platform support
 
-## What it shows
+The Rust binary is pre-built and installed automatically for your platform via npm `optionalDependencies`:
 
-**Line 1:** Model · Effort level · Active agents · Current task · Directory `[git branch]` · Context bar
+| Platform | Package |
+|---|---|
+| Linux x64 | [`@alyibrahim/claude-statusline-linux-x64`](https://www.npmjs.com/package/@alyibrahim/claude-statusline-linux-x64) |
+| Linux arm64 | [`@alyibrahim/claude-statusline-linux-arm64`](https://www.npmjs.com/package/@alyibrahim/claude-statusline-linux-arm64) |
+| macOS x64 (Intel) | [`@alyibrahim/claude-statusline-darwin-x64`](https://www.npmjs.com/package/@alyibrahim/claude-statusline-darwin-x64) |
+| macOS arm64 (Apple Silicon) | [`@alyibrahim/claude-statusline-darwin-arm64`](https://www.npmjs.com/package/@alyibrahim/claude-statusline-darwin-arm64) |
+| Windows x64 | [`@alyibrahim/claude-statusline-win32-x64`](https://www.npmjs.com/package/@alyibrahim/claude-statusline-win32-x64) |
 
-**Line 2:** Weekly usage · 5h usage · Reset countdown *(subscription)*  or  Session cost *(API key)*
+npm picks the right one automatically. If your platform isn't listed, the JS fallback is used instead — no action needed.
+
+---
 
 ## Why this one
 
-| | This package | Others |
+| | claude-statusline | Others |
 |---|---|---|
-| Fast startup | ✓ compiled Rust binary | Node.js cold-start every prompt |
-| No dependencies | ✓ no `jq`, `bc`, etc. | Require external tools |
-| No API calls | ✓ reads stdin directly | Poll OAuth endpoint, hit rate limits |
-| Subscription vs API aware | ✓ | Show cost for everyone |
-| Context bar normalized | ✓ usable % | Raw remaining % |
-| Active agent counter | ✓ | — |
+| Startup time | ~5ms (Rust binary) | ~100ms (Node.js cold-start every prompt) |
+| Shell dependencies | None | Require `jq`, `bc`, or `ccusage` |
+| API calls | None — reads Claude's stdin directly | Poll OAuth endpoint, risk rate limits |
+| Subscription-aware | Shows usage/resets for Pro/Max, cost for API | Treat everyone as API user |
+| Context bar | Usable % after auto-compact buffer | Raw remaining % |
+| Subagent counter | Counts active agents from todos dir | — |
+| Session tokens | Real-time via JSONL offset cache | Stale stdin snapshot or none |
+| Session commits | Tracks git commits made this session | — |
+
+---
+
+## Requirements
+
+- **Node.js ≥16** — for install/uninstall scripts only (not needed at runtime on supported platforms)
+- **git** — optional, enables branch display
+
+---
 
 ## Uninstall
 
@@ -53,13 +89,15 @@ claude-statusline uninstall
 npm uninstall -g @alyibrahim/claude-statusline
 ```
 
-> Run `claude-statusline uninstall` first regardless of package manager — this removes the statusline from `~/.claude/settings.json` before the package files are deleted.
+> Always run `claude-statusline uninstall` first — it removes the `statusLine` entry from `~/.claude/settings.json` before the files are deleted.
+
+---
 
 ## Notes
 
-- **Switched Node versions?** Re-run `claude-statusline setup` — only needed if the Rust binary wasn't installed (unsupported platform fallback).
-- Writes only the `statusLine` key in `~/.claude/settings.json` — all other settings are preserved.
-- Respects `$CLAUDE_CONFIG_DIR` if set.
+- Settings are written only to the `statusLine` key — all other `~/.claude/settings.json` keys are untouched
+- Respects `$CLAUDE_CONFIG_DIR` if set
+- Switched Node versions on an unsupported platform? Re-run `claude-statusline setup`
 
 ## License
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alyibrahim/claude-statusline",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A zero-dependency Claude Code statusline — reads rate limits from stdin, no API calls",
   "engines": {
     "node": ">=16"
@@ -21,11 +21,11 @@
   ],
   "license": "MIT",
   "optionalDependencies": {
-    "@alyibrahim/claude-statusline-linux-x64": "1.1.0",
-    "@alyibrahim/claude-statusline-linux-arm64": "1.1.0",
-    "@alyibrahim/claude-statusline-darwin-x64": "1.1.0",
-    "@alyibrahim/claude-statusline-darwin-arm64": "1.1.0",
-    "@alyibrahim/claude-statusline-win32-x64": "1.1.0"
+    "@alyibrahim/claude-statusline-linux-x64": "1.2.0",
+    "@alyibrahim/claude-statusline-linux-arm64": "1.2.0",
+    "@alyibrahim/claude-statusline-darwin-x64": "1.2.0",
+    "@alyibrahim/claude-statusline-darwin-arm64": "1.2.0",
+    "@alyibrahim/claude-statusline-win32-x64": "1.2.0"
   },
   "devDependencies": {
     "jest": "^29.0.0"

package/statusline.js

@@ -5,7 +5,58 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
-const { execSync } = require('child_process');
+const { execSync, execFileSync } = require('child_process');
+
+// Reads cumulative token totals from the session JSONL file, using a byte-offset
+// cache so only new bytes are parsed on each invocation (O(new bytes) not O(file)).
+// Returns { totalIn, totalOut } or null on any error.
+function readSessionTokens(claudeDir, session, absDir) {
+  if (!session) return null;
+  const slug = absDir.replace(/\//g, '-');
+  const jsonlPath = path.join(claudeDir, 'projects', slug, `${session}.jsonl`);
+  const cachePath = path.join(claudeDir, `statusline-tokcache-${session}.json`);
+  try {
+    const fileSize = fs.statSync(jsonlPath).size;
+    let totalIn = 0, totalOut = 0, cachedOffset = 0;
+    try {
+      const cached = JSON.parse(fs.readFileSync(cachePath, 'utf8'));
+      totalIn = cached.totalIn || 0;
+      totalOut = cached.totalOut || 0;
+      cachedOffset = Math.min(cached.offset || 0, fileSize);
+    } catch (e) {}
+    if (fileSize > cachedOffset) {
+      const fd = fs.openSync(jsonlPath, 'r');
+      const buf = Buffer.alloc(fileSize - cachedOffset);
+      const bytesRead = fs.readSync(fd, buf, 0, buf.length, cachedOffset);
+      fs.closeSync(fd);
+      const content = buf.subarray(0, bytesRead).toString('utf8');
+      // Exclude the last element: it's either an empty string (content ends with \n)
+      // or a potentially incomplete line (file was mid-write).
+      const safeLines = content.split('\n').slice(0, -1);
+      for (const line of safeLines) {
+        if (!line.trim()) continue;
+        try {
+          const entry = JSON.parse(line);
+          if (entry.type === 'assistant' && entry.message?.usage) {
+            const u = entry.message.usage;
+            totalIn  += (u.input_tokens || 0) + (u.cache_read_input_tokens || 0) + (u.cache_creation_input_tokens || 0);
+            totalOut += (u.output_tokens || 0);
+          }
+        } catch (e) {}
+      }
+      // Advance offset by the bytes of all complete lines (each terminated by \n)
+      const processed = safeLines.join('\n') + '\n';
+      try {
+        fs.writeFileSync(cachePath, JSON.stringify({
+          totalIn, totalOut, offset: cachedOffset + Buffer.from(processed, 'utf8').length,
+        }));
+      } catch (e) {}
+    }
+    return { totalIn, totalOut };
+  } catch (e) {
+    return null;
+  }
+}
 
 // Read JSON from stdin
 let input = '';
@@ -104,26 +155,67 @@ process.stdin.on('end', () => {
       }
     }
 
-    // Git branch (command is a fixed string; dir is passed as cwd, not interpolated — no injection risk)
+    // Git branch + session commit counter
+    const absDir = path.resolve(dir);
     let branch = '';
+    let commitCount = 0;
     try {
       branch = execSync('git rev-parse --abbrev-ref HEAD', { cwd: dir, stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim();
+      const headSha = execSync('git rev-parse HEAD', { cwd: dir, stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim();
+      if (session) {
+        const sessionFile = path.join(claudeDir, `statusline-session-${session}.json`);
+        let sessionData = {};
+        try { sessionData = JSON.parse(fs.readFileSync(sessionFile, 'utf8')); } catch (e) {}
+        if (!sessionData[absDir]) {
+          sessionData[absDir] = headSha;
+          try { fs.writeFileSync(sessionFile, JSON.stringify(sessionData)); } catch (e) {}
+        }
+        const baseline = sessionData[absDir];
+        if (baseline !== headSha) {
+          const countStr = execFileSync('git', ['rev-list', '--count', `${baseline}..HEAD`], { cwd: dir, stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim();
+          commitCount = parseInt(countStr, 10) || 0;
+        }
+      }
     } catch (e) {}
 
     // Output
-    const dirname = sanitize(path.basename(dir));
     const safeBranch = sanitize(branch);
-    // dirname is bright; branch stays cyan; surrounding prefix/suffix stay dim
+    let dirLabel;
+    if (absDir === homeDir) {
+      dirLabel = '~';
+    } else if (path.dirname(absDir) === homeDir) {
+      dirLabel = `~/${path.basename(absDir)}`;
+    } else {
+      dirLabel = `~/${path.basename(path.dirname(absDir))}/${path.basename(absDir)}`;
+    }
+    const dirname = sanitize(dirLabel);
+    // dirname is bright; branch stays cyan; commit count dim after branch
+    const commitSuffix = commitCount > 0 ? ` \x1b[32m+${commitCount}` : '';
+    const branchStr = `(${safeBranch})${commitSuffix}\x1b[0m \x1b[2m│\x1b[0m`;
     const dirDisplay = safeBranch
-      ? `\x1b[1m\x1b[97m${dirname}\x1b[0m\x1b[2m \x1b[36m[${safeBranch}]\x1b[0m`
+      ? `\x1b[1m\x1b[97m${dirname}\x1b[0m\x1b[2m \x1b[36m${branchStr}\x1b[0m`
       : `\x1b[1m\x1b[97m${dirname}\x1b[0m`;
     const u5h = usageLine('Current', pct5h, resetSuffix), u7d = usageLine('Weekly', pctWeek);
     const costDisplay = sessionCost !== null
       ? `  \x1b[33m$${sessionCost < 0.01 ? sessionCost.toFixed(4) : sessionCost.toFixed(2)}\x1b[0m`
       : '';
+    // Session token consumption — prefer JSONL-sourced totals (accurate through
+    // the last completed tool use) over the stdin snapshot (only updated at turn start).
+    const stdinIn   = data.context_window?.total_input_tokens  ?? null;
+    const stdinOut  = data.context_window?.total_output_tokens ?? null;
+    const jsonlTok  = readSessionTokens(claudeDir, session, absDir);
+    const totalIn   = jsonlTok && jsonlTok.totalIn  > (stdinIn  ?? 0) ? jsonlTok.totalIn  : stdinIn;
+    const totalOut  = jsonlTok && jsonlTok.totalOut > (stdinOut ?? 0) ? jsonlTok.totalOut : stdinOut;
+    let tokenDisplay = '';
+    if (totalIn != null || totalOut != null || jsonlTok) {
+      const total = (totalIn ?? 0) + (totalOut ?? 0);
+      const fmt = n => n >= 1000 ? `${(n / 1000).toFixed(1)}k` : String(n);
+      tokenDisplay = `\x1b[2m│\x1b[0m \x1b[97m${fmt(total)} tok\x1b[0m`;
+    }
+
     const usageContent = [u7d, u5h].filter(Boolean).join('  ');
-    const line2 = (usageContent || costDisplay)
-      ? `\x1b[0m\x1b[32mUsage\x1b[0m \x1b[2m│\x1b[0m ${[usageContent, costDisplay].filter(Boolean).join('  ')}`
+    const line2 = (usageContent || costDisplay || tokenDisplay)
+      ? `\x1b[0m\x1b[32mUsage\x1b[0m \x1b[2m│\x1b[0m ${[usageContent, costDisplay, tokenDisplay].filter(Boolean).join('  ')}`
       : '';
     // Effort level: read from env var first, then settings.json, then fall back to
     // model-based default (sonnet-4/opus-4 default to "medium" in Claude Code).