ccstatusline 2.1.5 → 2.1.7

package/README.md

@@ -46,14 +46,16 @@
 
 ## 🆕 Recent Updates
 
-### v2.1.0 - v2.1.4 - Usage widgets, links, new git insertions / deletions widgets, and reliability fixes
+### v2.1.0 - v2.1.7 - Usage widgets, links, new git insertions / deletions widgets, and reliability fixes
 
-- **🧩 New Usage widgets (v2.1.0)** - Added **Session Usage**, **Weekly Usage**, **Reset Timer**, and **Context Bar** widgets.
+- **🧩 New Usage widgets (v2.1.0)** - Added **Session Usage**, **Weekly Usage**, **Block Reset Timer**, and **Context Bar** widgets.
 - **📊 More accurate counts (v2.1.0)** - Usage/context widgets now use new statusline JSON metrics when available for more accurate token and context counts.
 - **🪟 Windows empty file bug fix (v2.1.1)** - Fixed a Windows issue that could create an empty `c:\dev\null` file.
 - **🔗 New Link widget (v2.1.3)** - Added a new **Link** widget with clickable OSC8 rendering, preview parity, and raw mode support.
 - **➕ New Git Insertions widget (v2.1.4)** - Added a dedicated Git widget that shows only uncommitted insertions (e.g., `+42`).
 - **➖ New Git Deletions widget (v2.1.4)** - Added a dedicated Git widget that shows only uncommitted deletions (e.g., `-10`).
+- **🧠 Context format fallback fix (v2.1.6)** - When `context_window_size` is missing, context widgets now infer 1M models from long-context labels such as `[1m]` and `1M context` in model identifiers.
+- **⏳ Weekly reset timer split (v2.1.7)** - Added a separate `Weekly Reset Timer` widget.
 
 ### v2.0.26 - v2.0.29 - Performance, git internals, and workflow improvements
 
@@ -425,7 +427,8 @@ bun run example
 - **Session Name** - Shows the session name set via `/rename` command in Claude Code
 - **Claude Session ID** - Shows the current Claude Code session ID from status JSON
 - **Block Timer** - Shows time elapsed in current 5-hour block or progress bar
-- **Reset Timer** - Shows time remaining until the current 5-hour block resets
+- **Block Reset Timer** - Shows time remaining until the current 5-hour block resets
+- **Weekly Reset Timer** - Shows time remaining until the weekly usage window resets
 - **Current Working Directory** - Shows current working directory with segment limit, fish-style abbreviation, and optional `~` home abbreviation
 - **Version** - Shows Claude Code version
 - **Output Style** - Shows the currently set output style in Claude Code
@@ -434,8 +437,8 @@ bun run example
 - **Tokens Cached** - Shows cached tokens used
 - **Tokens Total** - Shows total tokens used
 - **Context Length** - Shows current context length in tokens
-- **Context Percentage** - Shows percentage of context limit used (dynamic: 1M for model IDs with `[1m]` suffix, 200k otherwise)
-- **Context Percentage (usable)** - Shows percentage of usable context (dynamic: 800k for model IDs with `[1m]` suffix, 160k otherwise, accounting for auto-compact at 80%)
+- **Context Percentage** - Shows percentage of context limit used (dynamic: 1M for model IDs with long-context labels like `[1m]` or `1M context`, 200k otherwise)
+- **Context Percentage (usable)** - Shows percentage of usable context (dynamic: 800k for model IDs with long-context labels like `[1m]` or `1M context`, 160k otherwise, accounting for auto-compact at 80%)
 - **Context Bar** - Shows context usage as a progress bar with short/full display modes
 - **Terminal Width** - Shows detected terminal width (for debugging)
 - **Memory Usage** - Shows system memory usage (used/total, e.g., "Mem: 12.4G/16.0G")
@@ -527,6 +530,8 @@ Widget-specific shortcuts:
 - **Git widgets**: `h` toggle hide `no git` output
 - **Context % widgets**: `u` toggle used vs remaining display
 - **Block Timer**: `p` cycle display mode (time/full bar/short bar)
+- **Block Reset Timer**: `p` cycle display mode (time/full bar/short bar)
+- **Weekly Reset Timer**: `p` cycle display mode (time/full bar/short bar)
 - **Current Working Dir**: `h` home abbreviation, `s` segment editor, `f` fish-style path
 - **Custom Command**: `e` command, `w` max width, `t` timeout, `p` preserve ANSI colors
 - **Link**: `u` URL, `e` link text

package/dist/ccstatusline.js

@@ -51478,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.5";
+var PACKAGE_VERSION = "2.1.7";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -53032,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;
@@ -53070,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);
 }
 
@@ -53880,9 +53926,8 @@ class ContextPercentageWidget {
       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 formatRawOrLabeledValue(item, "Ctx: ", `${displayPercentage.toFixed(1)}%`);
@@ -53926,10 +53971,9 @@ class ContextPercentageUsableWidget {
   }
   render(item, context, settings) {
     const isInverse = isContextInverse(item);
-    const model = context.data?.model;
-    const modelId = typeof model === "string" ? model : model?.id;
+    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 formatRawOrLabeledValue(item, "Ctx(u): ", previewValue);
@@ -55646,12 +55690,14 @@ var CACHE_MAX_AGE = 180;
 var LOCK_MAX_AGE = 30;
 var TOKEN_CACHE_MAX_AGE = 3600;
 var FIVE_HOUR_BLOCK_MS = 5 * 60 * 60 * 1000;
+var SEVEN_DAY_WINDOW_MS = 7 * 24 * 60 * 60 * 1000;
 var UsageErrorSchema = exports_external.enum(["no-credentials", "timeout", "api-error", "parse-error"]);
 var UsageCredentialsSchema = exports_external.object({ claudeAiOauth: exports_external.object({ accessToken: exports_external.string().nullable().optional() }).optional() });
 var CachedUsageDataSchema = exports_external.object({
   sessionUsage: exports_external.number().nullable().optional(),
   sessionResetAt: exports_external.string().nullable().optional(),
   weeklyUsage: exports_external.number().nullable().optional(),
+  weeklyResetAt: exports_external.string().nullable().optional(),
   extraUsageEnabled: exports_external.boolean().nullable().optional(),
   extraUsageLimit: exports_external.number().nullable().optional(),
   extraUsageUsed: exports_external.number().nullable().optional(),
@@ -55661,10 +55707,12 @@ var CachedUsageDataSchema = exports_external.object({
 var UsageApiResponseSchema = exports_external.object({
   five_hour: exports_external.object({
     utilization: exports_external.number().nullable().optional(),
-    reset_at: exports_external.string().nullable().optional(),
     resets_at: exports_external.string().nullable().optional()
   }).optional(),
-  seven_day: exports_external.object({ utilization: exports_external.number().nullable().optional() }).optional(),
+  seven_day: exports_external.object({
+    utilization: exports_external.number().nullable().optional(),
+    resets_at: exports_external.string().nullable().optional()
+  }).optional(),
   extra_usage: exports_external.object({
     is_enabled: exports_external.boolean().nullable().optional(),
     monthly_limit: exports_external.number().nullable().optional(),
@@ -55694,6 +55742,7 @@ function parseCachedUsageData(rawJson) {
     sessionUsage: parsed.sessionUsage ?? undefined,
     sessionResetAt: parsed.sessionResetAt ?? undefined,
     weeklyUsage: parsed.weeklyUsage ?? undefined,
+    weeklyResetAt: parsed.weeklyResetAt ?? undefined,
     extraUsageEnabled: parsed.extraUsageEnabled ?? undefined,
     extraUsageLimit: parsed.extraUsageLimit ?? undefined,
     extraUsageUsed: parsed.extraUsageUsed ?? undefined,
@@ -55708,8 +55757,9 @@ function parseUsageApiResponse(rawJson) {
   }
   return {
     sessionUsage: parsed.five_hour?.utilization ?? undefined,
-    sessionResetAt: parsed.five_hour?.resets_at ?? parsed.five_hour?.reset_at ?? undefined,
+    sessionResetAt: parsed.five_hour?.resets_at ?? undefined,
     weeklyUsage: parsed.seven_day?.utilization ?? undefined,
+    weeklyResetAt: parsed.seven_day?.resets_at ?? undefined,
     extraUsageEnabled: parsed.extra_usage?.is_enabled ?? undefined,
     extraUsageLimit: parsed.extra_usage?.monthly_limit ?? undefined,
     extraUsageUsed: parsed.extra_usage?.used_credits ?? undefined,
@@ -55890,16 +55940,16 @@ function fetchUsageData() {
 function clamp(value, min, max) {
   return Math.max(min, Math.min(max, value));
 }
-function buildUsageWindow(resetAtMs, nowMs) {
-  if (!Number.isFinite(resetAtMs) || !Number.isFinite(nowMs)) {
+function buildUsageWindow(resetAtMs, nowMs, durationMs) {
+  if (!Number.isFinite(resetAtMs) || !Number.isFinite(nowMs) || !Number.isFinite(durationMs) || durationMs <= 0) {
     return null;
   }
-  const startAtMs = resetAtMs - FIVE_HOUR_BLOCK_MS;
-  const elapsedMs = clamp(nowMs - startAtMs, 0, FIVE_HOUR_BLOCK_MS);
-  const remainingMs = FIVE_HOUR_BLOCK_MS - elapsedMs;
-  const elapsedPercent = elapsedMs / FIVE_HOUR_BLOCK_MS * 100;
+  const startAtMs = resetAtMs - durationMs;
+  const elapsedMs = clamp(nowMs - startAtMs, 0, durationMs);
+  const remainingMs = durationMs - elapsedMs;
+  const elapsedPercent = elapsedMs / durationMs * 100;
   return {
-    sessionDurationMs: FIVE_HOUR_BLOCK_MS,
+    sessionDurationMs: durationMs,
     elapsedMs,
     remainingMs,
     elapsedPercent,
@@ -55914,14 +55964,14 @@ function getUsageWindowFromResetAt(sessionResetAt, nowMs = Date.now()) {
   if (Number.isNaN(resetAtMs)) {
     return null;
   }
-  return buildUsageWindow(resetAtMs, nowMs);
+  return buildUsageWindow(resetAtMs, nowMs, FIVE_HOUR_BLOCK_MS);
 }
 function getUsageWindowFromBlockMetrics(blockMetrics, nowMs = Date.now()) {
   const startAtMs = blockMetrics.startTime.getTime();
   if (Number.isNaN(startAtMs)) {
     return null;
   }
-  return buildUsageWindow(startAtMs + FIVE_HOUR_BLOCK_MS, nowMs);
+  return buildUsageWindow(startAtMs + FIVE_HOUR_BLOCK_MS, nowMs, FIVE_HOUR_BLOCK_MS);
 }
 function resolveUsageWindowWithFallback(usageData, blockMetrics, nowMs = Date.now()) {
   const usageWindow = getUsageWindowFromResetAt(usageData.sessionResetAt, nowMs);
@@ -55934,6 +55984,19 @@ function resolveUsageWindowWithFallback(usageData, blockMetrics, nowMs = Date.no
   }
   return getUsageWindowFromBlockMetrics(fallbackMetrics, nowMs);
 }
+function getWeeklyUsageWindowFromResetAt(weeklyResetAt, nowMs = Date.now()) {
+  if (!weeklyResetAt) {
+    return null;
+  }
+  const resetAtMs = Date.parse(weeklyResetAt);
+  if (Number.isNaN(resetAtMs)) {
+    return null;
+  }
+  return buildUsageWindow(resetAtMs, nowMs, SEVEN_DAY_WINDOW_MS);
+}
+function resolveWeeklyUsageWindow(usageData, nowMs = Date.now()) {
+  return getWeeklyUsageWindowFromResetAt(usageData.weeklyResetAt, nowMs);
+}
 function formatUsageDuration(durationMs) {
   const clampedMs = Math.max(0, durationMs);
   const elapsedHours = Math.floor(clampedMs / (1000 * 60 * 60));
@@ -56648,7 +56711,7 @@ class WeeklyUsageWidget {
     return true;
   }
 }
-// src/widgets/ResetTimer.ts
+// src/widgets/BlockResetTimer.ts
 function makeTimerProgressBar2(percent, width) {
   const clampedPercent = Math.max(0, Math.min(100, percent));
   const filledWidth = Math.floor(clampedPercent / 100 * width);
@@ -56656,15 +56719,15 @@ function makeTimerProgressBar2(percent, width) {
   return "█".repeat(filledWidth) + "░".repeat(emptyWidth);
 }
 
-class ResetTimerWidget {
+class BlockResetTimerWidget {
   getDefaultColor() {
     return "brightBlue";
   }
   getDescription() {
-    return "Shows time remaining until current 5hr block reset";
+    return "Shows time remaining until current 5hr block reset window";
   }
   getDisplayName() {
-    return "Reset Timer";
+    return "Block Reset Timer";
   }
   getCategory() {
     return "Usage";
@@ -56727,6 +56790,85 @@ class ResetTimerWidget {
     return true;
   }
 }
+// src/widgets/WeeklyResetTimer.ts
+function makeTimerProgressBar3(percent, width) {
+  const clampedPercent = Math.max(0, Math.min(100, percent));
+  const filledWidth = Math.floor(clampedPercent / 100 * width);
+  const emptyWidth = width - filledWidth;
+  return "█".repeat(filledWidth) + "░".repeat(emptyWidth);
+}
+
+class WeeklyResetTimerWidget {
+  getDefaultColor() {
+    return "brightBlue";
+  }
+  getDescription() {
+    return "Shows time remaining until weekly usage reset";
+  }
+  getDisplayName() {
+    return "Weekly Reset Timer";
+  }
+  getCategory() {
+    return "Usage";
+  }
+  getEditorDisplay(item) {
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: getUsageDisplayModifierText(item)
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-progress") {
+      return cycleUsageDisplayMode(item);
+    }
+    if (action === "toggle-invert") {
+      return toggleUsageInverted(item);
+    }
+    return null;
+  }
+  render(item, context, settings) {
+    const displayMode = getUsageDisplayMode(item);
+    const inverted = isUsageInverted(item);
+    if (context.isPreview) {
+      const previewPercent = inverted ? 90 : 10;
+      if (isUsageProgressMode(displayMode)) {
+        const barWidth = getUsageProgressBarWidth(displayMode);
+        const progressBar = makeTimerProgressBar3(previewPercent, barWidth);
+        return formatRawOrLabeledValue(item, "Weekly Reset ", `[${progressBar}] ${previewPercent.toFixed(1)}%`);
+      }
+      return formatRawOrLabeledValue(item, "Weekly Reset: ", "36hr 30m");
+    }
+    const usageData = fetchUsageData();
+    const window2 = resolveWeeklyUsageWindow(usageData);
+    if (!window2) {
+      if (usageData.error) {
+        return getUsageErrorMessage(usageData.error);
+      }
+      return null;
+    }
+    if (isUsageProgressMode(displayMode)) {
+      const barWidth = getUsageProgressBarWidth(displayMode);
+      const percent = inverted ? window2.remainingPercent : window2.elapsedPercent;
+      const progressBar = makeTimerProgressBar3(percent, barWidth);
+      const percentage = percent.toFixed(1);
+      return formatRawOrLabeledValue(item, "Weekly Reset ", `[${progressBar}] ${percentage}%`);
+    }
+    const remainingTime = formatUsageDuration(window2.remainingMs);
+    return formatRawOrLabeledValue(item, "Weekly Reset: ", remainingTime);
+  }
+  getCustomKeybinds() {
+    return [
+      { key: "p", label: "(p)rogress toggle", action: "toggle-progress" },
+      { key: "v", label: "in(v)ert fill", action: "toggle-invert" }
+    ];
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
 // src/widgets/ContextBar.ts
 function getDisplayMode(item) {
   return item.metadata?.display === "progress" ? "progress" : "progress-short";
@@ -56784,9 +56926,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;
@@ -57035,7 +57176,8 @@ var widgetRegistry = new Map([
   ["free-memory", new FreeMemoryWidget],
   ["session-usage", new SessionUsageWidget],
   ["weekly-usage", new WeeklyUsageWidget],
-  ["reset-timer", new ResetTimerWidget],
+  ["reset-timer", new BlockResetTimerWidget],
+  ["weekly-reset-timer", new WeeklyResetTimerWidget],
   ["context-bar", new ContextBarWidget]
 ]);
 function getWidget(type) {
@@ -57204,6 +57346,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 }) => {
@@ -57244,16 +57491,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);
@@ -57282,16 +57520,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("");
@@ -57341,12 +57570,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);
         }
       }
@@ -57354,13 +57578,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);
         }
       }
@@ -57370,47 +57588,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);
         }
@@ -57566,10 +57750,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);
             },
@@ -58257,6 +58438,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);
@@ -58292,23 +58784,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;
@@ -58335,7 +58810,7 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
       categoryQuery: "",
       widgetQuery: "",
       selectedType
-    }));
+    }, widgetCatalog, widgetCategories));
   };
   const applyWidgetPickerSelection = (selectedType) => {
     if (!widgetPicker) {
@@ -58371,238 +58846,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") {
@@ -58622,7 +58902,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;

package/package.json

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