@wrongstack/tui 0.268.0 → 0.269.0

package/dist/index.js

@@ -91,17 +91,14 @@ var Box = forwardRef(function Box2({ borderColor, backgroundColor, ...rest }, re
 function snapshotTokenCounter(tokenCounter) {
   return {
     usage: tokenCounter.total(),
+    currentRequest: tokenCounter.currentRequestTokens(),
     cost: tokenCounter.estimateCost(),
     cacheStats: tokenCounter.cacheStats()
   };
 }
 function useTokenCounterRefresh(tokenCounter, events) {
   const [data, setData] = useState(
-    () => tokenCounter ? {
-      usage: tokenCounter.total(),
-      cost: tokenCounter.estimateCost(),
-      cacheStats: tokenCounter.cacheStats()
-    } : void 0
+    () => tokenCounter ? snapshotTokenCounter(tokenCounter) : void 0
   );
   useEffect(() => {
     if (!tokenCounter) {
@@ -118,6 +115,19 @@ function useTokenCounterRefresh(tokenCounter, events) {
   }, [tokenCounter, events]);
   return data;
 }
+
+// src/thinking-word.ts
+var DEFAULT_TUI_THINKING_WORD = "thinking";
+var MAX_TUI_THINKING_WORD_LENGTH = 16;
+function normalizeTuiThinkingWord(value) {
+  if (typeof value !== "string") return DEFAULT_TUI_THINKING_WORD;
+  const word = value.trim();
+  if (word.length === 0 || word.length > MAX_TUI_THINKING_WORD_LENGTH) {
+    return DEFAULT_TUI_THINKING_WORD;
+  }
+  if (!/^[\p{L}\p{N}_-]+$/u.test(word)) return DEFAULT_TUI_THINKING_WORD;
+  return word;
+}
 function chipExpired(meta, now = Date.now()) {
   if (meta.expiresIn == null) return false;
   return now >= meta.shownAt + meta.expiresIn * 6e4;
@@ -160,10 +170,23 @@ var COMPACT_THRESHOLD = 50;
 var COMFORTABLE_THRESHOLD = 90;
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 var SPINNER_INTERVAL_MS = 250;
+function tokenDisplayTotals(usage, currentRequest) {
+  const usageInput = usage ? usage.input + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0) : 0;
+  const usageOutput = usage?.output ?? 0;
+  const fallbackInput = currentRequest ? currentRequest.input + currentRequest.cacheRead : 0;
+  return {
+    input: usageInput > 0 ? usageInput : fallbackInput,
+    output: usageOutput
+  };
+}
+function hasTokenDisplay(tokens) {
+  return tokens.input > 0 || tokens.output > 0;
+}
 function StatusBar({
   model,
   version,
   state,
+  thinkingWord,
   tokenCounter,
   hint,
   queueCount = 0,
@@ -217,6 +240,8 @@ function StatusBar({
   const hiddenSet = new Set(hiddenItems);
   const tokenData = useTokenCounterRefresh(tokenCounter, events);
   const usage = tokenData?.usage;
+  const displayTokens = tokenDisplayTotals(usage, tokenData?.currentRequest);
+  const showTokenDisplay = hasTokenDisplay(displayTokens);
   const cost = tokenData?.cost;
   const cache2 = tokenData?.cacheStats;
   const [elapsedMs, setElapsedMs] = useState(startedAt ? Date.now() - startedAt : 0);
@@ -235,7 +260,7 @@ function StatusBar({
     return () => clearInterval(t);
   }, [state]);
   const spinner = expectDefined$1(SPINNER_FRAMES[spinnerIdx]);
-  const { label: stateLabel, color: stateColor } = stateChip(state, fleet?.running ?? 0);
+  const { label: stateLabel, color: stateColor } = stateChip(state, fleet?.running ?? 0, thinkingWord);
   const statePrefix = state === "idle" || state === "aborting" ? "\u25CF" : spinner;
   const thinking = state === "running" || state === "streaming";
   const hasAutoProceed = autoProceedCountdown != null && autoProceedCountdown > 0;
@@ -295,6 +320,16 @@ function StatusBar({
               fmtTok(ctxMax)
             ] })
           ] }) : null,
+          showTokenDisplay ? /* @__PURE__ */ jsxs(Fragment, { children: [
+            /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }),
+            /* @__PURE__ */ jsxs(Text, { children: [
+              "\u2191 ",
+              /* @__PURE__ */ jsx(Text, { color: "cyan", children: fmtTok(displayTokens.input) }),
+              " \u2193",
+              " ",
+              /* @__PURE__ */ jsx(Text, { color: "cyan", children: fmtTok(displayTokens.output) })
+            ] })
+          ] }) : null,
           cost && cost.total > 0 && !hiddenSet.has("cost") ? /* @__PURE__ */ jsxs(Fragment, { children: [
             /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }),
             /* @__PURE__ */ jsxs(Text, { color: "yellow", children: [
@@ -372,15 +407,14 @@ function StatusBar({
                 ] });
               })()
             ] }) : null,
-            usage && isComfortable ? /* @__PURE__ */ jsxs(Fragment, { children: [
+            showTokenDisplay ? /* @__PURE__ */ jsxs(Fragment, { children: [
               /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }),
               /* @__PURE__ */ jsxs(Text, { children: [
-                "\u2191",
+                "\u2191 ",
+                /* @__PURE__ */ jsx(Text, { color: "cyan", children: fmtTok(displayTokens.input) }),
+                " \u2193",
                 " ",
-                /* @__PURE__ */ jsx(Text, { color: "cyan", children: fmtTok(usage.input + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0)) }),
-                " ",
-                "\u2193 ",
-                /* @__PURE__ */ jsx(Text, { color: "cyan", children: fmtTok(usage.output) })
+                /* @__PURE__ */ jsx(Text, { color: "cyan", children: fmtTok(displayTokens.output) })
               ] })
             ] }) : null,
             cache2 && cache2.hitRatio > 0 && isComfortable ? /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -894,7 +928,7 @@ function statusBarModelSpan(opts) {
     col += `WS v${opts.version}`.length + SB_GAP;
     col += 1 + SB_GAP;
   }
-  const { label } = stateChip(opts.state, opts.fleetRunning ?? 0);
+  const { label } = stateChip(opts.state, opts.fleetRunning ?? 0, opts.thinkingWord);
   col += 2 + label.length + SB_GAP;
   col += 1 + SB_GAP;
   return { start: col, len: opts.model.length };
@@ -912,13 +946,13 @@ function statusBarTodosSpan() {
   const LABEL_MAX = 20;
   return { start: SB_PADX, len: LABEL_MAX };
 }
-function stateChip(state, fleetRunning) {
+function stateChip(state, fleetRunning, thinkingWord) {
   if (state === "idle" && fleetRunning > 0) {
     return { label: `agents \u25B6${fleetRunning}`, color: "magenta" };
   }
   if (state === "idle") return { label: "idle", color: "cyan" };
   if (state === "aborting") return { label: "aborting\u2026", color: "yellow" };
-  return { label: "thinking\u2026", color: "green" };
+  return { label: `${normalizeTuiThinkingWord(thinkingWord)}\u2026`, color: "green" };
 }
 var WAVE_COLORS = [
   "#f38ba8",
@@ -2174,36 +2208,36 @@ var F_KEY_PANEL_ENTRIES = [
     key: 1,
     label: "Project switcher",
     action: "projectPickerOpen",
-    helpKeys: "F1",
-    helpDescription: "project switcher (also /project)"
+    helpKeys: "F1 or /project",
+    helpDescription: "project switcher (F1 may open terminal help)"
   },
   {
     key: 2,
     label: "Fleet orchestration monitor",
     action: "toggleMonitor",
-    helpKeys: "Ctrl+F / F2",
-    helpDescription: "fleet orchestration monitor"
+    helpKeys: "F2 or /fleet",
+    helpDescription: "fleet monitor (Ctrl+F may be terminal Find)"
   },
   {
     key: 3,
     label: "Agents live monitor",
     action: "toggleAgentsMonitor",
-    helpKeys: "Ctrl+G / F3",
-    helpDescription: "agents live monitor"
+    helpKeys: "F3 or Ctrl+G",
+    helpDescription: "agents live monitor (F3 is safer)"
   },
   {
     key: 4,
     label: "Worktree monitor",
     action: "toggleWorktreeMonitor",
-    helpKeys: "Ctrl+T / F4",
-    helpDescription: "worktree monitor"
+    helpKeys: "F4 or /worktree",
+    helpDescription: "worktree monitor (Ctrl+T may be reserved)"
   },
   {
     key: 5,
     label: "Plan panel",
     action: "togglePlanPanel",
-    helpKeys: "F5",
-    helpDescription: "plan panel"
+    helpKeys: "F5 or /plan",
+    helpDescription: "plan panel (F5 may be host refresh/run)"
   },
   {
     key: 6,
@@ -2237,22 +2271,22 @@ var F_KEY_PANEL_ENTRIES = [
     key: 10,
     label: "Live sessions panel",
     action: "toggleSessionsPanel",
-    helpKeys: "F10",
-    helpDescription: "live sessions panel"
+    helpKeys: "F10 or /resume",
+    helpDescription: "live sessions panel (F10 may open host menu)"
   },
   {
     key: 11,
     label: "Coordinator monitor",
     action: "toggleCoordinatorMonitor",
-    helpKeys: "F11",
-    helpDescription: "coordinator monitor"
+    helpKeys: "F11 or /coordinator",
+    helpDescription: "coordinator monitor (F11 may toggle fullscreen)"
   },
   {
     key: 12,
     label: "Status line picker",
     action: "statuslineOpen",
-    helpKeys: "F12",
-    helpDescription: "status line picker"
+    helpKeys: "F12 or /sl",
+    helpDescription: "status line picker (F12 may be host/devtools)"
   }
 ];
 var PAYLOAD_FREE_ACTIONS = /* @__PURE__ */ new Set([
@@ -2420,8 +2454,11 @@ function helpSections() {
       entries: [
         { keys: "Enter", desc: "send (queues while the agent is busy)" },
         { keys: "Esc Esc", desc: "clear the input buffer" },
-        { keys: "Ctrl+Backspace", desc: "delete the previous word" },
-        { keys: "Ctrl+S", desc: "edit autonomy settings" },
+        { keys: "Ctrl+\u2190/\u2192", desc: "word navigation (terminal-dependent)" },
+        { keys: "Ctrl+Backspace", desc: "delete previous word/chip" },
+        { keys: "Ctrl+S or /settings", desc: "settings (Ctrl+S may be reserved)" },
+        { keys: "Ctrl+V", desc: "paste text (may be host paste)" },
+        { keys: "Alt+V", desc: "paste image (terminal-dependent)" },
         { keys: "Ctrl+C", desc: "interrupt the run \xB7 twice to exit" }
       ]
     },
@@ -4441,7 +4478,7 @@ function parseRawNumbered(content) {
     const m = ITEM_RE.exec(line);
     if (!m) continue;
     const numPart = m[1];
-    let text = m[2].trim();
+    const text = m[2].trim();
     const hasAuto = !!m[3];
     let index;
     if (numPart !== void 0) {
@@ -4479,7 +4516,7 @@ function parseWithHeading(content, strict) {
     const m = ITEM_RE.exec(line);
     if (!m) break;
     const numPart = m[1];
-    let text = m[2].trim();
+    const text = m[2].trim();
     const hasAuto = !!m[3];
     let index;
     if (numPart !== void 0) {
@@ -5110,6 +5147,15 @@ function tokenLengthForward(buffer, cursor) {
   const m = buffer.slice(cursor).match(AT_START);
   return m ? m[0].length : 0;
 }
+function tokenSpanAt(buffer, cursor) {
+  const clamped = Math.max(0, Math.min(cursor, buffer.length));
+  for (const m of buffer.matchAll(GLOBAL)) {
+    const start = m.index ?? 0;
+    const end = start + m[0].length;
+    if (clamped >= start && clamped <= end) return { start, end };
+  }
+  return null;
+}
 function splitChips(text) {
   if (!text) return [];
   const spans = [];
@@ -5294,6 +5340,11 @@ function isHomeEnd(data) {
     return "end";
   return null;
 }
+function isCtrlArrow(data) {
+  if (data === "\x1B[1;5D" || data === "\x1B[5D") return "left";
+  if (data === "\x1B[1;5C" || data === "\x1B[5C") return "right";
+  return null;
+}
 function isBackspaceOrDelete(data) {
   if (data === "\x1B\x7F" || data === "\x1B\b") return "metaBackspace";
   if (data === "\x7F" || data === "\b") return "backspace";
@@ -5331,6 +5382,8 @@ var Input = memo(function Input2({
   const suppressInkEscRef = useRef(false);
   const suppressInkBackspaceRef = useRef(false);
   const suppressInkDeleteRef = useRef(false);
+  const suppressInkCtrlLeftRef = useRef(false);
+  const suppressInkCtrlRightRef = useRef(false);
   useInput((input, key) => {
     if (disabled) return;
     if (input && isLeakedMouseInput(input)) return;
@@ -5346,6 +5399,14 @@ var Input = memo(function Input2({
       suppressInkDeleteRef.current = false;
       return;
     }
+    if (key.ctrl && key.leftArrow && suppressInkCtrlLeftRef.current) {
+      suppressInkCtrlLeftRef.current = false;
+      return;
+    }
+    if (key.ctrl && key.rightArrow && suppressInkCtrlRightRef.current) {
+      suppressInkCtrlRightRef.current = false;
+      return;
+    }
     onKey(input, key);
   });
   const { stdin } = useStdin();
@@ -5381,6 +5442,17 @@ var Input = memo(function Input2({
         onKey("", { ...EMPTY_KEY, end: true });
         return;
       }
+      const ctrlArrow = isCtrlArrow(s2);
+      if (ctrlArrow === "left") {
+        suppressInkCtrlLeftRef.current = true;
+        onKey("", { ...EMPTY_KEY, leftArrow: true, ctrl: true });
+        return;
+      }
+      if (ctrlArrow === "right") {
+        suppressInkCtrlRightRef.current = true;
+        onKey("", { ...EMPTY_KEY, rightArrow: true, ctrl: true });
+        return;
+      }
       const bsdel = isBackspaceOrDelete(s2);
       if (bsdel === "backspace") {
         suppressInkBackspaceRef.current = true;
@@ -6555,7 +6627,7 @@ var MODE_DESC = {
   suggest: "Shows next-step suggestions after each turn",
   auto: "Self-driving \u2014 agent continues automatically"
 };
-var SETTINGS_FIELD_COUNT = 34;
+var SETTINGS_FIELD_COUNT = 35;
 var CONFIG_SCOPES = ["global", "project"];
 function SettingsPicker({
   field,
@@ -6574,24 +6646,25 @@ function SettingsPicker({
   featureModelsRegistry,
   tokenSavingTier,
   allowOutsideProjectRoot,
-  contextAutoCompact,
-  contextStrategy,
-  contextMode,
-  maxConcurrent,
-  logLevel,
-  auditLevel,
-  indexOnStart,
   maxIterations,
   autoProceedMaxIterations,
   enhanceDelayMs,
   enhanceEnabled,
   enhanceLanguage,
-  debugStream,
-  statuslineMode,
+  indexOnStart,
+  thinkingWord,
   reasoningMode,
   reasoningEffort,
   reasoningPreserve,
   cacheTtl,
+  contextAutoCompact,
+  contextStrategy,
+  contextMode,
+  maxConcurrent,
+  logLevel,
+  auditLevel,
+  debugStream,
+  statuslineMode,
   configScope,
   hint
 }) {
@@ -6674,51 +6747,6 @@ function SettingsPicker({
       value: boolVal(allowOutsideProjectRoot),
       detail: "Allow tools to access paths outside project root"
     },
-    // ── Context ──
-    { section: "Context" },
-    {
-      label: "Auto-compact",
-      value: boolVal(contextAutoCompact),
-      detail: "Auto-compact context when thresholds crossed"
-    },
-    {
-      label: "Compactor strategy",
-      value: contextStrategy,
-      detail: "hybrid (fast) | intelligent (LLM) | selective"
-    },
-    {
-      label: "Context mode",
-      value: contextMode,
-      detail: CONTEXT_MODE_DESCS[contextMode]
-    },
-    // ── Fleet ──
-    { section: "Fleet" },
-    {
-      label: "Max concurrent",
-      value: maxConcurrent === 0 ? "unlimited" : String(maxConcurrent),
-      detail: "Max subagents (0 = unlimited)"
-    },
-    // ── Logging ──
-    { section: "Logging" },
-    {
-      label: "Log level",
-      value: logLevel,
-      detail: "Console log verbosity"
-    },
-    // ── Session ──
-    { section: "Session" },
-    {
-      label: "Audit level",
-      value: auditLevel,
-      detail: "minimal | standard | full (large)"
-    },
-    // ── Indexing ──
-    { section: "Indexing" },
-    {
-      label: "Index on session start",
-      value: boolVal(indexOnStart),
-      detail: "Run incremental index at session start"
-    },
     // ── Tools ──
     { section: "Tools" },
     {
@@ -6746,8 +6774,18 @@ function SettingsPicker({
       value: enhanceLanguage,
       detail: "original (keep language) | english (translate)"
     },
+    {
+      label: "Index on session start",
+      value: boolVal(indexOnStart),
+      detail: "Run incremental index at session start"
+    },
     // ── Reasoning ──
     { section: "Reasoning" },
+    {
+      label: "Thinking word",
+      value: thinkingWord,
+      detail: "Word shown in status bar while agent works"
+    },
     {
       label: "Reasoning mode",
       value: reasoningMode,
@@ -6768,6 +6806,42 @@ function SettingsPicker({
       value: cacheTtl,
       detail: "Prompt cache TTL (5m | 1h)"
     },
+    // ── Context ──
+    { section: "Context" },
+    {
+      label: "Auto-compact",
+      value: boolVal(contextAutoCompact),
+      detail: "Auto-compact context when thresholds crossed"
+    },
+    {
+      label: "Compactor strategy",
+      value: contextStrategy,
+      detail: "hybrid (fast) | intelligent (LLM) | selective"
+    },
+    {
+      label: "Context mode",
+      value: contextMode,
+      detail: CONTEXT_MODE_DESCS[contextMode]
+    },
+    // ── Fleet ──
+    { section: "Fleet" },
+    {
+      label: "Max concurrent",
+      value: maxConcurrent === 0 ? "unlimited" : String(maxConcurrent),
+      detail: "Max subagents (0 = unlimited)"
+    },
+    // ── Logging ──
+    { section: "Logging" },
+    {
+      label: "Log level",
+      value: logLevel,
+      detail: "Console log verbosity"
+    },
+    {
+      label: "Audit level",
+      value: auditLevel,
+      detail: "minimal | standard | full (large)"
+    },
     // ── Debug ──
     { section: "Debug" },
     {
@@ -7092,9 +7166,9 @@ function hintsFor(ctx) {
   if (ctx.monitor) {
     const hints = [
       { key: "Esc", label: "close" },
-      { key: "^F", label: "fleet" },
-      { key: "^G", label: "agents" },
-      { key: "^T", label: "worktrees" },
+      { key: "F2", label: "fleet" },
+      { key: "F3", label: "agents" },
+      { key: "F4", label: "worktrees" },
       { key: "F6", label: "todos" },
       { key: "F9", label: "goal" }
     ];
@@ -7105,7 +7179,7 @@ function hintsFor(ctx) {
   }
   const base = [{ key: "?", label: "help" }];
   if (ctx.managed) base.push({ key: "PgUp/PgDn", label: "scroll" });
-  base.push({ key: "^G", label: "agents" }, { key: "^C", label: "stop" });
+  base.push({ key: "F3", label: "agents" }, { key: "^C", label: "stop" });
   if (ctx.nextPanelHint) {
     base.push({ key: ctx.nextPanelHint.key, label: ctx.nextPanelHint.label, discovery: true });
   }
@@ -7242,6 +7316,9 @@ var WT_STATUS = {
 function fmt(s2) {
   return WT_STATUS[s2] ?? { icon: "?", color: "white", label: s2 };
 }
+function isWorktreeMonitorCloseKey(input, key) {
+  return key.escape === true || key.ctrl === true && input === "w";
+}
 function WorktreeMonitor({
   worktrees,
   baseBranch,
@@ -7249,7 +7326,7 @@ function WorktreeMonitor({
   onClose
 }) {
   useInput((input, key) => {
-    if (key.ctrl && input === "w") onClose();
+    if (isWorktreeMonitorCloseKey(input, key)) onClose();
   });
   const TERMINAL_TTL_MS = 5 * 6e4;
   const list = Object.values(worktrees);
@@ -7286,7 +7363,7 @@ function WorktreeMonitor({
           failed
         ] })
       ] }) : null,
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502 Ctrl+T / F4 to close" })
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502 Esc / F4 to close" })
     ] }),
     recent.length === 0 ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "No worktrees. They appear when AutoPhase runs with isolation on." }) : recent.map((w) => {
       const s2 = fmt(w.status);
@@ -7336,7 +7413,7 @@ function WorktreeMonitor({
       ] }, w.branch);
     }),
     /* @__PURE__ */ jsxs(Box, { marginTop: 1, children: [
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Ctrl+T to close \xB7 merge conflicts with /worktree merge <branch>" }),
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Esc / F4 to close \xB7 merge conflicts with /worktree merge <branch>" }),
       staleTerminal > 0 ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: ` \xB7 ${staleTerminal} terminal pruned` }) : null
     ] })
   ] });
@@ -9123,6 +9200,7 @@ function reducer(state, action) {
           reasoningMode: action.reasoningMode,
           reasoningEffort: action.reasoningEffort,
           reasoningPreserve: action.reasoningPreserve,
+          thinkingWord: action.thinkingWord,
           cacheTtl: action.cacheTtl,
           configScope: action.configScope,
           hint: void 0
@@ -9178,95 +9256,96 @@ function reducer(state, action) {
         return { ...state, settingsPicker: { ...sp, tokenSavingTier: TOKEN_SAVING_TIERS[next] ?? "off", hint: bootHint } };
       }
       if (f === 14) return { ...state, settingsPicker: { ...sp, allowOutsideProjectRoot: !sp.allowOutsideProjectRoot, hint: void 0 } };
-      if (f === 15) return { ...state, settingsPicker: { ...sp, contextAutoCompact: !sp.contextAutoCompact, hint: void 0 } };
+      if (f === 15) {
+        const j = MAX_ITERATIONS_PRESETS.indexOf(sp.maxIterations);
+        const base = j < 0 ? 0 : j;
+        const next = (base + action.delta + MAX_ITERATIONS_PRESETS.length) % MAX_ITERATIONS_PRESETS.length;
+        return { ...state, settingsPicker: { ...sp, maxIterations: expectDefined$1(MAX_ITERATIONS_PRESETS[next]), hint: void 0 } };
+      }
       if (f === 16) {
+        const aj = AUTO_PROCEED_MAX_PRESETS.indexOf(sp.autoProceedMaxIterations);
+        const abase = aj < 0 ? 0 : aj;
+        const anext = (abase + action.delta + AUTO_PROCEED_MAX_PRESETS.length) % AUTO_PROCEED_MAX_PRESETS.length;
+        return { ...state, settingsPicker: { ...sp, autoProceedMaxIterations: expectDefined$1(AUTO_PROCEED_MAX_PRESETS[anext]), hint: void 0 } };
+      }
+      if (f === 17) {
+        const ej = ENHANCE_DELAY_PRESETS.indexOf(sp.enhanceDelayMs);
+        const ebase = ej < 0 ? 0 : ej;
+        const enext = (ebase + action.delta + ENHANCE_DELAY_PRESETS.length) % ENHANCE_DELAY_PRESETS.length;
+        return { ...state, settingsPicker: { ...sp, enhanceDelayMs: expectDefined$1(ENHANCE_DELAY_PRESETS[enext]), hint: void 0 } };
+      }
+      if (f === 18) return { ...state, settingsPicker: { ...sp, enhanceEnabled: !sp.enhanceEnabled, hint: void 0 } };
+      if (f === 19) {
+        const i = ENHANCE_LANGUAGES.indexOf(sp.enhanceLanguage);
+        const base = i < 0 ? 0 : i;
+        const next = (base + action.delta + ENHANCE_LANGUAGES.length) % ENHANCE_LANGUAGES.length;
+        return { ...state, settingsPicker: { ...sp, enhanceLanguage: expectDefined$1(ENHANCE_LANGUAGES[next]), hint: void 0 } };
+      }
+      if (f === 20) return { ...state, settingsPicker: { ...sp, indexOnStart: !sp.indexOnStart, hint: bootHint } };
+      if (f === 21) return state;
+      if (f === 22) {
+        const i = REASONING_MODES.indexOf(sp.reasoningMode);
+        const base = i < 0 ? 0 : i;
+        const next = (base + action.delta + REASONING_MODES.length) % REASONING_MODES.length;
+        return { ...state, settingsPicker: { ...sp, reasoningMode: expectDefined$1(REASONING_MODES[next]), hint: void 0 } };
+      }
+      if (f === 23) {
+        const i = REASONING_EFFORTS.indexOf(sp.reasoningEffort);
+        const base = i < 0 ? REASONING_EFFORTS.indexOf("high") : i;
+        const next = (base + action.delta + REASONING_EFFORTS.length) % REASONING_EFFORTS.length;
+        return { ...state, settingsPicker: { ...sp, reasoningEffort: expectDefined$1(REASONING_EFFORTS[next]), hint: void 0 } };
+      }
+      if (f === 24) return { ...state, settingsPicker: { ...sp, reasoningPreserve: !sp.reasoningPreserve, hint: void 0 } };
+      if (f === 25) {
+        const i = CACHE_TTLS.indexOf(sp.cacheTtl);
+        const base = i < 0 ? 0 : i;
+        const next = (base + action.delta + CACHE_TTLS.length) % CACHE_TTLS.length;
+        return { ...state, settingsPicker: { ...sp, cacheTtl: expectDefined$1(CACHE_TTLS[next]), hint: void 0 } };
+      }
+      if (f === 26) return { ...state, settingsPicker: { ...sp, contextAutoCompact: !sp.contextAutoCompact, hint: void 0 } };
+      if (f === 27) {
         const i = COMPACTOR_STRATEGIES.indexOf(sp.contextStrategy);
         const base = i < 0 ? 0 : i;
         const next = (base + action.delta + COMPACTOR_STRATEGIES.length) % COMPACTOR_STRATEGIES.length;
         return { ...state, settingsPicker: { ...sp, contextStrategy: expectDefined$1(COMPACTOR_STRATEGIES[next]), hint: bootHint } };
       }
-      if (f === 17) {
+      if (f === 28) {
         const i = CONTEXT_MODES.indexOf(sp.contextMode);
         const base = i < 0 ? 0 : i;
         const next = (base + action.delta + CONTEXT_MODES.length) % CONTEXT_MODES.length;
         return { ...state, settingsPicker: { ...sp, contextMode: expectDefined$1(CONTEXT_MODES[next]), hint: bootHint } };
       }
-      if (f === 18) {
+      if (f === 29) {
         const j = MAX_CONCURRENT_PRESETS.indexOf(sp.maxConcurrent);
         const base = j < 0 ? 0 : j;
         const next = (base + action.delta + MAX_CONCURRENT_PRESETS.length) % MAX_CONCURRENT_PRESETS.length;
         return { ...state, settingsPicker: { ...sp, maxConcurrent: expectDefined$1(MAX_CONCURRENT_PRESETS[next]), hint: void 0 } };
       }
-      if (f === 19) {
+      if (f === 30) {
         const i = LOG_LEVELS.indexOf(sp.logLevel);
         const base = i < 0 ? 0 : i;
         const next = (base + action.delta + LOG_LEVELS.length) % LOG_LEVELS.length;
         return { ...state, settingsPicker: { ...sp, logLevel: expectDefined$1(LOG_LEVELS[next]), hint: void 0 } };
       }
-      if (f === 20) {
+      if (f === 31) {
         const i = AUDIT_LEVELS.indexOf(sp.auditLevel);
         const base = i < 0 ? 0 : i;
         const next = (base + action.delta + AUDIT_LEVELS.length) % AUDIT_LEVELS.length;
         return { ...state, settingsPicker: { ...sp, auditLevel: expectDefined$1(AUDIT_LEVELS[next]), hint: void 0 } };
       }
-      if (f === 21) return { ...state, settingsPicker: { ...sp, indexOnStart: !sp.indexOnStart, hint: bootHint } };
-      if (f === 22) {
-        const j = MAX_ITERATIONS_PRESETS.indexOf(sp.maxIterations);
-        const base = j < 0 ? 0 : j;
-        const next = (base + action.delta + MAX_ITERATIONS_PRESETS.length) % MAX_ITERATIONS_PRESETS.length;
-        return { ...state, settingsPicker: { ...sp, maxIterations: expectDefined$1(MAX_ITERATIONS_PRESETS[next]), hint: void 0 } };
-      }
-      if (f === 23) {
-        const aj = AUTO_PROCEED_MAX_PRESETS.indexOf(sp.autoProceedMaxIterations);
-        const abase = aj < 0 ? 0 : aj;
-        const anext = (abase + action.delta + AUTO_PROCEED_MAX_PRESETS.length) % AUTO_PROCEED_MAX_PRESETS.length;
-        return { ...state, settingsPicker: { ...sp, autoProceedMaxIterations: expectDefined$1(AUTO_PROCEED_MAX_PRESETS[anext]), hint: void 0 } };
-      }
-      if (f === 24) {
-        const ej = ENHANCE_DELAY_PRESETS.indexOf(sp.enhanceDelayMs);
-        const ebase = ej < 0 ? 0 : ej;
-        const enext = (ebase + action.delta + ENHANCE_DELAY_PRESETS.length) % ENHANCE_DELAY_PRESETS.length;
-        return { ...state, settingsPicker: { ...sp, enhanceDelayMs: expectDefined$1(ENHANCE_DELAY_PRESETS[enext]), hint: void 0 } };
-      }
-      if (f === 25) return { ...state, settingsPicker: { ...sp, enhanceEnabled: !sp.enhanceEnabled, hint: void 0 } };
-      if (f === 26) {
-        const i = ENHANCE_LANGUAGES.indexOf(sp.enhanceLanguage);
-        const base = i < 0 ? 0 : i;
-        const next = (base + action.delta + ENHANCE_LANGUAGES.length) % ENHANCE_LANGUAGES.length;
-        return { ...state, settingsPicker: { ...sp, enhanceLanguage: expectDefined$1(ENHANCE_LANGUAGES[next]), hint: void 0 } };
-      }
-      if (f === 27) return { ...state, settingsPicker: { ...sp, debugStream: !sp.debugStream, hint: void 0 } };
-      if (f === 28) {
+      if (f === 32) return { ...state, settingsPicker: { ...sp, debugStream: !sp.debugStream, hint: void 0 } };
+      if (f === 33) {
         const i = STATUSLINE_MODES.indexOf(sp.statuslineMode);
         const base = i < 0 ? STATUSLINE_MODES.indexOf("detailed") : i;
         const next = (base + action.delta + STATUSLINE_MODES.length) % STATUSLINE_MODES.length;
         return { ...state, settingsPicker: { ...sp, statuslineMode: expectDefined$1(STATUSLINE_MODES[next]), hint: void 0 } };
       }
-      if (f === 29) {
+      if (f === 34) {
         const i = CONFIG_SCOPES.indexOf(sp.configScope);
         const base = i < 0 ? 0 : i;
         const next = (base + action.delta + CONFIG_SCOPES.length) % CONFIG_SCOPES.length;
         return { ...state, settingsPicker: { ...sp, configScope: expectDefined$1(CONFIG_SCOPES[next]), hint: void 0 } };
       }
-      if (f === 30) {
-        const i = REASONING_MODES.indexOf(sp.reasoningMode);
-        const base = i < 0 ? 0 : i;
-        const next = (base + action.delta + REASONING_MODES.length) % REASONING_MODES.length;
-        return { ...state, settingsPicker: { ...sp, reasoningMode: expectDefined$1(REASONING_MODES[next]), hint: void 0 } };
-      }
-      if (f === 31) {
-        const i = REASONING_EFFORTS.indexOf(sp.reasoningEffort);
-        const base = i < 0 ? REASONING_EFFORTS.indexOf("high") : i;
-        const next = (base + action.delta + REASONING_EFFORTS.length) % REASONING_EFFORTS.length;
-        return { ...state, settingsPicker: { ...sp, reasoningEffort: expectDefined$1(REASONING_EFFORTS[next]), hint: void 0 } };
-      }
-      if (f === 32) return { ...state, settingsPicker: { ...sp, reasoningPreserve: !sp.reasoningPreserve, hint: void 0 } };
-      if (f === 33) {
-        const i = CACHE_TTLS.indexOf(sp.cacheTtl);
-        const base = i < 0 ? 0 : i;
-        const next = (base + action.delta + CACHE_TTLS.length) % CACHE_TTLS.length;
-        return { ...state, settingsPicker: { ...sp, cacheTtl: expectDefined$1(CACHE_TTLS[next]), hint: void 0 } };
-      }
       return state;
     }
     case "settingsHint":
@@ -10184,6 +10263,41 @@ function selectedSlashCommandLine(picker) {
   const picked = picker.matches[picker.selected];
   return picked ? `/${picked.name}` : null;
 }
+function isInputWordSeparator(ch) {
+  return ch === void 0 || /\s/.test(ch);
+}
+function previousInputWordStart(buffer, cursor) {
+  let i = Math.max(0, Math.min(cursor, buffer.length));
+  const chipAtCursor = tokenSpanAt(buffer, i);
+  if (chipAtCursor && i > chipAtCursor.start) return chipAtCursor.start;
+  while (i > 0 && isInputWordSeparator(buffer[i - 1])) i--;
+  const chipBeforeCursor = tokenSpanAt(buffer, i);
+  if (chipBeforeCursor && i === chipBeforeCursor.end) return chipBeforeCursor.start;
+  while (i > 0 && !isInputWordSeparator(buffer[i - 1])) {
+    const chip = tokenSpanAt(buffer, i - 1);
+    if (chip) {
+      i = chip.start;
+      continue;
+    }
+    i--;
+  }
+  return i;
+}
+function nextInputWordStart(buffer, cursor) {
+  let i = Math.max(0, Math.min(cursor, buffer.length));
+  const chipAtCursor = tokenSpanAt(buffer, i);
+  if (chipAtCursor && i < chipAtCursor.end) i = chipAtCursor.end;
+  else while (i < buffer.length && !isInputWordSeparator(buffer[i])) {
+    const chip = tokenSpanAt(buffer, i);
+    if (chip) {
+      i = chip.end;
+      continue;
+    }
+    i++;
+  }
+  while (i < buffer.length && isInputWordSeparator(buffer[i])) i++;
+  return i;
+}
 function rehydrateHistory(messages, startId, toolCalls) {
   const entries = [];
   let nextId = startId;
@@ -10457,7 +10571,7 @@ function App({
     },
     autonomyPicker: { open: false, options: [], selected: 0 },
     resumePicker: { open: false, sessions: [], selected: 0, busy: false, hint: void 0, error: void 0 },
-    settingsPicker: { open: false, field: 0, mode: "off", delayMs: 0, titleAnimation: true, yolo: false, streamFleet: true, chime: false, confirmExit: true, nextPrediction: false, featureMcp: true, featurePlugins: true, featureMemory: true, featureSkills: true, featureModelsRegistry: true, tokenSavingTier: "off", allowOutsideProjectRoot: true, contextAutoCompact: true, contextStrategy: "hybrid", contextMode: "balanced", maxConcurrent: 10, logLevel: "info", auditLevel: "standard", indexOnStart: true, maxIterations: 500, autoProceedMaxIterations: 50, enhanceDelayMs: 6e4, enhanceEnabled: true, enhanceLanguage: "original", debugStream: false, statuslineMode: "detailed", reasoningMode: "auto", reasoningEffort: "high", reasoningPreserve: false, cacheTtl: "default", configScope: "global" },
+    settingsPicker: { open: false, field: 0, mode: "off", delayMs: 0, titleAnimation: true, yolo: false, streamFleet: true, chime: false, confirmExit: true, nextPrediction: false, featureMcp: true, featurePlugins: true, featureMemory: true, featureSkills: true, featureModelsRegistry: true, tokenSavingTier: "off", allowOutsideProjectRoot: true, contextAutoCompact: true, contextStrategy: "hybrid", contextMode: "balanced", maxConcurrent: 10, logLevel: "info", auditLevel: "standard", indexOnStart: true, maxIterations: 500, autoProceedMaxIterations: 50, enhanceDelayMs: 6e4, enhanceEnabled: true, enhanceLanguage: "original", debugStream: false, statuslineMode: "detailed", reasoningMode: "auto", reasoningEffort: "high", reasoningPreserve: false, thinkingWord: "thinking", cacheTtl: "default", configScope: "global" },
     statuslinePicker: { open: false, field: 0, hiddenItems: [], visibleChips: [], hint: void 0 },
     projectPicker: { open: false, allItems: [], items: [], selected: 0, filter: "", hint: void 0 },
     fKeyPicker: { open: false, selected: 0 },
@@ -10592,6 +10706,7 @@ function App({
   }, [agent.ctx, projectRoot]);
   const liveSettings = getSettings?.();
   const liveStatuslineMode = liveSettings?.statuslineMode ?? "detailed";
+  const liveThinkingWord = liveSettings?.thinkingWord ?? "thinking";
   const chimeRef = useRef(chime);
   chimeRef.current = liveSettings?.chime ?? chime;
   const confirmExitRef = useRef(confirmExit);
@@ -11175,6 +11290,7 @@ function App({
             reasoningMode: sp.reasoningMode,
             reasoningEffort: sp.reasoningEffort,
             reasoningPreserve: sp.reasoningPreserve,
+            thinkingWord: sp.thinkingWord,
             cacheTtl: sp.cacheTtl,
             configScope: sp.configScope
           });
@@ -11590,6 +11706,7 @@ function App({
       reasoningMode: s2.reasoningMode ?? "auto",
       reasoningEffort: s2.reasoningEffort ?? "high",
       reasoningPreserve: s2.reasoningPreserve ?? false,
+      thinkingWord: s2.thinkingWord ?? "thinking",
       cacheTtl: s2.cacheTtl ?? "default",
       configScope: s2.configScope ?? "global"
     });
@@ -11733,6 +11850,7 @@ function App({
       reasoningMode: sp.reasoningMode,
       reasoningEffort: sp.reasoningEffort,
       reasoningPreserve: sp.reasoningPreserve,
+      thinkingWord: sp.thinkingWord,
       cacheTtl: sp.cacheTtl,
       configScope: sp.configScope
     })).then((err) => {
@@ -11772,7 +11890,9 @@ function App({
     state.settingsPicker.reasoningMode,
     state.settingsPicker.reasoningEffort,
     state.settingsPicker.reasoningPreserve,
+    state.settingsPicker.thinkingWord,
     state.settingsPicker.cacheTtl,
+    state.settingsPicker.configScope,
     saveSettings
   ]);
   useEffect(() => {
@@ -12570,7 +12690,7 @@ function App({
         const now = Date.now();
         if (now - lastEnterAtRef.current < 50) return;
         lastEnterAtRef.current = now;
-        dispatch({ type: "settingsClose" });
+        dispatch({ type: "settingsValueChange", delta: 1 });
         return;
       }
       return;
@@ -13079,6 +13199,35 @@ function App({
       dispatch({ type: "statuslineOpen", hiddenItems: state.statuslinePicker.hiddenItems });
       return;
     }
+    if (state.settingsPicker.open) {
+      if (key.escape) {
+        dispatch({ type: "settingsClose" });
+        return;
+      }
+      if (key.upArrow) {
+        dispatch({ type: "settingsFieldMove", delta: -1 });
+        return;
+      }
+      if (key.downArrow) {
+        dispatch({ type: "settingsFieldMove", delta: 1 });
+        return;
+      }
+      if (key.leftArrow) {
+        dispatch({ type: "settingsValueChange", delta: -1 });
+        return;
+      }
+      if (key.rightArrow) {
+        dispatch({ type: "settingsValueChange", delta: 1 });
+        return;
+      }
+      if (isEnter) {
+        const now = Date.now();
+        if (now - lastEnterAtRef.current < 50) return;
+        lastEnterAtRef.current = now;
+        dispatch({ type: "settingsValueChange", delta: 1 });
+        return;
+      }
+    }
     if (key.ctrl && input === "s") {
       if (state.settingsPicker.open) {
         dispatch({ type: "settingsClose" });
@@ -13125,6 +13274,7 @@ function App({
           reasoningMode: cfg.reasoningMode ?? "auto",
           reasoningEffort: cfg.reasoningEffort ?? "high",
           reasoningPreserve: cfg.reasoningPreserve ?? false,
+          thinkingWord: cfg.thinkingWord ?? "thinking",
           cacheTtl: cfg.cacheTtl ?? "default",
           configScope: cfg.configScope ?? "global"
         });
@@ -13213,10 +13363,18 @@ function App({
     if (key.backspace) {
       if (key.ctrl) {
         if (cursor === 0) return;
-        const beforeCursor = buffer.slice(0, cursor);
-        const lastWordStart = beforeCursor.lastIndexOf(" ") + 1;
-        const next3 = beforeCursor.slice(0, lastWordStart) + buffer.slice(cursor);
-        setDraft(next3, lastWordStart);
+        const chip = tokenSpanAt(buffer, cursor);
+        const deleteStart = chip && cursor > chip.start && cursor < chip.end ? chip.start : previousInputWordStart(buffer, cursor);
+        const deleteEnd = chip && cursor > chip.start && cursor < chip.end ? chip.end : cursor;
+        const next3 = buffer.slice(0, deleteStart) + buffer.slice(deleteEnd);
+        if (nextStepsAutoSubmitTimerRef.current != null) {
+          clearInterval(nextStepsAutoSubmitTimerRef.current);
+          nextStepsAutoSubmitTimerRef.current = void 0;
+          setNextStepsAutoSubmitCountdown(null);
+          setNextStepsAutoSubmitLabel(null);
+          nextStepsAutoSubmitSuggestionRef.current = null;
+        }
+        setDraft(next3, deleteStart);
         return;
       }
       const tokenDel = deleteTokenBackward(buffer, cursor);
@@ -13239,17 +13397,18 @@ function App({
     if (key.delete) {
       if (key.ctrl) {
         if (cursor >= buffer.length) return;
-        const afterCursor = buffer.slice(cursor);
-        const nextWordStart = afterCursor.indexOf(" ");
-        const end = nextWordStart === -1 ? buffer.length : cursor + nextWordStart + 1;
-        const next3 = buffer.slice(0, cursor) + buffer.slice(end);
+        const chip = tokenSpanAt(buffer, cursor);
+        const deleteStart = chip && cursor > chip.start && cursor < chip.end ? chip.start : cursor;
+        const deleteEnd = chip && cursor > chip.start && cursor < chip.end ? chip.end : nextInputWordStart(buffer, cursor);
+        const next3 = buffer.slice(0, deleteStart) + buffer.slice(deleteEnd);
         if (nextStepsAutoSubmitTimerRef.current != null) {
           clearInterval(nextStepsAutoSubmitTimerRef.current);
           nextStepsAutoSubmitTimerRef.current = void 0;
           setNextStepsAutoSubmitCountdown(null);
+          setNextStepsAutoSubmitLabel(null);
           nextStepsAutoSubmitSuggestionRef.current = null;
         }
-        setDraft(next3, cursor);
+        setDraft(next3, deleteStart);
         return;
       }
       if (cursor >= buffer.length) return;
@@ -13267,11 +13426,7 @@ function App({
     }
     if (key.leftArrow) {
       if (key.ctrl) {
-        if (cursor === 0) return;
-        const beforeCursor = buffer.slice(0, cursor);
-        const prevWordStart = beforeCursor.lastIndexOf(" ");
-        const target = prevWordStart === -1 ? 0 : prevWordStart + 1;
-        setDraft(buffer, target);
+        setDraft(buffer, previousInputWordStart(buffer, cursor));
         return;
       }
       if (cursor > 0) setDraft(buffer, cursor - 1);
@@ -13279,11 +13434,7 @@ function App({
     }
     if (key.rightArrow) {
       if (key.ctrl) {
-        if (cursor >= buffer.length) return;
-        const afterCursor = buffer.slice(cursor);
-        const nextWordStart = afterCursor.indexOf(" ");
-        const target = nextWordStart === -1 ? buffer.length : cursor + nextWordStart + 1;
-        setDraft(buffer, target);
+        setDraft(buffer, nextInputWordStart(buffer, cursor));
         return;
       }
       if (cursor < buffer.length) setDraft(buffer, cursor + 1);
@@ -14166,6 +14317,7 @@ User message:
           logLevel: state.settingsPicker.logLevel,
           auditLevel: state.settingsPicker.auditLevel,
           indexOnStart: state.settingsPicker.indexOnStart,
+          thinkingWord: state.settingsPicker.thinkingWord,
           maxIterations: state.settingsPicker.maxIterations,
           autoProceedMaxIterations: state.settingsPicker.autoProceedMaxIterations,
           enhanceDelayMs: state.settingsPicker.enhanceDelayMs,
@@ -14336,6 +14488,7 @@ User message:
           model: `${liveProvider}/${liveModel}`,
           version: appVersion,
           state: state.status,
+          thinkingWord: liveThinkingWord,
           tokenCounter,
           hint: renderRunningTools(state.runningTools) || state.hint,
           queueCount: state.queue.length,