cxstatusline 0.14.0 → 0.15.0

package/dist/cxstatusline.js

@@ -27696,6 +27696,9 @@ var VARIATION_SELECTOR_SUPPLEMENT_END = 917999;
 var REGIONAL_INDICATOR_START = 127462;
 var REGIONAL_INDICATOR_END = 127487;
 var SGR_REGEX = /\x1b\[[0-9;]*m/g;
+var FIRST_CLUSTER_EXTENDER = 768;
+var CLUSTER_WIDTH_CACHE_LIMIT = 4096;
+var clusterWidthCache = new Map;
 var EXTENDED_PICTOGRAPHIC_REGEX = createUnicodePropertyRegex("\\p{Extended_Pictographic}");
 var EMOJI_PRESENTATION_REGEX = createUnicodePropertyRegex("\\p{Emoji_Presentation}");
 var EMOJI_MODIFIER_REGEX = createUnicodePropertyRegex("\\p{Emoji_Modifier}");
@@ -27776,8 +27779,8 @@ function isZeroWidthStandaloneCluster(cluster) {
     return codePoint === ZERO_WIDTH_JOINER || codePoint === COMBINING_ENCLOSING_KEYCAP || isVariationSelector(codePoint) || matchesUnicodeProperty(character, COMBINING_MARK_REGEX) || matchesUnicodeProperty(character, EMOJI_MODIFIER_REGEX);
   });
 }
-function shouldTreatClusterAsNarrowTextPictograph(cluster) {
-  if (stringWidth(cluster) <= 1) {
+function shouldTreatClusterAsNarrowTextPictograph(cluster, clusterStringWidth) {
+  if (clusterStringWidth <= 1) {
     return false;
   }
   const characters = Array.from(cluster);
@@ -27795,19 +27798,46 @@ function shouldTreatClusterAsNarrowTextPictograph(cluster) {
   }
   return characters.some((character) => matchesUnicodeProperty(character, EXTENDED_PICTOGRAPHIC_REGEX));
 }
-function getClusterWidth(cluster) {
+function isPrintableAscii(charCode) {
+  return charCode >= 32 && charCode <= 126;
+}
+function computeClusterWidth(cluster) {
   if (cluster.length === 0 || isZeroWidthStandaloneCluster(cluster)) {
     return 0;
   }
-  if (shouldTreatClusterAsNarrowTextPictograph(cluster)) {
+  const clusterStringWidth = stringWidth(cluster);
+  if (shouldTreatClusterAsNarrowTextPictograph(cluster, clusterStringWidth)) {
+    return 1;
+  }
+  return clusterStringWidth;
+}
+function getClusterWidth(cluster) {
+  if (cluster.length === 1 && isPrintableAscii(cluster.charCodeAt(0))) {
     return 1;
   }
-  return stringWidth(cluster);
+  const cached = clusterWidthCache.get(cluster);
+  if (cached !== undefined) {
+    return cached;
+  }
+  const width = computeClusterWidth(cluster);
+  if (clusterWidthCache.size >= CLUSTER_WIDTH_CACHE_LIMIT) {
+    clusterWidthCache.clear();
+  }
+  clusterWidthCache.set(cluster, width);
+  return width;
 }
 function getTextDisplayWidth(text) {
   let width = 0;
   let index = 0;
   while (index < text.length) {
+    if (isPrintableAscii(text.charCodeAt(index))) {
+      const nextIndex = index + 1;
+      if (nextIndex >= text.length || text.charCodeAt(nextIndex) < FIRST_CLUSTER_EXTENDER) {
+        width += 1;
+        index = nextIndex;
+        continue;
+      }
+    }
     const cluster = consumeDisplayCluster(text, index);
     if (!cluster) {
       break;
@@ -27931,9 +27961,40 @@ function getOsc8CloseSequence(terminator) {
   }
   return `${ESC2}]8;;${ESC2}\\`;
 }
+function nextOsc8Terminator(escape, current) {
+  if (escape.osc8Action === "open") {
+    return escape.osc8Terminator ?? "st";
+  }
+  if (escape.osc8Action === "close") {
+    return null;
+  }
+  return current;
+}
 function stripSgrCodes(text) {
   return text.replace(SGR_REGEX, "");
 }
+function sgrClearsBackground(sequence) {
+  const params = sequence.slice(2, -1).split(";").map((param) => Number.parseInt(param || "0", 10));
+  let clearsBackground = false;
+  for (let i = 0;i < params.length; i++) {
+    const param = params[i];
+    if (param === 0 || param === 49) {
+      clearsBackground = true;
+    } else if (param !== undefined && (param >= 40 && param <= 47 || param >= 100 && param <= 107 || param === 48)) {
+      clearsBackground = false;
+    }
+    if (param === 38 || param === 48 || param === 58) {
+      i += params[i + 1] === 5 ? 2 : 4;
+    }
+  }
+  return clearsBackground;
+}
+function restoreBackgroundAfterResets(text, backgroundCode) {
+  return text.replace(SGR_REGEX, (sequence) => sgrClearsBackground(sequence) ? sequence + backgroundCode : sequence);
+}
+function isEscapeIntroducer(character) {
+  return character === ESC2 || character === C1_CSI2 || character === C1_OSC2;
+}
 function getVisibleText(text) {
   let result = "";
   let index = 0;
@@ -27943,13 +28004,12 @@ function getVisibleText(text) {
       index = escape.nextIndex;
       continue;
     }
-    const codePoint = text.codePointAt(index);
-    if (codePoint === undefined) {
-      break;
+    let runEnd = index + 1;
+    while (runEnd < text.length && !isEscapeIntroducer(text[runEnd])) {
+      runEnd++;
     }
-    const character = String.fromCodePoint(codePoint);
-    result += character;
-    index += character.length;
+    result += text.slice(index, runEnd);
+    index = runEnd;
   }
   return result;
 }
@@ -27975,28 +28035,17 @@ function truncateStyledText(text, maxWidth, options = {}) {
   let index = 0;
   let didTruncate = false;
   let openOsc8Terminator = null;
+  const visibleText = getVisibleText(text);
+  let visibleIndex = 0;
   while (index < text.length) {
     const escape = parseEscapeSequence(text, index);
     if (escape) {
       output += escape.sequence;
       index = escape.nextIndex;
-      if (escape.osc8Action === "open") {
-        openOsc8Terminator = escape.osc8Terminator ?? "st";
-      } else if (escape.osc8Action === "close") {
-        openOsc8Terminator = null;
-      }
+      openOsc8Terminator = nextOsc8Terminator(escape, openOsc8Terminator);
       continue;
     }
-    let visibleSegmentEnd = index;
-    while (visibleSegmentEnd < text.length && !parseEscapeSequence(text, visibleSegmentEnd)) {
-      const codePoint = text.codePointAt(visibleSegmentEnd);
-      if (codePoint === undefined) {
-        break;
-      }
-      visibleSegmentEnd += String.fromCodePoint(codePoint).length;
-    }
-    const visibleSegment = text.slice(index, visibleSegmentEnd);
-    const cluster = consumeDisplayCluster(visibleSegment, 0);
+    const cluster = consumeDisplayCluster(visibleText, visibleIndex);
     if (!cluster) {
       break;
     }
@@ -28005,9 +28054,26 @@ function truncateStyledText(text, maxWidth, options = {}) {
       didTruncate = true;
       break;
     }
-    output += cluster.text;
+    let remaining = cluster.text.length;
+    while (remaining > 0 && index < text.length) {
+      const inner = parseEscapeSequence(text, index);
+      if (inner) {
+        output += inner.sequence;
+        index = inner.nextIndex;
+        openOsc8Terminator = nextOsc8Terminator(inner, openOsc8Terminator);
+        continue;
+      }
+      const codePoint = text.codePointAt(index);
+      if (codePoint === undefined) {
+        break;
+      }
+      const character = String.fromCodePoint(codePoint);
+      output += character;
+      index += character.length;
+      remaining -= character.length;
+    }
     currentWidth += clusterWidth;
-    index += cluster.text.length;
+    visibleIndex = cluster.nextIndex;
   }
   if (!didTruncate) {
     return text;
@@ -47341,6 +47407,9 @@ function getColorAnsiCode(colorName, colorLevel = "ansi16", isBackground = false
     return isBackground ? `\x1B[48;2;${first.r};${first.g};${first.b}m` : `\x1B[38;2;${first.r};${first.g};${first.b}m`;
   }
   if (colorName.startsWith("ansi256:")) {
+    if (colorLevel === "ansi16") {
+      return "";
+    }
     const code = parseInt(colorName.substring(8), 10);
     if (!isNaN(code) && code >= 0 && code <= 255) {
       return isBackground ? `\x1B[48;5;${code}m` : `\x1B[38;5;${code}m`;
@@ -47348,6 +47417,9 @@ function getColorAnsiCode(colorName, colorLevel = "ansi16", isBackground = false
     return "";
   }
   if (colorName.startsWith("hex:")) {
+    if (colorLevel === "ansi16") {
+      return "";
+    }
     const hex3 = colorName.substring(4);
     if (/^[0-9A-Fa-f]{6}$/.test(hex3)) {
       const r = parseInt(hex3.substring(0, 2), 16);
@@ -47769,8 +47841,37 @@ function getHideModifierText(item, states) {
 }
 
 // src/widgets/shared/raw-or-labeled.ts
+var LABEL_METADATA_KEY = "label";
+var EDIT_LABEL_ACTION = "edit-label";
+var LABEL_KEYBIND = {
+  key: "e",
+  label: "(e)dit label…",
+  action: EDIT_LABEL_ACTION
+};
+function getLabel(item, defaultLabel) {
+  return item.metadata?.[LABEL_METADATA_KEY] ?? defaultLabel;
+}
+function clearLabel(item) {
+  return removeMetadataKeys(item, [LABEL_METADATA_KEY]);
+}
+function setLabel(item, value) {
+  return {
+    ...item,
+    metadata: {
+      ...item.metadata,
+      [LABEL_METADATA_KEY]: value
+    }
+  };
+}
 function formatRawOrLabeledValue(item, labelPrefix, value) {
-  return item.rawValue ? value : `${labelPrefix}${value}`;
+  return item.rawValue ? value : `${getLabel(item, labelPrefix)}${value}`;
+}
+function getLabelKeybind() {
+  return LABEL_KEYBIND;
+}
+function getLabelModifierText(item) {
+  const label = item.metadata?.[LABEL_METADATA_KEY];
+  return label === undefined ? undefined : `(label: ${JSON.stringify(label)})`;
 }
 
 // src/widgets/CacheHitRate.ts
@@ -47796,24 +47897,27 @@ class CacheHitRateWidget {
   handleEditorAction(action, item) {
     return handleCacheScopeAction(action, item);
   }
+  getLabelPrefix() {
+    return "Cache Hit: ";
+  }
   render(item, context, settings) {
     const format = resolveNumberFormat("percent", item, settings);
     if (context.isPreview) {
-      return formatRawOrLabeledValue(item, "Cache Hit: ", formatPercent(87, format));
+      return formatRawOrLabeledValue(item, this.getLabelPrefix(), formatPercent(87, format));
     }
     const hideWhenEmpty = isHideStateEnabled(item, ZERO_HIDEABLE_STATE);
     const tokens = getCacheTokens(context, isCacheSessionScope(item));
     if (!tokens) {
-      return hideWhenEmpty ? null : formatRawOrLabeledValue(item, "Cache Hit: ", "n/a");
+      return hideWhenEmpty ? null : formatRawOrLabeledValue(item, this.getLabelPrefix(), "n/a");
     }
     const hitRate = getCacheHitRate(tokens);
     if (hitRate === null) {
-      return hideWhenEmpty ? null : formatRawOrLabeledValue(item, "Cache Hit: ", formatPercent(0, format));
+      return hideWhenEmpty ? null : formatRawOrLabeledValue(item, this.getLabelPrefix(), formatPercent(0, format));
     }
     if (hitRate === 0 && hideWhenEmpty) {
       return null;
     }
-    return formatRawOrLabeledValue(item, "Cache Hit: ", formatPercent(hitRate, format));
+    return formatRawOrLabeledValue(item, this.getLabelPrefix(), formatPercent(hitRate, format));
   }
   getCustomKeybinds(item) {
     return [getCacheScopeKeybind()];
@@ -47829,6 +47933,8 @@ class CacheHitRateWidget {
   }
 }
 // src/widgets/ClaudeSessionId.ts
+var LABEL = "Session ID: ";
+
 class ClaudeSessionIdWidget {
   getDefaultColor() {
     return "cyan";
@@ -47845,11 +47951,14 @@ class ClaudeSessionIdWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
+  getLabelPrefix() {
+    return LABEL;
+  }
   render(item, context, _settings) {
     const id = context.isPreview ? "preview-session-id" : context.data.session?.id;
     if (!id)
       return null;
-    return item.rawValue ? id : "Session ID: " + id;
+    return formatRawOrLabeledValue(item, this.getLabelPrefix(), id);
   }
   supportsRawValue() {
     return true;
@@ -48623,6 +48732,8 @@ class ContextBarWidget {
   }
 }
 // src/widgets/ContextLength.ts
+var LABEL2 = "Ctx: ";
+
 class ContextLengthWidget {
   getDefaultColor() {
     return "brightBlack";
@@ -48639,12 +48750,15 @@ class ContextLengthWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
+  getLabelPrefix() {
+    return LABEL2;
+  }
   render(item, context, settings) {
     const format = resolveNumberFormat("token", item, settings);
     const value = context.isPreview ? 18600 : getContextWindowContextLengthTokens(context.data);
     if (value === null)
       return null;
-    return item.rawValue ? formatTokens(value, format) : "Ctx: " + formatTokens(value, format);
+    return formatRawOrLabeledValue(item, this.getLabelPrefix(), formatTokens(value, format));
   }
   supportsRawValue() {
     return true;
@@ -48783,6 +48897,9 @@ class ContextPercentageWidget {
     const modifiers = [getContextInverseModifierText(item), getContextSliderModifierText(item)].filter((value) => value !== undefined);
     return { displayText: this.getDisplayName(), modifierText: modifiers.length ? "(" + modifiers.map((value) => value.replace(/^\(|\)$/g, "")).join(", ") + ")" : undefined };
   }
+  getLabelPrefix(item) {
+    return isContextInverse(item) ? "Ctx Left: " : "Ctx Used: ";
+  }
   handleEditorAction(action, item) {
     if (action === "toggle-slider")
       return cycleContextSliderMode(item);
@@ -48795,7 +48912,7 @@ class ContextPercentageWidget {
       return null;
     const percentage = isContextInverse(item) ? 100 - metrics.usedPercentage : metrics.usedPercentage;
     const slider = renderContextSlider(getContextSliderMode(item), percentage, format);
-    return formatRawOrLabeledValue(item, isContextInverse(item) ? "Ctx Left: " : "Ctx Used: ", slider ?? formatPercent(percentage, format));
+    return formatRawOrLabeledValue(item, this.getLabelPrefix(item), slider ?? formatPercent(percentage, format));
   }
   getCustomKeybinds() {
     return [{ key: "u", label: "(u)sed/remaining", action: "toggle-inverse" }, ...getContextSliderKeybinds()];
@@ -48828,6 +48945,9 @@ class ContextPercentageUsableWidget {
     const modifiers = [getContextInverseModifierText(item), getContextSliderModifierText(item)].filter((value) => value !== undefined);
     return { displayText: this.getDisplayName(), modifierText: modifiers.length ? "(" + modifiers.map((value) => value.replace(/^\(|\)$/g, "")).join(", ") + ")" : undefined };
   }
+  getLabelPrefix(item) {
+    return isContextInverse(item) ? "Ctx(u) Left: " : "Ctx(u) Used: ";
+  }
   handleEditorAction(action, item) {
     if (action === "toggle-slider")
       return cycleContextSliderMode(item);
@@ -48842,7 +48962,7 @@ class ContextPercentageUsableWidget {
     const used = Math.min(100, metrics.contextLengthTokens / config2.usableTokens * 100);
     const percentage = isContextInverse(item) ? 100 - used : used;
     const slider = renderContextSlider(getContextSliderMode(item), percentage, format);
-    return formatRawOrLabeledValue(item, isContextInverse(item) ? "Ctx(u) Left: " : "Ctx(u) Used: ", slider ?? formatPercent(percentage, format));
+    return formatRawOrLabeledValue(item, this.getLabelPrefix(item), slider ?? formatPercent(percentage, format));
   }
   getCustomKeybinds() {
     return [{ key: "u", label: "(u)sed/remaining", action: "toggle-inverse" }, ...getContextSliderKeybinds()];
@@ -48858,6 +48978,8 @@ class ContextPercentageUsableWidget {
   }
 }
 // src/widgets/ContextWindow.ts
+var LABEL3 = "Win: ";
+
 class ContextWindowWidget {
   getDefaultColor() {
     return "brightBlack";
@@ -48874,6 +48996,9 @@ class ContextWindowWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
+  getLabelPrefix() {
+    return LABEL3;
+  }
   render(item, context, settings) {
     const format = resolveNumberFormat("token", item, settings);
     let total = context.isPreview ? 200000 : getContextWindowSize(context.data);
@@ -48881,7 +49006,7 @@ class ContextWindowWidget {
       total = getContextConfig(getModelContextIdentifier(context.data.model)).maxTokens;
     if (total <= 0)
       return null;
-    return item.rawValue ? formatTokens(total, format) : "Win: " + formatTokens(total, format);
+    return formatRawOrLabeledValue(item, this.getLabelPrefix(), formatTokens(total, format));
   }
   supportsRawValue() {
     return true;
@@ -53921,6 +54046,9 @@ var import_react27 = __toESM(require_react(), 1);
 
 // src/utils/input-guards.ts
 var CONTROL_CHAR_REGEX = /[\u0000-\u001F\u007F]/u;
+function getPlainInput(input2, key) {
+  return key.ctrl || key.meta ? "" : input2;
+}
 var shouldInsertInput = (input2, key) => {
   if (!input2) {
     return false;
@@ -54207,7 +54335,8 @@ function processResult(result2, item, timedOut = false) {
   }
   const line = firstLine(result2.stdout);
   const cleaned = item.preserveColors ? keepSgrOnly(line) : keepSgrOnly(getVisibleText(line));
-  const text = applyMaxWidth(cleaned, item.maxWidth);
+  const truncated = applyMaxWidth(cleaned, item.maxWidth);
+  const text = truncated !== cleaned && stripSgrCodes(truncated) !== truncated ? `${truncated}\x1B[0m` : truncated;
   return getVisibleText(text).trim().length > 0 ? text : null;
 }
 function runSynchronously(item, context, runner) {
@@ -54475,7 +54604,82 @@ var CommandEditor = ({ widget, onComplete, onCancel }) => {
   }, undefined, true, undefined, this);
 };
 // src/widgets/CustomSymbol.tsx
+var import_react29 = __toESM(require_react(), 1);
+
+// src/widgets/shared/text-cursor.ts
 var import_react28 = __toESM(require_react(), 1);
+var segmenter2 = "Segmenter" in Intl ? new Intl.Segmenter(undefined, { granularity: "grapheme" }) : null;
+function getGraphemes(str2) {
+  if (segmenter2) {
+    return Array.from(segmenter2.segment(str2), (seg) => seg.segment);
+  }
+  return Array.from(str2);
+}
+function getBoundaries(text) {
+  const boundaries = [0];
+  for (const grapheme of getGraphemes(text)) {
+    boundaries.push((boundaries[boundaries.length - 1] ?? 0) + grapheme.length);
+  }
+  return boundaries;
+}
+function applyTextCursorInput(state, input2, key) {
+  const { text, cursor } = state;
+  const boundaries = getBoundaries(text);
+  const index = boundaries.findIndex((boundary) => boundary >= cursor);
+  const previous = boundaries[index - 1];
+  const next = boundaries[index + 1];
+  if (key.ctrl && key.leftArrow) {
+    return { text, cursor: 0 };
+  }
+  if (key.ctrl && key.rightArrow) {
+    return { text, cursor: text.length };
+  }
+  if (key.leftArrow) {
+    return previous === undefined ? state : { text, cursor: previous };
+  }
+  if (key.rightArrow) {
+    return next === undefined ? state : { text, cursor: next };
+  }
+  if (key.backspace) {
+    return previous === undefined ? state : { text: text.slice(0, previous) + text.slice(cursor), cursor: previous };
+  }
+  if (key.delete) {
+    return next === undefined ? state : { text: text.slice(0, cursor) + text.slice(next), cursor };
+  }
+  if (shouldInsertInput(input2, key)) {
+    return { text: text.slice(0, cursor) + input2 + text.slice(cursor), cursor: cursor + input2.length };
+  }
+  return null;
+}
+function renderTextWithCursor({ text, cursor }) {
+  let offset = 0;
+  const rendered = getGraphemes(text).map((grapheme) => {
+    const underCursor = offset === cursor;
+    offset += grapheme.length;
+    return underCursor ? `\x1B[7m${grapheme}\x1B[27m` : grapheme;
+  }).join("");
+  return cursor === text.length ? `${rendered}\x1B[7m \x1B[27m` : rendered;
+}
+function useTextCursor(initialText) {
+  const [state, setState] = import_react28.useState({ text: initialText, cursor: initialText.length });
+  const latestState = import_react28.useRef(state);
+  return {
+    text: state.text,
+    display: renderTextWithCursor(state),
+    getText: () => latestState.current.text,
+    handleInput: (input2, key) => {
+      const nextState = applyTextCursorInput(latestState.current, input2, key);
+      if (nextState === null) {
+        return false;
+      }
+      latestState.current = nextState;
+      setState(nextState);
+      return true;
+    }
+  };
+}
+
+// src/widgets/CustomSymbol.tsx
 var jsx_dev_runtime3 = __toESM(require_jsx_dev_runtime(), 1);
 
 class CustomSymbolWidget {
@@ -54521,18 +54725,7 @@ class CustomSymbolWidget {
   }
 }
 var CustomSymbolEditor = ({ widget, onComplete, onCancel }) => {
-  const [symbol2, setSymbol] = import_react28.useState(widget.customSymbol ?? "");
-  const getFirstGrapheme = (str2) => {
-    if (str2.length === 0) {
-      return "";
-    }
-    if ("Segmenter" in Intl) {
-      const segmenter2 = new Intl.Segmenter(undefined, { granularity: "grapheme" });
-      const segments = Array.from(segmenter2.segment(str2));
-      return segments[0]?.segment ?? "";
-    }
-    return Array.from(str2)[0] ?? "";
-  };
+  const [symbol2, setSymbol] = import_react29.useState(widget.customSymbol ?? "");
   use_input_default((input2, key) => {
     if (key.return) {
       onComplete({ ...widget, customSymbol: symbol2 });
@@ -54541,7 +54734,7 @@ var CustomSymbolEditor = ({ widget, onComplete, onCancel }) => {
     } else if (key.backspace || key.delete) {
       setSymbol("");
     } else if (shouldInsertInput(input2, key)) {
-      const firstGrapheme = getFirstGrapheme(input2);
+      const firstGrapheme = getGraphemes(input2)[0] ?? "";
       setSymbol(firstGrapheme);
     }
   });
@@ -54570,7 +54763,6 @@ var CustomSymbolEditor = ({ widget, onComplete, onCancel }) => {
   }, undefined, true, undefined, this);
 };
 // src/widgets/CustomText.tsx
-var import_react29 = __toESM(require_react(), 1);
 var jsx_dev_runtime4 = __toESM(require_jsx_dev_runtime(), 1);
 
 class CustomTextWidget {
@@ -54616,108 +54808,21 @@ class CustomTextWidget {
   }
 }
 var CustomTextEditor = ({ widget, onComplete, onCancel }) => {
-  const [text, setText] = import_react29.useState(widget.customText ?? "");
-  const [cursorPos, setCursorPos] = import_react29.useState(text.length);
-  const getGraphemes = (str2) => {
-    if ("Segmenter" in Intl) {
-      const segmenter2 = new Intl.Segmenter(undefined, { granularity: "grapheme" });
-      return Array.from(segmenter2.segment(str2), (seg) => seg.segment);
-    }
-    return Array.from(str2);
-  };
-  const graphemeToStringIndex = (str2, graphemeIndex) => {
-    const graphemes2 = getGraphemes(str2);
-    let stringIndex = 0;
-    for (let i = 0;i < Math.min(graphemeIndex, graphemes2.length); i++) {
-      const grapheme = graphemes2[i];
-      if (grapheme) {
-        stringIndex += grapheme.length;
-      }
-    }
-    return stringIndex;
-  };
-  const stringToGraphemeIndex = (str2, stringIndex) => {
-    const graphemes2 = getGraphemes(str2);
-    let currentStringIndex = 0;
-    for (let i = 0;i < graphemes2.length; i++) {
-      if (currentStringIndex >= stringIndex)
-        return i;
-      const grapheme = graphemes2[i];
-      if (grapheme) {
-        currentStringIndex += grapheme.length;
-      }
-    }
-    return graphemes2.length;
-  };
+  const { getText, display, handleInput } = useTextCursor(widget.customText ?? "");
   use_input_default((input2, key) => {
     if (key.return) {
-      onComplete({ ...widget, customText: text });
+      onComplete({ ...widget, customText: getText() });
     } else if (key.escape) {
       onCancel();
-    } else if (key.ctrl && key.leftArrow) {
-      setCursorPos(0);
-    } else if (key.ctrl && key.rightArrow) {
-      setCursorPos(text.length);
-    } else if (key.leftArrow) {
-      const currentGraphemeIndex2 = stringToGraphemeIndex(text, cursorPos);
-      if (currentGraphemeIndex2 > 0) {
-        const newStringIndex = graphemeToStringIndex(text, currentGraphemeIndex2 - 1);
-        setCursorPos(newStringIndex);
-      }
-    } else if (key.rightArrow) {
-      const currentGraphemeIndex2 = stringToGraphemeIndex(text, cursorPos);
-      const graphemeCount = getGraphemes(text).length;
-      if (currentGraphemeIndex2 < graphemeCount) {
-        const newStringIndex = graphemeToStringIndex(text, currentGraphemeIndex2 + 1);
-        setCursorPos(newStringIndex);
-      }
-    } else if (key.backspace) {
-      if (cursorPos > 0) {
-        const currentGraphemeIndex2 = stringToGraphemeIndex(text, cursorPos);
-        if (currentGraphemeIndex2 > 0) {
-          const deleteFromIndex = graphemeToStringIndex(text, currentGraphemeIndex2 - 1);
-          const deleteToIndex = graphemeToStringIndex(text, currentGraphemeIndex2);
-          setText(text.slice(0, deleteFromIndex) + text.slice(deleteToIndex));
-          setCursorPos(deleteFromIndex);
-        }
-      }
-    } else if (key.delete) {
-      if (cursorPos < text.length) {
-        const currentGraphemeIndex2 = stringToGraphemeIndex(text, cursorPos);
-        const graphemeCount = getGraphemes(text).length;
-        if (currentGraphemeIndex2 < graphemeCount) {
-          const deleteFromIndex = graphemeToStringIndex(text, currentGraphemeIndex2);
-          const deleteToIndex = graphemeToStringIndex(text, currentGraphemeIndex2 + 1);
-          setText(text.slice(0, deleteFromIndex) + text.slice(deleteToIndex));
-        }
-      }
-    } else if (shouldInsertInput(input2, key)) {
-      const newText = text.slice(0, cursorPos) + input2 + text.slice(cursorPos);
-      setText(newText);
-      setCursorPos(cursorPos + input2.length);
+    } else {
+      handleInput(input2, key);
     }
   });
-  const graphemes = getGraphemes(text);
-  const currentGraphemeIndex = stringToGraphemeIndex(text, cursorPos);
-  let display = "Enter custom text: ";
-  for (let i = 0;i < graphemes.length; i++) {
-    const grapheme = graphemes[i];
-    if (grapheme) {
-      if (i === currentGraphemeIndex) {
-        display += `\x1B[7m${grapheme}\x1B[0m`;
-      } else {
-        display += grapheme;
-      }
-    }
-  }
-  if (currentGraphemeIndex >= graphemes.length) {
-    display += "\x1B[7m \x1B[0m";
-  }
   return /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
       /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
-        children: display
+        children: `Enter custom text: ${display}`
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
         dimColor: true,
@@ -54783,17 +54888,6 @@ function renderSymbolSlotsEditor(props, slots) {
     slots
   }, undefined, false, undefined, this);
 }
-function getFirstGrapheme(str2) {
-  if (str2.length === 0) {
-    return "";
-  }
-  if ("Segmenter" in Intl) {
-    const segmenter2 = new Intl.Segmenter(undefined, { granularity: "grapheme" });
-    const segments = Array.from(segmenter2.segment(str2));
-    return segments[0]?.segment ?? "";
-  }
-  return Array.from(str2)[0] ?? "";
-}
 var SymbolSlotsEditor = ({ widget, slots, onComplete, onCancel }) => {
   const [values2, setValues] = import_react30.useState(() => slots.map((slot) => getSlotSymbol(widget, slot)));
   const [selectedIndex, setSelectedIndex] = import_react30.useState(0);
@@ -54812,7 +54906,7 @@ var SymbolSlotsEditor = ({ widget, slots, onComplete, onCancel }) => {
     } else if (key.backspace || key.delete) {
       setValues(values2.map((value, index) => index === selectedIndex ? "" : value));
     } else if (shouldInsertInput(input2, key)) {
-      const grapheme = getFirstGrapheme(input2);
+      const grapheme = getGraphemes(input2)[0] ?? "";
       setValues(values2.map((value, index) => index === selectedIndex ? grapheme : value));
     }
   });
@@ -54885,6 +54979,9 @@ class CurrentWorkingDirWidget {
   getCategory() {
     return "Environment";
   }
+  getLabelPrefix() {
+    return "cwd: ";
+  }
   getEditorDisplay(item) {
     const segments = item.metadata?.segments ? parseInt(item.metadata.segments, 10) : undefined;
     const fishStyle = item.metadata?.fishStyle === "true";
@@ -54955,24 +55052,13 @@ class CurrentWorkingDirWidget {
       let previewPath;
       if (fishStyle) {
         previewPath = "~/D/P/my-project";
-      } else if (abbreviateHome && segments && segments > 0) {
-        if (segments === 1) {
-          previewPath = "~/.../my-project";
-        } else {
-          previewPath = "~/.../Projects/my-project";
-        }
-      } else if (abbreviateHome) {
-        previewPath = "~/Documents/Projects/my-project";
-      } else if (segments && segments > 0) {
-        if (segments === 1) {
-          previewPath = ".../project";
-        } else {
-          previewPath = ".../example/project";
-        }
       } else {
-        previewPath = "/Users/example/Documents/Projects/my-project";
+        previewPath = abbreviateHome ? "~/Documents/Projects/my-project" : "/Users/example/Documents/Projects/my-project";
+        if (segments && segments > 0) {
+          previewPath = this.keepLastSegments(previewPath, segments);
+        }
       }
-      return item.rawValue ? `${symbolPrefix}${previewPath}` : `${symbolPrefix}cwd: ${previewPath}`;
+      return `${symbolPrefix}${formatRawOrLabeledValue(item, this.getLabelPrefix(), previewPath)}`;
     }
     const cwd2 = context.data.session?.cwd;
     if (!cwd2)
@@ -54985,18 +55071,10 @@ class CurrentWorkingDirWidget {
         displayPath = this.abbreviateHomeDir(displayPath);
       }
       if (segments && segments > 0) {
-        const useBackslash = displayPath.includes("\\") && !displayPath.includes("/");
-        const outSep = useBackslash ? "\\" : "/";
-        const pathParts = displayPath.split(/[\\/]+/);
-        const filteredParts = pathParts.filter((part) => part !== "");
-        if (filteredParts.length > segments) {
-          const selectedSegments = filteredParts.slice(-segments);
-          const prefix = displayPath.startsWith("~") ? `~${outSep}` : "";
-          displayPath = prefix + "..." + outSep + selectedSegments.join(outSep);
-        }
+        displayPath = this.keepLastSegments(displayPath, segments);
       }
     }
-    return item.rawValue ? `${symbolPrefix}${displayPath}` : `${symbolPrefix}cwd: ${displayPath}`;
+    return `${symbolPrefix}${formatRawOrLabeledValue(item, this.getLabelPrefix(), displayPath)}`;
   }
   getCustomKeybinds() {
     return [
@@ -55020,6 +55098,18 @@ class CurrentWorkingDirWidget {
   supportsColors(item) {
     return true;
   }
+  keepLastSegments(path, segments) {
+    const useBackslash = path.includes("\\") && !path.includes("/");
+    const outSep = useBackslash ? "\\" : "/";
+    const pathParts = path.split(/[\\/]+/);
+    const filteredParts = pathParts.filter((part) => part !== "");
+    const prefix = filteredParts[0] === "~" ? `~${outSep}` : "";
+    const pathSegments = prefix ? filteredParts.slice(1) : filteredParts;
+    if (pathSegments.length <= segments) {
+      return path;
+    }
+    return prefix + "..." + outSep + pathSegments.slice(-segments).join(outSep);
+  }
   abbreviateHomeDir(path) {
     const homeDir = os3.homedir();
     if (path === homeDir) {
@@ -55035,13 +55125,9 @@ class CurrentWorkingDirWidget {
     return path;
   }
   abbreviatePath(path) {
-    const homeDir = os3.homedir();
     const useBackslash = path.includes("\\") && !path.includes("/");
     const sep = useBackslash ? "\\" : "/";
-    let normalizedPath = path;
-    if (path.startsWith(homeDir)) {
-      normalizedPath = "~" + path.slice(homeDir.length);
-    }
+    const normalizedPath = this.abbreviateHomeDir(path);
     const parts = normalizedPath.split(/[\\/]+/).filter((part) => part !== "");
     const abbreviated = parts.map((part, index) => {
       if (index === 0 || index === parts.length - 1) {
@@ -55875,6 +55961,7 @@ class FiveHourUsageWidget {
   }
 }
 // src/widgets/FreeMemory.ts
+var LABEL4 = "Mem: ";
 function formatBytes(bytes, format) {
   const value = Math.max(0, bytes);
   if (value >= 1024 ** 3)
@@ -55902,19 +55989,22 @@ class FreeMemoryWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
+  getLabelPrefix() {
+    return LABEL4;
+  }
   render(item, context, settings) {
     const format = resolveNumberFormat("memory", item, settings);
     if (context.isPreview) {
       const value = formatBytes(12.4 * 1024 ** 3, format) + "/" + formatBytes(16 * 1024 ** 3, format);
-      return item.rawValue ? value : "Mem: " + value;
+      return formatRawOrLabeledValue(item, this.getLabelPrefix(), value);
     }
     const usage = context.memoryUsage;
     if (usage) {
       const value = formatBytes(usage.used, format) + "/" + formatBytes(usage.total, format);
-      return item.rawValue ? value : "Mem: " + value;
+      return formatRawOrLabeledValue(item, this.getLabelPrefix(), value);
     }
     if (context.freeMemoryBytes !== undefined) {
-      return item.rawValue ? formatBytes(context.freeMemoryBytes, format) : "Mem: " + formatBytes(context.freeMemoryBytes, format);
+      return formatRawOrLabeledValue(item, this.getLabelPrefix(), formatBytes(context.freeMemoryBytes, format));
     }
     return null;
   }
@@ -55956,8 +56046,10 @@ class GitBranchWidget {
   }
   render(item, context, _settings) {
     const prefix = formatSymbolPrefix(item, DEFAULT_SYMBOL);
-    if (context.isPreview)
-      return item.rawValue ? "main" : prefix + "main";
+    if (context.isPreview) {
+      const sample2 = item.maxWidth ? "feature/long-branch-name" : "main";
+      return applyMaxWidth(item.rawValue ? sample2 : prefix + sample2, item.maxWidth);
+    }
     const branch = context.data.git?.branch;
     if (!branch)
       return isHideStateEnabled(item, NO_GIT_HIDEABLE_STATE) ? null : prefix + "no git";
@@ -55978,6 +56070,67 @@ class GitBranchWidget {
 }
 // src/utils/git.ts
 import { spawnSync as spawnSync2 } from "node:child_process";
+import * as fs3 from "node:fs";
+import * as path2 from "node:path";
+
+// src/utils/git-hardening.ts
+var GIT_HARDENING_ARGS = ["-c", "core.fsmonitor=", "-c", "safe.bareRepository=explicit"];
+var REPOSITORY_SCOPES = new Set(["local", "worktree"]);
+var FILTER_COMMAND_KEYS = new Set(["clean", "smudge", "process"]);
+
+// src/utils/executable-path.ts
+import * as fs2 from "node:fs";
+import * as path from "node:path";
+var WINDOWS_EXECUTABLE_EXTENSIONS = [".com", ".exe"];
+var resolvedExecutables = new Map;
+function isFile(candidate) {
+  try {
+    return fs2.statSync(candidate).isFile();
+  } catch {
+    return false;
+  }
+}
+var DEFAULT_LOOKUP = {
+  platform: process.platform,
+  env: process.env,
+  isFile
+};
+function getPathValue(env3) {
+  const key = Object.keys(env3).find((name) => name.toUpperCase() === "PATH");
+  return key ? env3[key] ?? "" : "";
+}
+function findOnWindowsPath(name, lookup) {
+  const candidates = path.win32.extname(name) ? [name] : WINDOWS_EXECUTABLE_EXTENSIONS.map((extension2) => `${name}${extension2}`);
+  const directories = getPathValue(lookup.env).split(";").map((entry) => entry.trim().replace(/^"(.*)"$/, "$1")).filter((entry) => path.win32.isAbsolute(entry) && !entry.startsWith("\\\\?"));
+  for (const directory of directories) {
+    for (const candidate of candidates) {
+      const fullPath = path.win32.join(directory, candidate);
+      if (lookup.isFile(fullPath)) {
+        return fullPath;
+      }
+    }
+  }
+  return null;
+}
+function resolveExecutable(name, lookup = DEFAULT_LOOKUP) {
+  if (lookup.platform !== "win32" || /[\\/]/.test(name)) {
+    return name;
+  }
+  const cached2 = lookup === DEFAULT_LOOKUP ? resolvedExecutables.get(name) : undefined;
+  if (cached2) {
+    return cached2;
+  }
+  const resolved = findOnWindowsPath(name, lookup);
+  if (!resolved) {
+    throw new Error(`${name} was not found on PATH`);
+  }
+  if (lookup === DEFAULT_LOOKUP) {
+    resolvedExecutables.set(name, resolved);
+  }
+  return resolved;
+}
+
+// src/utils/git.ts
 function parseDiffShortStat(stat) {
   const insertMatch = /(\d+)\s+insertions?/.exec(stat);
   const deleteMatch = /(\d+)\s+deletions?/.exec(stat);
@@ -55988,7 +56141,8 @@ function parseDiffShortStat(stat) {
 }
 var GIT_EXEC_TIMEOUT = 5000;
 var defaultGitRunner = (args, cwd2) => {
-  const result2 = spawnSync2("git", args, {
+  const gitExecutable = resolveExecutable("git");
+  const result2 = spawnSync2(gitExecutable, [...GIT_HARDENING_ARGS, ...args], {
     cwd: cwd2,
     encoding: "utf8",
     stdio: ["ignore", "pipe", "ignore"],
@@ -56001,12 +56155,41 @@ var defaultGitRunner = (args, cwd2) => {
   }
   return result2.stdout ?? "";
 };
+function isDefinitelyOutsideGitRepository(cwd2) {
+  if (process.env.GIT_DIR !== undefined || process.env.GIT_WORK_TREE !== undefined || process.env.GIT_COMMON_DIR !== undefined) {
+    return false;
+  }
+  let current;
+  try {
+    current = fs3.realpathSync(cwd2);
+    if (!fs3.statSync(current).isDirectory()) {
+      return false;
+    }
+  } catch {
+    return false;
+  }
+  for (;; ) {
+    for (const marker of [".git", "HEAD"]) {
+      try {
+        fs3.lstatSync(path2.join(current, marker));
+        return false;
+      } catch {}
+    }
+    const parent = path2.dirname(current);
+    if (parent === current) {
+      return true;
+    }
+    current = parent;
+  }
+}
 function getGitDiffChanges(cwd2, runner = defaultGitRunner) {
   if (!cwd2)
     return null;
+  if (isDefinitelyOutsideGitRepository(cwd2))
+    return null;
   try {
-    const unstaged = runner(["diff", "--no-ext-diff", "--shortstat"], cwd2);
-    const staged = runner(["diff", "--cached", "--no-ext-diff", "--shortstat"], cwd2);
+    const unstaged = runner(["diff", "--no-ext-diff", "--no-textconv", "--ignore-submodules=dirty", "--shortstat"], cwd2);
+    const staged = runner(["diff", "--cached", "--no-ext-diff", "--no-textconv", "--ignore-submodules=dirty", "--shortstat"], cwd2);
     const unstagedCounts = parseDiffShortStat(unstaged);
     const stagedCounts = parseDiffShortStat(staged);
     return {
@@ -56068,6 +56251,8 @@ class GitChangesWidget {
   }
 }
 // src/widgets/GitPr.ts
+var LABEL5 = "PR #";
+
 class GitPrWidget {
   getDefaultColor() {
     return "cyan";
@@ -56084,11 +56269,14 @@ class GitPrWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
+  getLabelPrefix() {
+    return LABEL5;
+  }
   render(item, context, _settings) {
     const number4 = context.isPreview ? 42 : context.data.git?.pr;
     if (number4 === undefined)
       return null;
-    return item.rawValue ? "#" + number4 : "PR #" + number4;
+    return item.rawValue ? "#" + number4 : formatRawOrLabeledValue(item, this.getLabelPrefix(), String(number4));
   }
   supportsRawValue() {
     return true;
@@ -56098,8 +56286,8 @@ class GitPrWidget {
   }
 }
 // src/widgets/GitRootDir.ts
-function baseName(path) {
-  const trimmed = path.replace(/[\\/]+$/, "");
+function baseName(path3) {
+  const trimmed = path3.replace(/[\\/]+$/, "");
   const parts = trimmed.split(/[\\/]/).filter(Boolean);
   return parts.at(-1) ?? trimmed;
 }
@@ -56128,8 +56316,10 @@ class GitRootDirWidget {
     return { displayText: this.getDisplayName(), modifierText: makeModifierText(modifiers) };
   }
   render(item, context, _settings) {
-    if (context.isPreview)
-      return "my-repo";
+    if (context.isPreview) {
+      const sample2 = item.maxWidth ? "my-long-repository-name" : "my-repo";
+      return applyMaxWidth(sample2, item.maxWidth);
+    }
     const root = context.data.session?.project_root;
     if (!root)
       return isHideStateEnabled(item, NO_GIT_HIDEABLE_STATE) ? null : "no git";
@@ -56227,7 +56417,7 @@ function withWidgetSpeedWindowSeconds(item, seconds) {
 
 // src/utils/speed-tracker.ts
 import { readFileSync as readFileSync3 } from "node:fs";
-import { join as join5 } from "node:path";
+import { join as join6 } from "node:path";
 var memoryCache = new Map;
 function sanitizeCacheKey(key) {
   return key.replace(/[^a-zA-Z0-9_-]/g, "_");
@@ -56239,7 +56429,7 @@ function readCache(cacheDir, sessionId) {
   if (!cacheDir)
     return null;
   try {
-    const filePath = join5(cacheDir, `speed-${sanitizeCacheKey(sessionId)}.json`);
+    const filePath = join6(cacheDir, `speed-${sanitizeCacheKey(sessionId)}.json`);
     const raw = readFileSync3(filePath, "utf8");
     const data = JSON.parse(raw);
     if (data?.version === 1 && data?.sessionId === sessionId) {
@@ -56254,7 +56444,7 @@ function writeCache(cacheDir, data) {
   if (!cacheDir)
     return;
   try {
-    const filePath = join5(cacheDir, `speed-${sanitizeCacheKey(data.sessionId)}.json`);
+    const filePath = join6(cacheDir, `speed-${sanitizeCacheKey(data.sessionId)}.json`);
     writeFileAtomic(filePath, JSON.stringify(data, null, 2), { mode: 384 });
   } catch {}
 }
@@ -56498,6 +56688,9 @@ function calculateSpeed(kind, metrics) {
 function getSpeedWidgetDisplayName(kind) {
   return SPEED_WIDGET_CONFIG[kind].displayName;
 }
+function getSpeedWidgetLabel(kind) {
+  return SPEED_WIDGET_CONFIG[kind].label;
+}
 function getSpeedWidgetDescription(kind) {
   return SPEED_WIDGET_CONFIG[kind].description;
 }
@@ -56617,6 +56810,9 @@ class InputSpeedWidget {
   getCategory() {
     return "Token Speed";
   }
+  getLabelPrefix() {
+    return getSpeedWidgetLabel("input");
+  }
   getEditorDisplay(item) {
     return getSpeedWidgetEditorDisplay("input", item);
   }
@@ -56643,6 +56839,8 @@ class InputSpeedWidget {
   }
 }
 // src/widgets/Model.ts
+var LABEL6 = "Model: ";
+
 class ModelWidget {
   getDefaultColor() {
     return "cyan";
@@ -56659,13 +56857,16 @@ class ModelWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
+  getLabelPrefix() {
+    return LABEL6;
+  }
   render(item, context, _settings) {
     const name = context.isPreview ? "Codex" : context.data.model?.name;
     if (!name)
       return null;
     const suffix = name.indexOf(" (");
     const shortName = suffix >= 0 ? name.slice(0, suffix) : name;
-    return item.rawValue ? shortName : "Model: " + shortName;
+    return formatRawOrLabeledValue(item, this.getLabelPrefix(), shortName);
   }
   supportsRawValue() {
     return true;
@@ -56688,6 +56889,9 @@ class OutputSpeedWidget {
   getCategory() {
     return "Token Speed";
   }
+  getLabelPrefix() {
+    return getSpeedWidgetLabel("output");
+  }
   getEditorDisplay(item) {
     return getSpeedWidgetEditorDisplay("output", item);
   }
@@ -56813,6 +57017,7 @@ class SandboxStatusWidget {
   }
 }
 // src/widgets/SessionClock.ts
+var LABEL7 = "Session: ";
 var ZERO_HIDEABLE_STATE2 = { key: "zero", label: "when under 1 minute" };
 function formatDuration(ms) {
   const minutes = Math.floor(Math.max(0, ms) / 60000);
@@ -56841,6 +57046,9 @@ class SessionClockWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
+  getLabelPrefix() {
+    return LABEL7;
+  }
   getHideableStates() {
     return [ZERO_HIDEABLE_STATE2];
   }
@@ -56852,7 +57060,7 @@ class SessionClockWidget {
     if (elapsedMs < 60000 && isHideStateEnabled(item, ZERO_HIDEABLE_STATE2))
       return null;
     const value = formatDuration(elapsedMs);
-    return item.rawValue ? value : "Session: " + value;
+    return formatRawOrLabeledValue(item, this.getLabelPrefix(), value);
   }
   supportsRawValue() {
     return true;
@@ -56862,6 +57070,8 @@ class SessionClockWidget {
   }
 }
 // src/widgets/SessionName.ts
+var LABEL8 = "Session: ";
+
 class SessionNameWidget {
   getDefaultColor() {
     return "cyan";
@@ -56878,11 +57088,14 @@ class SessionNameWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
+  getLabelPrefix() {
+    return LABEL8;
+  }
   render(item, context, _settings) {
     const name = context.isPreview ? "my-session" : context.data.session?.thread_title;
     if (!name)
       return null;
-    return item.rawValue ? name : "Session: " + name;
+    return formatRawOrLabeledValue(item, this.getLabelPrefix(), name);
   }
   supportsRawValue() {
     return true;
@@ -57019,6 +57232,8 @@ function getTerminalWidth(options) {
 }
 
 // src/widgets/TerminalWidth.ts
+var LABEL9 = "Term: ";
+
 class TerminalWidthWidget {
   getDefaultColor() {
     return "gray";
@@ -57032,6 +57247,9 @@ class TerminalWidthWidget {
   getCategory() {
     return "Environment";
   }
+  getLabelPrefix() {
+    return LABEL9;
+  }
   getEditorDisplay(item) {
     return { displayText: this.getDisplayName() };
   }
@@ -57039,9 +57257,9 @@ class TerminalWidthWidget {
     const width = context.terminalWidth ?? getTerminalWidth();
     if (context.isPreview) {
       const detectedWidth = width ?? "??";
-      return item.rawValue ? `${detectedWidth}` : `Term: ${detectedWidth}`;
+      return formatRawOrLabeledValue(item, this.getLabelPrefix(), `${detectedWidth}`);
     } else if (width) {
-      return item.rawValue ? `${width}` : `Term: ${width}`;
+      return formatRawOrLabeledValue(item, this.getLabelPrefix(), `${width}`);
     }
     return null;
   }
@@ -57053,6 +57271,8 @@ class TerminalWidthWidget {
   }
 }
 // src/widgets/ThinkingEffort.ts
+var LABEL10 = "Thinking: ";
+
 class ThinkingEffortWidget {
   getDefaultColor() {
     return "magenta";
@@ -57069,11 +57289,14 @@ class ThinkingEffortWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
+  getLabelPrefix() {
+    return LABEL10;
+  }
   render(item, context, _settings) {
     const effort = context.isPreview ? "high" : context.data.model?.reasoning;
     if (!effort)
       return null;
-    return item.rawValue ? effort : "Thinking: " + effort;
+    return formatRawOrLabeledValue(item, this.getLabelPrefix(), effort);
   }
   supportsRawValue() {
     return true;
@@ -57099,19 +57322,22 @@ class TokensCachedWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
+  getLabelPrefix() {
+    return "Cached: ";
+  }
   getHideableStates() {
     return [ZERO_HIDEABLE_STATE];
   }
   render(item, context, settings) {
     const format = resolveNumberFormat("token", item, settings);
     if (context.isPreview)
-      return formatRawOrLabeledValue(item, "Cached: ", formatTokens(12000, format, 0));
+      return formatRawOrLabeledValue(item, this.getLabelPrefix(), formatTokens(12000, format, 0));
     const value = context.data.usage?.cached_input_tokens ?? null;
     if (value === null)
       return null;
     if (value === 0 && isHideStateEnabled(item, ZERO_HIDEABLE_STATE))
       return null;
-    return formatRawOrLabeledValue(item, "Cached: ", formatTokens(value, format));
+    return formatRawOrLabeledValue(item, this.getLabelPrefix(), formatTokens(value, format));
   }
   supportsRawValue() {
     return true;
@@ -57140,19 +57366,22 @@ class TokensInputWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
+  getLabelPrefix() {
+    return "In: ";
+  }
   getHideableStates() {
     return [ZERO_HIDEABLE_STATE];
   }
   render(item, context, settings) {
     const format = resolveNumberFormat("token", item, settings);
     if (context.isPreview)
-      return formatRawOrLabeledValue(item, "In: ", formatTokens(15200, format));
+      return formatRawOrLabeledValue(item, this.getLabelPrefix(), formatTokens(15200, format));
     const value = context.data.usage?.input_tokens ?? null;
     if (value === null)
       return null;
     if (value === 0 && isHideStateEnabled(item, ZERO_HIDEABLE_STATE))
       return null;
-    return formatRawOrLabeledValue(item, "In: ", formatTokens(value, format));
+    return formatRawOrLabeledValue(item, this.getLabelPrefix(), formatTokens(value, format));
   }
   supportsRawValue() {
     return true;
@@ -57181,19 +57410,22 @@ class TokensOutputWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
+  getLabelPrefix() {
+    return "Out: ";
+  }
   getHideableStates() {
     return [ZERO_HIDEABLE_STATE];
   }
   render(item, context, settings) {
     const format = resolveNumberFormat("token", item, settings);
     if (context.isPreview)
-      return formatRawOrLabeledValue(item, "Out: ", formatTokens(3400, format));
+      return formatRawOrLabeledValue(item, this.getLabelPrefix(), formatTokens(3400, format));
     const value = context.data.usage?.output_tokens ?? null;
     if (value === null)
       return null;
     if (value === 0 && isHideStateEnabled(item, ZERO_HIDEABLE_STATE))
       return null;
-    return formatRawOrLabeledValue(item, "Out: ", formatTokens(value, format));
+    return formatRawOrLabeledValue(item, this.getLabelPrefix(), formatTokens(value, format));
   }
   supportsRawValue() {
     return true;
@@ -57222,19 +57454,22 @@ class TokensTotalWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
+  getLabelPrefix() {
+    return "Total: ";
+  }
   getHideableStates() {
     return [ZERO_HIDEABLE_STATE];
   }
   render(item, context, settings) {
     const format = resolveNumberFormat("token", item, settings);
     if (context.isPreview)
-      return formatRawOrLabeledValue(item, "Total: ", formatTokens(30600, format));
+      return formatRawOrLabeledValue(item, this.getLabelPrefix(), formatTokens(30600, format));
     const value = context.data.usage && context.data.usage.input_tokens !== undefined && context.data.usage.output_tokens !== undefined ? context.data.usage.input_tokens + context.data.usage.output_tokens : null;
     if (value === null)
       return null;
     if (value === 0 && isHideStateEnabled(item, ZERO_HIDEABLE_STATE))
       return null;
-    return formatRawOrLabeledValue(item, "Total: ", formatTokens(value, format));
+    return formatRawOrLabeledValue(item, this.getLabelPrefix(), formatTokens(value, format));
   }
   supportsRawValue() {
     return true;
@@ -57260,6 +57495,9 @@ class TotalSpeedWidget {
   getCategory() {
     return "Token Speed";
   }
+  getLabelPrefix() {
+    return getSpeedWidgetLabel("total");
+  }
   getEditorDisplay(item) {
     return getSpeedWidgetEditorDisplay("total", item);
   }
@@ -57286,6 +57524,8 @@ class TotalSpeedWidget {
   }
 }
 // src/widgets/Version.ts
+var LABEL11 = "v";
+
 class VersionWidget {
   getDefaultColor() {
     return "gray";
@@ -57302,11 +57542,14 @@ class VersionWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
+  getLabelPrefix() {
+    return LABEL11;
+  }
   render(item, context, _settings) {
     const version2 = context.isPreview ? "0.152.1" : context.data.session?.codex_version;
     if (!version2)
       return null;
-    return item.rawValue ? version2 : "v" + version2;
+    return formatRawOrLabeledValue(item, this.getLabelPrefix(), version2);
   }
   supportsRawValue() {
     return true;
@@ -57669,23 +57912,27 @@ function getWidget(type) {
 }
 
 // src/utils/powerline-theme-index.ts
-function countPowerlineThemeSlots(entries) {
+function assignPowerlineThemeSlots(widgets, startSlot = 0, isShown = () => true) {
   let previousVisibleWidget = null;
-  let slotCount = 0;
-  for (const entry of entries) {
-    if (entry.widget.type === "separator" || entry.widget.type === "flex-separator") {
+  let nextSlot = startSlot;
+  const slots = widgets.map((widget, index) => {
+    if (widget.type === "separator" || widget.type === "flex-separator") {
       previousVisibleWidget = null;
-      continue;
+      return null;
     }
-    if (!entry.content) {
-      continue;
+    if (!isShown(index)) {
+      return null;
     }
     if (!previousVisibleWidget?.merge) {
-      slotCount++;
+      nextSlot++;
     }
-    previousVisibleWidget = entry.widget;
-  }
-  return slotCount;
+    previousVisibleWidget = widget;
+    return nextSlot - 1;
+  });
+  return { slots, nextSlot };
+}
+function countPowerlineThemeSlots(entries) {
+  return assignPowerlineThemeSlots(entries.map((entry) => entry.widget), 0, (index) => Boolean(entries[index]?.content)).nextSlot;
 }
 function advanceGlobalPowerlineThemeIndex(currentIndex, entries) {
   return currentIndex + countPowerlineThemeSlots(entries);
@@ -57730,6 +57977,88 @@ function advanceGlobalSeparatorIndex(currentIndex, widgets, preRenderedWidgets)
   return currentIndex + countSeparatorSlots(widgets, preRenderedWidgets);
 }
 
+// src/utils/terminal-sanitize.ts
+var ESC4 = "\x1B";
+var BEL4 = "\x07";
+var C1_ST = "œ";
+var SGR = /\x1b\[[0-9;:]*m/y;
+var OSC8 = /\x1b\]8;[A-Za-z0-9=:_.-]*;[^\x00-\x20\x7f-\x9f]*(?:\x1b\\|\x07)/y;
+var CONTROL = /[\x00-\x08\x0b-\x1f\x7f-\x9f]/;
+var CONTROL_GLOBAL = /[\x00-\x08\x0b-\x1f\x7f-\x9f]/g;
+var STRING_INTRODUCERS = new Set(["]", "P", "X", "^", "_"]);
+function matchAt(pattern, text, index) {
+  pattern.lastIndex = index;
+  return pattern.exec(text)?.[0] ?? null;
+}
+function isCsiParameterOrIntermediate(code) {
+  return code >= 32 && code <= 63;
+}
+function isIntermediate(code) {
+  return code >= 32 && code <= 47;
+}
+function skipEscapeSequence(text, index) {
+  const introducer = text[index + 1];
+  if (introducer === undefined) {
+    return index + 1;
+  }
+  if (introducer === "[") {
+    let end = index + 2;
+    while (end < text.length && isCsiParameterOrIntermediate(text.charCodeAt(end))) {
+      end++;
+    }
+    const final = text.charCodeAt(end);
+    return final >= 64 && final <= 126 ? end + 1 : end;
+  }
+  if (STRING_INTRODUCERS.has(introducer)) {
+    for (let end = index + 2;end < text.length; end++) {
+      const char = text[end];
+      if (char === BEL4 || char === C1_ST) {
+        return end + 1;
+      }
+      if (char === ESC4) {
+        return text[end + 1] === "\\" ? end + 2 : end;
+      }
+    }
+    return text.length;
+  }
+  if (isIntermediate(introducer.charCodeAt(0))) {
+    let end = index + 2;
+    while (end < text.length && isIntermediate(text.charCodeAt(end))) {
+      end++;
+    }
+    const final = text.charCodeAt(end);
+    return final >= 48 && final <= 126 ? end + 1 : end;
+  }
+  return index + 2;
+}
+function sanitizeTerminalText(text) {
+  if (!CONTROL.test(text)) {
+    return text;
+  }
+  let result2 = "";
+  let index = 0;
+  while (index < text.length) {
+    const char = text[index];
+    if (char === ESC4) {
+      const kept = matchAt(SGR, text, index) ?? matchAt(OSC8, text, index);
+      if (kept) {
+        result2 += kept;
+        index += kept.length;
+      } else {
+        index = skipEscapeSequence(text, index);
+      }
+      continue;
+    }
+    let end = index;
+    while (end < text.length && text[end] !== ESC4) {
+      end++;
+    }
+    result2 += text.slice(index, end).replace(CONTROL_GLOBAL, "");
+    index = end;
+  }
+  return result2;
+}
+
 // src/utils/renderer.ts
 var WIDGET_CONTROL_CHARS = /[\u0000-\u001F\u007F-\u009F]/g;
 function sanitizeRawText(text) {
@@ -57738,9 +58067,6 @@ function sanitizeRawText(text) {
 function sanitizeStringArray(value, fallback) {
   return Array.isArray(value) ? value.filter((item) => typeof item === "string").map(sanitizeRawText) : fallback;
 }
-function reapplyBackground(content, bgCode) {
-  return content.replace(/\x1b\[(?:0|49)m/g, (m) => m + bgCode);
-}
 function resolveStyledText(content, styled, settings, colorLevel) {
   if (!styled)
     return { text: content, styled: false };
@@ -57796,29 +58122,30 @@ function resolveEffectiveTerminalWidth(detectedWidth, settings, context) {
   if (!detectedWidth) {
     return null;
   }
+  const remaining = (reserved) => Math.max(0, detectedWidth - reserved);
   const flexMode = settings.flexMode;
   if (context.isPreview) {
     if (flexMode === "full") {
-      return detectedWidth - 6;
+      return remaining(6);
     }
     if (flexMode === "full-minus-40") {
-      return detectedWidth - 40;
+      return remaining(40);
     }
     if (flexMode === "full-until-compact") {
-      return detectedWidth - 6;
+      return remaining(6);
     }
     return null;
   }
   if (flexMode === "full") {
-    return detectedWidth - 6;
+    return remaining(6);
   }
   if (flexMode === "full-minus-40") {
-    return detectedWidth - 40;
+    return remaining(40);
   }
   if (flexMode === "full-until-compact") {
     const threshold = settings.compactThreshold;
     const contextPercentage = (context.data.usage?.context_used ?? 0) * 100;
-    return contextPercentage >= threshold ? detectedWidth - 40 : detectedWidth - 6;
+    return contextPercentage >= threshold ? remaining(40) : remaining(6);
   }
   return null;
 }
@@ -58083,7 +58410,7 @@ function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, gl
       powerlineGradientColumn = gradientResult.nextColumn;
     } else if (isStyled && widget.bgColor) {
       const bgCode = getColorAnsiCode(widget.bgColor, colorLevel, true);
-      widgetContent += reapplyBackground(styledContent, bgCode);
+      widgetContent += restoreBackgroundAfterResets(styledContent, bgCode);
     } else {
       widgetContent += styledContent;
     }
@@ -58201,7 +58528,7 @@ function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, gl
     }
   }
   if (totalFlexCount > 0) {
-    if (terminalWidth && terminalWidth > 0) {
+    if (terminalWidth !== null) {
       const parts = result2.split(FLEX_SENTINEL);
       const totalContentWidth = parts.reduce((sum2, p) => sum2 + getVisibleWidth(p), 0);
       const flexCount = parts.length - 1;
@@ -58221,7 +58548,7 @@ function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, gl
   if (colorLevel !== "none") {
     result2 += "\x1B[0m";
   }
-  if (terminalWidth && terminalWidth > 0) {
+  if (terminalWidth !== null) {
     const plainLength = getVisibleWidth(result2);
     if (plainLength > terminalWidth) {
       result2 = truncateStyledText(result2, terminalWidth, { ellipsis: true });
@@ -58329,7 +58656,7 @@ function preRenderAllWidgets(allLinesWidgets, settings, context) {
       try {
         const widgetImpl = getWidget(widget.type);
         const effectiveWidget = settings.minimalistMode ? { ...widget, rawValue: true } : widget;
-        const rawText = widgetImpl.render(effectiveWidget, context, settings) ?? "";
+        const rawText = sanitizeTerminalText(widgetImpl.render(effectiveWidget, context, settings) ?? "");
         styled = widgetImpl.emitsStyledOutput?.(effectiveWidget) === true && rawText.includes("\x1B");
         widgetText = styled ? keepSgrOnly(rawText) : sanitizeRawText(rawText);
       } catch {
@@ -58493,7 +58820,7 @@ function renderStatusLine(widgets, settings, context, preRenderedWidgets, preCal
       continue;
     }
     if (widget.type === "flex-separator") {
-      elements.push({ content: "FLEX", type: "flex-separator", widget });
+      elements.push({ content: "", type: "flex-separator", widget });
       hasFlexSeparator = true;
       continue;
     }
@@ -58517,7 +58844,7 @@ function renderStatusLine(widgets, settings, context, preRenderedWidgets, preCal
           const bg = settings.overrideBackgroundColor && settings.overrideBackgroundColor !== "none" ? settings.overrideBackgroundColor : widget.backgroundColor;
           if (bg) {
             const bgCode = getColorAnsiCode(bg, colorLevel, true);
-            content = `${bgCode}${reapplyBackground(widgetText, bgCode)}\x1B[0m`;
+            content = `${bgCode}${restoreBackgroundAfterResets(widgetText, bgCode)}\x1B[0m`;
           } else {
             content = `${widgetText}\x1B[0m`;
           }
@@ -58539,7 +58866,7 @@ function renderStatusLine(widgets, settings, context, preRenderedWidgets, preCal
   while (elements.length > 0 && elements[elements.length - 1]?.type === "separator") {
     elements.pop();
   }
-  if (!terminalWidth) {
+  if (terminalWidth === null) {
     for (let i = elements.length - 1;i >= 0; i--) {
       if (elements[i]?.type !== "separator" || !isSpacingSeparator(elements[i]?.widget, settings.defaultSeparator)) {
         continue;
@@ -58577,7 +58904,9 @@ function renderStatusLine(widgets, settings, context, preRenderedWidgets, preCal
         finalElements.push(defaultSep);
       }
     }
-    if (elem.type === "separator" || elem.type === "flex-separator") {
+    if (elem.type === "flex-separator") {
+      finalElements.push(null);
+    } else if (elem.type === "separator") {
       finalElements.push(elem.content);
     } else {
       const nextElem = index < elements.length - 1 ? elements[index + 1] : null;
@@ -58599,11 +58928,11 @@ function renderStatusLine(widgets, settings, context, preRenderedWidgets, preCal
     }
   });
   let statusLine;
-  if (hasFlexSeparator && terminalWidth) {
+  if (hasFlexSeparator && terminalWidth !== null) {
     const parts = [[]];
     let currentPart = 0;
     for (const elem of finalElements) {
-      if (elem === "FLEX") {
+      if (elem === null) {
         currentPart++;
         parts[currentPart] = [];
       } else {
@@ -58630,15 +58959,13 @@ function renderStatusLine(widgets, settings, context, preRenderedWidgets, preCal
         statusLine += " ".repeat(spaces);
       }
     }
+  } else if (hasFlexSeparator) {
+    statusLine = finalElements.map((e) => e ?? applyColorsWithOverride(" | ", "brightBlack")).join("");
   } else {
-    if (hasFlexSeparator && !terminalWidth) {
-      statusLine = finalElements.map((e) => e === "FLEX" ? applyColorsWithOverride(" | ", "brightBlack") : e).join("");
-    } else {
-      statusLine = finalElements.join("");
-    }
+    statusLine = finalElements.join("");
   }
   const maxWidth = terminalWidth ?? detectedWidth;
-  if (maxWidth && maxWidth > 0) {
+  if (maxWidth !== null && (terminalWidth !== null || maxWidth > 0)) {
     const plainLength = getVisibleWidth(statusLine);
     if (plainLength > maxWidth) {
       statusLine = truncateStyledText(statusLine, maxWidth, { ellipsis: true });
@@ -58649,8 +58976,8 @@ function renderStatusLine(widgets, settings, context, preRenderedWidgets, preCal
 }
 
 // src/utils/config.ts
-import { lstat, mkdir, readFile, readlink, realpath, rename, unlink, writeFile } from "node:fs/promises";
-import { basename, dirname as dirname3, resolve } from "node:path";
+import { lstat, mkdir, readFile, readlink, realpath, rename, stat, unlink, writeFile } from "node:fs/promises";
+import { basename, dirname as dirname4, resolve } from "node:path";
 
 // src/types/FlexMode.ts
 var FlexModeSchema = exports_external.enum(["full", "full-minus-40", "full-until-compact"]);
@@ -58876,29 +59203,37 @@ async function resolveSymlinkTarget(linkPath) {
   } catch (error61) {
     if (errorCode(error61) !== "ENOENT")
       throw error61;
-    return resolve(dirname3(linkPath), await readlink(linkPath));
+    return resolve(dirname4(linkPath), await readlink(linkPath));
   }
 }
 async function resolveAtomicWriteTarget(file2) {
   try {
     if (!(await lstat(file2)).isSymbolicLink()) {
-      return { targetPath: file2, tempDir: dirname3(file2) };
+      return { targetPath: file2, tempDir: dirname4(file2) };
     }
     const targetPath = await resolveSymlinkTarget(file2);
-    return { targetPath, tempDir: dirname3(targetPath) };
+    return { targetPath, tempDir: dirname4(targetPath) };
   } catch (error61) {
     if (errorCode(error61) === "ENOENT")
-      return { targetPath: file2, tempDir: dirname3(file2) };
+      return { targetPath: file2, tempDir: dirname4(file2) };
     throw error61;
   }
 }
+async function getReplacedFileMode(filePath) {
+  try {
+    return (await stat(filePath)).mode & 511;
+  } catch {
+    return 438;
+  }
+}
 async function writeSettingsJson(file2, settings) {
-  await mkdir(dirname3(file2), { recursive: true });
+  await mkdir(dirname4(file2), { recursive: true });
   const target = await resolveAtomicWriteTarget(file2);
   await mkdir(target.tempDir, { recursive: true });
   const tempPath = resolve(target.tempDir, `${basename(target.targetPath)}.${process.pid}.${Date.now()}.tmp`);
+  const mode = await getReplacedFileMode(target.targetPath);
   try {
-    await writeFile(tempPath, JSON.stringify(settings, null, 2), "utf8");
+    await writeFile(tempPath, JSON.stringify(settings, null, 2), { encoding: "utf8", mode });
     await rename(tempPath, target.targetPath);
   } catch (error61) {
     await unlink(tempPath).catch(() => {
@@ -58978,16 +59313,16 @@ async function runRender(stdin, deps) {
 }
 
 // src/commands/refresh-command.ts
-import { lstatSync as lstatSync2, readdirSync, unlinkSync as unlinkSync2 } from "node:fs";
-import { join as join6 } from "node:path";
+import { lstatSync as lstatSync3, readdirSync, unlinkSync as unlinkSync2 } from "node:fs";
+import { join as join7 } from "node:path";
 function evictOldEntries(dir, now2) {
   try {
     const entries = readdirSync(dir);
     for (const entry of entries) {
       if (entry.endsWith(".json") || entry.startsWith(".") && entry.endsWith(".tmp")) {
-        const filePath = join6(dir, entry);
+        const filePath = join7(dir, entry);
         try {
-          const st = lstatSync2(filePath);
+          const st = lstatSync3(filePath);
           if (now2 - st.mtimeMs > CACHE_MAX_AGE_MS) {
             unlinkSync2(filePath);
           }
@@ -59001,7 +59336,7 @@ function runRefreshCommand(cacheKey2, deps) {
     return 2;
   }
   const paths = resolvePaths(deps.env);
-  const docPath = join6(paths.commandCacheDir, `${cacheKey2}.json`);
+  const docPath = join7(paths.commandCacheDir, `${cacheKey2}.json`);
   const doc2 = readDocument(docPath, deps.now ?? Date.now);
   if (doc2 === "miss") {
     return 0;
@@ -59035,27 +59370,27 @@ function runRefreshCommand(cacheKey2, deps) {
   return 0;
 }
 // src/version-info.ts
-var VERSION = "0.14.0";
-var SOURCE_COMMIT = /^[0-9a-f]{40}$/.test("7da2284cff946dc0ff5c195c6521995e3e7c4dc2") ? "7da2284cff946dc0ff5c195c6521995e3e7c4dc2" : null;
+var VERSION = "0.15.0";
+var SOURCE_COMMIT = /^[0-9a-f]{40}$/.test("d2eca924591bfeb5dea069eefd2a7867267c9f51") ? "d2eca924591bfeb5dea069eefd2a7867267c9f51" : null;
 var SOURCE_DIRTY = false;
 
 // src/context.ts
-import { existsSync as existsSync3, realpathSync } from "node:fs";
+import { existsSync as existsSync3, realpathSync as realpathSync2 } from "node:fs";
 import { spawnSync as spawnSync4 } from "node:child_process";
 import { fileURLToPath } from "node:url";
 
 // src/patch/preflight.ts
 import { accessSync, constants as constants2, existsSync as existsSync2, statfsSync } from "node:fs";
-import { dirname as dirname4, join as join8 } from "node:path";
+import { dirname as dirname5, join as join9 } from "node:path";
 import { spawnSync as spawnSync3 } from "node:child_process";
 
 // src/patch/package-assemble.ts
-import { join as join7 } from "node:path";
+import { join as join8 } from "node:path";
 var PYTHON_CANDIDATES = ["python3.13", "python3.12", "python3.11", "python3.10", "python3"];
 var PYTHON_VERSION_CHECK = "import sys; sys.exit(sys.version_info < (3, 10))";
 function assembleArgs(input2) {
   const args = [
-    join7(input2.upstream, "scripts", "build_codex_package.py"),
+    join8(input2.upstream, "scripts", "build_codex_package.py"),
     "--variant",
     "codex",
     "--target",
@@ -59189,7 +59524,7 @@ function prebuiltPreflight(deps, paths) {
 }
 function whichReal(cmd) {
   for (const dir of (process.env.PATH ?? "").split(":").filter(Boolean)) {
-    const p = join8(dir, cmd);
+    const p = join9(dir, cmd);
     try {
       accessSync(p, constants2.X_OK);
       return p;
@@ -59197,10 +59532,10 @@ function whichReal(cmd) {
   }
   return null;
 }
-function nearestExisting(path) {
-  let p = path;
+function nearestExisting(path3) {
+  let p = path3;
   while (!existsSync2(p)) {
-    const parent = dirname4(p);
+    const parent = dirname5(p);
     if (parent === p)
       return p;
     p = parent;
@@ -59214,8 +59549,8 @@ function realDeps() {
       const r = spawnSync3(cmd, args, { encoding: "utf8", cwd: opts?.cwd });
       return { status: r.status, stdout: r.stdout ?? "", stderr: r.stderr ?? "" };
     },
-    freeBytes: (path) => {
-      const s = statfsSync(nearestExisting(path));
+    freeBytes: (path3) => {
+      const s = statfsSync(nearestExisting(path3));
       return Number(s.bavail) * Number(s.bsize);
     }
   };
@@ -59225,7 +59560,7 @@ function realDeps() {
 function ownBinary(paths) {
   if (existsSync3(paths.rendererLink))
     return paths.rendererLink;
-  return realpathSync(process.argv[1] ?? paths.rendererLink);
+  return realpathSync2(process.argv[1] ?? paths.rendererLink);
 }
 function realContext(env3, io) {
   const paths = resolvePaths(env3);
@@ -59260,11 +59595,11 @@ function realContext(env3, io) {
 
 // src/patch/run.ts
 import { appendFileSync, mkdirSync as mkdirSync9, rmSync as rmSync6 } from "node:fs";
-import { join as join19 } from "node:path";
+import { join as join20 } from "node:path";
 
 // src/lock.ts
 import { closeSync, existsSync as existsSync4, mkdirSync as mkdirSync3, openSync, readFileSync as readFileSync4, unlinkSync as unlinkSync3, writeSync } from "node:fs";
-import { dirname as dirname5 } from "node:path";
+import { dirname as dirname6 } from "node:path";
 function pidAlive(pid) {
   try {
     process.kill(pid, 0);
@@ -59284,7 +59619,7 @@ function lockHolder(file2) {
   }
 }
 function acquireLock(file2, isAlive = pidAlive) {
-  mkdirSync3(dirname5(file2), { recursive: true });
+  mkdirSync3(dirname6(file2), { recursive: true });
   for (let attempt2 = 0;attempt2 < 2; attempt2++) {
     try {
       const fd = openSync(file2, "wx");
@@ -59364,12 +59699,12 @@ function behindWithinMinor(upstream, patched) {
 
 // src/distribution/prebuilt.ts
 import { chmodSync as chmodSync2, copyFileSync, mkdirSync as mkdirSync6, mkdtempSync, readFileSync as readFileSync7, renameSync as renameSync4, rmSync as rmSync2 } from "node:fs";
-import { join as join12 } from "node:path";
+import { join as join13 } from "node:path";
 
 // src/patch/generation.ts
-import { chmodSync, cpSync, existsSync as existsSync5, lstatSync as lstatSync3, mkdirSync as mkdirSync4, readFileSync as readFileSync6, readdirSync as readdirSync2, readlinkSync, realpathSync as realpathSync2, renameSync as renameSync2, rmSync, statSync, symlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
+import { chmodSync, cpSync, existsSync as existsSync5, lstatSync as lstatSync4, mkdirSync as mkdirSync4, readFileSync as readFileSync6, readdirSync as readdirSync2, readlinkSync, realpathSync as realpathSync3, renameSync as renameSync2, rmSync, statSync as statSync3, symlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
 import { randomBytes as randomBytes2 } from "node:crypto";
-import { dirname as dirname6, isAbsolute, join as join9, relative, resolve as resolve2, sep } from "node:path";
+import { dirname as dirname7, isAbsolute, join as join10, relative, resolve as resolve2, sep } from "node:path";
 
 // src/digest.ts
 import { createHash as createHash2 } from "node:crypto";
@@ -59386,10 +59721,10 @@ var GENERATION_LEGAL_FILES = ["LICENSE", "NOTICE", "THIRD_PARTY_NOTICES.md"];
 var SAFE_SEGMENT = /^[A-Za-z0-9][A-Za-z0-9._+-]*$/;
 var ROOT_ALIAS = "codex";
 function isPackageLayout(dir) {
-  return existsSync5(join9(dir, "bin", "codex")) && existsSync5(join9(dir, "codex-package.json"));
+  return existsSync5(join10(dir, "bin", "codex")) && existsSync5(join10(dir, "codex-package.json"));
 }
 function executablePath(dir, name) {
-  return isPackageLayout(dir) ? join9(dir, "bin", name) : join9(dir, name);
+  return isPackageLayout(dir) ? join10(dir, "bin", name) : join10(dir, name);
 }
 var PackageMetadata = exports_external.object({
   version: exports_external.string(),
@@ -59398,10 +59733,10 @@ var PackageMetadata = exports_external.object({
 }).passthrough();
 function verifyPackage(dir, files, expect) {
   for (const [name, want] of Object.entries(files)) {
-    const file2 = join9(dir, name);
+    const file2 = join10(dir, name);
     let st;
     try {
-      st = lstatSync3(file2);
+      st = lstatSync4(file2);
     } catch {
       return `${name} is missing`;
     }
@@ -59416,7 +59751,7 @@ function verifyPackage(dir, files, expect) {
   }
   let metadata;
   try {
-    metadata = PackageMetadata.parse(JSON.parse(readFileSync6(join9(dir, "codex-package.json"), "utf8")));
+    metadata = PackageMetadata.parse(JSON.parse(readFileSync6(join10(dir, "codex-package.json"), "utf8")));
   } catch (e) {
     return `codex-package.json is unreadable: ${e instanceof Error ? e.message.split(`
 `)[0] : String(e)}`;
@@ -59433,20 +59768,20 @@ function packageFiles(dir) {
   const out = {};
   const walk = (current) => {
     for (const name of readdirSync2(current).sort()) {
-      const path = join9(current, name);
-      const rel = relative(dir, path).split(sep).join("/");
-      const st = lstatSync3(path);
+      const path3 = join10(current, name);
+      const rel = relative(dir, path3).split(sep).join("/");
+      const st = lstatSync4(path3);
       if (rel === INSTALLATION_FILE || rel === ROOT_ALIAS && st.isSymbolicLink())
         continue;
       if (st.isSymbolicLink())
         throw new Error(`${rel} is a symbolic link; a Codex package may only contain regular files`);
       if (st.isDirectory()) {
-        walk(path);
+        walk(path3);
         continue;
       }
       if (!st.isFile())
         throw new Error(`${rel} is not a regular file`);
-      out[rel] = digestOf(path);
+      out[rel] = digestOf(path3);
     }
   };
   walk(dir);
@@ -59461,10 +59796,10 @@ function nearestExisting2(p) {
   let cur = p;
   for (;; ) {
     try {
-      statSync(cur);
+      statSync3(cur);
       return cur;
     } catch {
-      const parent = dirname6(cur);
+      const parent = dirname7(cur);
       if (parent === cur)
         return cur;
       cur = parent;
@@ -59473,7 +59808,7 @@ function nearestExisting2(p) {
 }
 function realish(p) {
   const near = nearestExisting2(p);
-  return realpathSync2(near) + resolve2(p).slice(resolve2(near).length);
+  return realpathSync3(near) + resolve2(p).slice(resolve2(near).length);
 }
 function insideGenerationsRoot(paths, candidate) {
   return realish(candidate).startsWith(`${realish(paths.generationsDir)}${sep}`);
@@ -59487,7 +59822,7 @@ function validateStaging(pair) {
     throw new Error(`staged package is not the one its provenance describes: ${problem}; refusing to install it`);
   if (pair.provenance.source === "prebuilt") {
     for (const name of GENERATION_LEGAL_FILES) {
-      if (!(name in pair.provenance.files) || !existsSync5(join9(pair.directory, name)))
+      if (!(name in pair.provenance.files) || !existsSync5(join10(pair.directory, name)))
         throw new Error(`prebuilt pair is missing ${name}`);
     }
   }
@@ -59495,7 +59830,7 @@ function validateStaging(pair) {
     const want = pair.provenance.files[`bin/${name}`];
     if (!want)
       throw new Error(`staged pair is missing bin/${name}`);
-    const got = digestOf(join9(pair.directory, "bin", name));
+    const got = digestOf(join10(pair.directory, "bin", name));
     if (got.sha256 !== want.sha256 || got.size !== want.size) {
       throw new Error(`staged bin/${name} does not match its recorded digest; refusing to install it`);
     }
@@ -59506,7 +59841,7 @@ function installationRecord(pair) {
   return record2;
 }
 function commitJson(file2, value, rename2) {
-  const tmp = join9(dirname6(file2), `.${process.pid}.${randomBytes2(4).toString("hex")}.tmp`);
+  const tmp = join10(dirname7(file2), `.${process.pid}.${randomBytes2(4).toString("hex")}.tmp`);
   try {
     writeFileSync2(tmp, `${JSON.stringify(value, null, 2)}
 `);
@@ -59520,7 +59855,7 @@ var GENERATION_NAME = /^\d+\.\d+\.\d+-\d{8}T\d{6}-[0-9a-f]{6}$/;
 function freshName(pair, paths) {
   mkdirSync4(paths.generationsDir, { recursive: true });
   for (;; ) {
-    const dir = join9(paths.generationsDir, `${pair.codexVersion}-${stamp(pair.provenance.installedAt)}-${randomBytes2(3).toString("hex")}`);
+    const dir = join10(paths.generationsDir, `${pair.codexVersion}-${stamp(pair.provenance.installedAt)}-${randomBytes2(3).toString("hex")}`);
     if (!existsSync5(dir))
       return dir;
   }
@@ -59538,8 +59873,8 @@ function createGeneration(pair, paths, rename2 = renameSync2) {
   }
   try {
     chmodSync(dir, 493);
-    symlinkSync("bin/codex", join9(dir, ROOT_ALIAS));
-    commitJson(join9(dir, INSTALLATION_FILE), installationRecord(pair), rename2);
+    symlinkSync("bin/codex", join10(dir, ROOT_ALIAS));
+    commitJson(join10(dir, INSTALLATION_FILE), installationRecord(pair), rename2);
   } catch (e) {
     rmSync(dir, { recursive: true, force: true });
     throw e;
@@ -59547,11 +59882,11 @@ function createGeneration(pair, paths, rename2 = renameSync2) {
   return dir;
 }
 function isGenerationDir(dir) {
-  return existsSync5(join9(dir, INSTALLATION_FILE)) && isPackageLayout(dir);
+  return existsSync5(join10(dir, INSTALLATION_FILE)) && isPackageLayout(dir);
 }
 function listGenerations(paths) {
   try {
-    return readdirSync2(paths.generationsDir).map((name) => join9(paths.generationsDir, name)).sort();
+    return readdirSync2(paths.generationsDir).map((name) => join10(paths.generationsDir, name)).sort();
   } catch {
     return [];
   }
@@ -59584,11 +59919,11 @@ function activeGeneration(paths) {
   const target = readPointer(paths);
   if (target === null)
     return null;
-  const abs = isAbsolute(target) ? target : resolve2(dirname6(paths.currentGeneration), target);
+  const abs = isAbsolute(target) ? target : resolve2(dirname7(paths.currentGeneration), target);
   if (!insideGenerationsRoot(paths, abs))
     return null;
   try {
-    return statSync(abs).isDirectory() ? abs : null;
+    return statSync3(abs).isDirectory() ? abs : null;
   } catch {
     return null;
   }
@@ -59651,7 +59986,7 @@ function readInstallation(paths) {
   if (dir === null)
     return null;
   try {
-    const raw = JSON.parse(readFileSync6(join9(dir, INSTALLATION_FILE), "utf8"));
+    const raw = JSON.parse(readFileSync6(join10(dir, INSTALLATION_FILE), "utf8"));
     return checkedRecord(raw);
   } catch {
     return null;
@@ -59660,7 +59995,7 @@ function readInstallation(paths) {
 
 // src/distribution/archive.ts
 import { createReadStream as createReadStream2, createWriteStream, mkdirSync as mkdirSync5 } from "node:fs";
-import { dirname as dirname7, join as join10 } from "node:path";
+import { dirname as dirname8, join as join11 } from "node:path";
 import { createGunzip } from "node:zlib";
 
 // node_modules/tar/dist/esm/index.min.js
@@ -61751,7 +62086,7 @@ var hr = Symbol("entry");
 var cs = Symbol("entryOpt");
 var ui = Symbol("writeEntryClass");
 var lr = Symbol("write");
-var fs2 = Symbol("ondrain");
+var fs4 = Symbol("ondrain");
 var wt = class extends A {
   sync = false;
   opt;
@@ -61787,9 +62122,9 @@ var wt = class extends A {
       if (t.gzip && (typeof t.gzip != "object" && (t.gzip = {}), this.portable && (t.gzip.portable = true), this.zip = new ze(t.gzip)), t.brotli && (typeof t.brotli != "object" && (t.brotli = {}), this.zip = new We(t.brotli)), t.zstd && (typeof t.zstd != "object" && (t.zstd = {}), this.zip = new Ye(t.zstd)), !this.zip)
         throw new Error("impossible");
       let e = this.zip;
-      e.on("data", (i) => super.write(i)), e.on("end", () => super.end()), e.on("drain", () => this[fs2]()), this.on("resume", () => e.resume());
+      e.on("data", (i) => super.write(i)), e.on("end", () => super.end()), e.on("drain", () => this[fs4]()), this.on("resume", () => e.resume());
     } else
-      this.on("drain", this[fs2]);
+      this.on("drain", this[fs4]);
     this.noDirRecurse = !!t.noDirRecurse, this.follow = !!t.follow, this.noMtime = !!t.noMtime, t.mtime && (this.mtime = t.mtime), this.filter = typeof t.filter == "function" ? t.filter : () => true, this[W] = new hi, this[G] = 0, this.jobs = Number(t.jobs) || 4, this[Ee] = false, this[me] = false;
   }
   [lr](t) {
@@ -61911,7 +62246,7 @@ var wt = class extends A {
       this.emit("error", e);
     }
   }
-  [fs2]() {
+  [fs4]() {
     this[Et] && this[Et].entry && this[Et].entry.resume();
   }
   [di](t) {
@@ -62937,9 +63272,9 @@ function rejectionReason(entry, seen, budget, expected) {
 function writeEntry(entry, staging, expected) {
   const name = entry.path;
   const mode = isExecutable(name) ? EXECUTABLE_MODE : LEGAL_MODE;
-  const target = join10(staging, name);
+  const target = join11(staging, name);
   if (name.includes("/"))
-    mkdirSync5(dirname7(target), { recursive: true });
+    mkdirSync5(dirname8(target), { recursive: true });
   const sink = createWriteStream(target, { mode, flags: "wx" });
   const done = new Promise((resolve3, reject2) => {
     sink.on("error", reject2);
@@ -63027,7 +63362,7 @@ async function extractArchive(archivePath, staging, files) {
 import { createHash as createHash3 } from "node:crypto";
 import { createReadStream as createReadStream3, existsSync as existsSync6, renameSync as renameSync3 } from "node:fs";
 import { open as open2 } from "node:fs/promises";
-import { dirname as dirname8, join as join11 } from "node:path";
+import { dirname as dirname9, join as join12 } from "node:path";
 var PUBLIC_BASE = "https://github.com/adrijshikhar/cxstatusline/releases/download";
 var REPO = "adrijshikhar/cxstatusline";
 var MAX_REDIRECTS = 5;
@@ -63152,12 +63487,12 @@ async function singleHttpDownload(start, asset, dest, maxBytes, opts) {
   let existingHash = null;
   if (existsSync6(dest)) {
     try {
-      const stat = await open2(dest, "r").then(async (h) => {
+      const stat2 = await open2(dest, "r").then(async (h) => {
         const s3 = await h.stat();
         await h.close();
         return s3;
       });
-      if (stat.size > 0 && stat.size < maxBytes) {
+      if (stat2.size > 0 && stat2.size < maxBytes) {
         const hashed = await hashExistingFile(dest, maxBytes, asset);
         existingBytes = hashed.size;
         existingHash = hashed.hash;
@@ -63273,7 +63608,7 @@ async function ghDownload(ctx, tag, asset, dest, maxBytes) {
   if (ctx.which("gh") === null) {
     throw new GhMissingError(`${asset} is not public for release ${tag} and GitHub CLI (gh) is not installed`);
   }
-  const targetDir = dirname8(dest);
+  const targetDir = dirname9(dest);
   const result2 = ctx.run("gh", ["release", "download", tag, "--repo", REPO, "--pattern", asset, "--dir", targetDir], { timeoutMs: GH_TIMEOUT_MS });
   if (result2.status !== 0) {
     const detail = sanitize(result2.stderr || result2.stdout);
@@ -63282,7 +63617,7 @@ async function ghDownload(ctx, tag, asset, dest, maxBytes) {
     }
     throw new ReleaseUnavailableError(`release ${tag} not found or access denied: ${detail}`);
   }
-  const downloadedFile = join11(targetDir, asset);
+  const downloadedFile = join12(targetDir, asset);
   if (!existsSync6(downloadedFile) && !existsSync6(dest)) {
     throw new ReleaseUnavailableError(`release ${tag} not found or access denied: gh downloaded no ${asset}`);
   }
@@ -63304,7 +63639,7 @@ var MANIFEST_ASSET = "manifest.json";
 var PROBE_TIMEOUT_MS = 30000;
 function privateTemp(ctx, prefix) {
   mkdirSync6(ctx.paths.libexecDir, { recursive: true });
-  const dir = mkdtempSync(join12(ctx.paths.libexecDir, prefix));
+  const dir = mkdtempSync(join13(ctx.paths.libexecDir, prefix));
   chmodSync2(dir, 448);
   return dir;
 }
@@ -63343,7 +63678,7 @@ function verifyStaged(staging, manifest, artifact) {
     throw new Error(`staged package does not match the release manifest: ${problem}`);
 }
 function probeVersion(ctx, staging, codexVersion) {
-  const probe = ctx.run(join12(staging, "bin", "codex"), ["--version"], { timeoutMs: PROBE_TIMEOUT_MS });
+  const probe = ctx.run(join13(staging, "bin", "codex"), ["--version"], { timeoutMs: PROBE_TIMEOUT_MS });
   const reported = sanitize((probe.stdout || probe.stderr).slice(0, 512));
   if (probe.status !== 0 || reported !== `codex-cli ${codexVersion}`) {
     throw new Error(`staged codex reported version "${reported}" instead of "codex-cli ${codexVersion}"`);
@@ -63386,8 +63721,8 @@ function moveFile(src, dst) {
 async function stageArchive(ctx, download, manifest, artifact, tag, opts) {
   const cacheDir = ctx.paths.downloadCacheDir;
   mkdirSync6(cacheDir, { recursive: true });
-  const partFile = join12(cacheDir, `${tag}-${artifact.filename}.part`);
-  const archive = join12(download, artifact.filename);
+  const partFile = join13(cacheDir, `${tag}-${artifact.filename}.part`);
+  const archive = join13(download, artifact.filename);
   opts.onStatus?.("download", `Downloading prebuilt archive (${artifact.filename})...`);
   const got = await downloadAsset(ctx, tag, artifact.filename, partFile, ARCHIVE_MAX_BYTES, opts);
   if (got.sha256 !== artifact.sha256 || got.size !== artifact.size) {
@@ -63413,7 +63748,7 @@ async function preparePrebuilt(ctx, expected, opts = {}) {
   opts.onStatus?.("manifest", `Checking release ${tag} for ${expected.platform}...`);
   const download = privateTemp(ctx, "download-");
   try {
-    const manifestFile = join12(download, MANIFEST_ASSET);
+    const manifestFile = join13(download, MANIFEST_ASSET);
     await downloadAsset(ctx, tag, MANIFEST_ASSET, manifestFile, MANIFEST_MAX_BYTES, opts);
     const manifest = validateManifest(JSON.parse(readFileSync7(manifestFile, "utf8")), expected);
     const artifact = artifactFor(manifest, expected);
@@ -63501,8 +63836,8 @@ function packageRequiredFiles(platform2) {
   const base2 = ["codex-package.json", "bin/codex", "bin/codex-code-mode-host", "codex-path/rg", "LICENSE", "NOTICE", "THIRD_PARTY_NOTICES.md"];
   return platform2.startsWith("linux-") ? [...base2, "codex-resources/bwrap"] : base2;
 }
-function modeFor(path) {
-  return /^(bin|codex-path|codex-resources)\//.test(path) ? 493 : 420;
+function modeFor(path3) {
+  return /^(bin|codex-path|codex-resources)\//.test(path3) ? 493 : 420;
 }
 var HEX402 = /^[0-9a-f]{40}$/;
 var HEX642 = /^[0-9a-f]{64}$/;
@@ -63635,8 +63970,8 @@ function validateManifest(raw, expected) {
   const structural = ManifestShapeSchema.safeParse(raw);
   if (!structural.success) {
     const issue2 = structural.error.issues[0];
-    const path = issue2 && issue2.path.length > 0 ? issue2.path.join(".") : "manifest";
-    throw new Error(`invalid release manifest: ${path}: ${issue2?.message ?? "malformed"}`);
+    const path3 = issue2 && issue2.path.length > 0 ? issue2.path.join(".") : "manifest";
+    throw new Error(`invalid release manifest: ${path3}: ${issue2?.message ?? "malformed"}`);
   }
   const error61 = checkBusinessRules(structural.data, expected);
   if (error61)
@@ -63678,20 +64013,20 @@ function removeHook(file2) {
   const hooks = kept.length === 0 ? rest2 : { ...rest2, SessionStart: kept };
   return { file: { ...file2, hooks }, changed: true };
 }
-function readHooksFile(path) {
-  if (!existsSync7(path))
+function readHooksFile(path3) {
+  if (!existsSync7(path3))
     return null;
   let raw;
   try {
-    raw = JSON.parse(readFileSync8(path, "utf8"));
+    raw = JSON.parse(readFileSync8(path3, "utf8"));
   } catch {
-    throw new Error(`${path}: hooks.json is not valid JSON; fix it by hand before installing the hook`);
+    throw new Error(`${path3}: hooks.json is not valid JSON; fix it by hand before installing the hook`);
   }
   if (typeof raw !== "object" || raw === null || Array.isArray(raw))
-    throw new Error(`${path}: hooks.json must be a JSON object`);
+    throw new Error(`${path3}: hooks.json must be a JSON object`);
   const o = raw;
   if (o.hooks !== undefined && (typeof o.hooks !== "object" || o.hooks === null))
-    throw new Error(`${path}: "hooks" must be an object`);
+    throw new Error(`${path3}: "hooks" must be an object`);
   return { ...raw, hooks: o.hooks ?? {} };
 }
 function installHook(hooksFile, cxBin) {
@@ -64014,12 +64349,12 @@ function promptUpdate(options) {
 import { rmSync as rmSync5 } from "node:fs";
 
 // src/codex/upstream.ts
-import { accessSync as accessSync2, constants as constants3, lstatSync as lstatSync4, readlinkSync as readlinkSync2, realpathSync as realpathSync3, statSync as statSync2 } from "node:fs";
-import { dirname as dirname9, isAbsolute as isAbsolute2, join as join13, resolve as resolve3 } from "node:path";
+import { accessSync as accessSync2, constants as constants3, lstatSync as lstatSync5, readlinkSync as readlinkSync2, realpathSync as realpathSync4, statSync as statSync4 } from "node:fs";
+import { dirname as dirname10, isAbsolute as isAbsolute2, join as join14, resolve as resolve3 } from "node:path";
 function isExecutable2(p2) {
   try {
     accessSync2(p2, constants3.X_OK);
-    return statSync2(p2).isFile();
+    return statSync4(p2).isFile();
   } catch {
     return false;
   }
@@ -64028,7 +64363,7 @@ function isManaged(p2, paths, isOurWrapper) {
   if (resolve3(p2) === resolve3(paths.patchedBin) || isOurWrapper(p2))
     return true;
   try {
-    return realpathSync3(p2) === realpathSync3(paths.patchedBin);
+    return realpathSync4(p2) === realpathSync4(paths.patchedBin);
   } catch {
     return false;
   }
@@ -64036,13 +64371,13 @@ function isManaged(p2, paths, isOurWrapper) {
 function inspectLauncher(paths, isOurWrapper) {
   let st2;
   try {
-    st2 = lstatSync4(paths.wrapperPath);
+    st2 = lstatSync5(paths.wrapperPath);
   } catch {
     return null;
   }
   if (st2.isSymbolicLink()) {
     const raw = readlinkSync2(paths.wrapperPath);
-    const target = isAbsolute2(raw) ? raw : resolve3(dirname9(paths.wrapperPath), raw);
+    const target = isAbsolute2(raw) ? raw : resolve3(dirname10(paths.wrapperPath), raw);
     if (isManaged(target, paths, isOurWrapper))
       return null;
     return { kind: "found", bin: target, launcher_restore: { kind: "symlink", target } };
@@ -64055,7 +64390,7 @@ function walkPath(paths, env3, isOurWrapper) {
   for (const dir of (env3.PATH ?? "").split(":").filter(Boolean)) {
     if (resolve3(dir) === resolve3(paths.binDir))
       continue;
-    const candidate = join13(dir, "codex");
+    const candidate = join14(dir, "codex");
     if (isExecutable2(candidate) && !isManaged(candidate, paths, isOurWrapper))
       return candidate;
   }
@@ -64091,15 +64426,15 @@ function preserveLauncherRestore(recorded, found) {
 
 // src/patch/compile.ts
 import { chmodSync as chmodSync3, mkdirSync as mkdirSync7, mkdtempSync as mkdtempSync2, rmSync as rmSync3 } from "node:fs";
-import { join as join16 } from "node:path";
+import { join as join17 } from "node:path";
 
 // src/patch/build.ts
-import { existsSync as existsSync10, lstatSync as lstatSync5, readFileSync as readFileSync10, statSync as statSync3 } from "node:fs";
-import { join as join15 } from "node:path";
+import { existsSync as existsSync10, lstatSync as lstatSync6, readFileSync as readFileSync10, statSync as statSync5 } from "node:fs";
+import { join as join16 } from "node:path";
 
 // src/patch/v8.ts
 import { existsSync as existsSync9 } from "node:fs";
-import { join as join14 } from "node:path";
+import { join as join15 } from "node:path";
 function defaultV8Target() {
   const isArm = process.arch === "arm64";
   if (process.platform === "darwin")
@@ -64130,7 +64465,7 @@ function resolveV8Env(sourceDir, run, log) {
       RUSTY_V8_SRC_BINDING_PATH: process.env.RUSTY_V8_SRC_BINDING_PATH
     };
   }
-  const v8Script = join14(sourceDir, "scripts", "codex_package", "v8.py");
+  const v8Script = join15(sourceDir, "scripts", "codex_package", "v8.py");
   if (!existsSync9(v8Script)) {
     return {};
   }
@@ -64202,10 +64537,10 @@ function headCommit(plan, run) {
 }
 function prepareCheckout(plan, run, log) {
   const git = (step, ...args) => must(step, run, log, "git", ["-C", plan.sourceDir, ...args]);
-  if (existsSync10(join15(plan.sourceDir, ".git"))) {
+  if (existsSync10(join16(plan.sourceDir, ".git"))) {
     git("fetch", "fetch", "--tags", "--filter=blob:none", "origin");
-    const snapshot = join15(plan.sourceDir, SNAPSHOT);
-    const st2 = lstatSync5(snapshot, { throwIfNoEntry: false });
+    const snapshot = join16(plan.sourceDir, SNAPSHOT);
+    const st2 = lstatSync6(snapshot, { throwIfNoEntry: false });
     if (st2) {
       const tracked = run("git", ["-C", plan.sourceDir, "ls-files", "--error-unmatch", "--", SNAPSHOT]);
       if (tracked.status !== 0) {
@@ -64232,7 +64567,7 @@ function buildPatched(plan, run, log, which, onStatus) {
   git("apply --check", "apply", "--index", "--check", plan.patchFile);
   git("apply", "apply", "--index", plan.patchFile);
   onStatus?.("patch-done", `Applied ${patchBase} cleanly`);
-  const crateDir = join15(plan.sourceDir, "codex-rs");
+  const crateDir = join16(plan.sourceDir, "codex-rs");
   const v8Env = resolveV8Env(plan.sourceDir, run, log);
   onStatus?.("build", "Compiling release binaries (cargo build --release)... Note: this full compile typically takes 10 to 20 minutes.");
   const buildStart = Date.now();
@@ -64241,8 +64576,8 @@ function buildPatched(plan, run, log, which, onStatus) {
   const buildElapsedStr = buildElapsed >= 60 ? `${Math.floor(buildElapsed / 60)}m ${buildElapsed % 60}s` : `${buildElapsed}s`;
   onStatus?.("build-done", `Release binaries compiled (codex, codex-code-mode-host in ${buildElapsedStr})`);
   const [codex, codexCodeModeHost] = TARGETS.map((name) => {
-    const bin = join15(crateDir, "target", "release", name);
-    if (!existsSync10(bin) || statSync3(bin).size === 0) {
+    const bin = join16(crateDir, "target", "release", name);
+    if (!existsSync10(bin) || statSync5(bin).size === 0) {
       throw new BuildError("cargo build", `cargo exited 0 but ${bin} is missing or empty`);
     }
     return bin;
@@ -64266,7 +64601,7 @@ function platformLabel() {
   }
 }
 function prepareCompiled(ctx, upstream, ref, onStatus) {
-  const patchFile = join16(ctx.patchesDir, ref.file);
+  const patchFile = join17(ctx.patchesDir, ref.file);
   const patchSha256 = digestOf(patchFile).sha256;
   const built = buildPatched({ tag: ref.tag, sourceDir: ctx.paths.sourceDir, patchFile }, ctx.run, ctx.log, ctx.which, onStatus);
   onStatus?.("stage", "Assembling the Codex package with upstream's packager...");
@@ -64277,9 +64612,9 @@ function prepareCompiled(ctx, upstream, ref, onStatus) {
   if (cargo === null)
     throw new Error("cargo is not on PATH");
   mkdirSync7(ctx.paths.libexecDir, { recursive: true });
-  const directory = mkdtempSync2(join16(ctx.paths.libexecDir, STAGING_PREFIX));
+  const directory = mkdtempSync2(join17(ctx.paths.libexecDir, STAGING_PREFIX));
   chmodSync3(directory, 448);
-  const tmpDir = mkdtempSync2(join16(ctx.paths.libexecDir, "download-"));
+  const tmpDir = mkdtempSync2(join17(ctx.paths.libexecDir, "download-"));
   chmodSync3(tmpDir, 448);
   let target;
   try {
@@ -64326,7 +64661,7 @@ function prepareCompiled(ctx, upstream, ref, onStatus) {
 
 // src/patch/manifest.ts
 import { readFileSync as readFileSync11 } from "node:fs";
-import { join as join17 } from "node:path";
+import { join as join18 } from "node:path";
 class ManifestError extends Error {
   name = "ManifestError";
 }
@@ -64345,7 +64680,7 @@ var isCandidate = (c) => {
   return parsed !== null && parsed.pre === null;
 };
 function loadManifest(patchesDir) {
-  const file2 = join17(patchesDir, "manifest.json");
+  const file2 = join18(patchesDir, "manifest.json");
   try {
     const raw = JSON.parse(readFileSync11(file2, "utf8"));
     const m2 = raw;
@@ -64406,9 +64741,9 @@ function isCodexVersionSupported(m2, version2) {
 }
 
 // src/patch/wrapper.ts
-import { chmodSync as chmodSync4, closeSync as closeSync2, existsSync as existsSync11, lstatSync as lstatSync6, mkdirSync as mkdirSync8, openSync as openSync2, readFileSync as readFileSync12, readSync, renameSync as renameSync5, rmSync as rmSync4, statSync as statSync4, writeFileSync as writeFileSync3 } from "node:fs";
+import { chmodSync as chmodSync4, closeSync as closeSync2, existsSync as existsSync11, lstatSync as lstatSync7, mkdirSync as mkdirSync8, openSync as openSync2, readFileSync as readFileSync12, readSync, renameSync as renameSync5, rmSync as rmSync4, statSync as statSync6, writeFileSync as writeFileSync3 } from "node:fs";
 import { randomBytes as randomBytes3 } from "node:crypto";
-import { join as join18 } from "node:path";
+import { join as join19 } from "node:path";
 var WRAPPER_MARKER = "# cxstatusline-wrapper v1";
 var WRAPPER_MARKER_V2 = "# cxstatusline-wrapper v2";
 var WRAPPER_MARKERS = [WRAPPER_MARKER, WRAPPER_MARKER_V2];
@@ -64446,9 +64781,9 @@ function generationWrapperScript(currentGeneration, cxBin) {
   ].join(`
 `);
 }
-function isOurWrapper(path) {
+function isOurWrapper(path3) {
   try {
-    const fd = openSync2(path, "r");
+    const fd = openSync2(path3, "r");
     try {
       const header = Buffer.alloc(256);
       const size2 = readSync(fd, header, 0, header.length, 0);
@@ -64464,18 +64799,18 @@ function isOurWrapper(path) {
 }
 function isSymlink(p2) {
   try {
-    return lstatSync6(p2).isSymbolicLink();
+    return lstatSync7(p2).isSymbolicLink();
   } catch {
     return false;
   }
 }
 function stageExecutable(target, write) {
-  mkdirSync8(join18(target, ".."), { recursive: true });
+  mkdirSync8(join19(target, ".."), { recursive: true });
   const tmp = `${target}.tmp-${process.pid}`;
   try {
     write(tmp);
     chmodSync4(tmp, 493);
-    if (statSync4(tmp).size === 0)
+    if (statSync6(tmp).size === 0)
       throw new Error(`${target} staged as an empty file`);
     return tmp;
   } catch (e) {
@@ -65267,7 +65602,7 @@ async function runUpdate(ctx, opts = {}, transport = {}) {
   return runInstall(ctx, { compile: opts.compile ?? false, codexVersion: target }, transport);
 }
 function appendLog(file2, line) {
-  mkdirSync9(join19(file2, ".."), { recursive: true });
+  mkdirSync9(join20(file2, ".."), { recursive: true });
   appendFileSync(file2, `${new Date().toISOString()} ${line}
 `);
 }
@@ -65424,7 +65759,7 @@ async function promptCodexVersion(options) {
 // src/hook/run.ts
 import { appendFileSync as appendFileSync2, closeSync as closeSync3, existsSync as existsSync12, mkdirSync as mkdirSync10, openSync as openSync3 } from "node:fs";
 import { spawn as spawn2 } from "node:child_process";
-import { dirname as dirname10 } from "node:path";
+import { dirname as dirname11 } from "node:path";
 var HOOK_SOURCES = ["startup", "resume", "clear"];
 function parseHookInput(stdin) {
   try {
@@ -65553,7 +65888,7 @@ function realHookDeps() {
     spawnDetached(cxBin, args, logFile) {
       let fd;
       try {
-        mkdirSync10(dirname10(logFile), { recursive: true });
+        mkdirSync10(dirname11(logFile), { recursive: true });
         fd = openSync3(logFile, "a");
         const child = spawn2(cxBin, args, { detached: true, stdio: ["ignore", fd, fd], env: process.env });
         child.on("error", (err) => {
@@ -65576,8 +65911,8 @@ function realHookDeps() {
 }
 
 // src/commands/doctor.ts
-import { existsSync as existsSync14, lstatSync as lstatSync7, readFileSync as readFileSync14, readlinkSync as readlinkSync4, readdirSync as readdirSync3 } from "node:fs";
-import { join as join21 } from "node:path";
+import { existsSync as existsSync14, lstatSync as lstatSync8, readFileSync as readFileSync14, readlinkSync as readlinkSync4, readdirSync as readdirSync3 } from "node:fs";
+import { join as join22 } from "node:path";
 
 // src/utils/format.ts
 function formatDuration2(ms2) {
@@ -65594,16 +65929,16 @@ function formatDuration2(ms2) {
 
 // src/commands/doctor-generation.ts
 import { existsSync as existsSync13, readFileSync as readFileSync13, readlinkSync as readlinkSync3 } from "node:fs";
-import { dirname as dirname11, isAbsolute as isAbsolute3, join as join20, resolve as resolve4 } from "node:path";
+import { dirname as dirname12, isAbsolute as isAbsolute3, join as join21, resolve as resolve4 } from "node:path";
 var line = (key, value, ok = null) => ({ key, value, ok });
 var NO_GENERATION = "n/a (no active generation)";
 function resolvePointerTarget(paths, raw) {
-  return isAbsolute3(raw) ? raw : resolve4(dirname11(paths.currentGeneration), raw);
+  return isAbsolute3(raw) ? raw : resolve4(dirname12(paths.currentGeneration), raw);
 }
 function computeGenerationLine(paths, pointer) {
   const dir = activeGeneration(paths);
   if (dir !== null) {
-    if (!isGenerationDir(dir) && !existsSync13(join20(dir, INSTALLATION_FILE)))
+    if (!isGenerationDir(dir) && !existsSync13(join21(dir, INSTALLATION_FILE)))
       return { line: line("generation", "foreign", false), dir: null };
     return { line: line("generation", dir, true), dir };
   }
@@ -65715,7 +66050,7 @@ function legalLine(record2, dir) {
     return line("legal", "n/a (compiled build)", null);
   if (!dir)
     return line("legal", NO_GENERATION, null);
-  const missing = GENERATION_LEGAL_FILES.filter((f2) => !existsSync13(join20(dir, f2)));
+  const missing = GENERATION_LEGAL_FILES.filter((f2) => !existsSync13(join21(dir, f2)));
   return missing.length === 0 ? line("legal", "present", true) : line("legal", `missing: ${missing.join(", ")}`, false);
 }
 var DAEMON_SINCE = parseSemver("0.156.0");
@@ -65731,17 +66066,17 @@ function packageLayoutLine(record2, dir) {
   return problem === null ? line("package_layout", `ok (${record2.provenance.target})`, true) : line("package_layout", problem, false);
 }
 function daemonPackageLine(paths, record2) {
-  const current = join20(paths.codexHome, "packages", "app-server-daemon", "current");
+  const current = join21(paths.codexHome, "packages", "app-server-daemon", "current");
   let target;
   try {
     target = readlinkSync3(current);
   } catch {
     return line("daemon_package", "none", null);
   }
-  const dir = isAbsolute3(target) ? target : resolve4(dirname11(current), target);
+  const dir = isAbsolute3(target) ? target : resolve4(dirname12(current), target);
   let version2 = "unknown";
   try {
-    const meta3 = JSON.parse(readFileSync13(join20(dir, "codex-package.json"), "utf8"));
+    const meta3 = JSON.parse(readFileSync13(join21(dir, "codex-package.json"), "utf8"));
     if (typeof meta3.version === "string")
       version2 = meta3.version;
   } catch {}
@@ -65918,7 +66253,7 @@ function wrapperLine(ctx) {
   const p2 = ctx.paths.wrapperPath;
   let st2;
   try {
-    st2 = lstatSync7(p2);
+    st2 = lstatSync8(p2);
   } catch {
     return line2("wrapper", "absent");
   }
@@ -65973,7 +66308,7 @@ function commandCacheLine(ctx) {
     let oldestMtime = Infinity;
     for (const f2 of entries) {
       try {
-        const st2 = lstatSync7(join21(dir, f2));
+        const st2 = lstatSync8(join22(dir, f2));
         if (st2.mtimeMs < oldestMtime)
           oldestMtime = st2.mtimeMs;
       } catch {}
@@ -66144,11 +66479,11 @@ function runPolicy(ctx, argv, io2) {
 }
 
 // src/commands/revert.ts
-import { existsSync as existsSync15, lstatSync as lstatSync8, readFileSync as readFileSync15, readdirSync as readdirSync4, readlinkSync as readlinkSync5, rmSync as rmSync7, symlinkSync as symlinkSync2 } from "node:fs";
-import { basename as basename2, dirname as dirname12, isAbsolute as isAbsolute4, join as join22, resolve as resolve5 } from "node:path";
+import { existsSync as existsSync15, lstatSync as lstatSync9, readFileSync as readFileSync15, readdirSync as readdirSync4, readlinkSync as readlinkSync5, rmSync as rmSync7, symlinkSync as symlinkSync2 } from "node:fs";
+import { basename as basename2, dirname as dirname13, isAbsolute as isAbsolute4, join as join23, resolve as resolve5 } from "node:path";
 function safeIsSymlink(p2) {
   try {
-    return lstatSync8(p2).isSymbolicLink();
+    return lstatSync9(p2).isSymbolicLink();
   } catch {
     return false;
   }
@@ -66192,24 +66527,24 @@ function removeStagingDebris(ctx, actions) {
     return;
   const debris = readdirSync4(libexecDir).filter((n) => OWNED_LIBEXEC_PREFIXES.some((p2) => n.startsWith(p2)));
   for (const name of debris)
-    rmSync7(join22(libexecDir, name), { recursive: true, force: true });
+    rmSync7(join23(libexecDir, name), { recursive: true, force: true });
   if (debris.length > 0) {
     actions.push(`removed ${debris.length} leftover staging entr${debris.length === 1 ? "y" : "ies"} from ${libexecDir}`);
   }
 }
 function daemonCopyNotice(ctx, actions) {
-  const root = join22(ctx.paths.codexHome, "packages", "app-server-daemon");
-  const current = join22(root, "current");
+  const root = join23(ctx.paths.codexHome, "packages", "app-server-daemon");
+  const current = join23(root, "current");
   let target;
   try {
     target = readlinkSync5(current);
   } catch {
     return;
   }
-  const dir = isAbsolute4(target) ? target : resolve5(dirname12(current), target);
+  const dir = isAbsolute4(target) ? target : resolve5(dirname13(current), target);
   let ours = false;
   try {
-    const record2 = JSON.parse(readFileSync15(join22(dir, INSTALLATION_FILE), "utf8"));
+    const record2 = JSON.parse(readFileSync15(join23(dir, INSTALLATION_FILE), "utf8"));
     ours = typeof record2?.provenance?.cxVersion === "string";
   } catch {
     return;
@@ -66369,6 +66704,7 @@ var HideStatesEditor = ({ widget, states, onComplete, onCancel }) => {
   const [selectedIndex, setSelectedIndex] = import_react42.useState(0);
   const [enabledKeys, setEnabledKeys] = import_react42.useState(() => getEnabledHideStates(widget, states));
   use_input_default((input2, key) => {
+    const shortcut = getPlainInput(input2, key);
     if (key.return) {
       onComplete(setEnabledHideStates(widget, states, enabledKeys));
     } else if (key.escape) {
@@ -66377,7 +66713,7 @@ var HideStatesEditor = ({ widget, states, onComplete, onCancel }) => {
       setSelectedIndex(selectedIndex - 1 < 0 ? states.length - 1 : selectedIndex - 1);
     } else if (key.downArrow && states.length > 0) {
       setSelectedIndex(selectedIndex + 1 > states.length - 1 ? 0 : selectedIndex + 1);
-    } else if (input2 === " ") {
+    } else if (shortcut === " ") {
       const state = states[selectedIndex];
       if (state) {
         setEnabledKeys(enabledKeys.includes(state.key) ? enabledKeys.filter((enabledKey) => enabledKey !== state.key) : [...enabledKeys, state.key]);
@@ -66424,6 +66760,48 @@ var HideStatesEditor = ({ widget, states, onComplete, onCancel }) => {
   }, undefined, true, undefined, this);
 };
 
+// src/tui/components/LabelEditor.tsx
+var jsx_dev_runtime15 = __toESM(require_jsx_dev_runtime(), 1);
+var LabelEditor = ({ widget, defaultLabel, onComplete, onCancel }) => {
+  const { getText, display, handleInput } = useTextCursor(getLabel(widget, defaultLabel));
+  use_input_default((input2, key) => {
+    if (key.return) {
+      onComplete(setLabel(widget, getText()));
+    } else if (key.escape) {
+      onCancel();
+    } else if (key.tab) {
+      onComplete(clearLabel(widget));
+    } else {
+      handleInput(input2, key);
+    }
+  });
+  return /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+    flexDirection: "column",
+    children: [
+      /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+        bold: true,
+        children: "Label"
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+        dimColor: true,
+        children: "←→ move cursor, Ctrl+←→ jump to start/end, Tab reset to default, Enter save, ESC cancel"
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+        marginTop: 1,
+        children: /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+          children: [
+            `"${display}"`,
+            /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+              dimColor: true,
+              children: ` (default: ${JSON.stringify(defaultLabel)})`
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this)
+      }, undefined, false, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
+};
+
 // src/tui/components/items-editor/input-handlers.ts
 function customKeybindsFor(impl, item) {
   if (!impl || !item || item.type === "separator" || item.type === "flex-separator")
@@ -66435,6 +66813,9 @@ function customKeybindsFor(impl, item) {
   if ((impl.getHideableStates?.().length ?? 0) > 0 && !keybinds.some((k2) => k2.action === EDIT_HIDE_STATES_ACTION)) {
     keybinds.push(getHideKeybind());
   }
+  if (impl.getLabelPrefix && !item.rawValue) {
+    keybinds.push(getLabelKeybind());
+  }
   return keybinds;
 }
 function filterWidgetCatalog(catalog, category, query) {
@@ -66565,6 +66946,7 @@ function handleNormalInputMode({
   getWidgetImpl,
   setCustomEditorWidget
 }) {
+  const shortcut = getPlainInput(input2, key);
   if (key.upArrow && widgets.length) {
     setSelectedIndex(selectedIndex === 0 ? widgets.length - 1 : selectedIndex - 1);
   } else if (key.downArrow && widgets.length) {
@@ -66573,16 +66955,16 @@ function handleNormalInputMode({
     openWidgetPicker("change");
   } else if (key.return && widgets.length) {
     setMoveMode(true);
-  } else if (input2 === "a") {
+  } else if (shortcut === "a") {
     openWidgetPicker("add");
-  } else if (input2 === "i") {
+  } else if (shortcut === "i") {
     openWidgetPicker("insert");
-  } else if (input2 === "d" && widgets.length) {
+  } else if (shortcut === "d" && widgets.length) {
     const next = widgets.filter((_2, index) => index !== selectedIndex);
     onUpdate(next);
     if (selectedIndex >= next.length && selectedIndex > 0)
       setSelectedIndex(selectedIndex - 1);
-  } else if (input2 === "k" && widgets.length) {
+  } else if (shortcut === "k" && widgets.length) {
     const current = widgets[selectedIndex];
     if (!current)
       return;
@@ -66594,33 +66976,39 @@ function handleNormalInputMode({
     const index = selectedIndex + 1;
     onUpdate([...widgets.slice(0, index), clone3, ...widgets.slice(index)]);
     setSelectedIndex(index);
-  } else if (input2 === "c" && widgets.length) {
+  } else if (shortcut === "c" && widgets.length) {
     setShowClearConfirm(true);
-  } else if (input2 === " " && widgets[selectedIndex]?.type === "separator") {
+  } else if (shortcut === " " && widgets[selectedIndex]?.type === "separator") {
     const current = widgets[selectedIndex];
     const index = Math.max(0, separatorChars.indexOf(current.character ?? "|"));
     const character = separatorChars[(index + 1) % separatorChars.length];
     onUpdate(widgets.map((widget, itemIndex) => itemIndex === selectedIndex ? { ...widget, character } : widget));
-  } else if (input2 === "r" && widgets.length) {
+  } else if (shortcut === "r" && widgets.length) {
     const current = widgets[selectedIndex];
     if (current && current.type !== "separator" && current.type !== "flex-separator") {
       onUpdate(widgets.map((widget, index) => index === selectedIndex ? { ...widget, rawValue: !widget.rawValue } : widget));
     }
-  } else if (input2 === "m" && widgets.length) {
+  } else if (shortcut === "m" && widgets.length) {
     const current = widgets[selectedIndex];
-    if (current && selectedIndex < widgets.length - 1 && current.type !== "separator" && current.type !== "flex-separator") {
-      const merge3 = current.merge === undefined ? true : current.merge === true ? "no-padding" : undefined;
-      onUpdate(widgets.map((widget, index) => {
-        if (index !== selectedIndex)
-          return widget;
-        if (merge3 === undefined) {
-          const { merge: _2, ...withoutMerge } = widget;
-          return withoutMerge;
-        }
-        return { ...widget, merge: merge3 };
-      }));
+    if (current && current.type !== "separator" && current.type !== "flex-separator") {
+      const isLastWidget = selectedIndex === widgets.length - 1;
+      if (isLastWidget && current.merge) {
+        const { merge: _2, ...withoutMerge } = current;
+        onUpdate(widgets.map((w2, i) => i === selectedIndex ? withoutMerge : w2));
+      } else if (!isLastWidget) {
+        const merge3 = current.merge === undefined ? true : current.merge === true ? "no-padding" : undefined;
+        onUpdate(widgets.map((widget, index) => {
+          if (index !== selectedIndex)
+            return widget;
+          if (merge3 === undefined) {
+            const { merge: _2, ...withoutMerge } = widget;
+            return withoutMerge;
+          }
+          return { ...widget, merge: merge3 };
+        }));
+      }
     }
-  } else if (input2 === "x" && widgets.length) {
+  } else if (shortcut === "x" && widgets.length) {
     const current = widgets[selectedIndex];
     if (current && current.type !== "separator" && current.type !== "flex-separator") {
       onUpdate(widgets.map((widget, index) => {
@@ -66633,15 +67021,15 @@ function handleNormalInputMode({
         return { ...widget, excludeFromAutoAlign: true };
       }));
     }
-  } else if (input2 && !key.ctrl && !key.meta && widgets.length) {
+  } else if (shortcut && widgets.length) {
     const current = widgets[selectedIndex];
     if (!current)
       return;
     const impl = getWidgetImpl(current.type);
-    const keybind = customKeybindsFor(impl, current).find((entry) => entry.key === input2);
+    const keybind = customKeybindsFor(impl, current).find((entry) => entry.key === shortcut);
     if (!impl || !keybind)
       return;
-    if (keybind.action === EDIT_HIDE_STATES_ACTION) {
+    if (keybind.action === EDIT_HIDE_STATES_ACTION || keybind.action === EDIT_LABEL_ACTION) {
       setCustomEditorWidget({ widget: current, impl, action: keybind.action });
       return;
     }
@@ -66661,7 +67049,7 @@ function handleNormalInputMode({
 }
 
 // src/tui/components/ItemsEditor.tsx
-var jsx_dev_runtime15 = __toESM(require_jsx_dev_runtime(), 1);
+var jsx_dev_runtime16 = __toESM(require_jsx_dev_runtime(), 1);
 function displayWidgetType(type) {
   if (type === "flex-separator")
     return "Flex Separator";
@@ -66693,11 +67081,14 @@ function rowLabel(widget) {
   if (!impl)
     return displayWidgetType(widget.type);
   const { displayText, modifierText } = impl.getEditorDisplay(widget);
+  const labelModifierText = impl?.getLabelPrefix && !widget.rawValue ? getLabelModifierText(widget) : undefined;
   const numberFormatModifierText = impl.supportsNumberFormat?.() ? getNumberFormatModifierText(widget) : undefined;
   const hideModifierText = impl ? getHideModifierText(widget, impl.getHideableStates?.() ?? []) : undefined;
   const parts = [displayText];
   if (modifierText)
     parts.push(modifierText);
+  if (labelModifierText)
+    parts.push(labelModifierText);
   if (numberFormatModifierText)
     parts.push(numberFormatModifierText);
   if (hideModifierText)
@@ -66736,7 +67127,7 @@ function ItemsEditor({ widgets, onUpdate, onBack, lineNumber, settings: _setting
     if (widgetPicker.action === "change") {
       const current2 = widgets[selectedIndex];
       if (current2)
-        onUpdate(widgets.map((widget, index) => index === selectedIndex ? { ...widget, type } : widget));
+        onUpdate(widgets.map((widget, index) => index === selectedIndex ? widget.type === type ? widget : { ...clearLabel(widget), type } : widget));
     } else {
       const insertIndex = widgetPicker.action === "add" ? selectedIndex + 1 : selectedIndex;
       const index = widgets.length ? insertIndex : 0;
@@ -66775,7 +67166,7 @@ function ItemsEditor({ widgets, onUpdate, onBack, lineNumber, settings: _setting
     });
   });
   if (customEditor?.action === EDIT_HIDE_STATES_ACTION) {
-    return /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(HideStatesEditor, {
+    return /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(HideStatesEditor, {
       widget: customEditor.widget,
       states: customEditor.impl.getHideableStates?.() ?? [],
       onComplete: (updated) => {
@@ -66785,6 +67176,17 @@ function ItemsEditor({ widgets, onUpdate, onBack, lineNumber, settings: _setting
       onCancel: () => setCustomEditor(null)
     }, undefined, false, undefined, this);
   }
+  if (customEditor?.action === EDIT_LABEL_ACTION && customEditor.impl.getLabelPrefix) {
+    return /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(LabelEditor, {
+      widget: customEditor.widget,
+      defaultLabel: customEditor.impl.getLabelPrefix(customEditor.widget),
+      onComplete: (updated) => {
+        onUpdate(widgets.map((widget, index) => index === selectedIndex ? updated : widget));
+        setCustomEditor(null);
+      },
+      onCancel: () => setCustomEditor(null)
+    }, undefined, false, undefined, this);
+  }
   if (customEditor?.impl.renderEditor) {
     const editor = customEditor.impl.renderEditor({
       widget: customEditor.widget,
@@ -66795,15 +67197,15 @@ function ItemsEditor({ widgets, onUpdate, onBack, lineNumber, settings: _setting
       },
       onCancel: () => setCustomEditor(null)
     });
-    return editor ?? /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+    return editor ?? /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
       children: "Unknown editor"
     }, undefined, false, undefined, this);
   }
   if (showClearConfirm) {
-    return /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
           bold: true,
           children: [
             "Clear every widget from Line ",
@@ -66811,7 +67213,7 @@ function ItemsEditor({ widgets, onUpdate, onBack, lineNumber, settings: _setting
             "?"
           ]
         }, undefined, true, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(ConfirmDialog, {
+        /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(ConfirmDialog, {
           inline: true,
           onConfirm: () => {
             onUpdate([]);
@@ -66827,36 +67229,36 @@ function ItemsEditor({ widgets, onUpdate, onBack, lineNumber, settings: _setting
     const topLevelSearch = widgetPicker.level === "category" && widgetPicker.categoryQuery.trim().length > 0;
     const query = topLevelSearch ? widgetPicker.categoryQuery : widgetPicker.widgetQuery;
     const entries = filterWidgetCatalog(widgetCatalog, topLevelSearch ? "All" : widgetPicker.selectedCategory ?? "All", query);
-    return /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
           bold: true,
           children: widgetPicker.action === "change" ? "Change Widget" : "Add Widget"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
           dimColor: true,
           children: widgetPicker.level === "category" ? "Type to search; Enter to choose; Escape to go back" : "Type to search; Enter to add; Escape to go back"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
           children: `Search: ${query}`
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+        /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
           marginTop: 1,
           flexDirection: "column",
-          children: widgetPicker.level === "category" && !topLevelSearch ? widgetCategories.map((category) => /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+          children: widgetPicker.level === "category" && !topLevelSearch ? widgetCategories.map((category) => /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
             ...category === widgetPicker.selectedCategory && { color: "green" },
             children: [
               category === widgetPicker.selectedCategory ? "▶  " : "   ",
               category
             ]
-          }, category, true, undefined, this)) : entries.length ? entries.map((entry) => /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+          }, category, true, undefined, this)) : entries.length ? entries.map((entry) => /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
             ...entry.type === widgetPicker.selectedType && { color: "green" },
             children: [
               entry.type === widgetPicker.selectedType ? "▶  " : "   ",
               entry.displayName
             ]
-          }, entry.type, true, undefined, this)) : /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+          }, entry.type, true, undefined, this)) : /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
             dimColor: true,
             children: "No widgets match this search."
           }, undefined, false, undefined, this)
@@ -66867,33 +67269,33 @@ function ItemsEditor({ widgets, onUpdate, onBack, lineNumber, settings: _setting
   const current = widgets[selectedIndex];
   const customLabels = customKeybindsFor(current ? getWidgetImpl(current.type) : null, current).map((entry) => entry.label).join(", ");
   const normalHelp = "↑↓ select, ←→ change, Enter move, (a)dd, (i)nsert, (d)elete, (k)opy, (c)lear, Escape back";
-  return /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
         bold: true,
         children: [
           `Edit Line ${lineNumber}`,
-          moveMode && /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+          moveMode && /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
             color: "blue",
             children: " [MOVE MODE]"
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
         dimColor: true,
         children: moveMode ? "↑↓ to move, Escape or Enter to finish" : customLabels ? `${normalHelp}, ${customLabels}` : normalHelp
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
         marginTop: 1,
         flexDirection: "column",
-        children: widgets.length ? widgets.map((widget, index) => /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+        children: widgets.length ? widgets.map((widget, index) => /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
           ...index === selectedIndex && { color: "green" },
           children: [
             index === selectedIndex ? "▶  " : "   ",
             rowLabel(widget)
           ]
-        }, widget.id, true, undefined, this)) : /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+        }, widget.id, true, undefined, this)) : /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
           dimColor: true,
           children: "No widgets yet. Press (a) to add one."
         }, undefined, false, undefined, this)
@@ -66952,7 +67354,7 @@ function cycleWidgetColor({ widgets, widgetId, direction, editingBackground, col
 }
 
 // src/tui/components/ColorMenu.tsx
-var jsx_dev_runtime16 = __toESM(require_jsx_dev_runtime(), 1);
+var jsx_dev_runtime17 = __toESM(require_jsx_dev_runtime(), 1);
 function isTextInput(input2, key) {
   return Boolean(input2 && !key.ctrl && !key.meta && !key.tab);
 }
@@ -66997,6 +67399,7 @@ function ColorMenu({ widgets, lineIndex, settings, onUpdate, onBack }) {
         setAnsiInput(ansiInput + input2);
       return;
     }
+    const shortcut = getPlainInput(input2, key);
     if (key.escape) {
       onBack();
     } else if (key.upArrow && colorable.length) {
@@ -67006,34 +67409,37 @@ function ColorMenu({ widgets, lineIndex, settings, onUpdate, onBack }) {
     } else if (key.leftArrow || key.rightArrow) {
       if (selected)
         onUpdate(cycleWidgetColor({ widgets, widgetId: selected.id, direction: key.rightArrow ? "right" : "left", editingBackground, colors, backgroundColors: backgrounds }));
-    } else if (input2.toLowerCase() === "f") {
+    } else if (shortcut.toLowerCase() === "f") {
       setEditingBackground((value) => !value);
-    } else if (input2.toLowerCase() === "b" && selected) {
+    } else if (shortcut.toLowerCase() === "b" && selected) {
       onUpdate(toggleWidgetBold(widgets, selected.id));
-    } else if (input2.toLowerCase() === "d" && selected) {
+    } else if (shortcut.toLowerCase() === "d" && selected) {
       onUpdate(cycleWidgetDim(widgets, selected.id));
-    } else if (input2.toLowerCase() === "r" && selected) {
+    } else if (shortcut.toLowerCase() === "r" && selected) {
       onUpdate(resetWidgetStyling(widgets, selected.id));
-    } else if (input2.toLowerCase() === "c") {
+    } else if (shortcut.toLowerCase() === "c") {
       setClearConfirm(true);
-    } else if (input2.toLowerCase() === "s" && !settings.powerline.enabled && !settings.defaultSeparator) {
+    } else if (shortcut.toLowerCase() === "s" && !settings.powerline.enabled && !settings.defaultSeparator) {
+      const highlightedWidget = colorable[selectedIndex];
       setShowSeparators((value) => !value);
-      setSelectedIndex(0);
-    } else if (input2.toLowerCase() === "h" && settings.colorLevel === 3 && selected) {
+      if (showSeparators && highlightedWidget?.type === "separator") {
+        setSelectedIndex(0);
+      }
+    } else if (shortcut.toLowerCase() === "h" && settings.colorLevel === 3 && selected) {
       setHexInput("");
-    } else if (input2.toLowerCase() === "a" && settings.colorLevel === 2 && selected) {
+    } else if (shortcut.toLowerCase() === "a" && settings.colorLevel === 2 && selected) {
       setAnsiInput("");
     }
   });
   if (clearConfirm) {
-    return /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
           bold: true,
           children: "Clear all widget styling?"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(ConfirmDialog, {
+        /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(ConfirmDialog, {
           inline: true,
           onConfirm: () => {
             onUpdate(clearAllWidgetStyling(widgets));
@@ -67045,14 +67451,14 @@ function ColorMenu({ widgets, lineIndex, settings, onUpdate, onBack }) {
     }, undefined, true, undefined, this);
   }
   if (!colorable.length) {
-    return /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
           bold: true,
           children: `Colors — Line ${lineIndex + 1}`
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
           dimColor: true,
           children: "No colorable widgets. Press Escape to go back."
         }, undefined, false, undefined, this)
@@ -67060,38 +67466,38 @@ function ColorMenu({ widgets, lineIndex, settings, onUpdate, onBack }) {
     }, undefined, true, undefined, this);
   }
   const inputMode = hexInput !== null ? `Hex: #${hexInput}` : ansiInput !== null ? `ANSI 256: ${ansiInput}` : null;
-  return /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
         bold: true,
         children: [
           `Colors — Line ${lineIndex + 1}`,
-          editingBackground && /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+          editingBackground && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
             color: "yellow",
             children: " [Background]"
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      inputMode ? /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+      inputMode ? /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
         children: [
           inputMode,
-          /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
             dimColor: true,
             children: "  Enter to apply, Escape to cancel"
           }, undefined, false, undefined, this)
         ]
-      }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+      }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
         dimColor: true,
         children: `↑↓ select, ←→ cycle ${editingBackground ? "background" : "foreground"}, (f)g/bg, (b)old, (d)im, (r)eset, (c)lear${settings.colorLevel === 3 ? ", (h)ex" : settings.colorLevel === 2 ? ", (a)nsi256" : ""}, Escape back`
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
         marginTop: 1,
         flexDirection: "column",
         children: colorable.map((widget, index) => {
           const label = displayWidgetType(widget.type);
           const styled = applyColors(label, widget.color, widget.backgroundColor, widget.bold, getColorLevelString(settings.colorLevel), widget.dim);
-          return /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+          return /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
             ...index === selectedIndex && { color: "green" },
             children: [
               index === selectedIndex ? "▶  " : "   ",
@@ -67100,7 +67506,7 @@ function ColorMenu({ widgets, lineIndex, settings, onUpdate, onBack }) {
           }, widget.id, true, undefined, this);
         })
       }, undefined, false, undefined, this),
-      !settings.powerline.enabled && !settings.defaultSeparator && /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+      !settings.powerline.enabled && !settings.defaultSeparator && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
         dimColor: true,
         children: `(s)how separators: ${showSeparators ? "ON" : "OFF"}`
       }, undefined, false, undefined, this)
@@ -67110,15 +67516,15 @@ function ColorMenu({ widgets, lineIndex, settings, onUpdate, onBack }) {
 
 // src/tui/components/ExportConfigDialog.tsx
 var import_react45 = __toESM(require_react(), 1);
-var jsx_dev_runtime17 = __toESM(require_jsx_dev_runtime(), 1);
+var jsx_dev_runtime18 = __toESM(require_jsx_dev_runtime(), 1);
 function acceptsText(input2, key) {
   return Boolean(input2 && !key.ctrl && !key.meta && !key.tab);
 }
 function ExportConfigDialog({ initialPath, onExport, onCancel }) {
-  const [path, setPath] = import_react45.useState(initialPath);
+  const [path3, setPath] = import_react45.useState(initialPath);
   use_input_default((input2, key) => {
     if (key.return)
-      onExport(path);
+      onExport(path3);
     else if (key.escape)
       onCancel();
     else if (key.backspace || key.delete)
@@ -67126,27 +67532,27 @@ function ExportConfigDialog({ initialPath, onExport, onCancel }) {
     else if (acceptsText(input2, key))
       setPath((current) => current + input2);
   });
-  return /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
         bold: true,
         children: "Export Config"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
         dimColor: true,
         children: "Enter the file path to export your configuration to:"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
         children: [
-          `Path: ${path}`,
-          /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+          `Path: ${path3}`,
+          /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
             inverse: true,
             children: " "
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
         dimColor: true,
         children: "Enter to confirm, Escape to cancel"
       }, undefined, false, undefined, this)
@@ -67156,7 +67562,7 @@ function ExportConfigDialog({ initialPath, onExport, onCancel }) {
 
 // src/tui/components/GlobalOverridesMenu.tsx
 var import_react46 = __toESM(require_react(), 1);
-var jsx_dev_runtime18 = __toESM(require_jsx_dev_runtime(), 1);
+var jsx_dev_runtime19 = __toESM(require_jsx_dev_runtime(), 1);
 function acceptsText2(input2, key) {
   return Boolean(input2 && !key.ctrl && !key.meta && !key.tab);
 }
@@ -67284,49 +67690,50 @@ function GlobalOverridesMenu({ settings, onUpdate, onBack }) {
       }
       return;
     }
+    const shortcut = getPlainInput(input2, key);
     if (key.escape)
       onBack();
-    else if (input2.toLowerCase() === "n") {
+    else if (shortcut.toLowerCase() === "n") {
       setNumberFormatMode(true);
       setNumberFormatKindIndex(0);
-    } else if (input2.toLowerCase() === "p") {
+    } else if (shortcut.toLowerCase() === "p") {
       setValue(settings.defaultPadding ?? "");
       setEditing("padding");
-    } else if (input2.toLowerCase() === "s" && !powerline) {
+    } else if (shortcut.toLowerCase() === "s" && !powerline) {
       setValue(settings.defaultSeparator ?? "");
       setEditing("separator");
-    } else if (input2.toLowerCase() === "i" && !powerline)
+    } else if (shortcut.toLowerCase() === "i" && !powerline)
       onUpdate({ ...settings, inheritSeparatorColors: !settings.inheritSeparatorColors });
-    else if (input2.toLowerCase() === "o")
+    else if (shortcut.toLowerCase() === "o")
       onUpdate({ ...settings, globalBold: !settings.globalBold });
-    else if (input2.toLowerCase() === "m")
+    else if (shortcut.toLowerCase() === "m")
       onUpdate({ ...settings, minimalistMode: !settings.minimalistMode });
-    else if (input2.toLowerCase() === "f")
+    else if (shortcut.toLowerCase() === "f")
       onUpdate({ ...settings, overrideForegroundColor: cycle(foregrounds, settings.overrideForegroundColor) });
-    else if (input2.toLowerCase() === "g") {
+    else if (shortcut.toLowerCase() === "g") {
       setGradientMode(true);
       setGradientIndex(0);
-    } else if (input2.toLowerCase() === "x")
+    } else if (shortcut.toLowerCase() === "x")
       onUpdate({ ...settings, overrideForegroundColor: undefined });
-    else if (input2.toLowerCase() === "b" && !powerline)
+    else if (shortcut.toLowerCase() === "b" && !powerline)
       onUpdate({ ...settings, overrideBackgroundColor: cycle(backgrounds, settings.overrideBackgroundColor) });
-    else if (input2.toLowerCase() === "c" && !powerline)
+    else if (shortcut.toLowerCase() === "c" && !powerline)
       onUpdate({ ...settings, overrideBackgroundColor: undefined });
-    else if (input2.toLowerCase() === "d") {
+    else if (shortcut.toLowerCase() === "d") {
       const options = DefaultPaddingSideSchema.options;
       const index = Math.max(0, options.indexOf(settings.defaultPaddingSide));
       onUpdate({ ...settings, defaultPaddingSide: options[(index + 1) % options.length] ?? "both" });
     }
   });
   if (confirmSeparator) {
-    return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
           color: "yellow",
           children: "Setting a default separator removes manual separators. Continue?"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(ConfirmDialog, {
+        /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(ConfirmDialog, {
           inline: true,
           onConfirm: () => {
             onUpdate({ ...settings, defaultSeparator: value, lines: settings.lines.map((line3) => line3.filter((item) => item.type !== "separator")) });
@@ -67343,30 +67750,30 @@ function GlobalOverridesMenu({ settings, onUpdate, onBack }) {
   }
   if (gradientMode) {
     if (gradientStep) {
-      return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+      return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
         flexDirection: "column",
         children: [
-          /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
             bold: true,
             children: "Custom Gradient — Override FG Color"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
             children: gradientStep === "start" ? "Enter START hex color:" : "Enter END hex color:"
           }, undefined, false, undefined, this),
-          gradientStep === "end" && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+          gradientStep === "end" && /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
             dimColor: true,
             children: `Start: #${gradientStart}`
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
             children: [
               `#${gradientInput}`,
-              /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
                 dimColor: true,
                 children: "_".repeat(6 - gradientInput.length)
               }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
             dimColor: true,
             children: "Enter to continue, Escape to go back"
           }, undefined, false, undefined, this)
@@ -67374,28 +67781,28 @@ function GlobalOverridesMenu({ settings, onUpdate, onBack }) {
       }, undefined, true, undefined, this);
     }
     const level = getColorLevelString(settings.colorLevel);
-    return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
           bold: true,
           children: "Select Gradient — Override FG Color"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
           dimColor: true,
           children: "↑↓ select, Enter apply, Escape cancel"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+        /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
           marginTop: 1,
           flexDirection: "column",
           children: [
-            GRADIENT_PRESET_NAMES.map((name, index) => /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+            GRADIENT_PRESET_NAMES.map((name, index) => /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
               children: [
                 index === gradientIndex ? "▶ " : "  ",
                 applyColors(name, `gradient:${name}`, undefined, index === gradientIndex, level)
               ]
             }, name, true, undefined, this)),
-            /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
               children: [
                 gradientIndex === GRADIENT_PRESET_NAMES.length ? "▶ " : "  ",
                 "Custom (two hex stops)"
@@ -67408,23 +67815,23 @@ function GlobalOverridesMenu({ settings, onUpdate, onBack }) {
   }
   if (numberFormatMode) {
     const width = Math.max(...NUMBER_KINDS.map((kind) => kind.length));
-    return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
           bold: true,
           children: "Global Number Formatting"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
           dimColor: true,
           children: "↑↓ to select a number type, ←→ to cycle its style, ESC to go back"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+        /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
           marginTop: 1,
           flexDirection: "column",
           children: NUMBER_KINDS.map((kind, idx) => {
             const style = settings.numberFormat?.[kind]?.style ?? "precise (default)";
-            return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+            return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
               ...idx === numberFormatKindIndex && { color: "cyan" },
               children: [
                 idx === numberFormatKindIndex ? "▶ " : "  ",
@@ -67435,15 +67842,15 @@ function GlobalOverridesMenu({ settings, onUpdate, onBack }) {
             }, kind, true, undefined, this);
           })
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+        /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
           marginTop: 1,
           flexDirection: "column",
           children: [
-            /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
               dimColor: true,
               children: "precise = keep trailing zeros (1.0M), compact = trim them (1M / 1.1M), whole = no decimals (1M)."
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
               dimColor: true,
               children: "A global style forces that type across every widget. Decimal places are set per-widget or in settings.json."
             }, undefined, false, undefined, this)
@@ -67453,68 +67860,68 @@ function GlobalOverridesMenu({ settings, onUpdate, onBack }) {
     }, undefined, true, undefined, this);
   }
   if (editing) {
-    return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
           bold: true,
           children: editing === "padding" ? "Default Padding" : "Default Separator"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
           children: [
             value,
-            /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
               inverse: true,
               children: " "
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
           dimColor: true,
           children: "Enter to apply, Escape to cancel"
         }, undefined, false, undefined, this)
       ]
     }, undefined, true, undefined, this);
   }
-  return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
         bold: true,
         children: "Global Overrides"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
         dimColor: true,
         children: "Configure rendering-wide padding, separators, and styling."
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
         children: `Global Bold: ${settings.globalBold ? "Enabled" : "Disabled"} (o)`
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
         children: `Minimalist Mode: ${settings.minimalistMode ? "Enabled" : "Disabled"} (m)`
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
         children: `Number Formatting: ${settings.numberFormat ? "customized" : "(defaults)"} (n)`
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
         children: `Default Padding: ${settings.defaultPadding ? JSON.stringify(settings.defaultPadding) : "none"} (p)`
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
         children: `Padding Side: ${settings.defaultPaddingSide} (d)`
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
         children: `Override FG: ${settings.overrideForegroundColor ?? "none"} (f cycle, g gradient, x clear)`
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
         children: powerline ? "Override BG: disabled while Powerline is active" : `Override BG: ${settings.overrideBackgroundColor ?? "none"} (b cycle, c clear)`
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
         children: powerline ? "Default Separator: disabled while Powerline is active" : `Default Separator: ${settings.defaultSeparator ? JSON.stringify(settings.defaultSeparator) : "none"} (s)`
       }, undefined, false, undefined, this),
-      !powerline && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+      !powerline && /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
         children: `Inherit Separator Colors: ${settings.inheritSeparatorColors ? "Enabled" : "Disabled"} (i)`
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
         dimColor: true,
         children: "Escape to cancel these changes"
       }, undefined, false, undefined, this)
@@ -67524,15 +67931,15 @@ function GlobalOverridesMenu({ settings, onUpdate, onBack }) {
 
 // src/tui/components/ImportConfigDialog.tsx
 var import_react47 = __toESM(require_react(), 1);
-var jsx_dev_runtime19 = __toESM(require_jsx_dev_runtime(), 1);
+var jsx_dev_runtime20 = __toESM(require_jsx_dev_runtime(), 1);
 function acceptsText3(input2, key) {
   return Boolean(input2 && !key.ctrl && !key.meta && !key.tab);
 }
 function ImportConfigDialog({ error: error61, onFileChosen, onCancel }) {
-  const [path, setPath] = import_react47.useState("");
+  const [path3, setPath] = import_react47.useState("");
   use_input_default((input2, key) => {
     if (key.return)
-      onFileChosen(path);
+      onFileChosen(path3);
     else if (key.escape)
       onCancel();
     else if (key.backspace || key.delete)
@@ -67540,31 +67947,31 @@ function ImportConfigDialog({ error: error61, onFileChosen, onCancel }) {
     else if (acceptsText3(input2, key))
       setPath((current) => current + input2);
   });
-  return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime20.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime20.jsxDEV(Text, {
         bold: true,
         children: "Import Config"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime20.jsxDEV(Text, {
         dimColor: true,
         children: "Enter the file path to import configuration from:"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime20.jsxDEV(Text, {
         children: [
-          `Path: ${path}`,
-          /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+          `Path: ${path3}`,
+          /* @__PURE__ */ jsx_dev_runtime20.jsxDEV(Text, {
             inverse: true,
             children: " "
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      error61 && /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+      error61 && /* @__PURE__ */ jsx_dev_runtime20.jsxDEV(Text, {
         color: "red",
         children: error61
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime20.jsxDEV(Text, {
         dimColor: true,
         children: "Enter to preview, Escape to cancel"
       }, undefined, false, undefined, this)
@@ -67573,7 +67980,7 @@ function ImportConfigDialog({ error: error61, onFileChosen, onCancel }) {
 }
 
 // src/tui/components/StatusLinePreview.tsx
-var jsx_dev_runtime20 = __toESM(require_jsx_dev_runtime(), 1);
+var jsx_dev_runtime21 = __toESM(require_jsx_dev_runtime(), 1);
 var PREVIEW_CONTEXT = {
   data: { payload_version: 1 },
   now: new Date(0),
@@ -67581,78 +67988,81 @@ var PREVIEW_CONTEXT = {
 };
 function StatusLinePreview({ settings, terminalWidth }) {
   const rows = renderStatusLines(settings, { ...PREVIEW_CONTEXT, isPreview: true, terminalWidth });
-  return /* @__PURE__ */ jsx_dev_runtime20.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Box_default, {
     flexDirection: "column",
-    children: rows.map((row, i) => /* @__PURE__ */ jsx_dev_runtime20.jsxDEV(Text, {
+    children: rows.map((row, i) => /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Text, {
       children: row
     }, i, false, undefined, this))
   }, undefined, false, undefined, this);
 }
 
 // src/tui/components/ImportPreviewDialog.tsx
-var jsx_dev_runtime21 = __toESM(require_jsx_dev_runtime(), 1);
+var jsx_dev_runtime22 = __toESM(require_jsx_dev_runtime(), 1);
+function escapeControlCharacters(text) {
+  return text.replace(/[\x00-\x1f\x7f-\x9f]/g, (char) => `\\u${char.charCodeAt(0).toString(16).padStart(4, "0")}`);
+}
 function ImportPreviewDialog({ preview, terminalWidth, busy = false, onConfirm, onCancel }) {
   const rows = renderStatusLines(preview.settings, { ...PREVIEW_CONTEXT, isPreview: true, terminalWidth });
   const allCustomCommands = preview.settings.lines.flat().filter((item) => item.type === "custom-command");
-  const uncachedCommands = allCustomCommands.filter((item) => item.refreshMs === undefined).map((item) => item.commandPath ?? "(no command)");
-  const cachedCommands = allCustomCommands.filter((item) => item.refreshMs !== undefined).map((item) => `${item.commandPath ?? "(no command)"} (every ${item.refreshMs}ms)`);
-  return /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Box_default, {
+  const uncachedCommands = allCustomCommands.filter((item) => item.refreshMs === undefined).map((item) => escapeControlCharacters(item.commandPath ?? "(no command)"));
+  const cachedCommands = allCustomCommands.filter((item) => item.refreshMs !== undefined).map((item) => `${escapeControlCharacters(item.commandPath ?? "(no command)")} (every ${item.refreshMs}ms)`);
+  return /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
         bold: true,
         children: "Import Preview"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
         dimColor: true,
         children: "Preview rendered by the production statusline renderer:"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Box_default, {
         marginTop: 1,
         flexDirection: "column",
-        children: rows.map((row, index) => /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Text, {
+        children: rows.map((row, index) => /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
           children: row
         }, index, false, undefined, this))
       }, undefined, false, undefined, this),
-      preview.omittedTypes.length > 0 && /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Text, {
+      preview.omittedTypes.length > 0 && /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
         color: "yellow",
         children: `Deferred unsupported widgets: ${preview.omittedTypes.join(", ")}`
       }, undefined, false, undefined, this),
-      uncachedCommands.length > 0 && /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Box_default, {
+      uncachedCommands.length > 0 && /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Box_default, {
         flexDirection: "column",
         children: [
-          /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
             color: "yellow",
             children: "Commands that will run on every render:"
           }, undefined, false, undefined, this),
-          uncachedCommands.map((command, index) => /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Text, {
+          uncachedCommands.map((command, index) => /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
             color: "yellow",
             children: `  ${command}`
           }, index, false, undefined, this))
         ]
       }, undefined, true, undefined, this),
-      cachedCommands.length > 0 && /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Box_default, {
+      cachedCommands.length > 0 && /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Box_default, {
         flexDirection: "column",
         children: [
-          /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
             color: "yellow",
             children: "Cached commands (run in background):"
           }, undefined, false, undefined, this),
-          cachedCommands.map((command, index) => /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Text, {
+          cachedCommands.map((command, index) => /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
             color: "yellow",
             children: `  ${command}`
           }, index, false, undefined, this))
         ]
       }, undefined, true, undefined, this),
-      busy ? /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Text, {
+      busy ? /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
         dimColor: true,
         children: "Applying imported configuration…"
-      }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(jsx_dev_runtime21.Fragment, {
+      }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(jsx_dev_runtime22.Fragment, {
         children: [
-          /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
             children: "Apply this preset?"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime21.jsxDEV(ConfirmDialog, {
+          /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(ConfirmDialog, {
             inline: true,
             onConfirm,
             onCancel
@@ -67665,7 +68075,7 @@ function ImportPreviewDialog({ preview, terminalWidth, busy = false, onConfirm,
 
 // src/tui/components/LineSelector.tsx
 var import_react48 = __toESM(require_react(), 1);
-var jsx_dev_runtime22 = __toESM(require_jsx_dev_runtime(), 1);
+var jsx_dev_runtime23 = __toESM(require_jsx_dev_runtime(), 1);
 function cloneLines(lines) {
   return lines.map((line3) => line3.map((item) => ({ ...item, ...item.metadata && { metadata: { ...item.metadata } } })));
 }
@@ -67715,7 +68125,8 @@ function LineSelector({
       }
       return;
     }
-    if (input2 === "a" && allowEditing) {
+    const shortcut = getPlainInput(input2, key);
+    if (shortcut === "a" && allowEditing) {
       if (localLines.length >= 3) {
         setLimitMessage("Maximum of 3 lines");
       } else {
@@ -67726,11 +68137,11 @@ function LineSelector({
       }
       return;
     }
-    if (input2 === "d" && allowEditing && localLines.length > 1) {
+    if (shortcut === "d" && allowEditing && localLines.length > 1) {
       setConfirmDelete(true);
       return;
     }
-    if (input2 === "m" && allowEditing && localLines.length > 1) {
+    if (shortcut === "m" && allowEditing && localLines.length > 1) {
       setMoveMode(true);
       return;
     }
@@ -67738,18 +68149,18 @@ function LineSelector({
       onBack();
   });
   if (confirmDelete) {
-    return /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text, {
           bold: true,
           children: `Delete Line ${selectedIndex + 1}?`
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text, {
           dimColor: true,
           children: lineSummary(localLines[selectedIndex] ?? [])
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(ConfirmDialog, {
+        /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(ConfirmDialog, {
           inline: true,
           onConfirm: () => {
             const next = localLines.filter((_2, index) => index !== selectedIndex);
@@ -67763,28 +68174,28 @@ function LineSelector({
     }, undefined, true, undefined, this);
   }
   if (moveMode) {
-    return /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text, {
           bold: true,
           children: [
             title,
             " ",
-            /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text, {
               color: "blue",
               children: "[MOVE MODE]"
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text, {
           dimColor: true,
           children: "↑↓ to move a line, Escape or Enter to finish"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Box_default, {
+        /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Box_default, {
           marginTop: 1,
           flexDirection: "column",
-          children: localLines.map((line3, index) => /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
+          children: localLines.map((line3, index) => /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text, {
             ...index === selectedIndex && { color: "green" },
             children: [
               index === selectedIndex ? "◆  " : "   ",
@@ -67795,22 +68206,22 @@ function LineSelector({
       ]
     }, undefined, true, undefined, this);
   }
-  return /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text, {
         bold: true,
         children: title
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text, {
         dimColor: true,
         children: allowEditing ? "Enter to edit; (a)dd, (d)elete, (m)ove; Escape to cancel" : "Enter to choose a line; Escape to cancel"
       }, undefined, false, undefined, this),
-      limitMessage && /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
+      limitMessage && /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text, {
         color: "yellow",
         children: limitMessage
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(List, {
+      /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(List, {
         marginTop: 1,
         items: localLines.map((line3, index) => ({ label: `Line ${index + 1}`, sublabel: `(${lineSummary(line3)})`, value: index })),
         initialSelection: selectedIndex,
@@ -67823,7 +68234,7 @@ function LineSelector({
 }
 
 // src/tui/components/MainMenu.tsx
-var jsx_dev_runtime23 = __toESM(require_jsx_dev_runtime(), 1);
+var jsx_dev_runtime24 = __toESM(require_jsx_dev_runtime(), 1);
 function buildMainMenuItems() {
   return [
     { label: "Lines", value: "lines", description: "Edit up to three status-line rows and their widgets." },
@@ -67839,17 +68250,17 @@ function buildMainMenuItems() {
   ];
 }
 function MainMenu({ onSelect, initialSelection = 0, hasChanges = false }) {
-  return /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Text, {
         bold: true,
         children: [
           "Main Menu",
           hasChanges ? " (unsaved changes)" : ""
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(List, {
+      /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(List, {
         items: buildMainMenuItems(),
         marginTop: 1,
         initialSelection,
@@ -67865,7 +68276,7 @@ function MainMenu({ onSelect, initialSelection = 0, hasChanges = false }) {
 // src/tui/components/PowerlineSetup.tsx
 import { existsSync as existsSync16, readdirSync as readdirSync5 } from "node:fs";
 import { homedir as homedir2, platform as platform2 } from "node:os";
-import { join as join23 } from "node:path";
+import { join as join24 } from "node:path";
 var import_react51 = __toESM(require_react(), 1);
 
 // src/utils/powerline-settings.ts
@@ -67894,7 +68305,7 @@ function buildEnabledPowerlineSettings(settings, removeManualSeparators) {
 
 // src/tui/components/PowerlineSeparatorEditor.tsx
 var import_react49 = __toESM(require_react(), 1);
-var jsx_dev_runtime24 = __toESM(require_jsx_dev_runtime(), 1);
+var jsx_dev_runtime25 = __toESM(require_jsx_dev_runtime(), 1);
 var PRESETS = {
   separator: [
     { char: "", name: "Triangle Right" },
@@ -67932,7 +68343,7 @@ function acceptsText4(input2, key) {
 function PowerlineSeparatorEditor({ settings, mode, onUpdate, onBack }) {
   const items = itemsFor(settings, mode);
   const presets = PRESETS[mode];
-  const inversions = mode === "separator" ? settings.powerline.separatorInvertBackground : [];
+  const inversions = mode === "separator" ? items.map((_2, i) => settings.powerline.separatorInvertBackground[i] ?? false) : [];
   const [selectedIndex, setSelectedIndex] = import_react49.useState(0);
   const [hexInput, setHexInput] = import_react49.useState(null);
   const update2 = (nextItems, nextInversions = inversions) => {
@@ -67961,6 +68372,7 @@ function PowerlineSeparatorEditor({ settings, mode, onUpdate, onBack }) {
         setHexInput(hexInput + input2.toUpperCase());
       return;
     }
+    const shortcut = getPlainInput(input2, key);
     if (key.escape)
       onBack();
     else if (key.upArrow && items.length)
@@ -67978,81 +68390,81 @@ function PowerlineSeparatorEditor({ settings, mode, onUpdate, onBack }) {
       if (mode === "separator")
         nextInversions[selected] = isLeftFacing(char);
       update2(next, nextInversions);
-    } else if (input2.toLowerCase() === "a" || input2.toLowerCase() === "i") {
+    } else if (shortcut.toLowerCase() === "a" || shortcut.toLowerCase() === "i") {
       const next = [...items];
       const char = presets[0]?.char ?? "";
-      const index = input2.toLowerCase() === "a" ? selected + 1 : selected;
+      const index = shortcut.toLowerCase() === "a" ? selected + 1 : selected;
       next.splice(items.length ? index : 0, 0, char);
       const nextInversions = [...inversions];
       if (mode === "separator")
         nextInversions.splice(items.length ? index : 0, 0, isLeftFacing(char));
       update2(next, nextInversions);
       setSelectedIndex(items.length ? index : 0);
-    } else if (input2.toLowerCase() === "d" && (mode !== "separator" || items.length > 1)) {
+    } else if (shortcut.toLowerCase() === "d" && (mode !== "separator" || items.length > 1)) {
       const next = items.filter((_2, index) => index !== selected);
       update2(next, inversions.filter((_2, index) => index !== selected));
       setSelectedIndex(Math.min(selected, Math.max(0, next.length - 1)));
-    } else if (input2.toLowerCase() === "c") {
+    } else if (shortcut.toLowerCase() === "c") {
       update2(mode === "separator" ? [""] : [], mode === "separator" ? [false] : []);
       setSelectedIndex(0);
-    } else if (input2.toLowerCase() === "h")
+    } else if (shortcut.toLowerCase() === "h")
       setHexInput("");
-    else if (input2.toLowerCase() === "t" && mode === "separator" && items.length) {
+    else if (shortcut.toLowerCase() === "t" && mode === "separator" && items.length) {
       const next = [...inversions];
       next[selected] = !next[selected];
       update2(items, next);
     }
   });
   if (hexInput !== null) {
-    return /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Text, {
           bold: true,
           children: titleFor(mode)
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Text, {
           children: [
             `U+${hexInput}`,
-            /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Text, {
               inverse: true,
               children: " "
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Text, {
           dimColor: true,
           children: "Enter 4–6 hexadecimal digits, Escape to cancel"
         }, undefined, false, undefined, this)
       ]
     }, undefined, true, undefined, this);
   }
-  return /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Text, {
         bold: true,
         children: titleFor(mode)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Text, {
         dimColor: true,
         children: `↑↓ select, ←→ cycle, (a)dd, (i)nsert${mode !== "separator" || items.length > 1 ? ", (d)elete" : ""}, (c)lear, (h)ex${mode === "separator" ? ", (t)oggle invert" : ""}, Escape back`
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Box_default, {
         marginTop: 1,
         flexDirection: "column",
         children: items.length ? items.map((item, index) => {
           const preset = presets.find((entry) => entry.char === item);
           const code = item.codePointAt(0)?.toString(16).toUpperCase().padStart(4, "0");
           const label = preset ? `${item} - ${preset.name}` : `${item} - Custom (U+${code})`;
-          return /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Text, {
+          return /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Text, {
             ...index === selected && { color: "green" },
             children: [
               index === selected ? "▶  " : "   ",
               `${index + 1}: ${label}${mode === "separator" && inversions[index] ? " [Inverted]" : ""}`
             ]
           }, `${item}-${index}`, true, undefined, this);
-        }) : /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Text, {
+        }) : /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Text, {
           dimColor: true,
           children: "(none configured — press a to add)"
         }, undefined, false, undefined, this)
@@ -68063,7 +68475,7 @@ function PowerlineSeparatorEditor({ settings, mode, onUpdate, onBack }) {
 
 // src/tui/components/PowerlineThemeSelector.tsx
 var import_react50 = __toESM(require_react(), 1);
-var jsx_dev_runtime25 = __toESM(require_jsx_dev_runtime(), 1);
+var jsx_dev_runtime26 = __toESM(require_jsx_dev_runtime(), 1);
 function buildPowerlineThemeItems(themes, originalTheme) {
   return themes.map((themeName) => {
     const theme = getPowerlineTheme(themeName);
@@ -68085,19 +68497,27 @@ function applyCustomPowerlineTheme(settings, themeName) {
   const colors = theme[level === "ansi16" ? "1" : level === "ansi256" ? "2" : "3"];
   if (!colors)
     return null;
+  let nextLineSlot = 0;
+  const lines = settings.lines.map((line3) => {
+    const { slots, nextSlot } = assignPowerlineThemeSlots(line3, settings.powerline.continueThemeAcrossLines ? nextLineSlot : 0);
+    nextLineSlot = nextSlot;
+    return line3.map((widget, index) => {
+      const slot = slots[index];
+      if (typeof slot !== "number") {
+        return widget;
+      }
+      const color = colors.fg[slot % colors.fg.length];
+      const backgroundColor = colors.bg[slot % colors.bg.length];
+      return {
+        ...widget,
+        ...color && { color },
+        ...backgroundColor && { backgroundColor }
+      };
+    });
+  });
   return {
     ...settings,
-    lines: settings.lines.map((line3) => {
-      let index = 0;
-      return line3.map((widget) => {
-        if (widget.type === "separator" || widget.type === "flex-separator")
-          return widget;
-        const color = colors.fg[index % colors.fg.length];
-        const backgroundColor = colors.bg[index % colors.bg.length];
-        index += 1;
-        return { ...widget, ...color && { color }, ...backgroundColor && { backgroundColor } };
-      });
-    }),
+    lines,
     powerline: { ...settings.powerline, theme: "custom" }
   };
 }
@@ -68123,10 +68543,11 @@ function PowerlineThemeSelector({ settings, onUpdate, onBack }) {
   use_input_default((input2, key) => {
     if (confirmCustom)
       return;
+    const shortcut = getPlainInput(input2, key);
     if (key.escape) {
       onUpdate(originalSettings.current);
       onBack();
-    } else if (input2.toLowerCase() === "c") {
+    } else if (shortcut.toLowerCase() === "c") {
       const theme = themes[selectedIndex];
       if (theme && theme !== "custom")
         setConfirmCustom(true);
@@ -68134,21 +68555,21 @@ function PowerlineThemeSelector({ settings, onUpdate, onBack }) {
   });
   const selectedTheme = themes[selectedIndex];
   if (confirmCustom) {
-    return /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
           bold: true,
           color: "yellow",
           children: "Confirm Customization"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
           children: "This copies the current theme colors to widgets and overwrites existing widget colors."
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
           children: "Continue?"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(ConfirmDialog, {
+        /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(ConfirmDialog, {
           inline: true,
           onConfirm: () => {
             if (selectedTheme) {
@@ -68164,24 +68585,24 @@ function PowerlineThemeSelector({ settings, onUpdate, onBack }) {
       ]
     }, undefined, true, undefined, this);
   }
-  return /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
         bold: true,
         children: [
           "Powerline Theme Selection ",
-          /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
             dimColor: true,
             children: `| Original: ${originalTheme.current}`
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
         dimColor: true,
         children: `↑↓ navigate, Enter apply${selectedTheme && selectedTheme !== "custom" ? ", (c)ustomize theme" : ""}, Escape cancel`
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(List, {
+      /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(List, {
         marginTop: 1,
         items: buildPowerlineThemeItems(themes, originalTheme.current),
         initialSelection: selectedIndex,
@@ -68191,7 +68612,7 @@ function PowerlineThemeSelector({ settings, onUpdate, onBack }) {
         },
         onSelect: () => onBack()
       }, undefined, false, undefined, this),
-      settings.colorLevel === 1 && /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(Text, {
+      settings.colorLevel === 1 && /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
         color: "yellow",
         children: "16-color themes have a limited palette."
       }, undefined, false, undefined, this)
@@ -68200,7 +68621,7 @@ function PowerlineThemeSelector({ settings, onUpdate, onBack }) {
 }
 
 // src/tui/components/PowerlineSetup.tsx
-var jsx_dev_runtime26 = __toESM(require_jsx_dev_runtime(), 1);
+var jsx_dev_runtime27 = __toESM(require_jsx_dev_runtime(), 1);
 var SEPARATORS = [
   { char: "", name: "Triangle Right" },
   { char: "", name: "Triangle Left" },
@@ -68250,7 +68671,7 @@ function buildPowerlineSetupMenuItems(powerline) {
   ];
 }
 function detectPowerlineFont() {
-  const dirs = platform2() === "darwin" ? [join23(homedir2(), "Library", "Fonts"), "/Library/Fonts"] : platform2() === "win32" ? [join23(homedir2(), "AppData", "Local", "Microsoft", "Windows", "Fonts"), "C:\\Windows\\Fonts"] : [join23(homedir2(), ".local", "share", "fonts"), join23(homedir2(), ".fonts"), "/usr/share/fonts"];
+  const dirs = platform2() === "darwin" ? [join24(homedir2(), "Library", "Fonts"), "/Library/Fonts"] : platform2() === "win32" ? [join24(homedir2(), "AppData", "Local", "Microsoft", "Windows", "Fonts"), "C:\\Windows\\Fonts"] : [join24(homedir2(), ".local", "share", "fonts"), join24(homedir2(), ".fonts"), "/usr/share/fonts"];
   try {
     return dirs.some((dir) => existsSync16(dir) && readdirSync5(dir).some((file2) => /powerline|nerd font|meslo.*lg/i.test(file2)));
   } catch {
@@ -68268,23 +68689,24 @@ function PowerlineSetup({ settings, onUpdate, onBack }) {
   use_input_default((input2, key) => {
     if (confirmEnable || screen !== "menu")
       return;
+    const shortcut = getPlainInput(input2, key);
     if (key.escape)
       onBack();
-    else if (input2.toLowerCase() === "t") {
+    else if (shortcut.toLowerCase() === "t") {
       if (powerline.enabled)
         onUpdate({ ...settings, powerline: { ...powerline, enabled: false } });
       else if (manualSeparators)
         setConfirmEnable(true);
       else
         onUpdate(buildEnabledPowerlineSettings(settings, false));
-    } else if (input2.toLowerCase() === "a" && powerline.enabled) {
+    } else if (shortcut.toLowerCase() === "a" && powerline.enabled) {
       onUpdate({ ...settings, powerline: { ...powerline, autoAlign: !powerline.autoAlign } });
-    } else if (input2.toLowerCase() === "c" && powerline.enabled) {
+    } else if (shortcut.toLowerCase() === "c" && powerline.enabled) {
       onUpdate({ ...settings, powerline: { ...powerline, continueThemeAcrossLines: !powerline.continueThemeAcrossLines } });
     }
   });
   if (screen === "separator" || screen === "startCap" || screen === "endCap") {
-    return /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(PowerlineSeparatorEditor, {
+    return /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(PowerlineSeparatorEditor, {
       settings,
       mode: screen,
       onUpdate,
@@ -68292,23 +68714,23 @@ function PowerlineSetup({ settings, onUpdate, onBack }) {
     }, undefined, false, undefined, this);
   }
   if (screen === "themes")
-    return /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(PowerlineThemeSelector, {
+    return /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(PowerlineThemeSelector, {
       settings,
       onUpdate,
       onBack: () => setScreen("menu")
     }, undefined, false, undefined, this);
   if (confirmEnable) {
-    return /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
           color: "yellow",
           children: "Enabling Powerline removes manual separators from the status lines."
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
           children: "Continue?"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(ConfirmDialog, {
+        /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(ConfirmDialog, {
           inline: true,
           onConfirm: () => {
             onUpdate(buildEnabledPowerlineSettings(settings, true));
@@ -68319,53 +68741,53 @@ function PowerlineSetup({ settings, onUpdate, onBack }) {
       ]
     }, undefined, true, undefined, this);
   }
-  return /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
         bold: true,
         children: "Powerline Setup"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
         dimColor: true,
         children: browserRuntime ? "Font detection: unavailable in browser (the browser terminal decides glyph rendering)" : `Font detection: ${fontFound ? "compatible font found" : "no compatible font found"} (informational; terminal configuration controls glyph rendering)`
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
         children: [
           "Powerline Mode: ",
-          /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
             color: powerline.enabled ? "green" : "red",
             children: powerline.enabled ? "Enabled" : "Disabled"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
             dimColor: true,
             children: " — press (t) to toggle"
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      powerline.enabled && /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(jsx_dev_runtime26.Fragment, {
+      powerline.enabled && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(jsx_dev_runtime27.Fragment, {
         children: [
-          /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
             children: [
               "Align Widgets: ",
-              /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
                 color: powerline.autoAlign ? "green" : "red",
                 children: powerline.autoAlign ? "Enabled" : "Disabled"
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
                 dimColor: true,
                 children: " — press (a) to toggle"
               }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
             children: [
               "Continue Theme: ",
-              /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
                 color: powerline.continueThemeAcrossLines ? "green" : "red",
                 children: powerline.continueThemeAcrossLines ? "Enabled" : "Disabled"
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
                 dimColor: true,
                 children: " — press (c) to toggle"
               }, undefined, false, undefined, this)
@@ -68373,11 +68795,11 @@ function PowerlineSetup({ settings, onUpdate, onBack }) {
           }, undefined, true, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      !powerline.enabled && /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text, {
+      !powerline.enabled && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
         dimColor: true,
         children: "Enable Powerline mode to configure separators, caps, and themes."
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(List, {
+      /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(List, {
         marginTop: 1,
         items: buildPowerlineSetupMenuItems(powerline),
         initialSelection: selected,
@@ -68395,7 +68817,7 @@ function PowerlineSetup({ settings, onUpdate, onBack }) {
 }
 
 // src/tui/App.tsx
-var jsx_dev_runtime27 = __toESM(require_jsx_dev_runtime(), 1);
+var jsx_dev_runtime28 = __toESM(require_jsx_dev_runtime(), 1);
 var readImportFileFromDisk = (file2) => readFile2(file2, "utf8");
 function cloneSettings(settings) {
   const clone3 = globalThis.structuredClone;
@@ -68599,45 +69021,45 @@ function App2({ initialSettings, settingsPath, readImportFile = readImportFileFr
     }
   };
   if (!settings) {
-    return /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Box_default, {
-      children: /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
+    return /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(Box_default, {
+      children: /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(Text, {
         children: "Loading configuration…"
       }, undefined, false, undefined, this)
     }, undefined, false, undefined, this);
   }
-  return /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(Text, {
         bold: true,
         children: "cxstatusline Configuration"
       }, undefined, false, undefined, this),
-      flash && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
+      flash && /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(Text, {
         color: "yellow",
         children: flash
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(Box_default, {
         marginTop: 1,
         flexDirection: "column",
         children: [
-          /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(Text, {
             dimColor: true,
             children: "> Preview"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(StatusLinePreview, {
+          /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(StatusLinePreview, {
             settings,
             terminalWidth
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(Box_default, {
         marginTop: 1,
         children: [
-          screen === "main" && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(MainMenu, {
+          screen === "main" && /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(MainMenu, {
             hasChanges,
             onSelect: (value) => handleMainMenu(value)
           }, undefined, false, undefined, this),
-          screen === "lines" && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(LineSelector, {
+          screen === "lines" && /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(LineSelector, {
             lines: settings.lines,
             onSelect: (line3) => {
               setSelectedLine(line3);
@@ -68648,59 +69070,59 @@ function App2({ initialSettings, settingsPath, readImportFile = readImportFileFr
             title: "Edit Lines",
             allowEditing: true
           }, undefined, false, undefined, this),
-          screen === "items" && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(ItemsEditor, {
+          screen === "items" && /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(ItemsEditor, {
             widgets: settings.lines[selectedLine] ?? [],
             onUpdate: (widgets) => updateLine(selectedLine, widgets),
             onBack: () => setScreen("lines"),
             lineNumber: selectedLine + 1,
             settings
           }, undefined, false, undefined, this),
-          screen === "colors" && colorLine === null && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(LineSelector, {
+          screen === "colors" && colorLine === null && /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(LineSelector, {
             lines: settings.lines,
             onSelect: setColorLine,
             onBack: () => finishEdit(),
             title: "Edit Colors"
           }, undefined, false, undefined, this),
-          screen === "colors" && colorLine !== null && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(ColorMenu, {
+          screen === "colors" && colorLine !== null && /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(ColorMenu, {
             widgets: settings.lines[colorLine] ?? [],
             lineIndex: colorLine,
             settings,
             onUpdate: (widgets) => updateLine(colorLine, widgets),
             onBack: () => setColorLine(null)
           }, undefined, false, undefined, this),
-          screen === "powerline" && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(PowerlineSetup, {
+          screen === "powerline" && /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(PowerlineSetup, {
             settings,
             onUpdate: replaceSettings,
             onBack: () => finishEdit()
           }, undefined, false, undefined, this),
-          screen === "overrides" && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(GlobalOverridesMenu, {
+          screen === "overrides" && /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(GlobalOverridesMenu, {
             settings,
             onUpdate: replaceSettings,
             onBack: () => finishEdit()
           }, undefined, false, undefined, this),
-          screen === "export" && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(ExportConfigDialog, {
+          screen === "export" && /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(ExportConfigDialog, {
             initialPath: `${settingsPath}.export.json`,
             onExport: exportSettings,
             onCancel: () => finishEdit()
           }, undefined, false, undefined, this),
-          screen === "import" && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(ImportConfigDialog, {
+          screen === "import" && /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(ImportConfigDialog, {
             error: importError,
             onFileChosen: importSettings,
             onCancel: () => finishEdit()
           }, undefined, false, undefined, this),
-          screen === "import-preview" && importPreview && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(ImportPreviewDialog, {
+          screen === "import-preview" && importPreview && /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(ImportPreviewDialog, {
             preview: importPreview,
             terminalWidth,
             busy: importApplying,
             onConfirm: () => void applyImport(),
             onCancel: () => finishEdit()
           }, undefined, false, undefined, this),
-          screen === "confirm-save" && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(ConfirmDialog, {
+          screen === "confirm-save" && /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(ConfirmDialog, {
             message: "Save the current configuration and exit?",
             onConfirm: () => void saveAndExit(),
             onCancel: () => setScreen("main")
           }, undefined, false, undefined, this),
-          screen === "confirm-discard" && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(ConfirmDialog, {
+          screen === "confirm-discard" && /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(ConfirmDialog, {
             message: hasChanges ? "Discard unsaved changes and exit?" : "Exit without saving?",
             onConfirm: () => {
               if (originalSettings)
@@ -68709,7 +69131,7 @@ function App2({ initialSettings, settingsPath, readImportFile = readImportFileFr
             },
             onCancel: () => setScreen("main")
           }, undefined, false, undefined, this),
-          screen === "confirm-invalid-replace" && /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(ConfirmDialog, {
+          screen === "confirm-invalid-replace" && /* @__PURE__ */ jsx_dev_runtime28.jsxDEV(ConfirmDialog, {
             message: "Existing settings could not be parsed and have not been changed. Use default settings in memory? Saving later will replace the file.",
             onConfirm: () => {
               const defaults2 = clampSettings(DEFAULT_SETTINGS);
@@ -68726,7 +69148,7 @@ function App2({ initialSettings, settingsPath, readImportFile = readImportFileFr
 }
 async function runTUI(settingsPath) {
   process.stdout.write("\x1B[2J\x1B[H");
-  const instance = render_default(/* @__PURE__ */ jsx_dev_runtime27.jsxDEV(App2, {
+  const instance = render_default(/* @__PURE__ */ jsx_dev_runtime28.jsxDEV(App2, {
     settingsPath
   }, undefined, false, undefined, this));
   await instance.waitUntilExit();
@@ -68770,8 +69192,8 @@ function readMemoryUsage(deps, nowMs) {
 
 // src/commands/update-tool.ts
 import { spawnSync as spawnSync5 } from "node:child_process";
-import { existsSync as existsSync17, realpathSync as realpathSync4 } from "node:fs";
-import { dirname as dirname13, join as join24 } from "node:path";
+import { existsSync as existsSync17, realpathSync as realpathSync5 } from "node:fs";
+import { dirname as dirname14, join as join25 } from "node:path";
 async function defaultFetchLatestVersion() {
   const controller = new AbortController;
   const timer = setTimeout(() => controller.abort(), 5000);
@@ -68796,14 +69218,14 @@ function detectInstallType(binaryPath = process.argv[1]) {
   try {
     let resolved = binaryPath;
     try {
-      resolved = realpathSync4(binaryPath);
+      resolved = realpathSync5(binaryPath);
     } catch {}
-    let dir = dirname13(resolved);
+    let dir = dirname14(resolved);
     for (let i = 0;i < 5; i++) {
-      if (existsSync17(join24(dir, ".git")) && existsSync17(join24(dir, "package.json"))) {
+      if (existsSync17(join25(dir, ".git")) && existsSync17(join25(dir, "package.json"))) {
         return { type: "git", repoDir: dir };
       }
-      const parent = dirname13(dir);
+      const parent = dirname14(dir);
       if (parent === dir)
         break;
       dir = parent;