@qwen-code/qwen-code 0.20.2-jobbench-no-todo-write.0 → 0.21.0

package/chunks/{chunk-ZKBNRL6O.js → chunk-SQCQ4KO2.js}

@@ -5,14 +5,14 @@ import {
   enableMouseEvents,
   useKeypress,
   useKeypressContext
-} from "./chunk-6VPLV3L3.js";
+} from "./chunk-LQIW3YFY.js";
 import {
   formatSupportedModes,
   getCommandDisplayName,
   getCommandSourceBadge,
   getCommandSourceGroup,
   getCommandSubcommandNames
-} from "./chunk-ZUTM4LHM.js";
+} from "./chunk-RZIX2G32.js";
 import {
   calculateAverageLatency,
   calculateCacheHitRate,
@@ -22,16 +22,14 @@ import {
   computeSessionStats,
   getSystemInfoFields,
   levelLabel
-} from "./chunk-7MWABCXU.js";
-import {
-  wrapForMultiplexer
-} from "./chunk-4LVZNIDO.js";
+} from "./chunk-U7M2DMGW.js";
 import {
   MINIMUM_MAX_HEIGHT,
   MaxSizedBox
-} from "./chunk-64EG42HV.js";
+} from "./chunk-FQK6JAFG.js";
 import {
   CompactToolGroupDisplay,
+  ICON,
   SCREEN_READER_MODEL_PREFIX,
   SCREEN_READER_USER_PREFIX,
   SHELL_COMMAND_NAME,
@@ -44,10 +42,10 @@ import {
   estimateCompactToolGroupHeight,
   isCollapsibleTool,
   wrapAnsi
-} from "./chunk-KBB5O3JO.js";
+} from "./chunk-JXJFVC6E.js";
 import {
   theme
-} from "./chunk-6IL7KRLE.js";
+} from "./chunk-VAK25FTU.js";
 import {
   require_jsx_runtime
 } from "./chunk-SV5PQVQE.js";
@@ -59,17 +57,17 @@ import {
   use_is_screen_reader_enabled_default,
   use_stdin_default,
   use_stdout_default
-} from "./chunk-NEEB7UEN.js";
-import {
-  require_react
-} from "./chunk-5QWWOFGG.js";
+} from "./chunk-6GMVPFB2.js";
 import {
   relaunchApp
-} from "./chunk-O32RMIMO.js";
+} from "./chunk-Y34KJKDC.js";
 import {
   resolveColor,
   themeManager
-} from "./chunk-7Z6JQEL6.js";
+} from "./chunk-L5UHQJTJ.js";
+import {
+  require_react
+} from "./chunk-5QWWOFGG.js";
 import {
   cpLen,
   cpSlice,
@@ -83,37 +81,37 @@ import {
   toCodePoints,
   truncateToWidth,
   wrapToVisualLines
-} from "./chunk-RS7MT2QG.js";
+} from "./chunk-IPUUTYMV.js";
 import {
   stringWidth
-} from "./chunk-H2XVO6NE.js";
+} from "./chunk-2MIN6GRR.js";
 import {
   isTerminalGoalStatusKind
 } from "./chunk-QTERJVPZ.js";
-import {
-  formatDuration,
-  formatMemoryUsage,
-  formatRelativeTime,
-  formatTokenCount
-} from "./chunk-E5Z2AVNV.js";
 import {
   require_has_flag,
   require_source
 } from "./chunk-57OAHC2Y.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-64XKYOXK.js";
+} from "./chunk-IO3IX5Q4.js";
+import {
+  formatDuration,
+  formatMemoryUsage,
+  formatRelativeTime,
+  formatTokenCount
+} from "./chunk-E5Z2AVNV.js";
 import {
   getPersistScopeForModelSelection
-} from "./chunk-RHYFF54J.js";
+} from "./chunk-TEHGS6UP.js";
 import {
   getCurrentLanguage,
   localizeToolDisplayName,
   t
-} from "./chunk-V7WNRZL7.js";
+} from "./chunk-LKEJ26GS.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-CGIDQG6J.js";
+} from "./chunk-Z2BC6UJ5.js";
 import {
   ALL_PROVIDERS,
   IdeClient,
@@ -135,27 +133,32 @@ import {
   resolveBaseUrl,
   resolveMetadataKey,
   resolveOwnsModel
-} from "./chunk-IWALV67J.js";
+} from "./chunk-PHOF65IG.js";
 import {
   stripAnsi
-} from "./chunk-T4TZQJ7W.js";
+} from "./chunk-TWPJO254.js";
+import {
+  sanitizeForOsc,
+  supportsHyperlinks,
+  wrapForMultiplexer
+} from "./chunk-EPDRMGT4.js";
 import {
   MAIN_SOURCE,
   formatVisionBridgeNoticeDisplay,
   getMCPServerStatus,
   isVisionBridgeNoticeDisplay,
   uiTelemetryService
-} from "./chunk-H4A4A2SY.js";
+} from "./chunk-CIKQ7KKO.js";
 import {
   ToolDisplayNames,
   ToolNames,
   ToolNamesMigration
-} from "./chunk-YM3SZTH4.js";
+} from "./chunk-PR75REBZ.js";
 import {
   createDebugLogger,
   escapePath,
   unescapePath
-} from "./chunk-OQB4EXO4.js";
+} from "./chunk-NL7LTRLR.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -366,7 +369,7 @@ var require_supports_hyperlinks = __commonJS({
     init_esbuild_shims();
     var supportsColor = require_supports_color();
     var hasFlag = require_has_flag();
-    function parseVersion2(versionString) {
+    function parseVersion(versionString) {
       if (/^\d{3,4}$/.test(versionString)) {
         const m = /(\d{1,2})(\d{2})/.exec(versionString);
         return {
@@ -382,7 +385,7 @@ var require_supports_hyperlinks = __commonJS({
         patch: versions[2]
       };
     }
-    __name(parseVersion2, "parseVersion");
+    __name(parseVersion, "parseVersion");
     function supportsHyperlink(stream) {
       const { env } = process;
       if ("FORCE_HYPERLINK" in env) {
@@ -413,7 +416,7 @@ var require_supports_hyperlinks = __commonJS({
         return false;
       }
       if ("TERM_PROGRAM" in env) {
-        const version = parseVersion2(env.TERM_PROGRAM_VERSION);
+        const version = parseVersion(env.TERM_PROGRAM_VERSION);
         switch (env.TERM_PROGRAM) {
           case "iTerm.app":
             if (version.major === 3) {
@@ -430,7 +433,7 @@ var require_supports_hyperlinks = __commonJS({
         if (env.VTE_VERSION === "0.50.0") {
           return false;
         }
-        const version = parseVersion2(env.VTE_VERSION);
+        const version = parseVersion(env.VTE_VERSION);
         return version.major > 0 || version.minor >= 50;
       }
       return false;
@@ -2646,14 +2649,15 @@ __name(useTerminalSize, "useTerminalSize");
 
 // packages/cli/src/ui/components/SessionPreview.tsx
 init_esbuild_shims();
-var import_react41 = __toESM(require_react(), 1);
+var import_react42 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/HistoryItemDisplay.tsx
 init_esbuild_shims();
-var import_react40 = __toESM(require_react(), 1);
+var import_react41 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/messages/ConversationMessages.tsx
 init_esbuild_shims();
+var import_react13 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/utils/MarkdownDisplay.tsx
 init_esbuild_shims();
@@ -2827,7 +2831,7 @@ function colorizeCode(code, language, availableHeight, maxWidth, options = {}) {
             lowlight
           );
           return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Box_default, { children: [
-            showLineNumbers && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: activeTheme.colors.Gray, children: `${String(
+            showLineNumbers && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: activeTheme.colors.Gray, selectable: false, children: `${String(
               index + firstLineNumber + hiddenLinesCount
             ).padStart(padWidth, " ")} ` }),
             /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: activeTheme.defaultColor, wrap: "wrap", children: contentToRender })
@@ -2849,7 +2853,7 @@ function colorizeCode(code, language, availableHeight, maxWidth, options = {}) {
         maxWidth,
         overflowDirection: "top",
         children: lines.map((line, index) => /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Box_default, { children: [
-          showLineNumbers && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: activeTheme.defaultColor, children: `${String(index + firstLineNumber).padStart(padWidth, " ")} ` }),
+          showLineNumbers && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: activeTheme.defaultColor, selectable: false, children: `${String(index + firstLineNumber).padStart(padWidth, " ")} ` }),
           /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: activeTheme.colors.Gray, children: line })
         ] }, index))
       }
@@ -3250,20 +3254,6 @@ __name(renderInlineLatex, "renderInlineLatex");
 
 // packages/cli/src/ui/utils/osc8.ts
 init_esbuild_shims();
-function sanitizeForOsc(s) {
-  return s.replace(
-    // eslint-disable-next-line no-control-regex
-    /[\x00-\x1f\x7f\x80-\x9f\u200e\u200f\u202a-\u202e\u2066-\u2069\u2028\u2029]/g,
-    ""
-  );
-}
-__name(sanitizeForOsc, "sanitizeForOsc");
-function osc8Hyperlink(url, label = url) {
-  const safeUrl = sanitizeForOsc(url);
-  const safeLabel = sanitizeForOsc(label);
-  return wrapForMultiplexer(`\x1B]8;;${safeUrl}\x07${safeLabel}\x1B]8;;\x07`);
-}
-__name(osc8Hyperlink, "osc8Hyperlink");
 function osc8Open(url) {
   return wrapForMultiplexer(`\x1B]8;;${sanitizeForOsc(url)}\x07`);
 }
@@ -3287,93 +3277,6 @@ function isSafeOscScheme(url) {
   return SAFE_OSC8_SCHEMES.has(match[1].toLowerCase());
 }
 __name(isSafeOscScheme, "isSafeOscScheme");
-function shouldForceHyperlinks(value) {
-  if (value.length === 0) return true;
-  const trimmed = value.trim();
-  if (!/^[+-]?\d+$/.test(trimmed)) return false;
-  return Number(trimmed) !== 0;
-}
-__name(shouldForceHyperlinks, "shouldForceHyperlinks");
-function parseVersion(versionString) {
-  if (!versionString) return { major: 0, minor: 0, patch: 0 };
-  if (/^\d{3,4}$/.test(versionString)) {
-    const m = /(\d{1,2})(\d{2})/.exec(versionString);
-    return { major: 0, minor: parseInt(m[1], 10), patch: parseInt(m[2], 10) };
-  }
-  const parts = versionString.split(".").map((n) => parseInt(n, 10) || 0);
-  return { major: parts[0] ?? 0, minor: parts[1] ?? 0, patch: parts[2] ?? 0 };
-}
-__name(parseVersion, "parseVersion");
-function supportsHyperlinks(stream = process.stdout) {
-  const env = process.env;
-  if (env["QWEN_DISABLE_HYPERLINKS"] === "1") return false;
-  if (env["NO_COLOR"] !== void 0 && env["NO_COLOR"] !== "") return false;
-  if (env["FORCE_COLOR"] === "0" || env["FORCE_COLOR"] === "false") {
-    return false;
-  }
-  if (!stream || !stream.isTTY) return false;
-  const force = env["FORCE_HYPERLINK"];
-  if (force !== void 0) {
-    return shouldForceHyperlinks(force);
-  }
-  if (env["CI"]) return false;
-  if (env["TEAMCITY_VERSION"]) return false;
-  if (env["TMUX"] || env["STY"]) return false;
-  if (env["WT_SESSION"]) return true;
-  if (env["KITTY_WINDOW_ID"] || env["TERM"] === "xterm-kitty") return true;
-  if (env["DOMTERM"]) return true;
-  if (env["GHOSTTY_RESOURCES_DIR"] || env["TERM"] === "xterm-ghostty") {
-    return true;
-  }
-  if (env["KONSOLE_VERSION"]) {
-    const konsoleVersion = parseInt(env["KONSOLE_VERSION"], 10);
-    if (Number.isFinite(konsoleVersion) && konsoleVersion >= 210400) {
-      return true;
-    }
-  }
-  if (env["TERM"] === "alacritty" || env["ALACRITTY_LOG"] !== void 0 || env["ALACRITTY_WINDOW_ID"] !== void 0 || env["ALACRITTY_SOCKET"] !== void 0) {
-    return true;
-  }
-  if (env["TERMINAL_EMULATOR"] === "JetBrains-JediTerm") return true;
-  if (env["TERM_PROGRAM"]) {
-    const version = parseVersion(env["TERM_PROGRAM_VERSION"]);
-    switch (env["TERM_PROGRAM"]) {
-      case "iTerm.app":
-        if (version.major === 3) return version.minor >= 1;
-        return version.major > 3;
-      case "WezTerm":
-        return version.major >= 20200620;
-      case "vscode":
-        return version.major > 1 || version.major === 1 && version.minor >= 72;
-      case "ghostty":
-        return true;
-      case "mintty":
-        if (!env["TERM_PROGRAM_VERSION"]) return false;
-        return version.major > 3 || version.major === 3 && version.minor >= 3;
-      // Warp (TERM_PROGRAM=WarpTerminal) does NOT yet support OSC 8 — its
-      // rendering engine ignores the envelope and prints visible garbage,
-      // so we deliberately fall through to the legacy `label (url)` path.
-      // Re-enable when Warp ships OSC 8 support.
-      //
-      // Hyper exposes OSC 8 in recent versions but plugin chains have a
-      // history of breaking escape passthrough — gate on FORCE_HYPERLINK
-      // so users who know their setup works can opt in explicitly.
-      default:
-        break;
-    }
-  }
-  if (env["VTE_VERSION"]) {
-    const version = parseVersion(env["VTE_VERSION"]);
-    if (version.major === 0 && version.minor === 50 && version.patch === 0) {
-      return false;
-    }
-    if (version.major > 0 || version.minor >= 50) return true;
-    return false;
-  }
-  if (process.platform === "win32") return false;
-  return false;
-}
-__name(supportsHyperlinks, "supportsHyperlinks");
 function trimTrailingUrlPunctuation(url) {
   let openParen = 0;
   let openBracket = 0;
@@ -7092,8 +6995,8 @@ var RenderListItemInternal = /* @__PURE__ */ __name(({
   const isTaskItem = taskMatch !== null && renderVisualBlocks;
   const isTaskChecked = taskMatch?.[1]?.toLowerCase() === "x";
   const effectiveItemText = isTaskItem ? taskMatch[2] : itemText;
-  const prefix = isTaskItem ? `${isTaskChecked ? "\u2713" : "\u25CB"} ` : type === "ol" ? `${marker}. ` : `${marker} `;
-  const prefixWidth = prefix.length;
+  const prefix = isTaskItem ? `${isTaskChecked ? "\u2713" : ICON.CIRCLE_EMPTY} ` : type === "ol" ? `${marker}. ` : `${marker} `;
+  const prefixWidth = stringWidth(prefix);
   const indentation = leadingWhitespace.length;
   return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
     Box_default,
@@ -7155,11 +7058,23 @@ function getArenaStatusLabel(status) {
     case "failed" /* FAILED */:
       return { icon: "\u2717", text: "Failed", color: theme.status.error };
     case "running" /* RUNNING */:
-      return { icon: "\u25CB", text: "Running", color: theme.text.secondary };
+      return {
+        icon: ICON.CIRCLE_EMPTY,
+        text: "Running",
+        color: theme.text.secondary
+      };
     case "initializing" /* INITIALIZING */:
-      return { icon: "\u25CB", text: "Initializing", color: theme.text.secondary };
+      return {
+        icon: ICON.CIRCLE_EMPTY,
+        text: "Initializing",
+        color: theme.text.secondary
+      };
     default:
-      return { icon: "\u25CB", text: status, color: theme.text.secondary };
+      return {
+        icon: ICON.CIRCLE_EMPTY,
+        text: status,
+        color: theme.text.secondary
+      };
   }
 }
 __name(getArenaStatusLabel, "getArenaStatusLabel");
@@ -7192,8 +7107,8 @@ __name(formatDuration2, "formatDuration");
 
 // packages/cli/src/ui/components/messages/ConversationMessages.tsx
 var import_jsx_runtime8 = __toESM(require_jsx_runtime(), 1);
-var THINKING_ICON = "\u2234 ";
-var THINKING_ICON_PENDING = "\u2235 ";
+var THINKING_ICON = `${ICON.THEREFORE} `;
+var THINKING_ICON_PENDING = `${ICON.BECAUSE} `;
 var toggleKeyHint = process.platform === "darwin" ? "option+t" : "alt+t";
 function getPrefixWidth(prefix) {
   return stringWidth(prefix) + 1;
@@ -7217,7 +7132,7 @@ var PrefixedTextMessage = /* @__PURE__ */ __name(({
       marginTop,
       alignSelf,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Box_default, { width: prefixWidth, children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Text, { color: prefixColor, "aria-label": ariaLabel, children: prefix }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Box_default, { width: prefixWidth, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Text, { color: prefixColor, "aria-label": ariaLabel, children: prefix }) }),
         /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Text, { wrap: "wrap", color: textColor, children: text }) })
       ]
     }
@@ -7236,7 +7151,7 @@ var PrefixedMarkdownMessage = /* @__PURE__ */ __name(({
 }) => {
   const prefixWidth = getPrefixWidth(prefix);
   return /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(Box_default, { flexDirection: "row", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Box_default, { width: prefixWidth, children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Text, { color: prefixColor, "aria-label": ariaLabel, children: prefix }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Box_default, { width: prefixWidth, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Text, { color: prefixColor, "aria-label": ariaLabel, children: prefix }) }),
     /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Box_default, { flexGrow: 1, flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
       MarkdownDisplay,
       {
@@ -7310,7 +7225,7 @@ var AssistantMessage = /* @__PURE__ */ __name(({
   PrefixedMarkdownMessage,
   {
     text,
-    prefix: "\u25C6",
+    prefix: ICON.DIAMOND,
     prefixColor: theme.text.accent,
     ariaLabel: SCREEN_READER_MODEL_PREFIX,
     isPending,
@@ -7332,7 +7247,7 @@ var AssistantMessageContent = /* @__PURE__ */ __name(({
     isPending,
     availableTerminalHeight,
     contentWidth,
-    basePrefix: "\u25C6",
+    basePrefix: ICON.DIAMOND,
     sourceCopyIndexOffsets
   }
 ), "AssistantMessageContent");
@@ -7348,21 +7263,25 @@ function tailVisualLines(text, width, maxLines) {
     }
   }
   const lines = wrapToVisualLines(text.slice(sliceStart), width);
-  return lines.slice(-maxLines).join("\n");
+  return lines.slice(-maxLines);
 }
 __name(tailVisualLines, "tailVisualLines");
 var ThinkBody = /* @__PURE__ */ __name(({ text, isPending, expanded, availableTerminalHeight, contentWidth }) => {
+  const maxSeenLinesRef = (0, import_react13.useRef)(0);
+  const prevTextLenRef = (0, import_react13.useRef)(0);
+  if (!isPending || text.length < prevTextLenRef.current) {
+    maxSeenLinesRef.current = 0;
+  }
+  prevTextLenRef.current = text.length;
   if (!isPending && !expanded) return null;
   if (isPending && !expanded) {
     const innerWidth = Math.max(contentWidth - 2, 20);
-    const maxLines = availableTerminalHeight != null ? Math.max(
-      1,
-      Math.min(
-        MAX_STREAMING_THINKING_VISUAL_LINES,
-        Math.floor(availableTerminalHeight / 3)
-      )
-    ) : MAX_STREAMING_THINKING_VISUAL_LINES;
-    const display = tailVisualLines(text, innerWidth, maxLines);
+    const maxLines = MAX_STREAMING_THINKING_VISUAL_LINES;
+    const lines = tailVisualLines(text, innerWidth, maxLines);
+    const target = Math.max(lines.length, maxSeenLinesRef.current);
+    maxSeenLinesRef.current = target;
+    const padded = lines.length < target ? [...new Array(target - lines.length).fill(""), ...lines] : lines;
+    const display = padded.join("\n");
     return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Text, { dimColor: true, wrap: "truncate", children: display }) });
   }
   return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Box_default, { paddingLeft: 2, flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
@@ -7436,11 +7355,11 @@ var ThinkMessageContent = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
 init_esbuild_shims();
-var import_react26 = __toESM(require_react(), 1);
+var import_react27 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/messages/ToolMessage.tsx
 init_esbuild_shims();
-var import_react24 = __toESM(require_react(), 1);
+var import_react25 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/messages/DiffRenderer.tsx
 init_esbuild_shims();
@@ -7648,6 +7567,7 @@ var renderDiffContent = /* @__PURE__ */ __name((parsedLines, filename, tabWidth
             showLineNumbers && /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
               Text,
               {
+                selectable: false,
                 color: theme.text.secondary,
                 backgroundColor: line.type === "add" ? theme.background.diff.added : line.type === "del" ? theme.background.diff.removed : void 0,
                 children: [
@@ -7814,9 +7734,9 @@ var Colors = {
 // packages/cli/src/ui/components/TodoDisplay.tsx
 var import_jsx_runtime11 = __toESM(require_jsx_runtime(), 1);
 var STATUS_ICONS = {
-  pending: "\u25CB",
-  in_progress: "\u25D0",
-  completed: "\u25CF"
+  pending: ICON.CIRCLE_EMPTY,
+  in_progress: ICON.CIRCLE_LEFT_HALF,
+  completed: ICON.CIRCLE_FILLED
 };
 var TodoDisplay = /* @__PURE__ */ __name(({ todos }) => {
   if (!todos || todos.length === 0) {
@@ -7837,7 +7757,7 @@ var TodoItemRow = /* @__PURE__ */ __name(({ todo }) => {
 
 // packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx
 init_esbuild_shims();
-var import_react22 = __toESM(require_react(), 1);
+var import_react23 = __toESM(require_react(), 1);
 import { promises as fs3 } from "node:fs";
 import * as os3 from "node:os";
 import * as path2 from "node:path";
@@ -7847,11 +7767,11 @@ init_esbuild_shims();
 
 // packages/cli/src/ui/components/shared/BaseSelectionList.tsx
 init_esbuild_shims();
-var import_react16 = __toESM(require_react(), 1);
+var import_react17 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/useSelectionList.ts
 init_esbuild_shims();
-var import_react13 = __toESM(require_react(), 1);
+var import_react14 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/keyMatchers.ts
 init_esbuild_shims();
@@ -7877,6 +7797,8 @@ var Command = /* @__PURE__ */ ((Command2) => {
   Command2["ACCEPT_SUGGESTION"] = "acceptSuggestion";
   Command2["COMPLETION_UP"] = "completionUp";
   Command2["COMPLETION_DOWN"] = "completionDown";
+  Command2["COMPLETION_TAB_LEFT"] = "completionTabLeft";
+  Command2["COMPLETION_TAB_RIGHT"] = "completionTabRight";
   Command2["SUBMIT"] = "submit";
   Command2["QUEUE_MESSAGE"] = "queueMessage";
   Command2["NEWLINE"] = "newline";
@@ -7964,6 +7886,17 @@ var defaultKeyBindings = {
     { key: "down", shift: false },
     { key: "n", ctrl: true }
   ],
+  // Completion category tab switching (for the tabbed @ completion UI).
+  // Bound to Ctrl+arrows rather than plain arrows so the bare arrow keys keep
+  // moving the caret in the editable input buffer (plain arrows only switch
+  // tabs in modal dialogs, which have no text buffer). Alt/Option+arrows still
+  // perform word movement.
+  ["completionTabLeft" /* COMPLETION_TAB_LEFT */]: [
+    { key: "left", shift: false, ctrl: true, command: false }
+  ],
+  ["completionTabRight" /* COMPLETION_TAB_RIGHT */]: [
+    { key: "right", shift: false, ctrl: true, command: false }
+  ],
   // Text input
   // Must also exclude shift to allow shift+enter for newline
   ["submit" /* SUBMIT */]: [
@@ -8203,19 +8136,19 @@ function useSelectionList({
   showNumbers = false,
   disableVimNav = false
 }) {
-  const [state, dispatch] = (0, import_react13.useReducer)(selectionListReducer, {
+  const [state, dispatch] = (0, import_react14.useReducer)(selectionListReducer, {
     activeIndex: computeInitialIndex(initialIndex, items),
     initialIndex,
     pendingHighlight: false,
     pendingSelect: false,
     items
   });
-  const numberInputRef = (0, import_react13.useRef)("");
-  const numberInputTimer = (0, import_react13.useRef)(null);
-  (0, import_react13.useEffect)(() => {
+  const numberInputRef = (0, import_react14.useRef)("");
+  const numberInputTimer = (0, import_react14.useRef)(null);
+  (0, import_react14.useEffect)(() => {
     dispatch({ type: "INITIALIZE", payload: { initialIndex, items } });
   }, [initialIndex, items]);
-  (0, import_react13.useEffect)(() => {
+  (0, import_react14.useEffect)(() => {
     let needsClear = false;
     if (state.pendingHighlight && items[state.activeIndex]) {
       onHighlight?.(items[state.activeIndex].value);
@@ -8239,7 +8172,7 @@ function useSelectionList({
     onHighlight,
     onSelect
   ]);
-  (0, import_react13.useEffect)(
+  (0, import_react14.useEffect)(
     () => () => {
       if (numberInputTimer.current) {
         clearTimeout(numberInputTimer.current);
@@ -8335,11 +8268,11 @@ __name(useSelectionList, "useSelectionList");
 
 // packages/cli/src/ui/components/shared/RowMouseController.tsx
 init_esbuild_shims();
-var import_react15 = __toESM(require_react(), 1);
+var import_react16 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/useMouseEvents.ts
 init_esbuild_shims();
-var import_react14 = __toESM(require_react(), 1);
+var import_react15 = __toESM(require_react(), 1);
 var mouseModeRefs = /* @__PURE__ */ new Map();
 function effectiveTracking(entry) {
   if (entry.any > 0) return "any";
@@ -8391,23 +8324,23 @@ function useMouseEvents(handler, { isActive, tracking = "button", bypassVpGate =
   const { isRawModeSupported } = use_stdin_default();
   const { stdout } = use_stdout_default();
   const { subscribeMouse, unsubscribeMouse } = useKeypressContext();
-  const settings = (0, import_react14.useContext)(SettingsContext);
+  const settings = (0, import_react15.useContext)(SettingsContext);
   const isVpMode = settings?.merged.ui?.useTerminalBuffer ?? false;
   const vpGateOpen = isVpMode || bypassVpGate;
-  const handlerRef = (0, import_react14.useRef)(handler);
+  const handlerRef = (0, import_react15.useRef)(handler);
   handlerRef.current = handler;
   const enabled = isActive && isRawModeSupported && vpGateOpen && Boolean(stdout.isTTY);
-  (0, import_react14.useEffect)(() => {
+  (0, import_react15.useEffect)(() => {
     if (!enabled) return;
     acquireMouseMode(stdout, tracking);
     return () => {
       releaseMouseMode(stdout, tracking);
     };
   }, [enabled, stdout, tracking]);
-  const mouseCallback = (0, import_react14.useCallback)((event) => {
+  const mouseCallback = (0, import_react15.useCallback)((event) => {
     handlerRef.current(event);
   }, []);
-  (0, import_react14.useEffect)(() => {
+  (0, import_react15.useEffect)(() => {
     if (!enabled) return;
     subscribeMouse(mouseCallback);
     return () => unsubscribeMouse(mouseCallback);
@@ -8488,7 +8421,7 @@ function RowMouseController({
   onSelectIndex
 }) {
   const { rows: terminalHeight } = useTerminalSize();
-  const resolveIndex = (0, import_react15.useCallback)(
+  const resolveIndex = (0, import_react16.useCallback)(
     (event) => {
       const container = containerRef.current;
       if (!container) return null;
@@ -8515,7 +8448,7 @@ function RowMouseController({
     },
     [containerRef, itemRefs, scrollOffset, terminalHeight]
   );
-  const handleMouse = (0, import_react15.useCallback)(
+  const handleMouse = (0, import_react16.useCallback)(
     (event) => {
       if (event.name !== "move" && event.name !== "left-press") return;
       const index = resolveIndex(event);
@@ -8562,10 +8495,10 @@ function BaseSelectionList({
     isFocused,
     showNumbers
   });
-  const [scrollOffset, setScrollOffset] = (0, import_react16.useState)(
+  const [scrollOffset, setScrollOffset] = (0, import_react17.useState)(
     () => getScrollOffsetForIndex(activeIndex, items.length, maxItemsToShow)
   );
-  (0, import_react16.useEffect)(() => {
+  (0, import_react17.useEffect)(() => {
     const newScrollOffset = getScrollOffsetForIndex(
       activeIndex,
       items.length,
@@ -8577,10 +8510,10 @@ function BaseSelectionList({
       setScrollOffset(newScrollOffset);
     }
   }, [activeIndex, items.length, scrollOffset, maxItemsToShow]);
-  const settings = (0, import_react16.useContext)(SettingsContext);
+  const settings = (0, import_react17.useContext)(SettingsContext);
   const mouseEnabled = !!settings?.merged.ui?.useTerminalBuffer;
-  const containerRef = (0, import_react16.useRef)(null);
-  const itemRefs = (0, import_react16.useRef)([]);
+  const containerRef = (0, import_react17.useRef)(null);
+  const itemRefs = (0, import_react17.useRef)([]);
   const visibleItems = items.slice(scrollOffset, scrollOffset + maxItemsToShow);
   const numberColumnWidth = String(items.length).length;
   return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(Box_default, { ref: containerRef, flexDirection: "column", gap: itemGap, children: [
@@ -8710,7 +8643,7 @@ __name(RadioButtonSelect, "RadioButtonSelect");
 
 // packages/cli/src/ui/hooks/useLaunchEditor.ts
 init_esbuild_shims();
-var import_react17 = __toESM(require_react(), 1);
+var import_react18 = __toESM(require_react(), 1);
 import { spawnSync as spawnSync2 } from "child_process";
 function getEditorCommand(preferredEditor) {
   if (preferredEditor) {
@@ -8736,7 +8669,7 @@ __name(getEditorCommand, "getEditorCommand");
 function useLaunchEditor() {
   const settings = useSettings();
   const { stdin, setRawMode } = use_stdin_default();
-  const launchEditor = (0, import_react17.useCallback)(
+  const launchEditor = (0, import_react18.useCallback)(
     async (filePath) => {
       const preferredEditor = settings.merged.general?.preferredEditor;
       const editor = getEditorCommand(preferredEditor);
@@ -8773,14 +8706,14 @@ __name(useLaunchEditor, "useLaunchEditor");
 
 // packages/cli/src/ui/components/messages/AskUserQuestionDialog.tsx
 init_esbuild_shims();
-var import_react21 = __toESM(require_react(), 1);
+var import_react22 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/shared/TextInput.tsx
 init_esbuild_shims();
 
 // packages/cli/src/ui/components/shared/text-buffer.ts
 init_esbuild_shims();
-var import_react18 = __toESM(require_react(), 1);
+var import_react19 = __toESM(require_react(), 1);
 import { spawnSync as spawnSync3 } from "node:child_process";
 import fs2 from "node:fs";
 import os2 from "node:os";
@@ -10838,7 +10771,7 @@ function useTextBuffer({
   shellModeActive = false,
   preferredEditor
 }) {
-  const initialState = (0, import_react18.useMemo)(() => {
+  const initialState = (0, import_react19.useMemo)(() => {
     const lines2 = initialText.split("\n");
     const [initialCursorRow, initialCursorCol] = calculateInitialCursorPosition(
       lines2.length === 0 ? [""] : lines2,
@@ -10862,9 +10795,9 @@ function useTextBuffer({
       visualLayout: visualLayout2
     };
   }, [initialText, initialCursorOffset, viewport.width, viewport.height]);
-  const stateRef = (0, import_react18.useRef)(initialState);
-  const [state, setState] = (0, import_react18.useState)(initialState);
-  const dispatch = (0, import_react18.useCallback)((action) => {
+  const stateRef = (0, import_react19.useRef)(initialState);
+  const [state, setState] = (0, import_react19.useState)(initialState);
+  const dispatch = (0, import_react19.useCallback)((action) => {
     stateRef.current = textBufferReducer(stateRef.current, action);
     setState(stateRef.current);
   }, []);
@@ -10876,25 +10809,25 @@ function useTextBuffer({
     selectionAnchor,
     visualLayout
   } = state;
-  const text = (0, import_react18.useMemo)(() => lines.join("\n"), [lines]);
-  const visualCursor = (0, import_react18.useMemo)(
+  const text = (0, import_react19.useMemo)(() => lines.join("\n"), [lines]);
+  const visualCursor = (0, import_react19.useMemo)(
     () => calculateVisualCursorFromLayout(visualLayout, [cursorRow, cursorCol]),
     [visualLayout, cursorRow, cursorCol]
   );
   const { visualLines, visualToLogicalMap } = visualLayout;
-  const [visualScrollRow, setVisualScrollRow] = (0, import_react18.useState)(0);
-  (0, import_react18.useEffect)(() => {
+  const [visualScrollRow, setVisualScrollRow] = (0, import_react19.useState)(0);
+  (0, import_react19.useEffect)(() => {
     if (onChange) {
       onChange(text);
     }
   }, [text, onChange]);
-  (0, import_react18.useEffect)(() => {
+  (0, import_react19.useEffect)(() => {
     dispatch({
       type: "set_viewport",
       payload: { width: viewport.width, height: viewport.height }
     });
   }, [dispatch, viewport.width, viewport.height]);
-  (0, import_react18.useEffect)(() => {
+  (0, import_react19.useEffect)(() => {
     const { height } = viewport;
     const totalVisualLines = visualLines.length;
     const maxScrollStart = Math.max(0, totalVisualLines - height);
@@ -10909,7 +10842,7 @@ function useTextBuffer({
       setVisualScrollRow(newVisualScrollRow);
     }
   }, [visualCursor, visualScrollRow, viewport, visualLines.length]);
-  const insert = (0, import_react18.useCallback)(
+  const insert = (0, import_react19.useCallback)(
     (ch, { paste = false } = {}) => {
       if (paste && /[\n\r]/.test(ch) && !shellModeActive) {
         const validPaths = tryExtractFilePaths(ch, isValidPath);
@@ -10948,202 +10881,202 @@ function useTextBuffer({
     },
     [dispatch, isValidPath, shellModeActive]
   );
-  const newline = (0, import_react18.useCallback)(() => {
+  const newline = (0, import_react19.useCallback)(() => {
     dispatch({ type: "insert", payload: "\n" });
   }, [dispatch]);
-  const backspace = (0, import_react18.useCallback)(() => {
+  const backspace = (0, import_react19.useCallback)(() => {
     dispatch({ type: "backspace" });
   }, [dispatch]);
-  const del = (0, import_react18.useCallback)(() => {
+  const del = (0, import_react19.useCallback)(() => {
     dispatch({ type: "delete" });
   }, [dispatch]);
-  const move = (0, import_react18.useCallback)(
+  const move = (0, import_react19.useCallback)(
     (dir) => {
       dispatch({ type: "move", payload: { dir } });
     },
     [dispatch]
   );
-  const undo = (0, import_react18.useCallback)(() => {
+  const undo = (0, import_react19.useCallback)(() => {
     dispatch({ type: "undo" });
   }, [dispatch]);
-  const redo = (0, import_react18.useCallback)(() => {
+  const redo = (0, import_react19.useCallback)(() => {
     dispatch({ type: "redo" });
   }, [dispatch]);
-  const setText = (0, import_react18.useCallback)(
+  const setText = (0, import_react19.useCallback)(
     (newText) => {
       dispatch({ type: "set_text", payload: newText });
     },
     [dispatch]
   );
-  const deleteWordLeft = (0, import_react18.useCallback)(() => {
+  const deleteWordLeft = (0, import_react19.useCallback)(() => {
     dispatch({ type: "delete_word_left" });
   }, [dispatch]);
-  const deleteWordRight = (0, import_react18.useCallback)(() => {
+  const deleteWordRight = (0, import_react19.useCallback)(() => {
     dispatch({ type: "delete_word_right" });
   }, [dispatch]);
-  const killLineRight = (0, import_react18.useCallback)(() => {
+  const killLineRight = (0, import_react19.useCallback)(() => {
     dispatch({ type: "kill_line_right" });
   }, [dispatch]);
-  const killLineLeft = (0, import_react18.useCallback)(() => {
+  const killLineLeft = (0, import_react19.useCallback)(() => {
     dispatch({ type: "kill_line_left" });
   }, [dispatch]);
-  const vimDeleteWordForward = (0, import_react18.useCallback)(
+  const vimDeleteWordForward = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_delete_word_forward", payload: { count } });
     },
     [dispatch]
   );
-  const vimDeleteWordBackward = (0, import_react18.useCallback)(
+  const vimDeleteWordBackward = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_delete_word_backward", payload: { count } });
     },
     [dispatch]
   );
-  const vimDeleteWordEnd = (0, import_react18.useCallback)(
+  const vimDeleteWordEnd = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_delete_word_end", payload: { count } });
     },
     [dispatch]
   );
-  const vimChangeWordForward = (0, import_react18.useCallback)(
+  const vimChangeWordForward = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_change_word_forward", payload: { count } });
     },
     [dispatch]
   );
-  const vimChangeWordBackward = (0, import_react18.useCallback)(
+  const vimChangeWordBackward = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_change_word_backward", payload: { count } });
     },
     [dispatch]
   );
-  const vimChangeWordEnd = (0, import_react18.useCallback)(
+  const vimChangeWordEnd = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_change_word_end", payload: { count } });
     },
     [dispatch]
   );
-  const vimDeleteLine = (0, import_react18.useCallback)(
+  const vimDeleteLine = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_delete_line", payload: { count } });
     },
     [dispatch]
   );
-  const vimChangeLine = (0, import_react18.useCallback)(
+  const vimChangeLine = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_change_line", payload: { count } });
     },
     [dispatch]
   );
-  const vimDeleteToEndOfLine = (0, import_react18.useCallback)(() => {
+  const vimDeleteToEndOfLine = (0, import_react19.useCallback)(() => {
     dispatch({ type: "vim_delete_to_end_of_line" });
   }, [dispatch]);
-  const vimChangeToEndOfLine = (0, import_react18.useCallback)(() => {
+  const vimChangeToEndOfLine = (0, import_react19.useCallback)(() => {
     dispatch({ type: "vim_change_to_end_of_line" });
   }, [dispatch]);
-  const vimChangeMovement = (0, import_react18.useCallback)(
+  const vimChangeMovement = (0, import_react19.useCallback)(
     (movement, count) => {
       dispatch({ type: "vim_change_movement", payload: { movement, count } });
     },
     [dispatch]
   );
-  const vimDeleteMovement = (0, import_react18.useCallback)(
+  const vimDeleteMovement = (0, import_react19.useCallback)(
     (movement, count) => {
       dispatch({ type: "vim_delete_movement", payload: { movement, count } });
     },
     [dispatch]
   );
-  const vimMoveLeft = (0, import_react18.useCallback)(
+  const vimMoveLeft = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_move_left", payload: { count } });
     },
     [dispatch]
   );
-  const vimMoveRight = (0, import_react18.useCallback)(
+  const vimMoveRight = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_move_right", payload: { count } });
     },
     [dispatch]
   );
-  const vimMoveUp = (0, import_react18.useCallback)(
+  const vimMoveUp = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_move_up", payload: { count } });
     },
     [dispatch]
   );
-  const vimMoveDown = (0, import_react18.useCallback)(
+  const vimMoveDown = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_move_down", payload: { count } });
     },
     [dispatch]
   );
-  const vimMoveWordForward = (0, import_react18.useCallback)(
+  const vimMoveWordForward = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_move_word_forward", payload: { count } });
     },
     [dispatch]
   );
-  const vimMoveWordBackward = (0, import_react18.useCallback)(
+  const vimMoveWordBackward = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_move_word_backward", payload: { count } });
     },
     [dispatch]
   );
-  const vimMoveWordEnd = (0, import_react18.useCallback)(
+  const vimMoveWordEnd = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_move_word_end", payload: { count } });
     },
     [dispatch]
   );
-  const vimDeleteChar = (0, import_react18.useCallback)(
+  const vimDeleteChar = (0, import_react19.useCallback)(
     (count) => {
       dispatch({ type: "vim_delete_char", payload: { count } });
     },
     [dispatch]
   );
-  const vimInsertAtCursor = (0, import_react18.useCallback)(() => {
+  const vimInsertAtCursor = (0, import_react19.useCallback)(() => {
     dispatch({ type: "vim_insert_at_cursor" });
   }, [dispatch]);
-  const vimAppendAtCursor = (0, import_react18.useCallback)(() => {
+  const vimAppendAtCursor = (0, import_react19.useCallback)(() => {
     dispatch({ type: "vim_append_at_cursor" });
   }, [dispatch]);
-  const vimOpenLineBelow = (0, import_react18.useCallback)(() => {
+  const vimOpenLineBelow = (0, import_react19.useCallback)(() => {
     dispatch({ type: "vim_open_line_below" });
   }, [dispatch]);
-  const vimOpenLineAbove = (0, import_react18.useCallback)(() => {
+  const vimOpenLineAbove = (0, import_react19.useCallback)(() => {
     dispatch({ type: "vim_open_line_above" });
   }, [dispatch]);
-  const vimAppendAtLineEnd = (0, import_react18.useCallback)(() => {
+  const vimAppendAtLineEnd = (0, import_react19.useCallback)(() => {
     dispatch({ type: "vim_append_at_line_end" });
   }, [dispatch]);
-  const vimInsertAtLineStart = (0, import_react18.useCallback)(() => {
+  const vimInsertAtLineStart = (0, import_react19.useCallback)(() => {
     dispatch({ type: "vim_insert_at_line_start" });
   }, [dispatch]);
-  const vimMoveToLineStart = (0, import_react18.useCallback)(() => {
+  const vimMoveToLineStart = (0, import_react19.useCallback)(() => {
     dispatch({ type: "vim_move_to_line_start" });
   }, [dispatch]);
-  const vimMoveToLineEnd = (0, import_react18.useCallback)(() => {
+  const vimMoveToLineEnd = (0, import_react19.useCallback)(() => {
     dispatch({ type: "vim_move_to_line_end" });
   }, [dispatch]);
-  const vimMoveToFirstNonWhitespace = (0, import_react18.useCallback)(() => {
+  const vimMoveToFirstNonWhitespace = (0, import_react19.useCallback)(() => {
     dispatch({ type: "vim_move_to_first_nonwhitespace" });
   }, [dispatch]);
-  const vimMoveToFirstLine = (0, import_react18.useCallback)(() => {
+  const vimMoveToFirstLine = (0, import_react19.useCallback)(() => {
     dispatch({ type: "vim_move_to_first_line" });
   }, [dispatch]);
-  const vimMoveToLastLine = (0, import_react18.useCallback)(() => {
+  const vimMoveToLastLine = (0, import_react19.useCallback)(() => {
     dispatch({ type: "vim_move_to_last_line" });
   }, [dispatch]);
-  const vimMoveToLine = (0, import_react18.useCallback)(
+  const vimMoveToLine = (0, import_react19.useCallback)(
     (lineNumber) => {
       dispatch({ type: "vim_move_to_line", payload: { lineNumber } });
     },
     [dispatch]
   );
-  const vimEscapeInsertMode = (0, import_react18.useCallback)(() => {
+  const vimEscapeInsertMode = (0, import_react19.useCallback)(() => {
     dispatch({ type: "vim_escape_insert_mode" });
   }, [dispatch]);
-  const openInExternalEditor = (0, import_react18.useCallback)(
+  const openInExternalEditor = (0, import_react19.useCallback)(
     async (opts = {}) => {
       let tmpDir;
       let filePath;
@@ -11261,7 +11194,7 @@ function useTextBuffer({
     },
     [dispatch, stdin, setRawMode, preferredEditor]
   );
-  const handleInput = (0, import_react18.useCallback)(
+  const handleInput = (0, import_react19.useCallback)(
     (key) => {
       const { sequence: input } = key;
       if (key.paste) {
@@ -11312,11 +11245,11 @@ function useTextBuffer({
       redo
     ]
   );
-  const renderedVisualLines = (0, import_react18.useMemo)(
+  const renderedVisualLines = (0, import_react19.useMemo)(
     () => visualLines.slice(visualScrollRow, visualScrollRow + viewport.height),
     [visualLines, visualScrollRow, viewport.height]
   );
-  const replaceRange = (0, import_react18.useCallback)(
+  const replaceRange = (0, import_react19.useCallback)(
     (startRow, startCol, endRow, endCol, text2) => {
       dispatch({
         type: "replace_range",
@@ -11325,7 +11258,7 @@ function useTextBuffer({
     },
     [dispatch]
   );
-  const replaceRangeByOffset = (0, import_react18.useCallback)(
+  const replaceRangeByOffset = (0, import_react19.useCallback)(
     (startOffset, endOffset, replacementText) => {
       const currentText = stateRef.current.lines.join("\n");
       const [startRow, startCol] = offsetToLogicalPos(currentText, startOffset);
@@ -11334,13 +11267,13 @@ function useTextBuffer({
     },
     [replaceRange]
   );
-  const moveToOffset = (0, import_react18.useCallback)(
+  const moveToOffset = (0, import_react19.useCallback)(
     (offset) => {
       dispatch({ type: "move_to_offset", payload: { offset } });
     },
     [dispatch]
   );
-  const returnValue = (0, import_react18.useMemo)(
+  const returnValue = (0, import_react19.useMemo)(
     () => ({
       get lines() {
         return stateRef.current.lines;
@@ -11476,11 +11409,11 @@ __name(useTextBuffer, "useTextBuffer");
 
 // packages/cli/src/ui/hooks/usePreferredEditor.ts
 init_esbuild_shims();
-var import_react19 = __toESM(require_react(), 1);
+var import_react20 = __toESM(require_react(), 1);
 var debugLogger5 = createDebugLogger("PREFERRED_EDITOR");
 function usePreferredEditor() {
   const settings = useSettings();
-  return (0, import_react19.useMemo)(() => {
+  return (0, import_react20.useMemo)(() => {
     const raw = settings.merged.general?.preferredEditor ?? "";
     if (raw && !isValidEditorType(raw)) {
       debugLogger5.warn(
@@ -11500,7 +11433,7 @@ function usePreferredEditor() {
 __name(usePreferredEditor, "usePreferredEditor");
 
 // packages/cli/src/ui/components/shared/TextInput.tsx
-var import_react20 = __toESM(require_react(), 1);
+var import_react21 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/utils/software-cursor.ts
 init_esbuild_shims();
@@ -11598,12 +11531,12 @@ function TextInput({
   ellipsizeOverflow = false
 }) {
   const allowMultiline = height > 1;
-  const [cursorVisible, setCursorVisible] = (0, import_react20.useState)(isActive);
-  const onChangeRef = (0, import_react20.useRef)(onChange);
-  (0, import_react20.useEffect)(() => {
+  const [cursorVisible, setCursorVisible] = (0, import_react21.useState)(isActive);
+  const onChangeRef = (0, import_react21.useRef)(onChange);
+  (0, import_react21.useEffect)(() => {
     onChangeRef.current = onChange;
   }, [onChange]);
-  const stableOnChange = (0, import_react20.useCallback)((text) => {
+  const stableOnChange = (0, import_react21.useCallback)((text) => {
     onChangeRef.current?.(text);
   }, []);
   const preferredEditor = usePreferredEditor();
@@ -11618,7 +11551,7 @@ function TextInput({
     onChange: stableOnChange,
     preferredEditor
   });
-  (0, import_react20.useEffect)(() => {
+  (0, import_react21.useEffect)(() => {
     if (!isActive) {
       setCursorVisible(false);
       return;
@@ -11751,13 +11684,13 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
   availableWidth,
   onConfirm
 }) => {
-  const [currentQuestionIndex, setCurrentQuestionIndex] = (0, import_react21.useState)(0);
-  const [selectedOptions, setSelectedOptions] = (0, import_react21.useState)({});
-  const [customInputValues, setCustomInputValues] = (0, import_react21.useState)({});
-  const customInputValuesRef = (0, import_react21.useRef)({});
-  const [selectedIndex, setSelectedIndex] = (0, import_react21.useState)(0);
-  const [multiSelectedOptions, setMultiSelectedOptions] = (0, import_react21.useState)({});
-  const [customInputChecked, setCustomInputChecked] = (0, import_react21.useState)({});
+  const [currentQuestionIndex, setCurrentQuestionIndex] = (0, import_react22.useState)(0);
+  const [selectedOptions, setSelectedOptions] = (0, import_react22.useState)({});
+  const [customInputValues, setCustomInputValues] = (0, import_react22.useState)({});
+  const customInputValuesRef = (0, import_react22.useRef)({});
+  const [selectedIndex, setSelectedIndex] = (0, import_react22.useState)(0);
+  const [multiSelectedOptions, setMultiSelectedOptions] = (0, import_react22.useState)({});
+  const [customInputChecked, setCustomInputChecked] = (0, import_react22.useState)({});
   const hasMultipleQuestions = confirmationDetails.questions.length > 1;
   const totalTabs = hasMultipleQuestions ? confirmationDetails.questions.length + 1 : confirmationDetails.questions.length;
   const isSubmitTab = hasMultipleQuestions && currentQuestionIndex === totalTabs - 1;
@@ -12151,9 +12084,9 @@ var ToolConfirmationMessage = /* @__PURE__ */ __name(({
   const autoModeFallback = confirmationDetails.autoModeFallback;
   const settings = useSettings();
   const preferredEditor = settings.merged.general?.preferredEditor;
-  const [ideClient, setIdeClient] = (0, import_react22.useState)(null);
-  const [isDiffingEnabled, setIsDiffingEnabled] = (0, import_react22.useState)(false);
-  (0, import_react22.useEffect)(() => {
+  const [ideClient, setIdeClient] = (0, import_react23.useState)(null);
+  const [isDiffingEnabled, setIsDiffingEnabled] = (0, import_react23.useState)(false);
+  (0, import_react23.useEffect)(() => {
     let isMounted = true;
     if (config.getIdeMode()) {
       const getIdeClient = /* @__PURE__ */ __name(async () => {
@@ -12183,7 +12116,7 @@ var ToolConfirmationMessage = /* @__PURE__ */ __name(({
   }, "handleConfirm");
   const isTrustedFolder = config.isTrustedFolder();
   const launchEditor = useLaunchEditor();
-  const [planViewError, setPlanViewError] = (0, import_react22.useState)(null);
+  const [planViewError, setPlanViewError] = (0, import_react23.useState)(null);
   const openFullPlanInEditor = /* @__PURE__ */ __name(() => {
     if (confirmationDetails.type !== "plan") return;
     setPlanViewError(null);
@@ -12671,7 +12604,7 @@ var PlanSummaryDisplay = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/ShellInputPrompt.tsx
 init_esbuild_shims();
-var import_react23 = __toESM(require_react(), 1);
+var import_react24 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/keyToAnsi.ts
 init_esbuild_shims();
@@ -12734,7 +12667,7 @@ var ShellInputPrompt = /* @__PURE__ */ __name(({
   activeShellPtyId,
   focus = true
 }) => {
-  const handleShellInputSubmit = (0, import_react23.useCallback)(
+  const handleShellInputSubmit = (0, import_react24.useCallback)(
     (input) => {
       if (activeShellPtyId) {
         ShellExecutionService.writeToPty(activeShellPtyId, input);
@@ -12742,7 +12675,7 @@ var ShellInputPrompt = /* @__PURE__ */ __name(({
     },
     [activeShellPtyId]
   );
-  const handleInput = (0, import_react23.useCallback)(
+  const handleInput = (0, import_react24.useCallback)(
     (key) => {
       if (!focus || !activeShellPtyId) {
         return;
@@ -12801,42 +12734,43 @@ function sliceTextForMaxHeight(text, maxHeight, maxWidth) {
   let visualLineCount = 0;
   let currentLine = "";
   let currentLineWidth = 0;
-  const appendVisibleLine = /* @__PURE__ */ __name((line) => {
+  const appendVisibleLine = /* @__PURE__ */ __name((line, breakAfter) => {
     visualLineCount += 1;
-    visibleLines.push(line);
+    visibleLines.push({ text: line, breakAfter });
     if (visibleLines.length > visibleContentHeight) {
       visibleLines.shift();
     }
   }, "appendVisibleLine");
-  const flushCurrentLine = /* @__PURE__ */ __name(() => {
-    appendVisibleLine(currentLine);
+  const flushCurrentLine = /* @__PURE__ */ __name((breakAfter) => {
+    appendVisibleLine(currentLine, breakAfter);
     currentLine = "";
     currentLineWidth = 0;
   }, "flushCurrentLine");
   for (const char of toCodePoints(text)) {
     if (char === "\n") {
-      flushCurrentLine();
+      flushCurrentLine({ kind: "hard", joiner: "\n" });
       continue;
     }
     const charWidth = Math.max(getCachedStringWidth(char), 1);
     if (currentLineWidth > 0 && currentLineWidth + charWidth > visualWidth) {
-      flushCurrentLine();
+      flushCurrentLine({ kind: "soft", joiner: "" });
     }
     currentLine += char;
     currentLineWidth += charWidth;
   }
-  flushCurrentLine();
+  flushCurrentLine(null);
   if (visualLineCount <= targetMaxHeight) {
     return { text, hiddenLinesCount: 0 };
   }
   const hiddenLinesCount = visualLineCount - visibleContentHeight;
   return {
-    text: visibleLines.join("\n"),
-    hiddenLinesCount
+    text: visibleLines.map((line) => line.text).join("\n"),
+    hiddenLinesCount,
+    sourceBoundaries: visibleLines.slice(0, -1).map((line) => line.breakAfter ?? { kind: "hard", joiner: "\n" })
   };
 }
 __name(sliceTextForMaxHeight, "sliceTextForMaxHeight");
-var useResultDisplayRenderer = /* @__PURE__ */ __name((resultDisplay) => import_react24.default.useMemo(() => {
+var useResultDisplayRenderer = /* @__PURE__ */ __name((resultDisplay) => import_react25.default.useMemo(() => {
   if (!resultDisplay) {
     return { type: "none" };
   }
@@ -12908,7 +12842,7 @@ var SubagentApprovalContext = /* @__PURE__ */ __name(({ data }) => {
   const priorCalls = priorApprovalCalls(data);
   if (priorCalls.length === 0) return null;
   return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(Box_default, { flexDirection: "column", children: priorCalls.map((call) => {
-    const glyph = call.status === "failed" ? "\u2716" : call.status === "success" ? "\u2714" : "\u25CB";
+    const glyph = call.status === "failed" ? "\u2716" : call.status === "success" ? "\u2714" : ICON.CIRCLE_EMPTY;
     const displayName = localizeToolDisplayName(
       TOOL_DISPLAY_BY_NAME[call.name] ?? call.name
     );
@@ -13032,6 +12966,7 @@ var StringResultRenderer = /* @__PURE__ */ __name(({ data, renderAsMarkdown, ava
       maxHeight: availableHeight,
       maxWidth: childWidth,
       additionalHiddenLinesCount: sliced.hiddenLinesCount,
+      sourceBoundaries: sliced.sourceBoundaries,
       children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(Text, { wrap: "wrap", color: theme.text.primary, children: sliced.text }) })
     }
   );
@@ -13077,21 +13012,21 @@ var ToolMessage = /* @__PURE__ */ __name(({
 }) => {
   const settings = useSettings();
   const isThisShellFocused = (name === SHELL_COMMAND_NAME || name === SHELL_NAME) && status === "Executing" /* Executing */ && ptyId === activeShellPtyId && embeddedShellFocused;
-  const [lastUpdateTime, setLastUpdateTime] = import_react24.default.useState(null);
-  const [userHasFocused, setUserHasFocused] = import_react24.default.useState(false);
-  const [showFocusHint, setShowFocusHint] = import_react24.default.useState(false);
-  import_react24.default.useEffect(() => {
+  const [lastUpdateTime, setLastUpdateTime] = import_react25.default.useState(null);
+  const [userHasFocused, setUserHasFocused] = import_react25.default.useState(false);
+  const [showFocusHint, setShowFocusHint] = import_react25.default.useState(false);
+  import_react25.default.useEffect(() => {
     if (resultDisplay) {
       setLastUpdateTime(/* @__PURE__ */ new Date());
     }
   }, [resultDisplay]);
-  const shellTimeoutMs = import_react24.default.useMemo(() => {
+  const shellTimeoutMs = import_react25.default.useMemo(() => {
     if (typeof resultDisplay === "object" && resultDisplay !== null && "ansiOutput" in resultDisplay) {
       return resultDisplay.timeoutMs;
     }
     return void 0;
   }, [resultDisplay]);
-  import_react24.default.useEffect(() => {
+  import_react25.default.useEffect(() => {
     if (!lastUpdateTime) {
       return;
     }
@@ -13100,7 +13035,7 @@ var ToolMessage = /* @__PURE__ */ __name(({
     }, 5e3);
     return () => clearTimeout(timer);
   }, [lastUpdateTime]);
-  import_react24.default.useEffect(() => {
+  import_react25.default.useEffect(() => {
     if (isThisShellFocused) {
       setUserHasFocused(true);
     }
@@ -13123,7 +13058,7 @@ var ToolMessage = /* @__PURE__ */ __name(({
     renderOutputAsMarkdown = false;
   }
   const usingDetailedDisplay = fullDetail && isCollapsibleTool(name) && typeof detailedDisplay === "string" && detailedDisplay.length > 0;
-  const sanitizedDetailedDisplay = import_react24.default.useMemo(
+  const sanitizedDetailedDisplay = import_react25.default.useMemo(
     () => usingDetailedDisplay && typeof detailedDisplay === "string" ? sanitizeTerminalText(detailedDisplay) : detailedDisplay,
     [detailedDisplay, usingDetailedDisplay]
   );
@@ -13139,7 +13074,7 @@ var ToolMessage = /* @__PURE__ */ __name(({
     effectiveResultDisplay
   );
   const shouldCollapseResult = !forceShowResult && status === "Success" /* Success */ && isCollapsibleTool(name) && (effectiveDisplayRenderer.type === "string" || effectiveDisplayRenderer.type === "ansi");
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(Box_default, { paddingX: 1, paddingY: 0, flexDirection: "column", children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(Box_default, { paddingY: 0, flexDirection: "column", children: [
     /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(Box_default, { minHeight: 1, children: [
       /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(ToolStatusIndicator, { status, name }),
       /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
@@ -13242,7 +13177,7 @@ var ToolInfo = /* @__PURE__ */ __name(({
   status,
   emphasis
 }) => {
-  const nameColor = import_react24.default.useMemo(() => {
+  const nameColor = import_react25.default.useMemo(() => {
     switch (emphasis) {
       case "high":
         return theme.text.primary;
@@ -13269,7 +13204,7 @@ var TrailingIndicator = /* @__PURE__ */ __name(() => /* @__PURE__ */ (0, import_
 
 // packages/cli/src/ui/components/messages/InlineParallelAgentsDisplay.tsx
 init_esbuild_shims();
-var import_react25 = __toESM(require_react(), 1);
+var import_react26 = __toESM(require_react(), 1);
 var import_jsx_runtime19 = __toESM(require_jsx_runtime(), 1);
 function deriveAgentId(toolCall, resultDisplay) {
   return `${resultDisplay.subagentName}-${toolCall.callId}`;
@@ -13293,7 +13228,7 @@ function statusGlyph(status) {
   switch (status) {
     case "running":
     case "background":
-      return { glyph: "\u25CB", color: theme.status.warning };
+      return { glyph: ICON.CIRCLE_EMPTY, color: theme.status.warning };
     case "completed":
       return { glyph: "\u2714", color: theme.status.success };
     case "failed":
@@ -13330,8 +13265,8 @@ function truncateMiddle(input, max) {
 }
 __name(truncateMiddle, "truncateMiddle");
 var InlineParallelAgentsDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWidth, totalAgentCount, availableTerminalHeight }) => {
-  const config = (0, import_react25.useContext)(ConfigContext);
-  const agentEntries = (0, import_react25.useMemo)(() => {
+  const config = (0, import_react26.useContext)(ConfigContext);
+  const agentEntries = (0, import_react26.useMemo)(() => {
     const out = [];
     for (const tc of toolCalls) {
       if (isAgentResult(tc.resultDisplay)) {
@@ -13340,19 +13275,19 @@ var InlineParallelAgentsDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWi
     }
     return out;
   }, [toolCalls]);
-  const [now, setNow] = (0, import_react25.useState)(() => Date.now());
-  const hasLiveAgent = (0, import_react25.useMemo)(
+  const [now, setNow] = (0, import_react26.useState)(() => Date.now());
+  const hasLiveAgent = (0, import_react26.useMemo)(
     () => agentEntries.some(
       (e) => e.result.status === "running" || e.result.status === "background"
     ),
     [agentEntries]
   );
-  (0, import_react25.useEffect)(() => {
+  (0, import_react26.useEffect)(() => {
     if (!hasLiveAgent) return;
     const id = setInterval(() => setNow(Date.now()), 1e3);
     return () => clearInterval(id);
   }, [hasLiveAgent]);
-  const rows = (0, import_react25.useMemo)(() => {
+  const rows = (0, import_react26.useMemo)(() => {
     const registry = config?.getBackgroundTaskRegistry();
     void now;
     return agentEntries.map(({ toolCall, result }) => {
@@ -13472,27 +13407,27 @@ var ToolGroupMessage = /* @__PURE__ */ __name(({
   const isEmbeddedShellFocused = embeddedShellFocused && toolCalls.some(
     (t2) => t2.ptyId === activeShellPtyId && t2.status === "Executing" /* Executing */
   );
-  const toolAwaitingApproval = (0, import_react26.useMemo)(
+  const toolAwaitingApproval = (0, import_react27.useMemo)(
     () => toolCalls.find((tc) => tc.status === "Confirming" /* Confirming */),
     [toolCalls]
   );
-  const isMemoryOnlyGroup = (0, import_react26.useMemo)(
+  const isMemoryOnlyGroup = (0, import_react27.useMemo)(
     () => toolCalls.length > 0 && toolCalls.every((t2) => t2.isMemoryOp != null),
     [toolCalls]
   );
-  const inlineToolCalls = (0, import_react26.useMemo)(
+  const inlineToolCalls = (0, import_react27.useMemo)(
     () => isPending ? toolCalls.filter(
       (tool) => !isPanelOwnedSubagentTool(tool) || isAgentWithPendingConfirmation(tool.resultDisplay)
     ) : toolCalls,
     [isPending, toolCalls]
   );
-  const subagentsAwaitingApproval = (0, import_react26.useMemo)(
+  const subagentsAwaitingApproval = (0, import_react27.useMemo)(
     () => toolCalls.filter(
       (tc) => isAgentWithPendingConfirmation(tc.resultDisplay)
     ),
     [toolCalls]
   );
-  const focusedSubagentRef = (0, import_react26.useRef)(null);
+  const focusedSubagentRef = (0, import_react27.useRef)(null);
   const stillPending = subagentsAwaitingApproval.some(
     (tc) => tc.callId === focusedSubagentRef.current
   );
@@ -13500,7 +13435,7 @@ var ToolGroupMessage = /* @__PURE__ */ __name(({
     focusedSubagentRef.current = subagentsAwaitingApproval[0]?.callId ?? null;
   }
   const focusedSubagentCallId = focusedSubagentRef.current;
-  const runningSubagentCallId = (0, import_react26.useMemo)(
+  const runningSubagentCallId = (0, import_react27.useMemo)(
     () => toolCalls.find((tc) => isRunningAgent(tc.resultDisplay))?.callId ?? null,
     [toolCalls]
   );
@@ -13529,14 +13464,14 @@ var ToolGroupMessage = /* @__PURE__ */ __name(({
     const writeCount = memoryWriteCount ?? 0;
     return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Box_default, { flexDirection: "column", width: contentWidth, children: [
       readCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { paddingLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Text, { dimColor: true, children: [
-        "\u25CF ",
+        ICON.CIRCLE_FILLED + " ",
         "Recalled ",
         readCount,
         " ",
         readCount === 1 ? "memory" : "memories"
       ] }) }),
       writeCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { paddingLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Text, { dimColor: true, children: [
-        "\u25CF ",
+        ICON.CIRCLE_FILLED + " ",
         "Wrote ",
         writeCount,
         " ",
@@ -13554,7 +13489,7 @@ var ToolGroupMessage = /* @__PURE__ */ __name(({
   );
   const hasMemoryBadge = !isMemoryOnlyGroup && ((memoryWriteCount ?? 0) > 0 || (memoryReadCount ?? 0) > 0);
   const memoryBadge = hasMemoryBadge ? /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { paddingLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Text, { dimColor: true, children: [
-    "\u25CF ",
+    ICON.CIRCLE_FILLED + " ",
     [
       (memoryReadCount ?? 0) > 0 && `Recalled ${memoryReadCount} ${memoryReadCount === 1 ? "memory" : "memories"}`,
       (memoryWriteCount ?? 0) > 0 && `Wrote ${memoryWriteCount} ${memoryWriteCount === 1 ? "memory" : "memories"}`
@@ -13581,7 +13516,7 @@ var ToolGroupMessage = /* @__PURE__ */ __name(({
     /* marginBottom */
     1 + collapsibleSummaryHeight + memoryBadgeHeight
   );
-  const innerWidth = contentWidth - 2;
+  const confirmationInnerWidth = contentWidth - 2;
   let countToolCallsWithResults = 0;
   for (const tool of nonCollapsibleTools) {
     if (tool.resultDisplay !== void 0 && tool.resultDisplay !== "") {
@@ -13613,7 +13548,7 @@ var ToolGroupMessage = /* @__PURE__ */ __name(({
           {
             ...tool,
             availableTerminalHeight: availableTerminalHeightPerToolMessage,
-            contentWidth: innerWidth,
+            contentWidth,
             emphasis: isConfirming ? "high" : toolAwaitingApproval ? "low" : "medium",
             activeShellPtyId,
             embeddedShellFocused,
@@ -13631,7 +13566,7 @@ var ToolGroupMessage = /* @__PURE__ */ __name(({
             config,
             isFocused,
             availableTerminalHeight: availableTerminalHeightPerToolMessage,
-            contentWidth: innerWidth
+            contentWidth: confirmationInnerWidth
           }
         )
       ] }, tool.callId);
@@ -13680,8 +13615,8 @@ function CompressionMessage({
   }, "getCompressionText");
   const text = getCompressionText();
   return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Box_default, { flexDirection: "row", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Box_default, { marginRight: 1, children: isPending ? /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(build_default, { type: "dots" }) : /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { color: theme.text.accent, children: "\u25C6" }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Box_default, { width: 2, flexShrink: 0, children: isPending ? /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(build_default, { type: "dots" }) : /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { color: theme.text.accent, children: ICON.DIAMOND }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
       Text,
       {
         color: compression.isPending ? theme.text.accent : theme.status.success,
@@ -13723,8 +13658,8 @@ var SummaryMessage = /* @__PURE__ */ __name(({ summary }) => {
     return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { color: Colors.AccentGreen, children: "\u2713" });
   }, "getIcon");
   return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(Box_default, { flexDirection: "row", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { marginRight: 1, children: getIcon() }),
-    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { width: 2, flexShrink: 0, children: getIcon() }),
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
       Text,
       {
         color: summary.isPending ? Colors.AccentPurple : Colors.AccentGreen,
@@ -13739,7 +13674,7 @@ init_esbuild_shims();
 
 // node_modules/ink-link/dist/index.js
 init_esbuild_shims();
-var import_react27 = __toESM(require_react(), 1);
+var import_react28 = __toESM(require_react(), 1);
 var import_prop_types = __toESM(require_prop_types(), 1);
 
 // node_modules/ink-link/node_modules/terminal-link/index.js
@@ -13887,10 +13822,10 @@ terminalLink.stderr.isSupported = import_supports_hyperlinks.default.stderr;
 // node_modules/ink-link/dist/index.js
 var Link = /* @__PURE__ */ __name(({ children, url, fallback = true }) => (
   // eslint-disable-line react/function-component-definition
-  import_react27.default.createElement(
+  import_react28.default.createElement(
     Transform,
     { transform: /* @__PURE__ */ __name((children2) => terminalLink(children2, url, { fallback }), "transform") },
-    import_react27.default.createElement(Text, null, children)
+    import_react28.default.createElement(Text, null, children)
   )
 ), "Link");
 Link.propTypes = {
@@ -13937,7 +13872,7 @@ var InfoMessage = /* @__PURE__ */ __name(({
   StatusMessage,
   {
     text,
-    prefix: "\u25CF",
+    prefix: ICON.CIRCLE_FILLED,
     prefixColor: theme.text.primary,
     textColor: theme.text.primary,
     footer: linkUrl && /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(dist_default, { url: linkUrl, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Text, { color: theme.text.link, underline: true, children: linkText ?? linkUrl }) })
@@ -13956,7 +13891,7 @@ var WarningMessage = /* @__PURE__ */ __name(({ text }) => /* @__PURE__ */ (0, im
   StatusMessage,
   {
     text,
-    prefix: "\u25B3",
+    prefix: ICON.TRIANGLE,
     prefixColor: theme.status.warning,
     textColor: theme.status.warning
   }
@@ -13991,13 +13926,13 @@ var VisionNoticeMessage = /* @__PURE__ */ __name(({ text }) => /* @__PURE__ */ (
   StatusMessage,
   {
     text,
-    prefix: "\u25CE",
+    prefix: ICON.BULLSEYE,
     prefixColor: theme.text.secondary,
     textColor: theme.text.secondary
   }
 ), "VisionNoticeMessage");
 var AwayRecapMessage = /* @__PURE__ */ __name(({ text }) => /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Box_default, { flexDirection: "row", children: [
-  /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { width: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Text, { color: theme.text.secondary, children: "\u203B" }) }),
+  /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { width: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Text, { color: theme.text.secondary, children: ICON.REFERENCE }) }),
   /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Text, { wrap: "wrap", children: [
     /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Text, { color: theme.text.secondary, bold: true, children: [
       "recap:",
@@ -14044,7 +13979,7 @@ init_esbuild_shims();
 
 // node_modules/ink-gradient/dist/index.js
 init_esbuild_shims();
-var import_react28 = __toESM(require_react(), 1);
+var import_react29 = __toESM(require_react(), 1);
 var import_prop_types2 = __toESM(require_prop_types(), 1);
 var import_gradient_string = __toESM(require_gradient_string(), 1);
 var Gradient = /* @__PURE__ */ __name((props) => {
@@ -14060,7 +13995,7 @@ var Gradient = /* @__PURE__ */ __name((props) => {
     throw new Error("Either `name` or `colors` prop must be provided");
   }
   const applyGradient = /* @__PURE__ */ __name((text) => gradient.multiline(stripAnsi(text)), "applyGradient");
-  return import_react28.default.createElement(Transform, { transform: applyGradient }, props.children);
+  return import_react29.default.createElement(Transform, { transform: applyGradient }, props.children);
 }, "Gradient");
 Gradient.propTypes = {
   children: import_prop_types2.default.oneOfType([
@@ -14860,7 +14795,7 @@ var SessionSummaryDisplay = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/Help.tsx
 init_esbuild_shims();
-var import_react29 = __toESM(require_react(), 1);
+var import_react30 = __toESM(require_react(), 1);
 var import_jsx_runtime30 = __toESM(require_jsx_runtime(), 1);
 var DEFAULT_WIDTH = 100;
 var KEY_COL_WIDTH = 20;
@@ -14881,7 +14816,7 @@ var Help = /* @__PURE__ */ __name(({
 }) => {
   const safeWidth = Math.max(72, width);
   const bodyWidth = safeWidth - 6;
-  const handleTabChange = (0, import_react29.useCallback)(
+  const handleTabChange = (0, import_react30.useCallback)(
     (direction) => {
       const currentIndex = TAB_DEFS.findIndex((tab) => tab.tab === activeTab);
       const nextIndex = (currentIndex + direction + TAB_DEFS.length) % TAB_DEFS.length;
@@ -15019,20 +14954,20 @@ var ShortcutRow = /* @__PURE__ */ __name(({ shortcutKey, desc, width }) => /* @_
   /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Text, { color: theme.text.primary, wrap: "truncate", children: truncateText2(desc, width - KEY_COL_WIDTH - 1) })
 ] }), "ShortcutRow");
 var CommandsHelp = /* @__PURE__ */ __name(({ commands, width, customOnly, isInteractive }) => {
-  const groups = (0, import_react29.useMemo)(
+  const groups = (0, import_react30.useMemo)(
     () => groupCommands(commands, customOnly),
     [commands, customOnly]
   );
-  const lines = (0, import_react29.useMemo)(
+  const lines = (0, import_react30.useMemo)(
     () => renderCommandLines(groups, width),
     [groups, width]
   );
   const maxScroll = Math.max(0, lines.length - COMMAND_LIST_VISIBLE_LINES);
-  const [scrollOffset, setScrollOffset] = (0, import_react29.useState)(0);
-  (0, import_react29.useEffect)(() => {
+  const [scrollOffset, setScrollOffset] = (0, import_react30.useState)(0);
+  (0, import_react30.useEffect)(() => {
     setScrollOffset(0);
   }, [customOnly, commands]);
-  (0, import_react29.useEffect)(() => {
+  (0, import_react30.useEffect)(() => {
     setScrollOffset((offset) => Math.min(offset, maxScroll));
   }, [maxScroll]);
   useKeypress(
@@ -15220,26 +15155,26 @@ init_esbuild_shims();
 
 // packages/cli/src/ui/contexts/UIStateContext.tsx
 init_esbuild_shims();
-var import_react36 = __toESM(require_react(), 1);
+var import_react37 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/useHistoryManager.ts
 init_esbuild_shims();
-var import_react30 = __toESM(require_react(), 1);
+var import_react31 = __toESM(require_react(), 1);
 import process2 from "node:process";
 var debugLogger6 = createDebugLogger("HISTORY_MANAGER");
 var UI_COMPACT_CLEARED_MESSAGE = "[Old tool result content cleared]";
 var UI_COMPACT_KEEP_RECENT = 20;
 function useHistory() {
-  const [history, setHistory] = (0, import_react30.useState)([]);
-  const messageIdCounterRef = (0, import_react30.useRef)(0);
-  const getNextMessageId = (0, import_react30.useCallback)((baseTimestamp) => {
+  const [history, setHistory] = (0, import_react31.useState)([]);
+  const messageIdCounterRef = (0, import_react31.useRef)(0);
+  const getNextMessageId = (0, import_react31.useCallback)((baseTimestamp) => {
     messageIdCounterRef.current += 1;
     return baseTimestamp + messageIdCounterRef.current;
   }, []);
-  const loadHistory = (0, import_react30.useCallback)((newHistory) => {
+  const loadHistory = (0, import_react31.useCallback)((newHistory) => {
     setHistory(newHistory);
   }, []);
-  const addItem = (0, import_react30.useCallback)(
+  const addItem = (0, import_react31.useCallback)(
     (itemData, baseTimestamp) => {
       const id = getNextMessageId(baseTimestamp);
       const newItem = { ...itemData, id };
@@ -15263,7 +15198,7 @@ function useHistory() {
     },
     [getNextMessageId]
   );
-  const updateItem = (0, import_react30.useCallback)(
+  const updateItem = (0, import_react31.useCallback)(
     (id, updates) => {
       setHistory((prevHistory) => {
         let updated = false;
@@ -15286,7 +15221,7 @@ function useHistory() {
     },
     []
   );
-  const clearItems = (0, import_react30.useCallback)(() => {
+  const clearItems = (0, import_react31.useCallback)(() => {
     if (debugLogger6.isEnabled()) {
       debugLogger6.debug(
         `[CLEAR_HISTORY] Clearing history, memory before=${(process2.memoryUsage().heapUsed / 1024 / 1024).toFixed(1)}MB`
@@ -15295,13 +15230,13 @@ function useHistory() {
     setHistory([]);
     messageIdCounterRef.current = 0;
   }, []);
-  const truncateToItem = (0, import_react30.useCallback)((itemId) => {
+  const truncateToItem = (0, import_react31.useCallback)((itemId) => {
     setHistory((prev) => {
       const index = prev.findIndex((h) => h.id === itemId);
       return index === -1 ? prev : prev.slice(0, index);
     });
   }, []);
-  const compactOldItems = (0, import_react30.useCallback)(() => {
+  const compactOldItems = (0, import_react31.useCallback)(() => {
     setHistory((prev) => {
       if (prev.length === 0) return prev;
       let thoughtRemoved = 0;
@@ -15369,7 +15304,7 @@ function useHistory() {
       return thoughtRemoved > 0 || toolGroupsCompacted > 0 ? next : prev;
     });
   }, []);
-  return (0, import_react30.useMemo)(
+  return (0, import_react31.useMemo)(
     () => ({
       history,
       addItem,
@@ -15394,7 +15329,7 @@ __name(useHistory, "useHistory");
 
 // packages/cli/src/ui/contexts/UIActionsContext.tsx
 init_esbuild_shims();
-var import_react33 = __toESM(require_react(), 1);
+var import_react34 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/IdeIntegrationNudge.tsx
 init_esbuild_shims();
@@ -15536,7 +15471,7 @@ __name(CommandFormatMigrationNudge, "CommandFormatMigrationNudge");
 
 // packages/cli/src/ui/components/FolderTrustDialog.tsx
 init_esbuild_shims();
-var import_react31 = __toESM(require_react(), 1);
+var import_react32 = __toESM(require_react(), 1);
 import * as process3 from "node:process";
 import * as path3 from "node:path";
 var import_jsx_runtime33 = __toESM(require_jsx_runtime(), 1);
@@ -15544,7 +15479,7 @@ var FolderTrustDialog = /* @__PURE__ */ __name(({
   onSelect,
   isRestarting
 }) => {
-  (0, import_react31.useEffect)(() => {
+  (0, import_react32.useEffect)(() => {
     const doRelaunch = /* @__PURE__ */ __name(async () => {
       if (isRestarting) {
         setTimeout(async () => {
@@ -15672,16 +15607,16 @@ var MCPServerApprovalDialog = /* @__PURE__ */ __name(({ serverName, summary, sou
 
 // packages/cli/src/ui/hooks/useArenaCommand.ts
 init_esbuild_shims();
-var import_react32 = __toESM(require_react(), 1);
+var import_react33 = __toESM(require_react(), 1);
 function useArenaCommand() {
-  const [activeArenaDialog, setActiveArenaDialog] = (0, import_react32.useState)(null);
-  const openArenaDialog = (0, import_react32.useCallback)(
+  const [activeArenaDialog, setActiveArenaDialog] = (0, import_react33.useState)(null);
+  const openArenaDialog = (0, import_react33.useCallback)(
     (type) => {
       setActiveArenaDialog(type);
     },
     []
   );
-  const closeArenaDialog = (0, import_react32.useCallback)(() => {
+  const closeArenaDialog = (0, import_react33.useCallback)(() => {
     setActiveArenaDialog(null);
   }, []);
   return {
@@ -15693,9 +15628,9 @@ function useArenaCommand() {
 __name(useArenaCommand, "useArenaCommand");
 
 // packages/cli/src/ui/contexts/UIActionsContext.tsx
-var UIActionsContext = (0, import_react33.createContext)(null);
+var UIActionsContext = (0, import_react34.createContext)(null);
 var useUIActions = /* @__PURE__ */ __name(() => {
-  const context = (0, import_react33.useContext)(UIActionsContext);
+  const context = (0, import_react34.useContext)(UIActionsContext);
   if (!context) {
     throw new Error("useUIActions must be used within a UIActionsProvider");
   }
@@ -15704,16 +15639,16 @@ var useUIActions = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useIdeTrustListener.ts
 init_esbuild_shims();
-var import_react34 = __toESM(require_react(), 1);
+var import_react35 = __toESM(require_react(), 1);
 function useIdeTrustListener() {
   const settings = useSettings();
-  const [connectionStatus, setConnectionStatus] = (0, import_react34.useState)(
+  const [connectionStatus, setConnectionStatus] = (0, import_react35.useState)(
     "disconnected" /* Disconnected */
   );
-  const previousTrust = (0, import_react34.useRef)(void 0);
-  const [restartReason, setRestartReason] = (0, import_react34.useState)("NONE");
-  const [needsRestart, setNeedsRestart] = (0, import_react34.useState)(false);
-  const subscribe2 = (0, import_react34.useCallback)((onStoreChange) => {
+  const previousTrust = (0, import_react35.useRef)(void 0);
+  const [restartReason, setRestartReason] = (0, import_react35.useState)("NONE");
+  const [needsRestart, setNeedsRestart] = (0, import_react35.useState)(false);
+  const subscribe2 = (0, import_react35.useCallback)((onStoreChange) => {
     const handleStatusChange = /* @__PURE__ */ __name((state) => {
       setConnectionStatus(state.status);
       setRestartReason("CONNECTION_CHANGE");
@@ -15743,8 +15678,8 @@ function useIdeTrustListener() {
     }
     return ideContextStore.get()?.workspaceState?.isTrusted;
   }, "getSnapshot");
-  const isIdeTrusted = (0, import_react34.useSyncExternalStore)(subscribe2, getSnapshot);
-  (0, import_react34.useEffect)(() => {
+  const isIdeTrusted = (0, import_react35.useSyncExternalStore)(subscribe2, getSnapshot);
+  (0, import_react35.useEffect)(() => {
     const currentTrust = isWorkspaceTrusted(settings.merged).isTrusted;
     if (previousTrust.current !== void 0 && previousTrust.current !== currentTrust) {
       setNeedsRestart(true);
@@ -15757,7 +15692,7 @@ __name(useIdeTrustListener, "useIdeTrustListener");
 
 // packages/cli/src/ui/hooks/useProviderUpdates.ts
 init_esbuild_shims();
-var import_react35 = __toESM(require_react(), 1);
+var import_react36 = __toESM(require_react(), 1);
 function getProviderMetadata(settings, metadataKey) {
   const mergedSettings = settings.merged;
   const ns = mergedSettings[PROVIDER_METADATA_NS];
@@ -15856,9 +15791,9 @@ function findAllPendingUpdates(settings, currentModel) {
 }
 __name(findAllPendingUpdates, "findAllPendingUpdates");
 function useProviderUpdates(settings, config, addItem) {
-  const [updateRequest, setUpdateRequest] = (0, import_react35.useState)();
-  const migrated = (0, import_react35.useRef)(false);
-  const executeUpdate = (0, import_react35.useCallback)(
+  const [updateRequest, setUpdateRequest] = (0, import_react36.useState)();
+  const migrated = (0, import_react36.useRef)(false);
+  const executeUpdate = (0, import_react36.useCallback)(
     async (providerCfg, baseUrl) => {
       try {
         const resolved = resolveBaseUrl(providerCfg, baseUrl);
@@ -15945,7 +15880,7 @@ function useProviderUpdates(settings, config, addItem) {
     },
     [settings, config, addItem]
   );
-  const checkForUpdates = (0, import_react35.useCallback)(() => {
+  const checkForUpdates = (0, import_react36.useCallback)(() => {
     if (!migrated.current) {
       migrated.current = true;
       migrateProviderMetadata(settings);
@@ -15978,10 +15913,10 @@ function useProviderUpdates(settings, config, addItem) {
       }, "onConfirm")
     });
   }, [settings, config, executeUpdate]);
-  (0, import_react35.useEffect)(() => {
+  (0, import_react36.useEffect)(() => {
     checkForUpdates();
   }, [checkForUpdates]);
-  const dismissProviderUpdate = (0, import_react35.useCallback)(() => {
+  const dismissProviderUpdate = (0, import_react36.useCallback)(() => {
     setUpdateRequest(void 0);
   }, []);
   return {
@@ -15992,9 +15927,9 @@ function useProviderUpdates(settings, config, addItem) {
 __name(useProviderUpdates, "useProviderUpdates");
 
 // packages/cli/src/ui/contexts/UIStateContext.tsx
-var UIStateContext = (0, import_react36.createContext)(null);
+var UIStateContext = (0, import_react37.createContext)(null);
 var useUIState = /* @__PURE__ */ __name(() => {
-  const context = (0, import_react36.useContext)(UIStateContext);
+  const context = (0, import_react37.useContext)(UIStateContext);
   if (!context) {
     throw new Error("useUIState must be used within a UIStateProvider");
   }
@@ -17186,7 +17121,7 @@ var InsightProgressMessage = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/messages/BtwMessage.tsx
 init_esbuild_shims();
-var import_react37 = __toESM(require_react(), 1);
+var import_react38 = __toESM(require_react(), 1);
 var import_jsx_runtime43 = __toESM(require_jsx_runtime(), 1);
 var BTW_SELF_CHROME = 4;
 function normalizeCodeFences(text) {
@@ -17234,7 +17169,7 @@ var BtwMessageInternal = /* @__PURE__ */ __name(({
     }
   );
 }, "BtwMessageInternal");
-var BtwMessage = import_react37.default.memo(BtwMessageInternal);
+var BtwMessage = import_react38.default.memo(BtwMessageInternal);
 
 // packages/cli/src/ui/components/messages/MemorySavedMessage.tsx
 init_esbuild_shims();
@@ -17246,7 +17181,7 @@ var MemorySavedMessage = /* @__PURE__ */ __name(({
   const n = item.writtenCount;
   const label = n === 1 ? "memory" : "memories";
   return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Box_default, { flexDirection: "row", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { minWidth: 2, children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { dimColor: true, children: "\u25CF" }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { width: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { dimColor: true, children: ICON.CIRCLE_FILLED }) }),
     /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { dimColor: true, children: [
       verb,
       " ",
@@ -17363,7 +17298,7 @@ __name(padRight, "padRight");
 
 // packages/cli/src/ui/components/messages/GoalStatusMessage.tsx
 init_esbuild_shims();
-var import_react38 = __toESM(require_react(), 1);
+var import_react39 = __toESM(require_react(), 1);
 var import_jsx_runtime46 = __toESM(require_jsx_runtime(), 1);
 var pluralTurns = /* @__PURE__ */ __name((n) => n === 1 ? "turn" : "turns", "pluralTurns");
 function assertNeverGoalStatusKind(kind) {
@@ -17380,7 +17315,7 @@ var GoalStatusMessageInternal = /* @__PURE__ */ __name(({
   if (kind === "checking") {
     const reason = lastReason?.trim();
     return /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(Box_default, { flexDirection: "row", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(Box_default, { width: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(Text, { color: theme.text.secondary, children: "\u25CB" }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(Box_default, { width: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(Text, { color: theme.text.secondary, children: ICON.CIRCLE_EMPTY }) }),
       /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(Box_default, { flexGrow: 1, flexDirection: "column", children: [
         /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(Text, { color: theme.text.secondary, children: [
           "Goal check",
@@ -17403,7 +17338,7 @@ var GoalStatusMessageInternal = /* @__PURE__ */ __name(({
     switch (kind) {
       case "set":
         return {
-          prefix: "\u25CE",
+          prefix: ICON.BULLSEYE,
           prefixColor: theme.text.accent,
           title: "Goal set"
         };
@@ -17415,7 +17350,7 @@ var GoalStatusMessageInternal = /* @__PURE__ */ __name(({
         };
       case "cleared":
         return {
-          prefix: "\u25CB",
+          prefix: ICON.CIRCLE_EMPTY,
           prefixColor: theme.text.secondary,
           title: "Goal cleared"
         };
@@ -17464,19 +17399,19 @@ var GoalStatusMessageInternal = /* @__PURE__ */ __name(({
     ] })
   ] });
 }, "GoalStatusMessageInternal");
-var GoalStatusMessage = import_react38.default.memo(GoalStatusMessageInternal);
+var GoalStatusMessage = import_react39.default.memo(GoalStatusMessageInternal);
 
 // packages/cli/src/ui/contexts/ThoughtExpandedContext.tsx
 init_esbuild_shims();
-var import_react39 = __toESM(require_react(), 1);
+var import_react40 = __toESM(require_react(), 1);
 var EMPTY_IDS = /* @__PURE__ */ new Set();
-var ThoughtExpandedContext = (0, import_react39.createContext)({
+var ThoughtExpandedContext = (0, import_react40.createContext)({
   allExpanded: false,
   expandedHeadIds: EMPTY_IDS,
   toggle: /* @__PURE__ */ __name(() => {
   }, "toggle")
 });
-var useThoughtExpanded = /* @__PURE__ */ __name(() => (0, import_react39.useContext)(ThoughtExpandedContext), "useThoughtExpanded");
+var useThoughtExpanded = /* @__PURE__ */ __name(() => (0, import_react40.useContext)(ThoughtExpandedContext), "useThoughtExpanded");
 var ThoughtExpandedProvider = ThoughtExpandedContext.Provider;
 
 // packages/cli/src/ui/components/HistoryItemDisplay.tsx
@@ -17490,14 +17425,14 @@ var ClickableThinkMessage = /* @__PURE__ */ __name(({
   durationMs,
   onToggle
 }) => {
-  const ref = (0, import_react40.useRef)(null);
-  const pressRef = (0, import_react40.useRef)(null);
+  const ref = (0, import_react41.useRef)(null);
+  const pressRef = (0, import_react41.useRef)(null);
   const { rows: terminalHeight } = useTerminalSize();
   const settings = useSettings();
   const clickable = !!settings.merged.ui?.useTerminalBuffer;
   const isActive = !isPending;
   useMouseEvents(
-    (0, import_react40.useCallback)(
+    (0, import_react41.useCallback)(
       (event) => {
         if (!ref.current) return;
         if (event.name === "move") {
@@ -17600,7 +17535,7 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
   const resolvedThoughtExpanded = fullDetail || (thoughtExpanded ?? (allExpanded || expandedHeadIds.has(thoughtGroupHeadId)));
   const settings = useSettings();
   const showTimestamps = settings.merged.output?.showTimestamps === true;
-  const itemForDisplay = (0, import_react40.useMemo)(() => escapeAnsiCtrlCodes(item), [item]);
+  const itemForDisplay = (0, import_react41.useMemo)(() => escapeAnsiCtrlCodes(item), [item]);
   const contentWidth = terminalWidth - 4;
   const boxWidth = mainAreaWidth || contentWidth;
   return /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(
@@ -17712,10 +17647,10 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
             fullDetail
           }
         ),
-        itemForDisplay.type === "tool_use_summary" && /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Box_default, { paddingLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { dimColor: true, children: [
-          "\u25CF ",
-          itemForDisplay.summary
-        ] }) }),
+        itemForDisplay.type === "tool_use_summary" && /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Box_default, { flexDirection: "row", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Box_default, { width: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { dimColor: true, children: ICON.CIRCLE_FILLED }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { dimColor: true, children: itemForDisplay.summary })
+        ] }),
         itemForDisplay.type === "compression" && /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(CompressionMessage, { compression: itemForDisplay.compression }),
         itemForDisplay.type === "summary" && /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(SummaryMessage, { summary: itemForDisplay.summary }),
         itemForDisplay.type === "extensions_list" && /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(ExtensionsList, {}),
@@ -17804,7 +17739,7 @@ Original prompt: ${sanitizeSensitiveText(itemForDisplay.originalPrompt)}` }) }),
     itemForDisplay.id
   );
 }, "HistoryItemDisplayComponent");
-var HistoryItemDisplay = (0, import_react40.memo)(HistoryItemDisplayComponent);
+var HistoryItemDisplay = (0, import_react41.memo)(HistoryItemDisplayComponent);
 HistoryItemDisplay.displayName = "HistoryItemDisplay";
 
 // packages/cli/src/ui/components/SessionPreview.tsx
@@ -17821,9 +17756,9 @@ function SessionPreview(props) {
     onResume
   } = props;
   const { columns } = useTerminalSize();
-  const [data, setData] = (0, import_react41.useState)(null);
-  const [error, setError] = (0, import_react41.useState)(null);
-  (0, import_react41.useEffect)(() => {
+  const [data, setData] = (0, import_react42.useState)(null);
+  const [error, setError] = (0, import_react42.useState)(null);
+  (0, import_react42.useEffect)(() => {
     let cancelled = false;
     setData(null);
     setError(null);
@@ -17842,11 +17777,11 @@ function SessionPreview(props) {
       cancelled = true;
     };
   }, [sessionService, sessionId]);
-  const items = (0, import_react41.useMemo)(() => {
+  const items = (0, import_react42.useMemo)(() => {
     if (!data) return [];
     return buildResumedHistoryItems(data, null);
   }, [data]);
-  const computedMessageCount = (0, import_react41.useMemo)(() => {
+  const computedMessageCount = (0, import_react42.useMemo)(() => {
     if (!data) return void 0;
     const seen = /* @__PURE__ */ new Set();
     for (const msg of data.conversation.messages) {
@@ -18164,9 +18099,6 @@ export {
   loadLowlight,
   colorizeCode,
   fitPendingSlice,
-  sanitizeForOsc,
-  osc8Hyperlink,
-  supportsHyperlinks,
   TerminalOutputProvider,
   useTerminalOutput,
   RenderModeProvider,