@google/gemini-cli 0.41.0-preview.1 → 0.42.0-nightly.20260501.gcaa046641

package/bundle/{interactiveCli-LTPR447O.js → interactiveCli-74QXEIGP.js}

@@ -83,12 +83,10 @@ import {
   getTransformUnderCursor,
   getUsedStatusColor,
   handleAtCommand,
-  handleAutoUpdate,
   isAtCommand,
   isAutoExecutableCommand,
   isBrowser,
   isContextUsageHigh,
-  isDevelopment,
   isInSettingsScope,
   isNarrowWidth,
   isNewFile,
@@ -105,14 +103,12 @@ import {
   parseSlashCommand,
   persistentState,
   profiler,
-  relaunchApp,
   renderDiffLines,
   render_default,
   requestConsentInteractive,
   require_jsx_runtime,
   require_semver,
   saveClipboardImage,
-  setUpdateHandler,
   shouldSwitchTheme,
   startAutoMemoryIfEnabled,
   styledCharsWidth,
@@ -152,13 +148,13 @@ import {
   widestLineFromStyledChars,
   wordBreakStyledChars,
   wrapStyledChars
-} from "./chunk-DAEE6Y5T.js";
+} from "./chunk-EGV36KAI.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
 import {
   require_source
-} from "./chunk-R4LSW45D.js";
+} from "./chunk-J44J2AAV.js";
 import {
   ACTIVE_SHELL_MAX_LINES,
   COMPACT_TOOL_SUBVIEW_MAX_LINES,
@@ -198,26 +194,34 @@ import {
   getSessionFiles,
   interpolateColor,
   isLoadableSettingScope,
-  isTodoList,
   isWorkspaceTrusted,
   loadTrustedFolders,
-  mapCoreStatusToDisplayStatus,
   normalizeEscapedNewlines,
   pickDefaultThemeName,
-  require_react,
   require_tinygradient,
   resolveColor,
   sanitizeForDisplay,
   stringWidth,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-5QI3ZXQB.js";
+} from "./chunk-2WK6K7H4.js";
+import {
+  handleAutoUpdate,
+  isDevelopment,
+  relaunchApp,
+  setUpdateHandler
+} from "./chunk-FTIY7CSS.js";
+import {
+  isTodoList,
+  mapCoreStatusToDisplayStatus,
+  require_react
+} from "./chunk-ESRGVL52.js";
 import {
   registerCleanup,
   removeCleanup,
   runExitCleanup,
   setupTtyCheck
-} from "./chunk-KJ4M7JXR.js";
+} from "./chunk-K5CA5JX2.js";
 import {
   ApiKeyUpdatedEvent,
   AsyncFzf,
@@ -251,6 +255,7 @@ import {
   OverageOptionSelectedEvent,
   PolicyIntegrityManager,
   ProjectIdRequiredError,
+  RELEASE_CHANNEL_STABILITY,
   ROOT_SCHEDULER_ID,
   Scheduler,
   SessionEndReason,
@@ -289,6 +294,7 @@ import {
   geminiPartsToContentParts,
   generateSummary,
   getAdminErrorMessage,
+  getChannelFromVersion,
   getCodeAssistServer,
   getEditorDisplayName,
   getG1CreditBalance,
@@ -349,7 +355,7 @@ import {
   validatePlanContent,
   validatePlanPath,
   writeToStdout
-} from "./chunk-XO6NKGWV.js";
+} from "./chunk-SYZNFSS3.js";
 import {
   ACTIVATE_SKILL_TOOL_NAME,
   AGENT_TOOL_NAME,
@@ -416,7 +422,7 @@ import {
   safeJsonToMarkdown,
   shortenPath,
   tildeifyPath
-} from "./chunk-SAJ72M2G.js";
+} from "./chunk-FABHOVMY.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-RJTRUG2J.js";
 import "./chunk-IUUIT4SU.js";
@@ -5838,7 +5844,8 @@ var ToolInfo = ({
   status: coreStatus,
   emphasis,
   progressMessage: _progressMessage,
-  originalRequestName
+  originalRequestName,
+  isExpanded = false
 }) => {
   const status = mapCoreStatusToDisplayStatus(coreStatus);
   const nameColor = import_react16.default.useMemo(() => {
@@ -5856,19 +5863,35 @@ var ToolInfo = ({
     }
   }, [emphasis]);
   const isCompletedAskUser = isCompletedAskUserTool(name, status);
-  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(Box_default, { overflow: "hidden", height: 1, flexGrow: 1, flexShrink: 1, children: /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(Text, { strikethrough: status === "Canceled" /* Canceled */, wrap: "truncate", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(Text, { color: nameColor, bold: true, children: name }),
-    originalRequestName && originalRequestName !== name && /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(Text, { color: theme.text.secondary, italic: true, children: [
-      " ",
-      "(redirection from ",
-      originalRequestName,
-      ")"
-    ] }),
-    !isCompletedAskUser && /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(import_jsx_runtime17.Fragment, { children: [
-      " ",
-      /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(Text, { color: theme.text.secondary, children: description })
-    ] })
-  ] }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+    Box_default,
+    {
+      overflow: "hidden",
+      height: isExpanded ? void 0 : 1,
+      flexGrow: 1,
+      flexShrink: 1,
+      children: /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(
+        Text,
+        {
+          strikethrough: status === "Canceled" /* Canceled */,
+          wrap: isExpanded ? "wrap" : "truncate",
+          children: [
+            /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(Text, { color: nameColor, bold: true, children: name }),
+            originalRequestName && originalRequestName !== name && /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(Text, { color: theme.text.secondary, italic: true, children: [
+              " ",
+              "(redirection from ",
+              originalRequestName,
+              ")"
+            ] }),
+            !isCompletedAskUser && /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(import_jsx_runtime17.Fragment, { children: [
+              " ",
+              /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(Text, { color: theme.text.secondary, children: description })
+            ] })
+          ]
+        }
+      )
+    }
+  );
 };
 var McpProgressIndicator = ({
   progress,
@@ -6294,14 +6317,121 @@ var ShellInputPrompt = ({
   return null;
 };
 
+// packages/cli/src/ui/contexts/ToolActionsContext.tsx
+var import_react19 = __toESM(require_react(), 1);
+var import_jsx_runtime20 = __toESM(require_jsx_runtime(), 1);
+function hasLegacyCallback(details) {
+  return !!details && "onConfirm" in details && typeof details.onConfirm === "function";
+}
+var ToolActionsContext = (0, import_react19.createContext)(null);
+var useToolActions = () => {
+  const context = (0, import_react19.useContext)(ToolActionsContext);
+  if (!context) {
+    throw new Error("useToolActions must be used within a ToolActionsProvider");
+  }
+  return context;
+};
+var ToolActionsProvider = (props) => {
+  const {
+    children,
+    config,
+    toolCalls,
+    isExpanded,
+    toggleExpansion,
+    toggleAllExpansion
+  } = props;
+  const [ideClient, setIdeClient] = (0, import_react19.useState)(null);
+  const [isDiffingEnabled, setIsDiffingEnabled] = (0, import_react19.useState)(false);
+  (0, import_react19.useEffect)(() => {
+    let isMounted = true;
+    let activeClient = null;
+    const handleStatusChange = () => {
+      if (isMounted && activeClient) {
+        setIsDiffingEnabled(activeClient.isDiffingEnabled());
+      }
+    };
+    if (config.getIdeMode()) {
+      IdeClient.getInstance().then((client) => {
+        if (!isMounted) return;
+        activeClient = client;
+        setIdeClient(client);
+        setIsDiffingEnabled(client.isDiffingEnabled());
+        client.addStatusChangeListener(handleStatusChange);
+      }).catch((error) => {
+        debugLogger.error("Failed to get IdeClient instance:", error);
+      });
+    }
+    return () => {
+      isMounted = false;
+      if (activeClient) {
+        activeClient.removeStatusChangeListener(handleStatusChange);
+      }
+    };
+  }, [config]);
+  const confirm = (0, import_react19.useCallback)(
+    async (callId, outcome, payload) => {
+      const tool = toolCalls.find((t) => t.callId === callId);
+      if (!tool) {
+        debugLogger.warn(`ToolActions: Tool ${callId} not found`);
+        return;
+      }
+      const details = tool.confirmationDetails;
+      if (details?.type === "edit" && isDiffingEnabled && "filePath" in details) {
+        const cliOutcome = outcome === ToolConfirmationOutcome.Cancel ? "rejected" : "accepted";
+        await ideClient?.resolveDiffFromCli(details.filePath, cliOutcome);
+      }
+      if (tool.correlationId) {
+        await config.getMessageBus().publish({
+          type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+          correlationId: tool.correlationId,
+          confirmed: outcome !== ToolConfirmationOutcome.Cancel,
+          requiresUserConfirmation: false,
+          outcome,
+          payload
+        });
+        return;
+      }
+      if (hasLegacyCallback(details)) {
+        await details.onConfirm(outcome, payload);
+        return;
+      }
+      debugLogger.warn(
+        `ToolActions: No correlationId or callback for ${callId}`
+      );
+    },
+    [config, ideClient, toolCalls, isDiffingEnabled]
+  );
+  const cancel = (0, import_react19.useCallback)(
+    async (callId) => {
+      await confirm(callId, ToolConfirmationOutcome.Cancel);
+    },
+    [confirm]
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+    ToolActionsContext.Provider,
+    {
+      value: {
+        confirm,
+        cancel,
+        isDiffingEnabled,
+        isExpanded,
+        toggleExpansion,
+        toggleAllExpansion
+      },
+      children
+    }
+  );
+};
+
 // packages/cli/src/ui/components/messages/ToolMessage.tsx
-var import_jsx_runtime20 = (
+var import_jsx_runtime21 = (
   // It is crucial we don't replace this <> with a Box because otherwise the
   // sticky header inside it would be sticky to that box rather than to the
   // parent component of this ToolMessage.
   __toESM(require_jsx_runtime(), 1)
 );
 var ToolMessage = ({
+  callId,
   name,
   description,
   resultDisplay,
@@ -6323,6 +6453,8 @@ var ToolMessage = ({
   progress,
   progressTotal
 }) => {
+  const { isExpanded: isExpandedInContext } = useToolActions();
+  const isExpanded = (isExpandedInContext ? isExpandedInContext(callId) : false) || availableTerminalHeight === void 0;
   const isThisShellFocused2 = isThisShellFocused(
     name,
     status,
@@ -6336,8 +6468,8 @@ var ToolMessage = ({
     isThisShellFocused2,
     resultDisplay
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(import_jsx_runtime20.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(import_jsx_runtime21.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(
       StickyHeader,
       {
         width: terminalWidth,
@@ -6345,7 +6477,7 @@ var ToolMessage = ({
         borderColor,
         borderDimColor,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
             ToolStatusIndicator,
             {
               status,
@@ -6353,7 +6485,7 @@ var ToolMessage = ({
               isFocused: isThisShellFocused2
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
             ToolInfo,
             {
               name,
@@ -6361,21 +6493,22 @@ var ToolMessage = ({
               description,
               emphasis,
               progressMessage,
-              originalRequestName
+              originalRequestName,
+              isExpanded
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
             FocusHint,
             {
               shouldShowFocusHint,
               isThisShellFocused: isThisShellFocused2
             }
           ),
-          emphasis === "high" && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(TrailingIndicator, {})
+          emphasis === "high" && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(TrailingIndicator, {})
         ]
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(
       Box_default,
       {
         width: terminalWidth,
@@ -6389,7 +6522,7 @@ var ToolMessage = ({
         paddingX: 1,
         flexDirection: "column",
         children: [
-          status === CoreToolCallStatus.Executing && progress !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+          status === CoreToolCallStatus.Executing && progress !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
             McpProgressIndicator,
             {
               progress,
@@ -6398,7 +6531,7 @@ var ToolMessage = ({
               barWidth: 20
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
             ToolResultDisplay,
             {
               resultDisplay,
@@ -6410,7 +6543,7 @@ var ToolMessage = ({
               overflowDirection: kind === Kind.Agent ? "bottom" : "top"
             }
           ),
-          isThisShellFocused2 && config && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+          isThisShellFocused2 && config && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Box_default, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
             ShellInputPrompt,
             {
               activeShellPtyId: activeShellPtyId ?? null,
@@ -6424,13 +6557,13 @@ var ToolMessage = ({
 };
 
 // packages/cli/src/ui/components/messages/ShellToolMessage.tsx
-var import_react23 = __toESM(require_react(), 1);
+var import_react24 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/contexts/UIActionsContext.tsx
-var import_react22 = __toESM(require_react(), 1);
+var import_react23 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/IdeIntegrationNudge.tsx
-var import_jsx_runtime21 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime22 = __toESM(require_jsx_runtime(), 1);
 function IdeIntegrationNudge({
   ide,
   onComplete
@@ -6477,7 +6610,7 @@ function IdeIntegrationNudge({
     }
   ];
   const installText = isExtensionPreInstalled ? `If you select Yes, the CLI will have access to your open files and display diffs directly in ${ideName ?? "your editor"}.` : `If you select Yes, we'll install an extension that allows the CLI to access your open files and display diffs directly in ${ideName ?? "your editor"}.`;
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -6487,26 +6620,26 @@ function IdeIntegrationNudge({
       width: "100%",
       marginLeft: 1,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Box_default, { marginBottom: 1, flexDirection: "column", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Text, { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { color: theme.status.warning, children: "> " }),
+        /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(Box_default, { marginBottom: 1, flexDirection: "column", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(Text, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { color: theme.status.warning, children: "> " }),
             `Do you want to connect ${ideName ?? "your editor"} to Gemini CLI?`
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { color: theme.text.secondary, children: installText })
+          /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { color: theme.text.secondary, children: installText })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(RadioButtonSelect, { items: OPTIONS, onSelect: onComplete })
+        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(RadioButtonSelect, { items: OPTIONS, onSelect: onComplete })
       ]
     }
   );
 }
 
 // packages/cli/src/ui/components/FolderTrustDialog.tsx
-var import_react19 = __toESM(require_react(), 1);
+var import_react20 = __toESM(require_react(), 1);
 import * as process2 from "node:process";
 import * as path from "node:path";
 
 // packages/cli/src/ui/components/ShowMoreLines.tsx
-var import_jsx_runtime22 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime23 = __toESM(require_jsx_runtime(), 1);
 var ShowMoreLines = ({
   constrainHeight,
   isOverflowing: isOverflowingProp
@@ -6517,21 +6650,21 @@ var ShowMoreLines = ({
   if (!isOverflowing || !constrainHeight || !(streamingState === "idle" /* Idle */ || streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */ || streamingState === "responding" /* Responding */)) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { paddingX: 1, marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { color: theme.text.accent, wrap: "truncate", children: "Press Ctrl+O to show more lines" }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { paddingX: 1, marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Text, { color: theme.text.accent, wrap: "truncate", children: "Press Ctrl+O to show more lines" }) });
 };
 
 // packages/cli/src/ui/components/FolderTrustDialog.tsx
-var import_jsx_runtime23 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime24 = __toESM(require_jsx_runtime(), 1);
 var FolderTrustDialog = ({
   onSelect,
   isRestarting,
   discoveryResults
 }) => {
-  const [exiting, setExiting] = (0, import_react19.useState)(false);
+  const [exiting, setExiting] = (0, import_react20.useState)(false);
   const { terminalHeight, terminalWidth, constrainHeight } = useUIState();
   const isAlternateBuffer = useAlternateBuffer();
   const isExpanded = !constrainHeight;
-  (0, import_react19.useEffect)(() => {
+  (0, import_react20.useEffect)(() => {
     let timer;
     if (isRestarting) {
       timer = setTimeout(relaunchApp, 250);
@@ -6540,7 +6673,7 @@ var FolderTrustDialog = ({
       if (timer) clearTimeout(timer);
     };
   }, [isRestarting]);
-  const handleExit = (0, import_react19.useCallback)(() => {
+  const handleExit = (0, import_react20.useCallback)(() => {
     setExiting(true);
     setTimeout(async () => {
       await runExitCleanup();
@@ -6591,41 +6724,41 @@ var FolderTrustDialog = ({
     { label: "Agents", items: discoveryResults?.agents ?? [] },
     { label: "Setting overrides", items: discoveryResults?.settings ?? [] }
   ].filter((g) => g.items.length > 0);
-  const discoveryContent = /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Box_default, { flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Text, { color: theme.text.primary, children: "Trusting a folder allows Gemini CLI to load its local configurations, including custom commands, hooks, MCP servers, agent skills, and settings. These configurations could execute code on your behalf or change the behavior of the CLI." }) }),
-    hasErrors && /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Text, { color: theme.status.error, bold: true, children: "\u274C Discovery Errors:" }),
-      discoveryResults.discoveryErrors.map((error, i) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Text, { color: theme.status.error, children: [
+  const discoveryContent = /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { flexDirection: "column", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.primary, children: "Trusting a folder allows Gemini CLI to load its local configurations, including custom commands, hooks, MCP servers, agent skills, and settings. These configurations could execute code on your behalf or change the behavior of the CLI." }) }),
+    hasErrors && /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.status.error, bold: true, children: "\u274C Discovery Errors:" }),
+      discoveryResults.discoveryErrors.map((error, i) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { color: theme.status.error, children: [
         "\u2022 ",
         stripAnsi(error)
       ] }) }, i))
     ] }),
-    hasWarnings && /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Text, { color: theme.status.warning, bold: true, children: "\u26A0\uFE0F Security Warnings:" }),
-      discoveryResults.securityWarnings.map((warning, i) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Text, { color: theme.status.warning, children: [
+    hasWarnings && /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.status.warning, bold: true, children: "\u26A0\uFE0F Security Warnings:" }),
+      discoveryResults.securityWarnings.map((warning, i) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { color: theme.status.warning, children: [
         "\u2022 ",
         stripAnsi(warning)
       ] }) }, i))
     ] }),
-    hasDiscovery && /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Text, { color: theme.text.primary, bold: true, children: "This folder contains:" }),
-      groups.map((group) => /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Box_default, { flexDirection: "column", marginLeft: 2, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Text, { color: theme.text.primary, bold: true, children: [
+    hasDiscovery && /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.primary, bold: true, children: "This folder contains:" }),
+      groups.map((group) => /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { flexDirection: "column", marginLeft: 2, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { color: theme.text.primary, bold: true, children: [
           "\u2022 ",
           group.label,
           " (",
           group.items.length,
           "):"
         ] }),
-        group.items.map((item, idx) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Text, { color: theme.text.primary, children: [
+        group.items.map((item, idx) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { color: theme.text.primary, children: [
           "- ",
           stripAnsi(item)
         ] }) }, idx))
       ] }, group.label))
     ] })
   ] });
-  const title = /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Text, { bold: true, color: theme.text.primary, children: "Do you trust the files in this folder?" });
-  const selectOptions = /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+  const title = /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { bold: true, color: theme.text.primary, children: "Do you trust the files in this folder?" });
+  const selectOptions = /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
     RadioButtonSelect,
     {
       items: options,
@@ -6635,8 +6768,8 @@ var FolderTrustDialog = ({
   );
   const renderContent = () => {
     if (isAlternateBuffer) {
-      return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Box_default, { flexDirection: "column", width: dialogWidth, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+      return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { flexDirection: "column", width: dialogWidth, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
           StickyHeader,
           {
             width: dialogWidth,
@@ -6646,7 +6779,7 @@ var FolderTrustDialog = ({
             children: title
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(
           Box_default,
           {
             flexDirection: "column",
@@ -6658,20 +6791,20 @@ var FolderTrustDialog = ({
             borderBottom: false,
             width: dialogWidth,
             children: [
-              /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+              /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
                 Scrollable,
                 {
                   hasFocus: !isRestarting,
                   height: scrollableHeight,
                   width: dialogWidth - 2,
-                  children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { flexDirection: "column", paddingX: 1, children: discoveryContent })
+                  children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { flexDirection: "column", paddingX: 1, children: discoveryContent })
                 }
               ),
-              /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { paddingX: 1, marginY: 1, children: selectOptions })
+              /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { paddingX: 1, marginY: 1, children: selectOptions })
             ]
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
           Box_default,
           {
             height: 0,
@@ -6686,7 +6819,7 @@ var FolderTrustDialog = ({
         )
       ] });
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(
+    return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(
       Box_default,
       {
         flexDirection: "column",
@@ -6695,8 +6828,8 @@ var FolderTrustDialog = ({
         padding: 1,
         width: "100%",
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { marginBottom: 1, children: title }),
-          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { marginBottom: 1, children: title }),
+          /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
             MaxSizedBox,
             {
               maxHeight: isExpanded ? void 0 : Math.max(4, terminalHeight - 12),
@@ -6704,18 +6837,18 @@ var FolderTrustDialog = ({
               children: discoveryContent
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { marginTop: 1, children: selectOptions })
+          /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { marginTop: 1, children: selectOptions })
         ]
       }
     );
   };
-  const content = /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Box_default, { flexDirection: "column", width: "100%", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { flexDirection: "column", marginLeft: 1, marginRight: 1, children: renderContent() }),
-    /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { paddingX: 2, marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(ShowMoreLines, { constrainHeight }) }),
-    isRestarting && /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { marginLeft: 1, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Text, { color: theme.status.warning, children: "Gemini CLI is restarting to apply the trust changes..." }) }),
-    exiting && /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { marginLeft: 1, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Text, { color: theme.status.warning, children: "A folder trust level must be selected to continue. Exiting since escape was pressed." }) })
+  const content = /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { flexDirection: "column", width: "100%", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { flexDirection: "column", marginLeft: 1, marginRight: 1, children: renderContent() }),
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { paddingX: 2, marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ShowMoreLines, { constrainHeight }) }),
+    isRestarting && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { marginLeft: 1, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.status.warning, children: "Gemini CLI is restarting to apply the trust changes..." }) }),
+    exiting && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { marginLeft: 1, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.status.warning, children: "A folder trust level must be selected to continue. Exiting since escape was pressed." }) })
   ] });
-  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(OverflowProvider, { children: content });
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(OverflowProvider, { children: content });
 };
 
 // packages/cli/src/ui/components/PermissionsModifyTrustDialog.tsx
@@ -6723,7 +6856,7 @@ import * as process4 from "node:process";
 import * as path3 from "node:path";
 
 // packages/cli/src/ui/hooks/usePermissionsModifyTrust.ts
-var import_react20 = __toESM(require_react(), 1);
+var import_react21 = __toESM(require_react(), 1);
 import * as process3 from "node:process";
 import * as path2 from "node:path";
 function getInitialTrustState(settings, cwd5, isCurrentWorkspace) {
@@ -6751,22 +6884,22 @@ var usePermissionsModifyTrust = (onExit, addItem, targetDirectory) => {
   const settings = useSettings();
   const cwd5 = targetDirectory;
   const isCurrentWorkspace = path2.resolve(targetDirectory).toLowerCase() === path2.resolve(process3.cwd()).toLowerCase();
-  const [initialState5] = (0, import_react20.useState)(
+  const [initialState5] = (0, import_react21.useState)(
     () => getInitialTrustState(settings, cwd5, isCurrentWorkspace)
   );
-  const [currentTrustLevel] = (0, import_react20.useState)(
+  const [currentTrustLevel] = (0, import_react21.useState)(
     initialState5.currentTrustLevel
   );
-  const [pendingTrustLevel, setPendingTrustLevel] = (0, import_react20.useState)();
-  const [isInheritedTrustFromParent] = (0, import_react20.useState)(
+  const [pendingTrustLevel, setPendingTrustLevel] = (0, import_react21.useState)();
+  const [isInheritedTrustFromParent] = (0, import_react21.useState)(
     initialState5.isInheritedTrustFromParent
   );
-  const [isInheritedTrustFromIde] = (0, import_react20.useState)(
+  const [isInheritedTrustFromIde] = (0, import_react21.useState)(
     initialState5.isInheritedTrustFromIde
   );
-  const [needsRestart, setNeedsRestart] = (0, import_react20.useState)(false);
+  const [needsRestart, setNeedsRestart] = (0, import_react21.useState)(false);
   const isFolderTrustEnabled = settings.merged.security.folderTrust.enabled ?? true;
-  const updateTrustLevel = (0, import_react20.useCallback)(
+  const updateTrustLevel = (0, import_react21.useCallback)(
     async (trustLevel) => {
       if (!isCurrentWorkspace) {
         const folders = loadTrustedFolders();
@@ -6816,7 +6949,7 @@ var usePermissionsModifyTrust = (onExit, addItem, targetDirectory) => {
     },
     [cwd5, settings.merged, onExit, addItem, isCurrentWorkspace]
   );
-  const commitTrustLevelChange = (0, import_react20.useCallback)(async () => {
+  const commitTrustLevelChange = (0, import_react21.useCallback)(async () => {
     if (pendingTrustLevel) {
       const folders = loadTrustedFolders();
       try {
@@ -6847,7 +6980,7 @@ var usePermissionsModifyTrust = (onExit, addItem, targetDirectory) => {
 };
 
 // packages/cli/src/ui/components/PermissionsModifyTrustDialog.tsx
-var import_jsx_runtime24 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime25 = __toESM(require_jsx_runtime(), 1);
 function PermissionsModifyTrustDialog({
   onExit,
   addItem,
@@ -6907,8 +7040,8 @@ function PermissionsModifyTrustDialog({
     (item) => item.value === currentTrustLevel
   );
   const initialIndex = index === -1 ? 0 : index;
-  return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(import_jsx_runtime24.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(import_jsx_runtime25.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(
       Box_default,
       {
         borderStyle: "round",
@@ -6916,24 +7049,24 @@ function PermissionsModifyTrustDialog({
         flexDirection: "column",
         padding: 1,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { flexDirection: "column", paddingBottom: 1, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { bold: true, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Box_default, { flexDirection: "column", paddingBottom: 1, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Text, { bold: true, children: [
               "> ",
               "Modify Trust Level"
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { marginTop: 1 }),
-            /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Box_default, { marginTop: 1 }),
+            /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Text, { children: [
               "Folder: ",
               cwd5
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Text, { children: [
               "Current Level: ",
-              /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { bold: true, children: currentTrustLevel || "Not Set" })
+              /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Text, { bold: true, children: currentTrustLevel || "Not Set" })
             ] }),
-            isInheritedTrustFromParent && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.secondary, children: "Note: This folder behaves as a trusted folder because one of the parent folders is trusted. It will remain trusted even if you set a different trust level here. To change this, you need to modify the trust setting in the parent folder." }),
-            isInheritedTrustFromIde && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.secondary, children: "Note: This folder behaves as a trusted folder because the connected IDE workspace is trusted. It will remain trusted even if you set a different trust level here." })
+            isInheritedTrustFromParent && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Text, { color: theme.text.secondary, children: "Note: This folder behaves as a trusted folder because one of the parent folders is trusted. It will remain trusted even if you set a different trust level here. To change this, you need to modify the trust setting in the parent folder." }),
+            isInheritedTrustFromIde && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Text, { color: theme.text.secondary, children: "Note: This folder behaves as a trusted folder because the connected IDE workspace is trusted. It will remain trusted even if you set a different trust level here." })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
             RadioButtonSelect,
             {
               items: TRUST_LEVEL_ITEMS,
@@ -6942,22 +7075,22 @@ function PermissionsModifyTrustDialog({
               initialIndex
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.secondary, children: "(Use Enter to select, Esc to close)" }) })
+          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Text, { color: theme.text.secondary, children: "(Use Enter to select, Esc to close)" }) })
         ]
       }
     ),
-    needsRestart && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { marginLeft: 1, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.status.warning, children: "To apply the trust changes, Gemini CLI must be restarted. Press 'r' to restart CLI now." }) })
+    needsRestart && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Box_default, { marginLeft: 1, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Text, { color: theme.status.warning, children: "To apply the trust changes, Gemini CLI must be restarted. Press 'r' to restart CLI now." }) })
   ] });
 }
 
 // packages/cli/src/ui/components/NewAgentsNotification.tsx
-var import_react21 = __toESM(require_react(), 1);
-var import_jsx_runtime25 = __toESM(require_jsx_runtime(), 1);
+var import_react22 = __toESM(require_react(), 1);
+var import_jsx_runtime26 = __toESM(require_jsx_runtime(), 1);
 var NewAgentsNotification = ({
   agents,
   onSelect
 }) => {
-  const [isProcessing, setIsProcessing] = (0, import_react21.useState)(false);
+  const [isProcessing, setIsProcessing] = (0, import_react22.useState)(false);
   const options = [
     {
       label: "Acknowledge and Enable",
@@ -6981,7 +7114,7 @@ var NewAgentsNotification = ({
   const MAX_DISPLAYED_AGENTS = 5;
   const displayAgents = agents.slice(0, MAX_DISPLAYED_AGENTS);
   const remaining = agents.length - MAX_DISPLAYED_AGENTS;
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Box_default, { flexDirection: "column", width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Box_default, { flexDirection: "column", width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -6991,10 +7124,10 @@ var NewAgentsNotification = ({
       marginLeft: 1,
       marginRight: 1,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Text, { bold: true, color: theme.text.primary, children: "New Agents Discovered" }),
-          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Text, { color: theme.text.primary, children: "The following agents were found in this project. Please review them:" }),
-          /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(
+        /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Text, { bold: true, color: theme.text.primary, children: "New Agents Discovered" }),
+          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Text, { color: theme.text.primary, children: "The following agents were found in this project. Please review them:" }),
+          /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(
             Box_default,
             {
               flexDirection: "column",
@@ -7005,20 +7138,20 @@ var NewAgentsNotification = ({
                 displayAgents.map((agent) => {
                   const mcpServers = agent.kind === "local" ? agent.mcpServers : void 0;
                   const hasMcpServers = mcpServers && Object.keys(mcpServers).length > 0;
-                  return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Box_default, { flexDirection: "column", children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Box_default, { children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Box_default, { flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Text, { bold: true, color: theme.text.primary, children: [
+                  return /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(Box_default, { flexDirection: "column", children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(Box_default, { children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Box_default, { flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(Text, { bold: true, color: theme.text.primary, children: [
                         "- ",
                         agent.name,
                         ":",
                         " "
                       ] }) }),
-                      /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Text, { color: theme.text.secondary, children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(Text, { color: theme.text.secondary, children: [
                         " ",
                         agent.description
                       ] })
                     ] }),
-                    hasMcpServers && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Text, { color: theme.text.secondary, children: [
+                    hasMcpServers && /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(Text, { color: theme.text.secondary, children: [
                       "(Includes MCP servers:",
                       " ",
                       Object.keys(mcpServers).join(", "),
@@ -7026,7 +7159,7 @@ var NewAgentsNotification = ({
                     ] }) })
                   ] }, agent.name);
                 }),
-                remaining > 0 && /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Text, { color: theme.text.secondary, children: [
+                remaining > 0 && /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(Text, { color: theme.text.secondary, children: [
                   "... and ",
                   remaining,
                   " more."
@@ -7035,10 +7168,10 @@ var NewAgentsNotification = ({
             }
           )
         ] }),
-        isProcessing ? /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Box_default, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(CliSpinner, {}),
-          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Text, { color: theme.text.primary, children: " Processing..." })
-        ] }) : /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+        isProcessing ? /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(Box_default, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(CliSpinner, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Text, { color: theme.text.primary, children: " Processing..." })
+        ] }) : /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
           RadioButtonSelect,
           {
             items: options,
@@ -7052,9 +7185,9 @@ var NewAgentsNotification = ({
 };
 
 // packages/cli/src/ui/contexts/UIActionsContext.tsx
-var UIActionsContext = (0, import_react22.createContext)(null);
+var UIActionsContext = (0, import_react23.createContext)(null);
 var useUIActions = () => {
-  const context = (0, import_react22.useContext)(UIActionsContext);
+  const context = (0, import_react23.useContext)(UIActionsContext);
   if (!context) {
     throw new Error("useUIActions must be used within a UIActionsProvider");
   }
@@ -7062,8 +7195,9 @@ var useUIActions = () => {
 };
 
 // packages/cli/src/ui/components/messages/ShellToolMessage.tsx
-var import_jsx_runtime26 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime27 = __toESM(require_jsx_runtime(), 1);
 var ShellToolMessage = ({
+  callId,
   name,
   description,
   resultDisplay,
@@ -7080,6 +7214,8 @@ var ShellToolMessage = ({
   isExpandable,
   originalRequestName
 }) => {
+  const { isExpanded: isExpandedInContext } = useToolActions();
+  const isExpanded = (isExpandedInContext ? isExpandedInContext(callId) : false) || availableTerminalHeight === void 0;
   const {
     activePtyId: activeShellPtyId,
     embeddedShellFocused,
@@ -7106,7 +7242,7 @@ var ShellToolMessage = ({
     isAlternateBuffer,
     maxLinesLimit: maxLines
   });
-  import_react23.default.useEffect(() => {
+  import_react24.default.useEffect(() => {
     const isExecuting = status === CoreToolCallStatus.Executing;
     if (isExecuting && ptyId) {
       try {
@@ -7125,8 +7261,8 @@ var ShellToolMessage = ({
     }
   }, [ptyId, status, terminalWidth, availableHeight]);
   const { setEmbeddedShellFocused } = useUIActions();
-  const wasFocusedRef = import_react23.default.useRef(false);
-  import_react23.default.useEffect(() => {
+  const wasFocusedRef = import_react24.default.useRef(false);
+  import_react24.default.useEffect(() => {
     if (isThisShellFocused2) {
       wasFocusedRef.current = true;
     } else if (wasFocusedRef.current) {
@@ -7136,8 +7272,8 @@ var ShellToolMessage = ({
       wasFocusedRef.current = false;
     }
   }, [isThisShellFocused2, embeddedShellFocused, setEmbeddedShellFocused]);
-  const headerRef = import_react23.default.useRef(null);
-  const contentRef = import_react23.default.useRef(null);
+  const headerRef = import_react24.default.useRef(null);
+  const contentRef = import_react24.default.useRef(null);
   const isThisShellFocusable2 = isThisShellFocusable(name, status, config);
   const handleFocus = () => {
     if (isThisShellFocusable2) {
@@ -7151,8 +7287,8 @@ var ShellToolMessage = ({
     isThisShellFocused2,
     resultDisplay
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(import_jsx_runtime26.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)(import_jsx_runtime27.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)(
       StickyHeader,
       {
         width: terminalWidth,
@@ -7161,7 +7297,7 @@ var ShellToolMessage = ({
         borderDimColor,
         containerRef: headerRef,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
             ToolStatusIndicator,
             {
               status,
@@ -7169,28 +7305,29 @@ var ShellToolMessage = ({
               isFocused: isThisShellFocused2
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
             ToolInfo,
             {
               name,
               status,
               description,
               emphasis,
-              originalRequestName
+              originalRequestName,
+              isExpanded
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
             FocusHint,
             {
               shouldShowFocusHint,
               isThisShellFocused: isThisShellFocused2
             }
           ),
-          emphasis === "high" && /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(TrailingIndicator, {})
+          emphasis === "high" && /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(TrailingIndicator, {})
         ]
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(
+    /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)(
       Box_default,
       {
         ref: contentRef,
@@ -7205,7 +7342,7 @@ var ShellToolMessage = ({
         paddingX: 1,
         flexDirection: "column",
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
             ToolResultDisplay,
             {
               resultDisplay,
@@ -7216,7 +7353,7 @@ var ShellToolMessage = ({
               maxLines
             }
           ),
-          isThisShellFocused2 && config && /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
+          isThisShellFocused2 && config && /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
             ShellInputPrompt,
             {
               activeShellPtyId: activeShellPtyId ?? null,
@@ -7232,114 +7369,6 @@ var ShellToolMessage = ({
 
 // packages/cli/src/ui/components/messages/TopicMessage.tsx
 var import_react25 = __toESM(require_react(), 1);
-
-// packages/cli/src/ui/contexts/ToolActionsContext.tsx
-var import_react24 = __toESM(require_react(), 1);
-var import_jsx_runtime27 = __toESM(require_jsx_runtime(), 1);
-function hasLegacyCallback(details) {
-  return !!details && "onConfirm" in details && typeof details.onConfirm === "function";
-}
-var ToolActionsContext = (0, import_react24.createContext)(null);
-var useToolActions = () => {
-  const context = (0, import_react24.useContext)(ToolActionsContext);
-  if (!context) {
-    throw new Error("useToolActions must be used within a ToolActionsProvider");
-  }
-  return context;
-};
-var ToolActionsProvider = (props) => {
-  const {
-    children,
-    config,
-    toolCalls,
-    isExpanded,
-    toggleExpansion,
-    toggleAllExpansion
-  } = props;
-  const [ideClient, setIdeClient] = (0, import_react24.useState)(null);
-  const [isDiffingEnabled, setIsDiffingEnabled] = (0, import_react24.useState)(false);
-  (0, import_react24.useEffect)(() => {
-    let isMounted = true;
-    let activeClient = null;
-    const handleStatusChange = () => {
-      if (isMounted && activeClient) {
-        setIsDiffingEnabled(activeClient.isDiffingEnabled());
-      }
-    };
-    if (config.getIdeMode()) {
-      IdeClient.getInstance().then((client) => {
-        if (!isMounted) return;
-        activeClient = client;
-        setIdeClient(client);
-        setIsDiffingEnabled(client.isDiffingEnabled());
-        client.addStatusChangeListener(handleStatusChange);
-      }).catch((error) => {
-        debugLogger.error("Failed to get IdeClient instance:", error);
-      });
-    }
-    return () => {
-      isMounted = false;
-      if (activeClient) {
-        activeClient.removeStatusChangeListener(handleStatusChange);
-      }
-    };
-  }, [config]);
-  const confirm = (0, import_react24.useCallback)(
-    async (callId, outcome, payload) => {
-      const tool = toolCalls.find((t) => t.callId === callId);
-      if (!tool) {
-        debugLogger.warn(`ToolActions: Tool ${callId} not found`);
-        return;
-      }
-      const details = tool.confirmationDetails;
-      if (details?.type === "edit" && isDiffingEnabled && "filePath" in details) {
-        const cliOutcome = outcome === ToolConfirmationOutcome.Cancel ? "rejected" : "accepted";
-        await ideClient?.resolveDiffFromCli(details.filePath, cliOutcome);
-      }
-      if (tool.correlationId) {
-        await config.getMessageBus().publish({
-          type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-          correlationId: tool.correlationId,
-          confirmed: outcome !== ToolConfirmationOutcome.Cancel,
-          requiresUserConfirmation: false,
-          outcome,
-          payload
-        });
-        return;
-      }
-      if (hasLegacyCallback(details)) {
-        await details.onConfirm(outcome, payload);
-        return;
-      }
-      debugLogger.warn(
-        `ToolActions: No correlationId or callback for ${callId}`
-      );
-    },
-    [config, ideClient, toolCalls, isDiffingEnabled]
-  );
-  const cancel = (0, import_react24.useCallback)(
-    async (callId) => {
-      await confirm(callId, ToolConfirmationOutcome.Cancel);
-    },
-    [confirm]
-  );
-  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
-    ToolActionsContext.Provider,
-    {
-      value: {
-        confirm,
-        cancel,
-        isDiffingEnabled,
-        isExpanded,
-        toggleExpansion,
-        toggleAllExpansion
-      },
-      children
-    }
-  );
-};
-
-// packages/cli/src/ui/components/messages/TopicMessage.tsx
 var import_jsx_runtime28 = __toESM(require_jsx_runtime(), 1);
 var isTopicTool = (name) => name === UPDATE_TOPIC_TOOL_NAME || name === UPDATE_TOPIC_DISPLAY_NAME;
 var TopicMessage = ({
@@ -15145,7 +15174,8 @@ function AuthDialog({
         return;
       }
       if (authType) {
-        if (authType === AuthType.LOGIN_WITH_GOOGLE) {
+        const needsRestart = authType === AuthType.LOGIN_WITH_GOOGLE || authType === AuthType.USE_VERTEX_AI && process.env["CLOUD_SHELL"] === "true";
+        if (needsRestart) {
           setAuthContext({ requiresRestart: true });
         } else {
           setAuthContext({});
@@ -17974,8 +18004,55 @@ var PolicyUpdateDialog = ({
   ) });
 };
 
-// packages/cli/src/ui/components/DialogManager.tsx
+// packages/cli/src/ui/auth/LoginRestartDialog.tsx
 var import_jsx_runtime105 = __toESM(require_jsx_runtime(), 1);
+var LoginRestartDialog = ({
+  onDismiss,
+  config,
+  message
+}) => {
+  useKeypress(
+    (key) => {
+      if (key.name === "escape") {
+        onDismiss();
+        return true;
+      } else if (key.name === "r" || key.name === "R") {
+        setTimeout(async () => {
+          if (process.send) {
+            const remoteSettings = config.getRemoteAdminSettings();
+            if (remoteSettings) {
+              process.send({
+                type: "admin-settings-update",
+                settings: remoteSettings
+              });
+            }
+          }
+          await relaunchApp();
+        }, 100);
+        return true;
+      }
+      return false;
+    },
+    { isActive: true }
+  );
+  const displayMessage = message ?? "You've successfully signed in with Google. Gemini CLI needs to be restarted.";
+  return /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(
+    Box_default,
+    {
+      borderStyle: "round",
+      borderColor: theme.status.warning,
+      paddingX: 1,
+      flexDirection: "column",
+      children: [
+        /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Text, { color: theme.status.warning, children: displayMessage }),
+        /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Text, { color: theme.status.warning, children: "Press R to restart, or Esc to choose a different authentication method." })
+      ]
+    }
+  );
+};
+
+// packages/cli/src/ui/components/DialogManager.tsx
+var import_jsx_runtime106 = __toESM(require_jsx_runtime(), 1);
 var DialogManager = ({
   addItem,
   terminalWidth
@@ -17992,13 +18069,13 @@ var DialogManager = ({
     terminalWidth: uiTerminalWidth
   } = uiState;
   if (uiState.adminSettingsChanged) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(AdminSettingsChangedDialog, {});
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(AdminSettingsChangedDialog, {});
   }
   if (uiState.showIdeRestartPrompt) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(IdeTrustChangeDialog, { reason: uiState.ideTrustRestartReason });
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(IdeTrustChangeDialog, { reason: uiState.ideTrustRestartReason });
   }
   if (uiState.newAgents) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       NewAgentsNotification,
       {
         agents: uiState.newAgents,
@@ -18007,7 +18084,7 @@ var DialogManager = ({
     );
   }
   if (quotaState.proQuotaRequest) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       ProQuotaDialog,
       {
         failedModel: quotaState.proQuotaRequest.failedModel,
@@ -18022,7 +18099,7 @@ var DialogManager = ({
     );
   }
   if (quotaState.validationRequest) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       ValidationDialog,
       {
         validationLink: quotaState.validationRequest.validationLink,
@@ -18033,7 +18110,7 @@ var DialogManager = ({
     );
   }
   if (quotaState.overageMenuRequest) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       OverageMenuDialog,
       {
         failedModel: quotaState.overageMenuRequest.failedModel,
@@ -18045,7 +18122,7 @@ var DialogManager = ({
     );
   }
   if (quotaState.emptyWalletRequest) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       EmptyWalletDialog,
       {
         failedModel: quotaState.emptyWalletRequest.failedModel,
@@ -18057,7 +18134,7 @@ var DialogManager = ({
     );
   }
   if (uiState.shouldShowIdePrompt) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       IdeIntegrationNudge,
       {
         ide: uiState.currentIDE,
@@ -18066,7 +18143,7 @@ var DialogManager = ({
     );
   }
   if (uiState.isFolderTrustDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       FolderTrustDialog,
       {
         onSelect: uiActions.handleFolderTrustSelect,
@@ -18076,7 +18153,7 @@ var DialogManager = ({
     );
   }
   if (uiState.isPolicyUpdateDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       PolicyUpdateDialog,
       {
         config,
@@ -18086,7 +18163,7 @@ var DialogManager = ({
     );
   }
   if (uiState.loopDetectionConfirmationRequest) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       LoopDetectionConfirmation,
       {
         onComplete: uiState.loopDetectionConfirmationRequest.onComplete
@@ -18096,7 +18173,7 @@ var DialogManager = ({
   if (uiState.permissionConfirmationRequest) {
     const files = uiState.permissionConfirmationRequest.files;
     const filesList = files.map((f) => `- ${f}`).join("\n");
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       ConsentPrompt,
       {
         prompt: `The following files are outside your workspace:
@@ -18112,7 +18189,7 @@ Do you want to allow this read?`,
     );
   }
   if (uiState.commandConfirmationRequest) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       ConsentPrompt,
       {
         prompt: uiState.commandConfirmationRequest.prompt,
@@ -18122,7 +18199,7 @@ Do you want to allow this read?`,
     );
   }
   if (uiState.authConsentRequest) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       ConsentPrompt,
       {
         prompt: uiState.authConsentRequest.prompt,
@@ -18133,7 +18210,7 @@ Do you want to allow this read?`,
   }
   if (uiState.confirmUpdateExtensionRequests.length > 0) {
     const request = uiState.confirmUpdateExtensionRequests[0];
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       ConsentPrompt,
       {
         prompt: request.prompt,
@@ -18143,9 +18220,9 @@ Do you want to allow this read?`,
     );
   }
   if (uiState.isThemeDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(Box_default, { flexDirection: "column", children: [
-      uiState.themeError && /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Text, { color: theme.status.error, children: uiState.themeError }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsxs)(Box_default, { flexDirection: "column", children: [
+      uiState.themeError && /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Text, { color: theme.status.error, children: uiState.themeError }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
         ThemeDialog,
         {
           onSelect: uiActions.handleThemeSelect,
@@ -18159,7 +18236,7 @@ Do you want to allow this read?`,
     ] });
   }
   if (uiState.isSettingsDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       SettingsDialog,
       {
         onSelect: () => uiActions.closeSettingsDialog(),
@@ -18169,13 +18246,13 @@ Do you want to allow this read?`,
     ) });
   }
   if (uiState.isModelDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(ModelDialog, { onClose: uiActions.closeModelDialog });
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(ModelDialog, { onClose: uiActions.closeModelDialog });
   }
   if (uiState.isVoiceModelDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(VoiceModelDialog, { onClose: uiActions.closeVoiceModelDialog });
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(VoiceModelDialog, { onClose: uiActions.closeVoiceModelDialog });
   }
   if (uiState.isAgentConfigDialogOpen && uiState.selectedAgentName && uiState.selectedAgentDisplayName && uiState.selectedAgentDefinition) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       AgentConfigDialog,
       {
         agentName: uiState.selectedAgentName,
@@ -18194,7 +18271,7 @@ Do you want to allow this read?`,
     ) });
   }
   if (uiState.accountSuspensionInfo) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       BannedAccountDialog,
       {
         accountSuspensionInfo: uiState.accountSuspensionInfo,
@@ -18208,7 +18285,7 @@ Do you want to allow this read?`,
     ) });
   }
   if (uiState.isAuthenticating) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       AuthInProgress,
       {
         onTimeout: () => {
@@ -18218,7 +18295,7 @@ Do you want to allow this read?`,
     );
   }
   if (uiState.isAwaitingApiKeyInput) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       ApiAuthDialog,
       {
         onSubmit: uiActions.handleApiKeySubmit,
@@ -18229,8 +18306,18 @@ Do you want to allow this read?`,
       uiState.apiKeyDefaultValue
     ) });
   }
+  if (uiState.isAwaitingLoginRestart) {
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
+      LoginRestartDialog,
+      {
+        onDismiss: uiActions.dismissLoginRestart,
+        config,
+        message: uiState.loginRestartMessage
+      }
+    ) });
+  }
   if (uiState.isAuthDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       AuthDialog,
       {
         config,
@@ -18243,9 +18330,9 @@ Do you want to allow this read?`,
     ) });
   }
   if (uiState.isEditorDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(Box_default, { flexDirection: "column", children: [
-      uiState.editorError && /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Text, { color: theme.status.error, children: uiState.editorError }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsxs)(Box_default, { flexDirection: "column", children: [
+      uiState.editorError && /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Text, { color: theme.status.error, children: uiState.editorError }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
         EditorSettingsDialog,
         {
           onSelect: uiActions.handleEditorSelect,
@@ -18256,7 +18343,7 @@ Do you want to allow this read?`,
     ] });
   }
   if (uiState.showPrivacyNotice) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       PrivacyNotice,
       {
         onExit: () => uiActions.exitPrivacyNotice(),
@@ -18265,7 +18352,7 @@ Do you want to allow this read?`,
     );
   }
   if (uiState.isSessionBrowserOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       SessionBrowser,
       {
         config,
@@ -18276,7 +18363,7 @@ Do you want to allow this read?`,
     );
   }
   if (uiState.isPermissionsDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
       PermissionsModifyTrustDialog,
       {
         onExit: uiActions.closePermissionsDialog,
@@ -18292,7 +18379,7 @@ Do you want to allow this read?`,
 var import_react89 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/ToastDisplay.tsx
-var import_jsx_runtime106 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime107 = __toESM(require_jsx_runtime(), 1);
 function shouldShowToast(uiState, inputState) {
   return uiState.ctrlCPressedOnce || Boolean(uiState.transientMessage) || uiState.ctrlDPressedOnce || inputState.showEscapePrompt && (inputState.buffer.text.length > 0 || uiState.history.length > 0) || Boolean(uiState.queueErrorMessage) || uiState.showIsExpandableHint;
 }
@@ -18300,13 +18387,13 @@ var ToastDisplay = () => {
   const uiState = useUIState();
   const inputState = useInputState();
   if (uiState.ctrlCPressedOnce) {
-    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+C again to exit." });
+    return /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+C again to exit." });
   }
   if (uiState.transientMessage?.type === "warning" /* Warning */ && uiState.transientMessage.text) {
-    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Text, { color: theme.status.warning, children: uiState.transientMessage.text });
+    return /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(Text, { color: theme.status.warning, children: uiState.transientMessage.text });
   }
   if (uiState.ctrlDPressedOnce) {
-    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+D again to exit." });
+    return /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+D again to exit." });
   }
   if (inputState.showEscapePrompt) {
     const isPromptEmpty = inputState.buffer.text.length === 0;
@@ -18314,21 +18401,21 @@ var ToastDisplay = () => {
     if (isPromptEmpty && !hasHistory) {
       return null;
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime106.jsxs)(Text, { color: theme.text.secondary, children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime107.jsxs)(Text, { color: theme.text.secondary, children: [
       "Press Esc again to ",
       isPromptEmpty ? "rewind" : "clear prompt",
       "."
     ] });
   }
   if (uiState.transientMessage?.type === "hint" /* Hint */ && uiState.transientMessage.text) {
-    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Text, { color: theme.text.secondary, children: uiState.transientMessage.text });
+    return /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(Text, { color: theme.text.secondary, children: uiState.transientMessage.text });
   }
   if (uiState.queueErrorMessage) {
-    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Text, { color: theme.status.error, children: uiState.queueErrorMessage });
+    return /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(Text, { color: theme.status.error, children: uiState.queueErrorMessage });
   }
   if (uiState.showIsExpandableHint) {
     const action = uiState.constrainHeight ? "show more" : "collapse";
-    return /* @__PURE__ */ (0, import_jsx_runtime106.jsxs)(Text, { color: theme.text.secondary, children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime107.jsxs)(Text, { color: theme.text.secondary, children: [
       "Press Ctrl+O to ",
       action,
       " lines of the last response"
@@ -18440,7 +18527,7 @@ function useErrorCount() {
 }
 
 // packages/cli/src/ui/components/DetailedMessagesDisplay.tsx
-var import_jsx_runtime107 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime108 = __toESM(require_jsx_runtime(), 1);
 var iconBoxWidth = 3;
 var DetailedMessagesDisplay = ({ maxHeight, width, hasFocus }) => {
   const scrollableListRef = (0, import_react67.useRef)(null);
@@ -18471,7 +18558,7 @@ var DetailedMessagesDisplay = ({ maxHeight, width, hasFocus }) => {
   if (messages.length === 0) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime107.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime108.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -18485,11 +18572,11 @@ var DetailedMessagesDisplay = ({ maxHeight, width, hasFocus }) => {
       flexGrow: 0,
       overflow: "hidden",
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime107.jsxs)(Text, { bold: true, color: theme.text.primary, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime108.jsxs)(Text, { bold: true, color: theme.text.primary, children: [
           "Debug Console ",
-          /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(Text, { color: theme.text.secondary, children: "(F12 to close)" })
+          /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(Text, { color: theme.text.secondary, children: "(F12 to close)" })
         ] }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(Box_default, { height: maxHeight, width: width - borderAndPadding, children: /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(Box_default, { height: maxHeight, width: width - borderAndPadding, children: /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(
           ScrollableListWithForwardRef,
           {
             ref: scrollableListRef,
@@ -18514,11 +18601,11 @@ var DetailedMessagesDisplay = ({ maxHeight, width, hasFocus }) => {
                 default:
                   break;
               }
-              return /* @__PURE__ */ (0, import_jsx_runtime107.jsxs)(Box_default, { flexDirection: "row", children: [
-                /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(Box_default, { minWidth: iconBoxWidth, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(Text, { color: textColor, children: icon }) }),
-                /* @__PURE__ */ (0, import_jsx_runtime107.jsxs)(Text, { color: textColor, wrap: "wrap", children: [
+              return /* @__PURE__ */ (0, import_jsx_runtime108.jsxs)(Box_default, { flexDirection: "row", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(Box_default, { minWidth: iconBoxWidth, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(Text, { color: textColor, children: icon }) }),
+                /* @__PURE__ */ (0, import_jsx_runtime108.jsxs)(Text, { color: textColor, wrap: "wrap", children: [
                   msg.content,
-                  msg.count && msg.count > 1 && /* @__PURE__ */ (0, import_jsx_runtime107.jsxs)(Text, { color: theme.text.secondary, children: [
+                  msg.count && msg.count > 1 && /* @__PURE__ */ (0, import_jsx_runtime108.jsxs)(Text, { color: theme.text.secondary, children: [
                     " (x",
                     msg.count,
                     ")"
@@ -18538,12 +18625,12 @@ var DetailedMessagesDisplay = ({ maxHeight, width, hasFocus }) => {
 };
 
 // packages/cli/src/ui/components/shared/SectionHeader.tsx
-var import_jsx_runtime108 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime109 = __toESM(require_jsx_runtime(), 1);
 var SectionHeader = ({
   title,
   subtitle
-}) => /* @__PURE__ */ (0, import_jsx_runtime108.jsxs)(Box_default, { width: "100%", flexDirection: "column", overflow: "hidden", children: [
-  /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(
+}) => /* @__PURE__ */ (0, import_jsx_runtime109.jsxs)(Box_default, { width: "100%", flexDirection: "column", overflow: "hidden", children: [
+  /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(
     Box_default,
     {
       width: "100%",
@@ -18555,14 +18642,14 @@ var SectionHeader = ({
       borderColor: theme.text.secondary
     }
   ),
-  /* @__PURE__ */ (0, import_jsx_runtime108.jsxs)(Box_default, { flexDirection: "row", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(Text, { color: theme.text.primary, bold: true, wrap: "truncate-end", children: title }),
-    subtitle && /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(Text, { color: theme.text.secondary, wrap: "truncate-end", children: subtitle })
+  /* @__PURE__ */ (0, import_jsx_runtime109.jsxs)(Box_default, { flexDirection: "row", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(Text, { color: theme.text.primary, bold: true, wrap: "truncate-end", children: title }),
+    subtitle && /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(Text, { color: theme.text.secondary, wrap: "truncate-end", children: subtitle })
   ] })
 ] });
 
 // packages/cli/src/ui/components/ShortcutsHelp.tsx
-var import_jsx_runtime109 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime110 = __toESM(require_jsx_runtime(), 1);
 var buildShortcutItems = () => [
   { key: "!", description: "shell mode" },
   { key: "@", description: "select file or folder" },
@@ -18590,9 +18677,9 @@ var buildShortcutItems = () => [
     description: "open external editor"
   }
 ];
-var Shortcut = ({ item }) => /* @__PURE__ */ (0, import_jsx_runtime109.jsxs)(Box_default, { flexDirection: "row", children: [
-  /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(Box_default, { flexShrink: 0, marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(Text, { color: theme.text.accent, children: item.key }) }),
-  /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(Text, { color: theme.text.primary, children: item.description }) })
+var Shortcut = ({ item }) => /* @__PURE__ */ (0, import_jsx_runtime110.jsxs)(Box_default, { flexDirection: "row", children: [
+  /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Box_default, { flexShrink: 0, marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Text, { color: theme.text.accent, children: item.key }) }),
+  /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Text, { color: theme.text.primary, children: item.description }) })
 ] });
 var ShortcutsHelp = () => {
   const { terminalWidth } = useUIState();
@@ -18611,14 +18698,14 @@ var ShortcutsHelp = () => {
     items[9],
     items[3]
   ];
-  return /* @__PURE__ */ (0, import_jsx_runtime109.jsxs)(Box_default, { flexDirection: "column", width: "100%", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(SectionHeader, { title: " Shortcuts", subtitle: " See /help for more" }),
-    /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(Box_default, { flexDirection: "row", flexWrap: "wrap", paddingLeft: 1, paddingRight: 2, children: itemsForDisplay.map((item, index) => /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime110.jsxs)(Box_default, { flexDirection: "column", width: "100%", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(SectionHeader, { title: " Shortcuts", subtitle: " See /help for more" }),
+    /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Box_default, { flexDirection: "row", flexWrap: "wrap", paddingLeft: 1, paddingRight: 2, children: itemsForDisplay.map((item, index) => /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(
       Box_default,
       {
         width: isNarrow ? "100%" : "33%",
         paddingRight: isNarrow ? 0 : 2,
-        children: /* @__PURE__ */ (0, import_jsx_runtime109.jsx)(Shortcut, { item })
+        children: /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Shortcut, { item })
       },
       `${item.key}-${index}`
     )) })
@@ -18629,7 +18716,7 @@ var ShortcutsHelp = () => {
 var import_react81 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/SuggestionsDisplay.tsx
-var import_jsx_runtime110 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime111 = __toESM(require_jsx_runtime(), 1);
 var MAX_SUGGESTIONS_TO_SHOW = 8;
 function SuggestionsDisplay({
   suggestions,
@@ -18642,7 +18729,7 @@ function SuggestionsDisplay({
   expandedIndex
 }) {
   if (isLoading) {
-    return /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Box_default, { paddingX: 1, width, children: /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Text, { color: "gray", children: "Loading suggestions..." }) });
+    return /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Box_default, { paddingX: 1, width, children: /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { color: "gray", children: "Loading suggestions..." }) });
   }
   if (suggestions.length === 0) {
     return null;
@@ -18662,8 +18749,8 @@ function SuggestionsDisplay({
     ...suggestions.map((s) => getFullLabel(s).length)
   );
   const commandColumnWidth = mode === "slash" ? Math.min(maxLabelLength, Math.floor(width * 0.5)) : 0;
-  return /* @__PURE__ */ (0, import_jsx_runtime110.jsxs)(Box_default, { flexDirection: "column", paddingX: 1, width, children: [
-    scrollOffset > 0 && /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Text, { color: theme.text.primary, children: "\u25B2" }),
+  return /* @__PURE__ */ (0, import_jsx_runtime111.jsxs)(Box_default, { flexDirection: "column", paddingX: 1, width, children: [
+    scrollOffset > 0 && /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { color: theme.text.primary, children: "\u25B2" }),
     visibleSuggestions.map((suggestion, index) => {
       const originalIndex = startIndex + index;
       const isActive = originalIndex === activeIndex;
@@ -18672,7 +18759,7 @@ function SuggestionsDisplay({
       const isLong = suggestion.value.length >= MAX_WIDTH;
       const previousSectionTitle = suggestions[originalIndex - 1]?.sectionTitle;
       const shouldRenderSectionHeader = mode === "slash" && !!suggestion.sectionTitle && suggestion.sectionTitle !== previousSectionTitle;
-      const labelElement = /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(
+      const labelElement = /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(
         ExpandableText,
         {
           label: suggestion.value,
@@ -18682,34 +18769,34 @@ function SuggestionsDisplay({
           isExpanded
         }
       );
-      return /* @__PURE__ */ (0, import_jsx_runtime110.jsxs)(
+      return /* @__PURE__ */ (0, import_jsx_runtime111.jsxs)(
         Box_default,
         {
           flexDirection: "column",
           children: [
-            shouldRenderSectionHeader && /* @__PURE__ */ (0, import_jsx_runtime110.jsxs)(Text, { color: theme.text.secondary, children: [
+            shouldRenderSectionHeader && /* @__PURE__ */ (0, import_jsx_runtime111.jsxs)(Text, { color: theme.text.secondary, children: [
               "-- ",
               suggestion.sectionTitle,
               " --"
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime110.jsxs)(
+            /* @__PURE__ */ (0, import_jsx_runtime111.jsxs)(
               Box_default,
               {
                 flexDirection: "row",
                 backgroundColor: isActive ? theme.background.focus : void 0,
                 children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(
+                  /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(
                     Box_default,
                     {
                       ...mode === "slash" ? { width: commandColumnWidth, flexShrink: 0 } : { flexShrink: 1 },
-                      children: /* @__PURE__ */ (0, import_jsx_runtime110.jsxs)(Box_default, { children: [
+                      children: /* @__PURE__ */ (0, import_jsx_runtime111.jsxs)(Box_default, { children: [
                         labelElement,
-                        suggestion.commandKind && COMMAND_KIND_SUFFIX[suggestion.commandKind] && /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Text, { color: textColor, children: COMMAND_KIND_SUFFIX[suggestion.commandKind] })
+                        suggestion.commandKind && COMMAND_KIND_SUFFIX[suggestion.commandKind] && /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { color: textColor, children: COMMAND_KIND_SUFFIX[suggestion.commandKind] })
                       ] })
                     }
                   ),
-                  suggestion.description && /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Box_default, { flexGrow: 1, paddingLeft: 3, children: /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Text, { color: textColor, wrap: "truncate", children: sanitizeForDisplay(suggestion.description, 100) }) }),
-                  isActive && isLong && /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Box_default, { width: 3, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Text, { color: Colors.Gray, children: isExpanded ? " \u2190 " : " \u2192 " }) })
+                  suggestion.description && /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Box_default, { flexGrow: 1, paddingLeft: 3, children: /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { color: textColor, wrap: "truncate", children: sanitizeForDisplay(suggestion.description, 100) }) }),
+                  isActive && isLong && /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Box_default, { width: 3, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { color: Colors.Gray, children: isExpanded ? " \u2190 " : " \u2192 " }) })
                 ]
               }
             )
@@ -18718,8 +18805,8 @@ function SuggestionsDisplay({
         `${suggestion.value}-${originalIndex}`
       );
     }),
-    endIndex < suggestions.length && /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Text, { color: "gray", children: "\u25BC" }),
-    suggestions.length > MAX_SUGGESTIONS_TO_SHOW && /* @__PURE__ */ (0, import_jsx_runtime110.jsxs)(Text, { color: "gray", children: [
+    endIndex < suggestions.length && /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { color: "gray", children: "\u25BC" }),
+    suggestions.length > MAX_SUGGESTIONS_TO_SHOW && /* @__PURE__ */ (0, import_jsx_runtime111.jsxs)(Text, { color: "gray", children: [
       "(",
       activeIndex + 1,
       "/",
@@ -21356,7 +21443,7 @@ function useRepeatedKeyPress(options) {
 }
 
 // packages/cli/src/ui/components/InputPrompt.tsx
-var import_jsx_runtime111 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime112 = __toESM(require_jsx_runtime(), 1);
 function isTerminalPasteTrusted(kittyProtocolSupported) {
   return kittyProtocolSupported;
 }
@@ -21548,6 +21635,15 @@ var InputPrompt = ({
     setForceShowShellSuggestions,
     isShellSuggestionsVisible
   } = completion;
+  const effectivePlaceholder = (0, import_react81.useMemo)(() => {
+    if (!isVoiceModeEnabled) return placeholder;
+    const voiceAction = (settings.experimental.voice?.activationMode ?? "push-to-talk") === "push-to-talk" ? "hold space to talk" : "space to talk";
+    return `  Type your message or ${voiceAction} (Esc to exit)`;
+  }, [
+    isVoiceModeEnabled,
+    placeholder,
+    settings.experimental.voice?.activationMode
+  ]);
   const showCursor = focus && isShellFocused && !isEmbeddedShellFocused && !copyModeEnabled;
   (0, import_react81.useEffect)(() => {
     appEvents.emit("scroll-to-bottom" /* ScrollToBottom */);
@@ -22403,14 +22499,14 @@ var InputPrompt = ({
     ({ item }) => {
       if (item.type === "ghostLine") {
         const padding = Math.max(0, inputWidth - stringWidth(item.ghostLine));
-        return /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Box_default, { height: 1, children: /* @__PURE__ */ (0, import_jsx_runtime111.jsxs)(Text, { color: theme.text.secondary, children: [
+        return /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Box_default, { height: 1, children: /* @__PURE__ */ (0, import_jsx_runtime112.jsxs)(Text, { color: theme.text.secondary, children: [
           item.ghostLine,
           " ".repeat(padding)
         ] }) });
       }
       const { lineText, absoluteVisualIdx } = item;
       const mapEntry = buffer.visualToLogicalMap[absoluteVisualIdx];
-      if (!mapEntry) return /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { children: " " });
+      if (!mapEntry) return /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Text, { children: " " });
       const isOnCursorLine = focus && absoluteVisualIdx === cursorVisualRowAbsolute;
       const renderedLine = [];
       const [logicalLineIdx] = mapEntry;
@@ -22452,17 +22548,17 @@ var InputPrompt = ({
         }
         const color = seg.type === "command" || seg.type === "file" || seg.type === "paste" ? theme.text.accent : theme.text.primary;
         renderedLine.push(
-          /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { color, children: display }, `token-${segIdx}`)
+          /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Text, { color, children: display }, `token-${segIdx}`)
         );
       });
       const currentLineGhost = isOnCursorLine ? inlineGhost : "";
       if (isOnCursorLine && cursorVisualColAbsolute === cpLen(lineText) && !currentLineGhost) {
         renderedLine.push(
-          /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { children: showCursor ? import_chalk3.default.inverse(" ") : " " }, `cursor-end-${cursorVisualColAbsolute}`)
+          /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Text, { children: showCursor ? import_chalk3.default.inverse(" ") : " " }, `cursor-end-${cursorVisualColAbsolute}`)
         );
       }
       const showCursorBeforeGhost = focus && isOnCursorLine && cursorVisualColAbsolute === cpLen(lineText) && currentLineGhost;
-      return /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Box_default, { height: 1, children: /* @__PURE__ */ (0, import_jsx_runtime111.jsxs)(
+      return /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Box_default, { height: 1, children: /* @__PURE__ */ (0, import_jsx_runtime112.jsxs)(
         Text,
         {
           terminalCursorFocus: showCursor && isOnCursorLine,
@@ -22473,7 +22569,7 @@ var InputPrompt = ({
           children: [
             renderedLine,
             showCursorBeforeGhost && (showCursor ? import_chalk3.default.inverse(" ") : " "),
-            currentLineGhost && /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { color: theme.text.secondary, children: currentLineGhost })
+            currentLineGhost && /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Text, { color: theme.text.secondary, children: currentLineGhost })
           ]
         }
       ) });
@@ -22541,7 +22637,7 @@ var InputPrompt = ({
     statusColor = theme.status.warning;
     statusText = "Accepting edits";
   }
-  const suggestionsNode = shouldShowSuggestions ? /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Box_default, { paddingRight: 2, children: /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(
+  const suggestionsNode = shouldShowSuggestions ? /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Box_default, { paddingRight: 2, children: /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(
     SuggestionsDisplay,
     {
       suggestions: activeCompletion.suggestions,
@@ -22555,9 +22651,9 @@ var InputPrompt = ({
     }
   ) }) : null;
   const borderColor = isShellFocused && !isEmbeddedShellFocused ? statusColor ?? theme.ui.focus : theme.border.default;
-  return /* @__PURE__ */ (0, import_jsx_runtime111.jsxs)(import_jsx_runtime111.Fragment, { children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime112.jsxs)(import_jsx_runtime112.Fragment, { children: [
     suggestionsPosition === "above" && suggestionsNode,
-    useLineFallback || !useBackgroundColor ? /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(
+    useLineFallback || !useBackgroundColor ? /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(
       Box_default,
       {
         borderStyle: "round",
@@ -22572,20 +22668,21 @@ var InputPrompt = ({
         height: 0
       }
     ) : null,
-    /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(
       HalfLinePaddedBox,
       {
         backgroundBaseColor: theme.background.input,
         backgroundOpacity: 1,
         useBackgroundColor,
-        children: /* @__PURE__ */ (0, import_jsx_runtime111.jsxs)(Box_default, { flexGrow: 1, flexDirection: "row", paddingX: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime111.jsxs)(
+        children: /* @__PURE__ */ (0, import_jsx_runtime112.jsxs)(Box_default, { flexGrow: 1, flexDirection: "row", paddingX: 1, children: [
+          isVoiceModeEnabled && /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Text, { color: theme.text.accent, children: "\u{1F3A4} " }),
+          /* @__PURE__ */ (0, import_jsx_runtime112.jsxs)(
             Text,
             {
               color: statusColor ?? theme.text.accent,
               "aria-label": statusText || void 0,
               children: [
-                shellModeActive ? reverseSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime111.jsxs)(
+                shellModeActive ? reverseSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime112.jsxs)(
                   Text,
                   {
                     color: theme.text.link,
@@ -22595,37 +22692,30 @@ var InputPrompt = ({
                       " "
                     ]
                   }
-                ) : "!" : commandSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { color: theme.text.accent, children: "(r:) " }) : showYoloStyling ? "*" : ">",
+                ) : "!" : commandSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Text, { color: theme.text.accent, children: "(r:) " }) : showYoloStyling ? "*" : ">",
                 " "
               ]
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime111.jsxs)(Box_default, { flexGrow: 1, flexDirection: "column", ref: innerBoxRef, children: [
-            isRecording && /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Box_default, { flexDirection: "row", marginBottom: 0, children: /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { color: theme.status.success, children: "\u{1F399}\uFE0F Listening..." }) }),
-            isVoiceModeEnabled && !isRecording && /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Box_default, { flexDirection: "row", marginBottom: 0, children: /* @__PURE__ */ (0, import_jsx_runtime111.jsxs)(Text, { color: theme.text.secondary, children: [
-              "> Voice mode:",
-              " ",
-              (settings.experimental.voice?.activationMode ?? "push-to-talk") === "push-to-talk" ? "Hold Space to record" : "Space to start/stop recording",
-              " ",
-              "(Esc to exit)"
-            ] }) }),
-            buffer.text.length === 0 && !isRecording ? !isVoiceModeEnabled && placeholder ? showCursor ? /* @__PURE__ */ (0, import_jsx_runtime111.jsxs)(
+          /* @__PURE__ */ (0, import_jsx_runtime112.jsxs)(Box_default, { flexGrow: 1, flexDirection: "column", ref: innerBoxRef, children: [
+            isRecording && /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Box_default, { flexDirection: "row", marginBottom: 0, children: /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Text, { color: theme.status.success, children: "Listening..." }) }),
+            buffer.text.length === 0 && !isRecording ? effectivePlaceholder ? showCursor ? /* @__PURE__ */ (0, import_jsx_runtime112.jsxs)(
               Text,
               {
                 terminalCursorFocus: showCursor,
                 terminalCursorPosition: 0,
                 children: [
-                  import_chalk3.default.inverse(placeholder.slice(0, 1)),
-                  /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { color: theme.text.secondary, children: placeholder.slice(1) })
+                  import_chalk3.default.inverse(effectivePlaceholder.slice(0, 1)),
+                  /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Text, { color: theme.text.secondary, children: effectivePlaceholder.slice(1) })
                 ]
               }
-            ) : /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(Text, { color: theme.text.secondary, children: placeholder }) : null : /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(
+            ) : /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Text, { color: theme.text.secondary, children: effectivePlaceholder }) : null : /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(
               Box_default,
               {
                 flexDirection: "column",
                 height: Math.min(buffer.viewportHeight, scrollableData.length),
                 width: "100%",
-                children: config.getUseTerminalBuffer() ? /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(
+                children: config.getUseTerminalBuffer() ? /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(
                   ScrollableListWithForwardRef,
                   {
                     ref: listRef,
@@ -22648,7 +22738,7 @@ var InputPrompt = ({
                 ).map((item, index) => {
                   const actualIndex = buffer.visualScrollRow + index;
                   const key = item.type === "visualLine" ? `line-${item.absoluteVisualIdx}` : `ghost-${item.index}`;
-                  return /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(import_react81.Fragment, { children: renderItem({ item, index: actualIndex }) }, key);
+                  return /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(import_react81.Fragment, { children: renderItem({ item, index: actualIndex }) }, key);
                 })
               }
             )
@@ -22656,7 +22746,7 @@ var InputPrompt = ({
         ] })
       }
     ),
-    useLineFallback || !useBackgroundColor ? /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(
+    useLineFallback || !useBackgroundColor ? /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(
       Box_default,
       {
         borderStyle: "round",
@@ -23087,7 +23177,7 @@ var usePhraseCycler = (isActive, isWaiting, shouldShowFocusHint, showTips = true
 // packages/cli/src/ui/components/GeminiSpinner.tsx
 var import_react83 = __toESM(require_react(), 1);
 var import_tinygradient = __toESM(require_tinygradient(), 1);
-var import_jsx_runtime112 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime113 = __toESM(require_jsx_runtime(), 1);
 var COLOR_CYCLE_DURATION_MS = 4e3;
 var GeminiSpinner = ({
   spinnerType = "dots",
@@ -23117,11 +23207,11 @@ var GeminiSpinner = ({
   }, [isScreenReaderEnabled]);
   const progress = time % COLOR_CYCLE_DURATION_MS / COLOR_CYCLE_DURATION_MS;
   const currentColor = googleGradient.rgbAt(progress).toHexString();
-  return isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Text, { children: altText }) : /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(Text, { color: currentColor, children: /* @__PURE__ */ (0, import_jsx_runtime112.jsx)(CliSpinner, { type: spinnerType }) });
+  return isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { children: altText }) : /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: currentColor, children: /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(CliSpinner, { type: spinnerType }) });
 };
 
 // packages/cli/src/ui/components/GeminiRespondingSpinner.tsx
-var import_jsx_runtime113 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime114 = __toESM(require_jsx_runtime(), 1);
 var GeminiRespondingSpinner = ({
   nonRespondingDisplay,
   spinnerType = "dots",
@@ -23131,7 +23221,7 @@ var GeminiRespondingSpinner = ({
   const streamingState = useStreamingContext();
   const isScreenReaderEnabled = use_is_screen_reader_enabled_default();
   if (streamingState === "responding" /* Responding */ && !isHookActive) {
-    return /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(
       GeminiSpinner,
       {
         spinnerType,
@@ -23140,13 +23230,13 @@ var GeminiRespondingSpinner = ({
     );
   }
   if (nonRespondingDisplay) {
-    return isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { children: SCREEN_READER_LOADING }) : /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: color ?? theme.text.primary, children: nonRespondingDisplay });
+    return isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Text, { children: SCREEN_READER_LOADING }) : /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Text, { color: color ?? theme.text.primary, children: nonRespondingDisplay });
   }
   return null;
 };
 
 // packages/cli/src/ui/components/LoadingIndicator.tsx
-var import_jsx_runtime114 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime115 = __toESM(require_jsx_runtime(), 1);
 var LoadingIndicator = ({
   currentLoadingPhrase,
   wittyPhrase,
@@ -23169,72 +23259,72 @@ var LoadingIndicator = ({
   }
   const primaryText = 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_runtime114.jsx)(Box_default, { marginLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Text, { color: theme.text.secondary, dimColor: true, italic: true, children: wittyPhrase }) }) : null;
+  const wittyPhraseNode = !forceRealStatusOnly && showWit && wittyPhrase && primaryText === "Thinking..." ? /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Box_default, { marginLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Text, { color: theme.text.secondary, dimColor: true, italic: true, children: wittyPhrase }) }) : null;
   if (inline) {
-    return /* @__PURE__ */ (0, import_jsx_runtime114.jsxs)(Box_default, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Box_default, { marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime115.jsxs)(Box_default, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Box_default, { marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(
         GeminiRespondingSpinner,
         {
           nonRespondingDisplay: spinnerIcon ?? (streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */ ? "\u280F" : ""),
           isHookActive
         }
       ) }),
-      primaryText && /* @__PURE__ */ (0, import_jsx_runtime114.jsxs)(Box_default, { flexShrink: 1, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Text, { color: theme.text.primary, italic: true, wrap: "truncate-end", children: primaryText }),
-        primaryText === INTERACTIVE_SHELL_WAITING_PHRASE && /* @__PURE__ */ (0, import_jsx_runtime114.jsxs)(Text, { color: theme.ui.active, italic: true, children: [
+      primaryText && /* @__PURE__ */ (0, import_jsx_runtime115.jsxs)(Box_default, { flexShrink: 1, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Text, { color: theme.text.primary, italic: true, wrap: "truncate-end", children: primaryText }),
+        primaryText === INTERACTIVE_SHELL_WAITING_PHRASE && /* @__PURE__ */ (0, import_jsx_runtime115.jsxs)(Text, { color: theme.ui.active, italic: true, children: [
           " ",
           "(press tab to focus)"
         ] })
       ] }),
-      cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime114.jsxs)(import_jsx_runtime114.Fragment, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Box_default, { flexShrink: 0, width: 1 }),
-        /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Text, { color: theme.text.secondary, children: cancelAndTimerContent })
+      cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime115.jsxs)(import_jsx_runtime115.Fragment, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Box_default, { flexShrink: 0, width: 1 }),
+        /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Text, { color: theme.text.secondary, children: cancelAndTimerContent })
       ] }),
       wittyPhraseNode
     ] });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime114.jsxs)(Box_default, { paddingLeft: 0, flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime114.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime115.jsxs)(Box_default, { paddingLeft: 0, flexDirection: "column", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime115.jsxs)(
       Box_default,
       {
         width: "100%",
         flexDirection: isNarrow ? "column" : "row",
         alignItems: isNarrow ? "flex-start" : "center",
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime114.jsxs)(Box_default, { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Box_default, { marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime115.jsxs)(Box_default, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Box_default, { marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(
               GeminiRespondingSpinner,
               {
                 nonRespondingDisplay: spinnerIcon ?? (streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */ ? "\u280F" : ""),
                 isHookActive
               }
             ) }),
-            primaryText && /* @__PURE__ */ (0, import_jsx_runtime114.jsxs)(Box_default, { flexShrink: 1, children: [
-              /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Text, { color: theme.text.primary, italic: true, wrap: "truncate-end", children: primaryText }),
-              primaryText === INTERACTIVE_SHELL_WAITING_PHRASE && /* @__PURE__ */ (0, import_jsx_runtime114.jsxs)(Text, { color: theme.ui.active, italic: true, children: [
+            primaryText && /* @__PURE__ */ (0, import_jsx_runtime115.jsxs)(Box_default, { flexShrink: 1, children: [
+              /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Text, { color: theme.text.primary, italic: true, wrap: "truncate-end", children: primaryText }),
+              primaryText === INTERACTIVE_SHELL_WAITING_PHRASE && /* @__PURE__ */ (0, import_jsx_runtime115.jsxs)(Text, { color: theme.ui.active, italic: true, children: [
                 " ",
                 "(press tab to focus)"
               ] })
             ] }),
-            !isNarrow && cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime114.jsxs)(import_jsx_runtime114.Fragment, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Box_default, { flexShrink: 0, width: 1 }),
-              /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Text, { color: theme.text.secondary, children: cancelAndTimerContent })
+            !isNarrow && cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime115.jsxs)(import_jsx_runtime115.Fragment, { children: [
+              /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Box_default, { flexShrink: 0, width: 1 }),
+              /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Text, { color: theme.text.secondary, children: cancelAndTimerContent })
             ] }),
             !isNarrow && wittyPhraseNode
           ] }),
-          !isNarrow && /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Box_default, { flexGrow: 1 }),
-          !isNarrow && rightContent && /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Box_default, { children: rightContent })
+          !isNarrow && /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Box_default, { flexGrow: 1 }),
+          !isNarrow && rightContent && /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Box_default, { children: rightContent })
         ]
       }
     ),
-    isNarrow && cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Text, { color: theme.text.secondary, children: cancelAndTimerContent }) }),
+    isNarrow && cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Text, { color: theme.text.secondary, children: cancelAndTimerContent }) }),
     isNarrow && wittyPhraseNode,
-    isNarrow && rightContent && /* @__PURE__ */ (0, import_jsx_runtime114.jsx)(Box_default, { children: rightContent })
+    isNarrow && rightContent && /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Box_default, { children: rightContent })
   ] });
 };
 
 // packages/cli/src/ui/components/ContextSummaryDisplay.tsx
-var import_jsx_runtime115 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime116 = __toESM(require_jsx_runtime(), 1);
 var ContextSummaryDisplay = ({
   geminiMdFileCount,
   contextFileNames,
@@ -23302,14 +23392,14 @@ var ContextSummaryDisplay = ({
     skillText,
     backgroundText
   ].filter(Boolean);
-  return /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Box_default, { paddingX: 1, flexDirection: "row", flexWrap: "wrap", children: summaryParts.map((part, index) => /* @__PURE__ */ (0, import_jsx_runtime115.jsxs)(Box_default, { flexDirection: "row", children: [
-    index > 0 && /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Text, { color: theme.text.secondary, children: " \xB7 " }),
-    /* @__PURE__ */ (0, import_jsx_runtime115.jsx)(Text, { color: theme.text.secondary, children: part })
+  return /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Box_default, { paddingX: 1, flexDirection: "row", flexWrap: "wrap", children: summaryParts.map((part, index) => /* @__PURE__ */ (0, import_jsx_runtime116.jsxs)(Box_default, { flexDirection: "row", children: [
+    index > 0 && /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: " \xB7 " }),
+    /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: part })
   ] }, index)) });
 };
 
 // packages/cli/src/ui/components/StatusDisplay.tsx
-var import_jsx_runtime116 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime117 = __toESM(require_jsx_runtime(), 1);
 var StatusDisplay = ({
   hideContextSummary
 }) => {
@@ -23317,10 +23407,10 @@ var StatusDisplay = ({
   const settings = useSettings();
   const config = useConfig();
   if (process.env["GEMINI_SYSTEM_MD"]) {
-    return /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.status.error, children: "|\u2310\u25A0_\u25A0|" });
+    return /* @__PURE__ */ (0, import_jsx_runtime117.jsx)(Text, { color: theme.status.error, children: "|\u2310\u25A0_\u25A0|" });
   }
   if (!settings.merged.ui.hideContextSummary && !hideContextSummary) {
-    return /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime117.jsx)(
       ContextSummaryDisplay,
       {
         ideContext: uiState.ideContextState,
@@ -23337,11 +23427,11 @@ var StatusDisplay = ({
 };
 
 // packages/cli/src/ui/components/shared/HorizontalLine.tsx
-var import_jsx_runtime117 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime118 = __toESM(require_jsx_runtime(), 1);
 var HorizontalLine = ({
   color = theme.border.default,
   dim = false
-}) => /* @__PURE__ */ (0, import_jsx_runtime117.jsx)(
+}) => /* @__PURE__ */ (0, import_jsx_runtime118.jsx)(
   Box_default,
   {
     width: "100%",
@@ -23356,7 +23446,7 @@ var HorizontalLine = ({
 );
 
 // packages/cli/src/ui/components/ApprovalModeIndicator.tsx
-var import_jsx_runtime118 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime119 = __toESM(require_jsx_runtime(), 1);
 var ApprovalModeIndicator = ({
   approvalMode,
   allowPlanMode
@@ -23389,9 +23479,9 @@ var ApprovalModeIndicator = ({
       subText = `${cycleHint} to accept edits`;
       break;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime118.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime118.jsxs)(Text, { color: textColor, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime119.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime119.jsxs)(Text, { color: textColor, children: [
     textContent ? textContent : null,
-    subText ? /* @__PURE__ */ (0, import_jsx_runtime118.jsxs)(Text, { color: theme.text.secondary, children: [
+    subText ? /* @__PURE__ */ (0, import_jsx_runtime119.jsxs)(Text, { color: theme.text.secondary, children: [
       textContent ? " " : "",
       subText
     ] }) : null
@@ -23399,19 +23489,19 @@ var ApprovalModeIndicator = ({
 };
 
 // packages/cli/src/ui/components/ShellModeIndicator.tsx
-var import_jsx_runtime119 = __toESM(require_jsx_runtime(), 1);
-var ShellModeIndicator = () => /* @__PURE__ */ (0, import_jsx_runtime119.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime119.jsxs)(Text, { color: theme.ui.symbol, children: [
+var import_jsx_runtime120 = __toESM(require_jsx_runtime(), 1);
+var ShellModeIndicator = () => /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(Text, { color: theme.ui.symbol, children: [
   "shell mode enabled",
-  /* @__PURE__ */ (0, import_jsx_runtime119.jsx)(Text, { color: theme.text.secondary, children: " (esc to disable)" })
+  /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Text, { color: theme.text.secondary, children: " (esc to disable)" })
 ] }) });
 
 // packages/cli/src/ui/components/RawMarkdownIndicator.tsx
-var import_jsx_runtime120 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime121 = __toESM(require_jsx_runtime(), 1);
 var RawMarkdownIndicator = () => {
   const modKey = formatCommand("app.toggleMarkdown" /* TOGGLE_MARKDOWN */);
-  return /* @__PURE__ */ (0, import_jsx_runtime120.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(Text, { children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime121.jsxs)(Text, { children: [
     "raw markdown mode",
-    /* @__PURE__ */ (0, import_jsx_runtime120.jsxs)(Text, { color: theme.text.secondary, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime121.jsxs)(Text, { color: theme.text.secondary, children: [
       " (",
       modKey,
       " to toggle) "
@@ -23483,7 +23573,7 @@ var useComposerStatus = () => {
 };
 
 // packages/cli/src/ui/components/StatusRow.tsx
-var import_jsx_runtime121 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime122 = __toESM(require_jsx_runtime(), 1);
 var LAYOUT = {
   STATUS_MIN_HEIGHT: 1,
   TIP_LEFT_MARGIN: 2,
@@ -23555,7 +23645,7 @@ var StatusNode = ({
   } else {
     currentThought = thought ? { ...thought, subject: stripAnsi(thought.subject) } : null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(Box_default, { ref: onRefChange, children: /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Box_default, { ref: onRefChange, children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
     LoadingIndicator,
     {
       inline: true,
@@ -23637,7 +23727,7 @@ var StatusRow = ({
   const onStatusResize = (0, import_react85.useCallback)((width) => {
     if (width > 0) setStatusWidth(width);
   }, []);
-  const statusNode = /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(
+  const statusNode = /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
     StatusNode,
     {
       showTips,
@@ -23655,7 +23745,7 @@ var StatusRow = ({
     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_runtime121.jsx)(Box_default, { flexDirection: "row", justifyContent: "flex-end", ref: onTipRefChange, children: /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Box_default, { flexDirection: "row", justifyContent: "flex-end", ref: onTipRefChange, children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
       Text,
       {
         color,
@@ -23666,10 +23756,10 @@ var StatusRow = ({
     ) });
   };
   if (!showUiDetails && !showRow1Minimal && !showRow2Minimal) {
-    return /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(Box_default, { height: LAYOUT.STATUS_MIN_HEIGHT });
+    return /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Box_default, { height: LAYOUT.STATUS_MIN_HEIGHT });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime121.jsxs)(Box_default, { flexDirection: "column", width: "100%", children: [
-    showRow1 && /* @__PURE__ */ (0, import_jsx_runtime121.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)(Box_default, { flexDirection: "column", width: "100%", children: [
+    showRow1 && /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)(
       Box_default,
       {
         width: "100%",
@@ -23678,13 +23768,13 @@ var StatusRow = ({
         justifyContent: "space-between",
         minHeight: LAYOUT.STATUS_MIN_HEIGHT,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(Box_default, { flexDirection: "row", flexGrow: 1, flexShrink: 1, children: !showUiDetails && showRow1Minimal ? /* @__PURE__ */ (0, import_jsx_runtime121.jsxs)(Box_default, { flexDirection: "row", columnGap: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Box_default, { flexDirection: "row", flexGrow: 1, flexShrink: 1, children: !showUiDetails && showRow1Minimal ? /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)(Box_default, { flexDirection: "row", columnGap: 1, children: [
             statusNode,
-            !showUiDetails && showRow2Minimal && modeContentObj && /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime121.jsxs)(Text, { color: modeContentObj.color, children: [
+            !showUiDetails && showRow2Minimal && modeContentObj && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)(Text, { color: modeContentObj.color, children: [
               "\u25CF ",
               modeContentObj.text
             ] }) })
-          ] }) : isInteractiveShellWaiting ? /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(Box_default, { width: "100%", marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(Text, { color: theme.status.warning, children: INTERACTIVE_SHELL_WAITING_PHRASE }) }) : /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(
+          ] }) : isInteractiveShellWaiting ? /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Box_default, { width: "100%", marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Text, { color: theme.status.warning, children: INTERACTIVE_SHELL_WAITING_PHRASE }) }) : /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
             Box_default,
             {
               flexDirection: "row",
@@ -23695,7 +23785,7 @@ var StatusRow = ({
               children: statusNode
             }
           ) }),
-          /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
             Box_default,
             {
               flexShrink: 0,
@@ -23709,8 +23799,8 @@ var StatusRow = ({
         ]
       }
     ),
-    showRow1 && showRow2 && (showUiDetails || showRow1Minimal && showRow2Minimal) && /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(Box_default, { width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(HorizontalLine, { dim: true }) }),
-    showRow2 && /* @__PURE__ */ (0, import_jsx_runtime121.jsxs)(
+    showRow1 && showRow2 && (showUiDetails || showRow1Minimal && showRow2Minimal) && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Box_default, { width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(HorizontalLine, { dim: true }) }),
+    showRow2 && /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)(
       Box_default,
       {
         width: "100%",
@@ -23718,29 +23808,29 @@ var StatusRow = ({
         alignItems: isNarrow ? "flex-start" : "center",
         justifyContent: "space-between",
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
             Box_default,
             {
               flexDirection: "row",
               alignItems: "center",
               marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN,
-              children: showUiDetails ? /* @__PURE__ */ (0, import_jsx_runtime121.jsxs)(import_jsx_runtime121.Fragment, { children: [
-                !hideUiDetailsForSuggestions && !inputState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(
+              children: showUiDetails ? /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)(import_jsx_runtime122.Fragment, { children: [
+                !hideUiDetailsForSuggestions && !inputState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
                   ApprovalModeIndicator,
                   {
                     approvalMode: uiState.showApprovalModeIndicator,
                     allowPlanMode: uiState.allowPlanMode
                   }
                 ),
-                inputState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(Box_default, { marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(ShellModeIndicator, {}) }),
-                !uiState.renderMarkdown && /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(Box_default, { marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(RawMarkdownIndicator, {}) })
-              ] }) : showRow2Minimal && modeContentObj && /* @__PURE__ */ (0, import_jsx_runtime121.jsxs)(Text, { color: modeContentObj.color, children: [
+                inputState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Box_default, { marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(ShellModeIndicator, {}) }),
+                !uiState.renderMarkdown && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Box_default, { marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(RawMarkdownIndicator, {}) })
+              ] }) : showRow2Minimal && modeContentObj && /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)(Text, { color: modeContentObj.color, children: [
                 "\u25CF ",
                 modeContentObj.text
               ] })
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime121.jsxs)(
+          /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)(
             Box_default,
             {
               marginTop: isNarrow ? LAYOUT.CONTEXT_DISPLAY_TOP_MARGIN_NARROW : 0,
@@ -23748,8 +23838,8 @@ var StatusRow = ({
               alignItems: "center",
               marginLeft: isNarrow ? LAYOUT.CONTEXT_DISPLAY_LEFT_MARGIN_NARROW : LAYOUT.CONTEXT_DISPLAY_LEFT_MARGIN_WIDE,
               children: [
-                (showUiDetails || showMinimalContext) && /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(StatusDisplay, { hideContextSummary }),
-                showMinimalContext && !showUiDetails && /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(Box_default, { marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(
+                (showUiDetails || showMinimalContext) && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(StatusDisplay, { hideContextSummary }),
+                showMinimalContext && !showUiDetails && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Box_default, { marginLeft: LAYOUT.INDICATOR_LEFT_MARGIN, children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
                   ContextUsageDisplay,
                   {
                     promptTokenCount: uiState.sessionStats.lastPromptTokenCount,
@@ -23767,7 +23857,7 @@ var StatusRow = ({
 };
 
 // packages/cli/src/ui/components/QueuedMessageDisplay.tsx
-var import_jsx_runtime122 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime123 = __toESM(require_jsx_runtime(), 1);
 var MAX_DISPLAYED_QUEUED_MESSAGES = 3;
 var QueuedMessageDisplay = ({
   messageQueue: messageQueue2
@@ -23775,13 +23865,13 @@ var QueuedMessageDisplay = ({
   if (messageQueue2.length === 0) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Text, { dimColor: true, children: "Queued (press \u2191 to edit):" }) }),
+  return /* @__PURE__ */ (0, import_jsx_runtime123.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(Text, { dimColor: true, children: "Queued (press \u2191 to edit):" }) }),
     messageQueue2.slice(0, MAX_DISPLAYED_QUEUED_MESSAGES).map((message, index) => {
       const preview = message.replace(/\s+/g, " ");
-      return /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Box_default, { paddingLeft: 4, width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Text, { dimColor: true, wrap: "truncate", children: preview }) }, index);
+      return /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(Box_default, { paddingLeft: 4, width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(Text, { dimColor: true, wrap: "truncate", children: preview }) }, index);
     }),
-    messageQueue2.length > MAX_DISPLAYED_QUEUED_MESSAGES && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Box_default, { paddingLeft: 4, children: /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)(Text, { dimColor: true, children: [
+    messageQueue2.length > MAX_DISPLAYED_QUEUED_MESSAGES && /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(Box_default, { paddingLeft: 4, children: /* @__PURE__ */ (0, import_jsx_runtime123.jsxs)(Text, { dimColor: true, children: [
       "... (+",
       messageQueue2.length - MAX_DISPLAYED_QUEUED_MESSAGES,
       " more)"
@@ -23791,7 +23881,7 @@ var QueuedMessageDisplay = ({
 
 // packages/cli/src/ui/components/ConfigInitDisplay.tsx
 var import_react86 = __toESM(require_react(), 1);
-var import_jsx_runtime123 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime124 = __toESM(require_jsx_runtime(), 1);
 var ConfigInitDisplay = ({
   message: initialMessage = "Working..."
 }) => {
@@ -23832,10 +23922,10 @@ var ConfigInitDisplay = ({
       coreEvents.off(CoreEvent.McpClientUpdate, onChange);
     };
   }, [initialMessage]);
-  return /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime123.jsxs)(Text, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(GeminiSpinner, {}),
+  return /* @__PURE__ */ (0, import_jsx_runtime124.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime124.jsxs)(Text, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime124.jsx)(GeminiSpinner, {}),
     " ",
-    /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(Text, { color: theme.text.primary, children: message })
+    /* @__PURE__ */ (0, import_jsx_runtime124.jsx)(Text, { color: theme.text.primary, children: message })
   ] }) });
 };
 
@@ -23846,21 +23936,21 @@ var import_react88 = __toESM(require_react(), 1);
 var import_react87 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/ChecklistItem.tsx
-var import_jsx_runtime124 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime125 = __toESM(require_jsx_runtime(), 1);
 var ChecklistStatusDisplay = ({
   status
 }) => {
   switch (status) {
     case "completed":
-      return /* @__PURE__ */ (0, import_jsx_runtime124.jsx)(Text, { color: theme.status.success, "aria-label": "Completed", children: "\u2713" });
+      return /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(Text, { color: theme.status.success, "aria-label": "Completed", children: "\u2713" });
     case "in_progress":
-      return /* @__PURE__ */ (0, import_jsx_runtime124.jsx)(Text, { color: theme.text.accent, "aria-label": "In Progress", children: "\xBB" });
+      return /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(Text, { color: theme.text.accent, "aria-label": "In Progress", children: "\xBB" });
     case "pending":
-      return /* @__PURE__ */ (0, import_jsx_runtime124.jsx)(Text, { color: theme.text.secondary, "aria-label": "Pending", children: "\u2610" });
+      return /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(Text, { color: theme.text.secondary, "aria-label": "Pending", children: "\u2610" });
     case "cancelled":
-      return /* @__PURE__ */ (0, import_jsx_runtime124.jsx)(Text, { color: theme.status.error, "aria-label": "Cancelled", children: "\u2717" });
+      return /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(Text, { color: theme.status.error, "aria-label": "Cancelled", children: "\u2717" });
     case "blocked":
-      return /* @__PURE__ */ (0, import_jsx_runtime124.jsx)(Text, { color: theme.status.warning, "aria-label": "Blocked", children: "\u26D4" });
+      return /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(Text, { color: theme.status.warning, "aria-label": "Blocked", children: "\u26D4" });
     default:
       checkExhaustive(status);
   }
@@ -23885,14 +23975,14 @@ var ChecklistItem = ({
     }
   })();
   const strikethrough = item.status === "cancelled";
-  return /* @__PURE__ */ (0, import_jsx_runtime124.jsxs)(Box_default, { flexDirection: "row", columnGap: 1, "aria-role": ariaRole, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime124.jsx)(ChecklistStatusDisplay, { status: item.status }),
-    /* @__PURE__ */ (0, import_jsx_runtime124.jsx)(Box_default, { flexShrink: 1, children: /* @__PURE__ */ (0, import_jsx_runtime124.jsx)(Text, { color: textColor, wrap, strikethrough, children: item.label }) })
+  return /* @__PURE__ */ (0, import_jsx_runtime125.jsxs)(Box_default, { flexDirection: "row", columnGap: 1, "aria-role": ariaRole, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(ChecklistStatusDisplay, { status: item.status }),
+    /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(Box_default, { flexShrink: 1, children: /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(Text, { color: textColor, wrap, strikethrough, children: item.label }) })
   ] });
 };
 
 // packages/cli/src/ui/components/Checklist.tsx
-var import_jsx_runtime125 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime126 = __toESM(require_jsx_runtime(), 1);
 var ChecklistTitleDisplay = ({ title, items, toggleHint }) => {
   const score = (0, import_react87.useMemo)(() => {
     let total = 0;
@@ -23907,9 +23997,9 @@ var ChecklistTitleDisplay = ({ title, items, toggleHint }) => {
     }
     return `${completed}/${total} completed`;
   }, [items]);
-  return /* @__PURE__ */ (0, import_jsx_runtime125.jsxs)(Box_default, { flexDirection: "row", columnGap: 2, height: 1, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(Text, { color: theme.text.primary, bold: true, "aria-label": `${title} list`, children: title }),
-    /* @__PURE__ */ (0, import_jsx_runtime125.jsxs)(Text, { color: theme.text.secondary, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime126.jsxs)(Box_default, { flexDirection: "row", columnGap: 2, height: 1, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(Text, { color: theme.text.primary, bold: true, "aria-label": `${title} list`, children: title }),
+    /* @__PURE__ */ (0, import_jsx_runtime126.jsxs)(Text, { color: theme.text.secondary, children: [
       score,
       toggleHint ? ` (${toggleHint})` : ""
     ] })
@@ -23917,7 +24007,7 @@ var ChecklistTitleDisplay = ({ title, items, toggleHint }) => {
 };
 var ChecklistListDisplay = ({
   items
-}) => /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(Box_default, { flexDirection: "column", "aria-role": "list", children: items.map((item, index) => /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(
+}) => /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(Box_default, { flexDirection: "column", "aria-role": "list", children: items.map((item, index) => /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(
   ChecklistItem,
   {
     item,
@@ -23944,7 +24034,7 @@ var Checklist = ({
   if (items.length === 0 || !isExpanded && !hasActiveItems) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(
     Box_default,
     {
       borderStyle: "single",
@@ -23954,8 +24044,8 @@ var Checklist = ({
       borderColor: theme.border.default,
       paddingLeft: 1,
       paddingRight: 1,
-      children: isExpanded ? /* @__PURE__ */ (0, import_jsx_runtime125.jsxs)(Box_default, { flexDirection: "column", rowGap: 1, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(
+      children: isExpanded ? /* @__PURE__ */ (0, import_jsx_runtime126.jsxs)(Box_default, { flexDirection: "column", rowGap: 1, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(
           ChecklistTitleDisplay,
           {
             title,
@@ -23963,9 +24053,9 @@ var Checklist = ({
             toggleHint
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(ChecklistListDisplay, { items })
-      ] }) : /* @__PURE__ */ (0, import_jsx_runtime125.jsxs)(Box_default, { flexDirection: "row", columnGap: 1, height: 1, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(Box_default, { flexShrink: 0, flexGrow: 0, children: /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(ChecklistListDisplay, { items })
+      ] }) : /* @__PURE__ */ (0, import_jsx_runtime126.jsxs)(Box_default, { flexDirection: "row", columnGap: 1, height: 1, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(Box_default, { flexShrink: 0, flexGrow: 0, children: /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(
           ChecklistTitleDisplay,
           {
             title,
@@ -23973,14 +24063,14 @@ var Checklist = ({
             toggleHint
           }
         ) }),
-        inProgress && /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(Box_default, { flexShrink: 1, flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(ChecklistItem, { item: inProgress, wrap: "truncate" }) })
+        inProgress && /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(Box_default, { flexShrink: 1, flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(ChecklistItem, { item: inProgress, wrap: "truncate" }) })
       ] })
     }
   );
 };
 
 // packages/cli/src/ui/components/messages/Todo.tsx
-var import_jsx_runtime126 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime127 = __toESM(require_jsx_runtime(), 1);
 var TodoTray = () => {
   const uiState = useUIState();
   const todos = (0, import_react88.useMemo)(() => {
@@ -24011,7 +24101,7 @@ var TodoTray = () => {
   if (!todos || !todos.todos) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime127.jsx)(
     Checklist,
     {
       title: "Todo",
@@ -24023,7 +24113,7 @@ var TodoTray = () => {
 };
 
 // packages/cli/src/ui/components/Composer.tsx
-var import_jsx_runtime127 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime128 = __toESM(require_jsx_runtime(), 1);
 var Composer = ({ isFocused = true }) => {
   const uiState = useUIState();
   const inputState = useInputState();
@@ -24064,7 +24154,7 @@ var Composer = ({ isFocused = true }) => {
   const showToast = shouldShowToast(uiState, inputState);
   const hideUiDetailsForSuggestions = suggestionsVisible && suggestionsPosition === "above";
   const showMinimalToast = showToast;
-  return /* @__PURE__ */ (0, import_jsx_runtime127.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime128.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -24072,12 +24162,12 @@ var Composer = ({ isFocused = true }) => {
       flexGrow: 0,
       flexShrink: 0,
       children: [
-        uiState.isResuming && /* @__PURE__ */ (0, import_jsx_runtime127.jsx)(ConfigInitDisplay, { message: "Resuming session..." }),
-        showUiDetails && /* @__PURE__ */ (0, import_jsx_runtime127.jsx)(QueuedMessageDisplay, { messageQueue: uiState.messageQueue }),
-        showUiDetails && /* @__PURE__ */ (0, import_jsx_runtime127.jsx)(TodoTray, {}),
-        showShortcutsHelp && /* @__PURE__ */ (0, import_jsx_runtime127.jsx)(ShortcutsHelp, {}),
-        (showUiDetails || showMinimalToast) && /* @__PURE__ */ (0, import_jsx_runtime127.jsx)(Box_default, { minHeight: 1, marginLeft: isNarrow ? 0 : 1, children: /* @__PURE__ */ (0, import_jsx_runtime127.jsx)(ToastDisplay, {}) }),
-        /* @__PURE__ */ (0, import_jsx_runtime127.jsx)(Box_default, { width: "100%", flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime127.jsx)(
+        uiState.isResuming && /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(ConfigInitDisplay, { message: "Resuming session..." }),
+        showUiDetails && /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(QueuedMessageDisplay, { messageQueue: uiState.messageQueue }),
+        showUiDetails && /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(TodoTray, {}),
+        showShortcutsHelp && /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(ShortcutsHelp, {}),
+        (showUiDetails || showMinimalToast) && /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(Box_default, { minHeight: 1, marginLeft: isNarrow ? 0 : 1, children: /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(ToastDisplay, {}) }),
+        /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(Box_default, { width: "100%", flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(
           StatusRow,
           {
             showUiDetails,
@@ -24088,8 +24178,8 @@ var Composer = ({ isFocused = true }) => {
             hasPendingActionRequired
           }
         ) }),
-        showUiDetails && uiState.showErrorDetails && /* @__PURE__ */ (0, import_jsx_runtime127.jsx)(OverflowProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime127.jsxs)(Box_default, { flexDirection: "column", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime127.jsx)(
+        showUiDetails && uiState.showErrorDetails && /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(OverflowProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime128.jsxs)(Box_default, { flexDirection: "column", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(
             DetailedMessagesDisplay,
             {
               maxHeight: uiState.constrainHeight ? debugConsoleMaxHeight : void 0,
@@ -24097,9 +24187,9 @@ var Composer = ({ isFocused = true }) => {
               hasFocus: uiState.showErrorDetails
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime127.jsx)(ShowMoreLines, { constrainHeight: uiState.constrainHeight })
+          /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(ShowMoreLines, { constrainHeight: uiState.constrainHeight })
         ] }) }),
-        uiState.isInputActive && /* @__PURE__ */ (0, import_jsx_runtime127.jsx)(
+        uiState.isInputActive && /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(
           InputPrompt,
           {
             onSubmit: uiActions.handleFinalSubmit,
@@ -24123,19 +24213,19 @@ var Composer = ({ isFocused = true }) => {
             onSuggestionsVisibilityChange: setSuggestionsVisible
           }
         ),
-        showUiDetails && !settings.merged.ui.hideFooter && !isScreenReaderEnabled && /* @__PURE__ */ (0, import_jsx_runtime127.jsx)(Footer, {})
+        showUiDetails && !settings.merged.ui.hideFooter && !isScreenReaderEnabled && /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(Footer, {})
       ]
     }
   );
 };
 
 // packages/cli/src/ui/components/ExitWarning.tsx
-var import_jsx_runtime128 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime129 = __toESM(require_jsx_runtime(), 1);
 var ExitWarning = () => {
   const uiState = useUIState();
-  return /* @__PURE__ */ (0, import_jsx_runtime128.jsxs)(import_jsx_runtime128.Fragment, { children: [
-    uiState.dialogsVisible && uiState.ctrlCPressedOnce && /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+C again to exit." }) }),
-    uiState.dialogsVisible && uiState.ctrlDPressedOnce && /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+D again to exit." }) })
+  return /* @__PURE__ */ (0, import_jsx_runtime129.jsxs)(import_jsx_runtime129.Fragment, { children: [
+    uiState.dialogsVisible && uiState.ctrlCPressedOnce && /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+C again to exit." }) }),
+    uiState.dialogsVisible && uiState.ctrlDPressedOnce && /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+D again to exit." }) })
   ] });
 };
 
@@ -24159,12 +24249,12 @@ function useFlickerDetector(rootUiRef, terminalHeight) {
 }
 
 // packages/cli/src/ui/layouts/ScreenReaderAppLayout.tsx
-var import_jsx_runtime129 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime130 = __toESM(require_jsx_runtime(), 1);
 var ScreenReaderAppLayout = () => {
   const uiState = useUIState();
   const { rootUiRef, terminalHeight } = uiState;
   useFlickerDetector(rootUiRef, terminalHeight);
-  return /* @__PURE__ */ (0, import_jsx_runtime129.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime130.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -24172,27 +24262,27 @@ var ScreenReaderAppLayout = () => {
       height: "100%",
       ref: uiState.rootUiRef,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Notifications, {}),
-        /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Footer, {}),
-        /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Box_default, { flexGrow: 1, overflow: "hidden", children: /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(MainContent, {}) }),
-        uiState.dialogsVisible ? /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(Notifications, {}),
+        /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(Footer, {}),
+        /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(Box_default, { flexGrow: 1, overflow: "hidden", children: /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(MainContent, {}) }),
+        uiState.dialogsVisible ? /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(
           DialogManager,
           {
             terminalWidth: uiState.terminalWidth,
             addItem: uiState.historyManager.addItem
           }
-        ) : /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Composer, {}),
-        /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(ExitWarning, {})
+        ) : /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(Composer, {}),
+        /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(ExitWarning, {})
       ]
     }
   );
 };
 
 // packages/cli/src/ui/components/CopyModeWarning.tsx
-var import_jsx_runtime130 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime131 = __toESM(require_jsx_runtime(), 1);
 var CopyModeWarning = () => {
   const { copyModeEnabled } = useInputState();
-  return /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(Box_default, { height: 1, children: copyModeEnabled && /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(Text, { color: theme.status.warning, children: "In Copy Mode. Use Page Up/Down to scroll. Press Ctrl+S or any other key to exit." }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(Box_default, { height: 1, children: copyModeEnabled && /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(Text, { color: theme.status.warning, children: "In Copy Mode. Use Page Up/Down to scroll. Press Ctrl+S or any other key to exit." }) });
 };
 
 // packages/cli/src/ui/components/BackgroundTaskDisplay.tsx
@@ -24817,7 +24907,7 @@ ${mainContent}`;
 };
 
 // packages/cli/src/ui/components/BackgroundTaskDisplay.tsx
-var import_jsx_runtime131 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime132 = __toESM(require_jsx_runtime(), 1);
 var CONTENT_PADDING_X = 1;
 var BORDER_WIDTH = 2;
 var MAIN_BORDER_HEIGHT = 2;
@@ -24950,11 +25040,11 @@ var BackgroundTaskDisplay = ({
     { label: "List", command: "background.toggleList" /* TOGGLE_BACKGROUND_SHELL_LIST */ }
   ];
   const helpTextStr = helpTextParts.map((p) => `${p.label} (${formatCommand(p.command)})`).join(" | ");
-  const renderHelpText = () => /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(Text, { children: helpTextParts.map((p, i) => /* @__PURE__ */ (0, import_jsx_runtime131.jsxs)(Text, { children: [
+  const renderHelpText = () => /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(Text, { children: helpTextParts.map((p, i) => /* @__PURE__ */ (0, import_jsx_runtime132.jsxs)(Text, { children: [
     i > 0 ? " | " : "",
     p.label,
     " (",
-    /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(Text, { color: theme.text.accent, children: formatCommand(p.command) }),
+    /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(Text, { color: theme.text.accent, children: formatCommand(p.command) }),
     ")"
   ] }, p.label)) });
   const renderTabs = () => {
@@ -24985,7 +25075,7 @@ var BackgroundTaskDisplay = ({
       }
       const isActive = shell.pid === activePid;
       tabs.push(
-        /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(
           Text,
           {
             color: isActive ? theme.text.primary : theme.text.secondary,
@@ -25003,7 +25093,7 @@ var BackgroundTaskDisplay = ({
       const shouldShowOverflow = tabs.length > 1 || availableWidth - currentWidth >= overflowWidth;
       if (shouldShowOverflow) {
         tabs.push(
-          /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(Text, { color: theme.status.warning, bold: true, children: overflowLabel }, "overflow")
+          /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(Text, { color: theme.status.warning, bold: true, children: overflowLabel }, "overflow")
         );
       }
     }
@@ -25032,9 +25122,9 @@ var BackgroundTaskDisplay = ({
       };
     });
     const initialIndex = items.findIndex((item) => item.value === activePid);
-    return /* @__PURE__ */ (0, import_jsx_runtime131.jsxs)(Box_default, { flexDirection: "column", height: "100%", width: "100%", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(Box_default, { flexShrink: 0, marginBottom: 1, paddingTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(Text, { bold: true, children: `Select Process (${formatCommand("background.select" /* BACKGROUND_SHELL_SELECT */)} to select, ${formatCommand("background.kill" /* KILL_BACKGROUND_SHELL */)} to kill, ${formatCommand("background.escape" /* BACKGROUND_SHELL_ESCAPE */)} to cancel):` }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(Box_default, { flexGrow: 1, width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime132.jsxs)(Box_default, { flexDirection: "column", height: "100%", width: "100%", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(Box_default, { flexShrink: 0, marginBottom: 1, paddingTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(Text, { bold: true, children: `Select Process (${formatCommand("background.select" /* BACKGROUND_SHELL_SELECT */)} to select, ${formatCommand("background.kill" /* KILL_BACKGROUND_SHELL */)} to kill, ${formatCommand("background.escape" /* BACKGROUND_SHELL_ESCAPE */)} to cancel):` }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(Box_default, { flexGrow: 1, width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(
         RadioButtonSelect,
         {
           items,
@@ -25051,17 +25141,17 @@ var BackgroundTaskDisplay = ({
           ),
           renderItem: (item, { isSelected: _isSelected, titleColor: _titleColor }) => {
             const shell = shells.get(item.value);
-            if (!shell) return /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(Text, { children: item.label });
+            if (!shell) return /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(Text, { children: item.label });
             const truncatedCommand = formatShellCommandForDisplay(
               shell.command,
               maxCommandLength
             );
-            return /* @__PURE__ */ (0, import_jsx_runtime131.jsxs)(Text, { children: [
+            return /* @__PURE__ */ (0, import_jsx_runtime132.jsxs)(Text, { children: [
               truncatedCommand,
               " (PID: ",
               shell.pid,
               ")",
-              shell.status === "exited" ? /* @__PURE__ */ (0, import_jsx_runtime131.jsxs)(
+              shell.status === "exited" ? /* @__PURE__ */ (0, import_jsx_runtime132.jsxs)(
                 Text,
                 {
                   color: shell.exitCode === 0 ? theme.status.success : theme.status.error,
@@ -25087,23 +25177,23 @@ var BackgroundTaskDisplay = ({
       tildeifyPath(logPath),
       width - LOG_PATH_OVERHEAD
     );
-    return /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime131.jsxs)(Text, { color: theme.text.secondary, children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime132.jsxs)(Text, { color: theme.text.secondary, children: [
       "Log: ",
       displayPath
     ] }) });
   };
   const renderOutput = () => {
     const lines = typeof output === "string" ? output.split("\n") : output;
-    return /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(
       ScrollableListWithForwardRef,
       {
         ref: outputRef,
         data: lines,
         renderItem: ({ item: line, index }) => {
           if (typeof line === "string") {
-            return /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(Text, { children: line }, index);
+            return /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(Text, { children: line }, index);
           }
-          return /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(Text, { wrap: "truncate", children: line.length > 0 ? line.map((token, tokenIndex) => /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(
+          return /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(Text, { wrap: "truncate", children: line.length > 0 ? line.map((token, tokenIndex) => /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(
             Text,
             {
               color: token.fg,
@@ -25125,7 +25215,7 @@ var BackgroundTaskDisplay = ({
       }
     );
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime131.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime132.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -25134,7 +25224,7 @@ var BackgroundTaskDisplay = ({
       borderStyle: "single",
       borderColor: isFocused ? theme.ui.focus : void 0,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime131.jsxs)(
+        /* @__PURE__ */ (0, import_jsx_runtime132.jsxs)(
           Box_default,
           {
             flexDirection: "row",
@@ -25147,9 +25237,9 @@ var BackgroundTaskDisplay = ({
             paddingX: 1,
             borderColor: isFocused ? theme.ui.focus : void 0,
             children: [
-              /* @__PURE__ */ (0, import_jsx_runtime131.jsxs)(Box_default, { flexDirection: "row", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime132.jsxs)(Box_default, { flexDirection: "row", children: [
                 renderTabs(),
-                /* @__PURE__ */ (0, import_jsx_runtime131.jsxs)(Text, { bold: true, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime132.jsxs)(Text, { bold: true, children: [
                   " ",
                   "(PID: ",
                   activeShell?.pid,
@@ -25161,7 +25251,7 @@ var BackgroundTaskDisplay = ({
             ]
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime131.jsx)(Box_default, { flexGrow: 1, overflow: "hidden", paddingX: CONTENT_PADDING_X, children: isListOpenProp ? renderProcessList() : renderOutput() }),
+        /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(Box_default, { flexGrow: 1, overflow: "hidden", paddingX: CONTENT_PADDING_X, children: isListOpenProp ? renderProcessList() : renderOutput() }),
         renderFooter()
       ]
     }
@@ -25169,14 +25259,14 @@ var BackgroundTaskDisplay = ({
 };
 
 // packages/cli/src/ui/layouts/DefaultAppLayout.tsx
-var import_jsx_runtime132 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime133 = __toESM(require_jsx_runtime(), 1);
 var DefaultAppLayout = () => {
   const uiState = useUIState();
   const { copyModeEnabled } = useInputState();
   const isAlternateBuffer = useAlternateBuffer();
   const { rootUiRef, terminalHeight } = uiState;
   useFlickerDetector(rootUiRef, terminalHeight);
-  return /* @__PURE__ */ (0, import_jsx_runtime132.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime133.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -25187,8 +25277,8 @@ var DefaultAppLayout = () => {
       flexGrow: 0,
       ref: uiState.rootUiRef,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(MainContent, {}),
-        uiState.isBackgroundTaskVisible && uiState.backgroundTasks.size > 0 && uiState.activeBackgroundTaskPid && uiState.backgroundTaskHeight > 0 && uiState.streamingState !== "waiting_for_confirmation" /* WaitingForConfirmation */ && /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(Box_default, { height: uiState.backgroundTaskHeight, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime133.jsx)(MainContent, {}),
+        uiState.isBackgroundTaskVisible && uiState.backgroundTasks.size > 0 && uiState.activeBackgroundTaskPid && uiState.backgroundTaskHeight > 0 && uiState.streamingState !== "waiting_for_confirmation" /* WaitingForConfirmation */ && /* @__PURE__ */ (0, import_jsx_runtime133.jsx)(Box_default, { height: uiState.backgroundTaskHeight, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime133.jsx)(
           BackgroundTaskDisplay,
           {
             shells: uiState.backgroundTasks,
@@ -25199,7 +25289,7 @@ var DefaultAppLayout = () => {
             isListOpenProp: uiState.isBackgroundTaskListOpen
           }
         ) }),
-        /* @__PURE__ */ (0, import_jsx_runtime132.jsxs)(
+        /* @__PURE__ */ (0, import_jsx_runtime133.jsxs)(
           Box_default,
           {
             flexDirection: "column",
@@ -25209,16 +25299,16 @@ var DefaultAppLayout = () => {
             width: uiState.terminalWidth,
             height: copyModeEnabled ? uiState.stableControlsHeight : void 0,
             children: [
-              /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(Notifications, {}),
-              /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(CopyModeWarning, {}),
-              uiState.customDialog ? uiState.customDialog : uiState.dialogsVisible ? /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(
+              /* @__PURE__ */ (0, import_jsx_runtime133.jsx)(Notifications, {}),
+              /* @__PURE__ */ (0, import_jsx_runtime133.jsx)(CopyModeWarning, {}),
+              uiState.customDialog ? uiState.customDialog : uiState.dialogsVisible ? /* @__PURE__ */ (0, import_jsx_runtime133.jsx)(
                 DialogManager,
                 {
                   terminalWidth: uiState.terminalWidth,
                   addItem: uiState.historyManager.addItem
                 }
-              ) : /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(Composer, { isFocused: true }),
-              /* @__PURE__ */ (0, import_jsx_runtime132.jsx)(ExitWarning, {})
+              ) : /* @__PURE__ */ (0, import_jsx_runtime133.jsx)(Composer, { isFocused: true }),
+              /* @__PURE__ */ (0, import_jsx_runtime133.jsx)(ExitWarning, {})
             ]
           }
         )
@@ -25228,13 +25318,13 @@ var DefaultAppLayout = () => {
 };
 
 // packages/cli/src/ui/components/AlternateBufferQuittingDisplay.tsx
-var import_jsx_runtime133 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime134 = __toESM(require_jsx_runtime(), 1);
 var AlternateBufferQuittingDisplay = () => {
   const { version } = useAppContext();
   const uiState = useUIState();
   const confirmingTool = useConfirmingTool();
   const showPromptedTool = confirmingTool !== null;
-  return /* @__PURE__ */ (0, import_jsx_runtime133.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime134.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -25242,8 +25332,8 @@ var AlternateBufferQuittingDisplay = () => {
       flexGrow: 0,
       width: uiState.terminalWidth,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime133.jsx)(AppHeader, { version }, "app-header"),
-        uiState.history.map((h) => /* @__PURE__ */ (0, import_jsx_runtime133.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(AppHeader, { version }, "app-header"),
+        uiState.history.map((h) => /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(
           HistoryItemDisplay,
           {
             terminalWidth: uiState.mainAreaWidth,
@@ -25255,7 +25345,7 @@ var AlternateBufferQuittingDisplay = () => {
           },
           h.id
         )),
-        uiState.pendingHistoryItems.map((item, i) => /* @__PURE__ */ (0, import_jsx_runtime133.jsx)(
+        uiState.pendingHistoryItems.map((item, i) => /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(
           HistoryItemDisplay,
           {
             availableTerminalHeight: void 0,
@@ -25265,17 +25355,17 @@ var AlternateBufferQuittingDisplay = () => {
           },
           i
         )),
-        showPromptedTool && /* @__PURE__ */ (0, import_jsx_runtime133.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime133.jsx)(Text, { color: theme.status.warning, bold: true, children: "Action Required (was prompted):" }),
-          /* @__PURE__ */ (0, import_jsx_runtime133.jsxs)(Box_default, { marginTop: 1, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime133.jsx)(
+        showPromptedTool && /* @__PURE__ */ (0, import_jsx_runtime134.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(Text, { color: theme.status.warning, bold: true, children: "Action Required (was prompted):" }),
+          /* @__PURE__ */ (0, import_jsx_runtime134.jsxs)(Box_default, { marginTop: 1, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(
               ToolStatusIndicator,
               {
                 status: confirmingTool.tool.status,
                 name: confirmingTool.tool.name
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime133.jsx)(
+            /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(
               ToolInfo,
               {
                 name: confirmingTool.tool.name,
@@ -25286,26 +25376,26 @@ var AlternateBufferQuittingDisplay = () => {
             )
           ] })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime133.jsx)(QuittingDisplay, {})
+        /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(QuittingDisplay, {})
       ]
     }
   );
 };
 
 // packages/cli/src/ui/App.tsx
-var import_jsx_runtime134 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime135 = __toESM(require_jsx_runtime(), 1);
 var App = () => {
   const uiState = useUIState();
   const isAlternateBuffer = useAlternateBuffer();
   const isScreenReaderEnabled = use_is_screen_reader_enabled_default();
   if (uiState.quittingMessages) {
     if (isAlternateBuffer) {
-      return /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(StreamingContext.Provider, { value: uiState.streamingState, children: /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(AlternateBufferQuittingDisplay, {}) });
+      return /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(StreamingContext.Provider, { value: uiState.streamingState, children: /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(AlternateBufferQuittingDisplay, {}) });
     } else {
-      return /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(QuittingDisplay, {});
+      return /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(QuittingDisplay, {});
     }
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(StreamingContext.Provider, { value: uiState.streamingState, children: isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(ScreenReaderAppLayout, {}) : /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(DefaultAppLayout, {}) });
+  return /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(StreamingContext.Provider, { value: uiState.streamingState, children: isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(ScreenReaderAppLayout, {}) : /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(DefaultAppLayout, {}) });
 };
 
 // packages/cli/src/ui/AppContainer.tsx
@@ -25341,7 +25431,7 @@ import process7 from "node:process";
 
 // packages/cli/src/ui/contexts/TerminalContext.tsx
 var import_react94 = __toESM(require_react(), 1);
-var import_jsx_runtime135 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime136 = __toESM(require_jsx_runtime(), 1);
 var TerminalContext = (0, import_react94.createContext)(
   void 0
 );
@@ -25411,7 +25501,7 @@ function TerminalProvider({ children }) {
       stdin.removeListener("data", handleData);
     };
   }, [stdin, subscribers]);
-  return /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(
     TerminalContext.Provider,
     {
       value: { subscribe: subscribe2, unsubscribe, queryTerminalBackground },
@@ -26036,7 +26126,7 @@ var SkillCommandLoader = class {
 };
 
 // packages/cli/src/ui/components/LogoutConfirmationDialog.tsx
-var import_jsx_runtime136 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime137 = __toESM(require_jsx_runtime(), 1);
 var LogoutConfirmationDialog = ({ onSelect }) => {
   useKeypress(
     (key) => {
@@ -26060,7 +26150,7 @@ var LogoutConfirmationDialog = ({ onSelect }) => {
       key: "exit"
     }
   ];
-  return /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(Box_default, { flexDirection: "row", width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime136.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime137.jsx)(Box_default, { flexDirection: "row", width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime137.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -26071,12 +26161,12 @@ var LogoutConfirmationDialog = ({ onSelect }) => {
       marginLeft: 1,
       marginRight: 1,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime136.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(Text, { bold: true, color: theme.text.primary, children: "You are now signed out" }),
-          /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(Text, { color: theme.text.secondary, children: "Sign in again to continue using Gemini CLI, or exit the application." })
+        /* @__PURE__ */ (0, import_jsx_runtime137.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime137.jsx)(Text, { bold: true, color: theme.text.primary, children: "You are now signed out" }),
+          /* @__PURE__ */ (0, import_jsx_runtime137.jsx)(Text, { color: theme.text.secondary, children: "Sign in again to continue using Gemini CLI, or exit the application." })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(RadioButtonSelect, { items: options, onSelect, isFocused: true }),
-        /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(Text, { color: theme.text.secondary, children: "(Use Enter to select, Esc to close)" }) })
+        /* @__PURE__ */ (0, import_jsx_runtime137.jsx)(RadioButtonSelect, { items: options, onSelect, isFocused: true }),
+        /* @__PURE__ */ (0, import_jsx_runtime137.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime137.jsx)(Text, { color: theme.text.secondary, children: "(Use Enter to select, Esc to close)" }) })
       ]
     }
   ) });
@@ -26458,6 +26548,15 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
                   return { type: "handled" };
                 }
                 case "quit":
+                  if (result.deleteSession) {
+                    try {
+                      const chatRecordingService = config?.getGeminiClient()?.getChatRecordingService();
+                      if (chatRecordingService) {
+                        await chatRecordingService.deleteCurrentSessionAsync();
+                      }
+                    } catch {
+                    }
+                  }
                   actions.quit(result.messages);
                   return { type: "handled" };
                 case "submit_prompt":
@@ -28988,12 +29087,14 @@ var useAgentStream = ({
           );
           break;
         }
-        case "error":
+        case "error": {
+          const message = event._meta?.["code"] === "AGENT_EXECUTION_BLOCKED" ? `Agent execution blocked: ${event.message}` : event.message;
           addItem(
-            { type: "error" /* ERROR */, text: event.message },
+            { type: "error" /* ERROR */, text: message },
             userMessageTimestampRef.current
           );
           break;
+        }
         case "initialize":
         case "session_update":
         case "elicitation_request":
@@ -31452,6 +31553,7 @@ async function checkForUpdates(settings) {
       return null;
     }
     const { name, version: currentVersion } = packageJson2;
+    const currentChannel = getChannelFromVersion(currentVersion);
     const isNightly = currentVersion.includes("nightly");
     if (isNightly) {
       const [nightlyUpdate, latestUpdate] = await Promise.all([
@@ -31474,7 +31576,14 @@ async function checkForUpdates(settings) {
       }
     } else {
       const latestUpdate = await latestVersion(name);
-      if (latestUpdate && import_semver2.default.gt(latestUpdate, currentVersion)) {
+      if (!latestUpdate) {
+        return null;
+      }
+      const targetChannel = getChannelFromVersion(latestUpdate);
+      if (RELEASE_CHANNEL_STABILITY[targetChannel] < RELEASE_CHANNEL_STABILITY[currentChannel]) {
+        return null;
+      }
+      if (import_semver2.default.gt(latestUpdate, currentVersion)) {
         const message = `Gemini CLI update available! ${currentVersion} \u2192 ${latestUpdate}`;
         const type = import_semver2.default.diff(latestUpdate, currentVersion) || void 0;
         return {
@@ -31784,7 +31893,7 @@ function useSessionResume({
 
 // packages/cli/src/ui/hooks/useIncludeDirsTrust.tsx
 var import_react117 = __toESM(require_react(), 1);
-var import_jsx_runtime137 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime138 = __toESM(require_jsx_runtime(), 1);
 async function finishAddingDirectories(config, addItem, added, errors) {
   if (!config) {
     addItem({
@@ -31871,7 +31980,7 @@ Please use the permissions command to modify their trust level.`
         undefinedTrustDirs
       );
       setCustomDialog(
-        /* @__PURE__ */ (0, import_jsx_runtime137.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime138.jsx)(
           MultiFolderTrustDialog,
           {
             folders: undefinedTrustDirs,
@@ -32092,43 +32201,6 @@ function useBackgroundTaskManager({
   };
 }
 
-// packages/cli/src/ui/auth/LoginWithGoogleRestartDialog.tsx
-var import_jsx_runtime138 = __toESM(require_jsx_runtime(), 1);
-var LoginWithGoogleRestartDialog = ({
-  onDismiss,
-  config
-}) => {
-  useKeypress(
-    (key) => {
-      if (key.name === "escape") {
-        onDismiss();
-        return true;
-      } else if (key.name === "r" || key.name === "R") {
-        setTimeout(async () => {
-          if (process.send) {
-            const remoteSettings = config.getRemoteAdminSettings();
-            if (remoteSettings) {
-              process.send({
-                type: "admin-settings-update",
-                settings: remoteSettings
-              });
-            }
-          }
-          await relaunchApp();
-        }, 100);
-        return true;
-      }
-      return false;
-    },
-    { isActive: true }
-  );
-  const message = "You've successfully signed in with Google. Gemini CLI needs to be restarted.";
-  return /* @__PURE__ */ (0, import_jsx_runtime138.jsx)(Box_default, { borderStyle: "round", borderColor: theme.status.warning, paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime138.jsxs)(Text, { color: theme.status.warning, children: [
-    message,
-    " Press R to restart, or Esc to choose a different authentication method."
-  ] }) });
-};
-
 // packages/cli/src/ui/hooks/useTerminalTheme.ts
 var import_react121 = __toESM(require_react(), 1);
 function useTerminalTheme(handleThemeSelect, config, refreshStatic) {
@@ -33115,7 +33187,7 @@ var AppContainer = (props) => {
   );
   (0, import_react127.useEffect)(() => {
     if (authState === "authenticated" /* Authenticated */ && authContext.requiresRestart) {
-      setAuthState("awaiting_google_login_restart" /* AwaitingGoogleLoginRestart */);
+      setAuthState("awaiting_login_restart" /* AwaitingLoginRestart */);
       setAuthContext({});
     }
   }, [authState, authContext, setAuthState]);
@@ -33213,10 +33285,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
     async (apiKey) => {
       try {
         onAuthError(null);
-        if (!apiKey.trim() && apiKey.length > 1) {
-          onAuthError(
-            "API key cannot be empty string with length greater than 1."
-          );
+        if (!apiKey.trim()) {
+          onAuthError("API key cannot be empty or whitespace only.");
           return;
         }
         await saveApiKey(apiKey);
@@ -34050,7 +34120,7 @@ ${queuedText}` : queuedText;
       if (keyMatchers["app.showErrorDetails" /* SHOW_ERROR_DETAILS */](key)) {
         if (settings.merged.general.devtools) {
           void (async () => {
-            const { toggleDevToolsPanel } = await import("./devtoolsService-JPBL5I7F.js");
+            const { toggleDevToolsPanel } = await import("./devtoolsService-KZLK5WRW.js");
             await toggleDevToolsPanel(
               config,
               showErrorDetails,
@@ -34277,7 +34347,9 @@ ${queuedText}` : queuedText;
     };
   }, [historyManager]);
   const nightly = props.version.includes("nightly");
-  const dialogsVisible = shouldShowIdePrompt || 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 */ || !!newAgents;
+  const isAwaitingLoginRestart = authState === "awaiting_login_restart" /* AwaitingLoginRestart */;
+  const loginRestartMessage = settings.merged.security.auth.selectedType === AuthType.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 hasPendingToolConfirmation = (0, import_react127.useMemo)(
     () => isToolAwaitingConfirmation(pendingHistoryItems),
     [pendingHistoryItems]
@@ -34450,6 +34522,8 @@ ${queuedText}` : queuedText;
       accountSuspensionInfo,
       isAuthDialogOpen,
       isAwaitingApiKeyInput: authState === "awaiting_api_key_input" /* AwaitingApiKeyInput */,
+      isAwaitingLoginRestart,
+      loginRestartMessage,
       apiKeyDefaultValue,
       editorError,
       isEditorDialogOpen,
@@ -34653,6 +34727,8 @@ ${queuedText}` : queuedText;
       customDialog,
       apiKeyDefaultValue,
       authState,
+      isAwaitingLoginRestart,
+      loginRestartMessage,
       transientMessage,
       bannerData,
       bannerVisible,
@@ -34725,6 +34801,10 @@ ${queuedText}` : queuedText;
       setActiveBackgroundTaskPid,
       setIsBackgroundTaskListOpen,
       setAuthContext,
+      dismissLoginRestart: () => {
+        setAuthContext({});
+        setAuthState("updating" /* Updating */);
+      },
       onHintInput: () => {
       },
       onHintBackspace: () => {
@@ -34834,18 +34914,6 @@ ${queuedText}` : queuedText;
       setVoiceModeEnabled
     ]
   );
-  if (authState === "awaiting_google_login_restart" /* AwaitingGoogleLoginRestart */) {
-    return /* @__PURE__ */ (0, import_jsx_runtime139.jsx)(
-      LoginWithGoogleRestartDialog,
-      {
-        onDismiss: () => {
-          setAuthContext({});
-          setAuthState("updating" /* Updating */);
-        },
-        config
-      }
-    );
-  }
   return /* @__PURE__ */ (0, import_jsx_runtime139.jsx)(UIStateContext.Provider, { value: uiState, children: /* @__PURE__ */ (0, import_jsx_runtime139.jsx)(QuotaContext.Provider, { value: quotaState, children: /* @__PURE__ */ (0, import_jsx_runtime139.jsx)(InputContext.Provider, { value: inputState, children: /* @__PURE__ */ (0, import_jsx_runtime139.jsx)(UIActionsContext.Provider, { value: uiActions, children: /* @__PURE__ */ (0, import_jsx_runtime139.jsx)(ConfigContext.Provider, { value: config, children: /* @__PURE__ */ (0, import_jsx_runtime139.jsx)(
     AppContext.Provider,
     {
@@ -34945,7 +35013,12 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
     registerCleanup(cleanupLineWrapping);
   }
   checkForUpdates(settings).then((info) => {
-    handleAutoUpdate(info, settings, config.getProjectRoot());
+    handleAutoUpdate(
+      info,
+      settings,
+      config.getProjectRoot(),
+      config.getSandboxEnabled()
+    );
   }).catch((err) => {
     if (config.getDebugMode()) {
       debugLogger.warn("Update check failed:", err);