@google/gemini-cli 0.36.0-preview.6 → 0.36.0-preview.7

package/bundle/{interactiveCli-T2GH3MML.js → interactiveCli-B6Y3UISW.js}

@@ -181,7 +181,7 @@ import {
   widestLineFromStyledChars,
   wordBreakStyledChars,
   wrapStyledChars
-} from "./chunk-5JYGJANN.js";
+} from "./chunk-YTGZ6CSI.js";
 import {
   ApiKeyUpdatedEvent,
   AsyncFzf,
@@ -300,10 +300,9 @@ import {
   validatePlanContent,
   validatePlanPath,
   writeToStdout
-} from "./chunk-I3Z6XPMI.js";
+} from "./chunk-GDBDMLKR.js";
 import {
   ACTIVATE_SKILL_TOOL_NAME,
-  ASK_USER_TOOL_NAME,
   ApprovalMode,
   ChangeAuthRequestedError,
   CoreEvent,
@@ -346,7 +345,7 @@ import {
   safeJsonToMarkdown,
   shortenPath,
   tildeifyPath
-} from "./chunk-HLML5SVJ.js";
+} from "./chunk-S2IQOR7T.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-RJTRUG2J.js";
 import "./chunk-IUUIT4SU.js";
@@ -20965,14 +20964,14 @@ function useMouseContext() {
   return context;
 }
 function useMouse(handler, { isActive = true } = {}) {
-  const { subscribe, unsubscribe } = useMouseContext();
+  const { subscribe: subscribe2, unsubscribe } = useMouseContext();
   (0, import_react12.useEffect)(() => {
     if (!isActive) {
       return;
     }
-    subscribe(handler);
+    subscribe2(handler);
     return () => unsubscribe(handler);
-  }, [isActive, handler, subscribe, unsubscribe]);
+  }, [isActive, handler, subscribe2, unsubscribe]);
 }
 function MouseProvider({
   children,
@@ -20983,7 +20982,7 @@ function MouseProvider({
   const { stdin } = use_stdin_default();
   const subscribers = (0, import_react12.useRef)(/* @__PURE__ */ new Set()).current;
   const lastClickRef = (0, import_react12.useRef)(null);
-  const subscribe = (0, import_react12.useCallback)(
+  const subscribe2 = (0, import_react12.useCallback)(
     (handler) => {
       subscribers.add(handler);
     },
@@ -21063,24 +21062,24 @@ function MouseProvider({
     };
   }, [stdin, mouseEventsEnabled, subscribers, debugKeystrokeLogging]);
   const contextValue = (0, import_react12.useMemo)(
-    () => ({ subscribe, unsubscribe }),
-    [subscribe, unsubscribe]
+    () => ({ subscribe: subscribe2, unsubscribe }),
+    [subscribe2, unsubscribe]
   );
   return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(MouseContext.Provider, { value: contextValue, children });
 }
 
 // packages/cli/src/ui/hooks/useMouse.ts
 function useMouse2(onMouseEvent, { isActive }) {
-  const { subscribe, unsubscribe } = useMouseContext();
+  const { subscribe: subscribe2, unsubscribe } = useMouseContext();
   (0, import_react13.useEffect)(() => {
     if (!isActive) {
       return;
     }
-    subscribe(onMouseEvent);
+    subscribe2(onMouseEvent);
     return () => {
       unsubscribe(onMouseEvent);
     };
-  }, [isActive, onMouseEvent, subscribe, unsubscribe]);
+  }, [isActive, onMouseEvent, subscribe2, unsubscribe]);
 }
 
 // packages/cli/src/ui/contexts/ScrollProvider.tsx
@@ -24049,7 +24048,7 @@ var ToolGroupMessage = ({
   ) : void 0;
   const contentWidth = terminalWidth - TOOL_MESSAGE_HORIZONTAL_MARGIN;
   const isExplicitClosingSlice = allToolCalls.length === 0;
-  if (visibleToolCalls.length === 0 && (!isExplicitClosingSlice || borderBottomOverride !== true)) {
+  if (visibleToolCalls.length === 0 && !isExplicitClosingSlice) {
     return null;
   }
   const content = /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(
@@ -24125,7 +24124,7 @@ var ToolGroupMessage = ({
             We have to keep the bottom border separate so it doesn't get
             drawn over by the sticky header directly inside it.
            */
-        (visibleToolCalls.length > 0 || borderBottomOverride !== void 0) && /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+        (visibleToolCalls.length > 0 || borderBottomOverride !== void 0) && borderBottomOverride !== false && /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
           Box_default,
           {
             height: 0,
@@ -24591,7 +24590,7 @@ var Section = ({ title, children }) => /* @__PURE__ */ (0, import_jsx_runtime41.
   /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { bold: true, color: theme.text.primary, children: title }),
   children
 ] });
-var buildModelRows = (models, config, quotas, useGemini3_1 = false, useCustomToolModel = false) => {
+var buildModelRows = (models, config, quotas, useGemini3_1 = false, useGemini3_1FlashLite = false, useCustomToolModel = false) => {
   const getBaseModelName = (name) => name.replace("-001", "");
   const usedModelNames = new Set(
     Object.keys(models).map(getBaseModelName).map((name) => getDisplayString(name, config))
@@ -24612,7 +24611,12 @@ var buildModelRows = (models, config, quotas, useGemini3_1 = false, useCustomToo
     };
   });
   const quotaRows = quotas?.buckets?.filter(
-    (b) => b.modelId && isActiveModel(b.modelId, useGemini3_1, useCustomToolModel) && !usedModelNames.has(getDisplayString(b.modelId, config))
+    (b) => b.modelId && isActiveModel(
+      b.modelId,
+      useGemini3_1,
+      useGemini3_1FlashLite,
+      useCustomToolModel
+    ) && !usedModelNames.has(getDisplayString(b.modelId, config))
   ).map((bucket) => ({
     key: bucket.modelId,
     modelName: getDisplayString(bucket.modelId, config),
@@ -24636,6 +24640,7 @@ var ModelUsageTable = ({
   pooledLimit,
   pooledResetTime,
   useGemini3_1,
+  useGemini3_1FlashLite,
   useCustomToolModel
 }) => {
   const { stdout } = use_stdout_default();
@@ -24645,6 +24650,7 @@ var ModelUsageTable = ({
     config,
     quotas,
     useGemini3_1,
+    useGemini3_1FlashLite,
     useCustomToolModel
   );
   if (rows.length === 0) {
@@ -24930,6 +24936,7 @@ var StatsDisplay = ({
   const settings = useSettings();
   const config = useConfig();
   const useGemini3_1 = config.getGemini31LaunchedSync?.() ?? false;
+  const useGemini3_1FlashLite = config.getGemini31FlashLiteLaunchedSync?.() ?? false;
   const useCustomToolModel = useGemini3_1 && config.getContentGeneratorConfig().authType === AuthType.USE_GEMINI;
   const pooledRemaining = quotaStats?.remaining;
   const pooledLimit = quotaStats?.limit;
@@ -25059,6 +25066,7 @@ var StatsDisplay = ({
             pooledLimit,
             pooledResetTime,
             useGemini3_1,
+            useGemini3_1FlashLite,
             useCustomToolModel
           }
         ),
@@ -27755,13 +27763,7 @@ var ChoiceQuestionView = ({
   const overhead = HEADER_HEIGHT2 + TITLE_MARGIN + FOOTER_HEIGHT2;
   const listHeight = availableHeight ? Math.max(1, availableHeight - overhead) : void 0;
   const reservedListHeight = Math.min(selectionItems.length * 2, 6);
-  const questionHeightLimit = listHeight && !isAlternateBuffer ? question.unconstrainedHeight ? Math.max(1, listHeight - selectionItems.length * 2) : Math.min(
-    15,
-    Math.max(
-      1,
-      listHeight - Math.max(DIALOG_PADDING, reservedListHeight)
-    )
-  ) : void 0;
+  const questionHeightLimit = listHeight && !isAlternateBuffer ? question.unconstrainedHeight ? Math.max(1, listHeight - selectionItems.length * 2) : Math.max(1, listHeight - Math.max(DIALOG_PADDING, reservedListHeight)) : void 0;
   const maxItemsToShow = listHeight && (!isAlternateBuffer || availableHeight !== void 0) ? Math.min(
     selectionItems.length,
     Math.max(
@@ -32964,6 +32966,7 @@ function ModelDialog({ onClose }) {
   const preferredModel = config?.getModel() || DEFAULT_GEMINI_MODEL_AUTO;
   const shouldShowPreviewModels = config?.getHasAccessToPreviewModel();
   const useGemini31 = config?.getGemini31LaunchedSync?.() ?? false;
+  const useGemini31FlashLite = config?.getGemini31FlashLiteLaunchedSync?.() ?? false;
   const selectedAuthType = settings.merged.security.auth.selectedType;
   const useCustomToolModel = useGemini31 && selectedAuthType === AuthType.USE_GEMINI;
   const manualModelSelected = (0, import_react65.useMemo)(() => {
@@ -32978,6 +32981,7 @@ function ModelDialog({ onClose }) {
       PREVIEW_GEMINI_MODEL,
       PREVIEW_GEMINI_3_1_MODEL,
       PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL,
+      PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL,
       PREVIEW_GEMINI_FLASH_MODEL
     ];
     if (manualModels.includes(preferredModel)) {
@@ -33054,7 +33058,6 @@ function ModelDialog({ onClose }) {
     return list;
   }, [config, shouldShowPreviewModels, manualModelSelected, useGemini31]);
   const manualOptions = (0, import_react65.useMemo)(() => {
-    const isFreeTier = config?.getUserTier() === UserTierId.FREE;
     if (config?.getExperimentalDynamicModelConfiguration?.() === true && config.modelConfigService) {
       const list2 = Object.entries(
         config.modelConfigService.getModelDefinitions?.() ?? {}
@@ -33063,19 +33066,19 @@ function ModelDialog({ onClose }) {
         if (m.isPreview && !shouldShowPreviewModels) return false;
         if (m.tier === "auto") return false;
         if (!hasAccessToProModel && m.tier === "pro") return false;
-        if (m.tier === "flash-lite" && m.isPreview && !isFreeTier)
-          return false;
         if (id === PREVIEW_GEMINI_3_1_MODEL && !useGemini31) return false;
-        if (id === PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL && !useGemini31)
+        if (id === PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL && !useGemini31FlashLite)
           return false;
         return true;
       }).map(([id, m]) => {
         const resolvedId = config.modelConfigService.resolveModelId(id, {
           useGemini3_1: useGemini31,
+          useGemini3_1FlashLite: useGemini31FlashLite,
           useCustomTools: useCustomToolModel
         });
         const titleId = config.modelConfigService.resolveModelId(id, {
-          useGemini3_1: useGemini31
+          useGemini3_1: useGemini31,
+          useGemini3_1FlashLite: useGemini31FlashLite
         });
         return {
           value: resolvedId,
@@ -33122,7 +33125,7 @@ function ModelDialog({ onClose }) {
           key: PREVIEW_GEMINI_FLASH_MODEL
         }
       ];
-      if (isFreeTier) {
+      if (useGemini31FlashLite) {
         previewOptions.push({
           value: PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL,
           title: getDisplayString(PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL),
@@ -33138,6 +33141,7 @@ function ModelDialog({ onClose }) {
   }, [
     shouldShowPreviewModels,
     useGemini31,
+    useGemini31FlashLite,
     useCustomToolModel,
     hasAccessToProModel,
     config
@@ -34737,144 +34741,99 @@ var import_react71 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/useConsoleMessages.ts
 var import_react70 = __toESM(require_react(), 1);
-function consoleMessagesReducer(state, action) {
-  const MAX_CONSOLE_MESSAGES = 1e3;
-  switch (action.type) {
-    case "ADD_MESSAGES": {
-      const newMessages = [...state];
-      for (const queuedMessage of action.payload) {
-        const lastMessage = newMessages[newMessages.length - 1];
-        if (lastMessage && lastMessage.type === queuedMessage.type && lastMessage.content === queuedMessage.content) {
-          newMessages[newMessages.length - 1] = {
-            ...lastMessage,
-            count: lastMessage.count + 1
-          };
-        } else {
-          newMessages.push({ ...queuedMessage, count: 1 });
-        }
-      }
-      if (newMessages.length > MAX_CONSOLE_MESSAGES) {
-        return newMessages.slice(newMessages.length - MAX_CONSOLE_MESSAGES);
-      }
-      return newMessages;
+var MAX_CONSOLE_MESSAGES = 1e3;
+var globalConsoleMessages = [];
+var globalErrorCount = 0;
+var listeners = /* @__PURE__ */ new Set();
+var messageQueue = [];
+var timeoutId = null;
+function initializeConsoleStore() {
+  if (timeoutId) {
+    clearTimeout(timeoutId);
+    timeoutId = null;
+  }
+  messageQueue = [];
+  globalConsoleMessages = [];
+  globalErrorCount = 0;
+  notifyListeners();
+  coreEvents.off(CoreEvent.ConsoleLog, handleConsoleLog);
+  coreEvents.off(CoreEvent.Output, handleOutput);
+  coreEvents.on(CoreEvent.ConsoleLog, handleConsoleLog);
+  coreEvents.on(CoreEvent.Output, handleOutput);
+}
+function notifyListeners() {
+  for (const listener of listeners) {
+    listener();
+  }
+}
+function processQueue() {
+  if (messageQueue.length === 0) return;
+  const newMessages = [...globalConsoleMessages];
+  for (const queuedMessage of messageQueue) {
+    if (queuedMessage.type === "error") {
+      globalErrorCount++;
+    }
+    const prev = newMessages[newMessages.length - 1];
+    if (prev && prev.type === queuedMessage.type && prev.content === queuedMessage.content) {
+      newMessages[newMessages.length - 1] = {
+        ...prev,
+        count: prev.count + 1
+      };
+    } else {
+      newMessages.push({ ...queuedMessage, count: 1 });
     }
-    case "CLEAR":
-      return [];
-    default:
-      return state;
   }
+  globalConsoleMessages = newMessages.length > MAX_CONSOLE_MESSAGES ? newMessages.slice(-MAX_CONSOLE_MESSAGES) : newMessages;
+  messageQueue = [];
+  timeoutId = null;
+  notifyListeners();
 }
+function handleNewMessage(message) {
+  messageQueue.push(message);
+  if (!timeoutId) {
+    timeoutId = setTimeout(processQueue, 50);
+  }
+}
+function subscribe(listener) {
+  listeners.add(listener);
+  return () => {
+    listeners.delete(listener);
+  };
+}
+function getConsoleMessagesSnapshot() {
+  return globalConsoleMessages;
+}
+function getErrorCountSnapshot() {
+  return globalErrorCount;
+}
+var handleConsoleLog = (payload) => {
+  let content = payload.content;
+  const MAX_CONSOLE_MSG_LENGTH = 1e4;
+  if (content.length > MAX_CONSOLE_MSG_LENGTH) {
+    content = content.slice(0, MAX_CONSOLE_MSG_LENGTH) + `... [Truncated ${content.length - MAX_CONSOLE_MSG_LENGTH} characters]`;
+  }
+  handleNewMessage({
+    type: payload.type,
+    content,
+    count: 1
+  });
+};
+var handleOutput = (payload) => {
+  let content = typeof payload.chunk === "string" ? payload.chunk : new TextDecoder().decode(payload.chunk);
+  const MAX_OUTPUT_CHUNK_LENGTH = 1e4;
+  if (content.length > MAX_OUTPUT_CHUNK_LENGTH) {
+    content = content.slice(0, MAX_OUTPUT_CHUNK_LENGTH) + `... [Truncated ${content.length - MAX_OUTPUT_CHUNK_LENGTH} characters]`;
+  }
+  handleNewMessage({ type: "log", content, count: 1 });
+};
 function useConsoleMessages() {
-  const [consoleMessages, dispatch] = (0, import_react70.useReducer)(consoleMessagesReducer, []);
-  const messageQueueRef = (0, import_react70.useRef)([]);
-  const timeoutRef = (0, import_react70.useRef)(null);
-  const isProcessingRef = (0, import_react70.useRef)(false);
-  const processQueue = (0, import_react70.useCallback)(() => {
-    if (messageQueueRef.current.length > 0) {
-      isProcessingRef.current = true;
-      const messagesToProcess = messageQueueRef.current;
-      messageQueueRef.current = [];
-      (0, import_react70.startTransition)(() => {
-        dispatch({ type: "ADD_MESSAGES", payload: messagesToProcess });
-      });
-    }
-    timeoutRef.current = null;
-  }, []);
-  const handleNewMessage = (0, import_react70.useCallback)(
-    (message) => {
-      messageQueueRef.current.push(message);
-      if (!isProcessingRef.current && !timeoutRef.current) {
-        timeoutRef.current = setTimeout(processQueue, 50);
-      }
-    },
-    [processQueue]
-  );
-  (0, import_react70.useEffect)(() => {
-    isProcessingRef.current = false;
-    if (messageQueueRef.current.length > 0 && !timeoutRef.current) {
-      timeoutRef.current = setTimeout(processQueue, 50);
-    }
-  }, [consoleMessages, processQueue]);
-  (0, import_react70.useEffect)(() => {
-    const handleConsoleLog = (payload) => {
-      let content = payload.content;
-      const MAX_CONSOLE_MSG_LENGTH = 1e4;
-      if (content.length > MAX_CONSOLE_MSG_LENGTH) {
-        content = content.slice(0, MAX_CONSOLE_MSG_LENGTH) + `... [Truncated ${content.length - MAX_CONSOLE_MSG_LENGTH} characters]`;
-      }
-      handleNewMessage({
-        type: payload.type,
-        content,
-        count: 1
-      });
-    };
-    const handleOutput = (payload) => {
-      let content = typeof payload.chunk === "string" ? payload.chunk : new TextDecoder().decode(payload.chunk);
-      const MAX_OUTPUT_CHUNK_LENGTH = 1e4;
-      if (content.length > MAX_OUTPUT_CHUNK_LENGTH) {
-        content = content.slice(0, MAX_OUTPUT_CHUNK_LENGTH) + `... [Truncated ${content.length - MAX_OUTPUT_CHUNK_LENGTH} characters]`;
-      }
-      handleNewMessage({ type: "log", content, count: 1 });
-    };
-    coreEvents.on(CoreEvent.ConsoleLog, handleConsoleLog);
-    coreEvents.on(CoreEvent.Output, handleOutput);
-    return () => {
-      coreEvents.off(CoreEvent.ConsoleLog, handleConsoleLog);
-      coreEvents.off(CoreEvent.Output, handleOutput);
-    };
-  }, [handleNewMessage]);
-  const clearConsoleMessages = (0, import_react70.useCallback)(() => {
-    if (timeoutRef.current) {
-      clearTimeout(timeoutRef.current);
-      timeoutRef.current = null;
-    }
-    messageQueueRef.current = [];
-    isProcessingRef.current = true;
-    (0, import_react70.startTransition)(() => {
-      dispatch({ type: "CLEAR" });
-    });
-  }, []);
-  (0, import_react70.useEffect)(
-    () => () => {
-      if (timeoutRef.current) {
-        clearTimeout(timeoutRef.current);
-      }
-    },
-    []
-  );
-  return { consoleMessages, clearConsoleMessages };
+  return (0, import_react70.useSyncExternalStore)(subscribe, getConsoleMessagesSnapshot);
 }
 function useErrorCount() {
-  const [errorCount, dispatch] = (0, import_react70.useReducer)(
-    (state, action) => {
-      switch (action) {
-        case "INCREMENT":
-          return state + 1;
-        case "CLEAR":
-          return 0;
-        default:
-          return state;
-      }
-    },
-    0
-  );
-  (0, import_react70.useEffect)(() => {
-    const handleConsoleLog = (payload) => {
-      if (payload.type === "error") {
-        (0, import_react70.startTransition)(() => {
-          dispatch("INCREMENT");
-        });
-      }
-    };
-    coreEvents.on(CoreEvent.ConsoleLog, handleConsoleLog);
-    return () => {
-      coreEvents.off(CoreEvent.ConsoleLog, handleConsoleLog);
-    };
-  }, []);
+  const errorCount = (0, import_react70.useSyncExternalStore)(subscribe, getErrorCountSnapshot);
   const clearErrorCount = (0, import_react70.useCallback)(() => {
-    (0, import_react70.startTransition)(() => {
-      dispatch("CLEAR");
-    });
+    globalErrorCount = 0;
+    notifyListeners();
   }, []);
   return { errorCount, clearErrorCount };
 }
@@ -34884,7 +34843,7 @@ var import_jsx_runtime113 = __toESM(require_jsx_runtime(), 1);
 var iconBoxWidth = 3;
 var DetailedMessagesDisplay = ({ maxHeight, width, hasFocus }) => {
   const scrollableListRef = (0, import_react71.useRef)(null);
-  const { consoleMessages } = useConsoleMessages();
+  const consoleMessages = useConsoleMessages();
   const config = useConfig();
   const messages = (0, import_react71.useMemo)(() => {
     if (config.getDebugMode()) {
@@ -36977,11 +36936,11 @@ function usePromptCompletion({
     clearGhostText
   ]);
   (0, import_react79.useEffect)(() => {
-    const timeoutId = setTimeout(
+    const timeoutId2 = setTimeout(
       handlePromptCompletion,
       PROMPT_COMPLETION_DEBOUNCE_MS
     );
-    return () => clearTimeout(timeoutId);
+    return () => clearTimeout(timeoutId2);
   }, [buffer.text, buffer.cursor, handlePromptCompletion]);
   (0, import_react79.useEffect)(() => {
     const currentText = buffer.text.trim();
@@ -38698,20 +38657,20 @@ var InputPrompt = ({
 var import_jsx_runtime119 = __toESM(require_jsx_runtime(), 1);
 var MAX_DISPLAYED_QUEUED_MESSAGES = 3;
 var QueuedMessageDisplay = ({
-  messageQueue
+  messageQueue: messageQueue2
 }) => {
-  if (messageQueue.length === 0) {
+  if (messageQueue2.length === 0) {
     return null;
   }
   return /* @__PURE__ */ (0, import_jsx_runtime119.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime119.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime119.jsx)(Text, { dimColor: true, children: "Queued (press \u2191 to edit):" }) }),
-    messageQueue.slice(0, MAX_DISPLAYED_QUEUED_MESSAGES).map((message, index) => {
+    messageQueue2.slice(0, MAX_DISPLAYED_QUEUED_MESSAGES).map((message, index) => {
       const preview = message.replace(/\s+/g, " ");
       return /* @__PURE__ */ (0, import_jsx_runtime119.jsx)(Box_default, { paddingLeft: 4, width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime119.jsx)(Text, { dimColor: true, wrap: "truncate", children: preview }) }, index);
     }),
-    messageQueue.length > MAX_DISPLAYED_QUEUED_MESSAGES && /* @__PURE__ */ (0, import_jsx_runtime119.jsx)(Box_default, { paddingLeft: 4, children: /* @__PURE__ */ (0, import_jsx_runtime119.jsxs)(Text, { dimColor: true, children: [
+    messageQueue2.length > MAX_DISPLAYED_QUEUED_MESSAGES && /* @__PURE__ */ (0, import_jsx_runtime119.jsx)(Box_default, { paddingLeft: 4, children: /* @__PURE__ */ (0, import_jsx_runtime119.jsxs)(Text, { dimColor: true, children: [
       "... (+",
-      messageQueue.length - MAX_DISPLAYED_QUEUED_MESSAGES,
+      messageQueue2.length - MAX_DISPLAYED_QUEUED_MESSAGES,
       " more)"
     ] }) })
   ] });
@@ -40421,7 +40380,7 @@ function TerminalProvider({ children }) {
   const { stdout } = use_stdout_default();
   const subscribers = (0, import_react93.useRef)(/* @__PURE__ */ new Set()).current;
   const bufferRef = (0, import_react93.useRef)("");
-  const subscribe = (0, import_react93.useCallback)(
+  const subscribe2 = (0, import_react93.useCallback)(
     (handler) => {
       subscribers.add(handler);
     },
@@ -40439,14 +40398,14 @@ function TerminalProvider({ children }) {
         unsubscribe(handler);
         resolve3();
       };
-      subscribe(handler);
+      subscribe2(handler);
       TerminalCapabilityManager.queryBackgroundColor(stdout);
       setTimeout(() => {
         unsubscribe(handler);
         resolve3();
       }, 100);
     }),
-    [stdout, subscribe, unsubscribe]
+    [stdout, subscribe2, unsubscribe]
   );
   (0, import_react93.useEffect)(() => {
     const handleData = (data) => {
@@ -40476,7 +40435,7 @@ function TerminalProvider({ children }) {
   return /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(
     TerminalContext.Provider,
     {
-      value: { subscribe, unsubscribe, queryTerminalBackground },
+      value: { subscribe: subscribe2, unsubscribe, queryTerminalBackground },
       children
     }
   );
@@ -42531,8 +42490,24 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     const allPushed = toolCalls.length > 0 && toolCalls.every((tc) => pushedToolCallIds.has(tc.request.callId));
     const anyVisibleInHistory = pushedToolCallIds.size > 0;
     const anyVisibleInPending = remainingTools.some((tc) => {
-      const isInProgress = tc.status !== "success" && tc.status !== "error" && tc.status !== "cancelled";
-      if (tc.request.name === ASK_USER_TOOL_NAME && isInProgress) {
+      const displayName = tc.tool?.displayName ?? tc.request.name;
+      let hasResultDisplay = false;
+      if (tc.status === CoreToolCallStatus.Success || tc.status === CoreToolCallStatus.Error || tc.status === CoreToolCallStatus.Cancelled) {
+        hasResultDisplay = !!tc.response?.resultDisplay;
+      } else if (tc.status === CoreToolCallStatus.Executing) {
+        hasResultDisplay = !!tc.liveOutput;
+      }
+      if (shouldHideToolCall({
+        displayName,
+        status: tc.status,
+        approvalMode: tc.approvalMode,
+        hasResultDisplay,
+        parentCallId: tc.request.parentCallId
+      })) {
+        return false;
+      }
+      const displayStatus = mapCoreStatusToDisplayStatus(tc.status);
+      if (displayStatus === "Confirming" /* Confirming */) {
         return false;
       }
       return true;
@@ -45493,14 +45468,14 @@ var TimeoutError = class extends Error {
 // node_modules/ky/distribution/utils/timeout.js
 async function timeout(request, init, abortController, options) {
   return new Promise((resolve3, reject) => {
-    const timeoutId = setTimeout(() => {
+    const timeoutId2 = setTimeout(() => {
       if (abortController) {
         abortController.abort();
       }
       reject(new TimeoutError(request));
     }, options.timeout);
     void options.fetch(request, init).then(resolve3).catch(reject).then(() => {
-      clearTimeout(timeoutId);
+      clearTimeout(timeoutId2);
     });
   });
 }
@@ -45513,10 +45488,10 @@ async function delay(ms, { signal }) {
       signal.addEventListener("abort", abortHandler, { once: true });
     }
     function abortHandler() {
-      clearTimeout(timeoutId);
+      clearTimeout(timeoutId2);
       reject(signal.reason);
     }
-    const timeoutId = setTimeout(() => {
+    const timeoutId2 = setTimeout(() => {
       signal?.removeEventListener("abort", abortHandler);
       resolve3();
     }, ms);
@@ -46026,7 +46001,7 @@ function useMessageQueue({
   submitQuery,
   isMcpReady
 }) {
-  const [messageQueue, setMessageQueue] = (0, import_react109.useState)([]);
+  const [messageQueue2, setMessageQueue] = (0, import_react109.useState)([]);
   const addMessage = (0, import_react109.useCallback)((message) => {
     const trimmedMessage = message.trim();
     if (trimmedMessage.length > 0) {
@@ -46037,20 +46012,20 @@ function useMessageQueue({
     setMessageQueue([]);
   }, []);
   const getQueuedMessagesText = (0, import_react109.useCallback)(() => {
-    if (messageQueue.length === 0) return "";
-    return messageQueue.join("\n\n");
-  }, [messageQueue]);
+    if (messageQueue2.length === 0) return "";
+    return messageQueue2.join("\n\n");
+  }, [messageQueue2]);
   const popAllMessages = (0, import_react109.useCallback)(() => {
-    if (messageQueue.length === 0) {
+    if (messageQueue2.length === 0) {
       return void 0;
     }
-    const allMessages = messageQueue.join("\n\n");
+    const allMessages = messageQueue2.join("\n\n");
     setMessageQueue([]);
     return allMessages;
-  }, [messageQueue]);
+  }, [messageQueue2]);
   (0, import_react109.useEffect)(() => {
-    if (isConfigInitialized && streamingState === "idle" /* Idle */ && isMcpReady && messageQueue.length > 0) {
-      const combinedMessage = messageQueue.join("\n\n");
+    if (isConfigInitialized && streamingState === "idle" /* Idle */ && isMcpReady && messageQueue2.length > 0) {
+      const combinedMessage = messageQueue2.join("\n\n");
       setMessageQueue([]);
       submitQuery(combinedMessage);
     }
@@ -46058,11 +46033,11 @@ function useMessageQueue({
     isConfigInitialized,
     streamingState,
     isMcpReady,
-    messageQueue,
+    messageQueue2,
     submitQuery
   ]);
   return {
-    messageQueue,
+    messageQueue: messageQueue2,
     addMessage,
     clearQueue,
     getQueuedMessagesText,
@@ -46535,11 +46510,11 @@ var useHookDisplayState = () => {
         });
       };
       if (remaining > 0) {
-        const timeoutId = setTimeout(() => {
+        const timeoutId2 = setTimeout(() => {
           removeHook();
-          activeTimeouts.delete(timeoutId);
+          activeTimeouts.delete(timeoutId2);
         }, remaining);
-        activeTimeouts.add(timeoutId);
+        activeTimeouts.add(timeoutId2);
       } else {
         removeHook();
       }
@@ -46656,7 +46631,7 @@ var LoginWithGoogleRestartDialog = ({
 var import_react118 = __toESM(require_react(), 1);
 function useTerminalTheme(handleThemeSelect, config, refreshStatic) {
   const settings = useSettings();
-  const { subscribe, unsubscribe, queryTerminalBackground } = useTerminalContext();
+  const { subscribe: subscribe2, unsubscribe, queryTerminalBackground } = useTerminalContext();
   (0, import_react118.useEffect)(() => {
     if (settings.merged.ui.autoThemeSwitching === false) {
       return;
@@ -46701,7 +46676,7 @@ function useTerminalTheme(handleThemeSelect, config, refreshStatic) {
         refreshStatic();
       }
     };
-    subscribe(handleTerminalBackground);
+    subscribe2(handleTerminalBackground);
     return () => {
       clearInterval(pollIntervalId);
       unsubscribe(handleTerminalBackground);
@@ -46712,7 +46687,7 @@ function useTerminalTheme(handleThemeSelect, config, refreshStatic) {
     settings.merged.ui.terminalBackgroundPollingInterval,
     config,
     handleThemeSelect,
-    subscribe,
+    subscribe2,
     unsubscribe,
     queryTerminalBackground,
     refreshStatic
@@ -47335,7 +47310,6 @@ var AppContainer = (props) => {
   const app = use_app_default();
   const { stats: sessionStats } = useSessionStats();
   const branchName = useGitBranchName(config.getTargetDir());
-  const mainControlsRef = (0, import_react124.useRef)(null);
   const rootUiRef = (0, import_react124.useRef)(null);
   const lastTitleRef = (0, import_react124.useRef)(null);
   const staticExtraHeight = 3;
@@ -47985,7 +47959,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
   );
   const { isMcpReady } = useMcpStatus(config);
   const {
-    messageQueue,
+    messageQueue: messageQueue2,
     addMessage,
     clearQueue,
     getQueuedMessagesText,
@@ -48095,7 +48069,7 @@ ${queuedText}` : queuedText;
         }
         void submitQuery(submittedValue);
       } else {
-        if (isIdle && !isMcpOrConfigReady && messageQueue.length === 0) {
+        if (isIdle && !isMcpOrConfigReady && messageQueue2.length === 0) {
           coreEvents.emitFeedback(
             "info",
             !isConfigInitialized ? "Initializing... Prompts will be queued." : "Waiting for MCP servers to initialize... Slash commands are still available and prompts will be queued."
@@ -48113,7 +48087,7 @@ ${queuedText}` : queuedText;
       slashCommands,
       isMcpReady,
       streamingState,
-      messageQueue.length,
+      messageQueue2.length,
       pendingHistoryItems,
       config,
       constrainHeight,
@@ -48141,16 +48115,27 @@ ${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_react124.useRef)(null);
   const [controlsHeight, setControlsHeight] = (0, import_react124.useState)(0);
-  (0, import_react124.useLayoutEffect)(() => {
-    if (mainControlsRef.current) {
-      const fullFooterMeasurement = measure_element_default(mainControlsRef.current);
-      const roundedHeight = Math.round(fullFooterMeasurement.height);
-      if (roundedHeight > 0 && roundedHeight !== controlsHeight) {
-        setControlsHeight(roundedHeight);
-      }
+  const mainControlsRef = (0, import_react124.useCallback)((node) => {
+    if (observerRef.current) {
+      observerRef.current.disconnect();
+      observerRef.current = null;
+    }
+    if (node) {
+      const observer = new ResizeObserver((entries) => {
+        const entry = entries[0];
+        if (entry) {
+          const roundedHeight = Math.round(entry.contentRect.height);
+          setControlsHeight(
+            (prev) => roundedHeight !== prev ? roundedHeight : prev
+          );
+        }
+      });
+      observer.observe(node);
+      observerRef.current = observer;
     }
-  }, [buffer, terminalWidth, terminalHeight, controlsHeight, isInputActive]);
+  }, []);
   const availableTerminalHeight = Math.max(
     0,
     terminalHeight - controlsHeight - backgroundShellHeight - 1
@@ -48383,7 +48368,7 @@ ${queuedText}` : queuedText;
       if (keyMatchers["app.showErrorDetails" /* SHOW_ERROR_DETAILS */](key)) {
         if (settings.merged.general.devtools) {
           void (async () => {
-            const { toggleDevToolsPanel } = await import("./devtoolsService-FPXH5TOL.js");
+            const { toggleDevToolsPanel } = await import("./devtoolsService-Q6LGZKTJ.js");
             await toggleDevToolsPanel(
               config,
               showErrorDetails,
@@ -48779,7 +48764,7 @@ ${queuedText}` : queuedText;
       currentWittyPhrase,
       historyRemountKey,
       activeHooks,
-      messageQueue,
+      messageQueue: messageQueue2,
       queueErrorMessage,
       showApprovalModeIndicator,
       allowPlanMode,
@@ -48902,7 +48887,7 @@ ${queuedText}` : queuedText;
       currentWittyPhrase,
       historyRemountKey,
       activeHooks,
-      messageQueue,
+      messageQueue2,
       queueErrorMessage,
       showApprovalModeIndicator,
       allowPlanMode,
@@ -49143,6 +49128,7 @@ ${queuedText}` : queuedText;
 var import_jsx_runtime137 = __toESM(require_jsx_runtime(), 1);
 var SLOW_RENDER_MS = 200;
 async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), resumedSessionData, initializationResult) {
+  initializeConsoleStore();
   const useAlternateBuffer2 = shouldEnterAlternateScreen(
     isAlternateBufferEnabled(config),
     config.getScreenReader()