ccstatusline 2.0.8 → 2.0.10

package/README.md

@@ -22,6 +22,8 @@
 [![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/)
+
 
 ![Demo](https://raw.githubusercontent.com/sirmalloc/ccstatusline/main/screenshots/demo.gif)
 
@@ -42,6 +44,11 @@
 
 ## 🆕 Recent Updates
 
+### v2.0.10 - Git Updates
+
+- **🌳 Git Worktree widget** - Shows the active worktree name when working with git worktrees
+- **👻 Hide 'no git' message toggle** - Git widgets now support hiding the 'no git' message when not in a repository (toggle with 'h' key while editing the widget)
+
 ### v2.0.8 - Powerline Auto-Alignment
 
 ![Powerline Auto-Alignment](https://raw.githubusercontent.com/sirmalloc/ccstatusline/main/screenshots/autoAlign.png)
@@ -137,6 +144,7 @@ Once configured, ccstatusline automatically formats your Claude Code status line
 - **Model Name** - Shows the current Claude model (e.g., "Claude 3.5 Sonnet")
 - **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
 - **Session Clock** - Shows elapsed time since session start (e.g., "2hr 15m")
 - **Session Cost** - Shows total session cost in USD (e.g., "$1.23")
 - **Block Timer** - Shows time elapsed in current 5-hour block or progress bar
@@ -285,7 +293,7 @@ When terminal width is detected, status lines automatically truncate with ellips
 
 ```bash
 # Clone the repository
-git clone https://github.com/yourusername/ccstatusline.git
+git clone https://github.com/sirmalloc/ccstatusline.git
 cd ccstatusline
 
 # Install dependencies

package/dist/ccstatusline.js

@@ -36263,7 +36263,7 @@ function wrapAnsi(string, columns, options) {
 `);
 }
 
-// node_modules/is-fullwidth-code-point/index.js
+// node_modules/cli-truncate/node_modules/slice-ansi/node_modules/is-fullwidth-code-point/index.js
 function isFullwidthCodePoint(codePoint) {
   if (!Number.isInteger(codePoint)) {
     return false;
@@ -37556,6 +37556,14 @@ function styledCharsToString(chars) {
   }
   return ret;
 }
+// node_modules/is-fullwidth-code-point/index.js
+function isFullwidthCodePoint3(codePoint) {
+  if (!Number.isInteger(codePoint)) {
+    return false;
+  }
+  return codePoint >= 4352 && (codePoint <= 4447 || codePoint === 9001 || codePoint === 9002 || 11904 <= codePoint && codePoint <= 12871 && codePoint !== 12351 || 12880 <= codePoint && codePoint <= 19903 || 19968 <= codePoint && codePoint <= 42182 || 43360 <= codePoint && codePoint <= 43388 || 44032 <= codePoint && codePoint <= 55203 || 63744 <= codePoint && codePoint <= 64255 || 65040 <= codePoint && codePoint <= 65049 || 65072 <= codePoint && codePoint <= 65131 || 65281 <= codePoint && codePoint <= 65376 || 65504 <= codePoint && codePoint <= 65510 || 110592 <= codePoint && codePoint <= 110593 || 127488 <= codePoint && codePoint <= 127569 || 131072 <= codePoint && codePoint <= 262141);
+}
+
 // node_modules/@alcalzone/ansi-tokenize/build/tokenize.js
 function findNumberIndex2(str) {
   for (let index = 0;index < str.length; index++) {
@@ -37607,7 +37615,7 @@ function tokenize2(str, endChar = Number.POSITIVE_INFINITY) {
         continue;
       }
     }
-    const fullWidth = isFullwidthCodePoint(codePoint);
+    const fullWidth = isFullwidthCodePoint3(codePoint);
     const character = String.fromCodePoint(codePoint);
     ret.push({
       type: "char",
@@ -51037,7 +51045,7 @@ import { execSync as execSync3 } from "child_process";
 import * as fs5 from "fs";
 import * as path4 from "path";
 var __dirname = "/Users/sirmalloc/Projects/Personal/ccstatusline/src/utils";
-var PACKAGE_VERSION = "2.0.8";
+var PACKAGE_VERSION = "2.0.10";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -51938,16 +51946,38 @@ class GitBranchWidget {
     return "Git Branch";
   }
   getEditorDisplay(item) {
-    return { displayText: this.getDisplayName() };
+    const hideNoGit = item.metadata?.hideNoGit === "true";
+    const modifiers = [];
+    if (hideNoGit) {
+      modifiers.push("hide 'no git'");
+    }
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-nogit") {
+      const currentState = item.metadata?.hideNoGit === "true";
+      return {
+        ...item,
+        metadata: {
+          ...item.metadata,
+          hideNoGit: (!currentState).toString()
+        }
+      };
+    }
+    return null;
   }
   render(item, context, settings) {
+    const hideNoGit = item.metadata?.hideNoGit === "true";
     if (context.isPreview) {
       return item.rawValue ? "main" : "⎇ main";
     }
     const branch = this.getGitBranch();
     if (branch)
       return item.rawValue ? branch : `⎇ ${branch}`;
-    return "⎇ no git";
+    return hideNoGit ? null : "⎇ no git";
   }
   getGitBranch() {
     try {
@@ -51960,6 +51990,11 @@ class GitBranchWidget {
       return null;
     }
   }
+  getCustomKeybinds() {
+    return [
+      { key: "h", label: "(h)ide 'no git' message", action: "toggle-nogit" }
+    ];
+  }
   supportsRawValue() {
     return true;
   }
@@ -51981,9 +52016,31 @@ class GitChangesWidget {
     return "Git Changes";
   }
   getEditorDisplay(item) {
-    return { displayText: this.getDisplayName() };
+    const hideNoGit = item.metadata?.hideNoGit === "true";
+    const modifiers = [];
+    if (hideNoGit) {
+      modifiers.push("hide 'no git'");
+    }
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-nogit") {
+      const currentState = item.metadata?.hideNoGit === "true";
+      return {
+        ...item,
+        metadata: {
+          ...item.metadata,
+          hideNoGit: (!currentState).toString()
+        }
+      };
+    }
+    return null;
   }
   render(item, context, settings) {
+    const hideNoGit = item.metadata?.hideNoGit === "true";
     if (context.isPreview) {
       return "(+42,-10)";
     }
@@ -51991,7 +52048,7 @@ class GitChangesWidget {
     if (changes)
       return `(+${changes.insertions},-${changes.deletions})`;
     else
-      return "(no git)";
+      return hideNoGit ? null : "(no git)";
   }
   getGitChanges() {
     try {
@@ -52022,6 +52079,11 @@ class GitChangesWidget {
       return null;
     }
   }
+  getCustomKeybinds() {
+    return [
+      { key: "h", label: "(h)ide 'no git' message", action: "toggle-nogit" }
+    ];
+  }
   supportsRawValue() {
     return false;
   }
@@ -52029,6 +52091,78 @@ class GitChangesWidget {
     return true;
   }
 }
+// src/widgets/GitWorktree.ts
+import { execSync as execSync6 } from "child_process";
+
+class GitWorktreeWidget {
+  getDefaultColor() {
+    return "blue";
+  }
+  getDescription() {
+    return "Shows the current git worktree name";
+  }
+  getDisplayName() {
+    return "Git Worktree";
+  }
+  getEditorDisplay(item) {
+    const hideNoGit = item.metadata?.hideNoGit === "true";
+    const modifiers = [];
+    if (hideNoGit) {
+      modifiers.push("hide 'no git'");
+    }
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-nogit") {
+      const currentState = item.metadata?.hideNoGit === "true";
+      return {
+        ...item,
+        metadata: {
+          ...item.metadata,
+          hideNoGit: (!currentState).toString()
+        }
+      };
+    }
+    return null;
+  }
+  render(item, context) {
+    const hideNoGit = item.metadata?.hideNoGit === "true";
+    if (context.isPreview)
+      return item.rawValue ? "main" : "\uD81A\uDC30 main";
+    const worktree = this.getGitWorktree();
+    if (worktree)
+      return item.rawValue ? worktree : `\uD81A\uDC30 ${worktree}`;
+    return hideNoGit ? null : "\uD81A\uDC30 no git";
+  }
+  getGitWorktree() {
+    try {
+      const worktreeDir = execSync6("git rev-parse --git-dir", {
+        encoding: "utf8",
+        stdio: ["pipe", "pipe", "ignore"]
+      }).trim();
+      if (worktreeDir.endsWith("/.git") || worktreeDir === ".git")
+        return "main";
+      const [, worktree] = worktreeDir.split(".git/worktrees/");
+      return worktree ?? null;
+    } catch {
+      return null;
+    }
+  }
+  getCustomKeybinds() {
+    return [
+      { key: "h", label: "(h)ide 'no git' message", action: "toggle-nogit" }
+    ];
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
 // src/utils/renderer.ts
 var ANSI_REGEX = new RegExp(`\\x1b\\[[0-9;]*m`, "g");
 function formatTokens(count) {
@@ -52038,7 +52172,7 @@ function formatTokens(count) {
     return `${(count / 1000).toFixed(1)}k`;
   return count.toString();
 }
-function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, globalSeparatorOffset = 0, allLinesWidgets) {
+function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, globalSeparatorOffset = 0, preRenderedWidgets, preCalculatedMaxWidths) {
   const powerlineConfig = settings.powerline;
   const config2 = powerlineConfig ?? {};
   const separators = config2.separators ?? [""];
@@ -52092,6 +52226,13 @@ function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, gl
   }
   const widgetElements = [];
   let widgetColorIndex = 0;
+  const preRenderedIndices = [];
+  for (let i = 0;i < widgets.length; i++) {
+    const widget = widgets[i];
+    if (widget && widget.type !== "separator" && widget.type !== "flex-separator") {
+      preRenderedIndices.push(i);
+    }
+  }
   for (let i = 0;i < filteredWidgets.length; i++) {
     const widget = filteredWidgets[i];
     if (!widget)
@@ -52101,12 +52242,14 @@ function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, gl
     if (widget.type === "separator" || widget.type === "flex-separator") {
       continue;
     }
-    try {
+    const actualPreRenderedIndex = preRenderedIndices[i];
+    const preRendered = actualPreRenderedIndex !== undefined ? preRenderedWidgets[actualPreRenderedIndex] : undefined;
+    if (preRendered?.content) {
+      widgetText = preRendered.content;
       const widgetImpl = getWidget(widget.type);
-      widgetText = widgetImpl.render(widget, context, settings) ?? "";
-      defaultColor = widgetImpl.getDefaultColor();
-    } catch {
-      continue;
+      if (widgetImpl) {
+        defaultColor = widgetImpl.getDefaultColor();
+      }
     }
     if (widgetText) {
       const padding = settings.defaultPadding ?? "";
@@ -52146,49 +52289,12 @@ function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, gl
   if (widgetElements.length === 0)
     return "";
   const autoAlign = config2.autoAlign;
-  if (autoAlign && allLinesWidgets) {
-    const maxWidths = [];
-    const allLinesElements = [];
-    for (const lineWidgets of allLinesWidgets) {
-      const filteredLineWidgets = lineWidgets.filter((w) => w.type !== "separator" && w.type !== "flex-separator");
-      const lineElements = [];
-      for (const widget of filteredLineWidgets) {
-        let widgetText = "";
-        try {
-          const widgetImpl = getWidget(widget.type);
-          widgetText = widgetImpl.render(widget, context, settings) ?? "";
-        } catch {
-          continue;
-        }
-        if (widgetText) {
-          const padding = settings.defaultPadding ?? "";
-          const paddedText = `${padding}${widgetText}${padding}`;
-          lineElements.push({
-            content: paddedText,
-            bgColor: widget.backgroundColor,
-            fgColor: widget.color,
-            widget
-          });
-        }
-      }
-      allLinesElements.push(lineElements);
-    }
-    for (let pos = 0;pos < Math.max(...allLinesElements.map((line) => line.length)); pos++) {
-      let maxWidth = 0;
-      for (const lineElements of allLinesElements) {
-        const element = lineElements[pos];
-        if (element) {
-          const plainLength = element.content.replace(ANSI_REGEX, "").length;
-          maxWidth = Math.max(maxWidth, plainLength);
-        }
-      }
-      maxWidths.push(maxWidth);
-    }
+  if (autoAlign) {
     for (let i = 0;i < widgetElements.length; i++) {
       const element = widgetElements[i];
-      const maxWidth = maxWidths[i];
+      const maxWidth = preCalculatedMaxWidths[i];
       if (element && maxWidth !== undefined) {
-        const currentLength = element.content.replace(ANSI_REGEX, "").length;
+        const currentLength = stringWidth(element.content.replace(ANSI_REGEX, ""));
         const paddingNeeded = maxWidth - currentLength;
         if (paddingNeeded > 0) {
           element.content += " ".repeat(paddingNeeded);
@@ -52356,17 +52462,67 @@ function formatSeparator(sep) {
   }
   return sep;
 }
-function renderStatusLineWithInfo(widgets, settings, context, allLinesWidgets) {
-  const line = renderStatusLine(widgets, settings, context, allLinesWidgets);
+function preRenderAllWidgets(allLinesWidgets, settings, context) {
+  const preRenderedLines = [];
+  for (const lineWidgets of allLinesWidgets) {
+    const preRenderedLine = [];
+    for (const widget of lineWidgets) {
+      if (widget.type === "separator" || widget.type === "flex-separator") {
+        preRenderedLine.push({
+          content: "",
+          plainLength: 0,
+          widget
+        });
+        continue;
+      }
+      const widgetImpl = getWidget(widget.type);
+      if (!widgetImpl) {
+        continue;
+      }
+      const widgetText = widgetImpl.render(widget, context, settings) ?? "";
+      const plainLength = stringWidth(widgetText.replace(ANSI_REGEX, ""));
+      preRenderedLine.push({
+        content: widgetText,
+        plainLength,
+        widget
+      });
+    }
+    preRenderedLines.push(preRenderedLine);
+  }
+  return preRenderedLines;
+}
+function calculateMaxWidthsFromPreRendered(preRenderedLines, settings) {
+  const maxWidths = [];
+  const defaultPadding = settings.defaultPadding ?? "";
+  const paddingLength = defaultPadding.length;
+  for (const preRenderedLine of preRenderedLines) {
+    const filteredWidgets = preRenderedLine.filter((w) => w.widget.type !== "separator" && w.widget.type !== "flex-separator" && w.content);
+    for (let pos = 0;pos < filteredWidgets.length; pos++) {
+      const widget = filteredWidgets[pos];
+      if (!widget)
+        continue;
+      const totalWidth = widget.plainLength + paddingLength * 2;
+      const currentMax = maxWidths[pos];
+      if (currentMax === undefined) {
+        maxWidths[pos] = totalWidth;
+      } else {
+        maxWidths[pos] = Math.max(currentMax, totalWidth);
+      }
+    }
+  }
+  return maxWidths;
+}
+function renderStatusLineWithInfo(widgets, settings, context, preRenderedWidgets, preCalculatedMaxWidths) {
+  const line = renderStatusLine(widgets, settings, context, preRenderedWidgets, preCalculatedMaxWidths);
   const wasTruncated = line.includes("...");
   return { line, wasTruncated };
 }
-function renderStatusLine(widgets, settings, context, allLinesWidgets) {
+function renderStatusLine(widgets, settings, context, preRenderedWidgets, preCalculatedMaxWidths) {
   const colorLevel = getColorLevelString(settings.colorLevel);
   const powerlineSettings = settings.powerline;
   const isPowerlineMode = Boolean(powerlineSettings?.enabled);
   if (isPowerlineMode)
-    return renderPowerlineStatusLine(widgets, settings, context, context.lineIndex ?? 0, context.globalSeparatorIndex ?? 0, allLinesWidgets);
+    return renderPowerlineStatusLine(widgets, settings, context, context.lineIndex ?? 0, context.globalSeparatorIndex ?? 0, preRenderedWidgets, preCalculatedMaxWidths);
   const applyColorsWithOverride = (text, foregroundColor, backgroundColor, bold) => {
     let fgColor = foregroundColor;
     if (settings.overrideForegroundColor && settings.overrideForegroundColor !== "none") {
@@ -52424,12 +52580,8 @@ function renderStatusLine(widgets, settings, context, allLinesWidgets) {
         if (prevWidget && prevWidget.type !== "separator" && prevWidget.type !== "flex-separator") {
           let widgetColor = prevWidget.color;
           if (!widgetColor) {
-            try {
-              const widgetImpl = getWidget(prevWidget.type);
-              widgetColor = widgetImpl.getDefaultColor();
-            } catch {
-              widgetColor = "white";
-            }
+            const widgetImpl = getWidget(prevWidget.type);
+            widgetColor = widgetImpl ? widgetImpl.getDefaultColor() : "white";
           }
           separatorColor = widgetColor;
           separatorBg = prevWidget.backgroundColor;
@@ -52445,10 +52597,17 @@ function renderStatusLine(widgets, settings, context, allLinesWidgets) {
       continue;
     }
     try {
-      const widgetImpl = getWidget(widget.type);
-      const widgetText = widgetImpl.render(widget, context, settings);
+      let widgetText;
+      let defaultColor = "white";
+      const preRendered = preRenderedWidgets[i];
+      if (preRendered?.content) {
+        widgetText = preRendered.content;
+        const widgetImpl = getWidget(widget.type);
+        if (widgetImpl) {
+          defaultColor = widgetImpl.getDefaultColor();
+        }
+      }
       if (widgetText) {
-        const defaultColor = widgetImpl.getDefaultColor();
         if (widget.type === "custom-command" && widget.preserveColors) {
           let finalOutput = widgetText;
           if (widget.maxWidth && widget.maxWidth > 0) {
@@ -52512,7 +52671,7 @@ function renderStatusLine(widgets, settings, context, allLinesWidgets) {
           let widgetColor = prevElem2.widget.color;
           if (!widgetColor && prevElem2.widget.type !== "separator" && prevElem2.widget.type !== "flex-separator") {
             const widgetImpl = getWidget(prevElem2.widget.type);
-            widgetColor = widgetImpl.getDefaultColor();
+            widgetColor = widgetImpl ? widgetImpl.getDefaultColor() : "white";
           }
           const coloredSep = applyColorsWithOverride(defaultSep, widgetColor, prevElem2.widget.backgroundColor, prevElem2.widget.bold);
           finalElements.push(coloredSep);
@@ -53042,7 +53201,7 @@ var CustomTextEditor = ({ widget, onComplete, onCancel }) => {
   }, undefined, true, undefined, this);
 };
 // src/widgets/CustomCommand.tsx
-import { execSync as execSync6 } from "child_process";
+import { execSync as execSync7 } from "child_process";
 var import_react30 = __toESM(require_react(), 1);
 var jsx_dev_runtime2 = __toESM(require_jsx_dev_runtime(), 1);
 
@@ -53088,7 +53247,7 @@ class CustomCommandWidget {
       try {
         const timeout = item.timeout ?? 1000;
         const jsonInput = JSON.stringify(context.data);
-        let output = execSync6(item.commandPath, {
+        let output = execSync7(item.commandPath, {
           encoding: "utf8",
           input: jsonInput,
           timeout,
@@ -53543,6 +53702,7 @@ var widgetRegistry = new Map([
   ["output-style", new OutputStyleWidget],
   ["git-branch", new GitBranchWidget],
   ["git-changes", new GitChangesWidget],
+  ["git-worktree", new GitWorktreeWidget],
   ["current-working-dir", new CurrentWorkingDirWidget],
   ["tokens-input", new TokensInputWidget],
   ["tokens-output", new TokensOutputWidget],
@@ -53560,11 +53720,7 @@ var widgetRegistry = new Map([
   ["custom-command", new CustomCommandWidget]
 ]);
 function getWidget(type) {
-  const widget = widgetRegistry.get(type);
-  if (!widget) {
-    throw new Error(`Unknown widget type: ${type}`);
-  }
-  return widget;
+  return widgetRegistry.get(type) ?? null;
 }
 function getAllWidgetTypes(settings) {
   const allTypes = Array.from(widgetRegistry.keys());
@@ -53651,12 +53807,8 @@ var ColorMenu = ({ widgets, lineIndex, settings, onUpdate, onBack }) => {
     if (widget.type === "separator") {
       return showSeparators;
     }
-    try {
-      const widgetInstance = getWidget(widget.type);
-      return widgetInstance.supportsColors(widget);
-    } catch {
-      return false;
-    }
+    const widgetInstance = getWidget(widget.type);
+    return widgetInstance ? widgetInstance.supportsColors(widget) : true;
   });
   const [highlightedItemId, setHighlightedItemId] = import_react33.useState(colorableWidgets[0]?.id ?? null);
   const [editingBackground, setEditingBackground] = import_react33.useState(false);
@@ -53826,7 +53978,9 @@ var ColorMenu = ({ widgets, lineIndex, settings, onUpdate, onBack }) => {
                 let defaultColor = "white";
                 if (widget.type !== "separator" && widget.type !== "flex-separator") {
                   const widgetImpl = getWidget(widget.type);
-                  defaultColor = widgetImpl.getDefaultColor();
+                  if (widgetImpl) {
+                    defaultColor = widgetImpl.getDefaultColor();
+                  }
                 }
                 let currentColor2 = widget.color ?? defaultColor;
                 if (currentColor2 === "dim") {
@@ -53892,7 +54046,7 @@ var ColorMenu = ({ widgets, lineIndex, settings, onUpdate, onBack }) => {
       return "Flex Separator";
     }
     const widgetImpl = getWidget(widget.type);
-    return widgetImpl.getDisplayName();
+    return widgetImpl ? widgetImpl.getDisplayName() : `Unknown: ${widget.type}`;
   };
   const colorOptions = getAvailableColorsForUI();
   const colors = colorOptions.map((c) => c.value || "");
@@ -53904,7 +54058,9 @@ var ColorMenu = ({ widgets, lineIndex, settings, onUpdate, onBack }) => {
     let defaultColor = "white";
     if (widget.type !== "separator" && widget.type !== "flex-separator") {
       const widgetImpl = getWidget(widget.type);
-      defaultColor = widgetImpl.getDefaultColor();
+      if (widgetImpl) {
+        defaultColor = widgetImpl.getDefaultColor();
+      }
     }
     const styledLabel = applyColors(label, widget.color ?? defaultColor, widget.backgroundColor, widget.bold, level);
     return {
@@ -53925,7 +54081,7 @@ var ColorMenu = ({ widgets, lineIndex, settings, onUpdate, onBack }) => {
   const currentColor = editingBackground ? selectedWidget?.backgroundColor ?? "" : selectedWidget ? selectedWidget.color ?? (() => {
     if (selectedWidget.type !== "separator" && selectedWidget.type !== "flex-separator") {
       const widgetImpl = getWidget(selectedWidget.type);
-      return widgetImpl.getDefaultColor();
+      return widgetImpl ? widgetImpl.getDefaultColor() : "white";
     }
     return "white";
   })() : "white";
@@ -54872,8 +55028,8 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
       } else if (widgets.length > 0) {
         const currentWidget2 = widgets[selectedIndex];
         if (currentWidget2 && currentWidget2.type !== "separator" && currentWidget2.type !== "flex-separator") {
-          try {
-            const widgetImpl = getWidget(currentWidget2.type);
+          const widgetImpl = getWidget(currentWidget2.type);
+          if (widgetImpl) {
             if (widgetImpl.getCustomKeybinds) {
               const customKeybinds2 = widgetImpl.getCustomKeybinds();
               const matchedKeybind = customKeybinds2.find((kb) => kb.key === input);
@@ -54892,7 +55048,7 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
                 }
               }
             }
-          } catch {}
+          }
         }
       }
     }
@@ -54907,8 +55063,11 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
       return "Flex Separator";
     }
     const widgetImpl = getWidget(widget.type);
-    const { displayText, modifierText } = widgetImpl.getEditorDisplay(widget);
-    return displayText + (modifierText ? ` ${modifierText}` : "");
+    if (widgetImpl) {
+      const { displayText, modifierText } = widgetImpl.getEditorDisplay(widget);
+      return displayText + (modifierText ? ` ${modifierText}` : "");
+    }
+    return `Unknown: ${widget.type}`;
   };
   const hasFlexSeparator = widgets.some((widget) => widget.type === "flex-separator");
   const widthDetectionAvailable = canDetectTerminalWidth();
@@ -54918,13 +55077,13 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
   let canToggleRaw = false;
   let customKeybinds = [];
   if (currentWidget && !isSeparator && !isFlexSeparator) {
-    try {
-      const widgetImpl = getWidget(currentWidget.type);
+    const widgetImpl = getWidget(currentWidget.type);
+    if (widgetImpl) {
       canToggleRaw = widgetImpl.supportsRawValue();
       if (widgetImpl.getCustomKeybinds) {
         customKeybinds = widgetImpl.getCustomKeybinds();
       }
-    } catch {
+    } else {
       canToggleRaw = false;
     }
   }
@@ -55074,12 +55233,8 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
                   } else if (currentWidget.type === "flex-separator") {
                     return "Expands to fill available terminal width";
                   } else {
-                    try {
-                      const widgetImpl = getWidget(currentWidget.type);
-                      return widgetImpl.getDescription();
-                    } catch {
-                      return "Widget description not available";
-                    }
+                    const widgetImpl = getWidget(currentWidget.type);
+                    return widgetImpl ? widgetImpl.getDescription() : "Unknown widget type";
                   }
                 })()
               }, undefined, false, undefined, this)
@@ -56365,30 +56520,30 @@ var PowerlineSetup = ({
 // src/tui/components/StatusLinePreview.tsx
 var import_react42 = __toESM(require_react(), 1);
 var jsx_dev_runtime14 = __toESM(require_jsx_dev_runtime(), 1);
-var renderSingleLine = (widgets, terminalWidth, widthDetectionAvailable, settings, lineIndex, globalSeparatorIndex, allLinesWidgets) => {
+var renderSingleLine = (widgets, terminalWidth, widthDetectionAvailable, settings, lineIndex, globalSeparatorIndex, preRenderedWidgets, preCalculatedMaxWidths) => {
   const context = {
     terminalWidth,
     isPreview: true,
     lineIndex,
     globalSeparatorIndex
   };
-  return renderStatusLineWithInfo(widgets, settings, context, allLinesWidgets);
+  return renderStatusLineWithInfo(widgets, settings, context, preRenderedWidgets, preCalculatedMaxWidths);
 };
 var StatusLinePreview = ({ lines, terminalWidth, settings, onTruncationChange }) => {
   const widthDetectionAvailable = import_react42.default.useMemo(() => canDetectTerminalWidth(), []);
   const { renderedLines, anyTruncated } = import_react42.default.useMemo(() => {
     if (!settings)
       return { renderedLines: [], anyTruncated: false };
-    const isPowerlineMode = settings.powerline.enabled;
-    const autoAlign = settings.powerline.autoAlign;
-    const allLinesWidgets = isPowerlineMode && autoAlign ? lines : undefined;
+    const preRenderedLines = preRenderAllWidgets(lines, settings, { terminalWidth, isPreview: true });
+    const preCalculatedMaxWidths = calculateMaxWidthsFromPreRendered(preRenderedLines, settings);
     let globalSeparatorIndex = 0;
     const result = [];
     let truncated = false;
     for (let i = 0;i < lines.length; i++) {
       const lineItems = lines[i];
       if (lineItems && lineItems.length > 0) {
-        const renderResult = renderSingleLine(lineItems, terminalWidth, widthDetectionAvailable, settings, i, globalSeparatorIndex, allLinesWidgets);
+        const preRenderedWidgets = preRenderedLines[i] ?? [];
+        const renderResult = renderSingleLine(lineItems, terminalWidth, widthDetectionAvailable, settings, i, globalSeparatorIndex, preRenderedWidgets, preCalculatedMaxWidths);
         result.push(renderResult.line);
         if (renderResult.wasTruncated) {
           truncated = true;
@@ -56460,7 +56615,9 @@ var TerminalOptionsMenu = ({ settings, onUpdate, onBack }) => {
             if (widget.color?.startsWith("hex:")) {
               if (widget.type !== "separator" && widget.type !== "flex-separator") {
                 const widgetImpl = getWidget(widget.type);
-                newWidget.color = widgetImpl.getDefaultColor();
+                if (widgetImpl) {
+                  newWidget.color = widgetImpl.getDefaultColor();
+                }
               }
             }
             if (widget.backgroundColor?.startsWith("hex:")) {
@@ -56470,7 +56627,9 @@ var TerminalOptionsMenu = ({ settings, onUpdate, onBack }) => {
             if (widget.color?.startsWith("ansi256:")) {
               if (widget.type !== "separator" && widget.type !== "flex-separator") {
                 const widgetImpl = getWidget(widget.type);
-                newWidget.color = widgetImpl.getDefaultColor();
+                if (widgetImpl) {
+                  newWidget.color = widgetImpl.getDefaultColor();
+                }
               }
             }
             if (widget.backgroundColor?.startsWith("ansi256:")) {
@@ -56480,7 +56639,9 @@ var TerminalOptionsMenu = ({ settings, onUpdate, onBack }) => {
             if (widget.color?.startsWith("ansi256:") || widget.color?.startsWith("hex:")) {
               if (widget.type !== "separator" && widget.type !== "flex-separator") {
                 const widgetImpl = getWidget(widget.type);
-                newWidget.color = widgetImpl.getDefaultColor();
+                if (widgetImpl) {
+                  newWidget.color = widgetImpl.getDefaultColor();
+                }
               }
             }
             if (widget.backgroundColor?.startsWith("ansi256:") || widget.backgroundColor?.startsWith("hex:")) {
@@ -56506,7 +56667,9 @@ var TerminalOptionsMenu = ({ settings, onUpdate, onBack }) => {
           if (widget.color?.startsWith("ansi256:") || widget.color?.startsWith("hex:")) {
             if (widget.type !== "separator" && widget.type !== "flex-separator") {
               const widgetImpl = getWidget(widget.type);
-              newWidget.color = widgetImpl.getDefaultColor();
+              if (widgetImpl) {
+                newWidget.color = widgetImpl.getDefaultColor();
+              }
             }
           }
           if (widget.backgroundColor?.startsWith("ansi256:") || widget.backgroundColor?.startsWith("hex:")) {
@@ -58330,15 +58493,15 @@ async function renderMultipleLines(data) {
     blockMetrics,
     isPreview: false
   };
-  const isPowerlineMode = settings.powerline.enabled;
-  const autoAlign = settings.powerline.autoAlign;
-  const allLinesWidgets = isPowerlineMode && autoAlign ? lines : undefined;
+  const preRenderedLines = preRenderAllWidgets(lines, settings, context);
+  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 line = renderStatusLine(lineItems, settings, lineContext, allLinesWidgets);
+      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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccstatusline",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",
@@ -11,13 +11,13 @@
     "dist/"
   ],
   "scripts": {
-    "start": "bun run patch && bun run src/ccstatusline.ts",
+    "start": "bun run src/ccstatusline.ts",
     "statusline": "bun run src/ccstatusline.ts",
-    "patch": "patch-package",
-    "build": "bun run patch && rm -rf dist/* && bun build src/ccstatusline.ts --target=node --outfile=dist/ccstatusline.js --target-version=14",
+    "build": "rm -rf dist/* && bun build src/ccstatusline.ts --target=node --outfile=dist/ccstatusline.js --target-version=14",
     "postbuild": "bun run scripts/replace-version.ts",
     "prepublishOnly": "bun run build",
-    "lint": "bun tsc --noEmit; eslint . --config eslint.config.js --max-warnings=999999 --fix"
+    "lint": "bun tsc --noEmit; eslint . --config eslint.config.js --max-warnings=999999 --fix",
+    "test": "bun vitest"
   },
   "devDependencies": {
     "@eslint/js": "^9.33.0",
@@ -34,13 +34,13 @@
     "ink": "^6.2.0",
     "ink-gradient": "^3.0.0",
     "ink-select-input": "^6.2.0",
-    "patch-package": "^8.0.0",
     "react": "^19.1.1",
     "react-devtools-core": "^6.1.5",
     "strip-ansi": "^7.1.0",
     "tinyglobby": "^0.2.14",
     "typescript": "^5.9.2",
     "typescript-eslint": "^8.39.1",
+    "vitest": "^3.2.4",
     "zod": "^4.0.17"
   },
   "keywords": [
@@ -61,5 +61,8 @@
   },
   "trustedDependencies": [
     "unrs-resolver"
-  ]
+  ],
+  "patchedDependencies": {
+    "ink@6.2.0": "patches/ink@6.2.0.patch"
+  }
 }