ccstatusline-usage 2.0.46 → 2.1.2

package/README.md

@@ -14,36 +14,18 @@
 **🎨 A highly customizable status line formatter for Claude Code CLI**
 *Display model info, git branch, token usage, and other metrics in your terminal*
 
-[![npm version](https://img.shields.io/npm/v/ccstatusline-usage.svg)](https://www.npmjs.com/package/ccstatusline-usage)
-[![npm downloads](https://img.shields.io/npm/dm/ccstatusline-usage.svg)](https://www.npmjs.com/package/ccstatusline-usage)
+[![npm version](https://img.shields.io/npm/v/ccstatusline.svg)](https://www.npmjs.com/package/ccstatusline)
+[![npm downloads](https://img.shields.io/npm/dm/ccstatusline.svg)](https://www.npmjs.com/package/ccstatusline)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/sirmalloc/ccstatusline/blob/main/LICENSE)
-[![Node.js Version](https://img.shields.io/node/v/ccstatusline-usage.svg)](https://nodejs.org)
-[![install size](https://packagephobia.com/badge?p=ccstatusline-usage)](https://packagephobia.com/result?p=ccstatusline-usage)
+[![Node.js Version](https://img.shields.io/node/v/ccstatusline.svg)](https://nodejs.org)
+[![install size](https://packagephobia.com/badge?p=ccstatusline)](https://packagephobia.com/result?p=ccstatusline)
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/sirmalloc/ccstatusline/graphs/commit-activity)
 
 [![Mentioned in Awesome Claude Code](https://awesome.re/mentioned-badge.svg)](https://github.com/hesreallyhim/awesome-claude-code)
 [![ClaudeLog - A comprehensive knowledge base for Claude](https://claudelog.com/img/claude_log_badge.svg)](https://claudelog.com/)
 
-## Fork Enhancements
 
-This fork adds API-based usage widgets beyond the upstream:
-
-- **Session/Weekly Usage** - Real utilization from Anthropic API with progress bars
-- **Extra Usage** - When weekly limit is reached, shows extra usage spending (e.g. `Extra: €41.24/€47.00`)
-- **Reset Timer** - Time until 5-hour session window resets
-- **Context Window Display** - Visual bar showing context usage
-- **Two-line Layout** - Session info on line 1, context on line 2
-
-### Enhanced Status Line Preview
-
-```
-Session: [████░░░░░░░░░░░] 27.0% | Weekly: [████████████░░░] 86.0% | 1:56 hr | Extra: $41.24/$47.00 | Model: Opus 4.6 | Session ID: 714aa815-8a...
-  Context: [███████░░░░░░░░] 103k/200k (51%)
-```
-
-These widgets are enabled by default. Just install and run!
-
-![Status Bar Demo](screenshots/status-bar-demo.png)
+![Demo](https://raw.githubusercontent.com/sirmalloc/ccstatusline/main/screenshots/demo.gif)
 
 </div>
 
@@ -57,7 +39,6 @@ These widgets are enabled by default. Just install and run!
 - [API Documentation](#-api-documentation)
 - [Development](#️-development)
 - [Contributing](#-contributing)
-- [Uninstall](#️-uninstall)
 - [License](#-license)
 - [Related Projects](#-related-projects)
 
@@ -65,19 +46,11 @@ These widgets are enabled by default. Just install and run!
 
 ## 🆕 Recent Updates
 
-### [v2.0.46](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.0.46) - Upstream sync
-
-- Merged 101 upstream commits: line reorder move mode, Claude Session ID widget, `CLAUDE_CONFIG_DIR` support, Windows fixes, Block Timer fixes, model string/object handling fix, and more
-
-### [v2.0.45](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.0.45) - Extra usage spending display
+### [v2.1.2](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.1.2) - Token auth fallback and 401 handling
 
-- Extra usage spending display in Reset Timer widget (e.g. `Extra: €41.24/€47.00`)
-- Auto-detect currency from timezone (Europe/* = €, else $)
-
-### [v2.0.42](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.0.42) - Fix reset timer API field
-
-- Fixed API field name from `reset_at` to `resets_at` — reset timer now displays correctly
-- Merged latest changes from upstream ccstatusline
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): macOS file credential fallback — reads `~/.claude/.credentials.json` when Keychain entry is missing
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): 401 auth error handling — invalidates cached token so next call re-reads from disk after `/login`
+- Synced with upstream (101 commits)
 
 ### v2.0.16 - Add fish style path abbreviation toggle to Current Working Directory widget
 
@@ -93,7 +66,7 @@ These widgets are enabled by default. Just install and run!
 
 - **👾 Emoji Support** - You can now paste emoji into the custom text widget. You can also turn on the merge option to get emoji labels for your widgets like this:
   
-![Emoji Support](screenshots/emojiSupport.png)
+![Emoji Support](https://raw.githubusercontent.com/sirmalloc/ccstatusline/main/screenshots/emojiSupport.png)
 
 ### v2.0.11 - Unlimited Status Lines
 
@@ -106,13 +79,13 @@ These widgets are enabled by default. Just install and run!
 
 ### v2.0.8 - Powerline Auto-Alignment
 
-![Powerline Auto-Alignment](screenshots/autoAlign.png)
+![Powerline Auto-Alignment](https://raw.githubusercontent.com/sirmalloc/ccstatusline/main/screenshots/autoAlign.png)
 
 - **🎯 Widget Alignment** - Auto-align widgets across multiple status lines in Powerline mode for a clean, columnar layout (toggle with 'a' in Powerline Setup)
 
 ### v2.0.7 - Current Working Directory & Session Cost
 
-![Current Working Directory and Session Cost](screenshots/cwdAndSessionCost.png)
+![Current Working Directory and Session Cost](https://raw.githubusercontent.com/sirmalloc/ccstatusline/main/screenshots/cwdAndSessionCost.png)
 
 - **📁 Current Working Directory** - Display the current working directory with configurable segment display
   - Set the number of path segments to show (e.g., show only last 2 segments: `.../Personal/ccstatusline`)
@@ -130,7 +103,7 @@ These widgets are enabled by default. Just install and run!
 
 ### v2.0.2 - Block Timer Widget
 
-![Block Timer](screenshots/blockTimerSmall.png)
+![Block Timer](https://raw.githubusercontent.com/sirmalloc/ccstatusline/main/screenshots/blockTimerSmall.png)
 
 - **⏱️ Block Timer** - Track your progress through 5-hour Claude Code blocks
   - Displays time elapsed in current block as hours/minutes (e.g., "3hr 45m")
@@ -149,13 +122,9 @@ These widgets are enabled by default. Just install and run!
 
 ---
 
-</div>
-
 ## ✨ Features
 
 - **📊 Real-time Metrics** - Display model name, git branch, token usage, session duration, block timer, and more
-- **📈 API Usage Tracking** - Real-time 5-hour session and weekly utilization from Anthropic API with progress bars
-- **⏱️ Reset Timer** - Countdown to when your 5-hour session window resets
 - **🎨 Fully Customizable** - Choose what to display and customize colors for each element
 - **⚡ Powerline Support** - Beautiful Powerline-style rendering with arrow separators, caps, and custom fonts
 - **📐 Multi-line Support** - Configure multiple independent status lines
@@ -174,10 +143,10 @@ These widgets are enabled by default. Just install and run!
 
 ```bash
 # Run the configuration TUI with npm
-npx ccstatusline-usage@latest
+npx ccstatusline@latest
 
 # Or with Bun (faster)
-bunx ccstatusline-usage@latest
+bunx ccstatusline@latest
 ```
 
 ### Configure ccstatusline
@@ -216,19 +185,19 @@ ccstatusline works seamlessly on Windows with full feature compatibility across
 irm bun.sh/install.ps1 | iex
 
 # Run ccstatusline
-bunx ccstatusline-usage@latest
+bunx ccstatusline@latest
 ```
 
 #### Option 2: Using Node.js
 ```powershell
 # Using npm
-npx ccstatusline-usage@latest
+npx ccstatusline@latest
 
 # Or with Yarn
-yarn dlx ccstatusline-usage@latest
+yarn dlx ccstatusline@latest
 
 # Or with pnpm
-pnpm dlx ccstatusline-usage@latest
+pnpm dlx ccstatusline@latest
 ```
 
 ### Windows-Specific Features
@@ -283,7 +252,7 @@ winget install Git.Git
 **Issue**: Permission errors during installation
 ```powershell
 # Use non-global installation (recommended)
-npx ccstatusline-usage@latest
+npx ccstatusline@latest
 
 # Or run PowerShell as Administrator for global install
 ```
@@ -311,7 +280,7 @@ ccstatusline works perfectly in WSL environments:
 # Install in WSL Ubuntu/Debian
 curl -fsSL https://bun.sh/install | bash
 source ~/.bashrc
-bunx ccstatusline-usage@latest
+bunx ccstatusline@latest
 ```
 
 **WSL Benefits**:
@@ -348,14 +317,14 @@ Configure ccstatusline in your Claude Code settings:
 **For Bun users**:
 ```json
 {
-  "statusLine": "bunx ccstatusline-usage@latest"
+  "statusLine": "bunx ccstatusline@latest"
 }
 ```
 
 **For npm users**:
 ```json
 {
-  "statusLine": "npx ccstatusline-usage@latest"
+  "statusLine": "npx ccstatusline@latest"
 }
 ```
 
@@ -386,15 +355,7 @@ Once configured, ccstatusline automatically formats your Claude Code status line
 
 ### 📊 Available Widgets
 
-#### API Usage Widgets ([pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage))
-- **Session Usage** - 5-hour session utilization with progress bar (e.g., "Session: [████░░░░░░░░░░░] 29.0%")
-- **Weekly Usage** - 7-day utilization with progress bar (e.g., "Weekly: [█░░░░░░░░░░░░░░] 7.0%")
-- **Reset Timer / Extra Usage** - Time until 5-hour session window resets (e.g., "2:59 hr"), or extra usage spending when weekly limit is reached (e.g., "Extra: €41.24/€47.00")
-- **Context Bar** - Visual context window usage with bar (e.g., "Context: [███████░░░░░░░░] 103k/200k (51%)")
-
-#### Standard Widgets
 - **Model Name** - Shows the current Claude model (e.g., "Claude 3.5 Sonnet")
-- **Claude Session ID** - Shows the current session UUID
 - **Git Branch** - Displays current git branch name
 - **Git Changes** - Shows uncommitted insertions/deletions (e.g., "+42,-10")
 - **Git Worktree** - Shows the name of the current git worktree
@@ -524,7 +485,7 @@ Execute shell commands and display their output dynamically:
 3. Set timeout: `5000` (5 seconds for initial download)
 4. Enable "preserve colors" to keep ccusage's color formatting
 
-![ccusage integration](screenshots/ccusage.png)
+![ccusage integration](https://raw.githubusercontent.com/sirmalloc/ccstatusline/main/screenshots/ccusage.png)
 
 > 📄 **How it works:** The command receives Claude Code's JSON data via stdin, allowing ccusage to access session information, model details, and transcript data for accurate usage tracking.
 
@@ -645,17 +606,6 @@ Contributions are welcome! Please feel free to submit a Pull Request.
 
 ---
 
-## 🗑️ Uninstall
-
-```bash
-npm uninstall -g ccstatusline-usage
-rm -rf ~/.npm/_npx ~/.config/ccstatusline ~/.cache/ccstatusline*
-jq 'del(.statusLine)' ~/.claude/settings.json > /tmp/cs.json && cat /tmp/cs.json > ~/.claude/settings.json
-```
-
----
-
-
 ## 📄 License
 
 [MIT](LICENSE) © Matthew Breedlove
@@ -668,11 +618,6 @@ jq 'del(.statusLine)' ~/.claude/settings.json > /tmp/cs.json && cat /tmp/cs.json
 
 - GitHub: [@sirmalloc](https://github.com/sirmalloc)
 
-**PC van Velzen** ([pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage) fork)
-
-- GitHub: [@pcvelz](https://github.com/pcvelz)
-
-
 ---
 
 ## 🔗 Related Projects
@@ -710,8 +655,8 @@ Give a ⭐ if this project helped you!
 [![GitHub forks](https://img.shields.io/github/forks/sirmalloc/ccstatusline?style=social)](https://github.com/sirmalloc/ccstatusline/network/members)
 [![GitHub watchers](https://img.shields.io/github/watchers/sirmalloc/ccstatusline?style=social)](https://github.com/sirmalloc/ccstatusline/watchers)
 
-[![npm version](https://img.shields.io/npm/v/ccstatusline-usage.svg)](https://www.npmjs.com/package/ccstatusline-usage)
-[![npm downloads](https://img.shields.io/npm/dm/ccstatusline-usage.svg)](https://www.npmjs.com/package/ccstatusline-usage)
+[![npm version](https://img.shields.io/npm/v/ccstatusline.svg)](https://www.npmjs.com/package/ccstatusline)
+[![npm downloads](https://img.shields.io/npm/dm/ccstatusline.svg)](https://www.npmjs.com/package/ccstatusline)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/sirmalloc/ccstatusline/blob/main/LICENSE)
 [![Made with Bun](https://img.shields.io/badge/Made%20with-Bun-000000.svg?logo=bun)](https://bun.sh)
 

package/dist/ccstatusline.js

@@ -51450,7 +51450,7 @@ import { execSync as execSync3 } from "child_process";
 import * as fs5 from "fs";
 import * as path4 from "path";
 var __dirname = "/Users/peter/Documents/Code/ccstatusline-usage/src/utils";
-var PACKAGE_VERSION = "2.0.46";
+var PACKAGE_VERSION = "2.1.2";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -53456,18 +53456,6 @@ class ContextPercentageWidget {
       const usedPercentage = Math.min(100, context.tokenMetrics.contextLength / contextConfig.maxTokens * 100);
       const displayPercentage = isInverse ? 100 - usedPercentage : usedPercentage;
       return item.rawValue ? `${displayPercentage.toFixed(1)}%` : `Ctx: ${displayPercentage.toFixed(1)}%`;
-    } else if (context.data?.context_window) {
-      const ctxWindow = context.data.context_window;
-      let usedPercentage = null;
-      if (typeof ctxWindow.used_percentage === "number") {
-        usedPercentage = ctxWindow.used_percentage;
-      } else if (typeof ctxWindow.current_usage === "number" && ctxWindow.context_window_size) {
-        usedPercentage = Math.min(100, ctxWindow.current_usage / ctxWindow.context_window_size * 100);
-      }
-      if (usedPercentage !== null) {
-        const displayPercentage = isInverse ? 100 - usedPercentage : usedPercentage;
-        return item.rawValue ? `${displayPercentage.toFixed(1)}%` : `Ctx: ${displayPercentage.toFixed(1)}%`;
-      }
     }
     return null;
   }
@@ -54419,35 +54407,43 @@ var cachedData = null;
 var cacheTime = 0;
 var cachedToken = null;
 var tokenCacheTime = 0;
+var CRED_FILE = path5.join(process.env.HOME ?? "", ".claude", ".credentials.json");
+function readTokenFromFile() {
+  try {
+    const creds = JSON.parse(fs6.readFileSync(CRED_FILE, "utf8"));
+    return creds?.claudeAiOauth?.accessToken ?? null;
+  } catch {
+    return null;
+  }
+}
+function readTokenFromKeychain() {
+  try {
+    const result = execSync8('security find-generic-password -s "Claude Code-credentials" -w 2>/dev/null', { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
+    const parsed = JSON.parse(result);
+    return parsed?.claudeAiOauth?.accessToken ?? null;
+  } catch {
+    return null;
+  }
+}
+function invalidateTokenCache() {
+  cachedToken = null;
+  tokenCacheTime = 0;
+}
 function getToken() {
   const now = Math.floor(Date.now() / 1000);
   if (cachedToken && now - tokenCacheTime < TOKEN_CACHE_MAX_AGE) {
     return cachedToken;
   }
-  try {
-    const isMac = process.platform === "darwin";
-    if (isMac) {
-      const result = execSync8('security find-generic-password -s "Claude Code-credentials" -w 2>/dev/null', { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
-      const parsed = JSON.parse(result);
-      const token = parsed?.claudeAiOauth?.accessToken ?? null;
-      if (token) {
-        cachedToken = token;
-        tokenCacheTime = now;
-      }
-      return token;
-    } else {
-      const credFile = path5.join(process.env.HOME ?? "", ".claude", ".credentials.json");
-      const creds = JSON.parse(fs6.readFileSync(credFile, "utf8"));
-      const token = creds?.claudeAiOauth?.accessToken ?? null;
-      if (token) {
-        cachedToken = token;
-        tokenCacheTime = now;
-      }
-      return token;
-    }
-  } catch {
-    return null;
+  let token = null;
+  if (process.platform === "darwin")
+    token = readTokenFromKeychain();
+  if (!token)
+    token = readTokenFromFile();
+  if (token) {
+    cachedToken = token;
+    tokenCacheTime = now;
   }
+  return token;
 }
 function readStaleCache() {
   try {
@@ -54475,6 +54471,8 @@ function fetchFromApi(token) {
             res.on('end', () => {
                 if (res.statusCode === 200) {
                     process.stdout.write(data);
+                } else if (res.statusCode === 401) {
+                    process.exit(2);
                 } else {
                     process.exit(1);
                 }
@@ -54489,7 +54487,14 @@ function fetchFromApi(token) {
     timeout: 6000,
     env: { ...process.env, TOKEN: token }
   });
-  if (result.error || result.status !== 0 || !result.stdout) {
+  if (result.error || !result.stdout) {
+    if (result.status === 2)
+      return "auth-error";
+    return null;
+  }
+  if (result.status !== 0) {
+    if (result.status === 2)
+      return "auth-error";
     return null;
   }
   return result.stdout;
@@ -54537,6 +54542,13 @@ function fetchApiData() {
   }
   try {
     const response = fetchFromApi(token);
+    if (response === "auth-error") {
+      invalidateTokenCache();
+      const stale = readStaleCache();
+      if (stale && !stale.error)
+        return stale;
+      return { error: "api-error" };
+    }
     if (!response) {
       const stale = readStaleCache();
       if (stale && !stale.error)
@@ -54593,11 +54605,21 @@ function getErrorMessage(error43) {
       return "[Parse Error]";
   }
 }
-function makeProgressBar(percent, width = 15) {
+var MOBILE_THRESHOLD = 80;
+var MOBILE_BAR_WIDTH = 4;
+var DEFAULT_BAR_WIDTH = 15;
+function isMobileWidth(context) {
+  return (context.terminalWidth ?? 0) > 0 && (context.terminalWidth ?? 0) < MOBILE_THRESHOLD;
+}
+function makeProgressBar(percent, width = DEFAULT_BAR_WIDTH) {
   const filled = Math.round(percent / 100 * width);
   const empty = width - filled;
   return "[" + "█".repeat(filled) + "░".repeat(empty) + "]";
 }
+function formatUsageBar(label, shortLabel, percent, mobile) {
+  const bar = makeProgressBar(percent, mobile ? MOBILE_BAR_WIDTH : DEFAULT_BAR_WIDTH);
+  return `${mobile ? shortLabel : label}: ${bar} ${percent.toFixed(1)}%`;
+}
 
 class SessionUsageWidget {
   getDefaultColor() {
@@ -54620,8 +54642,7 @@ class SessionUsageWidget {
       return getErrorMessage(data.error);
     if (data.sessionUsage === undefined)
       return null;
-    const percent = data.sessionUsage;
-    return `Session: ${makeProgressBar(percent)} ${percent.toFixed(1)}%`;
+    return formatUsageBar("Session", "S", data.sessionUsage, isMobileWidth(context));
   }
   supportsRawValue() {
     return false;
@@ -54652,8 +54673,7 @@ class WeeklyUsageWidget {
       return getErrorMessage(data.error);
     if (data.weeklyUsage === undefined)
       return null;
-    const percent = data.weeklyUsage;
-    return `Weekly: ${makeProgressBar(percent)} ${percent.toFixed(1)}%`;
+    return formatUsageBar("Weekly", "W", data.weeklyUsage, isMobileWidth(context));
   }
   supportsRawValue() {
     return false;
@@ -54754,7 +54774,11 @@ class ContextBarWidget {
     const percent = total > 0 ? used / total * 100 : 0;
     const usedK = Math.round(used / 1000);
     const totalK = Math.round(total / 1000);
-    return `Context: ${makeProgressBar(percent)} ${usedK}k/${totalK}k (${Math.round(percent)}%)`;
+    const mobile = isMobileWidth(context);
+    const bar = makeProgressBar(percent, mobile ? MOBILE_BAR_WIDTH : DEFAULT_BAR_WIDTH);
+    const label = mobile ? "C" : "Context";
+    const suffix = mobile ? "" : ` (${Math.round(percent)}%)`;
+    return `${label}: ${bar} ${usedK}k/${totalK}k${suffix}`;
   }
   supportsRawValue() {
     return false;
@@ -58423,7 +58447,7 @@ Continue?`;
             bold: true,
             children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(dist_default4, {
               name: "retro",
-              children: "CCStatusline Usage"
+              children: "CCStatusline Configuration"
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccstatusline-usage",
-  "version": "2.0.46",
+  "version": "2.1.2",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",
@@ -18,6 +18,7 @@
     "prepublishOnly": "bun run build",
     "lint": "bun tsc --noEmit; eslint . --config eslint.config.js --max-warnings=999999 --fix",
     "test": "bun vitest",
+    "publish:safe": "bash scripts/safe-publish.sh",
     "docs": "typedoc",
     "docs:clean": "rm -rf docs"
   },