ccstatusline 2.1.4 → 2.1.6

package/dist/ccstatusline.js

@@ -39365,6 +39365,15 @@ async function getExistingStatusLine() {
   return settings.statusLine?.command ?? null;
 }
 
+// src/utils/clone-settings.ts
+function cloneSettings(settings) {
+  const cloneFn = globalThis.structuredClone;
+  if (typeof cloneFn === "function") {
+    return cloneFn(settings);
+  }
+  return JSON.parse(JSON.stringify(settings));
+}
+
 // src/utils/config.ts
 import * as fs3 from "fs";
 import * as os3 from "os";
@@ -51469,7 +51478,7 @@ import { execSync as execSync3 } from "child_process";
 import * as fs5 from "fs";
 import * as path4 from "path";
 var __dirname = "/Users/sirmalloc/Projects/Personal/ccstatusline/src/utils";
-var PACKAGE_VERSION = "2.1.4";
+var PACKAGE_VERSION = "2.1.6";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -51488,7 +51497,7 @@ function getPackageVersion() {
   }
   return "";
 }
-function getTerminalWidth() {
+function probeTerminalWidth() {
   if (process.platform === "win32") {
     return null;
   }
@@ -51522,38 +51531,11 @@ function getTerminalWidth() {
   } catch {}
   return null;
 }
+function getTerminalWidth() {
+  return probeTerminalWidth();
+}
 function canDetectTerminalWidth() {
-  if (process.platform === "win32") {
-    return false;
-  }
-  try {
-    const tty2 = execSync3("ps -o tty= -p $(ps -o ppid= -p $$)", {
-      encoding: "utf8",
-      stdio: ["pipe", "pipe", "ignore"],
-      shell: "/bin/sh"
-    }).trim();
-    if (tty2 && tty2 !== "??" && tty2 !== "?") {
-      const width = execSync3(`stty size < /dev/${tty2} | awk '{print $2}'`, {
-        encoding: "utf8",
-        stdio: ["pipe", "pipe", "ignore"],
-        shell: "/bin/sh"
-      }).trim();
-      const parsed = parseInt(width, 10);
-      if (!isNaN(parsed) && parsed > 0) {
-        return true;
-      }
-    }
-  } catch {}
-  try {
-    const width = execSync3("tput cols 2>/dev/null", {
-      encoding: "utf8",
-      stdio: ["pipe", "pipe", "ignore"]
-    }).trim();
-    const parsed = parseInt(width, 10);
-    return !isNaN(parsed) && parsed > 0;
-  } catch {
-    return false;
-  }
+  return probeTerminalWidth() !== null;
 }
 
 // node_modules/ink-select-input/build/Indicator.js
@@ -52433,6 +52415,49 @@ function getGitChangeCounts(context) {
   };
 }
 
+// src/widgets/shared/editor-display.ts
+function makeModifierText(modifiers) {
+  return modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined;
+}
+
+// src/widgets/shared/metadata.ts
+function isMetadataFlagEnabled(item, key) {
+  return item.metadata?.[key] === "true";
+}
+function toggleMetadataFlag(item, key) {
+  return {
+    ...item,
+    metadata: {
+      ...item.metadata,
+      [key]: (!isMetadataFlagEnabled(item, key)).toString()
+    }
+  };
+}
+
+// src/widgets/shared/git-no-git.ts
+var HIDE_NO_GIT_KEY = "hideNoGit";
+var TOGGLE_NO_GIT_ACTION = "toggle-nogit";
+var HIDE_NO_GIT_KEYBIND = {
+  key: "h",
+  label: "(h)ide 'no git' message",
+  action: TOGGLE_NO_GIT_ACTION
+};
+function isHideNoGitEnabled(item) {
+  return isMetadataFlagEnabled(item, HIDE_NO_GIT_KEY);
+}
+function getHideNoGitModifierText(item) {
+  return makeModifierText(isHideNoGitEnabled(item) ? ["hide 'no git'"] : []);
+}
+function handleToggleNoGitAction(action, item) {
+  if (action !== TOGGLE_NO_GIT_ACTION) {
+    return null;
+  }
+  return toggleMetadataFlag(item, HIDE_NO_GIT_KEY);
+}
+function getHideNoGitKeybinds() {
+  return [HIDE_NO_GIT_KEYBIND];
+}
+
 // src/widgets/GitBranch.ts
 class GitBranchWidget {
   getDefaultColor() {
@@ -52448,31 +52473,16 @@ class GitBranchWidget {
     return "Git";
   }
   getEditorDisplay(item) {
-    const hideNoGit = item.metadata?.hideNoGit === "true";
-    const modifiers = [];
-    if (hideNoGit) {
-      modifiers.push("hide 'no git'");
-    }
     return {
       displayText: this.getDisplayName(),
-      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+      modifierText: getHideNoGitModifierText(item)
     };
   }
   handleEditorAction(action, item) {
-    if (action === "toggle-nogit") {
-      const currentState = item.metadata?.hideNoGit === "true";
-      return {
-        ...item,
-        metadata: {
-          ...item.metadata,
-          hideNoGit: (!currentState).toString()
-        }
-      };
-    }
-    return null;
+    return handleToggleNoGitAction(action, item);
   }
   render(item, context, settings) {
-    const hideNoGit = item.metadata?.hideNoGit === "true";
+    const hideNoGit = isHideNoGitEnabled(item);
     if (context.isPreview) {
       return item.rawValue ? "main" : "⎇ main";
     }
@@ -52488,9 +52498,7 @@ class GitBranchWidget {
     return runGit("branch --show-current", context);
   }
   getCustomKeybinds() {
-    return [
-      { key: "h", label: "(h)ide 'no git' message", action: "toggle-nogit" }
-    ];
+    return getHideNoGitKeybinds();
   }
   supportsRawValue() {
     return true;
@@ -52514,31 +52522,16 @@ class GitChangesWidget {
     return "Git";
   }
   getEditorDisplay(item) {
-    const hideNoGit = item.metadata?.hideNoGit === "true";
-    const modifiers = [];
-    if (hideNoGit) {
-      modifiers.push("hide 'no git'");
-    }
     return {
       displayText: this.getDisplayName(),
-      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+      modifierText: getHideNoGitModifierText(item)
     };
   }
   handleEditorAction(action, item) {
-    if (action === "toggle-nogit") {
-      const currentState = item.metadata?.hideNoGit === "true";
-      return {
-        ...item,
-        metadata: {
-          ...item.metadata,
-          hideNoGit: (!currentState).toString()
-        }
-      };
-    }
-    return null;
+    return handleToggleNoGitAction(action, item);
   }
   render(item, context, _settings) {
-    const hideNoGit = item.metadata?.hideNoGit === "true";
+    const hideNoGit = isHideNoGitEnabled(item);
     if (context.isPreview) {
       return "(+42,-10)";
     }
@@ -52549,9 +52542,7 @@ class GitChangesWidget {
     return `(+${changes.insertions},-${changes.deletions})`;
   }
   getCustomKeybinds() {
-    return [
-      { key: "h", label: "(h)ide 'no git' message", action: "toggle-nogit" }
-    ];
+    return getHideNoGitKeybinds();
   }
   supportsRawValue() {
     return false;
@@ -52575,31 +52566,16 @@ class GitInsertionsWidget {
     return "Git";
   }
   getEditorDisplay(item) {
-    const hideNoGit = item.metadata?.hideNoGit === "true";
-    const modifiers = [];
-    if (hideNoGit) {
-      modifiers.push("hide 'no git'");
-    }
     return {
       displayText: this.getDisplayName(),
-      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+      modifierText: getHideNoGitModifierText(item)
     };
   }
   handleEditorAction(action, item) {
-    if (action === "toggle-nogit") {
-      const currentState = item.metadata?.hideNoGit === "true";
-      return {
-        ...item,
-        metadata: {
-          ...item.metadata,
-          hideNoGit: (!currentState).toString()
-        }
-      };
-    }
-    return null;
+    return handleToggleNoGitAction(action, item);
   }
   render(item, context, _settings) {
-    const hideNoGit = item.metadata?.hideNoGit === "true";
+    const hideNoGit = isHideNoGitEnabled(item);
     if (context.isPreview) {
       return "+42";
     }
@@ -52610,9 +52586,7 @@ class GitInsertionsWidget {
     return `+${changes.insertions}`;
   }
   getCustomKeybinds() {
-    return [
-      { key: "h", label: "(h)ide 'no git' message", action: "toggle-nogit" }
-    ];
+    return getHideNoGitKeybinds();
   }
   supportsRawValue() {
     return false;
@@ -52636,31 +52610,16 @@ class GitDeletionsWidget {
     return "Git";
   }
   getEditorDisplay(item) {
-    const hideNoGit = item.metadata?.hideNoGit === "true";
-    const modifiers = [];
-    if (hideNoGit) {
-      modifiers.push("hide 'no git'");
-    }
     return {
       displayText: this.getDisplayName(),
-      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+      modifierText: getHideNoGitModifierText(item)
     };
   }
   handleEditorAction(action, item) {
-    if (action === "toggle-nogit") {
-      const currentState = item.metadata?.hideNoGit === "true";
-      return {
-        ...item,
-        metadata: {
-          ...item.metadata,
-          hideNoGit: (!currentState).toString()
-        }
-      };
-    }
-    return null;
+    return handleToggleNoGitAction(action, item);
   }
   render(item, context, _settings) {
-    const hideNoGit = item.metadata?.hideNoGit === "true";
+    const hideNoGit = isHideNoGitEnabled(item);
     if (context.isPreview) {
       return "-10";
     }
@@ -52671,9 +52630,7 @@ class GitDeletionsWidget {
     return `-${changes.deletions}`;
   }
   getCustomKeybinds() {
-    return [
-      { key: "h", label: "(h)ide 'no git' message", action: "toggle-nogit" }
-    ];
+    return getHideNoGitKeybinds();
   }
   supportsRawValue() {
     return false;
@@ -52697,31 +52654,16 @@ class GitRootDirWidget {
     return "Git";
   }
   getEditorDisplay(item) {
-    const hideNoGit = item.metadata?.hideNoGit === "true";
-    const modifiers = [];
-    if (hideNoGit) {
-      modifiers.push("hide 'no git'");
-    }
     return {
       displayText: this.getDisplayName(),
-      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+      modifierText: getHideNoGitModifierText(item)
     };
   }
   handleEditorAction(action, item) {
-    if (action === "toggle-nogit") {
-      const currentState = item.metadata?.hideNoGit === "true";
-      return {
-        ...item,
-        metadata: {
-          ...item.metadata,
-          hideNoGit: (!currentState).toString()
-        }
-      };
-    }
-    return null;
+    return handleToggleNoGitAction(action, item);
   }
   render(item, context, _settings) {
-    const hideNoGit = item.metadata?.hideNoGit === "true";
+    const hideNoGit = isHideNoGitEnabled(item);
     if (context.isPreview) {
       return "my-repo";
     }
@@ -52745,9 +52687,7 @@ class GitRootDirWidget {
     return lastPart && lastPart.length > 0 ? lastPart : normalizedRootDir;
   }
   getCustomKeybinds() {
-    return [
-      { key: "h", label: "(h)ide 'no git' message", action: "toggle-nogit" }
-    ];
+    return getHideNoGitKeybinds();
   }
   supportsRawValue() {
     return false;
@@ -52771,31 +52711,16 @@ class GitWorktreeWidget {
     return "Git";
   }
   getEditorDisplay(item) {
-    const hideNoGit = item.metadata?.hideNoGit === "true";
-    const modifiers = [];
-    if (hideNoGit) {
-      modifiers.push("hide 'no git'");
-    }
     return {
       displayText: this.getDisplayName(),
-      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+      modifierText: getHideNoGitModifierText(item)
     };
   }
   handleEditorAction(action, item) {
-    if (action === "toggle-nogit") {
-      const currentState = item.metadata?.hideNoGit === "true";
-      return {
-        ...item,
-        metadata: {
-          ...item.metadata,
-          hideNoGit: (!currentState).toString()
-        }
-      };
-    }
-    return null;
+    return handleToggleNoGitAction(action, item);
   }
   render(item, context) {
-    const hideNoGit = item.metadata?.hideNoGit === "true";
+    const hideNoGit = isHideNoGitEnabled(item);
     if (context.isPreview)
       return item.rawValue ? "main" : "\uD81A\uDC30 main";
     if (!isInsideGitWorkTree(context)) {
@@ -52823,9 +52748,7 @@ class GitWorktreeWidget {
     return worktree.length > 0 ? worktree : null;
   }
   getCustomKeybinds() {
-    return [
-      { key: "h", label: "(h)ide 'no git' message", action: "toggle-nogit" }
-    ];
+    return getHideNoGitKeybinds();
   }
   supportsRawValue() {
     return true;
@@ -53109,30 +53032,77 @@ function truncateStyledText(text, maxWidth, options = {}) {
 }
 
 // src/utils/model-context.ts
+var DEFAULT_CONTEXT_WINDOW_SIZE = 200000;
+var USABLE_CONTEXT_RATIO = 0.8;
 function toValidWindowSize(value) {
   if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) {
     return null;
   }
   return value;
 }
-function getContextConfig(modelId, contextWindowSize) {
+function parseContextWindowSize(modelIdentifier) {
+  const delimitedMatch = /(?:\(|\[)\s*(\d+(?:[,_]\d+)*(?:\.\d+)?)\s*([km])\s*(?:\)|\])/i.exec(modelIdentifier);
+  if (delimitedMatch) {
+    const delimitedValue = delimitedMatch[1];
+    const delimitedUnit = delimitedMatch[2];
+    if (!delimitedValue || !delimitedUnit) {
+      return null;
+    }
+    const parsed2 = Number.parseFloat(delimitedValue.replace(/[,_]/g, ""));
+    if (Number.isFinite(parsed2) && parsed2 > 0) {
+      return Math.round(parsed2 * (delimitedUnit.toLowerCase() === "m" ? 1e6 : 1000));
+    }
+  }
+  const contextMatch = /\b(\d+(?:[,_]\d+)*(?:\.\d+)?)\s*([km])(?:\s*(?:token\s*)?context)?\b/i.exec(modelIdentifier);
+  if (!contextMatch) {
+    return null;
+  }
+  const contextValue = contextMatch[1];
+  const contextUnit = contextMatch[2];
+  if (!contextValue || !contextUnit) {
+    return null;
+  }
+  const parsed = Number.parseFloat(contextValue.replace(/[,_]/g, ""));
+  if (!Number.isFinite(parsed) || parsed <= 0) {
+    return null;
+  }
+  return Math.round(parsed * (contextUnit.toLowerCase() === "m" ? 1e6 : 1000));
+}
+function getModelContextIdentifier(model) {
+  if (typeof model === "string") {
+    const trimmed = model.trim();
+    return trimmed.length > 0 ? trimmed : undefined;
+  }
+  if (!model) {
+    return;
+  }
+  const id = model.id?.trim();
+  const displayName = model.display_name?.trim();
+  if (id && displayName) {
+    return `${id} ${displayName}`;
+  }
+  return id ?? displayName;
+}
+function getContextConfig(modelIdentifier, contextWindowSize) {
   const statusWindowSize = toValidWindowSize(contextWindowSize);
   if (statusWindowSize !== null) {
     return {
       maxTokens: statusWindowSize,
-      usableTokens: Math.floor(statusWindowSize * 0.8)
+      usableTokens: Math.floor(statusWindowSize * USABLE_CONTEXT_RATIO)
     };
   }
   const defaultConfig = {
-    maxTokens: 200000,
-    usableTokens: 160000
+    maxTokens: DEFAULT_CONTEXT_WINDOW_SIZE,
+    usableTokens: Math.floor(DEFAULT_CONTEXT_WINDOW_SIZE * USABLE_CONTEXT_RATIO)
   };
-  if (!modelId)
+  if (!modelIdentifier) {
     return defaultConfig;
-  if (modelId.toLowerCase().includes("[1m]")) {
+  }
+  const inferredWindowSize = parseContextWindowSize(modelIdentifier);
+  if (inferredWindowSize !== null) {
     return {
-      maxTokens: 1e6,
-      usableTokens: 800000
+      maxTokens: inferredWindowSize,
+      usableTokens: Math.floor(inferredWindowSize * USABLE_CONTEXT_RATIO)
     };
   }
   return defaultConfig;
@@ -53147,9 +53117,8 @@ function calculateContextPercentage(context) {
   if (!context.tokenMetrics) {
     return 0;
   }
-  const model = context.data?.model;
-  const modelId = typeof model === "string" ? model : model?.id;
-  const contextConfig = getContextConfig(modelId, contextWindowMetrics.windowSize);
+  const modelIdentifier = getModelContextIdentifier(context.data?.model);
+  const contextConfig = getContextConfig(modelIdentifier, contextWindowMetrics.windowSize);
   return Math.min(100, context.tokenMetrics.contextLength / contextConfig.maxTokens * 100);
 }
 
@@ -53161,6 +53130,36 @@ function formatTokens(count) {
     return `${(count / 1000).toFixed(1)}k`;
   return count.toString();
 }
+function resolveEffectiveTerminalWidth(detectedWidth, settings, context) {
+  if (!detectedWidth) {
+    return null;
+  }
+  const flexMode = settings.flexMode;
+  if (context.isPreview) {
+    if (flexMode === "full") {
+      return detectedWidth - 6;
+    }
+    if (flexMode === "full-minus-40") {
+      return detectedWidth - 40;
+    }
+    if (flexMode === "full-until-compact") {
+      return detectedWidth - 6;
+    }
+    return null;
+  }
+  if (flexMode === "full") {
+    return detectedWidth - 6;
+  }
+  if (flexMode === "full-minus-40") {
+    return detectedWidth - 40;
+  }
+  if (flexMode === "full-until-compact") {
+    const threshold = settings.compactThreshold;
+    const contextPercentage = calculateContextPercentage(context);
+    return contextPercentage >= threshold ? detectedWidth - 40 : detectedWidth - 6;
+  }
+  return null;
+}
 function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, globalSeparatorOffset = 0, preRenderedWidgets, preCalculatedMaxWidths) {
   const powerlineConfig = settings.powerline;
   const config2 = powerlineConfig ?? {};
@@ -53186,33 +53185,7 @@ function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, gl
   if (filteredWidgets.length === 0)
     return "";
   const detectedWidth = context.terminalWidth ?? getTerminalWidth();
-  let terminalWidth = null;
-  if (detectedWidth) {
-    const flexMode = settings.flexMode;
-    if (context.isPreview) {
-      if (flexMode === "full") {
-        terminalWidth = detectedWidth - 6;
-      } else if (flexMode === "full-minus-40") {
-        terminalWidth = detectedWidth - 40;
-      } else if (flexMode === "full-until-compact") {
-        terminalWidth = detectedWidth - 6;
-      }
-    } else {
-      if (flexMode === "full") {
-        terminalWidth = detectedWidth - 6;
-      } else if (flexMode === "full-minus-40") {
-        terminalWidth = detectedWidth - 40;
-      } else if (flexMode === "full-until-compact") {
-        const threshold = settings.compactThreshold;
-        const contextPercentage = calculateContextPercentage(context);
-        if (contextPercentage >= threshold) {
-          terminalWidth = detectedWidth - 40;
-        } else {
-          terminalWidth = detectedWidth - 6;
-        }
-      }
-    }
-  }
+  const terminalWidth = resolveEffectiveTerminalWidth(detectedWidth, settings, context);
   const widgetElements = [];
   let widgetColorIndex = 0;
   const preRenderedIndices = [];
@@ -53538,33 +53511,7 @@ function renderStatusLine(widgets, settings, context, preRenderedWidgets, preCal
     return applyColors(text, fgColor, bgColor, shouldBold, colorLevel);
   };
   const detectedWidth = context.terminalWidth ?? getTerminalWidth();
-  let terminalWidth = null;
-  if (detectedWidth) {
-    const flexMode = settings.flexMode;
-    if (context.isPreview) {
-      if (flexMode === "full") {
-        terminalWidth = detectedWidth - 6;
-      } else if (flexMode === "full-minus-40") {
-        terminalWidth = detectedWidth - 40;
-      } else if (flexMode === "full-until-compact") {
-        terminalWidth = detectedWidth - 6;
-      }
-    } else {
-      if (flexMode === "full") {
-        terminalWidth = detectedWidth - 6;
-      } else if (flexMode === "full-minus-40") {
-        terminalWidth = detectedWidth - 40;
-      } else if (flexMode === "full-until-compact") {
-        const threshold = settings.compactThreshold;
-        const contextPercentage = calculateContextPercentage(context);
-        if (contextPercentage >= threshold) {
-          terminalWidth = detectedWidth - 40;
-        } else {
-          terminalWidth = detectedWidth - 6;
-        }
-      }
-    }
-  }
+  const terminalWidth = resolveEffectiveTerminalWidth(detectedWidth, settings, context);
   const elements = [];
   let hasFlexSeparator = false;
   for (let i = 0;i < widgets.length; i++) {
@@ -53746,6 +53693,11 @@ function renderStatusLine(widgets, settings, context, preRenderedWidgets, preCal
   return statusLine;
 }
 
+// src/widgets/shared/raw-or-labeled.ts
+function formatRawOrLabeledValue(item, labelPrefix, value) {
+  return item.rawValue ? value : `${labelPrefix}${value}`;
+}
+
 // src/widgets/TokensInput.ts
 class TokensInputWidget {
   getDefaultColor() {
@@ -53765,14 +53717,14 @@ class TokensInputWidget {
   }
   render(item, context, settings) {
     if (context.isPreview) {
-      return item.rawValue ? "15.2k" : "In: 15.2k";
+      return formatRawOrLabeledValue(item, "In: ", "15.2k");
     }
     const inputTotalTokens = getContextWindowInputTotalTokens(context.data);
     if (inputTotalTokens !== null) {
-      return item.rawValue ? formatTokens(inputTotalTokens) : `In: ${formatTokens(inputTotalTokens)}`;
+      return formatRawOrLabeledValue(item, "In: ", formatTokens(inputTotalTokens));
     }
     if (context.tokenMetrics) {
-      return item.rawValue ? formatTokens(context.tokenMetrics.inputTokens) : `In: ${formatTokens(context.tokenMetrics.inputTokens)}`;
+      return formatRawOrLabeledValue(item, "In: ", formatTokens(context.tokenMetrics.inputTokens));
     }
     return null;
   }
@@ -53802,14 +53754,14 @@ class TokensOutputWidget {
   }
   render(item, context, settings) {
     if (context.isPreview) {
-      return item.rawValue ? "3.4k" : "Out: 3.4k";
+      return formatRawOrLabeledValue(item, "Out: ", "3.4k");
     }
     const outputTotalTokens = getContextWindowOutputTotalTokens(context.data);
     if (outputTotalTokens !== null) {
-      return item.rawValue ? formatTokens(outputTotalTokens) : `Out: ${formatTokens(outputTotalTokens)}`;
+      return formatRawOrLabeledValue(item, "Out: ", formatTokens(outputTotalTokens));
     }
     if (context.tokenMetrics) {
-      return item.rawValue ? formatTokens(context.tokenMetrics.outputTokens) : `Out: ${formatTokens(context.tokenMetrics.outputTokens)}`;
+      return formatRawOrLabeledValue(item, "Out: ", formatTokens(context.tokenMetrics.outputTokens));
     }
     return null;
   }
@@ -53839,10 +53791,10 @@ class TokensCachedWidget {
   }
   render(item, context, settings) {
     if (context.isPreview) {
-      return item.rawValue ? "12k" : "Cached: 12k";
+      return formatRawOrLabeledValue(item, "Cached: ", "12k");
     }
     if (context.tokenMetrics) {
-      return item.rawValue ? formatTokens(context.tokenMetrics.cachedTokens) : `Cached: ${formatTokens(context.tokenMetrics.cachedTokens)}`;
+      return formatRawOrLabeledValue(item, "Cached: ", formatTokens(context.tokenMetrics.cachedTokens));
     }
     return null;
   }
@@ -53872,10 +53824,10 @@ class TokensTotalWidget {
   }
   render(item, context, settings) {
     if (context.isPreview) {
-      return item.rawValue ? "30.6k" : "Total: 30.6k";
+      return formatRawOrLabeledValue(item, "Total: ", "30.6k");
     }
     if (context.tokenMetrics) {
-      return item.rawValue ? formatTokens(context.tokenMetrics.totalTokens) : `Total: ${formatTokens(context.tokenMetrics.totalTokens)}`;
+      return formatRawOrLabeledValue(item, "Total: ", formatTokens(context.tokenMetrics.totalTokens));
     }
     return null;
   }
@@ -53923,6 +53875,22 @@ class ContextLengthWidget {
     return true;
   }
 }
+// src/widgets/shared/context-inverse.ts
+var INVERSE_KEY = "inverse";
+var TOGGLE_INVERSE_ACTION = "toggle-inverse";
+function isContextInverse(item) {
+  return isMetadataFlagEnabled(item, INVERSE_KEY);
+}
+function getContextInverseModifierText(item) {
+  return makeModifierText(isContextInverse(item) ? ["remaining"] : []);
+}
+function handleContextInverseAction(action, item) {
+  if (action !== TOGGLE_INVERSE_ACTION) {
+    return null;
+  }
+  return toggleMetadataFlag(item, INVERSE_KEY);
+}
+
 // src/widgets/ContextPercentage.ts
 class ContextPercentageWidget {
   getDefaultColor() {
@@ -53938,47 +53906,31 @@ class ContextPercentageWidget {
     return "Context";
   }
   getEditorDisplay(item) {
-    const isInverse = item.metadata?.inverse === "true";
-    const modifiers = [];
-    if (isInverse) {
-      modifiers.push("remaining");
-    }
     return {
       displayText: this.getDisplayName(),
-      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+      modifierText: getContextInverseModifierText(item)
     };
   }
   handleEditorAction(action, item) {
-    if (action === "toggle-inverse") {
-      const currentState = item.metadata?.inverse === "true";
-      return {
-        ...item,
-        metadata: {
-          ...item.metadata,
-          inverse: (!currentState).toString()
-        }
-      };
-    }
-    return null;
+    return handleContextInverseAction(action, item);
   }
   render(item, context, settings) {
-    const isInverse = item.metadata?.inverse === "true";
+    const isInverse = isContextInverse(item);
     const contextWindowMetrics = getContextWindowMetrics(context.data);
     if (context.isPreview) {
       const previewValue = isInverse ? "90.7%" : "9.3%";
-      return item.rawValue ? previewValue : `Ctx: ${previewValue}`;
+      return formatRawOrLabeledValue(item, "Ctx: ", previewValue);
     }
     if (contextWindowMetrics.usedPercentage !== null) {
       const displayPercentage = isInverse ? 100 - contextWindowMetrics.usedPercentage : contextWindowMetrics.usedPercentage;
-      return item.rawValue ? `${displayPercentage.toFixed(1)}%` : `Ctx: ${displayPercentage.toFixed(1)}%`;
+      return formatRawOrLabeledValue(item, "Ctx: ", `${displayPercentage.toFixed(1)}%`);
     }
     if (context.tokenMetrics) {
-      const model = context.data?.model;
-      const modelId = typeof model === "string" ? model : model?.id;
-      const contextConfig = getContextConfig(modelId, contextWindowMetrics.windowSize);
+      const modelIdentifier = getModelContextIdentifier(context.data?.model);
+      const contextConfig = getContextConfig(modelIdentifier, contextWindowMetrics.windowSize);
       const usedPercentage = Math.min(100, context.tokenMetrics.contextLength / contextConfig.maxTokens * 100);
       const displayPercentage = isInverse ? 100 - usedPercentage : usedPercentage;
-      return item.rawValue ? `${displayPercentage.toFixed(1)}%` : `Ctx: ${displayPercentage.toFixed(1)}%`;
+      return formatRawOrLabeledValue(item, "Ctx: ", `${displayPercentage.toFixed(1)}%`);
     }
     return null;
   }
@@ -54009,48 +53961,32 @@ class ContextPercentageUsableWidget {
     return "Context";
   }
   getEditorDisplay(item) {
-    const isInverse = item.metadata?.inverse === "true";
-    const modifiers = [];
-    if (isInverse) {
-      modifiers.push("remaining");
-    }
     return {
       displayText: this.getDisplayName(),
-      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+      modifierText: getContextInverseModifierText(item)
     };
   }
   handleEditorAction(action, item) {
-    if (action === "toggle-inverse") {
-      const currentState = item.metadata?.inverse === "true";
-      return {
-        ...item,
-        metadata: {
-          ...item.metadata,
-          inverse: (!currentState).toString()
-        }
-      };
-    }
-    return null;
+    return handleContextInverseAction(action, item);
   }
   render(item, context, settings) {
-    const isInverse = item.metadata?.inverse === "true";
-    const model = context.data?.model;
-    const modelId = typeof model === "string" ? model : model?.id;
+    const isInverse = isContextInverse(item);
+    const modelIdentifier = getModelContextIdentifier(context.data?.model);
     const contextWindowMetrics = getContextWindowMetrics(context.data);
-    const contextConfig = getContextConfig(modelId, contextWindowMetrics.windowSize);
+    const contextConfig = getContextConfig(modelIdentifier, contextWindowMetrics.windowSize);
     if (context.isPreview) {
       const previewValue = isInverse ? "88.4%" : "11.6%";
-      return item.rawValue ? previewValue : `Ctx(u): ${previewValue}`;
+      return formatRawOrLabeledValue(item, "Ctx(u): ", previewValue);
     }
     if (contextWindowMetrics.contextLengthTokens !== null) {
       const usedPercentage = Math.min(100, contextWindowMetrics.contextLengthTokens / contextConfig.usableTokens * 100);
       const displayPercentage = isInverse ? 100 - usedPercentage : usedPercentage;
-      return item.rawValue ? `${displayPercentage.toFixed(1)}%` : `Ctx(u): ${displayPercentage.toFixed(1)}%`;
+      return formatRawOrLabeledValue(item, "Ctx(u): ", `${displayPercentage.toFixed(1)}%`);
     }
     if (context.tokenMetrics) {
       const usedPercentage = Math.min(100, context.tokenMetrics.contextLength / contextConfig.usableTokens * 100);
       const displayPercentage = isInverse ? 100 - usedPercentage : usedPercentage;
-      return item.rawValue ? `${displayPercentage.toFixed(1)}%` : `Ctx(u): ${displayPercentage.toFixed(1)}%`;
+      return formatRawOrLabeledValue(item, "Ctx(u): ", `${displayPercentage.toFixed(1)}%`);
     }
     return null;
   }
@@ -56069,17 +56005,56 @@ function makeUsageProgressBar(percent, width = 15) {
   return "[" + "█".repeat(filled) + "░".repeat(empty2) + "]";
 }
 
-// src/widgets/BlockTimer.ts
-function getDisplayMode(item) {
+// src/widgets/shared/usage-display.ts
+function getUsageDisplayMode(item) {
   const mode = item.metadata?.display;
   if (mode === "progress" || mode === "progress-short") {
     return mode;
   }
   return "time";
 }
-function isInverted(item) {
-  return item.metadata?.invert === "true";
+function isUsageProgressMode(mode) {
+  return mode === "progress" || mode === "progress-short";
+}
+function getUsageProgressBarWidth(mode) {
+  return mode === "progress" ? 32 : 16;
+}
+function isUsageInverted(item) {
+  return isMetadataFlagEnabled(item, "invert");
+}
+function getUsageDisplayModifierText(item) {
+  const mode = getUsageDisplayMode(item);
+  const modifiers = [];
+  if (mode === "progress") {
+    modifiers.push("progress bar");
+  } else if (mode === "progress-short") {
+    modifiers.push("short bar");
+  }
+  if (isUsageInverted(item)) {
+    modifiers.push("inverted");
+  }
+  return makeModifierText(modifiers);
+}
+function cycleUsageDisplayMode(item) {
+  const currentMode = getUsageDisplayMode(item);
+  const nextMode = currentMode === "time" ? "progress" : currentMode === "progress" ? "progress-short" : "time";
+  const nextMetadata = {
+    ...item.metadata ?? {},
+    display: nextMode
+  };
+  if (nextMode === "time") {
+    delete nextMetadata.invert;
+  }
+  return {
+    ...item,
+    metadata: nextMetadata
+  };
+}
+function toggleUsageInverted(item) {
+  return toggleMetadataFlag(item, "invert");
 }
+
+// src/widgets/BlockTimer.ts
 function makeTimerProgressBar(percent, width) {
   const clampedPercent = Math.max(0, Math.min(100, percent));
   const filledWidth = Math.floor(clampedPercent / 100 * width);
@@ -56101,90 +56076,51 @@ class BlockTimerWidget {
     return "Usage";
   }
   getEditorDisplay(item) {
-    const mode = getDisplayMode(item);
-    const modifiers = [];
-    if (mode === "progress") {
-      modifiers.push("progress bar");
-    } else if (mode === "progress-short") {
-      modifiers.push("short bar");
-    }
-    if (isInverted(item)) {
-      modifiers.push("inverted");
-    }
     return {
       displayText: this.getDisplayName(),
-      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+      modifierText: getUsageDisplayModifierText(item)
     };
   }
   handleEditorAction(action, item) {
     if (action === "toggle-progress") {
-      const currentMode = getDisplayMode(item);
-      let nextMode;
-      if (currentMode === "time") {
-        nextMode = "progress";
-      } else if (currentMode === "progress") {
-        nextMode = "progress-short";
-      } else {
-        nextMode = "time";
-      }
-      const nextMetadata = {
-        ...item.metadata ?? {},
-        display: nextMode
-      };
-      if (nextMode === "time") {
-        delete nextMetadata.invert;
-      }
-      return {
-        ...item,
-        metadata: nextMetadata
-      };
+      return cycleUsageDisplayMode(item);
     }
     if (action === "toggle-invert") {
-      return {
-        ...item,
-        metadata: {
-          ...item.metadata,
-          invert: (!isInverted(item)).toString()
-        }
-      };
+      return toggleUsageInverted(item);
     }
     return null;
   }
   render(item, context, settings) {
-    const displayMode = getDisplayMode(item);
-    const inverted = isInverted(item);
+    const displayMode = getUsageDisplayMode(item);
+    const inverted = isUsageInverted(item);
     if (context.isPreview) {
       const previewPercent = inverted ? 26.1 : 73.9;
-      const prefix = item.rawValue ? "" : "Block ";
-      if (displayMode === "progress" || displayMode === "progress-short") {
-        const barWidth = displayMode === "progress" ? 32 : 16;
+      if (isUsageProgressMode(displayMode)) {
+        const barWidth = getUsageProgressBarWidth(displayMode);
         const progressBar = makeTimerProgressBar(previewPercent, barWidth);
-        return `${prefix}[${progressBar}] ${previewPercent.toFixed(1)}%`;
+        return formatRawOrLabeledValue(item, "Block ", `[${progressBar}] ${previewPercent.toFixed(1)}%`);
       }
-      return item.rawValue ? "3hr 45m" : "Block: 3hr 45m";
+      return formatRawOrLabeledValue(item, "Block: ", "3hr 45m");
     }
     const usageData = fetchUsageData();
     const window2 = resolveUsageWindowWithFallback(usageData, context.blockMetrics);
     if (!window2) {
-      if (displayMode === "progress" || displayMode === "progress-short") {
-        const barWidth = displayMode === "progress" ? 32 : 16;
+      if (isUsageProgressMode(displayMode)) {
+        const barWidth = getUsageProgressBarWidth(displayMode);
         const emptyBar = "░".repeat(barWidth);
-        return item.rawValue ? `[${emptyBar}] 0.0%` : `Block [${emptyBar}] 0.0%`;
+        return formatRawOrLabeledValue(item, "Block ", `[${emptyBar}] 0.0%`);
       }
-      return item.rawValue ? "0hr 0m" : "Block: 0hr 0m";
+      return formatRawOrLabeledValue(item, "Block: ", "0hr 0m");
     }
-    if (displayMode === "progress" || displayMode === "progress-short") {
-      const barWidth = displayMode === "progress" ? 32 : 16;
+    if (isUsageProgressMode(displayMode)) {
+      const barWidth = getUsageProgressBarWidth(displayMode);
       const percent = inverted ? window2.remainingPercent : window2.elapsedPercent;
       const progressBar = makeTimerProgressBar(percent, barWidth);
       const percentage = percent.toFixed(1);
-      if (item.rawValue) {
-        return `[${progressBar}] ${percentage}%`;
-      }
-      return `Block [${progressBar}] ${percentage}%`;
+      return formatRawOrLabeledValue(item, "Block ", `[${progressBar}] ${percentage}%`);
     }
     const elapsedTime = formatUsageDuration(window2.elapsedMs);
-    return item.rawValue ? elapsedTime : `Block: ${elapsedTime}`;
+    return formatRawOrLabeledValue(item, "Block: ", elapsedTime);
   }
   getCustomKeybinds() {
     return [
@@ -56619,17 +56555,6 @@ class SessionNameWidget {
   }
 }
 // src/widgets/SessionUsage.ts
-function getDisplayMode2(item) {
-  const mode = item.metadata?.display;
-  if (mode === "progress" || mode === "progress-short") {
-    return mode;
-  }
-  return "time";
-}
-function isInverted2(item) {
-  return item.metadata?.invert === "true";
-}
-
 class SessionUsageWidget {
   getDefaultColor() {
     return "brightBlue";
@@ -56644,67 +56569,32 @@ class SessionUsageWidget {
     return "Usage";
   }
   getEditorDisplay(item) {
-    const mode = getDisplayMode2(item);
-    const modifiers = [];
-    if (mode === "progress") {
-      modifiers.push("progress bar");
-    } else if (mode === "progress-short") {
-      modifiers.push("short bar");
-    }
-    if (isInverted2(item)) {
-      modifiers.push("inverted");
-    }
     return {
       displayText: this.getDisplayName(),
-      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+      modifierText: getUsageDisplayModifierText(item)
     };
   }
   handleEditorAction(action, item) {
     if (action === "toggle-progress") {
-      const currentMode = getDisplayMode2(item);
-      let nextMode;
-      if (currentMode === "time") {
-        nextMode = "progress";
-      } else if (currentMode === "progress") {
-        nextMode = "progress-short";
-      } else {
-        nextMode = "time";
-      }
-      const nextMetadata = {
-        ...item.metadata ?? {},
-        display: nextMode
-      };
-      if (nextMode === "time") {
-        delete nextMetadata.invert;
-      }
-      return {
-        ...item,
-        metadata: nextMetadata
-      };
+      return cycleUsageDisplayMode(item);
     }
     if (action === "toggle-invert") {
-      return {
-        ...item,
-        metadata: {
-          ...item.metadata,
-          invert: (!isInverted2(item)).toString()
-        }
-      };
+      return toggleUsageInverted(item);
     }
     return null;
   }
   render(item, context, settings) {
-    const displayMode = getDisplayMode2(item);
-    const inverted = isInverted2(item);
+    const displayMode = getUsageDisplayMode(item);
+    const inverted = isUsageInverted(item);
     if (context.isPreview) {
       const previewPercent = 20;
       const renderedPercent = inverted ? 100 - previewPercent : previewPercent;
-      if (displayMode === "progress" || displayMode === "progress-short") {
-        const width = displayMode === "progress" ? 32 : 16;
+      if (isUsageProgressMode(displayMode)) {
+        const width = getUsageProgressBarWidth(displayMode);
         const progressDisplay = `${makeUsageProgressBar(renderedPercent, width)} ${renderedPercent.toFixed(1)}%`;
-        return item.rawValue ? progressDisplay : `Session: ${progressDisplay}`;
+        return formatRawOrLabeledValue(item, "Session: ", progressDisplay);
       }
-      return item.rawValue ? `${previewPercent.toFixed(1)}%` : `Session: ${previewPercent.toFixed(1)}%`;
+      return formatRawOrLabeledValue(item, "Session: ", `${previewPercent.toFixed(1)}%`);
     }
     const data = fetchUsageData();
     if (data.error)
@@ -56712,13 +56602,13 @@ class SessionUsageWidget {
     if (data.sessionUsage === undefined)
       return null;
     const percent = Math.max(0, Math.min(100, data.sessionUsage));
-    if (displayMode === "progress" || displayMode === "progress-short") {
-      const width = displayMode === "progress" ? 32 : 16;
+    if (isUsageProgressMode(displayMode)) {
+      const width = getUsageProgressBarWidth(displayMode);
       const renderedPercent = inverted ? 100 - percent : percent;
       const progressDisplay = `${makeUsageProgressBar(renderedPercent, width)} ${renderedPercent.toFixed(1)}%`;
-      return item.rawValue ? progressDisplay : `Session: ${progressDisplay}`;
+      return formatRawOrLabeledValue(item, "Session: ", progressDisplay);
     }
-    return item.rawValue ? `${percent.toFixed(1)}%` : `Session: ${percent.toFixed(1)}%`;
+    return formatRawOrLabeledValue(item, "Session: ", `${percent.toFixed(1)}%`);
   }
   getCustomKeybinds() {
     return [
@@ -56734,17 +56624,6 @@ class SessionUsageWidget {
   }
 }
 // src/widgets/WeeklyUsage.ts
-function getDisplayMode3(item) {
-  const mode = item.metadata?.display;
-  if (mode === "progress" || mode === "progress-short") {
-    return mode;
-  }
-  return "time";
-}
-function isInverted3(item) {
-  return item.metadata?.invert === "true";
-}
-
 class WeeklyUsageWidget {
   getDefaultColor() {
     return "brightBlue";
@@ -56759,67 +56638,32 @@ class WeeklyUsageWidget {
     return "Usage";
   }
   getEditorDisplay(item) {
-    const mode = getDisplayMode3(item);
-    const modifiers = [];
-    if (mode === "progress") {
-      modifiers.push("progress bar");
-    } else if (mode === "progress-short") {
-      modifiers.push("short bar");
-    }
-    if (isInverted3(item)) {
-      modifiers.push("inverted");
-    }
     return {
       displayText: this.getDisplayName(),
-      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+      modifierText: getUsageDisplayModifierText(item)
     };
   }
   handleEditorAction(action, item) {
     if (action === "toggle-progress") {
-      const currentMode = getDisplayMode3(item);
-      let nextMode;
-      if (currentMode === "time") {
-        nextMode = "progress";
-      } else if (currentMode === "progress") {
-        nextMode = "progress-short";
-      } else {
-        nextMode = "time";
-      }
-      const nextMetadata = {
-        ...item.metadata ?? {},
-        display: nextMode
-      };
-      if (nextMode === "time") {
-        delete nextMetadata.invert;
-      }
-      return {
-        ...item,
-        metadata: nextMetadata
-      };
+      return cycleUsageDisplayMode(item);
     }
     if (action === "toggle-invert") {
-      return {
-        ...item,
-        metadata: {
-          ...item.metadata,
-          invert: (!isInverted3(item)).toString()
-        }
-      };
+      return toggleUsageInverted(item);
     }
     return null;
   }
   render(item, context, settings) {
-    const displayMode = getDisplayMode3(item);
-    const inverted = isInverted3(item);
+    const displayMode = getUsageDisplayMode(item);
+    const inverted = isUsageInverted(item);
     if (context.isPreview) {
       const previewPercent = 12;
       const renderedPercent = inverted ? 100 - previewPercent : previewPercent;
-      if (displayMode === "progress" || displayMode === "progress-short") {
-        const width = displayMode === "progress" ? 32 : 16;
+      if (isUsageProgressMode(displayMode)) {
+        const width = getUsageProgressBarWidth(displayMode);
         const progressDisplay = `${makeUsageProgressBar(renderedPercent, width)} ${renderedPercent.toFixed(1)}%`;
-        return item.rawValue ? progressDisplay : `Weekly: ${progressDisplay}`;
+        return formatRawOrLabeledValue(item, "Weekly: ", progressDisplay);
       }
-      return item.rawValue ? `${previewPercent.toFixed(1)}%` : `Weekly: ${previewPercent.toFixed(1)}%`;
+      return formatRawOrLabeledValue(item, "Weekly: ", `${previewPercent.toFixed(1)}%`);
     }
     const data = fetchUsageData();
     if (data.error)
@@ -56827,13 +56671,13 @@ class WeeklyUsageWidget {
     if (data.weeklyUsage === undefined)
       return null;
     const percent = Math.max(0, Math.min(100, data.weeklyUsage));
-    if (displayMode === "progress" || displayMode === "progress-short") {
-      const width = displayMode === "progress" ? 32 : 16;
+    if (isUsageProgressMode(displayMode)) {
+      const width = getUsageProgressBarWidth(displayMode);
       const renderedPercent = inverted ? 100 - percent : percent;
       const progressDisplay = `${makeUsageProgressBar(renderedPercent, width)} ${renderedPercent.toFixed(1)}%`;
-      return item.rawValue ? progressDisplay : `Weekly: ${progressDisplay}`;
+      return formatRawOrLabeledValue(item, "Weekly: ", progressDisplay);
     }
-    return item.rawValue ? `${percent.toFixed(1)}%` : `Weekly: ${percent.toFixed(1)}%`;
+    return formatRawOrLabeledValue(item, "Weekly: ", `${percent.toFixed(1)}%`);
   }
   getCustomKeybinds() {
     return [
@@ -56849,16 +56693,6 @@ class WeeklyUsageWidget {
   }
 }
 // src/widgets/ResetTimer.ts
-function getDisplayMode4(item) {
-  const mode = item.metadata?.display;
-  if (mode === "progress" || mode === "progress-short") {
-    return mode;
-  }
-  return "time";
-}
-function isInverted4(item) {
-  return item.metadata?.invert === "true";
-}
 function makeTimerProgressBar2(percent, width) {
   const clampedPercent = Math.max(0, Math.min(100, percent));
   const filledWidth = Math.floor(clampedPercent / 100 * width);
@@ -56880,67 +56714,31 @@ class ResetTimerWidget {
     return "Usage";
   }
   getEditorDisplay(item) {
-    const mode = getDisplayMode4(item);
-    const modifiers = [];
-    if (mode === "progress") {
-      modifiers.push("progress bar");
-    } else if (mode === "progress-short") {
-      modifiers.push("short bar");
-    }
-    if (isInverted4(item)) {
-      modifiers.push("inverted");
-    }
     return {
       displayText: this.getDisplayName(),
-      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+      modifierText: getUsageDisplayModifierText(item)
     };
   }
   handleEditorAction(action, item) {
     if (action === "toggle-progress") {
-      const currentMode = getDisplayMode4(item);
-      let nextMode;
-      if (currentMode === "time") {
-        nextMode = "progress";
-      } else if (currentMode === "progress") {
-        nextMode = "progress-short";
-      } else {
-        nextMode = "time";
-      }
-      const nextMetadata = {
-        ...item.metadata ?? {},
-        display: nextMode
-      };
-      if (nextMode === "time") {
-        delete nextMetadata.invert;
-      }
-      return {
-        ...item,
-        metadata: nextMetadata
-      };
+      return cycleUsageDisplayMode(item);
     }
     if (action === "toggle-invert") {
-      return {
-        ...item,
-        metadata: {
-          ...item.metadata,
-          invert: (!isInverted4(item)).toString()
-        }
-      };
+      return toggleUsageInverted(item);
     }
     return null;
   }
   render(item, context, settings) {
-    const displayMode = getDisplayMode4(item);
-    const inverted = isInverted4(item);
+    const displayMode = getUsageDisplayMode(item);
+    const inverted = isUsageInverted(item);
     if (context.isPreview) {
       const previewPercent = inverted ? 90 : 10;
-      const prefix = item.rawValue ? "" : "Reset ";
-      if (displayMode === "progress" || displayMode === "progress-short") {
-        const barWidth = displayMode === "progress" ? 32 : 16;
+      if (isUsageProgressMode(displayMode)) {
+        const barWidth = getUsageProgressBarWidth(displayMode);
         const progressBar = makeTimerProgressBar2(previewPercent, barWidth);
-        return `${prefix}[${progressBar}] ${previewPercent.toFixed(1)}%`;
+        return formatRawOrLabeledValue(item, "Reset ", `[${progressBar}] ${previewPercent.toFixed(1)}%`);
       }
-      return item.rawValue ? "4hr 30m" : "Reset: 4hr 30m";
+      return formatRawOrLabeledValue(item, "Reset: ", "4hr 30m");
     }
     const usageData = fetchUsageData();
     const window2 = resolveUsageWindowWithFallback(usageData, context.blockMetrics);
@@ -56950,18 +56748,15 @@ class ResetTimerWidget {
       }
       return null;
     }
-    if (displayMode === "progress" || displayMode === "progress-short") {
-      const barWidth = displayMode === "progress" ? 32 : 16;
+    if (isUsageProgressMode(displayMode)) {
+      const barWidth = getUsageProgressBarWidth(displayMode);
       const percent = inverted ? window2.remainingPercent : window2.elapsedPercent;
       const progressBar = makeTimerProgressBar2(percent, barWidth);
       const percentage = percent.toFixed(1);
-      if (item.rawValue) {
-        return `[${progressBar}] ${percentage}%`;
-      }
-      return `Reset [${progressBar}] ${percentage}%`;
+      return formatRawOrLabeledValue(item, "Reset ", `[${progressBar}] ${percentage}%`);
     }
     const remainingTime = formatUsageDuration(window2.remainingMs);
-    return item.rawValue ? remainingTime : `Reset: ${remainingTime}`;
+    return formatRawOrLabeledValue(item, "Reset: ", remainingTime);
   }
   getCustomKeybinds() {
     return [
@@ -56977,7 +56772,7 @@ class ResetTimerWidget {
   }
 }
 // src/widgets/ContextBar.ts
-function getDisplayMode5(item) {
+function getDisplayMode(item) {
   return item.metadata?.display === "progress" ? "progress" : "progress-short";
 }
 
@@ -56995,7 +56790,7 @@ class ContextBarWidget {
     return "Context";
   }
   getEditorDisplay(item) {
-    const mode = getDisplayMode5(item);
+    const mode = getDisplayMode(item);
     const modifiers = [];
     if (mode === "progress-short") {
       modifiers.push("short bar");
@@ -57009,7 +56804,7 @@ class ContextBarWidget {
     if (action !== "toggle-progress") {
       return null;
     }
-    const currentMode = getDisplayMode5(item);
+    const currentMode = getDisplayMode(item);
     const nextMode = currentMode === "progress-short" ? "progress" : "progress-short";
     return {
       ...item,
@@ -57020,7 +56815,7 @@ class ContextBarWidget {
     };
   }
   render(item, context, settings) {
-    const displayMode = getDisplayMode5(item);
+    const displayMode = getDisplayMode(item);
     const barWidth = displayMode === "progress" ? 32 : 16;
     if (context.isPreview) {
       const previewDisplay = `${makeUsageProgressBar(25, barWidth)} 50k/200k (25%)`;
@@ -57033,9 +56828,8 @@ class ContextBarWidget {
       used = context.tokenMetrics.contextLength;
     }
     if (total === null && context.tokenMetrics) {
-      const model = context.data?.model;
-      const modelId = typeof model === "string" ? model : model?.id;
-      total = getContextConfig(modelId).maxTokens;
+      const modelIdentifier = getModelContextIdentifier(context.data?.model);
+      total = getContextConfig(modelIdentifier).maxTokens;
     }
     if (used === null || total === null || total <= 0) {
       return null;
@@ -57453,6 +57247,111 @@ var ConfirmDialog = ({ message, onConfirm, onCancel, inline = false }) => {
   }, undefined, true, undefined, this);
 };
 
+// src/tui/components/color-menu/mutations.ts
+function updateWidgetById(widgets, widgetId, updater) {
+  return widgets.map((widget) => widget.id === widgetId ? updater(widget) : widget);
+}
+function setWidgetColor(widgets, widgetId, color, editingBackground) {
+  return updateWidgetById(widgets, widgetId, (widget) => {
+    if (editingBackground) {
+      return {
+        ...widget,
+        backgroundColor: color
+      };
+    }
+    return {
+      ...widget,
+      color
+    };
+  });
+}
+function toggleWidgetBold(widgets, widgetId) {
+  return updateWidgetById(widgets, widgetId, (widget) => ({
+    ...widget,
+    bold: !widget.bold
+  }));
+}
+function resetWidgetStyling(widgets, widgetId) {
+  return updateWidgetById(widgets, widgetId, (widget) => {
+    const {
+      color,
+      backgroundColor,
+      bold,
+      ...restWidget
+    } = widget;
+    return restWidget;
+  });
+}
+function clearAllWidgetStyling(widgets) {
+  return widgets.map((widget) => {
+    const {
+      color,
+      backgroundColor,
+      bold,
+      ...restWidget
+    } = widget;
+    return restWidget;
+  });
+}
+function getDefaultForegroundColor(widget) {
+  if (widget.type === "separator" || widget.type === "flex-separator") {
+    return "white";
+  }
+  const widgetImpl = getWidget(widget.type);
+  return widgetImpl ? widgetImpl.getDefaultColor() : "white";
+}
+function getNextIndex(currentIndex, length, direction) {
+  if (direction === "right") {
+    return (currentIndex + 1) % length;
+  }
+  return currentIndex === 0 ? length - 1 : currentIndex - 1;
+}
+function cycleWidgetColor({
+  widgets,
+  widgetId,
+  direction,
+  editingBackground,
+  colors,
+  backgroundColors
+}) {
+  return updateWidgetById(widgets, widgetId, (widget) => {
+    if (editingBackground) {
+      if (backgroundColors.length === 0) {
+        return widget;
+      }
+      const currentBgColor = widget.backgroundColor ?? "";
+      let currentBgColorIndex = backgroundColors.indexOf(currentBgColor);
+      if (currentBgColorIndex === -1) {
+        currentBgColorIndex = 0;
+      }
+      const nextBgColorIndex = getNextIndex(currentBgColorIndex, backgroundColors.length, direction);
+      const nextBgColor = backgroundColors[nextBgColorIndex];
+      return {
+        ...widget,
+        backgroundColor: nextBgColor === "" ? undefined : nextBgColor
+      };
+    }
+    if (colors.length === 0) {
+      return widget;
+    }
+    const defaultColor = getDefaultForegroundColor(widget);
+    let currentColor = widget.color ?? defaultColor;
+    if (currentColor === "dim") {
+      currentColor = defaultColor;
+    }
+    let currentColorIndex = colors.indexOf(currentColor);
+    if (currentColorIndex === -1) {
+      currentColorIndex = 0;
+    }
+    const nextColorIndex = getNextIndex(currentColorIndex, colors.length, direction);
+    const nextColor = colors[nextColorIndex];
+    return {
+      ...widget,
+      color: nextColor
+    };
+  });
+}
+
 // src/tui/components/ColorMenu.tsx
 var jsx_dev_runtime6 = __toESM(require_jsx_dev_runtime(), 1);
 var ColorMenu = ({ widgets, lineIndex, settings, onUpdate, onBack }) => {
@@ -57493,16 +57392,7 @@ var ColorMenu = ({ widgets, lineIndex, settings, onUpdate, onBack }) => {
           const hexColor = `hex:${hexInput}`;
           const selectedWidget2 = colorableWidgets.find((widget) => widget.id === highlightedItemId);
           if (selectedWidget2) {
-            const newItems = widgets.map((widget) => {
-              if (widget.id === highlightedItemId) {
-                if (editingBackground) {
-                  return { ...widget, backgroundColor: hexColor };
-                } else {
-                  return { ...widget, color: hexColor };
-                }
-              }
-              return widget;
-            });
+            const newItems = setWidgetColor(widgets, selectedWidget2.id, hexColor, editingBackground);
             onUpdate(newItems);
           }
           setHexInputMode(false);
@@ -57531,16 +57421,7 @@ var ColorMenu = ({ widgets, lineIndex, settings, onUpdate, onBack }) => {
           const ansiColor = `ansi256:${code}`;
           const selectedWidget2 = colorableWidgets.find((widget) => widget.id === highlightedItemId);
           if (selectedWidget2) {
-            const newItems = widgets.map((widget) => {
-              if (widget.id === highlightedItemId) {
-                if (editingBackground) {
-                  return { ...widget, backgroundColor: ansiColor };
-                } else {
-                  return { ...widget, color: ansiColor };
-                }
-              }
-              return widget;
-            });
+            const newItems = setWidgetColor(widgets, selectedWidget2.id, ansiColor, editingBackground);
             onUpdate(newItems);
             setAnsi256InputMode(false);
             setAnsi256Input("");
@@ -57590,12 +57471,7 @@ var ColorMenu = ({ widgets, lineIndex, settings, onUpdate, onBack }) => {
       if (highlightedItemId && highlightedItemId !== "back") {
         const selectedWidget2 = colorableWidgets.find((widget) => widget.id === highlightedItemId);
         if (selectedWidget2) {
-          const newItems = widgets.map((widget) => {
-            if (widget.id === selectedWidget2.id) {
-              return { ...widget, bold: !widget.bold };
-            }
-            return widget;
-          });
+          const newItems = toggleWidgetBold(widgets, selectedWidget2.id);
           onUpdate(newItems);
         }
       }
@@ -57603,13 +57479,7 @@ var ColorMenu = ({ widgets, lineIndex, settings, onUpdate, onBack }) => {
       if (highlightedItemId && highlightedItemId !== "back") {
         const selectedWidget2 = colorableWidgets.find((widget) => widget.id === highlightedItemId);
         if (selectedWidget2) {
-          const newItems = widgets.map((widget) => {
-            if (widget.id === selectedWidget2.id) {
-              const { color, backgroundColor, bold, ...restWidget } = widget;
-              return restWidget;
-            }
-            return widget;
-          });
+          const newItems = resetWidgetStyling(widgets, selectedWidget2.id);
           onUpdate(newItems);
         }
       }
@@ -57619,47 +57489,13 @@ var ColorMenu = ({ widgets, lineIndex, settings, onUpdate, onBack }) => {
       if (highlightedItemId && highlightedItemId !== "back") {
         const selectedWidget2 = colorableWidgets.find((widget) => widget.id === highlightedItemId);
         if (selectedWidget2) {
-          const newItems = widgets.map((widget) => {
-            if (widget.id === selectedWidget2.id) {
-              if (editingBackground) {
-                const currentBgColor = widget.backgroundColor ?? "";
-                let currentBgColorIndex = bgColors.indexOf(currentBgColor);
-                if (currentBgColorIndex === -1)
-                  currentBgColorIndex = 0;
-                let nextBgColorIndex;
-                if (key.rightArrow) {
-                  nextBgColorIndex = (currentBgColorIndex + 1) % bgColors.length;
-                } else {
-                  nextBgColorIndex = currentBgColorIndex === 0 ? bgColors.length - 1 : currentBgColorIndex - 1;
-                }
-                const nextBgColor = bgColors[nextBgColorIndex];
-                return { ...widget, backgroundColor: nextBgColor === "" ? undefined : nextBgColor };
-              } else {
-                let defaultColor = "white";
-                if (widget.type !== "separator" && widget.type !== "flex-separator") {
-                  const widgetImpl = getWidget(widget.type);
-                  if (widgetImpl) {
-                    defaultColor = widgetImpl.getDefaultColor();
-                  }
-                }
-                let currentColor2 = widget.color ?? defaultColor;
-                if (currentColor2 === "dim") {
-                  currentColor2 = defaultColor;
-                }
-                let currentColorIndex = colors.indexOf(currentColor2);
-                if (currentColorIndex === -1)
-                  currentColorIndex = 0;
-                let nextColorIndex;
-                if (key.rightArrow) {
-                  nextColorIndex = (currentColorIndex + 1) % colors.length;
-                } else {
-                  nextColorIndex = currentColorIndex === 0 ? colors.length - 1 : currentColorIndex - 1;
-                }
-                const nextColor = colors[nextColorIndex];
-                return { ...widget, color: nextColor };
-              }
-            }
-            return widget;
+          const newItems = cycleWidgetColor({
+            widgets,
+            widgetId: selectedWidget2.id,
+            direction: key.rightArrow ? "right" : "left",
+            editingBackground,
+            colors,
+            backgroundColors: bgColors
           });
           onUpdate(newItems);
         }
@@ -57815,10 +57651,7 @@ var ColorMenu = ({ widgets, lineIndex, settings, onUpdate, onBack }) => {
           children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(ConfirmDialog, {
             inline: true,
             onConfirm: () => {
-              const newItems = widgets.map((widget) => {
-                const { color, backgroundColor, bold, ...restWidget } = widget;
-                return restWidget;
-              });
+              const newItems = clearAllWidgetStyling(widgets);
               onUpdate(newItems);
               setShowClearConfirm(false);
             },
@@ -58506,6 +58339,317 @@ var InstallMenu = ({
 };
 // src/tui/components/ItemsEditor.tsx
 var import_react37 = __toESM(require_react(), 1);
+
+// src/tui/components/items-editor/input-handlers.ts
+function setPickerState(setWidgetPicker, normalizeState, updater) {
+  setWidgetPicker((prev) => {
+    if (!prev) {
+      return prev;
+    }
+    return normalizeState(updater(prev));
+  });
+}
+function getPickerCategories(widgetCategories) {
+  return [...widgetCategories];
+}
+function normalizePickerState(state, widgetCatalog, widgetCategories) {
+  const filteredCategories = getPickerCategories(widgetCategories);
+  const selectedCategory = state.selectedCategory && filteredCategories.includes(state.selectedCategory) ? state.selectedCategory : filteredCategories[0] ?? null;
+  const hasTopLevelSearch = state.level === "category" && state.categoryQuery.trim().length > 0;
+  const effectiveCategory = hasTopLevelSearch ? "All" : selectedCategory ?? "All";
+  const effectiveQuery = hasTopLevelSearch ? state.categoryQuery : state.widgetQuery;
+  const filteredWidgets = filterWidgetCatalog(widgetCatalog, effectiveCategory, effectiveQuery);
+  const hasSelectedType = state.selectedType ? filteredWidgets.some((entry) => entry.type === state.selectedType) : false;
+  return {
+    ...state,
+    selectedCategory,
+    selectedType: hasSelectedType ? state.selectedType : filteredWidgets[0]?.type ?? null
+  };
+}
+function getPickerViewState(widgetPicker, widgetCatalog, widgetCategories) {
+  const filteredCategories = getPickerCategories(widgetCategories);
+  const selectedCategory = widgetPicker.selectedCategory && filteredCategories.includes(widgetPicker.selectedCategory) ? widgetPicker.selectedCategory : filteredCategories[0] ?? null;
+  const hasTopLevelSearch = widgetPicker.level === "category" && widgetPicker.categoryQuery.trim().length > 0;
+  const topLevelSearchEntries = hasTopLevelSearch ? filterWidgetCatalog(widgetCatalog, "All", widgetPicker.categoryQuery) : [];
+  const topLevelSelectedEntry = topLevelSearchEntries.find((entry) => entry.type === widgetPicker.selectedType) ?? topLevelSearchEntries[0];
+  const filteredWidgets = filterWidgetCatalog(widgetCatalog, selectedCategory ?? "All", widgetPicker.widgetQuery);
+  const selectedEntry = filteredWidgets.find((entry) => entry.type === widgetPicker.selectedType) ?? filteredWidgets[0];
+  return {
+    filteredCategories,
+    selectedCategory,
+    hasTopLevelSearch,
+    topLevelSearchEntries,
+    topLevelSelectedEntry,
+    filteredWidgets,
+    selectedEntry
+  };
+}
+function handlePickerInputMode({
+  input,
+  key,
+  widgetPicker,
+  widgetCatalog,
+  widgetCategories,
+  setWidgetPicker,
+  applyWidgetPickerSelection
+}) {
+  const normalizeState = (state) => normalizePickerState(state, widgetCatalog, widgetCategories);
+  const {
+    filteredCategories,
+    selectedCategory,
+    hasTopLevelSearch,
+    topLevelSearchEntries,
+    topLevelSelectedEntry,
+    filteredWidgets,
+    selectedEntry
+  } = getPickerViewState(widgetPicker, widgetCatalog, widgetCategories);
+  if (widgetPicker.level === "category") {
+    if (key.escape) {
+      if (widgetPicker.categoryQuery.length > 0) {
+        setPickerState(setWidgetPicker, normalizeState, (prev) => ({
+          ...prev,
+          categoryQuery: ""
+        }));
+      } else {
+        setWidgetPicker(null);
+      }
+    } else if (key.return) {
+      if (hasTopLevelSearch) {
+        if (topLevelSelectedEntry) {
+          applyWidgetPickerSelection(topLevelSelectedEntry.type);
+        }
+      } else if (selectedCategory) {
+        setPickerState(setWidgetPicker, normalizeState, (prev) => ({
+          ...prev,
+          level: "widget",
+          selectedCategory
+        }));
+      }
+    } else if (key.upArrow || key.downArrow) {
+      if (hasTopLevelSearch) {
+        if (topLevelSearchEntries.length === 0) {
+          return;
+        }
+        let currentIndex = topLevelSearchEntries.findIndex((entry) => entry.type === widgetPicker.selectedType);
+        if (currentIndex === -1) {
+          currentIndex = 0;
+        }
+        const nextIndex = key.downArrow ? Math.min(topLevelSearchEntries.length - 1, currentIndex + 1) : Math.max(0, currentIndex - 1);
+        const nextType = topLevelSearchEntries[nextIndex]?.type ?? null;
+        setPickerState(setWidgetPicker, normalizeState, (prev) => ({
+          ...prev,
+          selectedType: nextType
+        }));
+      } else {
+        if (filteredCategories.length === 0) {
+          return;
+        }
+        let currentIndex = filteredCategories.findIndex((category) => category === selectedCategory);
+        if (currentIndex === -1) {
+          currentIndex = 0;
+        }
+        const nextIndex = key.downArrow ? Math.min(filteredCategories.length - 1, currentIndex + 1) : Math.max(0, currentIndex - 1);
+        const nextCategory = filteredCategories[nextIndex] ?? null;
+        setPickerState(setWidgetPicker, normalizeState, (prev) => ({
+          ...prev,
+          selectedCategory: nextCategory
+        }));
+      }
+    } else if (key.backspace || key.delete) {
+      setPickerState(setWidgetPicker, normalizeState, (prev) => ({
+        ...prev,
+        categoryQuery: prev.categoryQuery.slice(0, -1)
+      }));
+    } else if (input && !key.ctrl && !key.meta && !key.tab) {
+      setPickerState(setWidgetPicker, normalizeState, (prev) => ({
+        ...prev,
+        categoryQuery: prev.categoryQuery + input
+      }));
+    }
+  } else {
+    if (key.escape) {
+      if (widgetPicker.widgetQuery.length > 0) {
+        setPickerState(setWidgetPicker, normalizeState, (prev) => ({
+          ...prev,
+          widgetQuery: ""
+        }));
+      } else {
+        setPickerState(setWidgetPicker, normalizeState, (prev) => ({
+          ...prev,
+          level: "category"
+        }));
+      }
+    } else if (key.return) {
+      if (selectedEntry) {
+        applyWidgetPickerSelection(selectedEntry.type);
+      }
+    } else if (key.upArrow || key.downArrow) {
+      if (filteredWidgets.length === 0) {
+        return;
+      }
+      let currentIndex = filteredWidgets.findIndex((entry) => entry.type === widgetPicker.selectedType);
+      if (currentIndex === -1) {
+        currentIndex = 0;
+      }
+      const nextIndex = key.downArrow ? Math.min(filteredWidgets.length - 1, currentIndex + 1) : Math.max(0, currentIndex - 1);
+      const nextType = filteredWidgets[nextIndex]?.type ?? null;
+      setPickerState(setWidgetPicker, normalizeState, (prev) => ({
+        ...prev,
+        selectedType: nextType
+      }));
+    } else if (key.backspace || key.delete) {
+      setPickerState(setWidgetPicker, normalizeState, (prev) => ({
+        ...prev,
+        widgetQuery: prev.widgetQuery.slice(0, -1)
+      }));
+    } else if (input && !key.ctrl && !key.meta && !key.tab) {
+      setPickerState(setWidgetPicker, normalizeState, (prev) => ({
+        ...prev,
+        widgetQuery: prev.widgetQuery + input
+      }));
+    }
+  }
+}
+function handleMoveInputMode({
+  key,
+  widgets,
+  selectedIndex,
+  onUpdate,
+  setSelectedIndex,
+  setMoveMode
+}) {
+  if (key.upArrow && selectedIndex > 0) {
+    const newWidgets = [...widgets];
+    const temp = newWidgets[selectedIndex];
+    const prev = newWidgets[selectedIndex - 1];
+    if (temp && prev) {
+      [newWidgets[selectedIndex], newWidgets[selectedIndex - 1]] = [prev, temp];
+    }
+    onUpdate(newWidgets);
+    setSelectedIndex(selectedIndex - 1);
+  } else if (key.downArrow && selectedIndex < widgets.length - 1) {
+    const newWidgets = [...widgets];
+    const temp = newWidgets[selectedIndex];
+    const next = newWidgets[selectedIndex + 1];
+    if (temp && next) {
+      [newWidgets[selectedIndex], newWidgets[selectedIndex + 1]] = [next, temp];
+    }
+    onUpdate(newWidgets);
+    setSelectedIndex(selectedIndex + 1);
+  } else if (key.escape || key.return) {
+    setMoveMode(false);
+  }
+}
+function handleNormalInputMode({
+  input,
+  key,
+  widgets,
+  selectedIndex,
+  separatorChars,
+  onBack,
+  onUpdate,
+  setSelectedIndex,
+  setMoveMode,
+  setShowClearConfirm,
+  openWidgetPicker,
+  getVisibleCustomKeybinds,
+  setCustomEditorWidget
+}) {
+  if (key.upArrow && widgets.length > 0) {
+    setSelectedIndex(Math.max(0, selectedIndex - 1));
+  } else if (key.downArrow && widgets.length > 0) {
+    setSelectedIndex(Math.min(widgets.length - 1, selectedIndex + 1));
+  } else if (key.leftArrow && widgets.length > 0) {
+    openWidgetPicker("change");
+  } else if (key.rightArrow && widgets.length > 0) {
+    openWidgetPicker("change");
+  } else if (key.return && widgets.length > 0) {
+    setMoveMode(true);
+  } else if (input === "a") {
+    openWidgetPicker("add");
+  } else if (input === "i") {
+    openWidgetPicker("insert");
+  } else if (input === "d" && widgets.length > 0) {
+    const newWidgets = widgets.filter((_, i) => i !== selectedIndex);
+    onUpdate(newWidgets);
+    if (selectedIndex >= newWidgets.length && selectedIndex > 0) {
+      setSelectedIndex(selectedIndex - 1);
+    }
+  } else if (input === "c") {
+    if (widgets.length > 0) {
+      setShowClearConfirm(true);
+    }
+  } else if (input === " " && widgets.length > 0) {
+    const currentWidget = widgets[selectedIndex];
+    if (currentWidget && currentWidget.type === "separator") {
+      const currentChar = currentWidget.character ?? "|";
+      const currentCharIndex = separatorChars.indexOf(currentChar);
+      const nextChar = separatorChars[(currentCharIndex + 1) % separatorChars.length];
+      const newWidgets = [...widgets];
+      newWidgets[selectedIndex] = { ...currentWidget, character: nextChar };
+      onUpdate(newWidgets);
+    }
+  } else if (input === "r" && widgets.length > 0) {
+    const currentWidget = widgets[selectedIndex];
+    if (currentWidget && currentWidget.type !== "separator" && currentWidget.type !== "flex-separator") {
+      const widgetImpl = getWidget(currentWidget.type);
+      if (!widgetImpl?.supportsRawValue()) {
+        return;
+      }
+      const newWidgets = [...widgets];
+      newWidgets[selectedIndex] = { ...currentWidget, rawValue: !currentWidget.rawValue };
+      onUpdate(newWidgets);
+    }
+  } else if (input === "m" && widgets.length > 0) {
+    const currentWidget = widgets[selectedIndex];
+    if (currentWidget && selectedIndex < widgets.length - 1 && currentWidget.type !== "separator" && currentWidget.type !== "flex-separator") {
+      const newWidgets = [...widgets];
+      let nextMergeState;
+      if (currentWidget.merge === undefined) {
+        nextMergeState = true;
+      } else if (currentWidget.merge === true) {
+        nextMergeState = "no-padding";
+      } else {
+        nextMergeState = undefined;
+      }
+      if (nextMergeState === undefined) {
+        const { merge: merge2, ...rest } = currentWidget;
+        newWidgets[selectedIndex] = rest;
+      } else {
+        newWidgets[selectedIndex] = { ...currentWidget, merge: nextMergeState };
+      }
+      onUpdate(newWidgets);
+    }
+  } else if (key.escape) {
+    onBack();
+  } else if (widgets.length > 0) {
+    const currentWidget = widgets[selectedIndex];
+    if (currentWidget && currentWidget.type !== "separator" && currentWidget.type !== "flex-separator") {
+      const widgetImpl = getWidget(currentWidget.type);
+      if (!widgetImpl?.getCustomKeybinds) {
+        return;
+      }
+      const customKeybinds = getVisibleCustomKeybinds(widgetImpl, currentWidget);
+      const matchedKeybind = customKeybinds.find((kb) => kb.key === input);
+      if (matchedKeybind && !key.ctrl) {
+        if (widgetImpl.handleEditorAction) {
+          const updatedWidget = widgetImpl.handleEditorAction(matchedKeybind.action, currentWidget);
+          if (updatedWidget) {
+            const newWidgets = [...widgets];
+            newWidgets[selectedIndex] = updatedWidget;
+            onUpdate(newWidgets);
+          } else if (widgetImpl.renderEditor) {
+            setCustomEditorWidget({ widget: currentWidget, impl: widgetImpl, action: matchedKeybind.action });
+          }
+        } else if (widgetImpl.renderEditor) {
+          setCustomEditorWidget({ widget: currentWidget, impl: widgetImpl, action: matchedKeybind.action });
+        }
+      }
+    }
+  }
+}
+
+// src/tui/components/ItemsEditor.tsx
 var jsx_dev_runtime9 = __toESM(require_jsx_dev_runtime(), 1);
 var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
   const [selectedIndex, setSelectedIndex] = import_react37.useState(0);
@@ -58541,23 +58685,6 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
   const handleEditorCancel = () => {
     setCustomEditorWidget(null);
   };
-  const getFilteredCategories = (query) => {
-    return [...widgetCategories];
-  };
-  const normalizePickerState = (state) => {
-    const filteredCategories = getFilteredCategories(state.categoryQuery);
-    const selectedCategory = state.selectedCategory && filteredCategories.includes(state.selectedCategory) ? state.selectedCategory : filteredCategories[0] ?? null;
-    const hasTopLevelSearch = state.level === "category" && state.categoryQuery.trim().length > 0;
-    const effectiveCategory = hasTopLevelSearch ? "All" : selectedCategory ?? "All";
-    const effectiveQuery = hasTopLevelSearch ? state.categoryQuery : state.widgetQuery;
-    const filteredWidgets = filterWidgetCatalog(widgetCatalog, effectiveCategory, effectiveQuery);
-    const hasSelectedType = state.selectedType ? filteredWidgets.some((entry) => entry.type === state.selectedType) : false;
-    return {
-      ...state,
-      selectedCategory,
-      selectedType: hasSelectedType ? state.selectedType : filteredWidgets[0]?.type ?? null
-    };
-  };
   const shouldShowCustomKeybind = (widget, keybind) => {
     if (keybind.action !== "toggle-invert") {
       return true;
@@ -58584,7 +58711,7 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
       categoryQuery: "",
       widgetQuery: "",
       selectedType
-    }));
+    }, widgetCatalog, widgetCategories));
   };
   const applyWidgetPickerSelection = (selectedType) => {
     if (!widgetPicker) {
@@ -58620,238 +58747,43 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
       return;
     }
     if (widgetPicker) {
-      const filteredCategories = getFilteredCategories(widgetPicker.categoryQuery);
-      const selectedCategory = widgetPicker.selectedCategory && filteredCategories.includes(widgetPicker.selectedCategory) ? widgetPicker.selectedCategory : filteredCategories[0] ?? null;
-      const hasTopLevelSearch = widgetPicker.level === "category" && widgetPicker.categoryQuery.trim().length > 0;
-      const topLevelSearchEntries2 = hasTopLevelSearch ? filterWidgetCatalog(widgetCatalog, "All", widgetPicker.categoryQuery) : [];
-      const topLevelSelectedEntry = topLevelSearchEntries2.find((entry) => entry.type === widgetPicker.selectedType) ?? topLevelSearchEntries2[0];
-      const filteredWidgets = filterWidgetCatalog(widgetCatalog, selectedCategory ?? "All", widgetPicker.widgetQuery);
-      const selectedEntry = filteredWidgets.find((entry) => entry.type === widgetPicker.selectedType) ?? filteredWidgets[0];
-      if (widgetPicker.level === "category") {
-        if (key.escape) {
-          if (widgetPicker.categoryQuery.length > 0) {
-            setWidgetPicker((prev) => prev ? normalizePickerState({
-              ...prev,
-              categoryQuery: ""
-            }) : prev);
-          } else {
-            setWidgetPicker(null);
-          }
-        } else if (key.return) {
-          if (hasTopLevelSearch) {
-            if (topLevelSelectedEntry) {
-              applyWidgetPickerSelection(topLevelSelectedEntry.type);
-            }
-          } else if (selectedCategory) {
-            setWidgetPicker((prev) => prev ? normalizePickerState({
-              ...prev,
-              level: "widget",
-              selectedCategory
-            }) : prev);
-          }
-        } else if (key.upArrow || key.downArrow) {
-          if (hasTopLevelSearch) {
-            if (topLevelSearchEntries2.length === 0) {
-              return;
-            }
-            let currentIndex = topLevelSearchEntries2.findIndex((entry) => entry.type === widgetPicker.selectedType);
-            if (currentIndex === -1) {
-              currentIndex = 0;
-            }
-            const nextIndex = key.downArrow ? Math.min(topLevelSearchEntries2.length - 1, currentIndex + 1) : Math.max(0, currentIndex - 1);
-            const nextType = topLevelSearchEntries2[nextIndex]?.type ?? null;
-            setWidgetPicker((prev) => prev ? normalizePickerState({
-              ...prev,
-              selectedType: nextType
-            }) : prev);
-          } else {
-            if (filteredCategories.length === 0) {
-              return;
-            }
-            let currentIndex = filteredCategories.findIndex((category) => category === selectedCategory);
-            if (currentIndex === -1) {
-              currentIndex = 0;
-            }
-            const nextIndex = key.downArrow ? Math.min(filteredCategories.length - 1, currentIndex + 1) : Math.max(0, currentIndex - 1);
-            const nextCategory = filteredCategories[nextIndex] ?? null;
-            setWidgetPicker((prev) => prev ? normalizePickerState({
-              ...prev,
-              selectedCategory: nextCategory
-            }) : prev);
-          }
-        } else if (key.backspace || key.delete) {
-          setWidgetPicker((prev) => prev ? normalizePickerState({
-            ...prev,
-            categoryQuery: prev.categoryQuery.slice(0, -1)
-          }) : prev);
-        } else if (input && !key.ctrl && !key.meta && !key.tab) {
-          setWidgetPicker((prev) => prev ? normalizePickerState({
-            ...prev,
-            categoryQuery: prev.categoryQuery + input
-          }) : prev);
-        }
-      } else {
-        if (key.escape) {
-          if (widgetPicker.widgetQuery.length > 0) {
-            setWidgetPicker((prev) => prev ? normalizePickerState({
-              ...prev,
-              widgetQuery: ""
-            }) : prev);
-          } else {
-            setWidgetPicker((prev) => prev ? normalizePickerState({
-              ...prev,
-              level: "category"
-            }) : prev);
-          }
-        } else if (key.return) {
-          if (selectedEntry) {
-            applyWidgetPickerSelection(selectedEntry.type);
-          }
-        } else if (key.upArrow || key.downArrow) {
-          if (filteredWidgets.length === 0) {
-            return;
-          }
-          let currentIndex = filteredWidgets.findIndex((entry) => entry.type === widgetPicker.selectedType);
-          if (currentIndex === -1) {
-            currentIndex = 0;
-          }
-          const nextIndex = key.downArrow ? Math.min(filteredWidgets.length - 1, currentIndex + 1) : Math.max(0, currentIndex - 1);
-          const nextType = filteredWidgets[nextIndex]?.type ?? null;
-          setWidgetPicker((prev) => prev ? normalizePickerState({
-            ...prev,
-            selectedType: nextType
-          }) : prev);
-        } else if (key.backspace || key.delete) {
-          setWidgetPicker((prev) => prev ? normalizePickerState({
-            ...prev,
-            widgetQuery: prev.widgetQuery.slice(0, -1)
-          }) : prev);
-        } else if (input && !key.ctrl && !key.meta && !key.tab) {
-          setWidgetPicker((prev) => prev ? normalizePickerState({
-            ...prev,
-            widgetQuery: prev.widgetQuery + input
-          }) : prev);
-        }
-      }
+      handlePickerInputMode({
+        input,
+        key,
+        widgetPicker,
+        widgetCatalog,
+        widgetCategories,
+        setWidgetPicker,
+        applyWidgetPickerSelection
+      });
       return;
     }
     if (moveMode) {
-      if (key.upArrow && selectedIndex > 0) {
-        const newWidgets = [...widgets];
-        const temp = newWidgets[selectedIndex];
-        const prev = newWidgets[selectedIndex - 1];
-        if (temp && prev) {
-          [newWidgets[selectedIndex], newWidgets[selectedIndex - 1]] = [prev, temp];
-        }
-        onUpdate(newWidgets);
-        setSelectedIndex(selectedIndex - 1);
-      } else if (key.downArrow && selectedIndex < widgets.length - 1) {
-        const newWidgets = [...widgets];
-        const temp = newWidgets[selectedIndex];
-        const next = newWidgets[selectedIndex + 1];
-        if (temp && next) {
-          [newWidgets[selectedIndex], newWidgets[selectedIndex + 1]] = [next, temp];
-        }
-        onUpdate(newWidgets);
-        setSelectedIndex(selectedIndex + 1);
-      } else if (key.escape || key.return) {
-        setMoveMode(false);
-      }
-    } else {
-      if (key.upArrow && widgets.length > 0) {
-        setSelectedIndex(Math.max(0, selectedIndex - 1));
-      } else if (key.downArrow && widgets.length > 0) {
-        setSelectedIndex(Math.min(widgets.length - 1, selectedIndex + 1));
-      } else if (key.leftArrow && widgets.length > 0) {
-        openWidgetPicker("change");
-      } else if (key.rightArrow && widgets.length > 0) {
-        openWidgetPicker("change");
-      } else if (key.return && widgets.length > 0) {
-        setMoveMode(true);
-      } else if (input === "a") {
-        openWidgetPicker("add");
-      } else if (input === "i") {
-        openWidgetPicker("insert");
-      } else if (input === "d" && widgets.length > 0) {
-        const newWidgets = widgets.filter((_, i) => i !== selectedIndex);
-        onUpdate(newWidgets);
-        if (selectedIndex >= newWidgets.length && selectedIndex > 0) {
-          setSelectedIndex(selectedIndex - 1);
-        }
-      } else if (input === "c") {
-        if (widgets.length > 0) {
-          setShowClearConfirm(true);
-        }
-      } else if (input === " " && widgets.length > 0) {
-        const currentWidget2 = widgets[selectedIndex];
-        if (currentWidget2 && currentWidget2.type === "separator") {
-          const currentChar = currentWidget2.character ?? "|";
-          const currentCharIndex = separatorChars.indexOf(currentChar);
-          const nextChar = separatorChars[(currentCharIndex + 1) % separatorChars.length];
-          const newWidgets = [...widgets];
-          newWidgets[selectedIndex] = { ...currentWidget2, character: nextChar };
-          onUpdate(newWidgets);
-        }
-      } else if (input === "r" && widgets.length > 0) {
-        const currentWidget2 = widgets[selectedIndex];
-        if (currentWidget2 && currentWidget2.type !== "separator" && currentWidget2.type !== "flex-separator") {
-          const widgetImpl = getWidget(currentWidget2.type);
-          if (!widgetImpl?.supportsRawValue()) {
-            return;
-          }
-          const newWidgets = [...widgets];
-          newWidgets[selectedIndex] = { ...currentWidget2, rawValue: !currentWidget2.rawValue };
-          onUpdate(newWidgets);
-        }
-      } else if (input === "m" && widgets.length > 0) {
-        const currentWidget2 = widgets[selectedIndex];
-        if (currentWidget2 && selectedIndex < widgets.length - 1 && currentWidget2.type !== "separator" && currentWidget2.type !== "flex-separator") {
-          const newWidgets = [...widgets];
-          let nextMergeState;
-          if (currentWidget2.merge === undefined) {
-            nextMergeState = true;
-          } else if (currentWidget2.merge === true) {
-            nextMergeState = "no-padding";
-          } else {
-            nextMergeState = undefined;
-          }
-          if (nextMergeState === undefined) {
-            const { merge: merge2, ...rest } = currentWidget2;
-            newWidgets[selectedIndex] = rest;
-          } else {
-            newWidgets[selectedIndex] = { ...currentWidget2, merge: nextMergeState };
-          }
-          onUpdate(newWidgets);
-        }
-      } else if (key.escape) {
-        onBack();
-      } else if (widgets.length > 0) {
-        const currentWidget2 = widgets[selectedIndex];
-        if (currentWidget2 && currentWidget2.type !== "separator" && currentWidget2.type !== "flex-separator") {
-          const widgetImpl = getWidget(currentWidget2.type);
-          if (widgetImpl) {
-            if (widgetImpl.getCustomKeybinds) {
-              const customKeybinds2 = getVisibleCustomKeybinds(widgetImpl, currentWidget2);
-              const matchedKeybind = customKeybinds2.find((kb) => kb.key === input);
-              if (matchedKeybind && !key.ctrl) {
-                if (widgetImpl.handleEditorAction) {
-                  const updatedWidget = widgetImpl.handleEditorAction(matchedKeybind.action, currentWidget2);
-                  if (updatedWidget) {
-                    const newWidgets = [...widgets];
-                    newWidgets[selectedIndex] = updatedWidget;
-                    onUpdate(newWidgets);
-                  } else if (widgetImpl.renderEditor) {
-                    setCustomEditorWidget({ widget: currentWidget2, impl: widgetImpl, action: matchedKeybind.action });
-                  }
-                } else if (widgetImpl.renderEditor) {
-                  setCustomEditorWidget({ widget: currentWidget2, impl: widgetImpl, action: matchedKeybind.action });
-                }
-              }
-            }
-          }
-        }
-      }
+      handleMoveInputMode({
+        key,
+        widgets,
+        selectedIndex,
+        onUpdate,
+        setSelectedIndex,
+        setMoveMode
+      });
+      return;
     }
+    handleNormalInputMode({
+      input,
+      key,
+      widgets,
+      selectedIndex,
+      separatorChars,
+      onBack,
+      onUpdate,
+      setSelectedIndex,
+      setMoveMode,
+      setShowClearConfirm,
+      openWidgetPicker,
+      getVisibleCustomKeybinds,
+      setCustomEditorWidget
+    });
   });
   const getWidgetDisplay = (widget) => {
     if (widget.type === "separator") {
@@ -58871,7 +58803,7 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
   };
   const hasFlexSeparator = widgets.some((widget) => widget.type === "flex-separator");
   const widthDetectionAvailable = canDetectTerminalWidth();
-  const pickerCategories = widgetPicker ? getFilteredCategories(widgetPicker.categoryQuery) : [];
+  const pickerCategories = widgetPicker ? [...widgetCategories] : [];
   const selectedPickerCategory = widgetPicker ? widgetPicker.selectedCategory && pickerCategories.includes(widgetPicker.selectedCategory) ? widgetPicker.selectedCategory : pickerCategories[0] ?? null : null;
   const topLevelSearchEntries = widgetPicker && widgetPicker.level === "category" && widgetPicker.categoryQuery.trim().length > 0 ? filterWidgetCatalog(widgetCatalog, "All", widgetPicker.categoryQuery) : [];
   const selectedTopLevelSearchEntry = widgetPicker ? topLevelSearchEntries.find((entry) => entry.type === widgetPicker.selectedType) ?? topLevelSearchEntries[0] : null;
@@ -59659,6 +59591,30 @@ var MainMenu = ({ onSelect, isClaudeInstalled, hasChanges, initialSelection = 0,
 var import_react42 = __toESM(require_react(), 1);
 import * as os10 from "os";
 
+// src/utils/powerline-settings.ts
+function resolveEnabledPowerlineTheme(theme) {
+  if (!theme || theme === "custom") {
+    return getDefaultPowerlineTheme();
+  }
+  return theme;
+}
+function buildEnabledPowerlineSettings(settings, removeManualSeparators) {
+  const powerlineConfig = settings.powerline;
+  const lines = removeManualSeparators ? settings.lines.map((line) => line.filter((item) => item.type !== "separator" && item.type !== "flex-separator")) : settings.lines;
+  return {
+    ...settings,
+    powerline: {
+      ...powerlineConfig,
+      enabled: true,
+      theme: resolveEnabledPowerlineTheme(powerlineConfig.theme),
+      separators: powerlineConfig.separators,
+      separatorInvertBackground: powerlineConfig.separatorInvertBackground
+    },
+    defaultPadding: " ",
+    lines
+  };
+}
+
 // src/tui/components/PowerlineSeparatorEditor.tsx
 var import_react40 = __toESM(require_react(), 1);
 var jsx_dev_runtime12 = __toESM(require_jsx_dev_runtime(), 1);
@@ -60271,19 +60227,7 @@ var PowerlineSetup = ({
           if (hasSeparatorItems) {
             setConfirmingEnable(true);
           } else {
-            const theme = !powerlineConfig.theme || powerlineConfig.theme === "custom" ? getDefaultPowerlineTheme() : powerlineConfig.theme;
-            const updatedSettings = {
-              ...settings,
-              powerline: {
-                ...powerlineConfig,
-                enabled: true,
-                theme,
-                separators: powerlineConfig.separators,
-                separatorInvertBackground: powerlineConfig.separatorInvertBackground
-              },
-              defaultPadding: " "
-            };
-            onUpdate(updatedSettings);
+            onUpdate(buildEnabledPowerlineSettings(settings, false));
           }
         } else {
           const newConfig = { ...powerlineConfig, enabled: false };
@@ -60513,20 +60457,7 @@ var PowerlineSetup = ({
             children: /* @__PURE__ */ jsx_dev_runtime14.jsxDEV(ConfirmDialog, {
               inline: true,
               onConfirm: () => {
-                const theme = !powerlineConfig.theme || powerlineConfig.theme === "custom" ? getDefaultPowerlineTheme() : powerlineConfig.theme;
-                const updatedSettings = {
-                  ...settings,
-                  powerline: {
-                    ...powerlineConfig,
-                    enabled: true,
-                    theme,
-                    separators: powerlineConfig.separators,
-                    separatorInvertBackground: powerlineConfig.separatorInvertBackground
-                  },
-                  defaultPadding: " ",
-                  lines: settings.lines.map((line) => line.filter((item) => item.type !== "separator" && item.type !== "flex-separator"))
-                };
-                onUpdate(updatedSettings);
+                onUpdate(buildEnabledPowerlineSettings(settings, true));
                 setConfirmingEnable(false);
               },
               onCancel: () => {
@@ -60695,8 +60626,19 @@ var PowerlineSetup = ({
 };
 // src/tui/components/StatusLinePreview.tsx
 var import_react43 = __toESM(require_react(), 1);
+
+// src/utils/separator-index.ts
+function countSeparatorSlots(widgets) {
+  const nonMergedWidgets = widgets.filter((_, idx) => idx === widgets.length - 1 || !widgets[idx]?.merge);
+  return Math.max(0, nonMergedWidgets.length - 1);
+}
+function advanceGlobalSeparatorIndex(currentIndex, widgets) {
+  return currentIndex + countSeparatorSlots(widgets);
+}
+
+// src/tui/components/StatusLinePreview.tsx
 var jsx_dev_runtime15 = __toESM(require_jsx_dev_runtime(), 1);
-var renderSingleLine = (widgets, terminalWidth, widthDetectionAvailable, settings, lineIndex, globalSeparatorIndex, preRenderedWidgets, preCalculatedMaxWidths) => {
+var renderSingleLine = (widgets, terminalWidth, settings, lineIndex, globalSeparatorIndex, preRenderedWidgets, preCalculatedMaxWidths) => {
   const context = {
     terminalWidth,
     isPreview: true,
@@ -60706,7 +60648,6 @@ var renderSingleLine = (widgets, terminalWidth, widthDetectionAvailable, setting
   return renderStatusLineWithInfo(widgets, settings, context, preRenderedWidgets, preCalculatedMaxWidths);
 };
 var StatusLinePreview = ({ lines, terminalWidth, settings, onTruncationChange }) => {
-  const widthDetectionAvailable = import_react43.default.useMemo(() => canDetectTerminalWidth(), []);
   const { renderedLines, anyTruncated } = import_react43.default.useMemo(() => {
     if (!settings)
       return { renderedLines: [], anyTruncated: false };
@@ -60719,19 +60660,16 @@ var StatusLinePreview = ({ lines, terminalWidth, settings, onTruncationChange })
       const lineItems = lines[i];
       if (lineItems && lineItems.length > 0) {
         const preRenderedWidgets = preRenderedLines[i] ?? [];
-        const renderResult = renderSingleLine(lineItems, terminalWidth, widthDetectionAvailable, settings, i, globalSeparatorIndex, preRenderedWidgets, preCalculatedMaxWidths);
+        const renderResult = renderSingleLine(lineItems, terminalWidth, settings, i, globalSeparatorIndex, preRenderedWidgets, preCalculatedMaxWidths);
         result.push(renderResult.line);
         if (renderResult.wasTruncated) {
           truncated = true;
         }
-        const nonMergedWidgets = lineItems.filter((_, idx) => idx === lineItems.length - 1 || !lineItems[idx]?.merge);
-        if (nonMergedWidgets.length > 1) {
-          globalSeparatorIndex += nonMergedWidgets.length - 1;
-        }
+        globalSeparatorIndex = advanceGlobalSeparatorIndex(globalSeparatorIndex, lineItems);
       }
     }
     return { renderedLines: result, anyTruncated: truncated };
-  }, [lines, terminalWidth, widthDetectionAvailable, settings]);
+  }, [lines, terminalWidth, settings]);
   import_react43.default.useEffect(() => {
     onTruncationChange?.(anyTruncated);
   }, [anyTruncated, onTruncationChange]);
@@ -60766,6 +60704,59 @@ var StatusLinePreview = ({ lines, terminalWidth, settings, onTruncationChange })
 };
 // src/tui/components/TerminalOptionsMenu.tsx
 var import_react44 = __toESM(require_react(), 1);
+
+// src/utils/color-sanitize.ts
+function isCustomColor(value) {
+  if (!value) {
+    return false;
+  }
+  return value.startsWith("ansi256:") || value.startsWith("hex:");
+}
+function isIncompatibleForLevel(value, nextLevel) {
+  if (!isCustomColor(value)) {
+    return false;
+  }
+  if (nextLevel === 2) {
+    return Boolean(value?.startsWith("hex:"));
+  }
+  if (nextLevel === 3) {
+    return Boolean(value?.startsWith("ansi256:"));
+  }
+  return true;
+}
+function resetWidgetForegroundToDefault(widget, nextWidget) {
+  if (widget.type === "separator" || widget.type === "flex-separator") {
+    return nextWidget;
+  }
+  const widgetImpl = getWidget(widget.type);
+  if (!widgetImpl) {
+    return nextWidget;
+  }
+  return {
+    ...nextWidget,
+    color: widgetImpl.getDefaultColor()
+  };
+}
+function hasCustomWidgetColors(lines) {
+  return lines.some((line) => line.some((widget) => isCustomColor(widget.color) || isCustomColor(widget.backgroundColor)));
+}
+function sanitizeLinesForColorLevel(lines, nextLevel) {
+  return lines.map((line) => line.map((widget) => {
+    let nextWidget = { ...widget };
+    if (isIncompatibleForLevel(widget.color, nextLevel)) {
+      nextWidget = resetWidgetForegroundToDefault(widget, nextWidget);
+    }
+    if (isIncompatibleForLevel(widget.backgroundColor, nextLevel)) {
+      nextWidget = {
+        ...nextWidget,
+        backgroundColor: undefined
+      };
+    }
+    return nextWidget;
+  }));
+}
+
+// src/tui/components/TerminalOptionsMenu.tsx
 var jsx_dev_runtime16 = __toESM(require_jsx_dev_runtime(), 1);
 var TerminalOptionsMenu = ({ settings, onUpdate, onBack }) => {
   const [showColorWarning, setShowColorWarning] = import_react44.useState(false);
@@ -60777,7 +60768,7 @@ var TerminalOptionsMenu = ({ settings, onUpdate, onBack }) => {
     } else if (selectedIndex === 0) {
       onBack("width");
     } else if (selectedIndex === 1) {
-      const hasCustomColors = settings.lines.some((line) => line.some((widget) => Boolean(widget.color && (widget.color.startsWith("ansi256:") || widget.color.startsWith("hex:"))) || Boolean(widget.backgroundColor && (widget.backgroundColor.startsWith("ansi256:") || widget.backgroundColor.startsWith("hex:")))));
+      const hasCustomColors = hasCustomWidgetColors(settings.lines);
       const currentLevel = settings.colorLevel;
       const nextLevel = (currentLevel + 1) % 4;
       if (hasCustomColors && (currentLevel === 2 && nextLevel !== 2 || currentLevel === 3 && nextLevel !== 3)) {
@@ -60785,47 +60776,7 @@ var TerminalOptionsMenu = ({ settings, onUpdate, onBack }) => {
         setPendingColorLevel(nextLevel);
       } else {
         source_default.level = nextLevel;
-        const cleanedLines = settings.lines.map((line) => line.map((widget) => {
-          const newWidget = { ...widget };
-          if (nextLevel === 2) {
-            if (widget.color?.startsWith("hex:")) {
-              if (widget.type !== "separator" && widget.type !== "flex-separator") {
-                const widgetImpl = getWidget(widget.type);
-                if (widgetImpl) {
-                  newWidget.color = widgetImpl.getDefaultColor();
-                }
-              }
-            }
-            if (widget.backgroundColor?.startsWith("hex:")) {
-              newWidget.backgroundColor = undefined;
-            }
-          } else if (nextLevel === 3) {
-            if (widget.color?.startsWith("ansi256:")) {
-              if (widget.type !== "separator" && widget.type !== "flex-separator") {
-                const widgetImpl = getWidget(widget.type);
-                if (widgetImpl) {
-                  newWidget.color = widgetImpl.getDefaultColor();
-                }
-              }
-            }
-            if (widget.backgroundColor?.startsWith("ansi256:")) {
-              newWidget.backgroundColor = undefined;
-            }
-          } else {
-            if (widget.color?.startsWith("ansi256:") || widget.color?.startsWith("hex:")) {
-              if (widget.type !== "separator" && widget.type !== "flex-separator") {
-                const widgetImpl = getWidget(widget.type);
-                if (widgetImpl) {
-                  newWidget.color = widgetImpl.getDefaultColor();
-                }
-              }
-            }
-            if (widget.backgroundColor?.startsWith("ansi256:") || widget.backgroundColor?.startsWith("hex:")) {
-              newWidget.backgroundColor = undefined;
-            }
-          }
-          return newWidget;
-        }));
+        const cleanedLines = sanitizeLinesForColorLevel(settings.lines, nextLevel);
         onUpdate({
           ...settings,
           lines: cleanedLines,
@@ -60837,23 +60788,7 @@ var TerminalOptionsMenu = ({ settings, onUpdate, onBack }) => {
   const handleColorConfirm = () => {
     if (pendingColorLevel !== null) {
       source_default.level = pendingColorLevel;
-      const cleanedLines = settings.lines.map((line) => line.map((widget) => {
-        const newWidget = { ...widget };
-        if (pendingColorLevel !== 2 && pendingColorLevel !== 3 || pendingColorLevel === 2 && (widget.color?.startsWith("hex:") || widget.backgroundColor?.startsWith("hex:")) || pendingColorLevel === 3 && (widget.color?.startsWith("ansi256:") || widget.backgroundColor?.startsWith("ansi256:"))) {
-          if (widget.color?.startsWith("ansi256:") || widget.color?.startsWith("hex:")) {
-            if (widget.type !== "separator" && widget.type !== "flex-separator") {
-              const widgetImpl = getWidget(widget.type);
-              if (widgetImpl) {
-                newWidget.color = widgetImpl.getDefaultColor();
-              }
-            }
-          }
-          if (widget.backgroundColor?.startsWith("ansi256:") || widget.backgroundColor?.startsWith("hex:")) {
-            newWidget.backgroundColor = undefined;
-          }
-        }
-        return newWidget;
-      }));
+      const cleanedLines = sanitizeLinesForColorLevel(settings.lines, pendingColorLevel);
       onUpdate({
         ...settings,
         lines: cleanedLines,
@@ -61215,7 +61150,7 @@ var App2 = () => {
     loadSettings().then((loadedSettings) => {
       source_default.level = loadedSettings.colorLevel;
       setSettings(loadedSettings);
-      setOriginalSettings(JSON.parse(JSON.stringify(loadedSettings)));
+      setOriginalSettings(cloneSettings(loadedSettings));
     });
     isInstalled().then(setIsClaudeInstalled);
     const fontStatus = checkPowerlineFonts();
@@ -61254,7 +61189,7 @@ var App2 = () => {
     if (key.ctrl && input === "s" && settings) {
       (async () => {
         await saveSettings(settings);
-        setOriginalSettings(JSON.parse(JSON.stringify(settings)));
+        setOriginalSettings(cloneSettings(settings));
         setHasChanges(false);
         setFlashMessage({
           text: "✓ Configuration saved",
@@ -61367,7 +61302,7 @@ ${GITHUB_REPO_URL}`,
         break;
       case "save":
         await saveSettings(settings);
-        setOriginalSettings(JSON.parse(JSON.stringify(settings)));
+        setOriginalSettings(cloneSettings(settings));
         setHasChanges(false);
         exit();
         break;
@@ -61433,7 +61368,7 @@ ${GITHUB_REPO_URL}`,
                   install: 5,
                   starGithub: hasChanges ? 8 : 7
                 };
-                setMenuSelections({ ...menuSelections, main: menuMap[value] ?? 0 });
+                setMenuSelections((prev) => ({ ...prev, main: menuMap[value] ?? 0 }));
               }
               handleMainMenuSelect(value);
             },
@@ -61447,12 +61382,12 @@ ${GITHUB_REPO_URL}`,
           screen === "lines" && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(LineSelector, {
             lines: settings.lines,
             onSelect: (line) => {
-              setMenuSelections({ ...menuSelections, lines: line });
+              setMenuSelections((prev) => ({ ...prev, lines: line }));
               handleLineSelect(line);
             },
             onLinesUpdate: updateLines,
             onBack: () => {
-              setMenuSelections({ ...menuSelections, main: 0 });
+              setMenuSelections((prev) => ({ ...prev, main: 0 }));
               setScreen("main");
             },
             initialSelection: menuSelections.lines,
@@ -61465,7 +61400,7 @@ ${GITHUB_REPO_URL}`,
               updateLine(selectedLine, widgets);
             },
             onBack: () => {
-              setMenuSelections({ ...menuSelections, lines: selectedLine });
+              setMenuSelections((prev) => ({ ...prev, lines: selectedLine }));
               setScreen("lines");
             },
             lineNumber: selectedLine + 1,
@@ -61475,12 +61410,12 @@ ${GITHUB_REPO_URL}`,
             lines: settings.lines,
             onLinesUpdate: updateLines,
             onSelect: (line) => {
-              setMenuSelections({ ...menuSelections, lines: line });
+              setMenuSelections((prev) => ({ ...prev, lines: line }));
               setSelectedLine(line);
               setScreen("colors");
             },
             onBack: () => {
-              setMenuSelections({ ...menuSelections, main: 1 });
+              setMenuSelections((prev) => ({ ...prev, main: 1 }));
               setScreen("main");
             },
             initialSelection: menuSelections.lines,
@@ -61511,7 +61446,7 @@ ${GITHUB_REPO_URL}`,
               if (target === "width") {
                 setScreen("terminalWidth");
               } else {
-                setMenuSelections({ ...menuSelections, main: 3 });
+                setMenuSelections((prev) => ({ ...prev, main: 3 }));
                 setScreen("main");
               }
             }
@@ -61531,7 +61466,7 @@ ${GITHUB_REPO_URL}`,
               setSettings(updatedSettings);
             },
             onBack: () => {
-              setMenuSelections({ ...menuSelections, main: 4 });
+              setMenuSelections((prev) => ({ ...prev, main: 4 }));
               setScreen("main");
             }
           }, undefined, false, undefined, this),
@@ -61589,6 +61524,17 @@ function runTUI() {
   render_default(/* @__PURE__ */ jsx_dev_runtime18.jsxDEV(App2, {}, undefined, false, undefined, this));
 }
 // src/types/StatusJSON.ts
+var CoercedNumberSchema = exports_external.preprocess((value) => {
+  if (typeof value !== "string") {
+    return value;
+  }
+  const trimmed = value.trim();
+  if (trimmed.length === 0) {
+    return value;
+  }
+  const parsed = Number(trimmed);
+  return Number.isFinite(parsed) ? parsed : value;
+}, exports_external.number());
 var StatusJSONSchema = exports_external.looseObject({
   hook_event_name: exports_external.string().optional(),
   session_id: exports_external.string().optional(),
@@ -61608,27 +61554,27 @@ var StatusJSONSchema = exports_external.looseObject({
   version: exports_external.string().optional(),
   output_style: exports_external.object({ name: exports_external.string().optional() }).optional(),
   cost: exports_external.object({
-    total_cost_usd: exports_external.number().optional(),
-    total_duration_ms: exports_external.number().optional(),
-    total_api_duration_ms: exports_external.number().optional(),
-    total_lines_added: exports_external.number().optional(),
-    total_lines_removed: exports_external.number().optional()
+    total_cost_usd: CoercedNumberSchema.optional(),
+    total_duration_ms: CoercedNumberSchema.optional(),
+    total_api_duration_ms: CoercedNumberSchema.optional(),
+    total_lines_added: CoercedNumberSchema.optional(),
+    total_lines_removed: CoercedNumberSchema.optional()
   }).optional(),
   context_window: exports_external.object({
-    context_window_size: exports_external.number().nullable().optional(),
-    total_input_tokens: exports_external.number().nullable().optional(),
-    total_output_tokens: exports_external.number().nullable().optional(),
+    context_window_size: CoercedNumberSchema.nullable().optional(),
+    total_input_tokens: CoercedNumberSchema.nullable().optional(),
+    total_output_tokens: CoercedNumberSchema.nullable().optional(),
     current_usage: exports_external.union([
-      exports_external.number(),
+      CoercedNumberSchema,
       exports_external.object({
-        input_tokens: exports_external.number().optional(),
-        output_tokens: exports_external.number().optional(),
-        cache_creation_input_tokens: exports_external.number().optional(),
-        cache_read_input_tokens: exports_external.number().optional()
+        input_tokens: CoercedNumberSchema.optional(),
+        output_tokens: CoercedNumberSchema.optional(),
+        cache_creation_input_tokens: CoercedNumberSchema.optional(),
+        cache_read_input_tokens: CoercedNumberSchema.optional()
       })
     ]).nullable().optional(),
-    used_percentage: exports_external.number().nullable().optional(),
-    remaining_percentage: exports_external.number().nullable().optional()
+    used_percentage: CoercedNumberSchema.nullable().optional(),
+    remaining_percentage: CoercedNumberSchema.nullable().optional()
   }).nullable().optional()
 });
 
@@ -61699,12 +61645,10 @@ async function renderMultipleLines(data) {
       const line = renderStatusLine(lineItems, settings, lineContext, preRenderedWidgets, preCalculatedMaxWidths);
       const strippedLine = getVisibleText(line).trim();
       if (strippedLine.length > 0) {
-        const nonMergedWidgets = lineItems.filter((_, idx) => idx === lineItems.length - 1 || !lineItems[idx]?.merge);
-        if (nonMergedWidgets.length > 1)
-          globalSeparatorIndex += nonMergedWidgets.length - 1;
         let outputLine = line.replace(/ /g, " ");
         outputLine = "\x1B[0m" + outputLine;
         console.log(outputLine);
+        globalSeparatorIndex = advanceGlobalSeparatorIndex(globalSeparatorIndex, lineItems);
       }
     }
   }