@google/gemini-cli 0.65.0-preview.0 → 0.66.0-nightly.20261017.ged96faedf

package/bundle/{interactiveCli-L4PK7YY3.js → interactiveCli-TG7PGV4V.js}

@@ -48,6 +48,7 @@ import {
   Static,
   StreamingContext,
   StyledLine,
+  TMUX_SPINNER_INTERVAL_MS,
   TOOL_SUCCESS_RATE_HIGH,
   TOOL_SUCCESS_RATE_MEDIUM,
   TerminalCapabilityManager,
@@ -122,7 +123,6 @@ import {
   render_default,
   requestConsentInteractive,
   require_jsx_runtime,
-  require_semver,
   safeRepeat,
   saveClipboardImage,
   shouldSwitchTheme,
@@ -171,10 +171,10 @@ import {
   widestLineFromStyledChars,
   wordBreakStyledChars,
   wrapStyledChars
-} from "./chunk-SN7QZKXC.js";
+} from "./chunk-NAPT3FAL.js";
 import {
   require_source
-} from "./chunk-K4G5D5ZZ.js";
+} from "./chunk-RE4V6I3G.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
@@ -227,24 +227,25 @@ import {
   stripAnsi,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-V2R74WAG.js";
+} from "./chunk-NU74STQ5.js";
 import {
   handleAutoUpdate,
   isDevelopment,
   relaunchApp,
+  require_semver,
   setUpdateHandler
-} from "./chunk-BFIV7GTA.js";
+} from "./chunk-HDP6V6JI.js";
 import {
   isTodoList,
   mapCoreStatusToDisplayStatus,
   require_react
-} from "./chunk-QJK54DSE.js";
+} from "./chunk-5VQUE3OF.js";
 import {
   registerCleanup,
   removeCleanup,
   runExitCleanup,
   setupTtyCheck
-} from "./chunk-S7BCRBI4.js";
+} from "./chunk-YP27UYI4.js";
 import {
   ACTIVATE_SKILL_TOOL_NAME,
   AGENT_TOOL_NAME,
@@ -389,6 +390,7 @@ import {
   isRenderedInHistory,
   isStructuredToolResult,
   isSubagentProgress,
+  isTmux,
   isUserVisibleHook,
   isValidEditorType,
   isVisibleInToolGroup,
@@ -431,7 +433,7 @@ import {
   validatePlanContent,
   validatePlanPath,
   writeToStdout
-} from "./chunk-K7NOVQ6G.js";
+} from "./chunk-QCWGLPCO.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-IUUIT4SU.js";
 import "./chunk-L6PII3GR.js";
@@ -3247,11 +3249,11 @@ var require_registry_auth_token = __commonJS({
 });
 
 // packages/cli/src/interactiveCli.tsx
-var import_react120 = __toESM(require_react(), 1);
+var import_react122 = __toESM(require_react(), 1);
 import { basename as basename5 } from "node:path";
 
 // packages/cli/src/ui/AppContainer.tsx
-var import_react119 = __toESM(require_react(), 1);
+var import_react121 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/HistoryItemDisplay.tsx
 var import_react23 = __toESM(require_react(), 1);
@@ -5189,8 +5191,14 @@ var ToolResultDisplay = ({
     isAlternateBuffer,
     maxLinesLimit: maxLines
   });
-  const combinedPaddingAndBorderWidth = 4;
-  const childWidth = terminalWidth - combinedPaddingAndBorderWidth;
+  const totalContainerWidth = terminalWidth || 0;
+  const borderSpace = 4;
+  const scrollbarBuffer = isAlternateBuffer ? 1 : 0;
+  const childWidth = Math.max(0, totalContainerWidth - borderSpace);
+  const safeContentWidth = Math.max(
+    0,
+    totalContainerWidth - borderSpace - scrollbarBuffer
+  );
   const keyExtractor = import_react8.default.useCallback(
     (_, index) => index.toString(),
     []
@@ -5208,13 +5216,13 @@ var ToolResultDisplay = ({
     const formattedJSON = prettyJSON ? JSON.stringify(prettyJSON, null, 2) : null;
     let content;
     if (formattedJSON) {
-      content = /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { wrap: "wrap", color: theme.text.primary, children: formattedJSON });
+      content = /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Box_default, { width: safeContentWidth, flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { wrap: "wrap", color: theme.text.primary, children: formattedJSON }) });
     } else if (isSubagentProgress(contentData)) {
       content = /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
         SubagentProgressDisplay,
         {
           progress: contentData,
-          terminalWidth: childWidth
+          terminalWidth: safeContentWidth
         }
       );
     } else if (typeof contentData === "string" && renderOutputAsMarkdown) {
@@ -5222,26 +5230,26 @@ var ToolResultDisplay = ({
         MarkdownDisplay,
         {
           text: contentData,
-          terminalWidth: childWidth,
+          terminalWidth: safeContentWidth,
           renderMarkdown,
           isPending: false
         }
       );
     } else if (typeof contentData === "string" && !renderOutputAsMarkdown) {
-      content = /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { wrap: "wrap", color: theme.text.primary, children: contentData });
+      content = /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Box_default, { width: safeContentWidth, flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { wrap: "wrap", color: theme.text.primary, children: contentData }) });
     } else if (isStructuredToolResult(contentData)) {
       if (renderOutputAsMarkdown) {
         content = /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
           MarkdownDisplay,
           {
             text: contentData.summary,
-            terminalWidth: childWidth,
+            terminalWidth: safeContentWidth,
             renderMarkdown,
             isPending: false
           }
         );
       } else {
-        content = /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { wrap: "wrap", color: theme.text.primary, children: contentData.summary });
+        content = /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Box_default, { width: safeContentWidth, flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { wrap: "wrap", color: theme.text.primary, children: contentData.summary }) });
       }
     } else if (isFileDiffResult(contentData)) {
       content = /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
@@ -5251,7 +5259,7 @@ var ToolResultDisplay = ({
           filename: contentData.fileName,
           disableTruncation: contentData.isBuildFile && !isLockFile(contentData.fileName),
           availableTerminalHeight: availableHeight,
-          terminalWidth: childWidth
+          terminalWidth: safeContentWidth
         }
       );
     } else if (Array.isArray(contentData)) {
@@ -5261,13 +5269,13 @@ var ToolResultDisplay = ({
         {
           data: contentData,
           availableTerminalHeight: isAlternateBuffer ? void 0 : availableHeight,
-          width: childWidth,
+          width: safeContentWidth,
           maxLines: isAlternateBuffer ? void 0 : maxLines,
           disableTruncation: shouldDisableTruncation
         }
       );
     } else if (typeof contentData === "object" && contentData !== null) {
-      content = /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { wrap: "wrap", color: theme.text.primary, children: JSON.stringify(contentData, null, 2) });
+      content = /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Box_default, { width: safeContentWidth, flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { wrap: "wrap", color: theme.text.primary, children: JSON.stringify(contentData, null, 2) }) });
     } else {
       content = null;
     }
@@ -6756,8 +6764,8 @@ var import_react18 = __toESM(require_react(), 1);
 var import_jsx_runtime25 = __toESM(require_jsx_runtime(), 1);
 var PAYLOAD_MARGIN_LEFT = 6;
 var PAYLOAD_BORDER_CHROME_WIDTH = 4;
-var PAYLOAD_SCROLL_GUTTER = 4;
-var PAYLOAD_MAX_WIDTH = 120 + PAYLOAD_SCROLL_GUTTER;
+var PAYLOAD_SCROLL_GUTTER = 1;
+var PAYLOAD_MAX_WIDTH = 120 + PAYLOAD_BORDER_CHROME_WIDTH;
 var hasPayload = (res) => {
   if (!hasSummary(res)) return false;
   if (!("payload" in res)) return false;
@@ -6874,6 +6882,9 @@ function getGenericSuccessData(resultDisplay, originalDescription) {
   }
   return { description, summary, payload };
 }
+function renderDiffLineItem(item, width) {
+  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Box_default, { minHeight: 1, width, flexDirection: "column", children: item });
+}
 var DenseToolMessage = (props) => {
   const {
     callId,
@@ -6973,6 +6984,17 @@ var DenseToolMessage = (props) => {
     isAlternateBuffer
   ]);
   const { description, summary } = viewParts;
+  const totalContainerWidth = Math.max(
+    0,
+    Math.min(PAYLOAD_MAX_WIDTH, (terminalWidth || 0) - PAYLOAD_MARGIN_LEFT)
+  );
+  const borderSpace = PAYLOAD_BORDER_CHROME_WIDTH;
+  const scrollbarBuffer = PAYLOAD_SCROLL_GUTTER;
+  const safeContentWidth = Math.max(
+    0,
+    totalContainerWidth - borderSpace - scrollbarBuffer
+  );
+  const scrollableWidth = Math.max(0, totalContainerWidth - borderSpace);
   const diffLines = (0, import_react18.useMemo)(() => {
     if (!diff || !isExpanded || !isAlternateBuffer) return [];
     const parsedLines = parseDiffWithLineNumbers(diff.fileDiff);
@@ -6983,7 +7005,7 @@ var DenseToolMessage = (props) => {
       return colorizeCode({
         code: addedContent,
         language: fileExtension,
-        maxWidth: Math.max(0, (terminalWidth || 0) - PAYLOAD_MARGIN_LEFT),
+        maxWidth: safeContentWidth,
         settings,
         disableColor: status === "cancelled" /* Cancelled */,
         returnLines: true
@@ -6992,11 +7014,11 @@ var DenseToolMessage = (props) => {
       return renderDiffLines({
         parsedLines,
         filename: diff.fileName,
-        terminalWidth: Math.max(0, (terminalWidth || 0) - PAYLOAD_MARGIN_LEFT),
+        terminalWidth: safeContentWidth,
         disableColor: status === "cancelled" /* Cancelled */
       });
     }
-  }, [diff, isExpanded, isAlternateBuffer, terminalWidth, settings, status]);
+  }, [diff, isExpanded, isAlternateBuffer, safeContentWidth, settings, status]);
   const showPayload = (0, import_react18.useMemo)(() => {
     const policy = !isAlternateBuffer || !diff || isExpanded;
     if (!policy) return false;
@@ -7015,8 +7037,14 @@ var DenseToolMessage = (props) => {
     viewParts.payload,
     outputFile
   ]);
-  const keyExtractor = (_item, index) => `diff-line-${index}`;
-  const renderItem = ({ item }) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Box_default, { minHeight: 1, children: item });
+  const keyExtractor = (0, import_react18.useCallback)(
+    (_item, index) => `diff-line-${index}`,
+    []
+  );
+  const renderItem = (0, import_react18.useCallback)(
+    ({ item }) => renderDiffLineItem(item, safeContentWidth),
+    [safeContentWidth]
+  );
   return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Box_default, { flexDirection: "column", children: [
     /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Box_default, { marginLeft: 2, flexDirection: "row", flexWrap: "wrap", children: [
       /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Box_default, { flexDirection: "row", flexShrink: 1, children: [
@@ -7052,13 +7080,8 @@ var DenseToolMessage = (props) => {
         borderColor: theme.border.default,
         borderDimColor: true,
         minWidth: 0,
-        maxWidth: Math.max(
-          0,
-          Math.min(
-            PAYLOAD_MAX_WIDTH,
-            (terminalWidth || 0) - PAYLOAD_MARGIN_LEFT
-          )
-        ),
+        width: totalContainerWidth,
+        maxWidth: totalContainerWidth,
         children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
           ScrollableListWithForwardRef,
           {
@@ -7067,13 +7090,7 @@ var DenseToolMessage = (props) => {
             keyExtractor,
             estimatedItemHeight: () => 1,
             hasFocus: isFocused,
-            width: Math.max(
-              0,
-              Math.min(
-                PAYLOAD_MAX_WIDTH,
-                (terminalWidth || 0) - PAYLOAD_MARGIN_LEFT - PAYLOAD_BORDER_CHROME_WIDTH - PAYLOAD_SCROLL_GUTTER
-              )
-            )
+            width: scrollableWidth
           }
         )
       }
@@ -9640,6 +9657,7 @@ var HistoryItemDisplay = ({
   const inlineThinkingMode = getInlineThinkingMode(settings);
   const itemForDisplay = (0, import_react23.useMemo)(() => escapeAnsiCtrlCodes(item), [item]);
   const needTopMargin = !!(isFirstAfterThinking && inlineThinkingMode !== "off" || isToolGroupBoundary);
+  const effectiveAvailableTerminalHeight = availableTerminalHeight !== void 0 && needTopMargin ? Math.max(availableTerminalHeight - 1, 1) : availableTerminalHeight;
   return /* @__PURE__ */ (0, import_jsx_runtime53.jsxs)(
     Box_default,
     {
@@ -9663,7 +9681,7 @@ var HistoryItemDisplay = ({
           {
             text: itemForDisplay.text,
             isPending,
-            availableTerminalHeight: availableTerminalHeightGemini ?? availableTerminalHeight,
+            availableTerminalHeight: availableTerminalHeightGemini ?? effectiveAvailableTerminalHeight,
             terminalWidth
           }
         ),
@@ -9672,7 +9690,7 @@ var HistoryItemDisplay = ({
           {
             text: itemForDisplay.text,
             isPending,
-            availableTerminalHeight: availableTerminalHeightGemini ?? availableTerminalHeight,
+            availableTerminalHeight: availableTerminalHeightGemini ?? effectiveAvailableTerminalHeight,
             terminalWidth
           }
         ),
@@ -9735,7 +9753,7 @@ var HistoryItemDisplay = ({
           {
             item: itemForDisplay,
             toolCalls: itemForDisplay.tools,
-            availableTerminalHeight,
+            availableTerminalHeight: effectiveAvailableTerminalHeight,
             terminalWidth,
             borderTop: itemForDisplay.borderTop,
             borderBottom: itemForDisplay.borderBottom,
@@ -12642,6 +12660,29 @@ var ToolConfirmationQueueWithBudget = ({
     "confirmation-queue"
   ) });
 };
+var STATIC_HISTORY_ITEM_TYPES = /* @__PURE__ */ new Set([
+  "user",
+  "user_shell",
+  "gemini",
+  "gemini_content",
+  "info",
+  "warning",
+  "error",
+  "hint",
+  "thinking",
+  "about",
+  "help",
+  "stats",
+  "model_stats",
+  "tool_stats",
+  "model",
+  "quit",
+  "extensions_list",
+  "tools_list",
+  "skills_list",
+  "agents_list",
+  "chat_list"
+]);
 var MainContent = () => {
   const { version } = useAppContext();
   const uiState = useUIState();
@@ -12843,15 +12884,35 @@ var MainContent = () => {
   const estimatedItemHeight = (0, import_react36.useCallback)(() => 100, []);
   const keyExtractor = (0, import_react36.useCallback)(
     (item, _index) => {
-      if (item.type === "header") return "header";
-      if (item.type === "history") return item.item.id.toString();
+      if (item.type === "header") {
+        return `header-${showHeaderDetails}-${uiState.bannerVisible}-${uiState.bannerData?.defaultText ?? ""}-${uiState.bannerData?.warningText ?? ""}-${uiState.updateInfo?.isUpdating}-${uiState.historyRemountKey}`;
+      }
+      if (item.type === "history") {
+        return `${item.item.id}-${uiState.renderMarkdown}-${uiState.historyRemountKey}`;
+      }
       return "pending";
     },
-    []
+    [
+      showHeaderDetails,
+      uiState.bannerVisible,
+      uiState.bannerData?.defaultText,
+      uiState.bannerData?.warningText,
+      uiState.renderMarkdown,
+      uiState.historyRemountKey,
+      uiState.updateInfo?.isUpdating
+    ]
   );
   const isStaticItem = (0, import_react36.useCallback)(
-    (item) => item.type === "header",
-    []
+    (item) => {
+      if (item.type === "header") {
+        return !uiState.updateInfo?.isUpdating;
+      }
+      if (item.type === "history") {
+        return STATIC_HISTORY_ITEM_TYPES.has(item.item.type);
+      }
+      return false;
+    },
+    [uiState.updateInfo?.isUpdating]
   );
   const scrollableList = (0, import_react36.useMemo)(() => {
     if (isAlternateBufferOrTerminalBuffer) {
@@ -17988,7 +18049,7 @@ Do you want to allow this read?`,
 };
 
 // packages/cli/src/ui/components/Composer.tsx
-var import_react81 = __toESM(require_react(), 1);
+var import_react83 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/ToastDisplay.tsx
 var import_jsx_runtime104 = __toESM(require_jsx_runtime(), 1);
@@ -18170,6 +18231,8 @@ var DetailedMessagesDisplay = ({ maxHeight, width, hasFocus }) => {
   if (messages.length === 0) {
     return null;
   }
+  const headerAndBorderHeight = 4;
+  const listHeight = maxHeight !== void 0 ? Math.max(1, maxHeight - headerAndBorderHeight) : void 0;
   return /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(
     Box_default,
     {
@@ -18188,10 +18251,11 @@ var DetailedMessagesDisplay = ({ maxHeight, width, hasFocus }) => {
           "Debug Console ",
           /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Text, { color: theme.text.secondary, children: "(F12 to close)" })
         ] }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Box_default, { height: maxHeight, width: width - borderAndPadding, children: /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Box_default, { height: listHeight, width: width - borderAndPadding, children: /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
           ScrollableListWithForwardRef,
           {
             ref: scrollableListRef,
+            containerHeight: listHeight,
             data: messages,
             renderItem: ({ item: msg }) => {
               let textColor = theme.text.primary;
@@ -22423,7 +22487,7 @@ var InputPrompt = ({
 };
 
 // packages/cli/src/ui/components/StatusRow.tsx
-var import_react77 = __toESM(require_react(), 1);
+var import_react79 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/usePhraseCycler.ts
 var import_react74 = __toESM(require_react(), 1);
@@ -22831,155 +22895,169 @@ var usePhraseCycler = (isActive, isWaiting, shouldShowFocusHint, showTips = true
   return { currentTip, currentWittyPhrase };
 };
 
+// packages/cli/src/ui/components/LoadingIndicator.tsx
+var import_react77 = __toESM(require_react(), 1);
+
+// packages/cli/src/ui/components/GeminiRespondingSpinner.tsx
+var import_react76 = __toESM(require_react(), 1);
+
 // packages/cli/src/ui/components/GeminiSpinner.tsx
 var import_react75 = __toESM(require_react(), 1);
 var import_tinygradient = __toESM(require_tinygradient(), 1);
 var import_jsx_runtime111 = __toESM(require_jsx_runtime(), 1);
 var COLOR_CYCLE_DURATION_MS = 4e3;
-var GeminiSpinner = ({
-  spinnerType = "dots",
-  altText
-}) => {
-  const isScreenReaderEnabled = use_is_screen_reader_enabled_default();
-  const [time, setTime] = (0, import_react75.useState)(0);
-  const googleGradient = (0, import_react75.useMemo)(() => {
-    const brandColors = [
-      Colors.AccentPurple,
-      Colors.AccentBlue,
-      Colors.AccentCyan,
-      Colors.AccentGreen,
-      Colors.AccentYellow,
-      Colors.AccentRed
-    ];
-    return (0, import_tinygradient.default)([...brandColors, brandColors[0]]);
-  }, []);
-  (0, import_react75.useEffect)(() => {
-    if (isScreenReaderEnabled) {
-      return;
-    }
-    const interval = setInterval(() => {
-      setTime((prevTime) => prevTime + 30);
-    }, 30);
-    return () => clearInterval(interval);
-  }, [isScreenReaderEnabled]);
-  const progress = time % COLOR_CYCLE_DURATION_MS / COLOR_CYCLE_DURATION_MS;
-  const currentColor = googleGradient.rgbAt(progress).toHexString();
-  return isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { children: altText }) : /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { color: currentColor, children: /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(CliSpinner, { type: spinnerType }) });
-};
+var DEFAULT_COLOR_CYCLE_INTERVAL_MS = 30;
+var GeminiSpinner = import_react75.default.memo(
+  ({ spinnerType = "dots", altText }) => {
+    const isScreenReaderEnabled = use_is_screen_reader_enabled_default();
+    const [time, setTime] = (0, import_react75.useState)(0);
+    const intervalMs = isTmux() ? TMUX_SPINNER_INTERVAL_MS : DEFAULT_COLOR_CYCLE_INTERVAL_MS;
+    const googleGradient = (0, import_react75.useMemo)(() => {
+      const brandColors = [
+        Colors.AccentPurple,
+        Colors.AccentBlue,
+        Colors.AccentCyan,
+        Colors.AccentGreen,
+        Colors.AccentYellow,
+        Colors.AccentRed
+      ];
+      return (0, import_tinygradient.default)([...brandColors, brandColors[0]]);
+    }, []);
+    (0, import_react75.useEffect)(() => {
+      if (isScreenReaderEnabled) {
+        return;
+      }
+      const interval = setInterval(() => {
+        setTime((prevTime) => prevTime + intervalMs);
+      }, intervalMs);
+      return () => clearInterval(interval);
+    }, [isScreenReaderEnabled, intervalMs]);
+    const progress = time % COLOR_CYCLE_DURATION_MS / COLOR_CYCLE_DURATION_MS;
+    const currentColor = googleGradient.rgbAt(progress).toHexString();
+    return isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { children: altText }) : /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { color: currentColor, children: /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(CliSpinner, { type: spinnerType }) });
+  }
+);
+GeminiSpinner.displayName = "GeminiSpinner";
 
 // packages/cli/src/ui/components/GeminiRespondingSpinner.tsx
 var import_jsx_runtime112 = __toESM(require_jsx_runtime(), 1);
-var GeminiRespondingSpinner = ({
-  nonRespondingDisplay,
-  spinnerType = "dots",
-  isHookActive = false,
-  color
-}) => {
-  const streamingState = useStreamingContext();
-  const isScreenReaderEnabled = use_is_screen_reader_enabled_default();
-  if (streamingState === "responding" /* Responding */ && !isHookActive) {
-    return /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(
-      GeminiSpinner,
-      {
-        spinnerType,
-        altText: SCREEN_READER_RESPONDING
-      }
-    );
-  }
-  if (nonRespondingDisplay) {
-    return isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Text, { children: SCREEN_READER_LOADING }) : /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Text, { color: color ?? theme.text.primary, children: nonRespondingDisplay });
+var GeminiRespondingSpinner = import_react76.default.memo(
+  ({
+    nonRespondingDisplay,
+    spinnerType = "dots",
+    isHookActive = false,
+    color
+  }) => {
+    const streamingState = useStreamingContext();
+    const isScreenReaderEnabled = use_is_screen_reader_enabled_default();
+    if (streamingState === "responding" /* Responding */ && !isHookActive) {
+      return /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(
+        GeminiSpinner,
+        {
+          spinnerType,
+          altText: SCREEN_READER_RESPONDING
+        }
+      );
+    }
+    if (nonRespondingDisplay) {
+      return isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Text, { children: SCREEN_READER_LOADING }) : /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Text, { color: color ?? theme.text.primary, children: nonRespondingDisplay });
+    }
+    return null;
   }
-  return null;
-};
+);
+GeminiRespondingSpinner.displayName = "GeminiRespondingSpinner";
 
 // packages/cli/src/ui/components/LoadingIndicator.tsx
 var import_jsx_runtime113 = __toESM(require_jsx_runtime(), 1);
-var LoadingIndicator = ({
-  currentLoadingPhrase,
-  statusPhrase,
-  wittyPhrase,
-  showWit = false,
-  elapsedTime,
-  inline = false,
-  rightContent,
-  thought,
-  thoughtLabel,
-  showCancelAndTimer = true,
-  forceRealStatusOnly = false,
-  spinnerIcon,
-  isHookActive = false
-}) => {
-  const streamingState = useStreamingContext();
-  const { columns: terminalWidth } = useTerminalSize();
-  const isNarrow = isNarrowWidth(terminalWidth);
-  if (streamingState === "idle" /* Idle */ && !currentLoadingPhrase && !statusPhrase && !thought) {
-    return null;
-  }
-  const primaryText = statusPhrase ?? (currentLoadingPhrase === INTERACTIVE_SHELL_WAITING_PHRASE ? currentLoadingPhrase : thought?.subject ? thoughtLabel ?? thought.subject : currentLoadingPhrase || (streamingState === "responding" /* Responding */ ? "Thinking..." : void 0));
-  const cancelAndTimerContent = showCancelAndTimer && streamingState === "responding" /* Responding */ ? `(esc to cancel, ${elapsedTime < 60 ? `${elapsedTime}s` : formatDuration(elapsedTime * 1e3)})` : null;
-  const wittyPhraseNode = !forceRealStatusOnly && showWit && wittyPhrase && primaryText === "Thinking..." ? /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { marginLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.text.secondary, dimColor: true, italic: true, children: wittyPhrase }) }) : null;
-  if (inline) {
-    return /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Box_default, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(
-        GeminiRespondingSpinner,
+var LoadingIndicator = import_react77.default.memo(
+  ({
+    currentLoadingPhrase,
+    statusPhrase,
+    wittyPhrase,
+    showWit = false,
+    elapsedTime,
+    inline = false,
+    rightContent,
+    thought,
+    thoughtLabel,
+    showCancelAndTimer = true,
+    forceRealStatusOnly = false,
+    spinnerIcon,
+    isHookActive = false
+  }) => {
+    const streamingState = useStreamingContext();
+    const { columns: terminalWidth } = useTerminalSize();
+    const isNarrow = isNarrowWidth(terminalWidth);
+    if (streamingState === "idle" /* Idle */ && !currentLoadingPhrase && !statusPhrase && !thought) {
+      return null;
+    }
+    const primaryText = statusPhrase ?? (currentLoadingPhrase === INTERACTIVE_SHELL_WAITING_PHRASE ? currentLoadingPhrase : thought?.subject ? thoughtLabel ?? thought.subject : currentLoadingPhrase || (streamingState === "responding" /* Responding */ ? "Thinking..." : void 0));
+    const cancelAndTimerContent = showCancelAndTimer && streamingState === "responding" /* Responding */ ? `(esc to cancel, ${elapsedTime < 60 ? `${elapsedTime}s` : formatDuration(elapsedTime * 1e3)})` : null;
+    const wittyPhraseNode = !forceRealStatusOnly && showWit && wittyPhrase && primaryText === "Thinking..." ? /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { marginLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.text.secondary, dimColor: true, italic: true, children: wittyPhrase }) }) : null;
+    if (inline) {
+      return /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Box_default, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(
+          GeminiRespondingSpinner,
+          {
+            nonRespondingDisplay: spinnerIcon ?? (streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */ ? "\u280F" : ""),
+            isHookActive
+          }
+        ) }),
+        primaryText && /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Box_default, { flexShrink: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.text.primary, italic: true, wrap: "truncate-end", children: primaryText }),
+          primaryText === INTERACTIVE_SHELL_WAITING_PHRASE && /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Text, { color: theme.ui.active, italic: true, children: [
+            " ",
+            "(press tab to focus)"
+          ] })
+        ] }),
+        cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(import_jsx_runtime113.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { flexShrink: 0, width: 1 }),
+          /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.text.secondary, children: cancelAndTimerContent })
+        ] }),
+        wittyPhraseNode
+      ] });
+    }
+    return /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Box_default, { paddingLeft: 0, flexDirection: "column", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(
+        Box_default,
         {
-          nonRespondingDisplay: spinnerIcon ?? (streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */ ? "\u280F" : ""),
-          isHookActive
+          width: "100%",
+          flexDirection: isNarrow ? "column" : "row",
+          alignItems: isNarrow ? "flex-start" : "center",
+          children: [
+            /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Box_default, { children: [
+              /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(
+                GeminiRespondingSpinner,
+                {
+                  nonRespondingDisplay: spinnerIcon ?? (streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */ ? "\u280F" : ""),
+                  isHookActive
+                }
+              ) }),
+              primaryText && /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Box_default, { flexShrink: 1, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.text.primary, italic: true, wrap: "truncate-end", children: primaryText }),
+                primaryText === INTERACTIVE_SHELL_WAITING_PHRASE && /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Text, { color: theme.ui.active, italic: true, children: [
+                  " ",
+                  "(press tab to focus)"
+                ] })
+              ] }),
+              !isNarrow && cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(import_jsx_runtime113.Fragment, { children: [
+                /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { flexShrink: 0, width: 1 }),
+                /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.text.secondary, children: cancelAndTimerContent })
+              ] }),
+              !isNarrow && wittyPhraseNode
+            ] }),
+            !isNarrow && /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { flexGrow: 1 }),
+            !isNarrow && rightContent && /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { children: rightContent })
+          ]
         }
-      ) }),
-      primaryText && /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Box_default, { flexShrink: 1, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.text.primary, italic: true, wrap: "truncate-end", children: primaryText }),
-        primaryText === INTERACTIVE_SHELL_WAITING_PHRASE && /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Text, { color: theme.ui.active, italic: true, children: [
-          " ",
-          "(press tab to focus)"
-        ] })
-      ] }),
-      cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(import_jsx_runtime113.Fragment, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { flexShrink: 0, width: 1 }),
-        /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.text.secondary, children: cancelAndTimerContent })
-      ] }),
-      wittyPhraseNode
+      ),
+      isNarrow && cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.text.secondary, children: cancelAndTimerContent }) }),
+      isNarrow && wittyPhraseNode,
+      isNarrow && rightContent && /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { children: rightContent })
     ] });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Box_default, { paddingLeft: 0, flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(
-      Box_default,
-      {
-        width: "100%",
-        flexDirection: isNarrow ? "column" : "row",
-        alignItems: isNarrow ? "flex-start" : "center",
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Box_default, { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(
-              GeminiRespondingSpinner,
-              {
-                nonRespondingDisplay: spinnerIcon ?? (streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */ ? "\u280F" : ""),
-                isHookActive
-              }
-            ) }),
-            primaryText && /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Box_default, { flexShrink: 1, children: [
-              /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.text.primary, italic: true, wrap: "truncate-end", children: primaryText }),
-              primaryText === INTERACTIVE_SHELL_WAITING_PHRASE && /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Text, { color: theme.ui.active, italic: true, children: [
-                " ",
-                "(press tab to focus)"
-              ] })
-            ] }),
-            !isNarrow && cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(import_jsx_runtime113.Fragment, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { flexShrink: 0, width: 1 }),
-              /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.text.secondary, children: cancelAndTimerContent })
-            ] }),
-            !isNarrow && wittyPhraseNode
-          ] }),
-          !isNarrow && /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { flexGrow: 1 }),
-          !isNarrow && rightContent && /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { children: rightContent })
-        ]
-      }
-    ),
-    isNarrow && cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.text.secondary, children: cancelAndTimerContent }) }),
-    isNarrow && wittyPhraseNode,
-    isNarrow && rightContent && /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { children: rightContent })
-  ] });
-};
+);
+LoadingIndicator.displayName = "LoadingIndicator";
 
 // packages/cli/src/ui/components/ContextSummaryDisplay.tsx
 var import_jsx_runtime114 = __toESM(require_jsx_runtime(), 1);
@@ -23168,12 +23246,12 @@ var RawMarkdownIndicator = () => {
 };
 
 // packages/cli/src/ui/hooks/useComposerStatus.ts
-var import_react76 = __toESM(require_react(), 1);
+var import_react78 = __toESM(require_react(), 1);
 var useComposerStatus = () => {
   const uiState = useUIState();
   const quotaState = useQuotaState();
   const settings = useSettings();
-  const hasPendingToolConfirmation = (0, import_react76.useMemo)(
+  const hasPendingToolConfirmation = (0, import_react78.useMemo)(
     () => (uiState.pendingHistoryItems ?? []).filter(
       (item) => item.type === "tool_group"
     ).some(
@@ -23189,7 +23267,7 @@ var useComposerStatus = () => {
   );
   const showLoadingIndicator = (!uiState.embeddedShellFocused || uiState.isBackgroundTaskVisible) && uiState.streamingState === "responding" /* Responding */ && !hasPendingActionRequired;
   const showApprovalModeIndicator = uiState.showApprovalModeIndicator;
-  const modeContentObj = (0, import_react76.useMemo)(() => {
+  const modeContentObj = (0, import_react78.useMemo)(() => {
     const hideMinimalModeHintWhileBusy = !uiState.cleanUiDetailsVisible && (showLoadingIndicator || uiState.activeHooks.length > 0);
     if (hideMinimalModeHintWhileBusy) return null;
     switch (showApprovalModeIndicator) {
@@ -23244,283 +23322,291 @@ var LAYOUT = {
   CONTEXT_DISPLAY_LEFT_MARGIN_WIDE: 0,
   COLLISION_GAP: 10
 };
-var StatusNode = ({
-  showTips,
-  showWit,
-  thought,
-  elapsedTime,
-  currentWittyPhrase,
-  activeHooks,
-  showLoadingIndicator,
-  errorVerbosity,
-  statusPhrase,
-  onResize
-}) => {
-  const observerRef = (0, import_react77.useRef)(null);
-  (0, import_react77.useEffect)(
-    () => () => {
-      observerRef.current?.disconnect();
-    },
-    []
-  );
-  const onRefChange = (0, import_react77.useCallback)(
-    (node) => {
-      if (observerRef.current) {
-        observerRef.current.disconnect();
-        observerRef.current = null;
-      }
-      if (node && onResize) {
-        const observer = new ResizeObserver((entries) => {
-          const entry = entries[0];
-          if (entry) {
-            onResize(Math.round(entry.contentRect.width));
-          }
-        });
-        observer.observe(node);
-        observerRef.current = observer;
-      }
-    },
-    [onResize]
-  );
-  if (activeHooks.length === 0 && !showLoadingIndicator && !statusPhrase) {
-    return null;
-  }
-  let currentLoadingPhrase = void 0;
-  let currentThought = null;
-  if (activeHooks.length > 0) {
-    const userVisibleHooks = activeHooks.filter(
-      (h) => isUserVisibleHook(h.source)
-    );
-    if (userVisibleHooks.length > 0) {
-      const label = userVisibleHooks.length > 1 ? "Executing Hooks" : "Executing Hook";
-      const displayNames = userVisibleHooks.map((h) => {
-        let name = stripAnsi(h.name);
-        if (h.index && h.total && h.total > 1) {
-          name += ` (${h.index}/${h.total})`;
-        }
-        return name;
-      });
-      currentLoadingPhrase = `${label}: ${displayNames.join(", ")}`;
-    } else {
-      currentLoadingPhrase = GENERIC_WORKING_LABEL;
-    }
-  } else {
-    currentThought = thought ? { ...thought, subject: stripAnsi(thought.subject) } : null;
-  }
-  return /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { ref: onRefChange, children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
-    LoadingIndicator,
-    {
-      inline: true,
-      showTips,
-      showWit,
-      errorVerbosity,
-      thought: currentThought,
-      currentLoadingPhrase,
-      statusPhrase,
-      elapsedTime,
-      forceRealStatusOnly: false,
-      wittyPhrase: currentWittyPhrase
-    }
-  ) });
-};
-var StatusRow = ({
-  showUiDetails,
-  isNarrow,
-  terminalWidth,
-  hideContextSummary,
-  hideUiDetailsForSuggestions,
-  hasPendingActionRequired,
-  statusPhrase: propStatusPhrase
-}) => {
-  const uiState = useUIState();
-  const statusPhrase = propStatusPhrase ?? uiState.statusPhrase;
-  const inputState = useInputState();
-  const settings = useSettings();
-  const {
-    isInteractiveShellWaiting,
-    showLoadingIndicator,
+var StatusNode = import_react79.default.memo(
+  ({
     showTips,
     showWit,
-    modeContentObj,
-    showMinimalContext
-  } = useComposerStatus();
-  const [statusWidth, setStatusWidth] = (0, import_react77.useState)(0);
-  const [tipWidth, setTipWidth] = (0, import_react77.useState)(0);
-  const tipObserverRef = (0, import_react77.useRef)(null);
-  (0, import_react77.useEffect)(
-    () => () => {
-      tipObserverRef.current?.disconnect();
-    },
-    []
-  );
-  const onTipRefChange = (0, import_react77.useCallback)((node) => {
-    if (tipObserverRef.current) {
-      tipObserverRef.current.disconnect();
-      tipObserverRef.current = null;
-    }
-    if (node) {
-      const observer = new ResizeObserver((entries) => {
-        const entry = entries[0];
-        if (entry) {
-          const width = Math.round(entry.contentRect.width);
-          if (width > 0) {
-            setTipWidth(width);
-          }
+    thought,
+    elapsedTime,
+    currentWittyPhrase,
+    activeHooks,
+    showLoadingIndicator,
+    errorVerbosity,
+    statusPhrase,
+    onResize
+  }) => {
+    const observerRef = (0, import_react79.useRef)(null);
+    (0, import_react79.useEffect)(
+      () => () => {
+        observerRef.current?.disconnect();
+      },
+      []
+    );
+    const onRefChange = (0, import_react79.useCallback)(
+      (node) => {
+        if (observerRef.current) {
+          observerRef.current.disconnect();
+          observerRef.current = null;
+        }
+        if (node && onResize) {
+          const observer = new ResizeObserver((entries) => {
+            const entry = entries[0];
+            if (entry) {
+              onResize(Math.round(entry.contentRect.width));
+            }
+          });
+          observer.observe(node);
+          observerRef.current = observer;
         }
-      });
-      observer.observe(node);
-      tipObserverRef.current = observer;
-    }
-  }, []);
-  const tipContentStr = (() => {
-    if (showTips && uiState.currentTip && !(isInteractiveShellWaiting && uiState.currentTip === INTERACTIVE_SHELL_WAITING_PHRASE)) {
-      return uiState.currentTip;
-    }
-    if (settings.merged.ui.showShortcutsHint && !hideUiDetailsForSuggestions && !hasPendingActionRequired && inputState.buffer.text.length === 0) {
-      return showUiDetails ? "? for shortcuts" : "press tab twice for more";
+      },
+      [onResize]
+    );
+    if (activeHooks.length === 0 && !showLoadingIndicator && !statusPhrase) {
+      return null;
     }
-    return void 0;
-  })();
-  const willCollideTip = statusWidth + tipWidth + LAYOUT.COLLISION_GAP > terminalWidth;
-  const showTipLine = Boolean(
-    !hasPendingActionRequired && tipContentStr && !willCollideTip && !isNarrow
-  );
-  const showRow1Minimal = showLoadingIndicator || uiState.activeHooks.length > 0 || showTipLine || Boolean(statusPhrase);
-  const showRow2Minimal = Boolean(modeContentObj) && !hideUiDetailsForSuggestions || showMinimalContext;
-  const showRow1 = showUiDetails || showRow1Minimal;
-  const showRow2 = showUiDetails || showRow2Minimal;
-  const onStatusResize = (0, import_react77.useCallback)((width) => {
-    if (width > 0) setStatusWidth(width);
-  }, []);
-  const statusNode = /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
-    StatusNode,
-    {
-      showTips,
-      showWit,
-      thought: uiState.thought,
-      elapsedTime: uiState.elapsedTime,
-      currentWittyPhrase: uiState.currentWittyPhrase,
-      activeHooks: uiState.activeHooks,
-      showLoadingIndicator,
-      errorVerbosity: settings.merged.ui.errorVerbosity,
-      statusPhrase,
-      onResize: onStatusResize
+    let currentLoadingPhrase = void 0;
+    let currentThought = null;
+    if (activeHooks.length > 0) {
+      const userVisibleHooks = activeHooks.filter(
+        (h) => isUserVisibleHook(h.source)
+      );
+      if (userVisibleHooks.length > 0) {
+        const label = userVisibleHooks.length > 1 ? "Executing Hooks" : "Executing Hook";
+        const displayNames = userVisibleHooks.map((h) => {
+          let name = stripAnsi(h.name);
+          if (h.index && h.total && h.total > 1) {
+            name += ` (${h.index}/${h.total})`;
+          }
+          return name;
+        });
+        currentLoadingPhrase = `${label}: ${displayNames.join(", ")}`;
+      } else {
+        currentLoadingPhrase = GENERIC_WORKING_LABEL;
+      }
+    } else {
+      currentThought = thought ? { ...thought, subject: stripAnsi(thought.subject) } : null;
     }
-  );
-  const renderTipNode = () => {
-    if (!tipContentStr) return null;
-    const isShortcutHint = tipContentStr === "? for shortcuts" || tipContentStr === "press tab twice for more";
-    const color = isShortcutHint && uiState.shortcutsHelpVisible ? theme.text.accent : theme.text.secondary;
-    return /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { flexDirection: "row", justifyContent: "flex-end", ref: onTipRefChange, children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
-      Text,
+    return /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { ref: onRefChange, children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
+      LoadingIndicator,
       {
-        color,
-        wrap: "truncate-end",
-        italic: !isShortcutHint && tipContentStr === uiState.currentWittyPhrase,
-        children: tipContentStr === uiState.currentTip ? `Tip: ${tipContentStr}` : tipContentStr
+        inline: true,
+        showTips,
+        showWit,
+        errorVerbosity,
+        thought: currentThought,
+        currentLoadingPhrase,
+        statusPhrase,
+        elapsedTime,
+        forceRealStatusOnly: false,
+        wittyPhrase: currentWittyPhrase
       }
     ) });
-  };
-  if (!showUiDetails && !showRow1Minimal && !showRow2Minimal) {
-    return /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { height: LAYOUT.STATUS_MIN_HEIGHT });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(Box_default, { flexDirection: "column", width: "100%", children: [
-    showRow1 && /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(
-      Box_default,
-      {
-        width: "100%",
-        flexDirection: "row",
-        alignItems: "center",
-        justifyContent: "space-between",
-        minHeight: LAYOUT.STATUS_MIN_HEIGHT,
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { flexDirection: "row", flexGrow: 1, flexShrink: 1, children: !showUiDetails && showRow1Minimal ? /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(Box_default, { flexDirection: "row", columnGap: 1, children: [
-            statusNode,
-            !showUiDetails && showRow2Minimal && modeContentObj && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(Text, { color: modeContentObj.color, children: [
-              "\u25CF ",
-              modeContentObj.text
-            ] }) })
-          ] }) : isInteractiveShellWaiting ? /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { width: "100%", marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Text, { color: theme.status.warning, children: INTERACTIVE_SHELL_WAITING_PHRASE }) }) : /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
-            Box_default,
-            {
-              flexDirection: "row",
-              alignItems: isNarrow ? "flex-start" : "center",
-              flexGrow: 1,
-              flexShrink: 0,
-              marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN,
-              children: statusNode
-            }
-          ) }),
-          /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
-            Box_default,
-            {
-              flexShrink: 0,
-              marginLeft: showTipLine ? LAYOUT.TIP_LEFT_MARGIN : 0,
-              marginRight: showTipLine ? isNarrow ? LAYOUT.TIP_RIGHT_MARGIN_NARROW : LAYOUT.TIP_RIGHT_MARGIN_WIDE : 0,
-              position: showTipLine ? "relative" : "absolute",
-              ...showTipLine ? {} : { top: -100, left: -100 },
-              children: !isNarrow && tipContentStr && renderTipNode()
+);
+StatusNode.displayName = "StatusNode";
+var StatusRow = import_react79.default.memo(
+  ({
+    showUiDetails,
+    isNarrow,
+    terminalWidth,
+    hideContextSummary,
+    hideUiDetailsForSuggestions,
+    hasPendingActionRequired,
+    statusPhrase: propStatusPhrase
+  }) => {
+    const uiState = useUIState();
+    const statusPhrase = propStatusPhrase ?? uiState.statusPhrase;
+    const inputState = useInputState();
+    const settings = useSettings();
+    const {
+      isInteractiveShellWaiting,
+      showLoadingIndicator,
+      showTips,
+      showWit,
+      modeContentObj,
+      showMinimalContext
+    } = useComposerStatus();
+    const [statusWidth, setStatusWidth] = (0, import_react79.useState)(0);
+    const [tipWidth, setTipWidth] = (0, import_react79.useState)(0);
+    const tipObserverRef = (0, import_react79.useRef)(null);
+    (0, import_react79.useEffect)(
+      () => () => {
+        tipObserverRef.current?.disconnect();
+      },
+      []
+    );
+    const onTipRefChange = (0, import_react79.useCallback)((node) => {
+      if (tipObserverRef.current) {
+        tipObserverRef.current.disconnect();
+        tipObserverRef.current = null;
+      }
+      if (node) {
+        const observer = new ResizeObserver((entries) => {
+          const entry = entries[0];
+          if (entry) {
+            const width = Math.round(entry.contentRect.width);
+            if (width > 0) {
+              setTipWidth(width);
             }
-          )
-        ]
+          }
+        });
+        observer.observe(node);
+        tipObserverRef.current = observer;
       }
-    ),
-    showRow1 && showRow2 && (showUiDetails || showRow1Minimal && showRow2Minimal) && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(HorizontalLine, { dim: true }) }),
-    showRow2 && /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(
-      Box_default,
+    }, []);
+    const tipContentStr = (() => {
+      if (showTips && uiState.currentTip && !(isInteractiveShellWaiting && uiState.currentTip === INTERACTIVE_SHELL_WAITING_PHRASE)) {
+        return uiState.currentTip;
+      }
+      if (settings.merged.ui?.showShortcutsHint && !hideUiDetailsForSuggestions && !hasPendingActionRequired && inputState.buffer.text.length === 0) {
+        return showUiDetails ? "? for shortcuts" : "press tab twice for more";
+      }
+      return void 0;
+    })();
+    const hasStatus = showLoadingIndicator || uiState.activeHooks.length > 0 || Boolean(statusPhrase);
+    const effectiveStatusWidth = hasStatus ? statusWidth : 0;
+    const willCollideTip = effectiveStatusWidth + tipWidth + LAYOUT.COLLISION_GAP > terminalWidth;
+    const showTipLine = Boolean(
+      !hasPendingActionRequired && tipContentStr && !willCollideTip && !isNarrow
+    );
+    const showRow1Minimal = showLoadingIndicator || uiState.activeHooks.length > 0 || showTipLine || Boolean(statusPhrase);
+    const showRow2Minimal = Boolean(modeContentObj) && !hideUiDetailsForSuggestions || showMinimalContext;
+    const showRow1 = showUiDetails || showRow1Minimal;
+    const showRow2 = showUiDetails || showRow2Minimal;
+    const onStatusResize = (0, import_react79.useCallback)((width) => {
+      if (width > 0) setStatusWidth(width);
+    }, []);
+    const statusNode = /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
+      StatusNode,
       {
-        width: "100%",
-        flexDirection: isNarrow ? "column" : "row",
-        alignItems: isNarrow ? "flex-start" : "center",
-        justifyContent: "space-between",
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
-            Box_default,
-            {
-              flexDirection: "row",
-              alignItems: "center",
-              marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN,
-              children: showUiDetails ? /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(import_jsx_runtime120.Fragment, { children: [
-                !hideUiDetailsForSuggestions && !inputState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
-                  ApprovalModeIndicator,
-                  {
-                    approvalMode: uiState.showApprovalModeIndicator,
-                    allowPlanMode: uiState.allowPlanMode
-                  }
-                ),
-                inputState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(ShellModeIndicator, {}) }),
-                !uiState.renderMarkdown && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(RawMarkdownIndicator, {}) })
-              ] }) : showRow2Minimal && modeContentObj && /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(Text, { color: modeContentObj.color, children: [
+        showTips,
+        showWit,
+        thought: uiState.thought,
+        elapsedTime: uiState.elapsedTime,
+        currentWittyPhrase: uiState.currentWittyPhrase,
+        activeHooks: uiState.activeHooks,
+        showLoadingIndicator,
+        errorVerbosity: settings.merged.ui?.errorVerbosity,
+        statusPhrase,
+        onResize: onStatusResize
+      }
+    );
+    const renderTipNode = () => {
+      if (!tipContentStr) return null;
+      const isShortcutHint = tipContentStr === "? for shortcuts" || tipContentStr === "press tab twice for more";
+      const color = isShortcutHint && uiState.shortcutsHelpVisible ? theme.text.accent : theme.text.secondary;
+      return /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { flexDirection: "row", justifyContent: "flex-end", ref: onTipRefChange, children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
+        Text,
+        {
+          color,
+          wrap: "truncate-end",
+          italic: !isShortcutHint && tipContentStr === uiState.currentWittyPhrase,
+          children: tipContentStr === uiState.currentTip ? `Tip: ${tipContentStr}` : tipContentStr
+        }
+      ) });
+    };
+    if (!showUiDetails && !showRow1Minimal && !showRow2Minimal) {
+      return /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { height: LAYOUT.STATUS_MIN_HEIGHT });
+    }
+    return /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(Box_default, { flexDirection: "column", width: "100%", children: [
+      showRow1 && /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(
+        Box_default,
+        {
+          width: "100%",
+          flexDirection: "row",
+          alignItems: "center",
+          justifyContent: "space-between",
+          minHeight: LAYOUT.STATUS_MIN_HEIGHT,
+          children: [
+            /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { flexDirection: "row", flexGrow: 1, flexShrink: 1, children: !showUiDetails && showRow1Minimal ? /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(Box_default, { flexDirection: "row", columnGap: 1, children: [
+              statusNode,
+              !showUiDetails && showRow2Minimal && modeContentObj && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(Text, { color: modeContentObj.color, children: [
                 "\u25CF ",
                 modeContentObj.text
-              ] })
-            }
-          ),
-          /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(
-            Box_default,
-            {
-              marginTop: isNarrow ? LAYOUT.CONTEXT_DISPLAY_TOP_MARGIN_NARROW : 0,
-              flexDirection: "row",
-              alignItems: "center",
-              marginLeft: isNarrow ? LAYOUT.CONTEXT_DISPLAY_LEFT_MARGIN_NARROW : LAYOUT.CONTEXT_DISPLAY_LEFT_MARGIN_WIDE,
-              children: [
-                (showUiDetails || showMinimalContext) && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(StatusDisplay, { hideContextSummary }),
-                showMinimalContext && !showUiDetails && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
-                  ContextUsageDisplay,
-                  {
-                    promptTokenCount: uiState.sessionStats.lastPromptTokenCount,
-                    model: typeof uiState.currentModel === "string" ? uiState.currentModel : void 0,
-                    terminalWidth
-                  }
-                ) })
-              ]
-            }
-          )
-        ]
-      }
-    )
-  ] });
-};
+              ] }) })
+            ] }) : isInteractiveShellWaiting ? /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { width: "100%", marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Text, { color: theme.status.warning, children: INTERACTIVE_SHELL_WAITING_PHRASE }) }) : /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
+              Box_default,
+              {
+                flexDirection: "row",
+                alignItems: isNarrow ? "flex-start" : "center",
+                flexGrow: 1,
+                flexShrink: 0,
+                marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN,
+                children: statusNode
+              }
+            ) }),
+            /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
+              Box_default,
+              {
+                flexShrink: 0,
+                marginLeft: showTipLine ? LAYOUT.TIP_LEFT_MARGIN : 0,
+                marginRight: showTipLine ? isNarrow ? LAYOUT.TIP_RIGHT_MARGIN_NARROW : LAYOUT.TIP_RIGHT_MARGIN_WIDE : 0,
+                position: showTipLine ? "relative" : "absolute",
+                ...showTipLine ? {} : { top: -100, left: -100 },
+                children: !isNarrow && tipContentStr && renderTipNode()
+              }
+            )
+          ]
+        }
+      ),
+      showRow1 && showRow2 && (showUiDetails || showRow1Minimal && showRow2Minimal) && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(HorizontalLine, { dim: true }) }),
+      showRow2 && /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(
+        Box_default,
+        {
+          width: "100%",
+          flexDirection: isNarrow ? "column" : "row",
+          alignItems: isNarrow ? "flex-start" : "center",
+          justifyContent: "space-between",
+          children: [
+            /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
+              Box_default,
+              {
+                flexDirection: "row",
+                alignItems: "center",
+                marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN,
+                children: showUiDetails ? /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(import_jsx_runtime120.Fragment, { children: [
+                  !hideUiDetailsForSuggestions && !inputState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
+                    ApprovalModeIndicator,
+                    {
+                      approvalMode: uiState.showApprovalModeIndicator,
+                      allowPlanMode: uiState.allowPlanMode
+                    }
+                  ),
+                  inputState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(ShellModeIndicator, {}) }),
+                  !uiState.renderMarkdown && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(RawMarkdownIndicator, {}) })
+                ] }) : showRow2Minimal && modeContentObj && /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(Text, { color: modeContentObj.color, children: [
+                  "\u25CF ",
+                  modeContentObj.text
+                ] })
+              }
+            ),
+            /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(
+              Box_default,
+              {
+                marginTop: isNarrow ? LAYOUT.CONTEXT_DISPLAY_TOP_MARGIN_NARROW : 0,
+                flexDirection: "row",
+                alignItems: "center",
+                marginLeft: isNarrow ? LAYOUT.CONTEXT_DISPLAY_LEFT_MARGIN_NARROW : LAYOUT.CONTEXT_DISPLAY_LEFT_MARGIN_WIDE,
+                children: [
+                  (showUiDetails || showMinimalContext) && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(StatusDisplay, { hideContextSummary }),
+                  showMinimalContext && !showUiDetails && /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(
+                    ContextUsageDisplay,
+                    {
+                      promptTokenCount: uiState.sessionStats.lastPromptTokenCount,
+                      model: typeof uiState.currentModel === "string" ? uiState.currentModel : void 0,
+                      terminalWidth
+                    }
+                  ) })
+                ]
+              }
+            )
+          ]
+        }
+      )
+    ] });
+  }
+);
+StatusRow.displayName = "StatusRow";
 
 // packages/cli/src/ui/components/QueuedMessageDisplay.tsx
 var import_jsx_runtime121 = __toESM(require_jsx_runtime(), 1);
@@ -23546,13 +23632,13 @@ var QueuedMessageDisplay = ({
 };
 
 // packages/cli/src/ui/components/ConfigInitDisplay.tsx
-var import_react78 = __toESM(require_react(), 1);
+var import_react80 = __toESM(require_react(), 1);
 var import_jsx_runtime122 = __toESM(require_jsx_runtime(), 1);
 var ConfigInitDisplay = ({
   message: initialMessage = "Working..."
 }) => {
-  const [message, setMessage] = (0, import_react78.useState)(initialMessage);
-  (0, import_react78.useEffect)(() => {
+  const [message, setMessage] = (0, import_react80.useState)(initialMessage);
+  (0, import_react80.useEffect)(() => {
     const onChange = (clients) => {
       if (!clients || clients.size === 0) {
         setMessage(initialMessage);
@@ -23596,10 +23682,10 @@ var ConfigInitDisplay = ({
 };
 
 // packages/cli/src/ui/components/messages/Todo.tsx
-var import_react80 = __toESM(require_react(), 1);
+var import_react82 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/Checklist.tsx
-var import_react79 = __toESM(require_react(), 1);
+var import_react81 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/ChecklistItem.tsx
 var import_jsx_runtime123 = __toESM(require_jsx_runtime(), 1);
@@ -23650,7 +23736,7 @@ var ChecklistItem = ({
 // packages/cli/src/ui/components/Checklist.tsx
 var import_jsx_runtime124 = __toESM(require_jsx_runtime(), 1);
 var ChecklistTitleDisplay = ({ title, items, toggleHint }) => {
-  const score = (0, import_react79.useMemo)(() => {
+  const score = (0, import_react81.useMemo)(() => {
     let total = 0;
     let completed = 0;
     for (const item of items) {
@@ -23687,11 +23773,11 @@ var Checklist = ({
   isExpanded,
   toggleHint
 }) => {
-  const inProgress = (0, import_react79.useMemo)(
+  const inProgress = (0, import_react81.useMemo)(
     () => items.find((item) => item.status === "in_progress") || null,
     [items]
   );
-  const hasActiveItems = (0, import_react79.useMemo)(
+  const hasActiveItems = (0, import_react81.useMemo)(
     () => items.some(
       (item) => item.status === "pending" || item.status === "in_progress"
     ),
@@ -23739,7 +23825,7 @@ var Checklist = ({
 var import_jsx_runtime125 = __toESM(require_jsx_runtime(), 1);
 var TodoTray = () => {
   const uiState = useUIState();
-  const todos = (0, import_react80.useMemo)(() => {
+  const todos = (0, import_react82.useMemo)(() => {
     for (let i = uiState.history.length - 1; i >= 0; i--) {
       const entry = uiState.history[i];
       if (entry.type !== "tool_group") {
@@ -23755,7 +23841,7 @@ var TodoTray = () => {
     }
     return null;
   }, [uiState.history]);
-  const checklistItems = (0, import_react80.useMemo)(() => {
+  const checklistItems = (0, import_react82.useMemo)(() => {
     if (!todos || !todos.todos) {
       return [];
     }
@@ -23788,10 +23874,10 @@ var Composer = ({ isFocused = true }) => {
   const config = useConfig();
   const { vimEnabled, vimMode } = useVimMode();
   const isScreenReaderEnabled = use_is_screen_reader_enabled_default();
-  const { columns: terminalWidth } = useTerminalSize();
+  const { columns: terminalWidth, rows: terminalHeight } = useTerminalSize();
   const isNarrow = isNarrowWidth(terminalWidth);
-  const debugConsoleMaxHeight = Math.floor(Math.max(terminalWidth * 0.2, 5));
-  const [suggestionsVisible, setSuggestionsVisible] = (0, import_react81.useState)(false);
+  const debugConsoleMaxHeight = Math.floor(Math.max(terminalHeight * 0.2, 5));
+  const [suggestionsVisible, setSuggestionsVisible] = (0, import_react83.useState)(false);
   const isAlternateBuffer = useAlternateBuffer();
   const showUiDetails = uiState.cleanUiDetailsVisible;
   const suggestionsPosition = isAlternateBuffer ? "above" : "below";
@@ -23803,12 +23889,12 @@ var Composer = ({ isFocused = true }) => {
   } = useComposerStatus();
   const isPassiveShortcutsHelpState = uiState.isInputActive && uiState.streamingState === "idle" && !hasPendingActionRequired;
   const { setShortcutsHelpVisible } = uiActions;
-  (0, import_react81.useEffect)(() => {
+  (0, import_react83.useEffect)(() => {
     if (hasPendingActionRequired && !hasPendingToolConfirmation) {
       appEvents.emit("scroll-to-bottom" /* ScrollToBottom */);
     }
   }, [hasPendingActionRequired, hasPendingToolConfirmation]);
-  (0, import_react81.useEffect)(() => {
+  (0, import_react83.useEffect)(() => {
     if (uiState.shortcutsHelpVisible && !isPassiveShortcutsHelpState) {
       setShortcutsHelpVisible(false);
     }
@@ -23852,7 +23938,7 @@ var Composer = ({ isFocused = true }) => {
           /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(
             DetailedMessagesDisplay,
             {
-              maxHeight: uiState.constrainHeight ? debugConsoleMaxHeight : void 0,
+              maxHeight: debugConsoleMaxHeight,
               width: uiState.terminalWidth,
               hasFocus: uiState.showErrorDetails
             }
@@ -23902,11 +23988,11 @@ var ExitWarning = () => {
 };
 
 // packages/cli/src/ui/hooks/useFlickerDetector.ts
-var import_react82 = __toESM(require_react(), 1);
+var import_react84 = __toESM(require_react(), 1);
 function useFlickerDetector(rootUiRef, terminalHeight) {
   const config = useConfig();
   const { constrainHeight } = useUIState();
-  (0, import_react82.useEffect)(() => {
+  (0, import_react84.useEffect)(() => {
     if (rootUiRef.current) {
       const measurement = measure_element_default(rootUiRef.current);
       if (measurement.height > terminalHeight) {
@@ -23958,10 +24044,10 @@ var CopyModeWarning = () => {
 };
 
 // packages/cli/src/ui/components/BackgroundTaskDisplay.tsx
-var import_react84 = __toESM(require_react(), 1);
+var import_react86 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/useExecutionLifecycle.ts
-var import_react83 = __toESM(require_react(), 1);
+var import_react85 = __toESM(require_react(), 1);
 import path12 from "node:path";
 import os2 from "node:os";
 import fs5 from "node:fs";
@@ -24089,8 +24175,8 @@ ${safeModelContent}
   });
 }
 var useExecutionLifecycle = (addItemToHistory, setPendingHistoryItem, onExec, onDebugMessage, config, geminiClient, setShellInputFocused, terminalWidth, terminalHeight, activeBackgroundExecutionId, isWaitingForConfirmation) => {
-  const [state, dispatch] = (0, import_react83.useReducer)(shellReducer, initialState4);
-  const manager = (0, import_react83.useRef)(null);
+  const [state, dispatch] = (0, import_react85.useReducer)(shellReducer, initialState4);
+  const manager = (0, import_react85.useRef)(null);
   if (!manager.current) {
     manager.current = {
       wasVisibleBeforeForeground: false,
@@ -24101,7 +24187,7 @@ var useExecutionLifecycle = (addItemToHistory, setPendingHistoryItem, onExec, on
   }
   const m = manager.current;
   const activePtyId = state.activeShellPtyId ?? activeBackgroundExecutionId ?? void 0;
-  (0, import_react83.useEffect)(() => {
+  (0, import_react85.useEffect)(() => {
     const isForegroundActive = !!activePtyId || !!isWaitingForConfirmation;
     if (isForegroundActive) {
       if (m.restoreTimeout) {
@@ -24131,7 +24217,7 @@ var useExecutionLifecycle = (addItemToHistory, setPendingHistoryItem, onExec, on
     m,
     dispatch
   ]);
-  (0, import_react83.useEffect)(
+  (0, import_react85.useEffect)(
     () => () => {
       for (const unsubscribe of m.subscriptions.values()) {
         unsubscribe();
@@ -24140,7 +24226,7 @@ var useExecutionLifecycle = (addItemToHistory, setPendingHistoryItem, onExec, on
     },
     [m]
   );
-  const toggleBackgroundTasks = (0, import_react83.useCallback)(() => {
+  const toggleBackgroundTasks = (0, import_react85.useCallback)(() => {
     if (state.backgroundTasks.size > 0) {
       const willBeVisible = !state.isBackgroundTaskVisible;
       dispatch({ type: "TOGGLE_VISIBILITY" });
@@ -24172,7 +24258,7 @@ var useExecutionLifecycle = (addItemToHistory, setPendingHistoryItem, onExec, on
     m,
     dispatch
   ]);
-  const backgroundCurrentExecution = (0, import_react83.useCallback)(() => {
+  const backgroundCurrentExecution = (0, import_react85.useCallback)(() => {
     const pidToBackground = state.activeShellPtyId ?? activeBackgroundExecutionId;
     if (pidToBackground) {
       m.backgroundedPids.add(pidToBackground);
@@ -24188,7 +24274,7 @@ var useExecutionLifecycle = (addItemToHistory, setPendingHistoryItem, onExec, on
       }
     }
   }, [state.activeShellPtyId, activeBackgroundExecutionId, m]);
-  const dismissBackgroundTask = (0, import_react83.useCallback)(
+  const dismissBackgroundTask = (0, import_react85.useCallback)(
     async (pid) => {
       const shell = state.backgroundTasks.get(pid);
       if (shell) {
@@ -24206,7 +24292,7 @@ var useExecutionLifecycle = (addItemToHistory, setPendingHistoryItem, onExec, on
     },
     [state.backgroundTasks, dispatch, m]
   );
-  const registerBackgroundTask = (0, import_react83.useCallback)(
+  const registerBackgroundTask = (0, import_react85.useCallback)(
     (pid, command, initialOutput, completionBehavior) => {
       m.backgroundedPids.add(pid);
       dispatch({
@@ -24266,7 +24352,7 @@ var useExecutionLifecycle = (addItemToHistory, setPendingHistoryItem, onExec, on
     },
     [dispatch, m]
   );
-  (0, import_react83.useEffect)(() => {
+  (0, import_react85.useEffect)(() => {
     const listener = (info) => {
       if (m.backgroundedPids.has(info.executionId)) {
         return;
@@ -24283,7 +24369,7 @@ var useExecutionLifecycle = (addItemToHistory, setPendingHistoryItem, onExec, on
       ExecutionLifecycleService.offBackground(listener);
     };
   }, [registerBackgroundTask, m]);
-  const handleShellCommand = (0, import_react83.useCallback)(
+  const handleShellCommand = (0, import_react85.useCallback)(
     (rawQuery, abortSignal) => {
       if (typeof rawQuery !== "string" || rawQuery.trim() === "") {
         return false;
@@ -24608,21 +24694,21 @@ var BackgroundTaskDisplay = ({
     setIsBackgroundTaskListOpen
   } = useUIActions();
   const activeShell = shells.get(activePid);
-  const [output, setOutput] = (0, import_react84.useState)(
+  const [output, setOutput] = (0, import_react86.useState)(
     activeShell?.output || ""
   );
-  const [highlightedPid, setHighlightedPid] = (0, import_react84.useState)(
+  const [highlightedPid, setHighlightedPid] = (0, import_react86.useState)(
     activePid
   );
-  const outputRef = (0, import_react84.useRef)(null);
-  const subscribedRef = (0, import_react84.useRef)(false);
-  (0, import_react84.useEffect)(() => {
+  const outputRef = (0, import_react86.useRef)(null);
+  const subscribedRef = (0, import_react86.useRef)(false);
+  (0, import_react86.useEffect)(() => {
     if (!activePid) return;
     const ptyWidth = Math.max(1, width - BORDER_WIDTH - CONTENT_PADDING_X * 2);
     const ptyHeight = Math.max(1, height - TOTAL_OVERHEAD_HEIGHT);
     ShellExecutionService.resizePty(activePid, ptyWidth, ptyHeight);
   }, [activePid, width, height]);
-  (0, import_react84.useEffect)(() => {
+  (0, import_react86.useEffect)(() => {
     if (!activePid) {
       setOutput("");
       return;
@@ -24653,7 +24739,7 @@ var BackgroundTaskDisplay = ({
       subscribedRef.current = false;
     };
   }, [activePid, shells]);
-  (0, import_react84.useEffect)(() => {
+  (0, import_react86.useEffect)(() => {
     if (isListOpenProp) {
       setHighlightedPid(activePid);
     }
@@ -25074,12 +25160,12 @@ var App = () => {
 import process12 from "node:process";
 
 // packages/cli/src/ui/hooks/useMemoryMonitor.ts
-var import_react85 = __toESM(require_react(), 1);
+var import_react87 = __toESM(require_react(), 1);
 import process6 from "node:process";
 var MEMORY_WARNING_THRESHOLD = 7 * 1024 * 1024 * 1024;
 var MEMORY_CHECK_INTERVAL = 60 * 1e3;
 var useMemoryMonitor = ({ addItem }) => {
-  (0, import_react85.useEffect)(() => {
+  (0, import_react87.useEffect)(() => {
     const intervalId = setInterval(() => {
       const usage = process6.memoryUsage().rss;
       if (usage > MEMORY_WARNING_THRESHOLD) {
@@ -25098,17 +25184,17 @@ var useMemoryMonitor = ({ addItem }) => {
 };
 
 // packages/cli/src/ui/hooks/useThemeCommand.ts
-var import_react87 = __toESM(require_react(), 1);
+var import_react89 = __toESM(require_react(), 1);
 import process7 from "node:process";
 
 // packages/cli/src/ui/contexts/TerminalContext.tsx
-var import_react86 = __toESM(require_react(), 1);
+var import_react88 = __toESM(require_react(), 1);
 var import_jsx_runtime134 = __toESM(require_jsx_runtime(), 1);
-var TerminalContext = (0, import_react86.createContext)(
+var TerminalContext = (0, import_react88.createContext)(
   void 0
 );
 function useTerminalContext() {
-  const context = (0, import_react86.useContext)(TerminalContext);
+  const context = (0, import_react88.useContext)(TerminalContext);
   if (!context) {
     throw new Error(
       "useTerminalContext must be used within a TerminalProvider"
@@ -25119,21 +25205,21 @@ function useTerminalContext() {
 function TerminalProvider({ children }) {
   const { stdin } = use_stdin_default();
   const { stdout } = use_stdout_default();
-  const subscribers = (0, import_react86.useRef)(/* @__PURE__ */ new Set()).current;
-  const bufferRef = (0, import_react86.useRef)("");
-  const subscribe2 = (0, import_react86.useCallback)(
+  const subscribers = (0, import_react88.useRef)(/* @__PURE__ */ new Set()).current;
+  const bufferRef = (0, import_react88.useRef)("");
+  const subscribe2 = (0, import_react88.useCallback)(
     (handler) => {
       subscribers.add(handler);
     },
     [subscribers]
   );
-  const unsubscribe = (0, import_react86.useCallback)(
+  const unsubscribe = (0, import_react88.useCallback)(
     (handler) => {
       subscribers.delete(handler);
     },
     [subscribers]
   );
-  const queryTerminalBackground = (0, import_react86.useCallback)(
+  const queryTerminalBackground = (0, import_react88.useCallback)(
     async () => new Promise((resolve3) => {
       const handler = () => {
         unsubscribe(handler);
@@ -25148,7 +25234,7 @@ function TerminalProvider({ children }) {
     }),
     [stdout, subscribe2, unsubscribe]
   );
-  (0, import_react86.useEffect)(() => {
+  (0, import_react88.useEffect)(() => {
     const handleData = (data) => {
       bufferRef.current += typeof data === "string" ? data : data.toString("utf-8");
       const match = bufferRef.current.match(
@@ -25184,9 +25270,9 @@ function TerminalProvider({ children }) {
 
 // packages/cli/src/ui/hooks/useThemeCommand.ts
 var useThemeCommand = (loadedSettings, setThemeError, addItem, initialThemeError, refreshStatic) => {
-  const [isThemeDialogOpen, setIsThemeDialogOpen] = (0, import_react87.useState)(!!initialThemeError);
+  const [isThemeDialogOpen, setIsThemeDialogOpen] = (0, import_react89.useState)(!!initialThemeError);
   const { queryTerminalBackground } = useTerminalContext();
-  const openThemeDialog = (0, import_react87.useCallback)(async () => {
+  const openThemeDialog = (0, import_react89.useCallback)(async () => {
     if (process7.env["NO_COLOR"]) {
       addItem(
         {
@@ -25200,7 +25286,7 @@ var useThemeCommand = (loadedSettings, setThemeError, addItem, initialThemeError
     await queryTerminalBackground();
     setIsThemeDialogOpen(true);
   }, [addItem, queryTerminalBackground]);
-  const applyTheme = (0, import_react87.useCallback)(
+  const applyTheme = (0, import_react89.useCallback)(
     (themeName) => {
       if (!themeManager.setActiveTheme(themeName)) {
         setIsThemeDialogOpen(true);
@@ -25211,17 +25297,17 @@ var useThemeCommand = (loadedSettings, setThemeError, addItem, initialThemeError
     },
     [setThemeError]
   );
-  const handleThemeHighlight = (0, import_react87.useCallback)(
+  const handleThemeHighlight = (0, import_react89.useCallback)(
     (themeName) => {
       applyTheme(themeName);
     },
     [applyTheme]
   );
-  const closeThemeDialog = (0, import_react87.useCallback)(() => {
+  const closeThemeDialog = (0, import_react89.useCallback)(() => {
     applyTheme(loadedSettings.merged.ui.theme);
     setIsThemeDialogOpen(false);
   }, [applyTheme, loadedSettings]);
-  const handleThemeSelect = (0, import_react87.useCallback)(
+  const handleThemeSelect = (0, import_react89.useCallback)(
     async (themeName, scope) => {
       try {
         const mergedCustomThemes = {
@@ -25258,7 +25344,7 @@ var useThemeCommand = (loadedSettings, setThemeError, addItem, initialThemeError
 };
 
 // packages/cli/src/ui/hooks/useQuotaAndFallback.ts
-var import_react88 = __toESM(require_react(), 1);
+var import_react90 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/creditsFlowHandler.ts
 async function handleCreditsFlow(args) {
@@ -25456,13 +25542,13 @@ function useQuotaAndFallback({
   onShowAuthSelection,
   errorVerbosity = "full"
 }) {
-  const [proQuotaRequest, setProQuotaRequest] = (0, import_react88.useState)(null);
-  const [validationRequest, setValidationRequest] = (0, import_react88.useState)(null);
-  const [overageMenuRequest, setOverageMenuRequest] = (0, import_react88.useState)(null);
-  const [emptyWalletRequest, setEmptyWalletRequest] = (0, import_react88.useState)(null);
-  const isDialogPending = (0, import_react88.useRef)(false);
-  const isValidationPending = (0, import_react88.useRef)(false);
-  (0, import_react88.useEffect)(() => {
+  const [proQuotaRequest, setProQuotaRequest] = (0, import_react90.useState)(null);
+  const [validationRequest, setValidationRequest] = (0, import_react90.useState)(null);
+  const [overageMenuRequest, setOverageMenuRequest] = (0, import_react90.useState)(null);
+  const [emptyWalletRequest, setEmptyWalletRequest] = (0, import_react90.useState)(null);
+  const isDialogPending = (0, import_react90.useRef)(false);
+  const isValidationPending = (0, import_react90.useRef)(false);
+  (0, import_react90.useEffect)(() => {
     const fallbackHandler = async (failedModel, fallbackModel, error) => {
       const contentGeneratorConfig = config.getContentGeneratorConfig();
       let message;
@@ -25588,7 +25674,7 @@ function useQuotaAndFallback({
     onShowAuthSelection,
     errorVerbosity
   ]);
-  (0, import_react88.useEffect)(() => {
+  (0, import_react90.useEffect)(() => {
     const validationHandler = async (validationLink, validationDescription, learnMoreUrl) => {
       if (isValidationPending.current) {
         return "cancel";
@@ -25608,7 +25694,7 @@ function useQuotaAndFallback({
     };
     config.setValidationHandler(validationHandler);
   }, [config]);
-  const handleProQuotaChoice = (0, import_react88.useCallback)(
+  const handleProQuotaChoice = (0, import_react90.useCallback)(
     (choice) => {
       if (!proQuotaRequest) return;
       const intent = choice;
@@ -25631,7 +25717,7 @@ function useQuotaAndFallback({
     },
     [proQuotaRequest, historyManager, config, setModelSwitchedFromQuotaError]
   );
-  const handleValidationChoice = (0, import_react88.useCallback)(
+  const handleValidationChoice = (0, import_react90.useCallback)(
     (choice) => {
       if (!isValidationPending.current || !validationRequest) return;
       isValidationPending.current = false;
@@ -25643,14 +25729,14 @@ function useQuotaAndFallback({
     },
     [validationRequest, onShowAuthSelection]
   );
-  const handleOverageMenuChoice = (0, import_react88.useCallback)(
+  const handleOverageMenuChoice = (0, import_react90.useCallback)(
     (choice) => {
       if (!overageMenuRequest) return;
       overageMenuRequest.resolve(choice);
     },
     [overageMenuRequest]
   );
-  const handleEmptyWalletChoice = (0, import_react88.useCallback)(
+  const handleEmptyWalletChoice = (0, import_react90.useCallback)(
     (choice) => {
       if (!emptyWalletRequest) return;
       emptyWalletRequest.resolve(choice);
@@ -25680,7 +25766,7 @@ function getResetTimeMessage(delayMs) {
 }
 
 // packages/cli/src/ui/hooks/useEditorSettings.ts
-var import_react89 = __toESM(require_react(), 1);
+var import_react91 = __toESM(require_react(), 1);
 
 // packages/cli/src/config/settingPaths.ts
 var SettingPaths = {
@@ -25691,11 +25777,11 @@ var SettingPaths = {
 
 // packages/cli/src/ui/hooks/useEditorSettings.ts
 var useEditorSettings = (loadedSettings, setEditorError, addItem) => {
-  const [isEditorDialogOpen, setIsEditorDialogOpen] = (0, import_react89.useState)(false);
-  const openEditorDialog = (0, import_react89.useCallback)(() => {
+  const [isEditorDialogOpen, setIsEditorDialogOpen] = (0, import_react91.useState)(false);
+  const openEditorDialog = (0, import_react91.useCallback)(() => {
     setIsEditorDialogOpen(true);
   }, []);
-  const handleEditorSelect = (0, import_react89.useCallback)(
+  const handleEditorSelect = (0, import_react91.useCallback)(
     (editorType, scope) => {
       if (editorType && (!hasValidEditorCommand(editorType) || !allowEditorTypeInSandbox(editorType))) {
         return;
@@ -25722,7 +25808,7 @@ var useEditorSettings = (loadedSettings, setEditorError, addItem) => {
     },
     [loadedSettings, setEditorError, addItem]
   );
-  const exitEditorDialog = (0, import_react89.useCallback)(() => {
+  const exitEditorDialog = (0, import_react91.useCallback)(() => {
     setIsEditorDialogOpen(false);
     coreEvents.emit("editor-selected" /* EditorSelected */, { editor: void 0 });
   }, []);
@@ -25735,13 +25821,13 @@ var useEditorSettings = (loadedSettings, setEditorError, addItem) => {
 };
 
 // packages/cli/src/ui/hooks/useSettingsCommand.ts
-var import_react90 = __toESM(require_react(), 1);
+var import_react92 = __toESM(require_react(), 1);
 function useSettingsCommand() {
-  const [isSettingsDialogOpen, setIsSettingsDialogOpen] = (0, import_react90.useState)(false);
-  const openSettingsDialog = (0, import_react90.useCallback)(() => {
+  const [isSettingsDialogOpen, setIsSettingsDialogOpen] = (0, import_react92.useState)(false);
+  const openSettingsDialog = (0, import_react92.useCallback)(() => {
     setIsSettingsDialogOpen(true);
   }, []);
-  const closeSettingsDialog = (0, import_react90.useCallback)(() => {
+  const closeSettingsDialog = (0, import_react92.useCallback)(() => {
     setIsSettingsDialogOpen(false);
   }, []);
   return {
@@ -25752,13 +25838,13 @@ function useSettingsCommand() {
 }
 
 // packages/cli/src/ui/hooks/useModelCommand.ts
-var import_react91 = __toESM(require_react(), 1);
+var import_react93 = __toESM(require_react(), 1);
 var useModelCommand = () => {
-  const [isModelDialogOpen, setIsModelDialogOpen] = (0, import_react91.useState)(false);
-  const openModelDialog = (0, import_react91.useCallback)(() => {
+  const [isModelDialogOpen, setIsModelDialogOpen] = (0, import_react93.useState)(false);
+  const openModelDialog = (0, import_react93.useCallback)(() => {
     setIsModelDialogOpen(true);
   }, []);
-  const closeModelDialog = (0, import_react91.useCallback)(() => {
+  const closeModelDialog = (0, import_react93.useCallback)(() => {
     setIsModelDialogOpen(false);
   }, []);
   return {
@@ -25769,13 +25855,13 @@ var useModelCommand = () => {
 };
 
 // packages/cli/src/ui/hooks/useVoiceModelCommand.ts
-var import_react92 = __toESM(require_react(), 1);
+var import_react94 = __toESM(require_react(), 1);
 var useVoiceModelCommand = () => {
-  const [isVoiceModelDialogOpen, setIsVoiceModelDialogOpen] = (0, import_react92.useState)(false);
-  const openVoiceModelDialog = (0, import_react92.useCallback)(() => {
+  const [isVoiceModelDialogOpen, setIsVoiceModelDialogOpen] = (0, import_react94.useState)(false);
+  const openVoiceModelDialog = (0, import_react94.useCallback)(() => {
     setIsVoiceModelDialogOpen(true);
   }, []);
-  const closeVoiceModelDialog = (0, import_react92.useCallback)(() => {
+  const closeVoiceModelDialog = (0, import_react94.useCallback)(() => {
     setIsVoiceModelDialogOpen(false);
   }, []);
   return {
@@ -25786,7 +25872,7 @@ var useVoiceModelCommand = () => {
 };
 
 // packages/cli/src/ui/hooks/slashCommandProcessor.ts
-var import_react93 = __toESM(require_react(), 1);
+var import_react95 = __toESM(require_react(), 1);
 import process8 from "node:process";
 
 // packages/cli/src/services/SkillCommandLoader.ts
@@ -25879,41 +25965,41 @@ var LogoutConfirmationDialog = ({ onSelect }) => {
 // packages/cli/src/ui/hooks/slashCommandProcessor.ts
 var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHistory, refreshStatic, toggleVimEnabled, setIsProcessing, actions, extensionsUpdateState, isConfigInitialized, setBannerVisible, setCustomDialog) => {
   const session = useSessionStats();
-  const [commands, setCommands] = (0, import_react93.useState)(
+  const [commands, setCommands] = (0, import_react95.useState)(
     void 0
   );
-  const [reloadTrigger, setReloadTrigger] = (0, import_react93.useState)(0);
-  const reloadCommands = (0, import_react93.useCallback)(() => {
+  const [reloadTrigger, setReloadTrigger] = (0, import_react95.useState)(0);
+  const reloadCommands = (0, import_react95.useCallback)(() => {
     setReloadTrigger((v) => v + 1);
   }, []);
-  const [confirmationRequest, setConfirmationRequest] = (0, import_react93.useState)(null);
-  const [sessionShellAllowlist, setSessionShellAllowlist] = (0, import_react93.useState)(
+  const [confirmationRequest, setConfirmationRequest] = (0, import_react95.useState)(null);
+  const [sessionShellAllowlist, setSessionShellAllowlist] = (0, import_react95.useState)(
     /* @__PURE__ */ new Set()
   );
-  const gitService = (0, import_react93.useMemo)(() => {
+  const gitService = (0, import_react95.useMemo)(() => {
     if (!config?.getProjectRoot()) {
       return;
     }
     return new GitService(config.getProjectRoot(), config.storage);
   }, [config]);
-  const logger = (0, import_react93.useMemo)(() => {
+  const logger = (0, import_react95.useMemo)(() => {
     const l = new Logger(
       config?.getSessionId() || "",
       config?.storage ?? new Storage(process8.cwd())
     );
     return l;
   }, [config]);
-  const [pendingItem, setPendingItem] = (0, import_react93.useState)(
+  const [pendingItem, setPendingItem] = (0, import_react95.useState)(
     null
   );
-  const pendingHistoryItems = (0, import_react93.useMemo)(() => {
+  const pendingHistoryItems = (0, import_react95.useMemo)(() => {
     const items = [];
     if (pendingItem != null) {
       items.push(pendingItem);
     }
     return items;
   }, [pendingItem]);
-  const addMessage = (0, import_react93.useCallback)(
+  const addMessage = (0, import_react95.useCallback)(
     (message) => {
       let historyItemContent;
       if (message.type === "about" /* ABOUT */) {
@@ -25965,7 +26051,7 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
     },
     [addItem]
   );
-  const commandContext = (0, import_react93.useMemo)(
+  const commandContext = (0, import_react95.useMemo)(
     () => ({
       services: {
         agentContext: config,
@@ -26031,7 +26117,7 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
       setCustomDialog
     ]
   );
-  (0, import_react93.useEffect)(() => {
+  (0, import_react95.useEffect)(() => {
     if (!config) {
       return;
     }
@@ -26062,7 +26148,7 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
       coreEvents.off("extensionsStopping", extensionEventListener);
     };
   }, [config, reloadCommands]);
-  (0, import_react93.useEffect)(() => {
+  (0, import_react95.useEffect)(() => {
     const controller = new AbortController();
     (async () => {
       const commandService = await CommandService.create(
@@ -26083,7 +26169,7 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
       controller.abort();
     };
   }, [config, reloadTrigger, isConfigInitialized]);
-  const handleSlashCommand = (0, import_react93.useCallback)(
+  const handleSlashCommand = (0, import_react95.useCallback)(
     async (rawQuery, oneTimeShellAllowlist, overwriteConfirmed, addToHistory = true) => {
       if (!commands) {
         return false;
@@ -26172,7 +26258,7 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
                   return { type: "handled" };
                 case "logout":
                   setCustomDialog(
-                    (0, import_react93.createElement)(LogoutConfirmationDialog, {
+                    (0, import_react95.createElement)(LogoutConfirmationDialog, {
                       onSelect: async (choice) => {
                         setCustomDialog(null);
                         if (choice === "login" /* LOGIN */) {
@@ -26486,12 +26572,12 @@ var BEL = "\x07";
 var SEP = ";";
 var isTerminalApp = !isBrowser && process9.env.TERM_PROGRAM === "Apple_Terminal";
 var isWindows2 = !isBrowser && process9.platform === "win32";
-var isTmux = !isBrowser && (process9.env.TERM?.startsWith("screen") || process9.env.TERM?.startsWith("tmux") || process9.env.TMUX !== void 0);
+var isTmux2 = !isBrowser && (process9.env.TERM?.startsWith("screen") || process9.env.TERM?.startsWith("tmux") || process9.env.TMUX !== void 0);
 var cwdFunction = isBrowser ? () => {
   throw new Error("`process.cwd()` only works in Node.js, not the browser.");
 } : process9.cwd;
 var wrapOsc = (sequence) => {
-  if (isTmux) {
+  if (isTmux2) {
     return "\x1BPtmux;" + sequence.replaceAll("\x1B", "\x1B\x1B") + "\x1B\\";
   }
   return sequence;
@@ -26682,10 +26768,10 @@ function computeTerminalTitle({
 }
 
 // packages/cli/src/ui/hooks/useLogger.ts
-var import_react94 = __toESM(require_react(), 1);
+var import_react96 = __toESM(require_react(), 1);
 var useLogger = (config) => {
-  const [logger, setLogger] = (0, import_react94.useState)(null);
-  (0, import_react94.useEffect)(() => {
+  const [logger, setLogger] = (0, import_react96.useState)(null);
+  (0, import_react96.useEffect)(() => {
     const newLogger = new Logger(config.getSessionId(), config.storage);
     newLogger.initialize().then(() => setLogger(newLogger)).catch(() => {
     });
@@ -26694,7 +26780,7 @@ var useLogger = (config) => {
 };
 
 // packages/cli/src/ui/hooks/useGeminiStream.ts
-var import_react99 = __toESM(require_react(), 1);
+var import_react101 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/utils/markdownUtilities.ts
 var isIndexInsideCodeBlock = (content, indexToTest) => {
@@ -26755,11 +26841,11 @@ var findLastSafeSplitPoint = (content) => {
 };
 
 // packages/cli/src/ui/hooks/useStateAndRef.ts
-var import_react95 = __toESM(require_react(), 1);
+var import_react97 = __toESM(require_react(), 1);
 var useStateAndRef = (initialValue) => {
-  const [state, setState] = import_react95.default.useState(initialValue);
-  const ref = import_react95.default.useRef(initialValue);
-  const setStateInternal = import_react95.default.useCallback(
+  const [state, setState] = import_react97.default.useState(initialValue);
+  const ref = import_react97.default.useRef(initialValue);
+  const setStateInternal = import_react97.default.useCallback(
     (newStateOrCallback) => {
       let newValue;
       if (typeof newStateOrCallback === "function") {
@@ -26868,21 +26954,21 @@ function mapToDisplay(toolOrTools, options = {}) {
 }
 
 // packages/cli/src/ui/hooks/useToolScheduler.ts
-var import_react96 = __toESM(require_react(), 1);
+var import_react98 = __toESM(require_react(), 1);
 function useToolScheduler(onComplete, config, getPreferredEditor) {
-  const [toolCallsMap, setToolCallsMap] = (0, import_react96.useState)({});
-  const [lastToolOutputTime, setLastToolOutputTime] = (0, import_react96.useState)(0);
-  const [subagentHistoryMap, setSubagentHistoryMap] = (0, import_react96.useState)({});
-  const messageBus = (0, import_react96.useMemo)(() => config.getMessageBus(), [config]);
-  const onCompleteRef = (0, import_react96.useRef)(onComplete);
-  (0, import_react96.useEffect)(() => {
+  const [toolCallsMap, setToolCallsMap] = (0, import_react98.useState)({});
+  const [lastToolOutputTime, setLastToolOutputTime] = (0, import_react98.useState)(0);
+  const [subagentHistoryMap, setSubagentHistoryMap] = (0, import_react98.useState)({});
+  const messageBus = (0, import_react98.useMemo)(() => config.getMessageBus(), [config]);
+  const onCompleteRef = (0, import_react98.useRef)(onComplete);
+  (0, import_react98.useEffect)(() => {
     onCompleteRef.current = onComplete;
   }, [onComplete]);
-  const getPreferredEditorRef = (0, import_react96.useRef)(getPreferredEditor);
-  (0, import_react96.useEffect)(() => {
+  const getPreferredEditorRef = (0, import_react98.useRef)(getPreferredEditor);
+  (0, import_react98.useEffect)(() => {
     getPreferredEditorRef.current = getPreferredEditor;
   }, [getPreferredEditor]);
-  const scheduler = (0, import_react96.useMemo)(
+  const scheduler = (0, import_react98.useMemo)(
     () => new Scheduler({
       context: config,
       messageBus,
@@ -26891,12 +26977,12 @@ function useToolScheduler(onComplete, config, getPreferredEditor) {
     }),
     [config, messageBus]
   );
-  (0, import_react96.useEffect)(() => () => scheduler.dispose(), [scheduler]);
-  const internalAdaptToolCalls = (0, import_react96.useCallback)(
+  (0, import_react98.useEffect)(() => () => scheduler.dispose(), [scheduler]);
+  const internalAdaptToolCalls = (0, import_react98.useCallback)(
     (coreCalls, prevTracked) => adaptToolCalls(coreCalls, prevTracked),
     []
   );
-  (0, import_react96.useEffect)(() => {
+  (0, import_react98.useEffect)(() => {
     const handler = (event) => {
       const isRoot = event.schedulerId === ROOT_SCHEDULER_ID;
       const hasExecuting = event.toolCalls.some(
@@ -26926,7 +27012,7 @@ function useToolScheduler(onComplete, config, getPreferredEditor) {
       messageBus.unsubscribe("tool-calls-update" /* TOOL_CALLS_UPDATE */, handler);
     };
   }, [messageBus, internalAdaptToolCalls]);
-  (0, import_react96.useEffect)(() => {
+  (0, import_react98.useEffect)(() => {
     const handler = (event) => {
       setSubagentHistoryMap((prev) => {
         const history = prev[event.subagentName] ?? [];
@@ -26950,7 +27036,7 @@ function useToolScheduler(onComplete, config, getPreferredEditor) {
       messageBus.unsubscribe("subagent-activity" /* SUBAGENT_ACTIVITY */, handler);
     };
   }, [messageBus]);
-  const schedule = (0, import_react96.useCallback)(
+  const schedule = (0, import_react98.useCallback)(
     async (request, signal) => {
       setToolCallsMap({});
       setSubagentHistoryMap({});
@@ -26960,13 +27046,13 @@ function useToolScheduler(onComplete, config, getPreferredEditor) {
     },
     [scheduler]
   );
-  const cancelAll = (0, import_react96.useCallback)(
+  const cancelAll = (0, import_react98.useCallback)(
     (_signal) => {
       scheduler.cancelAll();
     },
     [scheduler]
   );
-  const markToolsAsSubmitted = (0, import_react96.useCallback)(
+  const markToolsAsSubmitted = (0, import_react98.useCallback)(
     (callIdsToMark) => {
       setToolCallsMap((prevMap) => {
         const nextMap = { ...prevMap };
@@ -26980,7 +27066,7 @@ function useToolScheduler(onComplete, config, getPreferredEditor) {
     },
     []
   );
-  const toolCalls = (0, import_react96.useMemo)(() => {
+  const toolCalls = (0, import_react98.useMemo)(() => {
     const flattened = Object.values(toolCallsMap).flat();
     return flattened.map((tc) => {
       let subagentName = tc.request.name;
@@ -27009,7 +27095,7 @@ function useToolScheduler(onComplete, config, getPreferredEditor) {
       };
     });
   }, [toolCallsMap, subagentHistoryMap]);
-  const setToolCallsForDisplay = (0, import_react96.useCallback)(
+  const setToolCallsForDisplay = (0, import_react98.useCallback)(
     (action) => {
       setToolCallsMap((prev) => {
         const currentFlattened = Object.values(prev).flat();
@@ -27062,15 +27148,15 @@ import { promises as fs6 } from "node:fs";
 import path13 from "node:path";
 
 // packages/cli/src/ui/hooks/useAgentStream.ts
-var import_react98 = __toESM(require_react(), 1);
+var import_react100 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/useTurnActivityMonitor.ts
-var import_react97 = __toESM(require_react(), 1);
+var import_react99 = __toESM(require_react(), 1);
 var useTurnActivityMonitor = (streamingState, activePtyId, pendingToolCalls = []) => {
-  const [operationStartTime, setOperationStartTime] = (0, import_react97.useState)(0);
-  const prevPtyIdRef = (0, import_react97.useRef)(void 0);
-  const prevStreamingStateRef = (0, import_react97.useRef)(void 0);
-  (0, import_react97.useEffect)(() => {
+  const [operationStartTime, setOperationStartTime] = (0, import_react99.useState)(0);
+  const prevPtyIdRef = (0, import_react99.useRef)(void 0);
+  const prevStreamingStateRef = (0, import_react99.useRef)(void 0);
+  (0, import_react99.useEffect)(() => {
     const isNowResponding = streamingState === "responding" /* Responding */;
     const wasResponding = prevStreamingStateRef.current === "responding" /* Responding */;
     const ptyChanged = activePtyId !== prevPtyIdRef.current;
@@ -27082,7 +27168,7 @@ var useTurnActivityMonitor = (streamingState, activePtyId, pendingToolCalls = []
     prevPtyIdRef.current = activePtyId;
     prevStreamingStateRef.current = streamingState;
   }, [streamingState, activePtyId]);
-  const isRedirectionActive = (0, import_react97.useMemo)(
+  const isRedirectionActive = (0, import_react99.useMemo)(
     () => (
       // Check active tool calls for run_shell_command
       pendingToolCalls.some((tc) => {
@@ -27142,25 +27228,25 @@ var useAgentStream = ({
   isShellFocused,
   logger
 }) => {
-  const [initError] = (0, import_react98.useState)(null);
-  const [retryStatus] = (0, import_react98.useState)(null);
-  const [streamingState, setStreamingState] = (0, import_react98.useState)(
+  const [initError] = (0, import_react100.useState)(null);
+  const [retryStatus] = (0, import_react100.useState)(null);
+  const [streamingState, setStreamingState] = (0, import_react100.useState)(
     "idle" /* Idle */
   );
-  const [thought, setThought] = (0, import_react98.useState)(null);
-  const [lastOutputTime, setLastOutputTime] = (0, import_react98.useState)(Date.now());
-  const currentStreamIdRef = (0, import_react98.useRef)(null);
-  const userMessageTimestampRef = (0, import_react98.useRef)(0);
-  const geminiMessageBufferRef = (0, import_react98.useRef)("");
+  const [thought, setThought] = (0, import_react100.useState)(null);
+  const [lastOutputTime, setLastOutputTime] = (0, import_react100.useState)(Date.now());
+  const currentStreamIdRef = (0, import_react100.useRef)(null);
+  const userMessageTimestampRef = (0, import_react100.useRef)(0);
+  const geminiMessageBufferRef = (0, import_react100.useRef)("");
   const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
   const [trackedTools, trackedToolsRef, setTrackedTools] = useStateAndRef([]);
-  const toolRequestArgsRef = (0, import_react98.useRef)(
+  const toolRequestArgsRef = (0, import_react100.useRef)(
     /* @__PURE__ */ new Map()
   );
-  const cancellationStateRef = (0, import_react98.useRef)(
+  const cancellationStateRef = (0, import_react100.useRef)(
     "idle" /* Idle */
   );
-  const cancelPromiseRef = (0, import_react98.useRef)(Promise.resolve());
+  const cancelPromiseRef = (0, import_react100.useRef)(Promise.resolve());
   const [pushedToolCallIds, pushedToolCallIdsRef, setPushedToolCallIds] = useStateAndRef(/* @__PURE__ */ new Set());
   const [_isFirstToolInGroup, isFirstToolInGroupRef, setIsFirstToolInGroup] = useStateAndRef(true);
   const [_hasEmittedBoxInTurn, hasEmittedBoxInTurnRef, setHasEmittedBoxInTurn] = useStateAndRef(false);
@@ -27168,13 +27254,13 @@ var useAgentStream = ({
   const activePtyId = void 0;
   const backgroundTaskCount = 0;
   const isBackgroundTaskVisible = false;
-  const toggleBackgroundTasks = (0, import_react98.useCallback)(() => {
+  const toggleBackgroundTasks = (0, import_react100.useCallback)(() => {
   }, []);
   const backgroundCurrentExecution = void 0;
-  const backgroundTasks = (0, import_react98.useMemo)(() => /* @__PURE__ */ new Map(), []);
-  const dismissBackgroundTask = (0, import_react98.useCallback)(async (_pid) => {
+  const backgroundTasks = (0, import_react100.useMemo)(() => /* @__PURE__ */ new Map(), []);
+  const dismissBackgroundTask = (0, import_react100.useCallback)(async (_pid) => {
   }, []);
-  const pendingToolCalls = (0, import_react98.useMemo)(
+  const pendingToolCalls = (0, import_react100.useMemo)(
     () => trackedTools.map((t) => ({
       request: {
         name: t.originalRequestName || t.name,
@@ -27187,15 +27273,15 @@ var useAgentStream = ({
     })),
     [trackedTools]
   );
-  const [loopDetectionConfirmationRequest] = (0, import_react98.useState)(null);
-  const flushPendingText = (0, import_react98.useCallback)(() => {
+  const [loopDetectionConfirmationRequest] = (0, import_react100.useState)(null);
+  const flushPendingText = (0, import_react100.useCallback)(() => {
     if (pendingHistoryItemRef.current) {
       addItem(pendingHistoryItemRef.current, userMessageTimestampRef.current);
       setPendingHistoryItem(null);
       geminiMessageBufferRef.current = "";
     }
   }, [addItem, pendingHistoryItemRef, setPendingHistoryItem]);
-  const cancelOngoingRequest = (0, import_react98.useCallback)(
+  const cancelOngoingRequest = (0, import_react100.useCallback)(
     async (clearBuffer = true) => {
       if (!agent) {
         return;
@@ -27322,13 +27408,13 @@ var useAgentStream = ({
       trackedToolsRef
     ]
   );
-  const handleApprovalModeChange = (0, import_react98.useCallback)(
+  const handleApprovalModeChange = (0, import_react100.useCallback)(
     async (newApprovalMode) => {
       debugLogger.debug(`Approval mode changed to ${newApprovalMode} (stub)`);
     },
     []
   );
-  const handleEvent = (0, import_react98.useCallback)(
+  const handleEvent = (0, import_react100.useCallback)(
     (event) => {
       setLastOutputTime(Date.now());
       switch (event.type) {
@@ -27482,7 +27568,7 @@ var useAgentStream = ({
       setLastOutputTime
     ]
   );
-  (0, import_react98.useEffect)(() => {
+  (0, import_react100.useEffect)(() => {
     const unsubscribe = agent?.subscribe(handleEvent);
     return () => unsubscribe?.();
   }, [agent, handleEvent]);
@@ -27498,7 +27584,7 @@ var useAgentStream = ({
       isActive: streamingState === "responding" /* Responding */ || streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */
     }
   );
-  const submitQuery = (0, import_react98.useCallback)(
+  const submitQuery = (0, import_react100.useCallback)(
     async (query, options, _prompt_id) => {
       if (!agent) return;
       const timestamp = Date.now();
@@ -27530,7 +27616,7 @@ var useAgentStream = ({
     },
     [agent, addItem, logger, startNewPrompt]
   );
-  (0, import_react98.useEffect)(() => {
+  (0, import_react100.useEffect)(() => {
     if (trackedTools.length > 0) {
       const isNewBatch = !trackedTools.some(
         (tc) => pushedToolCallIdsRef.current.has(tc.callId)
@@ -27550,7 +27636,7 @@ var useAgentStream = ({
     setIsFirstToolInGroup,
     streamingState
   ]);
-  (0, import_react98.useEffect)(() => {
+  (0, import_react100.useEffect)(() => {
     if (trackedTools.length === 0) return;
     const allTerminal = trackedTools.every(
       (tc) => tc.status === "success" || tc.status === "error" || tc.status === "cancelled"
@@ -27607,7 +27693,7 @@ var useAgentStream = ({
     isShellFocused,
     backgroundTasks
   ]);
-  const pendingToolGroupItems = (0, import_react98.useMemo)(() => {
+  const pendingToolGroupItems = (0, import_react100.useMemo)(() => {
     const remainingTools = trackedTools.filter(
       (tc) => !pushedToolCallIdsRef.current.has(tc.callId)
     );
@@ -27663,7 +27749,7 @@ var useAgentStream = ({
     isShellFocused,
     backgroundTasks
   ]);
-  const pendingHistoryItems = (0, import_react98.useMemo)(
+  const pendingHistoryItems = (0, import_react100.useMemo)(
     () => [pendingHistoryItem, ...pendingToolGroupItems].filter(
       (i) => i !== void 0 && i !== null
     ),
@@ -27739,41 +27825,41 @@ function calculateStreamingState(isResponding, toolCalls) {
   return "idle" /* Idle */;
 }
 var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, _performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onCancelSubmit, setShellInputFocused, terminalWidth, terminalHeight, isShellFocused, consumeUserHint) => {
-  const [initError, setInitError] = (0, import_react99.useState)(null);
-  const [retryStatus, setRetryStatus] = (0, import_react99.useState)(
+  const [initError, setInitError] = (0, import_react101.useState)(null);
+  const [retryStatus, setRetryStatus] = (0, import_react101.useState)(
     null
   );
   const isLowErrorVerbosity = settings.merged.ui?.errorVerbosity !== "full";
-  const suppressedToolErrorCountRef = (0, import_react99.useRef)(0);
-  const suppressedToolErrorNoteShownRef = (0, import_react99.useRef)(false);
-  const lowVerbosityFailureNoteShownRef = (0, import_react99.useRef)(false);
-  const abortControllerRef = (0, import_react99.useRef)(null);
-  const turnCancelledRef = (0, import_react99.useRef)(false);
-  const pendingToolCallRequestsRef = (0, import_react99.useRef)([]);
-  const activeSchedulePromiseRef = (0, import_react99.useRef)(null);
-  const cancellationStateRef = (0, import_react99.useRef)(
+  const suppressedToolErrorCountRef = (0, import_react101.useRef)(0);
+  const suppressedToolErrorNoteShownRef = (0, import_react101.useRef)(false);
+  const lowVerbosityFailureNoteShownRef = (0, import_react101.useRef)(false);
+  const abortControllerRef = (0, import_react101.useRef)(null);
+  const turnCancelledRef = (0, import_react101.useRef)(false);
+  const pendingToolCallRequestsRef = (0, import_react101.useRef)([]);
+  const activeSchedulePromiseRef = (0, import_react101.useRef)(null);
+  const cancellationStateRef = (0, import_react101.useRef)(
     "idle" /* Idle */
   );
-  const cancelPromiseRef = (0, import_react99.useRef)(Promise.resolve());
-  const activeQueryIdRef = (0, import_react99.useRef)(null);
-  const previousApprovalModeRef = (0, import_react99.useRef)(
+  const cancelPromiseRef = (0, import_react101.useRef)(Promise.resolve());
+  const activeQueryIdRef = (0, import_react101.useRef)(null);
+  const previousApprovalModeRef = (0, import_react101.useRef)(
     config.getApprovalMode()
   );
   const [isResponding, isRespondingRef, setIsResponding] = useStateAndRef(false);
   const [thought, thoughtRef, setThought] = useStateAndRef(null);
   const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
-  const [lastGeminiActivityTime, setLastGeminiActivityTime] = (0, import_react99.useState)(0);
+  const [lastGeminiActivityTime, setLastGeminiActivityTime] = (0, import_react101.useState)(0);
   const [pushedToolCallIds, pushedToolCallIdsRef, setPushedToolCallIds] = useStateAndRef(/* @__PURE__ */ new Set());
   const [_isFirstToolInGroup, isFirstToolInGroupRef, setIsFirstToolInGroup] = useStateAndRef(true);
   const { startNewPrompt, getPromptCount } = useSessionStats();
   const logger = useLogger(config);
-  const gitService = (0, import_react99.useMemo)(() => {
+  const gitService = (0, import_react101.useMemo)(() => {
     if (!config.getProjectRoot()) {
       return;
     }
     return new GitService(config.getProjectRoot(), config.storage);
   }, [config]);
-  (0, import_react99.useEffect)(() => {
+  (0, import_react101.useEffect)(() => {
     const handleRetryAttempt = (payload) => {
       if (turnCancelledRef.current || !isRespondingRef.current) {
         return;
@@ -27859,13 +27945,13 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     config,
     getPreferredEditor
   );
-  const activeBackgroundExecutionId = (0, import_react99.useMemo)(() => {
+  const activeBackgroundExecutionId = (0, import_react101.useMemo)(() => {
     const executingBackgroundableTool = toolCalls.find(
       isBackgroundableExecutingToolCall
     );
     return executingBackgroundableTool?.pid;
   }, [toolCalls]);
-  const onExec = (0, import_react99.useCallback)(
+  const onExec = (0, import_react101.useCallback)(
     async (done) => {
       setIsResponding(true);
       await done;
@@ -27896,11 +27982,11 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     terminalHeight,
     activeBackgroundExecutionId
   );
-  const streamingState = (0, import_react99.useMemo)(
+  const streamingState = (0, import_react101.useMemo)(
     () => calculateStreamingState(isResponding, toolCalls),
     [isResponding, toolCalls]
   );
-  (0, import_react99.useEffect)(() => {
+  (0, import_react101.useEffect)(() => {
     if (toolCalls.length > 0) {
       const isNewBatch = !toolCalls.some(
         (tc) => pushedToolCallIdsRef.current.has(tc.request.callId)
@@ -27920,29 +28006,17 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     setIsFirstToolInGroup,
     streamingState
   ]);
-  (0, import_react99.useEffect)(() => {
+  (0, import_react101.useEffect)(() => {
+    const isFinished = (tc) => tc.status === "success" || tc.status === "error" || tc.status === "cancelled";
     const toolsToPush = [];
-    for (let i = 0; i < toolCalls.length; i++) {
-      const tc = toolCalls[i];
+    for (const tc of toolCalls) {
       if (pushedToolCallIdsRef.current.has(tc.request.callId)) continue;
-      if (tc.status === "success" || tc.status === "error" || tc.status === "cancelled") {
-        const isAgent = tc.tool?.kind === "agent" /* Agent */;
-        if (isAgent) {
-          let contigAgentsComplete = true;
-          for (let j = i + 1; j < toolCalls.length; j++) {
-            const nextTc = toolCalls[j];
-            if (nextTc.tool?.kind === "agent" /* Agent */) {
-              if (nextTc.status !== "success" && nextTc.status !== "error" && nextTc.status !== "cancelled") {
-                contigAgentsComplete = false;
-                break;
-              }
-            } else {
-              break;
-            }
-          }
-          if (!contigAgentsComplete) {
-            break;
-          }
+      if (isFinished(tc)) {
+        const { groupId } = tc.request;
+        if (groupId !== void 0 && toolCalls.some(
+          (other) => other.request.groupId === groupId && !isFinished(other)
+        )) {
+          break;
         }
         toolsToPush.push(tc);
       } else {
@@ -27954,21 +28028,16 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       const isFirstInThisPush = isFirstToolInGroupRef.current;
       const isCompactModeEnabled = settings.merged.ui?.compactToolOutput === true;
       const groups = [];
-      let currentGroup = [];
+      let currentGroupId;
       for (const tc of toolsToPush) {
         newPushed.add(tc.request.callId);
-        if (tc.tool?.kind === "agent" /* Agent */) {
-          currentGroup.push(tc);
+        const { groupId } = tc.request;
+        if (groupId !== void 0 && groupId === currentGroupId) {
+          groups[groups.length - 1].push(tc);
         } else {
-          if (currentGroup.length > 0) {
-            groups.push(currentGroup);
-            currentGroup = [];
-          }
           groups.push([tc]);
         }
-      }
-      if (currentGroup.length > 0) {
-        groups.push(currentGroup);
+        currentGroupId = groupId;
       }
       for (let i = 0; i < groups.length; i++) {
         const group = groups[i];
@@ -28020,7 +28089,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     backgroundTasks,
     settings.merged.ui?.compactToolOutput
   ]);
-  const pendingToolGroupItems = (0, import_react99.useMemo)(() => {
+  const pendingToolGroupItems = (0, import_react101.useMemo)(() => {
     const remainingTools = toolCalls.filter(
       (tc) => !pushedToolCallIds.has(tc.request.callId)
     );
@@ -28090,26 +28159,26 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     backgroundTasks,
     settings.merged.ui?.compactToolOutput
   ]);
-  const lastQueryRef = (0, import_react99.useRef)(null);
-  const lastPromptIdRef = (0, import_react99.useRef)(null);
-  const loopDetectedRef = (0, import_react99.useRef)(false);
-  const autoNudgeAttemptCountRef = (0, import_react99.useRef)(0);
+  const lastQueryRef = (0, import_react101.useRef)(null);
+  const lastPromptIdRef = (0, import_react101.useRef)(null);
+  const loopDetectedRef = (0, import_react101.useRef)(false);
+  const autoNudgeAttemptCountRef = (0, import_react101.useRef)(0);
   const MAX_AUTO_NUDGE_ATTEMPTS = 2;
-  const submitQueryRef = (0, import_react99.useRef)(null);
+  const submitQueryRef = (0, import_react101.useRef)(null);
   const [
     loopDetectionConfirmationRequest,
     setLoopDetectionConfirmationRequest
-  ] = (0, import_react99.useState)(null);
+  ] = (0, import_react101.useState)(null);
   const activePtyId = activeShellPtyId ?? activeBackgroundExecutionId ?? void 0;
-  const prevActiveShellPtyIdRef = (0, import_react99.useRef)(null);
-  (0, import_react99.useEffect)(() => {
+  const prevActiveShellPtyIdRef = (0, import_react101.useRef)(null);
+  (0, import_react101.useEffect)(() => {
     if (turnCancelledRef.current && prevActiveShellPtyIdRef.current !== null && activeShellPtyId === null) {
       addItem({ type: "info" /* INFO */, text: "Request cancelled." });
       setIsResponding(false);
     }
     prevActiveShellPtyIdRef.current = activeShellPtyId;
   }, [activeShellPtyId, addItem, setIsResponding]);
-  (0, import_react99.useEffect)(() => {
+  (0, import_react101.useEffect)(() => {
     if (config.getApprovalMode() === "yolo" /* YOLO */ && streamingState === "idle" /* Idle */) {
       const lastUserMessageIndex = history.findLastIndex(
         (item) => item.type === "user" /* USER */
@@ -28123,12 +28192,12 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       }
     }
   }, [streamingState, config, history]);
-  (0, import_react99.useEffect)(() => {
+  (0, import_react101.useEffect)(() => {
     if (!isResponding) {
       setRetryStatus(null);
     }
   }, [isResponding]);
-  const maybeAddSuppressedToolErrorNote = (0, import_react99.useCallback)(
+  const maybeAddSuppressedToolErrorNote = (0, import_react101.useCallback)(
     (userMessageTimestamp) => {
       if (!isLowErrorVerbosity) {
         return;
@@ -28150,7 +28219,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, isLowErrorVerbosity]
   );
-  const maybeAddLowVerbosityFailureNote = (0, import_react99.useCallback)(
+  const maybeAddLowVerbosityFailureNote = (0, import_react101.useCallback)(
     (userMessageTimestamp) => {
       if (!isLowErrorVerbosity || config.getDebugMode()) {
         return;
@@ -28169,7 +28238,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, config, isLowErrorVerbosity]
   );
-  const cancelOngoingRequest = (0, import_react99.useCallback)(
+  const cancelOngoingRequest = (0, import_react101.useCallback)(
     async (clearBuffer = true) => {
       if (turnCancelledRef.current) {
         if (clearBuffer) {
@@ -28367,7 +28436,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       isActive: streamingState === "responding" /* Responding */ || streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */
     }
   );
-  const prepareQueryForGemini = (0, import_react99.useCallback)(
+  const prepareQueryForGemini = (0, import_react101.useCallback)(
     async (query, userMessageTimestamp, abortSignal, prompt_id) => {
       if (turnCancelledRef.current) {
         return { queryToSend: null, shouldProceed: false };
@@ -28473,7 +28542,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       settings
     ]
   );
-  const handleContentEvent = (0, import_react99.useCallback)(
+  const handleContentEvent = (0, import_react101.useCallback)(
     (eventValue, currentGeminiMessageBuffer, userMessageTimestamp) => {
       setRetryStatus(null);
       if (turnCancelledRef.current) {
@@ -28514,7 +28583,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, pendingHistoryItemRef, setPendingHistoryItem]
   );
-  const handleThoughtEvent = (0, import_react99.useCallback)(
+  const handleThoughtEvent = (0, import_react101.useCallback)(
     (eventValue, _userMessageTimestamp) => {
       setThought(eventValue);
       if (getInlineThinkingMode(settings) === "full") {
@@ -28526,7 +28595,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, settings, setThought]
   );
-  const handleUserCancelledEvent = (0, import_react99.useCallback)(
+  const handleUserCancelledEvent = (0, import_react101.useCallback)(
     (userMessageTimestamp) => {
       if (turnCancelledRef.current) {
         return;
@@ -28561,7 +28630,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       setIsResponding
     ]
   );
-  const handleErrorEvent = (0, import_react99.useCallback)(
+  const handleErrorEvent = (0, import_react101.useCallback)(
     (eventValue, userMessageTimestamp) => {
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -28594,7 +28663,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       maybeAddLowVerbosityFailureNote
     ]
   );
-  const handleInvalidStreamEvent = (0, import_react99.useCallback)(
+  const handleInvalidStreamEvent = (0, import_react101.useCallback)(
     (eventValue, userMessageTimestamp) => {
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -28640,7 +28709,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       geminiClient
     ]
   );
-  const handleCitationEvent = (0, import_react99.useCallback)(
+  const handleCitationEvent = (0, import_react101.useCallback)(
     (text, userMessageTimestamp) => {
       if (!showCitations(settings)) {
         return;
@@ -28653,7 +28722,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, pendingHistoryItemRef, setPendingHistoryItem, settings]
   );
-  const handleFinishedEvent = (0, import_react99.useCallback)(
+  const handleFinishedEvent = (0, import_react101.useCallback)(
     (event, userMessageTimestamp) => {
       const finishReason = event.value.reason;
       if (!finishReason) {
@@ -28689,7 +28758,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem]
   );
-  const handleChatCompressionEvent = (0, import_react99.useCallback)(
+  const handleChatCompressionEvent = (0, import_react101.useCallback)(
     (eventValue, userMessageTimestamp) => {
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -28715,14 +28784,14 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, pendingHistoryItemRef, setPendingHistoryItem, config]
   );
-  const handleMaxSessionTurnsEvent = (0, import_react99.useCallback)(
+  const handleMaxSessionTurnsEvent = (0, import_react101.useCallback)(
     () => addItem({
       type: "info",
       text: `The session has reached the maximum number of turns: ${config.getMaxSessionTurns()}. Please update this limit in your setting.json file.`
     }),
     [addItem, config]
   );
-  const handleContextWindowWillOverflowEvent = (0, import_react99.useCallback)(
+  const handleContextWindowWillOverflowEvent = (0, import_react101.useCallback)(
     (estimatedRequestTokenCount, remainingTokenCount) => {
       onCancelSubmit(true);
       const limit = tokenLimit(config.getModel());
@@ -28738,7 +28807,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, onCancelSubmit, config]
   );
-  const handleChatModelEvent = (0, import_react99.useCallback)(
+  const handleChatModelEvent = (0, import_react101.useCallback)(
     (eventValue, userMessageTimestamp) => {
       if (!settings.merged.ui.showModelInfoInChat) {
         return;
@@ -28757,7 +28826,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, pendingHistoryItemRef, setPendingHistoryItem, settings]
   );
-  const handleAgentExecutionStoppedEvent = (0, import_react99.useCallback)(
+  const handleAgentExecutionStoppedEvent = (0, import_react101.useCallback)(
     (reason, userMessageTimestamp, systemMessage, contextCleared) => {
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -28790,7 +28859,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       maybeAddLowVerbosityFailureNote
     ]
   );
-  const handleAgentExecutionBlockedEvent = (0, import_react99.useCallback)(
+  const handleAgentExecutionBlockedEvent = (0, import_react101.useCallback)(
     (reason, userMessageTimestamp, systemMessage, contextCleared) => {
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -28821,7 +28890,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       maybeAddLowVerbosityFailureNote
     ]
   );
-  const processGeminiStreamEvents = (0, import_react99.useCallback)(
+  const processGeminiStreamEvents = (0, import_react101.useCallback)(
     async (stream, userMessageTimestamp, signal, isContinuation, prompt_id) => {
       let geminiMessageBuffer = "";
       const toolCallRequests = [];
@@ -28959,7 +29028,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       setThought
     ]
   );
-  const submitQuery = (0, import_react99.useCallback)(
+  const submitQuery = (0, import_react101.useCallback)(
     async (query, options, prompt_id) => runInDevTraceSpan(
       {
         operation: options?.isContinuation ? "system_prompt" /* SystemPrompt */ : "user_prompt" /* UserPrompt */,
@@ -29125,7 +29194,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     ]
   );
   submitQueryRef.current = submitQuery;
-  const handleApprovalModeChange = (0, import_react99.useCallback)(
+  const handleApprovalModeChange = (0, import_react101.useCallback)(
     async (newApprovalMode) => {
       if (previousApprovalModeRef.current === "plan" /* PLAN */ && newApprovalMode !== "plan" /* PLAN */ && streamingState === "idle" /* Idle */) {
         if (geminiClient) {
@@ -29188,7 +29257,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [config, toolCalls, geminiClient, streamingState, addItem, onDebugMessage]
   );
-  const handleCompletedTools = (0, import_react99.useCallback)(
+  const handleCompletedTools = (0, import_react101.useCallback)(
     async (completedToolCallsFromScheduler) => {
       const completedAndReadyToSubmitTools = completedToolCallsFromScheduler.filter(
         (tc) => {
@@ -29361,13 +29430,13 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       toolCalls
     ]
   );
-  const pendingHistoryItems = (0, import_react99.useMemo)(
+  const pendingHistoryItems = (0, import_react101.useMemo)(
     () => [pendingHistoryItem, ...pendingToolGroupItems].filter(
       (i) => i !== void 0 && i !== null
     ),
     [pendingHistoryItem, pendingToolGroupItems]
   );
-  (0, import_react99.useEffect)(() => {
+  (0, import_react101.useEffect)(() => {
     const saveRestorableToolCalls = async () => {
       if (!config.getCheckpointingEnabled()) {
         return;
@@ -29437,7 +29506,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
 };
 
 // packages/cli/src/ui/hooks/vim.ts
-var import_react100 = __toESM(require_react(), 1);
+var import_react102 = __toESM(require_react(), 1);
 var DIGIT_MULTIPLIER = 10;
 var DEFAULT_COUNT = 1;
 var DIGIT_1_TO_9 = /^[1-9]$/;
@@ -29540,23 +29609,23 @@ var vimReducer = (state, action) => {
 function useVim(buffer, onSubmit) {
   const keyMatchers = useKeyMatchers();
   const { vimEnabled, vimMode, setVimMode } = useVimMode();
-  const [state, dispatch] = (0, import_react100.useReducer)(vimReducer, initialVimState);
-  const lastEscapeTimestampRef = (0, import_react100.useRef)(0);
-  (0, import_react100.useEffect)(() => {
+  const [state, dispatch] = (0, import_react102.useReducer)(vimReducer, initialVimState);
+  const lastEscapeTimestampRef = (0, import_react102.useRef)(0);
+  (0, import_react102.useEffect)(() => {
     dispatch({ type: "SET_MODE", mode: vimMode });
   }, [vimMode]);
-  const updateMode = (0, import_react100.useCallback)(
+  const updateMode = (0, import_react102.useCallback)(
     (mode) => {
       setVimMode(mode);
       dispatch({ type: "SET_MODE", mode });
     },
     [setVimMode]
   );
-  const getCurrentCount = (0, import_react100.useCallback)(
+  const getCurrentCount = (0, import_react102.useCallback)(
     () => state.count || DEFAULT_COUNT,
     [state.count]
   );
-  const checkDoubleEscape = (0, import_react100.useCallback)(() => {
+  const checkDoubleEscape = (0, import_react102.useCallback)(() => {
     const now = Date.now();
     const lastEscape = lastEscapeTimestampRef.current;
     lastEscapeTimestampRef.current = now;
@@ -29566,7 +29635,7 @@ function useVim(buffer, onSubmit) {
     }
     return false;
   }, []);
-  const executeCommand = (0, import_react100.useCallback)(
+  const executeCommand = (0, import_react102.useCallback)(
     (cmdType, count, char) => {
       switch (cmdType) {
         case CMD_TYPES.DELETE_WORD_FORWARD: {
@@ -29765,7 +29834,7 @@ function useVim(buffer, onSubmit) {
     },
     [buffer, updateMode]
   );
-  const handleInsertModeInput = (0, import_react100.useCallback)(
+  const handleInsertModeInput = (0, import_react102.useCallback)(
     (normalizedKey) => {
       if (keyMatchers["basic.cancel" /* ESCAPE */](normalizedKey)) {
         checkDoubleEscape();
@@ -29799,7 +29868,7 @@ function useVim(buffer, onSubmit) {
     },
     [buffer, dispatch, updateMode, onSubmit, checkDoubleEscape, keyMatchers]
   );
-  const normalizeKey = (0, import_react100.useCallback)(
+  const normalizeKey = (0, import_react102.useCallback)(
     (key) => ({
       name: key.name || "",
       sequence: key.sequence || "",
@@ -29811,7 +29880,7 @@ function useVim(buffer, onSubmit) {
     }),
     []
   );
-  const handleChangeMovement = (0, import_react100.useCallback)(
+  const handleChangeMovement = (0, import_react102.useCallback)(
     (movement) => {
       const count = getCurrentCount();
       dispatch({ type: "CLEAR_COUNT" });
@@ -29832,7 +29901,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, dispatch, buffer, updateMode]
   );
-  const handleDeleteMovement = (0, import_react100.useCallback)(
+  const handleDeleteMovement = (0, import_react102.useCallback)(
     (movement) => {
       const count = getCurrentCount();
       dispatch({ type: "CLEAR_COUNT" });
@@ -29852,7 +29921,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, dispatch, buffer]
   );
-  const handleOperatorMotion = (0, import_react100.useCallback)(
+  const handleOperatorMotion = (0, import_react102.useCallback)(
     (operator, motion) => {
       const count = getCurrentCount();
       const commandMap = {
@@ -29885,7 +29954,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, executeCommand, dispatch]
   );
-  const handleInput = (0, import_react100.useCallback)(
+  const handleInput = (0, import_react102.useCallback)(
     (key) => {
       if (!vimEnabled) {
         return false;
@@ -30593,13 +30662,13 @@ function useVim(buffer, onSubmit) {
 }
 
 // packages/cli/src/ui/hooks/useTimer.ts
-var import_react101 = __toESM(require_react(), 1);
+var import_react103 = __toESM(require_react(), 1);
 var useTimer = (isActive, resetKey) => {
-  const [elapsedTime, setElapsedTime] = (0, import_react101.useState)(0);
-  const timerRef = (0, import_react101.useRef)(null);
-  const prevResetKeyRef = (0, import_react101.useRef)(resetKey);
-  const prevIsActiveRef = (0, import_react101.useRef)(isActive);
-  (0, import_react101.useEffect)(() => {
+  const [elapsedTime, setElapsedTime] = (0, import_react103.useState)(0);
+  const timerRef = (0, import_react103.useRef)(null);
+  const prevResetKeyRef = (0, import_react103.useRef)(resetKey);
+  const prevIsActiveRef = (0, import_react103.useRef)(isActive);
+  (0, import_react103.useEffect)(() => {
     let shouldResetTime = false;
     if (prevResetKeyRef.current !== resetKey) {
       shouldResetTime = true;
@@ -30636,7 +30705,7 @@ var useTimer = (isActive, resetKey) => {
 };
 
 // packages/cli/src/ui/hooks/useLoadingIndicator.ts
-var import_react102 = __toESM(require_react(), 1);
+var import_react104 = __toESM(require_react(), 1);
 var LOW_VERBOSITY_RETRY_HINT_ATTEMPT_THRESHOLD = 2;
 var useLoadingIndicator = ({
   streamingState,
@@ -30649,7 +30718,7 @@ var useLoadingIndicator = ({
   maxLength,
   pauseUpdates = false
 }) => {
-  const [timerResetKey, setTimerResetKey] = (0, import_react102.useState)(0);
+  const [timerResetKey, setTimerResetKey] = (0, import_react104.useState)(0);
   const isTimerActive = streamingState === "responding" /* Responding */ && !pauseUpdates;
   const elapsedTimeFromTimer = useTimer(isTimerActive, timerResetKey);
   const isPhraseCyclingActive = streamingState === "responding" /* Responding */ && !pauseUpdates;
@@ -30663,9 +30732,9 @@ var useLoadingIndicator = ({
     customWittyPhrases,
     maxLength
   );
-  const [retainedElapsedTime, setRetainedElapsedTime] = (0, import_react102.useState)(0);
-  const prevStreamingStateRef = (0, import_react102.useRef)(null);
-  (0, import_react102.useEffect)(() => {
+  const [retainedElapsedTime, setRetainedElapsedTime] = (0, import_react104.useState)(0);
+  const prevStreamingStateRef = (0, import_react104.useRef)(null);
+  (0, import_react104.useEffect)(() => {
     if (prevStreamingStateRef.current === "waiting_for_confirmation" /* WaitingForConfirmation */ && streamingState === "responding" /* Responding */) {
       setTimerResetKey((prevKey) => prevKey + 1);
       setRetainedElapsedTime(0);
@@ -30731,24 +30800,24 @@ var useShellInactivityStatus = ({
 };
 
 // packages/cli/src/ui/hooks/useFolderTrust.ts
-var import_react103 = __toESM(require_react(), 1);
+var import_react105 = __toESM(require_react(), 1);
 import * as process10 from "node:process";
 var useFolderTrust = (settings, onTrustChange, addItem) => {
-  const [isTrusted, setIsTrusted] = (0, import_react103.useState)(void 0);
-  const [isFolderTrustDialogOpen, setIsFolderTrustDialogOpen] = (0, import_react103.useState)(false);
-  const [discoveryResults, setDiscoveryResults] = (0, import_react103.useState)(null);
-  const [isRestarting, setIsRestarting] = (0, import_react103.useState)(false);
-  const startupMessageSent = (0, import_react103.useRef)(false);
-  const onTrustChangeRef = (0, import_react103.useRef)(onTrustChange);
-  const addItemRef = (0, import_react103.useRef)(addItem);
-  const settingsRef = (0, import_react103.useRef)(settings);
-  (0, import_react103.useEffect)(() => {
+  const [isTrusted, setIsTrusted] = (0, import_react105.useState)(void 0);
+  const [isFolderTrustDialogOpen, setIsFolderTrustDialogOpen] = (0, import_react105.useState)(false);
+  const [discoveryResults, setDiscoveryResults] = (0, import_react105.useState)(null);
+  const [isRestarting, setIsRestarting] = (0, import_react105.useState)(false);
+  const startupMessageSent = (0, import_react105.useRef)(false);
+  const onTrustChangeRef = (0, import_react105.useRef)(onTrustChange);
+  const addItemRef = (0, import_react105.useRef)(addItem);
+  const settingsRef = (0, import_react105.useRef)(settings);
+  (0, import_react105.useEffect)(() => {
     onTrustChangeRef.current = onTrustChange;
     addItemRef.current = addItem;
     settingsRef.current = settings;
   }, [onTrustChange, addItem, settings]);
   const folderTrust = settings.merged.security.folderTrust.enabled ?? true;
-  (0, import_react103.useEffect)(() => {
+  (0, import_react105.useEffect)(() => {
     let isMounted = true;
     const { isTrusted: trusted } = isWorkspaceTrusted(
       settingsRef.current.merged
@@ -30783,7 +30852,7 @@ var useFolderTrust = (settings, onTrustChange, addItem) => {
       isMounted = false;
     };
   }, [folderTrust]);
-  const handleFolderTrustSelect = (0, import_react103.useCallback)(
+  const handleFolderTrustSelect = (0, import_react105.useCallback)(
     async (choice) => {
       const trustLevelMap = {
         ["trust_folder" /* TRUST_FOLDER */]: "TRUST_FOLDER" /* TRUST_FOLDER */,
@@ -31758,7 +31827,7 @@ async function checkForUpdates(settings) {
 }
 
 // packages/cli/src/ui/hooks/useMessageQueue.ts
-var import_react104 = __toESM(require_react(), 1);
+var import_react106 = __toESM(require_react(), 1);
 function useMessageQueue({
   isConfigInitialized,
   streamingState,
@@ -31766,21 +31835,21 @@ function useMessageQueue({
   isMcpReady,
   isCompressing = false
 }) {
-  const [messageQueue2, setMessageQueue] = (0, import_react104.useState)([]);
-  const addMessage = (0, import_react104.useCallback)((message) => {
+  const [messageQueue2, setMessageQueue] = (0, import_react106.useState)([]);
+  const addMessage = (0, import_react106.useCallback)((message) => {
     const trimmedMessage = message.trim();
     if (trimmedMessage.length > 0) {
       setMessageQueue((prev) => [...prev, trimmedMessage]);
     }
   }, []);
-  const clearQueue = (0, import_react104.useCallback)(() => {
+  const clearQueue = (0, import_react106.useCallback)(() => {
     setMessageQueue([]);
   }, []);
-  const getQueuedMessagesText = (0, import_react104.useCallback)(() => {
+  const getQueuedMessagesText = (0, import_react106.useCallback)(() => {
     if (messageQueue2.length === 0) return "";
     return messageQueue2.join("\n\n");
   }, [messageQueue2]);
-  const popAllMessages = (0, import_react104.useCallback)(() => {
+  const popAllMessages = (0, import_react106.useCallback)(() => {
     if (messageQueue2.length === 0) {
       return void 0;
     }
@@ -31788,7 +31857,7 @@ function useMessageQueue({
     setMessageQueue([]);
     return allMessages;
   }, [messageQueue2]);
-  (0, import_react104.useEffect)(() => {
+  (0, import_react106.useEffect)(() => {
     if (isConfigInitialized && streamingState === "idle" /* Idle */ && !isCompressing && isMcpReady && messageQueue2.length > 0) {
       const combinedMessage = messageQueue2.join("\n\n");
       setMessageQueue([]);
@@ -31812,15 +31881,15 @@ function useMessageQueue({
 }
 
 // packages/cli/src/ui/hooks/useMcpStatus.ts
-var import_react105 = __toESM(require_react(), 1);
+var import_react107 = __toESM(require_react(), 1);
 function useMcpStatus(config) {
-  const [discoveryState, setDiscoveryState] = (0, import_react105.useState)(
+  const [discoveryState, setDiscoveryState] = (0, import_react107.useState)(
     () => config.getMcpClientManager()?.getDiscoveryState() ?? "not_started" /* NOT_STARTED */
   );
-  const [mcpServerCount, setMcpServerCount] = (0, import_react105.useState)(
+  const [mcpServerCount, setMcpServerCount] = (0, import_react107.useState)(
     () => config.getMcpClientManager()?.getMcpServerCount() ?? 0
   );
-  (0, import_react105.useEffect)(() => {
+  (0, import_react107.useEffect)(() => {
     const onChange = () => {
       const manager = config.getMcpClientManager();
       if (manager) {
@@ -31842,7 +31911,7 @@ function useMcpStatus(config) {
 }
 
 // packages/cli/src/ui/hooks/useApprovalModeIndicator.ts
-var import_react106 = __toESM(require_react(), 1);
+var import_react108 = __toESM(require_react(), 1);
 function useApprovalModeIndicator({
   config,
   addItem,
@@ -31852,8 +31921,8 @@ function useApprovalModeIndicator({
 }) {
   const keyMatchers = useKeyMatchers();
   const currentConfigValue = config.getApprovalMode();
-  const [showApprovalMode, setApprovalMode] = (0, import_react106.useState)(currentConfigValue);
-  (0, import_react106.useEffect)(() => {
+  const [showApprovalMode, setApprovalMode] = (0, import_react108.useState)(currentConfigValue);
+  (0, import_react108.useEffect)(() => {
     setApprovalMode(currentConfigValue);
   }, [currentConfigValue]);
   useKeypress(
@@ -31922,13 +31991,13 @@ function useApprovalModeIndicator({
 }
 
 // packages/cli/src/ui/hooks/useGitBranchName.ts
-var import_react107 = __toESM(require_react(), 1);
+var import_react109 = __toESM(require_react(), 1);
 import fs7 from "node:fs";
 import fsPromises from "node:fs/promises";
 function useGitBranchName(cwd5) {
-  const [branchName, setBranchName] = (0, import_react107.useState)(void 0);
-  const timeoutRef = (0, import_react107.useRef)(null);
-  const fetchBranchName = (0, import_react107.useCallback)(async () => {
+  const [branchName, setBranchName] = (0, import_react109.useState)(void 0);
+  const timeoutRef = (0, import_react109.useRef)(null);
+  const fetchBranchName = (0, import_react109.useCallback)(async () => {
     try {
       const { stdout } = await spawnAsync(
         "git",
@@ -31950,7 +32019,7 @@ function useGitBranchName(cwd5) {
       setBranchName(void 0);
     }
   }, [cwd5, setBranchName]);
-  (0, import_react107.useEffect)(() => {
+  (0, import_react109.useEffect)(() => {
     void fetchBranchName();
     let watcher;
     let cancelled = false;
@@ -31994,7 +32063,7 @@ function useGitBranchName(cwd5) {
 }
 
 // packages/cli/src/ui/hooks/useSessionResume.ts
-var import_react108 = __toESM(require_react(), 1);
+var import_react110 = __toESM(require_react(), 1);
 function useSessionResume({
   config,
   historyManager,
@@ -32004,14 +32073,14 @@ function useSessionResume({
   resumedSessionData,
   isAuthenticating
 }) {
-  const [isResuming, setIsResuming] = (0, import_react108.useState)(false);
-  const historyManagerRef = (0, import_react108.useRef)(historyManager);
-  const refreshStaticRef = (0, import_react108.useRef)(refreshStatic);
-  (0, import_react108.useEffect)(() => {
+  const [isResuming, setIsResuming] = (0, import_react110.useState)(false);
+  const historyManagerRef = (0, import_react110.useRef)(historyManager);
+  const refreshStaticRef = (0, import_react110.useRef)(refreshStatic);
+  (0, import_react110.useEffect)(() => {
     historyManagerRef.current = historyManager;
     refreshStaticRef.current = refreshStatic;
   });
-  const loadHistoryForResume = (0, import_react108.useCallback)(
+  const loadHistoryForResume = (0, import_react110.useCallback)(
     async (uiHistory, clientHistory, resumedData) => {
       if (!isGeminiClientInitialized) {
         return;
@@ -32041,8 +32110,8 @@ function useSessionResume({
     },
     [config, isGeminiClientInitialized, setQuittingMessages]
   );
-  const hasLoadedResumedSession = (0, import_react108.useRef)(false);
-  (0, import_react108.useEffect)(() => {
+  const hasLoadedResumedSession = (0, import_react110.useRef)(false);
+  (0, import_react110.useEffect)(() => {
     if (resumedSessionData && !isAuthenticating && isGeminiClientInitialized && !hasLoadedResumedSession.current) {
       hasLoadedResumedSession.current = true;
       const historyData = convertSessionToHistoryFormats(
@@ -32064,7 +32133,7 @@ function useSessionResume({
 }
 
 // packages/cli/src/ui/hooks/useIncludeDirsTrust.tsx
-var import_react109 = __toESM(require_react(), 1);
+var import_react111 = __toESM(require_react(), 1);
 var import_jsx_runtime136 = __toESM(require_jsx_runtime(), 1);
 async function finishAddingDirectories(config, addItem, added, errors) {
   if (!config) {
@@ -32093,7 +32162,7 @@ async function finishAddingDirectories(config, addItem, added, errors) {
 }
 function useIncludeDirsTrust(config, isTrustedFolder, historyManager, setCustomDialog) {
   const { addItem } = historyManager;
-  (0, import_react109.useEffect)(() => {
+  (0, import_react111.useEffect)(() => {
     if (isTrustedFolder === void 0 || !config) {
       return;
     }
@@ -32176,13 +32245,13 @@ Please use the permissions command to modify their trust level.`
 }
 
 // packages/cli/src/ui/hooks/useInputHistoryStore.ts
-var import_react110 = __toESM(require_react(), 1);
+var import_react112 = __toESM(require_react(), 1);
 function useInputHistoryStore() {
-  const [inputHistory, setInputHistory] = (0, import_react110.useState)([]);
-  const [_pastSessionMessages, setPastSessionMessages] = (0, import_react110.useState)([]);
-  const [_currentSessionMessages, setCurrentSessionMessages] = (0, import_react110.useState)([]);
-  const [isInitialized, setIsInitialized] = (0, import_react110.useState)(false);
-  const recalculateHistory = (0, import_react110.useCallback)(
+  const [inputHistory, setInputHistory] = (0, import_react112.useState)([]);
+  const [_pastSessionMessages, setPastSessionMessages] = (0, import_react112.useState)([]);
+  const [_currentSessionMessages, setCurrentSessionMessages] = (0, import_react112.useState)([]);
+  const [isInitialized, setIsInitialized] = (0, import_react112.useState)(false);
+  const recalculateHistory = (0, import_react112.useCallback)(
     (currentSession, pastSession) => {
       const combinedMessages = [...currentSession, ...pastSession];
       const deduplicatedMessages = [];
@@ -32198,7 +32267,7 @@ function useInputHistoryStore() {
     },
     []
   );
-  const initializeFromLogger = (0, import_react110.useCallback)(
+  const initializeFromLogger = (0, import_react112.useCallback)(
     async (logger) => {
       if (isInitialized || !logger) return;
       try {
@@ -32218,7 +32287,7 @@ function useInputHistoryStore() {
     },
     [isInitialized, recalculateHistory]
   );
-  const addInput = (0, import_react110.useCallback)(
+  const addInput = (0, import_react112.useCallback)(
     (input) => {
       const trimmedInput = input.trim();
       if (!trimmedInput) return;
@@ -32245,12 +32314,12 @@ function useInputHistoryStore() {
 }
 
 // packages/cli/src/ui/hooks/useHookDisplayState.ts
-var import_react111 = __toESM(require_react(), 1);
+var import_react113 = __toESM(require_react(), 1);
 var useHookDisplayState = () => {
-  const [activeHooks, setActiveHooks] = (0, import_react111.useState)([]);
-  const hookStartTimes = (0, import_react111.useRef)(/* @__PURE__ */ new Map());
-  const timeouts = (0, import_react111.useRef)(/* @__PURE__ */ new Set());
-  (0, import_react111.useEffect)(() => {
+  const [activeHooks, setActiveHooks] = (0, import_react113.useState)([]);
+  const hookStartTimes = (0, import_react113.useRef)(/* @__PURE__ */ new Map());
+  const timeouts = (0, import_react113.useRef)(/* @__PURE__ */ new Set());
+  (0, import_react113.useEffect)(() => {
     const activeTimeouts = timeouts.current;
     const startTimes = hookStartTimes.current;
     const handleHookStart = (payload) => {
@@ -32315,7 +32384,7 @@ var useHookDisplayState = () => {
 };
 
 // packages/cli/src/ui/hooks/useBackgroundTaskManager.ts
-var import_react112 = __toESM(require_react(), 1);
+var import_react114 = __toESM(require_react(), 1);
 function useBackgroundTaskManager({
   backgroundTasks,
   backgroundTaskCount,
@@ -32325,9 +32394,9 @@ function useBackgroundTaskManager({
   setEmbeddedShellFocused,
   terminalHeight
 }) {
-  const [isBackgroundTaskListOpen, setIsBackgroundTaskListOpen] = (0, import_react112.useState)(false);
-  const [activeBackgroundTaskPid, setActiveBackgroundTaskPid] = (0, import_react112.useState)(null);
-  (0, import_react112.useEffect)(() => {
+  const [isBackgroundTaskListOpen, setIsBackgroundTaskListOpen] = (0, import_react114.useState)(false);
+  const [activeBackgroundTaskPid, setActiveBackgroundTaskPid] = (0, import_react114.useState)(null);
+  (0, import_react114.useEffect)(() => {
     if (backgroundTasks.size === 0) {
       if (activeBackgroundTaskPid !== null) {
         setActiveBackgroundTaskPid(null);
@@ -32344,7 +32413,7 @@ function useBackgroundTaskManager({
     backgroundTaskCount,
     isBackgroundTaskListOpen
   ]);
-  (0, import_react112.useEffect)(() => {
+  (0, import_react114.useEffect)(() => {
     if (embeddedShellFocused) {
       const hasActiveForegroundShell = !!activePtyId;
       const hasVisibleBackgroundTask = isBackgroundTaskVisible && backgroundTasks.size > 0;
@@ -32360,7 +32429,7 @@ function useBackgroundTaskManager({
     activePtyId,
     setEmbeddedShellFocused
   ]);
-  const backgroundTaskHeight = (0, import_react112.useMemo)(
+  const backgroundTaskHeight = (0, import_react114.useMemo)(
     () => isBackgroundTaskVisible && backgroundTasks.size > 0 ? Math.max(Math.floor(terminalHeight * 0.3), 5) : 0,
     [isBackgroundTaskVisible, backgroundTasks.size, terminalHeight]
   );
@@ -32374,11 +32443,11 @@ function useBackgroundTaskManager({
 }
 
 // packages/cli/src/ui/hooks/useTerminalTheme.ts
-var import_react113 = __toESM(require_react(), 1);
+var import_react115 = __toESM(require_react(), 1);
 function useTerminalTheme(handleThemeSelect, config, refreshStatic) {
   const settings = useSettings();
   const { subscribe: subscribe2, unsubscribe, queryTerminalBackground } = useTerminalContext();
-  (0, import_react113.useEffect)(() => {
+  (0, import_react115.useEffect)(() => {
     if (settings.merged.ui.autoThemeSwitching === false) {
       return;
     }
@@ -32441,11 +32510,11 @@ function useTerminalTheme(handleThemeSelect, config, refreshStatic) {
 }
 
 // packages/cli/src/ui/hooks/useTimedMessage.ts
-var import_react114 = __toESM(require_react(), 1);
+var import_react116 = __toESM(require_react(), 1);
 function useTimedMessage(durationMs) {
-  const [message, setMessage] = (0, import_react114.useState)(null);
-  const timeoutRef = (0, import_react114.useRef)(null);
-  const showMessage = (0, import_react114.useCallback)(
+  const [message, setMessage] = (0, import_react116.useState)(null);
+  const timeoutRef = (0, import_react116.useRef)(null);
+  const showMessage = (0, import_react116.useCallback)(
     (msg) => {
       setMessage(msg);
       if (timeoutRef.current) {
@@ -32459,7 +32528,7 @@ function useTimedMessage(durationMs) {
     },
     [durationMs]
   );
-  (0, import_react114.useEffect)(
+  (0, import_react116.useEffect)(
     () => () => {
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
@@ -32471,17 +32540,17 @@ function useTimedMessage(durationMs) {
 }
 
 // packages/cli/src/ui/hooks/useSuspend.ts
-var import_react115 = __toESM(require_react(), 1);
+var import_react117 = __toESM(require_react(), 1);
 import process11 from "node:process";
 function useSuspend({
   handleWarning,
   setRawMode,
   shouldUseAlternateScreen
 }) {
-  const [ctrlZPressCount, setCtrlZPressCount] = (0, import_react115.useState)(0);
-  const ctrlZTimerRef = (0, import_react115.useRef)(null);
-  const onResumeHandlerRef = (0, import_react115.useRef)(null);
-  (0, import_react115.useEffect)(
+  const [ctrlZPressCount, setCtrlZPressCount] = (0, import_react117.useState)(0);
+  const ctrlZTimerRef = (0, import_react117.useRef)(null);
+  const onResumeHandlerRef = (0, import_react117.useRef)(null);
+  (0, import_react117.useEffect)(
     () => () => {
       if (ctrlZTimerRef.current) {
         clearTimeout(ctrlZTimerRef.current);
@@ -32494,7 +32563,7 @@ function useSuspend({
     },
     []
   );
-  (0, import_react115.useEffect)(() => {
+  (0, import_react117.useEffect)(() => {
     if (ctrlZTimerRef.current) {
       clearTimeout(ctrlZTimerRef.current);
       ctrlZTimerRef.current = null;
@@ -32560,17 +32629,17 @@ function useSuspend({
       }, WARNING_PROMPT_DURATION_MS);
     }
   }, [ctrlZPressCount, handleWarning, setRawMode, shouldUseAlternateScreen]);
-  const handleSuspend = (0, import_react115.useCallback)(() => {
+  const handleSuspend = (0, import_react117.useCallback)(() => {
     setCtrlZPressCount((prev) => prev + 1);
   }, []);
   return { handleSuspend };
 }
 
 // packages/cli/src/ui/hooks/useRunEventNotifications.ts
-var import_react117 = __toESM(require_react(), 1);
+var import_react119 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/utils/pendingAttentionNotification.ts
-var import_react116 = __toESM(require_react(), 1);
+var import_react118 = __toESM(require_react(), 1);
 
 // packages/cli/src/utils/terminalNotifications.ts
 var MAX_NOTIFICATION_TITLE_CHARS = 48;
@@ -32785,7 +32854,7 @@ function useRunEventNotifications({
   hasConfirmUpdateExtensionRequests,
   hasLoopDetectionConfirmationRequest
 }) {
-  const pendingAttentionNotification = (0, import_react117.useMemo)(
+  const pendingAttentionNotification = (0, import_react119.useMemo)(
     () => getPendingAttentionNotification(
       pendingHistoryItems,
       commandConfirmationRequest,
@@ -32803,11 +32872,11 @@ function useRunEventNotifications({
       hasLoopDetectionConfirmationRequest
     ]
   );
-  const hadPendingAttentionRef = (0, import_react117.useRef)(false);
-  const previousFocusedRef = (0, import_react117.useRef)(isFocused);
-  const previousStreamingStateRef = (0, import_react117.useRef)(streamingState);
-  const lastSentAttentionNotificationRef = (0, import_react117.useRef)(null);
-  (0, import_react117.useEffect)(() => {
+  const hadPendingAttentionRef = (0, import_react119.useRef)(false);
+  const previousFocusedRef = (0, import_react119.useRef)(isFocused);
+  const previousStreamingStateRef = (0, import_react119.useRef)(streamingState);
+  const lastSentAttentionNotificationRef = (0, import_react119.useRef)(null);
+  (0, import_react119.useEffect)(() => {
     if (!notificationsEnabled) {
       return;
     }
@@ -32851,7 +32920,7 @@ function useRunEventNotifications({
     notificationMethod,
     pendingAttentionNotification
   ]);
-  (0, import_react117.useEffect)(() => {
+  (0, import_react119.useEffect)(() => {
     if (!notificationsEnabled) {
       return;
     }
@@ -32881,28 +32950,28 @@ function useRunEventNotifications({
 }
 
 // packages/cli/src/ui/hooks/useVisibilityToggle.ts
-var import_react118 = __toESM(require_react(), 1);
+var import_react120 = __toESM(require_react(), 1);
 var APPROVAL_MODE_REVEAL_DURATION_MS = 1200;
 var FOCUS_UI_ENABLED_STATE_KEY = "focusUiEnabled";
 function useVisibilityToggle() {
-  const [focusUiEnabledByDefault] = (0, import_react118.useState)(
+  const [focusUiEnabledByDefault] = (0, import_react120.useState)(
     () => persistentState.get(FOCUS_UI_ENABLED_STATE_KEY) === true
   );
-  const [cleanUiDetailsVisible, setCleanUiDetailsVisibleState] = (0, import_react118.useState)(
+  const [cleanUiDetailsVisible, setCleanUiDetailsVisibleState] = (0, import_react120.useState)(
     !focusUiEnabledByDefault
   );
-  const modeRevealTimeoutRef = (0, import_react118.useRef)(null);
-  const cleanUiDetailsPinnedRef = (0, import_react118.useRef)(!focusUiEnabledByDefault);
-  const clearModeRevealTimeout = (0, import_react118.useCallback)(() => {
+  const modeRevealTimeoutRef = (0, import_react120.useRef)(null);
+  const cleanUiDetailsPinnedRef = (0, import_react120.useRef)(!focusUiEnabledByDefault);
+  const clearModeRevealTimeout = (0, import_react120.useCallback)(() => {
     if (modeRevealTimeoutRef.current) {
       clearTimeout(modeRevealTimeoutRef.current);
       modeRevealTimeoutRef.current = null;
     }
   }, []);
-  const persistFocusUiPreference = (0, import_react118.useCallback)((isFullUiVisible) => {
+  const persistFocusUiPreference = (0, import_react120.useCallback)((isFullUiVisible) => {
     persistentState.set(FOCUS_UI_ENABLED_STATE_KEY, !isFullUiVisible);
   }, []);
-  const setCleanUiDetailsVisible = (0, import_react118.useCallback)(
+  const setCleanUiDetailsVisible = (0, import_react120.useCallback)(
     (visible) => {
       clearModeRevealTimeout();
       cleanUiDetailsPinnedRef.current = visible;
@@ -32911,7 +32980,7 @@ function useVisibilityToggle() {
     },
     [clearModeRevealTimeout, persistFocusUiPreference]
   );
-  const toggleCleanUiDetailsVisible = (0, import_react118.useCallback)(() => {
+  const toggleCleanUiDetailsVisible = (0, import_react120.useCallback)(() => {
     clearModeRevealTimeout();
     setCleanUiDetailsVisibleState((visible) => {
       const nextVisible = !visible;
@@ -32920,7 +32989,7 @@ function useVisibilityToggle() {
       return nextVisible;
     });
   }, [clearModeRevealTimeout, persistFocusUiPreference]);
-  const revealCleanUiDetailsTemporarily = (0, import_react118.useCallback)(
+  const revealCleanUiDetailsTemporarily = (0, import_react120.useCallback)(
     (durationMs = APPROVAL_MODE_REVEAL_DURATION_MS) => {
       if (cleanUiDetailsPinnedRef.current) {
         return;
@@ -32936,7 +33005,7 @@ function useVisibilityToggle() {
     },
     [clearModeRevealTimeout]
   );
-  (0, import_react118.useEffect)(() => () => clearModeRevealTimeout(), [clearModeRevealTimeout]);
+  (0, import_react120.useEffect)(() => () => clearModeRevealTimeout(), [clearModeRevealTimeout]);
   return {
     cleanUiDetailsVisible,
     setCleanUiDetailsVisible,
@@ -33000,17 +33069,17 @@ var AppContainer = (props) => {
   const { reset } = useOverflowActions();
   const notificationsEnabled = isNotificationsEnabled(settings);
   const notificationMethod = getNotificationMethod(settings);
-  const { setOptions, dumpCurrentFrame, startRecording, stopRecording } = (0, import_react119.useContext)(AppContext_default);
-  const recordingFilenameRef = (0, import_react119.useRef)(null);
+  const { setOptions, dumpCurrentFrame, startRecording, stopRecording } = (0, import_react121.useContext)(AppContext_default);
+  const recordingFilenameRef = (0, import_react121.useRef)(null);
   const historyManager = useHistory({
     chatRecordingService: config.getGeminiClient()?.getChatRecordingService()
   });
   useMemoryMonitor(historyManager);
   const isAlternateBuffer = config.getUseAlternateBuffer();
-  const [mouseMode, setMouseMode] = (0, import_react119.useState)(
+  const [mouseMode, setMouseMode] = (0, import_react121.useState)(
     () => config.getUseAlternateBuffer()
   );
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     setOptions({
       stickyHeadersInBackbuffer: mouseMode
     });
@@ -33020,28 +33089,28 @@ var AppContainer = (props) => {
       disableMouseEvents();
     }
   }, [mouseMode, setOptions]);
-  const [corgiMode, setCorgiMode] = (0, import_react119.useState)(false);
-  const [debugMessage, setDebugMessage] = (0, import_react119.useState)("");
-  const [quittingMessages, setQuittingMessages] = (0, import_react119.useState)(null);
-  const [showPrivacyNotice, setShowPrivacyNotice] = (0, import_react119.useState)(false);
-  const [themeError, setThemeError] = (0, import_react119.useState)(
+  const [corgiMode, setCorgiMode] = (0, import_react121.useState)(false);
+  const [debugMessage, setDebugMessage] = (0, import_react121.useState)("");
+  const [quittingMessages, setQuittingMessages] = (0, import_react121.useState)(null);
+  const [showPrivacyNotice, setShowPrivacyNotice] = (0, import_react121.useState)(false);
+  const [themeError, setThemeError] = (0, import_react121.useState)(
     initializationResult.themeError
   );
-  const [isProcessing, setIsProcessing] = (0, import_react119.useState)(false);
-  const [embeddedShellFocused, setEmbeddedShellFocused] = (0, import_react119.useState)(false);
-  const [showDebugProfiler, setShowDebugProfiler] = (0, import_react119.useState)(false);
-  const [customDialog, setCustomDialog] = (0, import_react119.useState)(
+  const [isProcessing, setIsProcessing] = (0, import_react121.useState)(false);
+  const [embeddedShellFocused, setEmbeddedShellFocused] = (0, import_react121.useState)(false);
+  const [showDebugProfiler, setShowDebugProfiler] = (0, import_react121.useState)(false);
+  const [customDialog, setCustomDialog] = (0, import_react121.useState)(
     null
   );
-  const [copyModeEnabled, setCopyModeEnabled] = (0, import_react119.useState)(false);
-  const [pendingRestorePrompt, setPendingRestorePrompt] = (0, import_react119.useState)(false);
-  const toggleBackgroundTasksRef = (0, import_react119.useRef)(() => {
+  const [copyModeEnabled, setCopyModeEnabled] = (0, import_react121.useState)(false);
+  const [pendingRestorePrompt, setPendingRestorePrompt] = (0, import_react121.useState)(false);
+  const toggleBackgroundTasksRef = (0, import_react121.useRef)(() => {
   });
-  const isBackgroundTaskVisibleRef = (0, import_react119.useRef)(false);
-  const backgroundTasksRef = (0, import_react119.useRef)(/* @__PURE__ */ new Map());
-  const [adminSettingsChanged, setAdminSettingsChanged] = (0, import_react119.useState)(false);
-  const [expandedTools, setExpandedTools] = (0, import_react119.useState)(/* @__PURE__ */ new Set());
-  const toggleExpansion = (0, import_react119.useCallback)((callId) => {
+  const isBackgroundTaskVisibleRef = (0, import_react121.useRef)(false);
+  const backgroundTasksRef = (0, import_react121.useRef)(/* @__PURE__ */ new Map());
+  const [adminSettingsChanged, setAdminSettingsChanged] = (0, import_react121.useState)(false);
+  const [expandedTools, setExpandedTools] = (0, import_react121.useState)(/* @__PURE__ */ new Set());
+  const toggleExpansion = (0, import_react121.useCallback)((callId) => {
     setExpandedTools((prev) => {
       const next = new Set(prev);
       if (next.has(callId)) {
@@ -33052,7 +33121,7 @@ var AppContainer = (props) => {
       return next;
     });
   }, []);
-  const toggleAllExpansion = (0, import_react119.useCallback)((callIds) => {
+  const toggleAllExpansion = (0, import_react121.useCallback)((callIds) => {
     setExpandedTools((prev) => {
       const next = new Set(prev);
       const anyCollapsed = callIds.some((id) => !next.has(id));
@@ -33064,25 +33133,25 @@ var AppContainer = (props) => {
       return next;
     });
   }, []);
-  const isExpanded = (0, import_react119.useCallback)(
+  const isExpanded = (0, import_react121.useCallback)(
     (callId) => expandedTools.has(callId),
     [expandedTools]
   );
-  const [shellModeActive, setShellModeActive] = (0, import_react119.useState)(false);
-  const [isVoiceModeEnabled, setVoiceModeEnabled] = (0, import_react119.useState)(false);
-  const [modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError] = (0, import_react119.useState)(false);
-  const [historyRemountKey, setHistoryRemountKey] = (0, import_react119.useState)(0);
-  const [settingsNonce, setSettingsNonce] = (0, import_react119.useState)(0);
+  const [shellModeActive, setShellModeActive] = (0, import_react121.useState)(false);
+  const [isVoiceModeEnabled, setVoiceModeEnabled] = (0, import_react121.useState)(false);
+  const [modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError] = (0, import_react121.useState)(false);
+  const [historyRemountKey, setHistoryRemountKey] = (0, import_react121.useState)(0);
+  const [settingsNonce, setSettingsNonce] = (0, import_react121.useState)(0);
   const activeHooks = useHookDisplayState();
-  const [updateInfo, setUpdateInfo] = (0, import_react119.useState)(null);
-  const [isTrustedFolder, setIsTrustedFolder] = (0, import_react119.useState)(
+  const [updateInfo, setUpdateInfo] = (0, import_react121.useState)(null);
+  const [isTrustedFolder, setIsTrustedFolder] = (0, import_react121.useState)(
     () => isWorkspaceTrusted(settings.merged).isTrusted
   );
   const [queueErrorMessage, setQueueErrorMessage] = useTimedMessage(
     QUEUE_ERROR_DISPLAY_DURATION_MS
   );
-  const [newAgents, setNewAgents] = (0, import_react119.useState)(null);
-  const [constrainHeight, setConstrainHeight] = (0, import_react119.useState)(true);
+  const [newAgents, setNewAgents] = (0, import_react121.useState)(null);
+  const [constrainHeight, setConstrainHeight] = (0, import_react121.useState)(true);
   const [expandHintTrigger, triggerExpandHint] = useTimedMessage(
     EXPAND_HINT_DURATION_MS
   );
@@ -33090,17 +33159,17 @@ var AppContainer = (props) => {
   const overflowState = useOverflowState();
   const overflowingIdsSize = overflowState?.overflowingIds.size ?? 0;
   const hasOverflowState = overflowingIdsSize > 0 || !constrainHeight;
-  const prevOverflowingIdsSizeRef = (0, import_react119.useRef)(0);
-  (0, import_react119.useEffect)(() => {
+  const prevOverflowingIdsSizeRef = (0, import_react121.useRef)(0);
+  (0, import_react121.useEffect)(() => {
     if (overflowingIdsSize > prevOverflowingIdsSizeRef.current && hasOverflowState) {
       triggerExpandHint(true);
     }
     prevOverflowingIdsSizeRef.current = overflowingIdsSize;
   }, [hasOverflowState, overflowingIdsSize, triggerExpandHint]);
-  const [defaultBannerText, setDefaultBannerText] = (0, import_react119.useState)("");
-  const [warningBannerText, setWarningBannerText] = (0, import_react119.useState)("");
-  const [bannerVisible, setBannerVisible] = (0, import_react119.useState)(true);
-  const bannerData = (0, import_react119.useMemo)(
+  const [defaultBannerText, setDefaultBannerText] = (0, import_react121.useState)("");
+  const [warningBannerText, setWarningBannerText] = (0, import_react121.useState)("");
+  const [bannerVisible, setBannerVisible] = (0, import_react121.useState)(true);
+  const bannerData = (0, import_react121.useMemo)(
     () => ({
       defaultText: defaultBannerText,
       warningText: warningBannerText
@@ -33123,24 +33192,24 @@ var AppContainer = (props) => {
     historyManager.addItem,
     config.getEnableExtensionReloading()
   );
-  const [isPermissionsDialogOpen, setPermissionsDialogOpen] = (0, import_react119.useState)(false);
-  const [permissionsDialogProps, setPermissionsDialogProps] = (0, import_react119.useState)(null);
-  const openPermissionsDialog = (0, import_react119.useCallback)(
+  const [isPermissionsDialogOpen, setPermissionsDialogOpen] = (0, import_react121.useState)(false);
+  const [permissionsDialogProps, setPermissionsDialogProps] = (0, import_react121.useState)(null);
+  const openPermissionsDialog = (0, import_react121.useCallback)(
     (props2) => {
       setPermissionsDialogOpen(true);
       setPermissionsDialogProps(props2 ?? null);
     },
     []
   );
-  const closePermissionsDialog = (0, import_react119.useCallback)(() => {
+  const closePermissionsDialog = (0, import_react121.useCallback)(() => {
     setPermissionsDialogOpen(false);
     setPermissionsDialogProps(null);
   }, []);
-  const [isAgentConfigDialogOpen, setIsAgentConfigDialogOpen] = (0, import_react119.useState)(false);
-  const [selectedAgentName, setSelectedAgentName] = (0, import_react119.useState)();
-  const [selectedAgentDisplayName, setSelectedAgentDisplayName] = (0, import_react119.useState)();
-  const [selectedAgentDefinition, setSelectedAgentDefinition] = (0, import_react119.useState)();
-  const openAgentConfigDialog = (0, import_react119.useCallback)(
+  const [isAgentConfigDialogOpen, setIsAgentConfigDialogOpen] = (0, import_react121.useState)(false);
+  const [selectedAgentName, setSelectedAgentName] = (0, import_react121.useState)();
+  const [selectedAgentDisplayName, setSelectedAgentDisplayName] = (0, import_react121.useState)();
+  const [selectedAgentDefinition, setSelectedAgentDefinition] = (0, import_react121.useState)();
+  const openAgentConfigDialog = (0, import_react121.useCallback)(
     (name, displayName, definition) => {
       setSelectedAgentName(name);
       setSelectedAgentDisplayName(displayName);
@@ -33149,28 +33218,28 @@ var AppContainer = (props) => {
     },
     []
   );
-  const closeAgentConfigDialog = (0, import_react119.useCallback)(() => {
+  const closeAgentConfigDialog = (0, import_react121.useCallback)(() => {
     setIsAgentConfigDialogOpen(false);
     setSelectedAgentName(void 0);
     setSelectedAgentDisplayName(void 0);
     setSelectedAgentDefinition(void 0);
   }, []);
-  const toggleDebugProfiler = (0, import_react119.useCallback)(
+  const toggleDebugProfiler = (0, import_react121.useCallback)(
     () => setShowDebugProfiler((prev) => !prev),
     []
   );
-  const [currentModel, setCurrentModel] = (0, import_react119.useState)(config.getModel());
-  const [userTier, setUserTier] = (0, import_react119.useState)(void 0);
-  const [quotaStats, setQuotaStats] = (0, import_react119.useState)(() => {
+  const [currentModel, setCurrentModel] = (0, import_react121.useState)(config.getModel());
+  const [userTier, setUserTier] = (0, import_react121.useState)(void 0);
+  const [quotaStats, setQuotaStats] = (0, import_react121.useState)(() => {
     const remaining = config.getQuotaRemaining();
     const limit = config.getQuotaLimit();
     const resetTime = config.getQuotaResetTime();
     return remaining !== void 0 || limit !== void 0 || resetTime !== void 0 ? { remaining, limit, resetTime } : void 0;
   });
-  const [paidTier, setPaidTier] = (0, import_react119.useState)(
+  const [paidTier, setPaidTier] = (0, import_react121.useState)(
     void 0
   );
-  const [isConfigInitialized, setConfigInitialized] = (0, import_react119.useState)(false);
+  const [isConfigInitialized, setConfigInitialized] = (0, import_react121.useState)(false);
   const logger = useLogger(config);
   const { inputHistory, addInput, initializeFromLogger } = useInputHistoryStore();
   const { columns: terminalWidth, rows: terminalHeight } = useTerminalSize();
@@ -33179,10 +33248,10 @@ var AppContainer = (props) => {
   const app = use_app_default();
   const { stats: sessionStats } = useSessionStats();
   const branchName = useGitBranchName(config.getTargetDir());
-  const rootUiRef = (0, import_react119.useRef)(null);
-  const lastTitleRef = (0, import_react119.useRef)(null);
+  const rootUiRef = (0, import_react121.useRef)(null);
+  const lastTitleRef = (0, import_react121.useRef)(null);
   const staticExtraHeight = 3;
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     (async () => {
       if (!config.isInitialized()) {
         await config.initialize();
@@ -33227,11 +33296,11 @@ var AppContainer = (props) => {
       );
     };
   }, [config, resumedSessionData]);
-  (0, import_react119.useEffect)(
+  (0, import_react121.useEffect)(
     () => setUpdateHandler(historyManager.addItem, setUpdateInfo),
     [historyManager.addItem]
   );
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     const handleModelChanged = () => {
       setCurrentModel(config.getModel());
     };
@@ -33249,7 +33318,7 @@ var AppContainer = (props) => {
       coreEvents.off("quota-changed" /* QuotaChanged */, handleQuotaChanged);
     };
   }, [config]);
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     const handleSettingsChanged = () => {
       setSettingsNonce((prev) => prev + 1);
     };
@@ -33273,12 +33342,12 @@ var AppContainer = (props) => {
   }, [settings]);
   const { errorCount, clearErrorCount } = useErrorCount();
   const mainAreaWidth = calculateMainAreaWidth(terminalWidth, config);
-  const { inputWidth, suggestionsWidth } = (0, import_react119.useMemo)(() => {
+  const { inputWidth, suggestionsWidth } = (0, import_react121.useMemo)(() => {
     const { inputWidth: inputWidth2, suggestionsWidth: suggestionsWidth2 } = calculatePromptWidths(mainAreaWidth);
     return { inputWidth: inputWidth2, suggestionsWidth: suggestionsWidth2 };
   }, [mainAreaWidth]);
   const staticAreaMaxItemHeight = Math.max(terminalHeight * 4, 100);
-  const getPreferredEditor = (0, import_react119.useCallback)(() => {
+  const getPreferredEditor = (0, import_react121.useCallback)(() => {
     const val = settings.merged.general.preferredEditor;
     return isValidEditorType(val) ? val : void 0;
   }, [settings.merged.general.preferredEditor]);
@@ -33291,56 +33360,56 @@ var AppContainer = (props) => {
     shellModeActive,
     getPreferredEditor
   });
-  const bufferRef = (0, import_react119.useRef)(buffer);
-  (0, import_react119.useEffect)(() => {
+  const bufferRef = (0, import_react121.useRef)(buffer);
+  (0, import_react121.useEffect)(() => {
     bufferRef.current = buffer;
   }, [buffer]);
-  const stableSetText = (0, import_react119.useCallback)((text) => {
+  const stableSetText = (0, import_react121.useCallback)((text) => {
     bufferRef.current.setText(text);
   }, []);
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     initializeFromLogger(logger);
   }, [logger, initializeFromLogger]);
   useTerminalSetupPrompt({
     addConfirmUpdateExtensionRequest,
     addItem: historyManager.addItem
   });
-  const isStdoutCorkedRef = (0, import_react119.useRef)(false);
-  const isRefreshingStaticRef = (0, import_react119.useRef)(false);
-  const resizeCorkSafetyTimerRef = (0, import_react119.useRef)(null);
-  const resizeDebounceTimerRef = (0, import_react119.useRef)(null);
-  const lastStdoutColumnsRef = (0, import_react119.useRef)(
+  const isStdoutCorkedRef = (0, import_react121.useRef)(false);
+  const isRefreshingStaticRef = (0, import_react121.useRef)(false);
+  const resizeCorkSafetyTimerRef = (0, import_react121.useRef)(null);
+  const resizeDebounceTimerRef = (0, import_react121.useRef)(null);
+  const lastStdoutColumnsRef = (0, import_react121.useRef)(
     stdout.columns ?? process12.stdout.columns ?? terminalWidth
   );
-  const lastRefreshedColumnsRef = (0, import_react119.useRef)(terminalWidth);
-  const terminalWidthRef = (0, import_react119.useRef)(terminalWidth);
+  const lastRefreshedColumnsRef = (0, import_react121.useRef)(terminalWidth);
+  const terminalWidthRef = (0, import_react121.useRef)(terminalWidth);
   terminalWidthRef.current = terminalWidth;
-  const clearResizeCorkSafetyTimer = (0, import_react119.useCallback)(() => {
+  const clearResizeCorkSafetyTimer = (0, import_react121.useCallback)(() => {
     if (resizeCorkSafetyTimerRef.current) {
       clearTimeout(resizeCorkSafetyTimerRef.current);
       resizeCorkSafetyTimerRef.current = null;
     }
   }, []);
-  const clearResizeDebounceTimer = (0, import_react119.useCallback)(() => {
+  const clearResizeDebounceTimer = (0, import_react121.useCallback)(() => {
     if (resizeDebounceTimerRef.current) {
       clearTimeout(resizeDebounceTimerRef.current);
       resizeDebounceTimerRef.current = null;
     }
   }, []);
-  const corkStdout = (0, import_react119.useCallback)(() => {
+  const corkStdout = (0, import_react121.useCallback)(() => {
     if (!isStdoutCorkedRef.current && typeof stdout.cork === "function") {
       stdout.cork();
       isStdoutCorkedRef.current = true;
     }
   }, [stdout]);
-  const uncorkStdout = (0, import_react119.useCallback)(() => {
+  const uncorkStdout = (0, import_react121.useCallback)(() => {
     clearResizeCorkSafetyTimer();
     if (isStdoutCorkedRef.current && typeof stdout.uncork === "function") {
       isStdoutCorkedRef.current = false;
       stdout.uncork();
     }
   }, [stdout, clearResizeCorkSafetyTimer]);
-  const refreshStatic = (0, import_react119.useCallback)(() => {
+  const refreshStatic = (0, import_react121.useCallback)(() => {
     if (!isAlternateBuffer && !config.getUseTerminalBuffer()) {
       clearResizeDebounceTimer();
       refreshStdoutSize(stdout);
@@ -33362,6 +33431,8 @@ var AppContainer = (props) => {
         stdout.write(ENTER_SYNCHRONIZED_OUTPUT);
       }
       stdout.write(base_exports.clearTerminal);
+    }
+    if (!isAlternateBuffer || config.getUseTerminalBuffer()) {
       setHistoryRemountKey((prev) => prev + 1);
     }
   }, [
@@ -33374,7 +33445,7 @@ var AppContainer = (props) => {
     corkStdout,
     uncorkStdout
   ]);
-  (0, import_react119.useLayoutEffect)(() => {
+  (0, import_react121.useLayoutEffect)(() => {
     if (isRefreshingStaticRef.current) {
       isRefreshingStaticRef.current = false;
       refreshStdoutSize(stdout);
@@ -33392,7 +33463,7 @@ var AppContainer = (props) => {
     isAlternateBuffer,
     config.getScreenReader()
   );
-  const handleEditorClose = (0, import_react119.useCallback)(() => {
+  const handleEditorClose = (0, import_react121.useCallback)(() => {
     if (shouldUseAlternateScreen) {
       enterAlternateScreen();
       enableMouseEvents();
@@ -33404,14 +33475,14 @@ var AppContainer = (props) => {
     terminalCapabilityManager.enableSupportedModes();
     refreshStatic();
   }, [refreshStatic, shouldUseAlternateScreen, app, config]);
-  const [editorError, setEditorError] = (0, import_react119.useState)(null);
+  const [editorError, setEditorError] = (0, import_react121.useState)(null);
   const {
     isEditorDialogOpen,
     openEditorDialog,
     handleEditorSelect,
     exitEditorDialog
   } = useEditorSettings(settings, setEditorError, historyManager.addItem);
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     coreEvents.on("external-editor-closed" /* ExternalEditorClosed */, handleEditorClose);
     coreEvents.on("request-editor-selection" /* RequestEditorSelection */, openEditorDialog);
     return () => {
@@ -33419,7 +33490,7 @@ var AppContainer = (props) => {
       coreEvents.off("request-editor-selection" /* RequestEditorSelection */, openEditorDialog);
     };
   }, [handleEditorClose, openEditorDialog]);
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     if (!(settings.merged.ui.hideBanner || config.getScreenReader()) && bannerVisible && bannerText) {
       refreshStatic();
     }
@@ -33454,16 +33525,16 @@ var AppContainer = (props) => {
     initializationResult.authError,
     initializationResult.accountSuspensionInfo
   );
-  const [authContext, setAuthContext] = (0, import_react119.useState)(
+  const [authContext, setAuthContext] = (0, import_react121.useState)(
     {}
   );
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     if (authState === "authenticated" /* Authenticated */ && authContext.requiresRestart) {
       setAuthState("awaiting_login_restart" /* AwaitingLoginRestart */);
       setAuthContext({});
     }
   }, [authState, authContext, setAuthState]);
-  const handleShowAuthSelection = (0, import_react119.useCallback)(() => {
+  const handleShowAuthSelection = (0, import_react121.useCallback)(() => {
     setAuthState("updating" /* Updating */);
   }, [setAuthState]);
   const {
@@ -33505,13 +33576,13 @@ var AppContainer = (props) => {
     handleResumeSession,
     handleDeleteSession: handleDeleteSessionSync
   } = useSessionBrowser(config, loadHistoryForResume);
-  const handleDeleteSession = (0, import_react119.useCallback)(
+  const handleDeleteSession = (0, import_react121.useCallback)(
     async (session) => {
       await handleDeleteSessionSync(session);
     },
     [handleDeleteSessionSync]
   );
-  const handleAuthSelect = (0, import_react119.useCallback)(
+  const handleAuthSelect = (0, import_react121.useCallback)(
     async (authType, scope) => {
       if (authType) {
         const previousAuthType = config.getContentGeneratorConfig()?.authType ?? "unknown";
@@ -33556,7 +33627,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     },
     [settings, config, setAuthState, onAuthError, setAuthContext]
   );
-  const handleApiKeySubmit = (0, import_react119.useCallback)(
+  const handleApiKeySubmit = (0, import_react121.useCallback)(
     async (apiKey) => {
       try {
         onAuthError(null);
@@ -33576,16 +33647,16 @@ Logging in with Google... Restarting Gemini CLI to continue.
     },
     [setAuthState, onAuthError, reloadApiKey, config]
   );
-  const handleApiKeyCancel = (0, import_react119.useCallback)(() => {
+  const handleApiKeyCancel = (0, import_react121.useCallback)(() => {
     setAuthState("updating" /* Updating */);
   }, [setAuthState]);
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     if (authState === "authenticated" /* Authenticated */) {
       setUserTier(config.getUserTier());
       setPaidTier(config.getUserPaidTier());
     }
   }, [config, authState]);
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     if (settings.merged.security.auth.enforcedType && settings.merged.security.auth.selectedType && settings.merged.security.auth.enforcedType !== settings.merged.security.auth.selectedType) {
       onAuthError(
         `Authentication is enforced to be ${settings.merged.security.auth.enforcedType}, but you are currently using ${settings.merged.security.auth.selectedType}.`
@@ -33621,19 +33692,19 @@ Logging in with Google... Restarting Gemini CLI to continue.
     closeVoiceModelDialog
   } = useVoiceModelCommand();
   const { toggleVimEnabled } = useVimMode();
-  const setIsBackgroundTaskListOpenRef = (0, import_react119.useRef)(
+  const setIsBackgroundTaskListOpenRef = (0, import_react121.useRef)(
     () => {
     }
   );
-  const [shortcutsHelpVisible, setShortcutsHelpVisible] = (0, import_react119.useState)(false);
+  const [shortcutsHelpVisible, setShortcutsHelpVisible] = (0, import_react121.useState)(false);
   const {
     cleanUiDetailsVisible,
     setCleanUiDetailsVisible,
     toggleCleanUiDetailsVisible,
     revealCleanUiDetailsTemporarily
   } = useVisibilityToggle();
-  const cancelPromiseRef = (0, import_react119.useRef)(null);
-  const awaitCancelPromise = (0, import_react119.useCallback)(async () => {
+  const cancelPromiseRef = (0, import_react121.useRef)(null);
+  const awaitCancelPromise = (0, import_react121.useCallback)(async () => {
     if (!cancelPromiseRef.current) {
       return;
     }
@@ -33654,7 +33725,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       cancelPromiseRef.current = null;
     }
   }, []);
-  const slashCommandActions = (0, import_react119.useMemo)(
+  const slashCommandActions = (0, import_react121.useMemo)(
     () => ({
       openAuthDialog: () => setAuthState("updating" /* Updating */),
       openThemeDialog,
@@ -33739,9 +33810,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
     setBannerVisible,
     setCustomDialog
   );
-  const [authConsentRequest, setAuthConsentRequest] = (0, import_react119.useState)(null);
-  const [permissionConfirmationRequest, setPermissionConfirmationRequest] = (0, import_react119.useState)(null);
-  (0, import_react119.useEffect)(() => {
+  const [authConsentRequest, setAuthConsentRequest] = (0, import_react121.useState)(null);
+  const [permissionConfirmationRequest, setPermissionConfirmationRequest] = (0, import_react121.useState)(null);
+  (0, import_react121.useEffect)(() => {
     const handleConsentRequest = (payload) => {
       setAuthConsentRequest({
         prompt: payload.prompt,
@@ -33756,7 +33827,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       coreEvents.off("consent-request" /* ConsentRequest */, handleConsentRequest);
     };
   }, []);
-  const performMemoryRefresh = (0, import_react119.useCallback)(async () => {
+  const performMemoryRefresh = (0, import_react121.useCallback)(async () => {
     historyManager.addItem(
       {
         type: "info" /* INFO */,
@@ -33796,9 +33867,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
       debugLogger.warn("Error refreshing memory:", error);
     }
   }, [config, historyManager]);
-  const cancelHandlerRef = (0, import_react119.useRef)(() => {
+  const cancelHandlerRef = (0, import_react121.useRef)(() => {
   });
-  const onCancelSubmit = (0, import_react119.useCallback)(
+  const onCancelSubmit = (0, import_react121.useCallback)(
     (shouldRestorePrompt, clearBuffer = false) => {
       if (shouldRestorePrompt) {
         setPendingRestorePrompt(true);
@@ -33809,7 +33880,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     },
     []
   );
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     if (pendingRestorePrompt) {
       const lastHistoryUserMsg = historyManager.history.findLast(
         (h) => h.type === "user"
@@ -33821,9 +33892,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
       }
     }
   }, [pendingRestorePrompt, inputHistory, historyManager.history]);
-  const pendingHintsRef = (0, import_react119.useRef)([]);
-  const [pendingHintCount, setPendingHintCount] = (0, import_react119.useState)(0);
-  const consumePendingHints = (0, import_react119.useCallback)(() => {
+  const pendingHintsRef = (0, import_react121.useRef)([]);
+  const [pendingHintCount, setPendingHintCount] = (0, import_react121.useState)(0);
+  const consumePendingHints = (0, import_react121.useCallback)(() => {
     if (pendingHintsRef.current.length === 0) {
       return null;
     }
@@ -33832,7 +33903,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     setPendingHintCount(0);
     return hint;
   }, []);
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     const hintListener = (text, source) => {
       if (source !== "user_steering" && source !== "background_completion") {
         return;
@@ -33845,7 +33916,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       config.injectionService.offInjection(hintListener);
     };
   }, [config]);
-  const streamAgent = (0, import_react119.useMemo)(
+  const streamAgent = (0, import_react121.useMemo)(
     () => config?.getAgentSessionInteractiveEnabled() ? new LegacyAgentProtocol({ config, getPreferredEditor }) : void 0,
     [config, getPreferredEditor]
   );
@@ -33903,7 +33974,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     dismissBackgroundTask,
     retryStatus
   } = activeStream;
-  const pendingHistoryItems = (0, import_react119.useMemo)(
+  const pendingHistoryItems = (0, import_react121.useMemo)(
     () => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems],
     [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems]
   );
@@ -33926,8 +33997,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
     terminalHeight
   });
   setIsBackgroundTaskListOpenRef.current = setIsBackgroundTaskListOpen;
-  const lastOutputTimeRef = (0, import_react119.useRef)(0);
-  (0, import_react119.useEffect)(() => {
+  const lastOutputTimeRef = (0, import_react121.useRef)(0);
+  (0, import_react121.useEffect)(() => {
     lastOutputTimeRef.current = lastOutputTime;
   }, [lastOutputTime]);
   const { shouldShowFocusHint, inactivityStatus } = useShellInactivityStatus({
@@ -33940,7 +34011,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
   });
   const shouldShowActionRequiredTitle = inactivityStatus === "action_required";
   const shouldShowSilentWorkingTitle = inactivityStatus === "silent_working";
-  const handleApprovalModeChangeWithUiReveal = (0, import_react119.useCallback)(
+  const handleApprovalModeChangeWithUiReveal = (0, import_react121.useCallback)(
     (mode) => {
       void handleApprovalModeChange(mode);
       if (!cleanUiDetailsVisible) {
@@ -33954,7 +34025,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     ]
   );
   const { isMcpReady } = useMcpStatus(config);
-  const isCompressing = (0, import_react119.useMemo)(
+  const isCompressing = (0, import_react121.useMemo)(
     () => pendingHistoryItems.some(
       (item) => item.type === "compression" /* COMPRESSION */ && item.compression.isPending
     ),
@@ -33973,7 +34044,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     isMcpReady,
     isCompressing
   });
-  cancelHandlerRef.current = (0, import_react119.useCallback)(
+  cancelHandlerRef.current = (0, import_react121.useCallback)(
     (shouldRestorePrompt = true, clearBuffer = false) => {
       if (!clearBuffer && isToolAwaitingConfirmation(pendingHistoryItems)) {
         return;
@@ -34005,7 +34076,7 @@ ${queuedText}` : queuedText;
       pendingHistoryItems
     ]
   );
-  const handleHintSubmit = (0, import_react119.useCallback)(
+  const handleHintSubmit = (0, import_react121.useCallback)(
     (hint) => {
       const trimmed = hint.trim();
       if (!trimmed) {
@@ -34019,7 +34090,7 @@ ${queuedText}` : queuedText;
     },
     [config, historyManager]
   );
-  const handleFinalSubmit = (0, import_react119.useCallback)(
+  const handleFinalSubmit = (0, import_react121.useCallback)(
     async (submittedValue) => {
       reset();
       triggerExpandHint(null);
@@ -34103,7 +34174,7 @@ ${queuedText}` : queuedText;
       triggerExpandHint
     ]
   );
-  const handleClearScreen = (0, import_react119.useCallback)(() => {
+  const handleClearScreen = (0, import_react121.useCallback)(() => {
     reset();
     triggerExpandHint(null);
     historyManager.clearItems();
@@ -34118,22 +34189,22 @@ ${queuedText}` : queuedText;
   ]);
   const { handleInput: vimHandleInput } = useVim(buffer, handleFinalSubmit);
   const isInputActive = !initError && !isProcessing && !isResuming && (streamingState === "idle" /* Idle */ || streamingState === "responding" /* Responding */ || streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */) && !proQuotaRequest;
-  const observerRef = (0, import_react119.useRef)(null);
-  (0, import_react119.useEffect)(
+  const observerRef = (0, import_react121.useRef)(null);
+  (0, import_react121.useEffect)(
     () => () => {
       observerRef.current?.disconnect();
     },
     []
   );
-  const [controlsHeight, setControlsHeight] = (0, import_react119.useState)(0);
-  const [lastNonCopyControlsHeight, setLastNonCopyControlsHeight] = (0, import_react119.useState)(0);
-  (0, import_react119.useLayoutEffect)(() => {
+  const [controlsHeight, setControlsHeight] = (0, import_react121.useState)(0);
+  const [lastNonCopyControlsHeight, setLastNonCopyControlsHeight] = (0, import_react121.useState)(0);
+  (0, import_react121.useLayoutEffect)(() => {
     if (!copyModeEnabled && controlsHeight > 0) {
       setLastNonCopyControlsHeight(controlsHeight);
     }
   }, [copyModeEnabled, controlsHeight]);
   const stableControlsHeight = copyModeEnabled && lastNonCopyControlsHeight > 0 ? lastNonCopyControlsHeight : controlsHeight;
-  const mainControlsRef = (0, import_react119.useCallback)((node) => {
+  const mainControlsRef = (0, import_react121.useCallback)((node) => {
     if (observerRef.current) {
       observerRef.current.disconnect();
       observerRef.current = null;
@@ -34168,14 +34239,14 @@ ${queuedText}` : queuedText;
     sandboxManager: config.sandboxManager
   });
   const { isFocused, hasReceivedFocusEvent } = useFocus();
-  const contextFileNames = (0, import_react119.useMemo)(() => {
+  const contextFileNames = (0, import_react121.useMemo)(() => {
     const fromSettings = settings.merged.context.fileName;
     return fromSettings ? Array.isArray(fromSettings) ? fromSettings : [fromSettings] : getAllGeminiMdFilenames();
   }, [settings.merged.context.fileName]);
-  const initialPrompt = (0, import_react119.useMemo)(() => config.getQuestion(), [config]);
-  const initialPromptSubmitted = (0, import_react119.useRef)(false);
+  const initialPrompt = (0, import_react121.useMemo)(() => config.getQuestion(), [config]);
+  const initialPromptSubmitted = (0, import_react121.useRef)(false);
   const geminiClient = config.getGeminiClient();
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     if (initialPrompt && isConfigInitialized && !initialPromptSubmitted.current && !isAuthenticating && !isAuthDialogOpen && !isThemeDialogOpen && !isEditorDialogOpen && !showPrivacyNotice && geminiClient?.isInitialized?.()) {
       void handleFinalSubmit(initialPrompt);
       initialPromptSubmitted.current = true;
@@ -34191,9 +34262,9 @@ ${queuedText}` : queuedText;
     showPrivacyNotice,
     geminiClient
   ]);
-  const [idePromptAnswered, setIdePromptAnswered] = (0, import_react119.useState)(false);
-  const [currentIDE, setCurrentIDE] = (0, import_react119.useState)(null);
-  (0, import_react119.useEffect)(() => {
+  const [idePromptAnswered, setIdePromptAnswered] = (0, import_react121.useState)(false);
+  const [currentIDE, setCurrentIDE] = (0, import_react121.useState)(null);
+  (0, import_react121.useEffect)(() => {
     const getIde = async () => {
       const ideClient = await IdeClient.getInstance();
       const currentIde = ideClient.getCurrentIde();
@@ -34204,10 +34275,10 @@ ${queuedText}` : queuedText;
   const shouldShowIdePrompt = Boolean(
     currentIDE && !config.getIdeMode() && !settings.merged.ide.hasSeenNudge && !idePromptAnswered
   );
-  const [showErrorDetails, setShowErrorDetails] = (0, import_react119.useState)(false);
-  const [showFullTodos, setShowFullTodos] = (0, import_react119.useState)(false);
-  const [renderMarkdown, setRenderMarkdown] = (0, import_react119.useState)(true);
-  const handleExitRepeat = (0, import_react119.useCallback)(
+  const [showErrorDetails, setShowErrorDetails] = (0, import_react121.useState)(false);
+  const [showFullTodos, setShowFullTodos] = (0, import_react121.useState)(false);
+  const [renderMarkdown, setRenderMarkdown] = (0, import_react121.useState)(true);
+  const handleExitRepeat = (0, import_react121.useCallback)(
     async (count) => {
       if (count > 2) {
         recordExitFail(config);
@@ -34229,9 +34300,9 @@ ${queuedText}` : queuedText;
     windowMs: WARNING_PROMPT_DURATION_MS,
     onRepeat: handleExitRepeat
   });
-  const [ideContextState, setIdeContextState] = (0, import_react119.useState)();
-  const [showEscapePrompt, setShowEscapePrompt] = (0, import_react119.useState)(false);
-  const [showIdeRestartPrompt, setShowIdeRestartPrompt] = (0, import_react119.useState)(false);
+  const [ideContextState, setIdeContextState] = (0, import_react121.useState)();
+  const [showEscapePrompt, setShowEscapePrompt] = (0, import_react121.useState)(false);
+  const [showIdeRestartPrompt, setShowIdeRestartPrompt] = (0, import_react121.useState)(false);
   const [transientMessage, showTransientMessage] = useTimedMessage(WARNING_PROMPT_DURATION_MS);
   const {
     isFolderTrustDialogOpen,
@@ -34240,17 +34311,17 @@ ${queuedText}` : queuedText;
     isRestarting
   } = useFolderTrust(settings, setIsTrustedFolder, historyManager.addItem);
   const policyUpdateConfirmationRequest = config.getPolicyUpdateConfirmationRequest();
-  const [isPolicyUpdateDialogOpen, setIsPolicyUpdateDialogOpen] = (0, import_react119.useState)(
+  const [isPolicyUpdateDialogOpen, setIsPolicyUpdateDialogOpen] = (0, import_react121.useState)(
     !!policyUpdateConfirmationRequest
   );
   const {
     needsRestart: ideNeedsRestart,
     restartReason: ideTrustRestartReason
   } = useIdeTrustListener();
-  const prevWidthRef = (0, import_react119.useRef)(terminalWidth);
+  const prevWidthRef = (0, import_react121.useRef)(terminalWidth);
   useIncludeDirsTrust(config, isTrustedFolder, historyManager, setCustomDialog);
-  const tabFocusTimeoutRef = (0, import_react119.useRef)(null);
-  (0, import_react119.useEffect)(() => {
+  const tabFocusTimeoutRef = (0, import_react121.useRef)(null);
+  (0, import_react121.useEffect)(() => {
     const handleTransientMessage = (payload) => {
       showTransientMessage({ text: payload.message, type: payload.type });
     };
@@ -34278,7 +34349,7 @@ ${queuedText}` : queuedText;
       }
     };
   }, [showTransientMessage]);
-  const handleWarning = (0, import_react119.useCallback)(
+  const handleWarning = (0, import_react121.useCallback)(
     (message) => {
       showTransientMessage({
         text: message,
@@ -34292,12 +34363,12 @@ ${queuedText}` : queuedText;
     setRawMode,
     shouldUseAlternateScreen
   });
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     if (ideNeedsRestart) {
       setShowIdeRestartPrompt(true);
     }
   }, [ideNeedsRestart]);
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     if (isAlternateBuffer || config.getUseTerminalBuffer() || typeof stdout.prependListener !== "function") {
       return;
     }
@@ -34332,7 +34403,7 @@ ${queuedText}` : queuedText;
     clearResizeDebounceTimer,
     clearResizeCorkSafetyTimer
   ]);
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     if (prevWidthRef.current === terminalWidth) {
       return;
     }
@@ -34355,25 +34426,24 @@ ${queuedText}` : queuedText;
     isAlternateBuffer,
     config
   ]);
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     const unsubscribe = ideContextStore.subscribe(setIdeContextState);
     setIdeContextState(ideContextStore.get());
     return unsubscribe;
   }, []);
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     const openDebugConsole = () => {
       setShowErrorDetails(true);
-      setConstrainHeight(false);
     };
     appEvents.on("open-debug-console" /* OpenDebugConsole */, openDebugConsole);
     return () => {
       appEvents.off("open-debug-console" /* OpenDebugConsole */, openDebugConsole);
     };
   }, [config]);
-  const handleEscapePromptChange = (0, import_react119.useCallback)((showPrompt) => {
+  const handleEscapePromptChange = (0, import_react121.useCallback)((showPrompt) => {
     setShowEscapePrompt(showPrompt);
   }, []);
-  const handleIdePromptComplete = (0, import_react119.useCallback)(
+  const handleIdePromptComplete = (0, import_react121.useCallback)(
     (result) => {
       if (result.userSelection === "yes") {
         handleSlashCommand("/ide install");
@@ -34388,7 +34458,7 @@ ${queuedText}` : queuedText;
   const isAwaitingLoginRestart = authState === "awaiting_login_restart" /* AwaitingLoginRestart */;
   const loginRestartMessage = settings.merged.security.auth.selectedType === "vertex-ai" /* USE_VERTEX_AI */ ? "Authenticating to Vertex AI in Cloud Shell requires a restart to apply project settings." : void 0;
   const dialogsVisible = shouldShowIdePrompt || isFolderTrustDialogOpen || isPolicyUpdateDialogOpen || adminSettingsChanged || !!commandConfirmationRequest || !!authConsentRequest || !!permissionConfirmationRequest || !!customDialog || confirmUpdateExtensionRequests.length > 0 || !!loopDetectionConfirmationRequest || isThemeDialogOpen || isSettingsDialogOpen || isModelDialogOpen || isVoiceModelDialogOpen || isAgentConfigDialogOpen || isPermissionsDialogOpen || isAuthenticating || isAuthDialogOpen || isEditorDialogOpen || showPrivacyNotice || showIdeRestartPrompt || !!proQuotaRequest || !!validationRequest || !!overageMenuRequest || !!emptyWalletRequest || isSessionBrowserOpen || authState === "awaiting_api_key_input" /* AwaitingApiKeyInput */ || isAwaitingLoginRestart || !!newAgents;
-  const handleGlobalKeypress = (0, import_react119.useCallback)(
+  const handleGlobalKeypress = (0, import_react121.useCallback)(
     (key) => {
       if (settings.merged.general.debugKeystrokeLogging) {
         debugLogger.log("[DEBUG] Keystroke:", JSON.stringify(key));
@@ -34479,7 +34549,7 @@ ${queuedText}` : queuedText;
       if (keyMatchers["app.showErrorDetails" /* SHOW_ERROR_DETAILS */](key)) {
         if (settings.merged.general.devtools) {
           void (async () => {
-            const { toggleDevToolsPanel } = await import("./devtoolsService-HIZA3JGR.js");
+            const { toggleDevToolsPanel } = await import("./devtoolsService-UO6ZB72B.js");
             await toggleDevToolsPanel(
               config,
               showErrorDetails,
@@ -34631,7 +34701,7 @@ ${queuedText}` : queuedText;
       priority: 200 /* Critical */
     }
   );
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     if (settings.merged.ui.hideWindowTitle) return;
     const paddedTitle = computeTerminalTitle({
       streamingState,
@@ -34658,7 +34728,7 @@ ${queuedText}` : queuedText;
     config,
     stdout
   ]);
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     const handleUserFeedback = (payload) => {
       let type;
       switch (payload.severity) {
@@ -34709,7 +34779,7 @@ ${queuedText}` : queuedText;
     };
   }, [historyManager]);
   const nightly = props.version.includes("nightly");
-  const hasPendingToolConfirmation = (0, import_react119.useMemo)(
+  const hasPendingToolConfirmation = (0, import_react121.useMemo)(
     () => isToolAwaitingConfirmation(pendingHistoryItems),
     [pendingHistoryItems]
   );
@@ -34774,7 +34844,7 @@ ${queuedText}` : queuedText;
     hasLoopDetectionConfirmationRequest
   });
   const isPassiveShortcutsHelpState = isInputActive && streamingState === "idle" /* Idle */ && !hasPendingActionRequired;
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     if (shortcutsHelpVisible && !isPassiveShortcutsHelpState) {
       setShortcutsHelpVisible(false);
     }
@@ -34783,7 +34853,7 @@ ${queuedText}` : queuedText;
     isPassiveShortcutsHelpState,
     setShortcutsHelpVisible
   ]);
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     if (!isConfigInitialized || !config.isModelSteeringEnabled() || streamingState !== "idle" /* Idle */ || !isMcpReady || isToolAwaitingConfirmation(pendingHistoryItems)) {
       return;
     }
@@ -34803,14 +34873,14 @@ ${queuedText}` : queuedText;
     pendingHistoryItems,
     pendingHintCount
   ]);
-  const allToolCalls = (0, import_react119.useMemo)(
+  const allToolCalls = (0, import_react121.useMemo)(
     () => getAllToolCalls(pendingHistoryItems),
     [pendingHistoryItems]
   );
-  const [geminiMdFileCount, setGeminiMdFileCount] = (0, import_react119.useState)(
+  const [geminiMdFileCount, setGeminiMdFileCount] = (0, import_react121.useState)(
     config.getGeminiMdFileCount()
   );
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     const handleMemoryChanged = (result) => {
       setGeminiMdFileCount(result.fileCount);
     };
@@ -34819,7 +34889,7 @@ ${queuedText}` : queuedText;
       coreEvents.off("memory-changed" /* MemoryChanged */, handleMemoryChanged);
     };
   }, []);
-  (0, import_react119.useEffect)(() => {
+  (0, import_react121.useEffect)(() => {
     let isMounted = true;
     const fetchBannerTexts = async () => {
       const [defaultBanner, warningBanner] = await Promise.all([
@@ -34837,7 +34907,7 @@ ${queuedText}` : queuedText;
       isMounted = false;
     };
   }, [config, refreshStatic]);
-  const inputState = (0, import_react119.useMemo)(
+  const inputState = (0, import_react121.useMemo)(
     () => ({
       buffer,
       userMessages: inputHistory,
@@ -34857,7 +34927,7 @@ ${queuedText}` : queuedText;
       suggestionsWidth
     ]
   );
-  const quotaState = (0, import_react119.useMemo)(
+  const quotaState = (0, import_react121.useMemo)(
     () => ({
       userTier,
       stats: quotaStats,
@@ -34876,7 +34946,7 @@ ${queuedText}` : queuedText;
       emptyWalletRequest
     ]
   );
-  const uiState = (0, import_react119.useMemo)(
+  const uiState = (0, import_react121.useMemo)(
     () => ({
       history: historyManager.history,
       historyManager,
@@ -35111,11 +35181,11 @@ ${queuedText}` : queuedText;
       showIsExpandableHint
     ]
   );
-  const exitPrivacyNotice = (0, import_react119.useCallback)(
+  const exitPrivacyNotice = (0, import_react121.useCallback)(
     () => setShowPrivacyNotice(false),
     [setShowPrivacyNotice]
   );
-  const uiActions = (0, import_react119.useMemo)(
+  const uiActions = (0, import_react121.useMemo)(
     () => ({
       handleThemeSelect,
       closeThemeDialog,
@@ -35333,7 +35403,9 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
     debugMode: config.getDebugMode()
   });
   consolePatcher.patch();
-  const { stdout: inkStdout, stderr: inkStderr } = createWorkingStdio();
+  const { stdout: inkStdout, stderr: inkStderr } = createWorkingStdio({
+    synchronizedOutput: process.platform !== "win32" || isTmux()
+  });
   const isShpool = !!process.env["SHPOOL_SESSION_NAME"];
   const AppWrapper = () => {
     useKittyKeyboardProtocol();
@@ -35352,7 +35424,7 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
     await new Promise((resolve3) => setTimeout(resolve3, 100));
   }
   const instance = render_default(
-    process.env["DEBUG"] ? /* @__PURE__ */ (0, import_jsx_runtime138.jsx)(import_react120.default.StrictMode, { children: /* @__PURE__ */ (0, import_jsx_runtime138.jsx)(AppWrapper, {}) }) : /* @__PURE__ */ (0, import_jsx_runtime138.jsx)(AppWrapper, {}),
+    process.env["DEBUG"] ? /* @__PURE__ */ (0, import_jsx_runtime138.jsx)(import_react122.default.StrictMode, { children: /* @__PURE__ */ (0, import_jsx_runtime138.jsx)(AppWrapper, {}) }) : /* @__PURE__ */ (0, import_jsx_runtime138.jsx)(AppWrapper, {}),
     {
       stdout: inkStdout,
       stderr: inkStderr,
@@ -35370,7 +35442,7 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
       alternateBuffer: useAlternateBuffer2,
       terminalBuffer: config.getUseTerminalBuffer(),
       renderProcess: config.getUseRenderProcess() && config.getUseTerminalBuffer(),
-      incrementalRendering: settings.merged.ui.incrementalRendering !== false && useAlternateBuffer2 && !isShpool,
+      incrementalRendering: settings.merged.ui.incrementalRendering !== false && (useAlternateBuffer2 || config.getUseTerminalBuffer()) && !isShpool,
       debugRainbow: settings.merged.ui.debugRainbow === true
     }
   );