ccstatusline-usage 2.1.3 → 2.1.4

package/README.md

@@ -46,6 +46,15 @@
 
 ## 🆕 Recent Updates
 
+### [v2.1.4](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.1.4) - Compact mode widget-boundary wrapping
+
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Widget-boundary wrapping** — compact mode now wraps at widget boundaries instead of mid-widget, using a dedicated compact renderer (`compact-renderer.ts`). Widgets that don't fit on the current line cleanly wrap to the next:
+  ```
+  S: [░░░░] 2.0% | W: [██░░] 43.0% | 4:36 hr
+  M: o4.6 ▌▌▌ | S: 5647528d | C: [██░░] 119k/200k
+  ```
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Terminal-agnostic compact detection** — compact mode now triggers on any narrow terminal (< 80 columns), not just tmux
+
 ### [v2.1.3](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.1.3) - Mobile/compact mode and thinking effort bars
 
 - [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Mobile/compact mode** — in narrow terminals (< 80 effective columns, e.g. tmux panes), widgets auto-switch to compact rendering: `M: o4.6` instead of `Model: claude-opus-4-6`, session ID truncated to 8 chars, and multiple status lines merge into one
@@ -376,8 +385,8 @@ Once configured, ccstatusline automatically formats your Claude Code status line
 - **Tokens Cached** - Shows cached tokens used
 - **Tokens Total** - Shows total tokens used
 - **Context Length** - Shows current context length in tokens
-- **Context Percentage** - Shows percentage of context limit used (dynamic: 1M for Sonnet 4.5 with `[1m]` suffix, 200k otherwise)
-- **Context Percentage (usable)** - Shows percentage of usable context (dynamic: 800k for Sonnet 4.5 with `[1m]` suffix, 160k otherwise, accounting for auto-compact at 80%)
+- **Context Percentage** - Shows percentage of context limit used (dynamic: 1M for Sonnet 4.5/Opus 4.6 with `[1m]` suffix, 200k otherwise)
+- **Context Percentage (usable)** - Shows percentage of usable context (dynamic: 800k for Sonnet 4.5/Opus 4.6 with `[1m]` suffix, 160k otherwise, accounting for auto-compact at 80%)
 - **Terminal Width** - Shows detected terminal width (for debugging)
 - **Custom Text** - Add your own custom text to the status line
 - **Custom Command** - Execute shell commands and display their output (refreshes whenever the statusline is updated by Claude Code)
@@ -447,7 +456,7 @@ The Block Timer widget helps you track your progress through Claude Code's 5-hou
 ### 🔤 Raw Value Mode
 
 Some widgets support "raw value" mode which displays just the value without a label:
-- Normal: `Model: Claude 3.5 Sonnet` → Raw: `Claude 3.5 Sonnet`
+- Normal: `Model: Claude Opus 4.6` → Raw: `Claude Opus 4.6`
 - Normal: `Session: 2hr 15m` → Raw: `2hr 15m`
 - Normal: `Block: 3hr 45m` → Raw: `3hr 45m`
 - Normal: `Ctx: 18.6k` → Raw: `18.6k`
@@ -624,6 +633,11 @@ Contributions are welcome! Please feel free to submit a Pull Request.
 
 - GitHub: [@sirmalloc](https://github.com/sirmalloc)
 
+**Fork maintained by Peter van Velzen**
+
+- GitHub: [@pcvelz](https://github.com/pcvelz)
+- Fork: [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage)
+
 ---
 
 ## 🔗 Related Projects
@@ -643,11 +657,11 @@ Contributions are welcome! Please feel free to submit a Pull Request.
 
 ## Star History
 
-<a href="https://www.star-history.com/#sirmalloc/ccstatusline&Timeline">
+<a href="https://www.star-history.com/#pcvelz/ccstatusline-usage&Timeline">
  <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=sirmalloc/ccstatusline&type=Timeline&theme=dark" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=sirmalloc/ccstatusline&type=Timeline" />
-   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=sirmalloc/ccstatusline&type=Timeline" />
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=pcvelz/ccstatusline-usage&type=Timeline&theme=dark" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=pcvelz/ccstatusline-usage&type=Timeline" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=pcvelz/ccstatusline-usage&type=Timeline" />
  </picture>
 </a>
 
@@ -657,21 +671,21 @@ Contributions are welcome! Please feel free to submit a Pull Request.
 
 Give a ⭐ if this project helped you!
 
-[![GitHub stars](https://img.shields.io/github/stars/sirmalloc/ccstatusline?style=social)](https://github.com/sirmalloc/ccstatusline/stargazers)
-[![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)
+[![GitHub stars](https://img.shields.io/github/stars/pcvelz/ccstatusline-usage?style=social)](https://github.com/pcvelz/ccstatusline-usage/stargazers)
+[![GitHub forks](https://img.shields.io/github/forks/pcvelz/ccstatusline-usage?style=social)](https://github.com/pcvelz/ccstatusline-usage/network/members)
+[![GitHub watchers](https://img.shields.io/github/watchers/pcvelz/ccstatusline-usage?style=social)](https://github.com/pcvelz/ccstatusline-usage/watchers)
 
-[![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)
+[![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)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/pcvelz/ccstatusline-usage/blob/main/LICENSE)
 [![Made with Bun](https://img.shields.io/badge/Made%20with-Bun-000000.svg?logo=bun)](https://bun.sh)
 
-[![Issues](https://img.shields.io/github/issues/sirmalloc/ccstatusline)](https://github.com/sirmalloc/ccstatusline/issues)
-[![Pull Requests](https://img.shields.io/github/issues-pr/sirmalloc/ccstatusline)](https://github.com/sirmalloc/ccstatusline/pulls)
-[![Contributors](https://img.shields.io/github/contributors/sirmalloc/ccstatusline)](https://github.com/sirmalloc/ccstatusline/graphs/contributors)
+[![Issues](https://img.shields.io/github/issues/pcvelz/ccstatusline-usage)](https://github.com/pcvelz/ccstatusline-usage/issues)
+[![Pull Requests](https://img.shields.io/github/issues-pr/pcvelz/ccstatusline-usage)](https://github.com/pcvelz/ccstatusline-usage/pulls)
+[![Contributors](https://img.shields.io/github/contributors/pcvelz/ccstatusline-usage)](https://github.com/pcvelz/ccstatusline-usage/graphs/contributors)
 
 ### 💬 Connect
 
-[Report Bug](https://github.com/sirmalloc/ccstatusline/issues) · [Request Feature](https://github.com/sirmalloc/ccstatusline/issues) · [Discussions](https://github.com/sirmalloc/ccstatusline/discussions)
+[Report Bug](https://github.com/pcvelz/ccstatusline-usage/issues) · [Request Feature](https://github.com/pcvelz/ccstatusline-usage/issues) · [Discussions](https://github.com/pcvelz/ccstatusline-usage/discussions)
 
 </div>

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.1.3";
+var PACKAGE_VERSION = "2.1.4";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -58750,6 +58750,63 @@ var StatusJSONSchema = exports_external.looseObject({
   }).nullable().optional()
 });
 
+// src/utils/compact-renderer.ts
+function renderCompactOutput(preRenderedLines, settings, maxWidth) {
+  const colorLevel = getColorLevelString(settings.colorLevel);
+  const sep = settings.defaultSeparator ?? "|";
+  const separatorText = sep === "|" ? " | " : ` ${sep} `;
+  const separatorWidth = separatorText.length;
+  const coloredWidgets = [];
+  for (const line of preRenderedLines) {
+    for (const pw of line) {
+      if (pw.widget.type === "separator" || pw.widget.type === "flex-separator")
+        continue;
+      if (pw.plainLength === 0)
+        continue;
+      let fgColor = pw.widget.color;
+      if (!fgColor) {
+        const impl = getWidget(pw.widget.type);
+        fgColor = impl ? impl.getDefaultColor() : "white";
+      }
+      let bgColor = pw.widget.backgroundColor;
+      if (settings.overrideForegroundColor && settings.overrideForegroundColor !== "none")
+        fgColor = settings.overrideForegroundColor;
+      if (settings.overrideBackgroundColor && settings.overrideBackgroundColor !== "none")
+        bgColor = settings.overrideBackgroundColor;
+      const bold = settings.globalBold || pw.widget.bold;
+      const colored = applyColors(pw.content, fgColor, bgColor, bold, colorLevel);
+      coloredWidgets.push({ colored, width: pw.plainLength });
+    }
+  }
+  if (coloredWidgets.length === 0)
+    return;
+  const outputLines = [];
+  let currentLine = "";
+  let currentWidth = 0;
+  for (const cw of coloredWidgets) {
+    const needed = currentWidth === 0 ? cw.width : separatorWidth + cw.width;
+    if (currentWidth > 0 && currentWidth + needed > maxWidth) {
+      outputLines.push(currentLine);
+      currentLine = cw.colored;
+      currentWidth = cw.width;
+    } else {
+      if (currentWidth > 0) {
+        currentLine += source_default.gray(separatorText);
+        currentWidth += separatorWidth;
+      }
+      currentLine += cw.colored;
+      currentWidth += cw.width;
+    }
+  }
+  if (currentLine)
+    outputLines.push(currentLine);
+  for (const line of outputLines) {
+    let outputLine = line.replace(/ /g, " ");
+    outputLine = "\x1B[0m" + outputLine;
+    console.log(outputLine);
+  }
+}
+
 // src/utils/jsonl.ts
 import * as fs8 from "fs";
 import path8 from "node:path";
@@ -59781,6 +59838,10 @@ function floorToHour(timestamp) {
 }
 
 // src/ccstatusline.ts
+var COMPACT_THRESHOLD = 80;
+function isCompactWidth(width) {
+  return width !== null && width > 0 && width < COMPACT_THRESHOLD;
+}
 async function readStdin() {
   if (process.stdin.isTTY) {
     return null;
@@ -59823,49 +59884,38 @@ async function renderMultipleLines(data) {
   if (hasBlockTimer) {
     blockMetrics = getBlockMetrics();
   }
-  const rawWidth = getTerminalWidth();
-  const deduction = settings.flexMode === "full-minus-40" ? 40 : 6;
-  const effectiveWidth = rawWidth ? rawWidth - deduction : null;
+  const terminalWidth = getTerminalWidth();
   const context = {
     data,
     tokenMetrics,
     sessionDuration,
     blockMetrics,
-    terminalWidth: effectiveWidth,
+    terminalWidth,
     isPreview: false
   };
   const preRenderedLines = preRenderAllWidgets(lines, settings, context);
-  const preCalculatedMaxWidths = calculateMaxWidthsFromPreRendered(preRenderedLines, settings);
-  const mobile = effectiveWidth !== null && effectiveWidth > 0 && effectiveWidth < 80;
-  const renderedLines = [];
-  let globalSeparatorIndex = 0;
-  for (let i = 0;i < lines.length; i++) {
-    const lineItems = lines[i];
-    if (lineItems && lineItems.length > 0) {
-      const lineContext = { ...context, lineIndex: i, globalSeparatorIndex };
-      const preRenderedWidgets = preRenderedLines[i] ?? [];
-      const line = renderStatusLine(lineItems, settings, lineContext, preRenderedWidgets, preCalculatedMaxWidths);
-      const strippedLine = line.replace(/\x1b\[[0-9;]*m/g, "").trim();
-      if (strippedLine.length > 0) {
-        const nonMergedWidgets = lineItems.filter((_, idx) => idx === lineItems.length - 1 || !lineItems[idx]?.merge);
-        if (nonMergedWidgets.length > 1)
-          globalSeparatorIndex += nonMergedWidgets.length - 1;
-        renderedLines.push(line);
-      }
-    }
-  }
-  if (mobile && renderedLines.length > 1) {
-    const sep2 = settings.defaultSeparator ?? "|";
-    const separator = sep2 === "|" ? " | " : ` ${sep2} `;
-    const merged = renderedLines.join(separator);
-    let outputLine = merged.replace(/ /g, " ");
-    outputLine = "\x1B[0m" + outputLine;
-    console.log(outputLine);
+  const compact = isCompactWidth(terminalWidth);
+  if (compact && terminalWidth) {
+    renderCompactOutput(preRenderedLines, settings, terminalWidth - 6);
   } else {
-    for (const line of renderedLines) {
-      let outputLine = line.replace(/ /g, " ");
-      outputLine = "\x1B[0m" + outputLine;
-      console.log(outputLine);
+    const preCalculatedMaxWidths = calculateMaxWidthsFromPreRendered(preRenderedLines, settings);
+    let globalSeparatorIndex = 0;
+    for (let i = 0;i < lines.length; i++) {
+      const lineItems = lines[i];
+      if (lineItems && lineItems.length > 0) {
+        const lineContext = { ...context, lineIndex: i, globalSeparatorIndex };
+        const preRenderedWidgets = preRenderedLines[i] ?? [];
+        const line = renderStatusLine(lineItems, settings, lineContext, preRenderedWidgets, preCalculatedMaxWidths);
+        const strippedLine = line.replace(/\x1b\[[0-9;]*m/g, "").trim();
+        if (strippedLine.length > 0) {
+          const nonMergedWidgets = lineItems.filter((_, idx) => idx === lineItems.length - 1 || !lineItems[idx]?.merge);
+          if (nonMergedWidgets.length > 1)
+            globalSeparatorIndex += nonMergedWidgets.length - 1;
+          let outputLine = line.replace(/ /g, " ");
+          outputLine = "\x1B[0m" + outputLine;
+          console.log(outputLine);
+        }
+      }
     }
   }
   if (settings.updatemessage?.message && settings.updatemessage.message.trim() !== "" && settings.updatemessage.remaining && settings.updatemessage.remaining > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccstatusline-usage",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",