@qwen-code/qwen-code 0.19.3 → 0.19.4-nightly.20260702.46814e4f1

package/chunks/{chunk-STUWFKGD.js → chunk-26JIREA5.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   relaunchApp
-} from "./chunk-QWFNTRH4.js";
+} from "./chunk-YSM24SCE.js";
 import {
   SHELL_COMMAND_NAME,
   SHELL_NAME,
@@ -13,10 +13,16 @@ import {
   getCommandSourceGroup,
   getCommandSubcommandNames,
   useSessionStats
-} from "./chunk-J7FA27RO.js";
+} from "./chunk-5LKL3PAU.js";
 import {
-  Colors
-} from "./chunk-5GOVVXEV.js";
+  Colors,
+  RowMouseController,
+  SettingsContext,
+  measureElementPosition,
+  useMouseEvents,
+  useSettings,
+  useTerminalSize
+} from "./chunk-Y4LITCRB.js";
 import {
   buildResumedHistoryItems,
   calculateAverageLatency,
@@ -25,23 +31,21 @@ import {
   calculateErrorRate,
   computeDiffColumnWidths,
   computeSessionStats,
-  disableMouseEvents,
-  enableMouseEvents,
   getSystemInfoFields,
+  levelLabel,
   useKeypress,
-  useKeypressContext,
   wrapForMultiplexer
-} from "./chunk-3TV3HUWZ.js";
+} from "./chunk-SCYK2YLI.js";
 import {
   isTerminalGoalStatusKind
 } from "./chunk-KSPVDFE4.js";
 import {
   MINIMUM_MAX_HEIGHT,
   MaxSizedBox
-} from "./chunk-4QK3O43S.js";
+} from "./chunk-LU7BIVWC.js";
 import {
   theme
-} from "./chunk-SMXULRAN.js";
+} from "./chunk-VXGPYF7U.js";
 import {
   Box_default,
   Static,
@@ -49,23 +53,15 @@ import {
   Transform,
   require_jsx_runtime,
   use_is_screen_reader_enabled_default,
-  use_stdin_default,
-  use_stdout_default
-} from "./chunk-T4T2FNV4.js";
+  use_stdin_default
+} from "./chunk-LOW52WYZ.js";
 import {
   require_react
 } from "./chunk-KYMBIKIW.js";
 import {
   resolveColor,
   themeManager
-} from "./chunk-I4H7PRWQ.js";
-import {
-  require_has_flag,
-  require_source
-} from "./chunk-3GONHQOA.js";
-import {
-  createLoadedSettingsAdapter
-} from "./chunk-BXSHL2SF.js";
+} from "./chunk-HTWHAN44.js";
 import {
   cpLen,
   cpSlice,
@@ -75,8 +71,16 @@ import {
   sanitizeSensitiveText,
   stringWidth,
   stripUnsafeCharacters,
-  toCodePoints
-} from "./chunk-JJXWTVSK.js";
+  toCodePoints,
+  wrapToVisualLines
+} from "./chunk-XHZKDN7M.js";
+import {
+  require_has_flag,
+  require_source
+} from "./chunk-3GONHQOA.js";
+import {
+  createLoadedSettingsAdapter
+} from "./chunk-7LUOQJ3D.js";
 import {
   formatDuration,
   formatMemoryUsage,
@@ -85,15 +89,15 @@ import {
 } from "./chunk-KHDZHZMH.js";
 import {
   getPersistScopeForModelSelection
-} from "./chunk-FKAVULLM.js";
+} from "./chunk-75AVTQJ2.js";
 import {
   getCurrentLanguage,
   localizeToolDisplayName,
   t
-} from "./chunk-R5OP2ATH.js";
+} from "./chunk-JZG7VB6C.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-F3ZYSEY6.js";
+} from "./chunk-FY4TT4L4.js";
 import {
   ALL_PROVIDERS,
   IdeClient,
@@ -114,20 +118,20 @@ import {
   resolveMetadataKey,
   resolveOwnsModel,
   stripAnsi
-} from "./chunk-YAINVQ3Q.js";
+} from "./chunk-A5OPLHFM.js";
 import {
   MAIN_SOURCE,
   getMCPServerStatus
-} from "./chunk-QNKBEJO2.js";
+} from "./chunk-UA6XBZT7.js";
 import {
   ToolDisplayNames,
   ToolNames
-} from "./chunk-BX5YO7UW.js";
+} from "./chunk-MTNTVOJR.js";
 import {
   createDebugLogger,
   escapePath,
   unescapePath
-} from "./chunk-UX4SGCGN.js";
+} from "./chunk-AVQDCKNF.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";
@@ -3477,26 +3481,12 @@ var useConfig = /* @__PURE__ */ __name(() => {
   return context;
 }, "useConfig");
 
-// packages/cli/src/ui/contexts/SettingsContext.tsx
-init_esbuild_shims();
-var import_react2 = __toESM(require_react(), 1);
-var SettingsContext = import_react2.default.createContext(
-  void 0
-);
-var useSettings = /* @__PURE__ */ __name(() => {
-  const context = (0, import_react2.useContext)(SettingsContext);
-  if (context === void 0) {
-    throw new Error("useSettings must be used within a SettingsProvider");
-  }
-  return context;
-}, "useSettings");
-
 // packages/cli/src/ui/components/SessionPicker.tsx
 init_esbuild_shims();
 
 // packages/cli/src/ui/hooks/useSessionPicker.ts
 init_esbuild_shims();
-var import_react4 = __toESM(require_react(), 1);
+var import_react3 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/utils/sessionPickerUtils.ts
 init_esbuild_shims();
@@ -3563,7 +3553,7 @@ __name(formatMessageCount, "formatMessageCount");
 
 // packages/cli/src/ui/hooks/useSessionSearchInput.ts
 init_esbuild_shims();
-var import_react3 = __toESM(require_react(), 1);
+var import_react2 = __toESM(require_react(), 1);
 var DELETION_KEY_NAMES = /* @__PURE__ */ new Set(["backspace", "delete"]);
 var graphemeSegmenter2 = new Intl.Segmenter(void 0, {
   granularity: "grapheme"
@@ -3590,11 +3580,11 @@ function isPrintableSearchChar(key) {
 __name(isPrintableSearchChar, "isPrintableSearchChar");
 function useSessionSearchInput(options) {
   const { onExitToList } = options;
-  const [searchQuery, rawSetSearchQuery] = (0, import_react3.useState)("");
-  const searchQueryRef = (0, import_react3.useRef)("");
-  const onExitToListRef = (0, import_react3.useRef)(onExitToList);
+  const [searchQuery, rawSetSearchQuery] = (0, import_react2.useState)("");
+  const searchQueryRef = (0, import_react2.useRef)("");
+  const onExitToListRef = (0, import_react2.useRef)(onExitToList);
   onExitToListRef.current = onExitToList;
-  const setSearchQuery = (0, import_react3.useCallback)(
+  const setSearchQuery = (0, import_react2.useCallback)(
     (nextValue) => {
       const prev = searchQueryRef.current;
       const next = typeof nextValue === "function" ? nextValue(prev) : nextValue;
@@ -3606,7 +3596,7 @@ function useSessionSearchInput(options) {
     },
     []
   );
-  const handleSearchKey = (0, import_react3.useCallback)(
+  const handleSearchKey = (0, import_react2.useCallback)(
     (key) => {
       const { name, sequence, ctrl } = key;
       if (name === "escape") {
@@ -3658,25 +3648,25 @@ function useSessionPicker({
     );
   }
   const hasInitialSessions = initialSessions !== void 0;
-  const [selectedIndex, setSelectedIndex] = (0, import_react4.useState)(0);
-  const [sessionState, setSessionState] = (0, import_react4.useState)(
+  const [selectedIndex, setSelectedIndex] = (0, import_react3.useState)(0);
+  const [sessionState, setSessionState] = (0, import_react3.useState)(
     hasInitialSessions ? { sessions: initialSessions, hasMore: false, nextCursor: void 0 } : { sessions: [], hasMore: true, nextCursor: void 0 }
   );
-  const [filterByBranch, setFilterByBranch] = (0, import_react4.useState)(false);
-  const [isLoading, setIsLoading] = (0, import_react4.useState)(!hasInitialSessions);
-  const [followScrollOffset, setFollowScrollOffset] = (0, import_react4.useState)(0);
-  const [viewMode, setViewMode] = (0, import_react4.useState)(
+  const [filterByBranch, setFilterByBranch] = (0, import_react3.useState)(false);
+  const [isLoading, setIsLoading] = (0, import_react3.useState)(!hasInitialSessions);
+  const [followScrollOffset, setFollowScrollOffset] = (0, import_react3.useState)(0);
+  const [viewMode, setViewMode] = (0, import_react3.useState)(
     "list"
   );
-  const [previewSessionId, setPreviewSessionId] = (0, import_react4.useState)(null);
-  const [checkedIds, setCheckedIds] = (0, import_react4.useState)(
+  const [previewSessionId, setPreviewSessionId] = (0, import_react3.useState)(null);
+  const [checkedIds, setCheckedIds] = (0, import_react3.useState)(
     () => /* @__PURE__ */ new Set()
   );
-  const disabledIdSet = (0, import_react4.useMemo)(
+  const disabledIdSet = (0, import_react3.useMemo)(
     () => new Set(disabledIds ?? []),
     [disabledIds]
   );
-  const toggleChecked = (0, import_react4.useCallback)(
+  const toggleChecked = (0, import_react3.useCallback)(
     (sessionId) => {
       if (disabledIdSet.has(sessionId)) return;
       setCheckedIds((prev) => {
@@ -3691,16 +3681,16 @@ function useSessionPicker({
     },
     [disabledIdSet]
   );
-  const exitPreview = (0, import_react4.useCallback)(() => {
+  const exitPreview = (0, import_react3.useCallback)(() => {
     setViewMode("list");
     setPreviewSessionId(null);
   }, []);
-  const onExitToList = (0, import_react4.useCallback)(() => {
+  const onExitToList = (0, import_react3.useCallback)(() => {
     setViewMode("list");
   }, []);
   const { searchQuery, setSearchQuery, handleSearchKey } = useSessionSearchInput({ onExitToList });
-  const isLoadingMoreRef = (0, import_react4.useRef)(false);
-  const filteredSessions = (0, import_react4.useMemo)(
+  const isLoadingMoreRef = (0, import_react3.useRef)(false);
+  const filteredSessions = (0, import_react3.useMemo)(
     () => filterSessions(
       sessionState.sessions,
       filterByBranch,
@@ -3709,7 +3699,7 @@ function useSessionPicker({
     ),
     [sessionState.sessions, filterByBranch, currentBranch, searchQuery]
   );
-  const scrollOffset = (0, import_react4.useMemo)(() => {
+  const scrollOffset = (0, import_react3.useMemo)(() => {
     if (centerSelection) {
       if (filteredSessions.length <= maxVisibleItems) {
         return 0;
@@ -3728,13 +3718,13 @@ function useSessionPicker({
     maxVisibleItems,
     selectedIndex
   ]);
-  const visibleSessions = (0, import_react4.useMemo)(
+  const visibleSessions = (0, import_react3.useMemo)(
     () => filteredSessions.slice(scrollOffset, scrollOffset + maxVisibleItems),
     [filteredSessions, maxVisibleItems, scrollOffset]
   );
   const showScrollUp = scrollOffset > 0;
   const showScrollDown = scrollOffset + maxVisibleItems < filteredSessions.length;
-  (0, import_react4.useEffect)(() => {
+  (0, import_react3.useEffect)(() => {
     if (!sessionService || hasInitialSessions) {
       return;
     }
@@ -3754,7 +3744,7 @@ function useSessionPicker({
     }, "loadInitialSessions");
     void loadInitialSessions();
   }, [sessionService, hasInitialSessions]);
-  const loadMoreSessions = (0, import_react4.useCallback)(async () => {
+  const loadMoreSessions = (0, import_react3.useCallback)(async () => {
     if (!sessionService || !sessionState.hasMore || isLoadingMoreRef.current) {
       return;
     }
@@ -3773,16 +3763,16 @@ function useSessionPicker({
       isLoadingMoreRef.current = false;
     }
   }, [sessionService, sessionState.hasMore, sessionState.nextCursor]);
-  (0, import_react4.useEffect)(() => {
+  (0, import_react3.useEffect)(() => {
     setSelectedIndex(0);
     setFollowScrollOffset(0);
   }, [filterByBranch, searchQuery]);
-  (0, import_react4.useEffect)(() => {
+  (0, import_react3.useEffect)(() => {
     if (selectedIndex >= filteredSessions.length && filteredSessions.length > 0) {
       setSelectedIndex(filteredSessions.length - 1);
     }
   }, [filteredSessions.length, selectedIndex]);
-  (0, import_react4.useEffect)(() => {
+  (0, import_react3.useEffect)(() => {
     if (isLoading || !sessionState.hasMore || isLoadingMoreRef.current || !centerSelection) {
       return;
     }
@@ -3800,7 +3790,7 @@ function useSessionPicker({
     scrollOffset,
     sessionState.hasMore
   ]);
-  const moveSelection = (0, import_react4.useCallback)(
+  const moveSelection = (0, import_react3.useCallback)(
     (delta) => {
       if (filteredSessions.length === 0) return;
       if (delta === -1) {
@@ -3958,49 +3948,24 @@ function useSessionPicker({
 }
 __name(useSessionPicker, "useSessionPicker");
 
-// packages/cli/src/ui/hooks/useTerminalSize.ts
-init_esbuild_shims();
-var import_react5 = __toESM(require_react(), 1);
-function useTerminalSize() {
-  const [size, setSize] = (0, import_react5.useState)({
-    columns: process.stdout.columns || 80,
-    rows: process.stdout.rows || 24
-  });
-  (0, import_react5.useEffect)(() => {
-    function updateSize() {
-      setSize({
-        columns: process.stdout.columns || 80,
-        rows: process.stdout.rows || 24
-      });
-    }
-    __name(updateSize, "updateSize");
-    process.stdout.on("resize", updateSize);
-    return () => {
-      process.stdout.off("resize", updateSize);
-    };
-  }, []);
-  return size;
-}
-__name(useTerminalSize, "useTerminalSize");
-
 // packages/cli/src/ui/components/SessionPreview.tsx
 init_esbuild_shims();
-var import_react43 = __toESM(require_react(), 1);
+var import_react40 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/HistoryItemDisplay.tsx
 init_esbuild_shims();
-var import_react42 = __toESM(require_react(), 1);
+var import_react39 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/messages/ConversationMessages.tsx
 init_esbuild_shims();
 
 // packages/cli/src/ui/utils/MarkdownDisplay.tsx
 init_esbuild_shims();
-var import_react11 = __toESM(require_react(), 1);
+var import_react9 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/utils/CodeColorizer.tsx
 init_esbuild_shims();
-var import_react6 = __toESM(require_react(), 1);
+var import_react4 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/utils/lowlightLoader.ts
 init_esbuild_shims();
@@ -4082,15 +4047,15 @@ function renderHastNode(node, theme2, inheritedColor) {
     }
     const colorToPassDown = elementColor || inheritedColor;
     const children = node.children?.map(
-      (child, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react6.default.Fragment, { children: renderHastNode(child, theme2, colorToPassDown) }, index)
+      (child, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react4.default.Fragment, { children: renderHastNode(child, theme2, colorToPassDown) }, index)
     );
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react6.default.Fragment, { children });
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react4.default.Fragment, { children });
   }
   if (node.type === "root") {
     if (!node.children || node.children.length === 0) {
       return null;
     }
-    return node.children?.map((child, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react6.default.Fragment, { children: renderHastNode(child, theme2, inheritedColor) }, index));
+    return node.children?.map((child, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react4.default.Fragment, { children: renderHastNode(child, theme2, inheritedColor) }, index));
   }
   return null;
 }
@@ -5739,7 +5704,7 @@ var TableRenderer = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/utils/InlineMarkdownRenderer.tsx
 init_esbuild_shims();
-var import_react7 = __toESM(require_react(), 1);
+var import_react5 = __toESM(require_react(), 1);
 var import_jsx_runtime3 = __toESM(require_jsx_runtime(), 1);
 var BOLD_MARKER_LENGTH = 2;
 var ITALIC_MARKER_LENGTH = 1;
@@ -5866,11 +5831,11 @@ var RenderInlineInternal = /* @__PURE__ */ __name(({
   }
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, { children: nodes.filter((node) => node !== null) });
 }, "RenderInlineInternal");
-var RenderInline = import_react7.default.memo(RenderInlineInternal);
+var RenderInline = import_react5.default.memo(RenderInlineInternal);
 
 // packages/cli/src/ui/utils/MermaidDiagram.tsx
 init_esbuild_shims();
-var import_react9 = __toESM(require_react(), 1);
+var import_react7 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/utils/mermaidVisualRenderer.ts
 init_esbuild_shims();
@@ -7899,15 +7864,15 @@ __name(fitImageToTerminal, "fitImageToTerminal");
 
 // packages/cli/src/ui/contexts/TerminalOutputContext.tsx
 init_esbuild_shims();
-var import_react8 = __toESM(require_react(), 1);
+var import_react6 = __toESM(require_react(), 1);
 var import_jsx_runtime4 = __toESM(require_jsx_runtime(), 1);
 var defaultWriteRaw = /* @__PURE__ */ __name((data) => {
   process.stdout.write(data);
 }, "defaultWriteRaw");
-var TerminalOutputContext = (0, import_react8.createContext)(defaultWriteRaw);
+var TerminalOutputContext = (0, import_react6.createContext)(defaultWriteRaw);
 var TerminalOutputProvider = /* @__PURE__ */ __name(({ value, children }) => /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(TerminalOutputContext.Provider, { value, children }), "TerminalOutputProvider");
 function useTerminalOutput() {
-  return (0, import_react8.useContext)(TerminalOutputContext);
+  return (0, import_react6.useContext)(TerminalOutputContext);
 }
 __name(useTerminalOutput, "useTerminalOutput");
 
@@ -7926,18 +7891,18 @@ var MermaidDiagramInternal = /* @__PURE__ */ __name(({
   availableTerminalHeight
 }) => {
   const writeRaw = useTerminalOutput();
-  const preparedTerminalImageSequence = import_react9.default.useRef(null);
-  const [imageState, setImageState] = import_react9.default.useState(
+  const preparedTerminalImageSequence = import_react7.default.useRef(null);
+  const [imageState, setImageState] = import_react7.default.useState(
     null
   );
   const innerWidth = Math.max(8, contentWidth - MERMAID_PADDING);
   const imageKey = `${source}\0${innerWidth}\0${availableTerminalHeight ?? "auto"}`;
   const image = imageState?.key === imageKey && !isPending ? imageState.result : null;
-  const visual = import_react9.default.useMemo(
+  const visual = import_react7.default.useMemo(
     () => renderMermaidVisual(source, innerWidth),
     [source, innerWidth]
   );
-  import_react9.default.useEffect(() => {
+  import_react7.default.useEffect(() => {
     if (isPending) {
       setImageState(null);
       return;
@@ -7973,10 +7938,10 @@ var MermaidDiagramInternal = /* @__PURE__ */ __name(({
     };
   }, [availableTerminalHeight, imageKey, innerWidth, isPending, source]);
   const kittySequence = image?.kind === "terminal-image" && image.protocol === "kitty" && image.placeholder ? image.sequence : null;
-  import_react9.default.useEffect(() => {
+  import_react7.default.useEffect(() => {
     preparedTerminalImageSequence.current = null;
   }, [imageKey]);
-  import_react9.default.useEffect(() => {
+  import_react7.default.useEffect(() => {
     if (!kittySequence || preparedTerminalImageSequence.current === kittySequence) {
       return;
     }
@@ -8057,23 +8022,24 @@ var MermaidDiagramInternal = /* @__PURE__ */ __name(({
     }
   );
 }, "MermaidDiagramInternal");
-var MermaidDiagram = import_react9.default.memo(MermaidDiagramInternal);
+var MermaidDiagram = import_react7.default.memo(MermaidDiagramInternal);
 
 // packages/cli/src/ui/contexts/RenderModeContext.tsx
 init_esbuild_shims();
-var import_react10 = __toESM(require_react(), 1);
-var RenderModeContext = import_react10.default.createContext({
+var import_react8 = __toESM(require_react(), 1);
+var RenderModeContext = import_react8.default.createContext({
   renderMode: "render",
   setRenderMode: /* @__PURE__ */ __name(() => void 0, "setRenderMode")
 });
 var RenderModeProvider = RenderModeContext.Provider;
 function useRenderMode() {
-  return import_react10.default.useContext(RenderModeContext);
+  return import_react8.default.useContext(RenderModeContext);
 }
 __name(useRenderMode, "useRenderMode");
 
 // packages/cli/src/ui/utils/MarkdownDisplay.tsx
 var import_jsx_runtime6 = __toESM(require_jsx_runtime(), 1);
+var MIN_PENDING_CONTENT_LINES = 1;
 function countMarkdownSourceBlocks(text) {
   const codeBlockLanguageCounts = /* @__PURE__ */ new Map();
   const lines = text.split(/\r?\n/);
@@ -8192,7 +8158,10 @@ var MarkdownDisplayInternal = /* @__PURE__ */ __name(({
   if (!text) return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_jsx_runtime6.Fragment, {});
   const renderVisualBlocks = renderMode === "render";
   const displayText = isPending ? text.trimEnd() : text;
-  const lines = displayText.split(/\r?\n/);
+  const allLines = displayText.split(/\r?\n/);
+  const pendingLineBudget = isPending && availableTerminalHeight !== void 0 ? Math.max(MIN_PENDING_CONTENT_LINES, availableTerminalHeight - 2) : void 0;
+  const pendingClipped = pendingLineBudget !== void 0 && allLines.length > pendingLineBudget;
+  const lines = pendingClipped ? allLines.slice(0, pendingLineBudget) : allLines;
   const headerRegex = /^ *(#{1,4}) +(.*)/;
   const codeFenceRegex = /^ *(`{3,}|~{3,}) *([^`]*)$/;
   const ulItemRegex = /^([ \t]*)([-*+]) +(.*)/;
@@ -8560,6 +8529,12 @@ var MarkdownDisplayInternal = /* @__PURE__ */ __name(({
       )
     );
   }
+  if (pendingClipped) {
+    return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(Box_default, { flexDirection: "column", children: [
+      contentBlocks,
+      /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Text, { color: theme.text.secondary, wrap: "truncate", children: "... generating more ..." })
+    ] });
+  }
   return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_jsx_runtime6.Fragment, { children: contentBlocks });
 }, "MarkdownDisplayInternal");
 var RenderCodeBlockInternal = /* @__PURE__ */ __name(({
@@ -8641,7 +8616,7 @@ var RenderCodeBlockInternal = /* @__PURE__ */ __name(({
     }
   );
 }, "RenderCodeBlockInternal");
-var RenderCodeBlock = import_react11.default.memo(RenderCodeBlockInternal);
+var RenderCodeBlock = import_react9.default.memo(RenderCodeBlockInternal);
 var RenderPendingMermaidBlockInternal = /* @__PURE__ */ __name(({ content, availableTerminalHeight, contentWidth }) => {
   const maxPreviewLines = availableTerminalHeight === void 0 ? 6 : Math.max(0, availableTerminalHeight - 2);
   const previewLines = content.slice(0, maxPreviewLines);
@@ -8660,7 +8635,7 @@ var RenderPendingMermaidBlockInternal = /* @__PURE__ */ __name(({ content, avail
     }
   );
 }, "RenderPendingMermaidBlockInternal");
-var RenderPendingMermaidBlock = import_react11.default.memo(RenderPendingMermaidBlockInternal);
+var RenderPendingMermaidBlock = import_react9.default.memo(RenderPendingMermaidBlockInternal);
 var RenderMathBlockInternal = /* @__PURE__ */ __name(({
   content,
   sourceCopyCommand,
@@ -8713,7 +8688,7 @@ var RenderMathBlockInternal = /* @__PURE__ */ __name(({
     }
   );
 }, "RenderMathBlockInternal");
-var RenderMathBlock = import_react11.default.memo(RenderMathBlockInternal);
+var RenderMathBlock = import_react9.default.memo(RenderMathBlockInternal);
 var RenderBlockquoteInternal = /* @__PURE__ */ __name(({
   quoteText,
   textColor = theme.text.primary,
@@ -8729,7 +8704,7 @@ var RenderBlockquoteInternal = /* @__PURE__ */ __name(({
     }
   ) }) })
 ] }), "RenderBlockquoteInternal");
-var RenderBlockquote = import_react11.default.memo(RenderBlockquoteInternal);
+var RenderBlockquote = import_react9.default.memo(RenderBlockquoteInternal);
 var RenderListItemInternal = /* @__PURE__ */ __name(({
   itemText,
   type,
@@ -8764,7 +8739,7 @@ var RenderListItemInternal = /* @__PURE__ */ __name(({
     }
   );
 }, "RenderListItemInternal");
-var RenderListItem = import_react11.default.memo(RenderListItemInternal);
+var RenderListItem = import_react9.default.memo(RenderListItemInternal);
 var RenderTableInternal = /* @__PURE__ */ __name(({
   headers,
   rows,
@@ -8781,8 +8756,8 @@ var RenderTableInternal = /* @__PURE__ */ __name(({
     enableInlineMath
   }
 ), "RenderTableInternal");
-var RenderTable = import_react11.default.memo(RenderTableInternal);
-var MarkdownDisplay = import_react11.default.memo(MarkdownDisplayInternal);
+var RenderTable = import_react9.default.memo(RenderTableInternal);
+var MarkdownDisplay = import_react9.default.memo(MarkdownDisplayInternal);
 
 // packages/cli/src/ui/textConstants.ts
 init_esbuild_shims();
@@ -8842,6 +8817,7 @@ __name(formatDuration2, "formatDuration");
 // packages/cli/src/ui/components/messages/ConversationMessages.tsx
 var import_jsx_runtime7 = __toESM(require_jsx_runtime(), 1);
 var THINKING_ICON = "\u2234 ";
+var THINKING_ICON_PENDING = "\u2235 ";
 var toggleKeyHint = process.platform === "darwin" ? "option+t" : "alt+t";
 function getPrefixWidth(prefix) {
   return stringWidth(prefix) + 1;
@@ -8958,7 +8934,7 @@ var AssistantMessage = /* @__PURE__ */ __name(({
   PrefixedMarkdownMessage,
   {
     text,
-    prefix: "\u2726",
+    prefix: "\u25C6",
     prefixColor: theme.text.accent,
     ariaLabel: SCREEN_READER_MODEL_PREFIX,
     isPending,
@@ -8980,43 +8956,11 @@ var AssistantMessageContent = /* @__PURE__ */ __name(({
     isPending,
     availableTerminalHeight,
     contentWidth,
-    basePrefix: "\u2726",
+    basePrefix: "\u25C6",
     sourceCopyIndexOffsets
   }
 ), "AssistantMessageContent");
 var MAX_STREAMING_THINKING_VISUAL_LINES = 4;
-function wrapToVisualLines(text, width) {
-  if (width <= 0) {
-    return [""];
-  }
-  const visualLines = [];
-  for (const logicalLine of text.split("\n")) {
-    if (logicalLine === "") {
-      visualLines.push("");
-      continue;
-    }
-    let currentLine = "";
-    let currentWidth = 0;
-    for (const char of logicalLine) {
-      const charWidth = getCachedStringWidth(char);
-      if (currentWidth + charWidth > width && currentWidth > 0) {
-        visualLines.push(currentLine);
-        currentLine = "";
-        currentWidth = 0;
-      }
-      currentLine += char;
-      currentWidth += charWidth;
-    }
-    if (currentLine) {
-      visualLines.push(currentLine);
-    }
-  }
-  if (visualLines.length === 0) {
-    visualLines.push("");
-  }
-  return visualLines;
-}
-__name(wrapToVisualLines, "wrapToVisualLines");
 function tailVisualLines(text, width, maxLines) {
   const charBudget = maxLines * width * 2;
   let sliceStart = Math.max(0, text.length - charBudget);
@@ -9060,7 +9004,7 @@ var ThinkMessage = /* @__PURE__ */ __name(({
     const display = tailVisualLines(text, innerWidth, maxLines);
     return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(Box_default, { flexDirection: "column", children: [
       /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(Text, { dimColor: true, italic: true, children: [
-        THINKING_ICON,
+        THINKING_ICON_PENDING,
         t("Thinking"),
         "\u2026",
         durationSuffix
@@ -9124,11 +9068,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_react24 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/messages/ToolMessage.tsx
 init_esbuild_shims();
-var import_react24 = __toESM(require_react(), 1);
+var import_react22 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/messages/DiffRenderer.tsx
 init_esbuild_shims();
@@ -9469,18 +9413,18 @@ var TodoItemRow = /* @__PURE__ */ __name(({ todo }) => {
 
 // packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx
 init_esbuild_shims();
-var import_react18 = __toESM(require_react(), 1);
+var import_react16 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/shared/RadioButtonSelect.tsx
 init_esbuild_shims();
 
 // packages/cli/src/ui/components/shared/BaseSelectionList.tsx
 init_esbuild_shims();
-var import_react13 = __toESM(require_react(), 1);
+var import_react11 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/useSelectionList.ts
 init_esbuild_shims();
-var import_react12 = __toESM(require_react(), 1);
+var import_react10 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/keyMatchers.ts
 init_esbuild_shims();
@@ -9824,19 +9768,19 @@ function useSelectionList({
   showNumbers = false,
   disableVimNav = false
 }) {
-  const [state, dispatch] = (0, import_react12.useReducer)(selectionListReducer, {
+  const [state, dispatch] = (0, import_react10.useReducer)(selectionListReducer, {
     activeIndex: computeInitialIndex(initialIndex, items),
     initialIndex,
     pendingHighlight: false,
     pendingSelect: false,
     items
   });
-  const numberInputRef = (0, import_react12.useRef)("");
-  const numberInputTimer = (0, import_react12.useRef)(null);
-  (0, import_react12.useEffect)(() => {
+  const numberInputRef = (0, import_react10.useRef)("");
+  const numberInputTimer = (0, import_react10.useRef)(null);
+  (0, import_react10.useEffect)(() => {
     dispatch({ type: "INITIALIZE", payload: { initialIndex, items } });
   }, [initialIndex, items]);
-  (0, import_react12.useEffect)(() => {
+  (0, import_react10.useEffect)(() => {
     let needsClear = false;
     if (state.pendingHighlight && items[state.activeIndex]) {
       onHighlight?.(items[state.activeIndex].value);
@@ -9860,7 +9804,7 @@ function useSelectionList({
     onHighlight,
     onSelect
   ]);
-  (0, import_react12.useEffect)(
+  (0, import_react10.useEffect)(
     () => () => {
       if (numberInputTimer.current) {
         clearTimeout(numberInputTimer.current);
@@ -9941,9 +9885,15 @@ function useSelectionList({
       payload: { index, items }
     });
   }, "setActiveIndex");
+  const selectIndex = /* @__PURE__ */ __name((index) => {
+    if (items[index]?.disabled) return;
+    dispatch({ type: "SET_ACTIVE_INDEX", payload: { index, items } });
+    dispatch({ type: "SELECT_CURRENT", payload: { items } });
+  }, "selectIndex");
   return {
     activeIndex: state.activeIndex,
-    setActiveIndex
+    setActiveIndex,
+    selectIndex
   };
 }
 __name(useSelectionList, "useSelectionList");
@@ -9969,7 +9919,7 @@ function BaseSelectionList({
   itemGap = 0,
   renderItem
 }) {
-  const { activeIndex } = useSelectionList({
+  const { activeIndex, setActiveIndex, selectIndex } = useSelectionList({
     items,
     initialIndex,
     onSelect,
@@ -9977,10 +9927,10 @@ function BaseSelectionList({
     isFocused,
     showNumbers
   });
-  const [scrollOffset, setScrollOffset] = (0, import_react13.useState)(
+  const [scrollOffset, setScrollOffset] = (0, import_react11.useState)(
     () => getScrollOffsetForIndex(activeIndex, items.length, maxItemsToShow)
   );
-  (0, import_react13.useEffect)(() => {
+  (0, import_react11.useEffect)(() => {
     const newScrollOffset = getScrollOffsetForIndex(
       activeIndex,
       items.length,
@@ -9992,9 +9942,24 @@ function BaseSelectionList({
       setScrollOffset(newScrollOffset);
     }
   }, [activeIndex, items.length, scrollOffset, maxItemsToShow]);
+  const settings = (0, import_react11.useContext)(SettingsContext);
+  const mouseEnabled = !!settings?.merged.ui?.useTerminalBuffer;
+  const containerRef = (0, import_react11.useRef)(null);
+  const itemRefs = (0, import_react11.useRef)([]);
   const visibleItems = items.slice(scrollOffset, scrollOffset + maxItemsToShow);
   const numberColumnWidth = String(items.length).length;
-  return /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(Box_default, { flexDirection: "column", gap: itemGap, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(Box_default, { ref: containerRef, flexDirection: "column", gap: itemGap, children: [
+    mouseEnabled && isFocused && items.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+      RowMouseController,
+      {
+        containerRef,
+        itemRefs,
+        scrollOffset,
+        isDisabled: (index) => !!items[index]?.disabled,
+        onHoverIndex: setActiveIndex,
+        onSelectIndex: selectIndex
+      }
+    ),
     showScrollArrows && /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
       Text,
       {
@@ -10023,31 +9988,41 @@ function BaseSelectionList({
       const itemNumberText = `${String(itemIndex + 1).padStart(
         numberColumnWidth
       )}.`;
-      return /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(Box_default, { alignItems: "flex-start", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Box_default, { minWidth: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
-          Text,
-          {
-            color: isSelected ? theme.status.success : theme.text.primary,
-            "aria-hidden": true,
-            children: isSelected ? "\u203A" : " "
-          }
-        ) }),
-        showNumbers && /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
-          Box_default,
-          {
-            marginRight: 1,
-            flexShrink: 0,
-            minWidth: itemNumberText.length,
-            "aria-state": { checked: isSelected },
-            children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Text, { color: numberColor, children: itemNumberText })
-          }
-        ),
-        /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Box_default, { flexGrow: 1, children: renderItem(item, {
-          isSelected,
-          titleColor,
-          numberColor
-        }) })
-      ] }, item.key);
+      return /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(
+        Box_default,
+        {
+          alignItems: "flex-start",
+          ref: (node) => {
+            itemRefs.current[index] = node;
+          },
+          children: [
+            /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Box_default, { minWidth: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+              Text,
+              {
+                color: isSelected ? theme.status.success : theme.text.primary,
+                "aria-hidden": true,
+                children: isSelected ? "\u203A" : " "
+              }
+            ) }),
+            showNumbers && /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+              Box_default,
+              {
+                marginRight: 1,
+                flexShrink: 0,
+                minWidth: itemNumberText.length,
+                "aria-state": { checked: isSelected },
+                children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Text, { color: numberColor, children: itemNumberText })
+              }
+            ),
+            /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Box_default, { flexGrow: 1, children: renderItem(item, {
+              isSelected,
+              titleColor,
+              numberColor
+            }) })
+          ]
+        },
+        item.key
+      );
     }),
     showScrollArrows && /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
       Text,
@@ -10100,14 +10075,14 @@ __name(RadioButtonSelect, "RadioButtonSelect");
 
 // packages/cli/src/ui/components/messages/AskUserQuestionDialog.tsx
 init_esbuild_shims();
-var import_react17 = __toESM(require_react(), 1);
+var import_react15 = __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_react14 = __toESM(require_react(), 1);
+var import_react12 = __toESM(require_react(), 1);
 import { spawnSync as spawnSync2 } from "node:child_process";
 import fs2 from "node:fs";
 import os2 from "node:os";
@@ -12165,7 +12140,7 @@ function useTextBuffer({
   shellModeActive = false,
   preferredEditor
 }) {
-  const initialState = (0, import_react14.useMemo)(() => {
+  const initialState = (0, import_react12.useMemo)(() => {
     const lines2 = initialText.split("\n");
     const [initialCursorRow, initialCursorCol] = calculateInitialCursorPosition(
       lines2.length === 0 ? [""] : lines2,
@@ -12189,9 +12164,9 @@ function useTextBuffer({
       visualLayout: visualLayout2
     };
   }, [initialText, initialCursorOffset, viewport.width, viewport.height]);
-  const stateRef = (0, import_react14.useRef)(initialState);
-  const [state, setState] = (0, import_react14.useState)(initialState);
-  const dispatch = (0, import_react14.useCallback)((action) => {
+  const stateRef = (0, import_react12.useRef)(initialState);
+  const [state, setState] = (0, import_react12.useState)(initialState);
+  const dispatch = (0, import_react12.useCallback)((action) => {
     stateRef.current = textBufferReducer(stateRef.current, action);
     setState(stateRef.current);
   }, []);
@@ -12203,25 +12178,25 @@ function useTextBuffer({
     selectionAnchor,
     visualLayout
   } = state;
-  const text = (0, import_react14.useMemo)(() => lines.join("\n"), [lines]);
-  const visualCursor = (0, import_react14.useMemo)(
+  const text = (0, import_react12.useMemo)(() => lines.join("\n"), [lines]);
+  const visualCursor = (0, import_react12.useMemo)(
     () => calculateVisualCursorFromLayout(visualLayout, [cursorRow, cursorCol]),
     [visualLayout, cursorRow, cursorCol]
   );
   const { visualLines, visualToLogicalMap } = visualLayout;
-  const [visualScrollRow, setVisualScrollRow] = (0, import_react14.useState)(0);
-  (0, import_react14.useEffect)(() => {
+  const [visualScrollRow, setVisualScrollRow] = (0, import_react12.useState)(0);
+  (0, import_react12.useEffect)(() => {
     if (onChange) {
       onChange(text);
     }
   }, [text, onChange]);
-  (0, import_react14.useEffect)(() => {
+  (0, import_react12.useEffect)(() => {
     dispatch({
       type: "set_viewport",
       payload: { width: viewport.width, height: viewport.height }
     });
   }, [dispatch, viewport.width, viewport.height]);
-  (0, import_react14.useEffect)(() => {
+  (0, import_react12.useEffect)(() => {
     const { height } = viewport;
     const totalVisualLines = visualLines.length;
     const maxScrollStart = Math.max(0, totalVisualLines - height);
@@ -12236,7 +12211,7 @@ function useTextBuffer({
       setVisualScrollRow(newVisualScrollRow);
     }
   }, [visualCursor, visualScrollRow, viewport, visualLines.length]);
-  const insert = (0, import_react14.useCallback)(
+  const insert = (0, import_react12.useCallback)(
     (ch, { paste = false } = {}) => {
       if (paste && /[\n\r]/.test(ch) && !shellModeActive) {
         const validPaths = tryExtractFilePaths(ch, isValidPath);
@@ -12275,202 +12250,202 @@ function useTextBuffer({
     },
     [dispatch, isValidPath, shellModeActive]
   );
-  const newline = (0, import_react14.useCallback)(() => {
+  const newline = (0, import_react12.useCallback)(() => {
     dispatch({ type: "insert", payload: "\n" });
   }, [dispatch]);
-  const backspace = (0, import_react14.useCallback)(() => {
+  const backspace = (0, import_react12.useCallback)(() => {
     dispatch({ type: "backspace" });
   }, [dispatch]);
-  const del = (0, import_react14.useCallback)(() => {
+  const del = (0, import_react12.useCallback)(() => {
     dispatch({ type: "delete" });
   }, [dispatch]);
-  const move = (0, import_react14.useCallback)(
+  const move = (0, import_react12.useCallback)(
     (dir) => {
       dispatch({ type: "move", payload: { dir } });
     },
     [dispatch]
   );
-  const undo = (0, import_react14.useCallback)(() => {
+  const undo = (0, import_react12.useCallback)(() => {
     dispatch({ type: "undo" });
   }, [dispatch]);
-  const redo = (0, import_react14.useCallback)(() => {
+  const redo = (0, import_react12.useCallback)(() => {
     dispatch({ type: "redo" });
   }, [dispatch]);
-  const setText = (0, import_react14.useCallback)(
+  const setText = (0, import_react12.useCallback)(
     (newText) => {
       dispatch({ type: "set_text", payload: newText });
     },
     [dispatch]
   );
-  const deleteWordLeft = (0, import_react14.useCallback)(() => {
+  const deleteWordLeft = (0, import_react12.useCallback)(() => {
     dispatch({ type: "delete_word_left" });
   }, [dispatch]);
-  const deleteWordRight = (0, import_react14.useCallback)(() => {
+  const deleteWordRight = (0, import_react12.useCallback)(() => {
     dispatch({ type: "delete_word_right" });
   }, [dispatch]);
-  const killLineRight = (0, import_react14.useCallback)(() => {
+  const killLineRight = (0, import_react12.useCallback)(() => {
     dispatch({ type: "kill_line_right" });
   }, [dispatch]);
-  const killLineLeft = (0, import_react14.useCallback)(() => {
+  const killLineLeft = (0, import_react12.useCallback)(() => {
     dispatch({ type: "kill_line_left" });
   }, [dispatch]);
-  const vimDeleteWordForward = (0, import_react14.useCallback)(
+  const vimDeleteWordForward = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_delete_word_forward", payload: { count } });
     },
     [dispatch]
   );
-  const vimDeleteWordBackward = (0, import_react14.useCallback)(
+  const vimDeleteWordBackward = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_delete_word_backward", payload: { count } });
     },
     [dispatch]
   );
-  const vimDeleteWordEnd = (0, import_react14.useCallback)(
+  const vimDeleteWordEnd = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_delete_word_end", payload: { count } });
     },
     [dispatch]
   );
-  const vimChangeWordForward = (0, import_react14.useCallback)(
+  const vimChangeWordForward = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_change_word_forward", payload: { count } });
     },
     [dispatch]
   );
-  const vimChangeWordBackward = (0, import_react14.useCallback)(
+  const vimChangeWordBackward = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_change_word_backward", payload: { count } });
     },
     [dispatch]
   );
-  const vimChangeWordEnd = (0, import_react14.useCallback)(
+  const vimChangeWordEnd = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_change_word_end", payload: { count } });
     },
     [dispatch]
   );
-  const vimDeleteLine = (0, import_react14.useCallback)(
+  const vimDeleteLine = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_delete_line", payload: { count } });
     },
     [dispatch]
   );
-  const vimChangeLine = (0, import_react14.useCallback)(
+  const vimChangeLine = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_change_line", payload: { count } });
     },
     [dispatch]
   );
-  const vimDeleteToEndOfLine = (0, import_react14.useCallback)(() => {
+  const vimDeleteToEndOfLine = (0, import_react12.useCallback)(() => {
     dispatch({ type: "vim_delete_to_end_of_line" });
   }, [dispatch]);
-  const vimChangeToEndOfLine = (0, import_react14.useCallback)(() => {
+  const vimChangeToEndOfLine = (0, import_react12.useCallback)(() => {
     dispatch({ type: "vim_change_to_end_of_line" });
   }, [dispatch]);
-  const vimChangeMovement = (0, import_react14.useCallback)(
+  const vimChangeMovement = (0, import_react12.useCallback)(
     (movement, count) => {
       dispatch({ type: "vim_change_movement", payload: { movement, count } });
     },
     [dispatch]
   );
-  const vimDeleteMovement = (0, import_react14.useCallback)(
+  const vimDeleteMovement = (0, import_react12.useCallback)(
     (movement, count) => {
       dispatch({ type: "vim_delete_movement", payload: { movement, count } });
     },
     [dispatch]
   );
-  const vimMoveLeft = (0, import_react14.useCallback)(
+  const vimMoveLeft = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_move_left", payload: { count } });
     },
     [dispatch]
   );
-  const vimMoveRight = (0, import_react14.useCallback)(
+  const vimMoveRight = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_move_right", payload: { count } });
     },
     [dispatch]
   );
-  const vimMoveUp = (0, import_react14.useCallback)(
+  const vimMoveUp = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_move_up", payload: { count } });
     },
     [dispatch]
   );
-  const vimMoveDown = (0, import_react14.useCallback)(
+  const vimMoveDown = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_move_down", payload: { count } });
     },
     [dispatch]
   );
-  const vimMoveWordForward = (0, import_react14.useCallback)(
+  const vimMoveWordForward = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_move_word_forward", payload: { count } });
     },
     [dispatch]
   );
-  const vimMoveWordBackward = (0, import_react14.useCallback)(
+  const vimMoveWordBackward = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_move_word_backward", payload: { count } });
     },
     [dispatch]
   );
-  const vimMoveWordEnd = (0, import_react14.useCallback)(
+  const vimMoveWordEnd = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_move_word_end", payload: { count } });
     },
     [dispatch]
   );
-  const vimDeleteChar = (0, import_react14.useCallback)(
+  const vimDeleteChar = (0, import_react12.useCallback)(
     (count) => {
       dispatch({ type: "vim_delete_char", payload: { count } });
     },
     [dispatch]
   );
-  const vimInsertAtCursor = (0, import_react14.useCallback)(() => {
+  const vimInsertAtCursor = (0, import_react12.useCallback)(() => {
     dispatch({ type: "vim_insert_at_cursor" });
   }, [dispatch]);
-  const vimAppendAtCursor = (0, import_react14.useCallback)(() => {
+  const vimAppendAtCursor = (0, import_react12.useCallback)(() => {
     dispatch({ type: "vim_append_at_cursor" });
   }, [dispatch]);
-  const vimOpenLineBelow = (0, import_react14.useCallback)(() => {
+  const vimOpenLineBelow = (0, import_react12.useCallback)(() => {
     dispatch({ type: "vim_open_line_below" });
   }, [dispatch]);
-  const vimOpenLineAbove = (0, import_react14.useCallback)(() => {
+  const vimOpenLineAbove = (0, import_react12.useCallback)(() => {
     dispatch({ type: "vim_open_line_above" });
   }, [dispatch]);
-  const vimAppendAtLineEnd = (0, import_react14.useCallback)(() => {
+  const vimAppendAtLineEnd = (0, import_react12.useCallback)(() => {
     dispatch({ type: "vim_append_at_line_end" });
   }, [dispatch]);
-  const vimInsertAtLineStart = (0, import_react14.useCallback)(() => {
+  const vimInsertAtLineStart = (0, import_react12.useCallback)(() => {
     dispatch({ type: "vim_insert_at_line_start" });
   }, [dispatch]);
-  const vimMoveToLineStart = (0, import_react14.useCallback)(() => {
+  const vimMoveToLineStart = (0, import_react12.useCallback)(() => {
     dispatch({ type: "vim_move_to_line_start" });
   }, [dispatch]);
-  const vimMoveToLineEnd = (0, import_react14.useCallback)(() => {
+  const vimMoveToLineEnd = (0, import_react12.useCallback)(() => {
     dispatch({ type: "vim_move_to_line_end" });
   }, [dispatch]);
-  const vimMoveToFirstNonWhitespace = (0, import_react14.useCallback)(() => {
+  const vimMoveToFirstNonWhitespace = (0, import_react12.useCallback)(() => {
     dispatch({ type: "vim_move_to_first_nonwhitespace" });
   }, [dispatch]);
-  const vimMoveToFirstLine = (0, import_react14.useCallback)(() => {
+  const vimMoveToFirstLine = (0, import_react12.useCallback)(() => {
     dispatch({ type: "vim_move_to_first_line" });
   }, [dispatch]);
-  const vimMoveToLastLine = (0, import_react14.useCallback)(() => {
+  const vimMoveToLastLine = (0, import_react12.useCallback)(() => {
     dispatch({ type: "vim_move_to_last_line" });
   }, [dispatch]);
-  const vimMoveToLine = (0, import_react14.useCallback)(
+  const vimMoveToLine = (0, import_react12.useCallback)(
     (lineNumber) => {
       dispatch({ type: "vim_move_to_line", payload: { lineNumber } });
     },
     [dispatch]
   );
-  const vimEscapeInsertMode = (0, import_react14.useCallback)(() => {
+  const vimEscapeInsertMode = (0, import_react12.useCallback)(() => {
     dispatch({ type: "vim_escape_insert_mode" });
   }, [dispatch]);
-  const openInExternalEditor = (0, import_react14.useCallback)(
+  const openInExternalEditor = (0, import_react12.useCallback)(
     async (opts = {}) => {
       let tmpDir;
       let filePath;
@@ -12588,7 +12563,7 @@ function useTextBuffer({
     },
     [dispatch, stdin, setRawMode, preferredEditor]
   );
-  const handleInput = (0, import_react14.useCallback)(
+  const handleInput = (0, import_react12.useCallback)(
     (key) => {
       const { sequence: input } = key;
       if (key.paste) {
@@ -12639,11 +12614,11 @@ function useTextBuffer({
       redo
     ]
   );
-  const renderedVisualLines = (0, import_react14.useMemo)(
+  const renderedVisualLines = (0, import_react12.useMemo)(
     () => visualLines.slice(visualScrollRow, visualScrollRow + viewport.height),
     [visualLines, visualScrollRow, viewport.height]
   );
-  const replaceRange = (0, import_react14.useCallback)(
+  const replaceRange = (0, import_react12.useCallback)(
     (startRow, startCol, endRow, endCol, text2) => {
       dispatch({
         type: "replace_range",
@@ -12652,7 +12627,7 @@ function useTextBuffer({
     },
     [dispatch]
   );
-  const replaceRangeByOffset = (0, import_react14.useCallback)(
+  const replaceRangeByOffset = (0, import_react12.useCallback)(
     (startOffset, endOffset, replacementText) => {
       const currentText = stateRef.current.lines.join("\n");
       const [startRow, startCol] = offsetToLogicalPos(currentText, startOffset);
@@ -12661,13 +12636,13 @@ function useTextBuffer({
     },
     [replaceRange]
   );
-  const moveToOffset = (0, import_react14.useCallback)(
+  const moveToOffset = (0, import_react12.useCallback)(
     (offset) => {
       dispatch({ type: "move_to_offset", payload: { offset } });
     },
     [dispatch]
   );
-  const returnValue = (0, import_react14.useMemo)(
+  const returnValue = (0, import_react12.useMemo)(
     () => ({
       get lines() {
         return stateRef.current.lines;
@@ -12803,11 +12778,11 @@ __name(useTextBuffer, "useTextBuffer");
 
 // packages/cli/src/ui/hooks/usePreferredEditor.ts
 init_esbuild_shims();
-var import_react15 = __toESM(require_react(), 1);
+var import_react13 = __toESM(require_react(), 1);
 var debugLogger5 = createDebugLogger("PREFERRED_EDITOR");
 function usePreferredEditor() {
   const settings = useSettings();
-  return (0, import_react15.useMemo)(() => {
+  return (0, import_react13.useMemo)(() => {
     const raw = settings.merged.general?.preferredEditor ?? "";
     if (raw && !isValidEditorType(raw)) {
       debugLogger5.warn(
@@ -12827,7 +12802,7 @@ function usePreferredEditor() {
 __name(usePreferredEditor, "usePreferredEditor");
 
 // packages/cli/src/ui/components/shared/TextInput.tsx
-var import_react16 = __toESM(require_react(), 1);
+var import_react14 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/utils/software-cursor.ts
 init_esbuild_shims();
@@ -12925,12 +12900,12 @@ function TextInput({
   ellipsizeOverflow = false
 }) {
   const allowMultiline = height > 1;
-  const [cursorVisible, setCursorVisible] = (0, import_react16.useState)(isActive);
-  const onChangeRef = (0, import_react16.useRef)(onChange);
-  (0, import_react16.useEffect)(() => {
+  const [cursorVisible, setCursorVisible] = (0, import_react14.useState)(isActive);
+  const onChangeRef = (0, import_react14.useRef)(onChange);
+  (0, import_react14.useEffect)(() => {
     onChangeRef.current = onChange;
   }, [onChange]);
-  const stableOnChange = (0, import_react16.useCallback)((text) => {
+  const stableOnChange = (0, import_react14.useCallback)((text) => {
     onChangeRef.current?.(text);
   }, []);
   const preferredEditor = usePreferredEditor();
@@ -12945,7 +12920,7 @@ function TextInput({
     onChange: stableOnChange,
     preferredEditor
   });
-  (0, import_react16.useEffect)(() => {
+  (0, import_react14.useEffect)(() => {
     if (!isActive) {
       setCursorVisible(false);
       return;
@@ -12958,7 +12933,7 @@ function TextInput({
   }, [isActive]);
   const handleSubmit = /* @__PURE__ */ __name(() => {
     if (!onSubmit) return;
-    onSubmit();
+    onSubmit(buffer.text);
   }, "handleSubmit");
   useKeypress(
     (key) => {
@@ -13064,12 +13039,13 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
   isFocused = true,
   onConfirm
 }) => {
-  const [currentQuestionIndex, setCurrentQuestionIndex] = (0, import_react17.useState)(0);
-  const [selectedOptions, setSelectedOptions] = (0, import_react17.useState)({});
-  const [customInputValues, setCustomInputValues] = (0, import_react17.useState)({});
-  const [selectedIndex, setSelectedIndex] = (0, import_react17.useState)(0);
-  const [multiSelectedOptions, setMultiSelectedOptions] = (0, import_react17.useState)({});
-  const [customInputChecked, setCustomInputChecked] = (0, import_react17.useState)({});
+  const [currentQuestionIndex, setCurrentQuestionIndex] = (0, import_react15.useState)(0);
+  const [selectedOptions, setSelectedOptions] = (0, import_react15.useState)({});
+  const [customInputValues, setCustomInputValues] = (0, import_react15.useState)({});
+  const customInputValuesRef = (0, import_react15.useRef)({});
+  const [selectedIndex, setSelectedIndex] = (0, import_react15.useState)(0);
+  const [multiSelectedOptions, setMultiSelectedOptions] = (0, import_react15.useState)({});
+  const [customInputChecked, setCustomInputChecked] = (0, import_react15.useState)({});
   const hasMultipleQuestions = confirmationDetails.questions.length > 1;
   const totalTabs = hasMultipleQuestions ? confirmationDetails.questions.length + 1 : confirmationDetails.questions.length;
   const isSubmitTab = hasMultipleQuestions && currentQuestionIndex === totalTabs - 1;
@@ -13077,7 +13053,8 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
   const isMultiSelect = currentQuestion?.multiSelect ?? false;
   const totalOptions = currentQuestion ? currentQuestion.options.length + 1 : 2;
   const isCustomInputSelected = !isSubmitTab && currentQuestion && selectedIndex === currentQuestion.options.length;
-  const currentCustomInputValue = customInputValues[currentQuestionIndex] ?? "";
+  const getCustomInputValue = /* @__PURE__ */ __name((idx) => customInputValuesRef.current[idx] ?? customInputValues[idx] ?? "", "getCustomInputValue");
+  const currentCustomInputValue = getCustomInputValue(currentQuestionIndex);
   const isCustomInputAnswer = !isSubmitTab && currentQuestion && !isMultiSelect && selectedOptions[currentQuestionIndex] !== void 0 && !currentQuestion.options.some(
     (opt) => opt.label === selectedOptions[currentQuestionIndex]
   );
@@ -13085,7 +13062,7 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
     const q = confirmationDetails.questions[idx];
     if (q?.multiSelect) {
       const selections = [...multiSelectedOptions[idx] ?? []];
-      const customValue = (customInputValues[idx] ?? "").trim();
+      const customValue = getCustomInputValue(idx).trim();
       if (customInputChecked[idx] && customValue) {
         selections.push(customValue);
       }
@@ -13116,24 +13093,30 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
       }, 150);
     }
   }, "selectAndAdvance");
-  const handleMultiSelectSubmit = /* @__PURE__ */ __name(() => {
+  const getCurrentMultiSelectAnswer = /* @__PURE__ */ __name((includeCustomInput = customInputChecked[currentQuestionIndex], inputValue = currentCustomInputValue) => {
     if (!currentQuestion) return;
     const selections = [...multiSelectedOptions[currentQuestionIndex] ?? []];
-    const customValue = currentCustomInputValue.trim();
-    if (customInputChecked[currentQuestionIndex] && customValue) {
+    const customValue = inputValue.trim();
+    if (includeCustomInput && customValue) {
       selections.push(customValue);
     }
-    if (selections.length === 0) return;
-    selectAndAdvance(selections.join(", "));
+    return selections.length > 0 ? selections.join(", ") : void 0;
+  }, "getCurrentMultiSelectAnswer");
+  const handleMultiSelectSubmit = /* @__PURE__ */ __name(() => {
+    const answer = getCurrentMultiSelectAnswer();
+    if (!answer) return;
+    selectAndAdvance(answer);
   }, "handleMultiSelectSubmit");
-  const handleCustomInputSubmit = /* @__PURE__ */ __name(() => {
-    const trimmedValue = currentCustomInputValue.trim();
+  const handleCustomInputSubmit = /* @__PURE__ */ __name((inputValue = currentCustomInputValue) => {
+    const trimmedValue = inputValue.trim();
     if (isMultiSelect) {
-      if (!trimmedValue) return;
       setCustomInputChecked((prev) => ({
         ...prev,
-        [currentQuestionIndex]: !prev[currentQuestionIndex]
+        [currentQuestionIndex]: trimmedValue.length > 0
       }));
+      if (trimmedValue) {
+        selectAndAdvance(getCurrentMultiSelectAnswer(true, inputValue));
+      }
       return;
     }
     if (!trimmedValue) return;
@@ -13156,6 +13139,10 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
           void onConfirm("cancel" /* Cancel */);
           return;
         }
+        if (key.name === "return") {
+          handleCustomInputSubmit();
+          return;
+        }
         return;
       }
       const input = key.sequence;
@@ -13181,8 +13168,8 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
         setSelectedIndex(Math.min(totalOptions - 1, selectedIndex + 1));
         return;
       }
-      const numKey = parseInt(input || "", 10);
-      if (!isNaN(numKey) && numKey >= 1 && numKey <= totalOptions) {
+      const numKey = input && /^[1-9]\d*$/.test(input) ? Number(input) : NaN;
+      if (Number.isSafeInteger(numKey) && numKey <= totalOptions) {
         const targetIndex = numKey - 1;
         setSelectedIndex(targetIndex);
         if (!isMultiSelect && !isSubmitTab && currentQuestion && targetIndex < currentQuestion.options.length) {
@@ -13369,7 +13356,11 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
               value: currentCustomInputValue,
               initialCursorOffset: currentCustomInputValue.length,
               onChange: (value) => {
-                const oldValue = customInputValues[currentQuestionIndex] ?? "";
+                const oldValue = customInputValuesRef.current[currentQuestionIndex] ?? customInputValues[currentQuestionIndex] ?? "";
+                customInputValuesRef.current = {
+                  ...customInputValuesRef.current,
+                  [currentQuestionIndex]: value
+                };
                 if (isMultiSelect && value !== oldValue) {
                   setCustomInputChecked((prevChecked) => ({
                     ...prevChecked,
@@ -13433,9 +13424,9 @@ var ToolConfirmationMessage = /* @__PURE__ */ __name(({
   const { onConfirm } = confirmationDetails;
   const settings = useSettings();
   const preferredEditor = settings.merged.general?.preferredEditor;
-  const [ideClient, setIdeClient] = (0, import_react18.useState)(null);
-  const [isDiffingEnabled, setIsDiffingEnabled] = (0, import_react18.useState)(false);
-  (0, import_react18.useEffect)(() => {
+  const [ideClient, setIdeClient] = (0, import_react16.useState)(null);
+  const [isDiffingEnabled, setIsDiffingEnabled] = (0, import_react16.useState)(false);
+  (0, import_react16.useEffect)(() => {
     let isMounted = true;
     if (config.getIdeMode()) {
       const getIdeClient = /* @__PURE__ */ __name(async () => {
@@ -13820,7 +13811,7 @@ var PlanSummaryDisplay = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/ShellInputPrompt.tsx
 init_esbuild_shims();
-var import_react19 = __toESM(require_react(), 1);
+var import_react17 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/keyToAnsi.ts
 init_esbuild_shims();
@@ -13883,7 +13874,7 @@ var ShellInputPrompt = /* @__PURE__ */ __name(({
   activeShellPtyId,
   focus = true
 }) => {
-  const handleShellInputSubmit = (0, import_react19.useCallback)(
+  const handleShellInputSubmit = (0, import_react17.useCallback)(
     (input) => {
       if (activeShellPtyId) {
         ShellExecutionService.writeToPty(activeShellPtyId, input);
@@ -13891,7 +13882,7 @@ var ShellInputPrompt = /* @__PURE__ */ __name(({
     },
     [activeShellPtyId]
   );
-  const handleInput = (0, import_react19.useCallback)(
+  const handleInput = (0, import_react17.useCallback)(
     (key) => {
       if (!focus || !activeShellPtyId) {
         return;
@@ -13926,16 +13917,16 @@ init_esbuild_shims();
 
 // packages/cli/src/ui/components/GeminiRespondingSpinner.tsx
 init_esbuild_shims();
-var import_react22 = __toESM(require_react(), 1);
+var import_react20 = __toESM(require_react(), 1);
 
 // node_modules/ink-spinner/build/index.js
 init_esbuild_shims();
-var import_react20 = __toESM(require_react(), 1);
+var import_react18 = __toESM(require_react(), 1);
 var import_cli_spinners = __toESM(require_cli_spinners(), 1);
 function Spinner({ type = "dots" }) {
-  const [frame, setFrame] = (0, import_react20.useState)(0);
+  const [frame, setFrame] = (0, import_react18.useState)(0);
   const spinner = import_cli_spinners.default[type];
-  (0, import_react20.useEffect)(() => {
+  (0, import_react18.useEffect)(() => {
     const timer = setInterval(() => {
       setFrame((previousFrame) => {
         const isLastFrame = previousFrame === spinner.frames.length - 1;
@@ -13946,19 +13937,19 @@ function Spinner({ type = "dots" }) {
       clearInterval(timer);
     };
   }, [spinner]);
-  return import_react20.default.createElement(Text, null, spinner.frames[frame]);
+  return import_react18.default.createElement(Text, null, spinner.frames[frame]);
 }
 __name(Spinner, "Spinner");
 var build_default = Spinner;
 
 // packages/cli/src/ui/contexts/StreamingContext.tsx
 init_esbuild_shims();
-var import_react21 = __toESM(require_react(), 1);
-var StreamingContext = (0, import_react21.createContext)(
+var import_react19 = __toESM(require_react(), 1);
+var StreamingContext = (0, import_react19.createContext)(
   void 0
 );
 var useStreamingContext = /* @__PURE__ */ __name(() => {
-  const context = import_react21.default.useContext(StreamingContext);
+  const context = import_react19.default.useContext(StreamingContext);
   if (context === void 0) {
     throw new Error(
       "useStreamingContext must be used within a StreamingContextProvider"
@@ -13993,8 +13984,8 @@ var GeminiSpinner = /* @__PURE__ */ __name(({
 }) => {
   const isScreenReaderEnabled = use_is_screen_reader_enabled_default();
   const isTmux = Boolean(process.env["TMUX"]);
-  const [tmuxFrameIndex, setTmuxFrameIndex] = (0, import_react22.useState)(0);
-  (0, import_react22.useEffect)(() => {
+  const [tmuxFrameIndex, setTmuxFrameIndex] = (0, import_react20.useState)(0);
+  (0, import_react20.useEffect)(() => {
     if (isScreenReaderEnabled || !isTmux) {
       return;
     }
@@ -14014,7 +14005,7 @@ var GeminiSpinner = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/shared/ToolStatusIndicator.tsx
 var import_jsx_runtime18 = __toESM(require_jsx_runtime(), 1);
-var STATUS_INDICATOR_WIDTH = 3;
+var STATUS_INDICATOR_WIDTH = 2;
 var ToolStatusIndicator = /* @__PURE__ */ __name(({
   status,
   name
@@ -14039,15 +14030,15 @@ var ToolStatusIndicator = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/shared/ToolElapsedTime.tsx
 init_esbuild_shims();
-var import_react23 = __toESM(require_react(), 1);
+var import_react21 = __toESM(require_react(), 1);
 var import_jsx_runtime19 = __toESM(require_jsx_runtime(), 1);
 var ToolElapsedTime = /* @__PURE__ */ __name(({
   status,
   executionStartTime,
   timeoutMs
 }) => {
-  const [elapsedSeconds, setElapsedSeconds] = (0, import_react23.useState)(0);
-  (0, import_react23.useEffect)(() => {
+  const [elapsedSeconds, setElapsedSeconds] = (0, import_react21.useState)(0);
+  (0, import_react21.useEffect)(() => {
     if (status !== "Executing" /* Executing */ || !executionStartTime) {
       setElapsedSeconds(0);
       return;
@@ -14291,7 +14282,7 @@ function sliceTextForMaxHeight(text, maxHeight, maxWidth) {
   };
 }
 __name(sliceTextForMaxHeight, "sliceTextForMaxHeight");
-var useResultDisplayRenderer = /* @__PURE__ */ __name((resultDisplay) => import_react24.default.useMemo(() => {
+var useResultDisplayRenderer = /* @__PURE__ */ __name((resultDisplay) => import_react22.default.useMemo(() => {
   if (!resultDisplay) {
     return { type: "none" };
   }
@@ -14325,7 +14316,7 @@ var useResultDisplayRenderer = /* @__PURE__ */ __name((resultDisplay) => import_
     const totalStr = progress.total != null ? `/${progress.total}` : "";
     return {
       type: "string",
-      data: `\u23F3 [${progress.progress}${totalStr}] ${msg}`
+      data: `\u25CC [${progress.progress}${totalStr}] ${msg}`
     };
   }
   if (typeof resultDisplay === "object" && resultDisplay !== null && "ansiOutput" in resultDisplay) {
@@ -14384,7 +14375,7 @@ var SubagentExecutionRenderer = /* @__PURE__ */ __name(({ data, availableHeight,
     const agentLabel = escapeAnsiCtrlCodes(data.subagentName || "agent");
     return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Box_default, { paddingLeft: 1, children: [
       /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Text, { color: theme.text.secondary, dimColor: true, children: [
-        "\u23F3 Queued approval:",
+        "\u25CC Queued approval:",
         " "
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { dimColor: true, children: agentLabel })
@@ -14420,8 +14411,8 @@ var SubagentScrollbackSummary = /* @__PURE__ */ __name(({ data }) => {
       formatDuration(stats.totalDurationMs, { hideTrailingZeros: true })
     );
   }
-  if (stats?.totalTokens && stats.totalTokens > 0) {
-    parts.push(`${formatTokenCount(stats.totalTokens)} tokens`);
+  if (stats?.outputTokens && stats.outputTokens > 0) {
+    parts.push(`${formatTokenCount(stats.outputTokens)} tokens`);
   }
   const tail = parts.length > 0 ? ` \xB7 ${parts.join(" \xB7 ")}` : "";
   const typePrefix = data.subagentName ? `${escapeAnsiCtrlCodes(data.subagentName)}: ` : "";
@@ -14505,21 +14496,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_react22.default.useState(null);
+  const [userHasFocused, setUserHasFocused] = import_react22.default.useState(false);
+  const [showFocusHint, setShowFocusHint] = import_react22.default.useState(false);
+  import_react22.default.useEffect(() => {
     if (resultDisplay) {
       setLastUpdateTime(/* @__PURE__ */ new Date());
     }
   }, [resultDisplay]);
-  const shellTimeoutMs = import_react24.default.useMemo(() => {
+  const shellTimeoutMs = import_react22.default.useMemo(() => {
     if (typeof resultDisplay === "object" && resultDisplay !== null && "ansiOutput" in resultDisplay) {
       return resultDisplay.timeoutMs;
     }
     return void 0;
   }, [resultDisplay]);
-  import_react24.default.useEffect(() => {
+  import_react22.default.useEffect(() => {
     if (!lastUpdateTime) {
       return;
     }
@@ -14528,7 +14519,7 @@ var ToolMessage = /* @__PURE__ */ __name(({
     }, 5e3);
     return () => clearTimeout(timer);
   }, [lastUpdateTime]);
-  import_react24.default.useEffect(() => {
+  import_react22.default.useEffect(() => {
     if (isThisShellFocused) {
       setUserHasFocused(true);
     }
@@ -14647,7 +14638,7 @@ var ToolInfo = /* @__PURE__ */ __name(({
   status,
   emphasis
 }) => {
-  const nameColor = import_react24.default.useMemo(() => {
+  const nameColor = import_react22.default.useMemo(() => {
     switch (emphasis) {
       case "high":
         return theme.text.primary;
@@ -14674,7 +14665,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_react23 = __toESM(require_react(), 1);
 var import_jsx_runtime22 = __toESM(require_jsx_runtime(), 1);
 function deriveAgentId(toolCall, resultDisplay) {
   return `${resultDisplay.subagentName}-${toolCall.callId}`;
@@ -14740,9 +14731,9 @@ function truncateMiddle(input, max) {
   return `${input.slice(0, head)}\u2026${input.slice(input.length - tail)}`;
 }
 __name(truncateMiddle, "truncateMiddle");
-var InlineParallelAgentsDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWidth, totalAgentCount }) => {
-  const config = (0, import_react25.useContext)(ConfigContext);
-  const agentEntries = (0, import_react25.useMemo)(() => {
+var InlineParallelAgentsDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWidth, totalAgentCount, availableTerminalHeight }) => {
+  const config = (0, import_react23.useContext)(ConfigContext);
+  const agentEntries = (0, import_react23.useMemo)(() => {
     const out = [];
     for (const tc of toolCalls) {
       if (isAgentResult(tc.resultDisplay)) {
@@ -14751,19 +14742,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_react23.useState)(() => Date.now());
+  const hasLiveAgent = (0, import_react23.useMemo)(
     () => agentEntries.some(
       (e) => e.result.status === "running" || e.result.status === "background"
     ),
     [agentEntries]
   );
-  (0, import_react25.useEffect)(() => {
+  (0, import_react23.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_react23.useMemo)(() => {
     const registry = config?.getBackgroundTaskRegistry();
     void now;
     return agentEntries.map(({ toolCall, result }) => {
@@ -14779,7 +14770,7 @@ var InlineParallelAgentsDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWi
         endTime: live?.endTime,
         fallbackElapsedMs: result.executionSummary?.totalDurationMs,
         recentActivity: recent ? { name: recent.name, description: recent.description } : void 0,
-        tokenCount: result.tokenCount ?? live?.stats?.totalTokens ?? result.executionSummary?.totalTokens
+        tokenCount: result.tokenCount ?? live?.stats?.outputTokens ?? result.executionSummary?.outputTokens
       };
     });
   }, [agentEntries, config, now]);
@@ -14789,9 +14780,27 @@ var InlineParallelAgentsDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWi
   ).length;
   const total = totalAgentCount ?? rows.length;
   const headerLabel = `Parallel agents \xB7 ${total} \xB7 ${doneCount}/${total} done`;
+  const hasBudget = availableTerminalHeight != null && availableTerminalHeight > 0;
+  let overflowCount = 0;
+  let visibleRows = rows;
+  if (hasBudget && rows.length + 1 > availableTerminalHeight) {
+    if (availableTerminalHeight >= 2) {
+      const rowsFit = availableTerminalHeight - 2;
+      overflowCount = rows.length - rowsFit;
+      visibleRows = rowsFit > 0 ? rows.slice(rows.length - rowsFit) : [];
+    } else {
+      visibleRows = [];
+    }
+  }
   return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(Box_default, { flexDirection: "column", width: contentWidth, paddingX: 1, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { bold: true, color: theme.text.accent, children: headerLabel }) }),
-    rows.map((row) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(AgentRow, { row, now }, row.agentId))
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { bold: true, color: theme.text.accent, wrap: "truncate-end", children: headerLabel }) }),
+    overflowCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(Text, { color: theme.text.secondary, wrap: "truncate-end", children: [
+      "\u2026 +",
+      overflowCount,
+      " more ",
+      overflowCount === 1 ? "agent" : "agents"
+    ] }) }),
+    visibleRows.map((row) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(AgentRow, { row, now }, row.agentId))
   ] });
 }, "InlineParallelAgentsDisplay");
 var AgentRow = /* @__PURE__ */ __name(({ row, now }) => {
@@ -14806,10 +14815,10 @@ var AgentRow = /* @__PURE__ */ __name(({ row, now }) => {
   if (tokens) trailingParts.push(`${tokens} tok`);
   const trailing = trailingParts.join(" \xB7 ");
   return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(Box_default, { flexDirection: "row", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { flexShrink: 0, marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { color, children: glyph }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { flexShrink: 0, marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { color, wrap: "truncate-end", children: glyph }) }),
     /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { flexShrink: 0, marginRight: 1, width: NAME_COL_WIDTH, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { wrap: "truncate-end", children: displayName }) }),
     /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { flexShrink: 1, flexGrow: 1, marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { color: theme.text.secondary, wrap: "truncate-end", children: activity }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { color: theme.text.secondary, children: trailing }) })
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { color: theme.text.secondary, wrap: "truncate-end", children: trailing }) })
   ] });
 }, "AgentRow");
 
@@ -14864,27 +14873,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_react24.useMemo)(
     () => toolCalls.find((tc) => tc.status === "Confirming" /* Confirming */),
     [toolCalls]
   );
-  const isMemoryOnlyGroup = (0, import_react26.useMemo)(
+  const isMemoryOnlyGroup = (0, import_react24.useMemo)(
     () => toolCalls.length > 0 && toolCalls.every((t2) => t2.isMemoryOp != null),
     [toolCalls]
   );
-  const inlineToolCalls = (0, import_react26.useMemo)(
+  const inlineToolCalls = (0, import_react24.useMemo)(
     () => isPending ? toolCalls.filter(
       (tool) => !isPanelOwnedSubagentTool(tool) || isAgentWithPendingConfirmation(tool.resultDisplay)
     ) : toolCalls,
     [isPending, toolCalls]
   );
-  const subagentsAwaitingApproval = (0, import_react26.useMemo)(
+  const subagentsAwaitingApproval = (0, import_react24.useMemo)(
     () => toolCalls.filter(
       (tc) => isAgentWithPendingConfirmation(tc.resultDisplay)
     ),
     [toolCalls]
   );
-  const focusedSubagentRef = (0, import_react26.useRef)(null);
+  const focusedSubagentRef = (0, import_react24.useRef)(null);
   const stillPending = subagentsAwaitingApproval.some(
     (tc) => tc.callId === focusedSubagentRef.current
   );
@@ -14892,18 +14901,23 @@ var ToolGroupMessage = /* @__PURE__ */ __name(({
     focusedSubagentRef.current = subagentsAwaitingApproval[0]?.callId ?? null;
   }
   const focusedSubagentCallId = focusedSubagentRef.current;
-  const runningSubagentCallId = (0, import_react26.useMemo)(
+  const runningSubagentCallId = (0, import_react24.useMemo)(
     () => toolCalls.find((tc) => isRunningAgent(tc.resultDisplay))?.callId ?? null,
     [toolCalls]
   );
   const keyboardFocusedSubagentCallId = focusedSubagentCallId ?? runningSubagentCallId;
   const hasSubagentPendingConfirmation = subagentsAwaitingApproval.length > 0;
   if (isPureParallelAgentGroup(toolCalls) && !hasSubagentPendingConfirmation) {
+    if (inlineToolCalls.length === 0) {
+      return null;
+    }
     return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
       InlineParallelAgentsDisplay,
       {
-        toolCalls,
-        contentWidth
+        toolCalls: inlineToolCalls,
+        contentWidth,
+        totalAgentCount: toolCalls.length,
+        availableTerminalHeight: isPending ? availableTerminalHeight : void 0
       }
     );
   }
@@ -15063,7 +15077,7 @@ function CompressionMessage({
   }, "getCompressionText");
   const text = getCompressionText();
   return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { flexDirection: "row", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { marginRight: 1, children: isPending ? /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(build_default, { type: "dots" }) : /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.accent, children: "\u2726" }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { marginRight: 1, children: isPending ? /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(build_default, { type: "dots" }) : /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.accent, children: "\u25C6" }) }),
     /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
       Text,
       {
@@ -15122,7 +15136,7 @@ init_esbuild_shims();
 
 // node_modules/ink-link/dist/index.js
 init_esbuild_shims();
-var import_react27 = __toESM(require_react(), 1);
+var import_react25 = __toESM(require_react(), 1);
 var import_prop_types = __toESM(require_prop_types(), 1);
 
 // node_modules/ink-link/node_modules/terminal-link/index.js
@@ -15270,10 +15284,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_react25.default.createElement(
     Transform,
     { transform: /* @__PURE__ */ __name((children2) => terminalLink(children2, url, { fallback }), "transform") },
-    import_react27.default.createElement(Text, null, children)
+    import_react25.default.createElement(Text, null, children)
   )
 ), "Link");
 Link.propTypes = {
@@ -15374,7 +15388,7 @@ var VisionNoticeMessage = /* @__PURE__ */ __name(({ text }) => /* @__PURE__ */ (
   StatusMessage,
   {
     text,
-    prefix: "\u{1F50E}",
+    prefix: "\u25CE",
     prefixColor: theme.text.secondary,
     textColor: theme.text.secondary
   }
@@ -15427,7 +15441,7 @@ init_esbuild_shims();
 
 // node_modules/ink-gradient/dist/index.js
 init_esbuild_shims();
-var import_react28 = __toESM(require_react(), 1);
+var import_react26 = __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) => {
@@ -15443,7 +15457,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_react26.default.createElement(Transform, { transform: applyGradient }, props.children);
 }, "Gradient");
 Gradient.propTypes = {
   children: import_prop_types2.default.oneOfType([
@@ -16243,7 +16257,7 @@ var SessionSummaryDisplay = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/Help.tsx
 init_esbuild_shims();
-var import_react29 = __toESM(require_react(), 1);
+var import_react27 = __toESM(require_react(), 1);
 var import_jsx_runtime33 = __toESM(require_jsx_runtime(), 1);
 var DEFAULT_WIDTH = 100;
 var KEY_COL_WIDTH = 20;
@@ -16264,7 +16278,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_react27.useCallback)(
     (direction) => {
       const currentIndex = TAB_DEFS.findIndex((tab) => tab.tab === activeTab);
       const nextIndex = (currentIndex + direction + TAB_DEFS.length) % TAB_DEFS.length;
@@ -16401,20 +16415,20 @@ var ShortcutRow = /* @__PURE__ */ __name(({ shortcutKey, desc, width }) => /* @_
   /* @__PURE__ */ (0, import_jsx_runtime33.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_react27.useMemo)(
     () => groupCommands(commands, customOnly),
     [commands, customOnly]
   );
-  const lines = (0, import_react29.useMemo)(
+  const lines = (0, import_react27.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_react27.useState)(0);
+  (0, import_react27.useEffect)(() => {
     setScrollOffset(0);
   }, [customOnly, commands]);
-  (0, import_react29.useEffect)(() => {
+  (0, import_react27.useEffect)(() => {
     setScrollOffset((offset) => Math.min(offset, maxScroll));
   }, [maxScroll]);
   useKeypress(
@@ -16602,26 +16616,26 @@ init_esbuild_shims();
 
 // packages/cli/src/ui/contexts/UIStateContext.tsx
 init_esbuild_shims();
-var import_react36 = __toESM(require_react(), 1);
+var import_react34 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/useHistoryManager.ts
 init_esbuild_shims();
-var import_react30 = __toESM(require_react(), 1);
+var import_react28 = __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_react28.useState)([]);
+  const messageIdCounterRef = (0, import_react28.useRef)(0);
+  const getNextMessageId = (0, import_react28.useCallback)((baseTimestamp) => {
     messageIdCounterRef.current += 1;
     return baseTimestamp + messageIdCounterRef.current;
   }, []);
-  const loadHistory = (0, import_react30.useCallback)((newHistory) => {
+  const loadHistory = (0, import_react28.useCallback)((newHistory) => {
     setHistory(newHistory);
   }, []);
-  const addItem = (0, import_react30.useCallback)(
+  const addItem = (0, import_react28.useCallback)(
     (itemData, baseTimestamp) => {
       const id = getNextMessageId(baseTimestamp);
       const newItem = { ...itemData, id };
@@ -16645,7 +16659,7 @@ function useHistory() {
     },
     [getNextMessageId]
   );
-  const updateItem = (0, import_react30.useCallback)(
+  const updateItem = (0, import_react28.useCallback)(
     (id, updates) => {
       setHistory((prevHistory) => {
         let updated = false;
@@ -16668,7 +16682,7 @@ function useHistory() {
     },
     []
   );
-  const clearItems = (0, import_react30.useCallback)(() => {
+  const clearItems = (0, import_react28.useCallback)(() => {
     if (debugLogger6.isEnabled()) {
       debugLogger6.debug(
         `[CLEAR_HISTORY] Clearing history, memory before=${(process2.memoryUsage().heapUsed / 1024 / 1024).toFixed(1)}MB`
@@ -16677,13 +16691,13 @@ function useHistory() {
     setHistory([]);
     messageIdCounterRef.current = 0;
   }, []);
-  const truncateToItem = (0, import_react30.useCallback)((itemId) => {
+  const truncateToItem = (0, import_react28.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_react28.useCallback)(() => {
     setHistory((prev) => {
       if (prev.length === 0) return prev;
       let thoughtRemoved = 0;
@@ -16747,7 +16761,7 @@ function useHistory() {
       return thoughtRemoved > 0 || toolGroupsCompacted > 0 ? next : prev;
     });
   }, []);
-  return (0, import_react30.useMemo)(
+  return (0, import_react28.useMemo)(
     () => ({
       history,
       addItem,
@@ -16772,7 +16786,7 @@ __name(useHistory, "useHistory");
 
 // packages/cli/src/ui/contexts/UIActionsContext.tsx
 init_esbuild_shims();
-var import_react33 = __toESM(require_react(), 1);
+var import_react31 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/IdeIntegrationNudge.tsx
 init_esbuild_shims();
@@ -16894,7 +16908,7 @@ function CommandFormatMigrationNudge({
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(Box_default, { marginBottom: 1, flexDirection: "column", children: [
           /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(Text, { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { color: theme.status.warning, children: "\u26A0\uFE0F  " }),
+            /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { color: theme.status.warning, children: "\u26A0  " }),
             /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { bold: true, children: t("Command Format Migration") })
           ] }),
           /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { color: theme.text.secondary, children: count > 1 ? t("Found {{count}} TOML command files:", { count: String(count) }) : t("Found {{count}} TOML command file:", { count: String(count) }) }),
@@ -16914,7 +16928,7 @@ __name(CommandFormatMigrationNudge, "CommandFormatMigrationNudge");
 
 // packages/cli/src/ui/components/FolderTrustDialog.tsx
 init_esbuild_shims();
-var import_react31 = __toESM(require_react(), 1);
+var import_react29 = __toESM(require_react(), 1);
 import * as process3 from "node:process";
 import * as path2 from "node:path";
 var import_jsx_runtime36 = __toESM(require_jsx_runtime(), 1);
@@ -16922,7 +16936,7 @@ var FolderTrustDialog = /* @__PURE__ */ __name(({
   onSelect,
   isRestarting
 }) => {
-  (0, import_react31.useEffect)(() => {
+  (0, import_react29.useEffect)(() => {
     const doRelaunch = /* @__PURE__ */ __name(async () => {
       if (isRestarting) {
         setTimeout(async () => {
@@ -17050,16 +17064,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_react30 = __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_react30.useState)(null);
+  const openArenaDialog = (0, import_react30.useCallback)(
     (type) => {
       setActiveArenaDialog(type);
     },
     []
   );
-  const closeArenaDialog = (0, import_react32.useCallback)(() => {
+  const closeArenaDialog = (0, import_react30.useCallback)(() => {
     setActiveArenaDialog(null);
   }, []);
   return {
@@ -17071,9 +17085,9 @@ function useArenaCommand() {
 __name(useArenaCommand, "useArenaCommand");
 
 // packages/cli/src/ui/contexts/UIActionsContext.tsx
-var UIActionsContext = (0, import_react33.createContext)(null);
+var UIActionsContext = (0, import_react31.createContext)(null);
 var useUIActions = /* @__PURE__ */ __name(() => {
-  const context = (0, import_react33.useContext)(UIActionsContext);
+  const context = (0, import_react31.useContext)(UIActionsContext);
   if (!context) {
     throw new Error("useUIActions must be used within a UIActionsProvider");
   }
@@ -17082,16 +17096,16 @@ var useUIActions = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useIdeTrustListener.ts
 init_esbuild_shims();
-var import_react34 = __toESM(require_react(), 1);
+var import_react32 = __toESM(require_react(), 1);
 function useIdeTrustListener() {
   const settings = useSettings();
-  const [connectionStatus, setConnectionStatus] = (0, import_react34.useState)(
+  const [connectionStatus, setConnectionStatus] = (0, import_react32.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 subscribe = (0, import_react34.useCallback)((onStoreChange) => {
+  const previousTrust = (0, import_react32.useRef)(void 0);
+  const [restartReason, setRestartReason] = (0, import_react32.useState)("NONE");
+  const [needsRestart, setNeedsRestart] = (0, import_react32.useState)(false);
+  const subscribe = (0, import_react32.useCallback)((onStoreChange) => {
     const handleStatusChange = /* @__PURE__ */ __name((state) => {
       setConnectionStatus(state.status);
       setRestartReason("CONNECTION_CHANGE");
@@ -17121,8 +17135,8 @@ function useIdeTrustListener() {
     }
     return ideContextStore.get()?.workspaceState?.isTrusted;
   }, "getSnapshot");
-  const isIdeTrusted = (0, import_react34.useSyncExternalStore)(subscribe, getSnapshot);
-  (0, import_react34.useEffect)(() => {
+  const isIdeTrusted = (0, import_react32.useSyncExternalStore)(subscribe, getSnapshot);
+  (0, import_react32.useEffect)(() => {
     const currentTrust = isWorkspaceTrusted(settings.merged).isTrusted;
     if (previousTrust.current !== void 0 && previousTrust.current !== currentTrust) {
       setNeedsRestart(true);
@@ -17135,7 +17149,7 @@ __name(useIdeTrustListener, "useIdeTrustListener");
 
 // packages/cli/src/ui/hooks/useProviderUpdates.ts
 init_esbuild_shims();
-var import_react35 = __toESM(require_react(), 1);
+var import_react33 = __toESM(require_react(), 1);
 function getProviderMetadata(settings, metadataKey) {
   const mergedSettings = settings.merged;
   const ns = mergedSettings[PROVIDER_METADATA_NS];
@@ -17234,9 +17248,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_react33.useState)();
+  const migrated = (0, import_react33.useRef)(false);
+  const executeUpdate = (0, import_react33.useCallback)(
     async (providerCfg, baseUrl) => {
       try {
         const resolved = resolveBaseUrl(providerCfg, baseUrl);
@@ -17316,7 +17330,7 @@ function useProviderUpdates(settings, config, addItem) {
     },
     [settings, config, addItem]
   );
-  const checkForUpdates = (0, import_react35.useCallback)(() => {
+  const checkForUpdates = (0, import_react33.useCallback)(() => {
     if (!migrated.current) {
       migrated.current = true;
       migrateProviderMetadata(settings);
@@ -17349,10 +17363,10 @@ function useProviderUpdates(settings, config, addItem) {
       }, "onConfirm")
     });
   }, [settings, config, executeUpdate]);
-  (0, import_react35.useEffect)(() => {
+  (0, import_react33.useEffect)(() => {
     checkForUpdates();
   }, [checkForUpdates]);
-  const dismissProviderUpdate = (0, import_react35.useCallback)(() => {
+  const dismissProviderUpdate = (0, import_react33.useCallback)(() => {
     setUpdateRequest(void 0);
   }, []);
   return {
@@ -17363,9 +17377,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_react34.createContext)(null);
 var useUIState = /* @__PURE__ */ __name(() => {
-  const context = (0, import_react36.useContext)(UIStateContext);
+  const context = (0, import_react34.useContext)(UIStateContext);
   if (!context) {
     throw new Error("useUIState must be used within a UIStateProvider");
   }
@@ -17482,6 +17496,12 @@ var ExtensionsList = /* @__PURE__ */ __name(() => {
 // packages/cli/src/ui/components/views/SkillsList.tsx
 init_esbuild_shims();
 var import_jsx_runtime39 = __toESM(require_jsx_runtime(), 1);
+var NAME_COLUMN = 24;
+function truncate(text, max) {
+  if (text.length <= max) return text;
+  return `${text.slice(0, Math.max(0, max - 1))}\u2026`;
+}
+__name(truncate, "truncate");
 var SkillsList = /* @__PURE__ */ __name(({ skills }) => /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
   /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Available skills:") }),
   /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Box_default, { height: 1 }),
@@ -17490,7 +17510,17 @@ var SkillsList = /* @__PURE__ */ __name(({ skills }) => /* @__PURE__ */ (0, impo
       "  ",
       "- "
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Text, { bold: true, color: theme.text.accent, children: skill.name })
+    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Text, { bold: true, color: theme.text.accent, children: skill.description ? truncate(skill.name, NAME_COLUMN).padEnd(NAME_COLUMN) : skill.name }),
+    skill.description && /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Text, { color: theme.text.secondary, children: [
+      " ",
+      truncate(skill.description, 80)
+    ] }),
+    skill.level && /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Text, { color: theme.text.secondary, children: [
+      "  ",
+      "(",
+      levelLabel(skill.level),
+      ")"
+    ] })
   ] }, skill.name)) : /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Text, { color: theme.text.primary, children: [
     " ",
     t("No skills available")
@@ -17554,7 +17584,7 @@ var McpStatus = /* @__PURE__ */ __name(({
   }
   return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", children: [
     discoveryInProgress && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.status.warning, children: t("\u23F3 MCP servers are starting up ({{count}} initializing)...", {
+      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.status.warning, children: t("\u25CC MCP servers are starting up ({{count}} initializing)...", {
         count: String(connectingServers.length)
       }) }),
       /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.primary, children: t(
@@ -17579,18 +17609,18 @@ var McpStatus = /* @__PURE__ */ __name(({
       let statusColor = theme.text.primary;
       switch (status) {
         case "connected" /* CONNECTED */:
-          statusIndicator = "\u{1F7E2}";
+          statusIndicator = "\u25CF";
           statusText = t("Ready");
           statusColor = theme.status.success;
           break;
         case "connecting" /* CONNECTING */:
-          statusIndicator = "\u{1F504}";
+          statusIndicator = "\u25D0";
           statusText = t("Starting... (first startup may take longer)");
           statusColor = theme.status.warning;
           break;
         case "disconnected" /* DISCONNECTED */:
         default:
-          statusIndicator = "\u{1F534}";
+          statusIndicator = "\u25CF";
           statusText = t("Disconnected");
           statusColor = theme.status.error;
           break;
@@ -17695,7 +17725,7 @@ var McpStatus = /* @__PURE__ */ __name(({
       ] }, serverName);
     }),
     blockedServers.map((server) => /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { marginBottom: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.status.error, children: "\u{1F534} " }),
+      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.status.error, children: "\u25CF " }),
       /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { bold: true, children: [
         server.name,
         server.extensionName ? ` ${t("(from {{extensionName}})", {
@@ -17708,7 +17738,7 @@ var McpStatus = /* @__PURE__ */ __name(({
       ] })
     ] }, server.name)),
     showTips && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.accent, children: t("\u{1F4A1} Tips:") }),
+      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.accent, children: t("\u2605 Tips:") }),
       /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { children: [
         "  ",
         "- ",
@@ -18474,7 +18504,7 @@ var ArenaSessionCard = /* @__PURE__ */ __name(({
                 " "
               ] }),
               /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.primary, children: [
-                agent.totalTokens.toLocaleString(),
+                agent.outputTokens.toLocaleString(),
                 " tokens \xB7 runtime",
                 " ",
                 formatDuration(agent.durationMs)
@@ -18540,7 +18570,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_react35 = __toESM(require_react(), 1);
 var import_jsx_runtime46 = __toESM(require_jsx_runtime(), 1);
 var BTW_SELF_CHROME = 4;
 function normalizeCodeFences(text) {
@@ -18588,7 +18618,7 @@ var BtwMessageInternal = /* @__PURE__ */ __name(({
     }
   );
 }, "BtwMessageInternal");
-var BtwMessage = import_react37.default.memo(BtwMessageInternal);
+var BtwMessage = import_react35.default.memo(BtwMessageInternal);
 
 // packages/cli/src/ui/components/messages/MemorySavedMessage.tsx
 init_esbuild_shims();
@@ -18707,7 +18737,7 @@ __name(padRight, "padRight");
 
 // packages/cli/src/ui/components/messages/GoalStatusMessage.tsx
 init_esbuild_shims();
-var import_react38 = __toESM(require_react(), 1);
+var import_react36 = __toESM(require_react(), 1);
 var import_jsx_runtime49 = __toESM(require_jsx_runtime(), 1);
 var pluralTurns = /* @__PURE__ */ __name((n) => n === 1 ? "turn" : "turns", "pluralTurns");
 function assertNeverGoalStatusKind(kind) {
@@ -18808,112 +18838,25 @@ var GoalStatusMessageInternal = /* @__PURE__ */ __name(({
     ] })
   ] });
 }, "GoalStatusMessageInternal");
-var GoalStatusMessage = import_react38.default.memo(GoalStatusMessageInternal);
+var GoalStatusMessage = import_react36.default.memo(GoalStatusMessageInternal);
 
 // packages/cli/src/ui/contexts/ThoughtExpandedContext.tsx
 init_esbuild_shims();
-var import_react39 = __toESM(require_react(), 1);
-var ThoughtExpandedContext = (0, import_react39.createContext)(false);
-var useThoughtExpanded = /* @__PURE__ */ __name(() => (0, import_react39.useContext)(ThoughtExpandedContext), "useThoughtExpanded");
+var import_react37 = __toESM(require_react(), 1);
+var ThoughtExpandedContext = (0, import_react37.createContext)(false);
+var useThoughtExpanded = /* @__PURE__ */ __name(() => (0, import_react37.useContext)(ThoughtExpandedContext), "useThoughtExpanded");
 var ThoughtExpandedProvider = ThoughtExpandedContext.Provider;
 
 // packages/cli/src/ui/contexts/ThinkingViewerContext.tsx
 init_esbuild_shims();
-var import_react40 = __toESM(require_react(), 1);
-var ThinkingViewerContext = (0, import_react40.createContext)({
+var import_react38 = __toESM(require_react(), 1);
+var ThinkingViewerContext = (0, import_react38.createContext)({
   openThinkingViewer: /* @__PURE__ */ __name(() => {
   }, "openThinkingViewer")
 });
-var useThinkingViewer = /* @__PURE__ */ __name(() => (0, import_react40.useContext)(ThinkingViewerContext), "useThinkingViewer");
+var useThinkingViewer = /* @__PURE__ */ __name(() => (0, import_react38.useContext)(ThinkingViewerContext), "useThinkingViewer");
 var ThinkingViewerProvider = ThinkingViewerContext.Provider;
 
-// packages/cli/src/ui/hooks/useMouseEvents.ts
-init_esbuild_shims();
-var import_react41 = __toESM(require_react(), 1);
-var mouseModeRefs = /* @__PURE__ */ new Map();
-var disableAllMouseModes = /* @__PURE__ */ __name(() => {
-  for (const stdout of mouseModeRefs.keys()) {
-    disableMouseEvents(stdout);
-  }
-  mouseModeRefs.clear();
-}, "disableAllMouseModes");
-function acquireMouseMode(stdout) {
-  const entry = mouseModeRefs.get(stdout);
-  if (entry) {
-    entry.refs += 1;
-    return;
-  }
-  enableMouseEvents(stdout);
-  if (mouseModeRefs.size === 0) {
-    process.on("exit", disableAllMouseModes);
-  }
-  mouseModeRefs.set(stdout, { refs: 1 });
-}
-__name(acquireMouseMode, "acquireMouseMode");
-function releaseMouseMode(stdout) {
-  const entry = mouseModeRefs.get(stdout);
-  if (!entry) return;
-  entry.refs -= 1;
-  if (entry.refs <= 0) {
-    mouseModeRefs.delete(stdout);
-    disableMouseEvents(stdout);
-    if (mouseModeRefs.size === 0) {
-      process.removeListener("exit", disableAllMouseModes);
-    }
-  }
-}
-__name(releaseMouseMode, "releaseMouseMode");
-function useMouseEvents(handler, { isActive }) {
-  const { isRawModeSupported } = use_stdin_default();
-  const { stdout } = use_stdout_default();
-  const { subscribeMouse, unsubscribeMouse } = useKeypressContext();
-  const handlerRef = (0, import_react41.useRef)(handler);
-  handlerRef.current = handler;
-  const enabled = isActive && isRawModeSupported;
-  (0, import_react41.useEffect)(() => {
-    if (!enabled) return;
-    acquireMouseMode(stdout);
-    return () => {
-      releaseMouseMode(stdout);
-    };
-  }, [enabled, stdout]);
-  const mouseCallback = (0, import_react41.useCallback)((event) => {
-    handlerRef.current(event);
-  }, []);
-  (0, import_react41.useEffect)(() => {
-    if (!enabled) return;
-    subscribeMouse(mouseCallback);
-    return () => unsubscribeMouse(mouseCallback);
-  }, [enabled, subscribeMouse, unsubscribeMouse, mouseCallback]);
-}
-__name(useMouseEvents, "useMouseEvents");
-
-// packages/cli/src/ui/utils/measure-element-position.ts
-init_esbuild_shims();
-function measureElementPosition(node) {
-  const { yogaNode } = node;
-  if (!yogaNode) {
-    return { x: 0, y: 0, width: 0, height: 0 };
-  }
-  let x = yogaNode.getComputedLeft();
-  let y = yogaNode.getComputedTop();
-  let current = node.parentNode;
-  while (current) {
-    if (current.yogaNode) {
-      x += current.yogaNode.getComputedLeft();
-      y += current.yogaNode.getComputedTop();
-    }
-    current = current.parentNode;
-  }
-  return {
-    x,
-    y,
-    width: yogaNode.getComputedWidth(),
-    height: yogaNode.getComputedHeight()
-  };
-}
-__name(measureElementPosition, "measureElementPosition");
-
 // packages/cli/src/ui/components/HistoryItemDisplay.tsx
 var import_jsx_runtime50 = __toESM(require_jsx_runtime(), 1);
 var ClickableThinkMessage = /* @__PURE__ */ __name(({
@@ -18925,15 +18868,15 @@ var ClickableThinkMessage = /* @__PURE__ */ __name(({
   contentWidth,
   durationMs
 }) => {
-  const ref = (0, import_react42.useRef)(null);
+  const ref = (0, import_react39.useRef)(null);
   const { openThinkingViewer } = useThinkingViewer();
   const isActive = !isPending && !expanded;
-  const sanitizedViewerText = (0, import_react42.useMemo)(
+  const sanitizedViewerText = (0, import_react39.useMemo)(
     () => escapeAnsiCtrlCodes(viewerText),
     [viewerText]
   );
   useMouseEvents(
-    (0, import_react42.useCallback)(
+    (0, import_react39.useCallback)(
       (event) => {
         if (event.name !== "left-press" || !ref.current) return;
         const metrics = measureElementPosition(ref.current);
@@ -19012,7 +18955,7 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
   const resolvedThoughtExpanded = thoughtExpanded ?? contextThoughtExpanded;
   const settings = useSettings();
   const showTimestamps = settings.merged.output?.showTimestamps === true;
-  const itemForDisplay = (0, import_react42.useMemo)(() => escapeAnsiCtrlCodes(item), [item]);
+  const itemForDisplay = (0, import_react39.useMemo)(() => escapeAnsiCtrlCodes(item), [item]);
   const contentWidth = terminalWidth - 4;
   const boxWidth = mainAreaWidth || contentWidth;
   return /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(
@@ -19230,9 +19173,9 @@ function SessionPreview(props) {
     onResume
   } = props;
   const { columns } = useTerminalSize();
-  const [data, setData] = (0, import_react43.useState)(null);
-  const [error, setError] = (0, import_react43.useState)(null);
-  (0, import_react43.useEffect)(() => {
+  const [data, setData] = (0, import_react40.useState)(null);
+  const [error, setError] = (0, import_react40.useState)(null);
+  (0, import_react40.useEffect)(() => {
     let cancelled = false;
     setData(null);
     setError(null);
@@ -19251,11 +19194,11 @@ function SessionPreview(props) {
       cancelled = true;
     };
   }, [sessionService, sessionId]);
-  const items = (0, import_react43.useMemo)(() => {
+  const items = (0, import_react40.useMemo)(() => {
     if (!data) return [];
     return buildResumedHistoryItems(data, null);
   }, [data]);
-  const computedMessageCount = (0, import_react43.useMemo)(() => {
+  const computedMessageCount = (0, import_react40.useMemo)(() => {
     if (!data) return void 0;
     const seen = /* @__PURE__ */ new Set();
     for (const msg of data.conversation.messages) {
@@ -19563,10 +19506,10 @@ __name(SessionPicker, "SessionPicker");
 export {
   ConfigContext,
   useConfig,
-  SettingsContext,
-  useSettings,
   truncateText,
-  useTerminalSize,
+  removeLastGrapheme,
+  isDeletionKey,
+  isPrintableSearchChar,
   loadLowlight,
   colorizeCode,
   sanitizeForOsc,
@@ -19604,6 +19547,7 @@ export {
   GeminiRespondingSpinner,
   GeminiSpinner,
   dist_default,
+  AboutBox,
   dist_default2,
   getRenderableGradientColors,
   Help,
@@ -19624,8 +19568,6 @@ export {
   BtwMessage,
   ThoughtExpandedProvider,
   ThinkingViewerProvider,
-  useMouseEvents,
-  measureElementPosition,
   HistoryItemDisplayComponent,
   SessionPicker
 };
@@ -19654,22 +19596,3 @@ export {
  * Copyright 2025 Qwen Team
  * SPDX-License-Identifier: Apache-2.0
  */
-/**
- * @license
- * Copyright 2025 Qwen
- * SPDX-License-Identifier: Apache-2.0
- *
- * Inspired by gemini-cli's MouseContext (Google LLC, Apache-2.0): enable SGR
- * mouse mode while at least one subscriber is active, parse mouse sequences
- * out of the KeypressContext pipeline, call each handler, restore on cleanup.
- */
-/**
- * @license
- * Copyright 2025 Qwen Team
- * SPDX-License-Identifier: Apache-2.0
- *
- * Shim for ink PR #968 (vadimdemedes/ink#968): extends measureElement()
- * to return {x, y, width, height}. Once the upstream PR is merged and
- * ink is upgraded, replace usages with `measureElement` from 'ink'
- * and delete this file.
- */