@alyibrahim/claude-statusline 1.1.1 → 1.2.0

package/README.md

@@ -2,10 +2,9 @@
 
 [![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)
-[![npm downloads](https://img.shields.io/npm/dm/@alyibrahim/claude-statusline)](https://www.npmjs.com/package/@alyibrahim/claude-statusline)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
-**A rich, fast statusline for [Claude Code](https://claude.ai/code)** — shows model, git branch, context usage, rate limits, and session cost 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** (~5ms startup vs ~100ms for Node.js). Zero shell dependencies. One install command.
 
@@ -27,18 +26,21 @@ Done. The statusline configures itself automatically. Restart Claude Code to see
 
 ## What you get
 
-**Line 1** — Model name · Effort level · Active subagents · Current task · Directory `[branch]` · Context bar
+**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)*
+**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 |
 
 ---
 
@@ -68,6 +70,8 @@ npm picks the right one automatically. If your platform isn't listed, the JS fal
 | 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 | — |
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alyibrahim/claude-statusline",
-  "version": "1.1.1",
+  "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).