@google/gemini-cli 0.65.0-nightly.20261013.g51617c1bc → 0.65.0-preview.0

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

@@ -171,10 +171,10 @@ import {
   widestLineFromStyledChars,
   wordBreakStyledChars,
   wrapStyledChars
-} from "./chunk-XHQIF7OW.js";
+} from "./chunk-SN7QZKXC.js";
 import {
   require_source
-} from "./chunk-5YND2HLC.js";
+} from "./chunk-K4G5D5ZZ.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
@@ -227,37 +227,33 @@ import {
   stripAnsi,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-TLYQMFOC.js";
+} from "./chunk-V2R74WAG.js";
 import {
   handleAutoUpdate,
   isDevelopment,
   relaunchApp,
   setUpdateHandler
-} from "./chunk-VJXI22NX.js";
+} from "./chunk-BFIV7GTA.js";
 import {
   isTodoList,
   mapCoreStatusToDisplayStatus,
   require_react
-} from "./chunk-6M4QEFFF.js";
+} from "./chunk-QJK54DSE.js";
 import {
   registerCleanup,
   removeCleanup,
   runExitCleanup,
   setupTtyCheck
-} from "./chunk-K6N5Z54J.js";
+} from "./chunk-S7BCRBI4.js";
 import {
   ACTIVATE_SKILL_TOOL_NAME,
   AGENT_TOOL_NAME,
   ApiKeyUpdatedEvent,
-  ApprovalMode,
   AsyncFzf,
   AudioRecorder,
   AuthType,
   ChangeAuthRequestedError,
-  CompressionStatus,
   ConversationFinishedEvent,
-  CoreEvent,
-  CoreToolCallStatus,
   CreditPurchaseClickEvent,
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
   DEFAULT_GEMINI_FLASH_MODEL,
@@ -279,20 +275,13 @@ import {
   GEMMA_4_31B_IT_MODEL,
   GLOB_DISPLAY_NAME,
   GREP_DISPLAY_NAME,
-  GeminiCliOperation,
-  GeminiEventType,
   GitService,
   IdeClient,
-  Kind,
   LS_DISPLAY_NAME,
   LegacyAgentProtocol,
   LlmRole,
   Logger,
   MAX_TOKENS_EXCEEDED_SUGGESTION,
-  MCPDiscoveryState,
-  MCPServerStatus,
-  MessageBusType,
-  MessageSenderType,
   ModelNotFoundError,
   ModelSlashCommandEvent,
   OTHER_BLOCKED_MESSAGE,
@@ -305,7 +294,6 @@ import {
   PREVIEW_GEMINI_MODEL,
   PolicyIntegrityManager,
   ProjectIdRequiredError,
-  QuestionType,
   READ_FILE_DISPLAY_NAME,
   READ_MANY_FILES_DISPLAY_NAME,
   RECITATION_BLOCKED_MESSAGE,
@@ -314,22 +302,16 @@ import {
   SAFETY_BLOCKED_MESSAGE,
   SHELL_TOOL_NAME,
   Scheduler,
-  SessionEndReason,
-  SessionStartSource,
   ShellExecutionService,
   SlashCommandStatus,
   Storage,
-  SubagentState,
   THINKING_ONLY_COMPRESS_SUGGESTION,
   TOPIC_PARAM_STRATEGIC_INTENT,
   TOPIC_PARAM_SUMMARY,
   TOPIC_PARAM_TITLE,
   TRUE_EMPTY_RESPONSE_MESSAGE,
   TerminalQuotaError,
-  ToolConfirmationOutcome,
-  ToolErrorType,
   TranscriptionFactory,
-  TrustLevel,
   UPDATE_TOPIC_DISPLAY_NAME,
   UPDATE_TOPIC_TOOL_NAME,
   UnauthorizedError,
@@ -342,7 +324,6 @@ import {
   WEB_FETCH_DISPLAY_NAME,
   WEB_SEARCH_DISPLAY_NAME,
   WRITE_FILE_DISPLAY_NAME,
-  WarningPriority,
   WhisperModelManager,
   addMCPStatusChangeListener,
   allowEditorTypeInSandbox,
@@ -450,7 +431,7 @@ import {
   validatePlanContent,
   validatePlanPath,
   writeToStdout
-} from "./chunk-UVUPZGTC.js";
+} from "./chunk-K7NOVQ6G.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-IUUIT4SU.js";
 import "./chunk-L6PII3GR.js";
@@ -5077,7 +5058,7 @@ function calculateShellMaxLines(options) {
   if (isAlternateBuffer && isThisShellFocused2 && !constrainHeight) {
     return maxLinesBasedOnHeight;
   }
-  const isExecuting = status === CoreToolCallStatus.Executing;
+  const isExecuting = status === "executing" /* Executing */;
   const shellMaxLinesLimit = isExecuting ? ACTIVE_SHELL_MAX_LINES - SHELL_CONTENT_OVERHEAD : COMPLETED_SHELL_MAX_LINES - SHELL_CONTENT_OVERHEAD;
   return Math.min(maxLinesBasedOnHeight, shellMaxLinesLimit);
 }
@@ -5113,13 +5094,13 @@ var formatToolArgs = (args) => {
 var SubagentProgressDisplay = ({ progress, terminalWidth, historyOverrides }) => {
   let headerText;
   let headerColor = theme.text.secondary;
-  if (progress.state === SubagentState.CANCELLED) {
+  if (progress.state === "cancelled" /* CANCELLED */) {
     headerText = `Subagent ${progress.agentName} was cancelled.`;
     headerColor = theme.status.warning;
-  } else if (progress.state === SubagentState.ERROR) {
+  } else if (progress.state === "error" /* ERROR */) {
     headerText = `Subagent ${progress.agentName} failed.`;
     headerColor = theme.status.error;
-  } else if (progress.state === SubagentState.COMPLETED) {
+  } else if (progress.state === "completed" /* COMPLETED */) {
     headerText = `Subagent ${progress.agentName} completed.`;
     headerColor = theme.status.success;
   } else {
@@ -5139,7 +5120,7 @@ var SubagentProgressDisplay = ({ progress, terminalWidth, historyOverrides }) =>
             /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(Text, { color, children: item.content }) })
           ] }, item.id);
         } else if (item.type === "tool_call") {
-          const statusSymbol = item.status === SubagentState.RUNNING ? /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(build_default, { type: "dots" }) : item.status === SubagentState.COMPLETED ? /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(Text, { color: theme.status.success, children: TOOL_STATUS.SUCCESS }) : item.status === SubagentState.CANCELLED ? /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(Text, { color: theme.status.warning, bold: true, children: TOOL_STATUS.CANCELED }) : /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(Text, { color: theme.status.error, children: TOOL_STATUS.ERROR });
+          const statusSymbol = item.status === "running" /* RUNNING */ ? /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(build_default, { type: "dots" }) : item.status === "completed" /* COMPLETED */ ? /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(Text, { color: theme.status.success, children: TOOL_STATUS.SUCCESS }) : item.status === "cancelled" /* CANCELLED */ ? /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(Text, { color: theme.status.warning, bold: true, children: TOOL_STATUS.CANCELED }) : /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(Text, { color: theme.status.error, children: TOOL_STATUS.ERROR });
           const formattedArgs = item.description || formatToolArgs(item.args);
           const displayArgs = formattedArgs.length > 60 ? formattedArgs.slice(0, 60) + "..." : formattedArgs;
           return /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(Box_default, { flexDirection: "row", children: [
@@ -5150,7 +5131,7 @@ var SubagentProgressDisplay = ({ progress, terminalWidth, historyOverrides }) =>
                 {
                   bold: true,
                   color: theme.text.primary,
-                  strikethrough: item.status === SubagentState.CANCELLED,
+                  strikethrough: item.status === "cancelled" /* CANCELLED */,
                   children: item.displayName || item.content
                 }
               ),
@@ -5159,7 +5140,7 @@ var SubagentProgressDisplay = ({ progress, terminalWidth, historyOverrides }) =>
                 {
                   color: theme.text.secondary,
                   wrap: "truncate",
-                  strikethrough: item.status === SubagentState.CANCELLED,
+                  strikethrough: item.status === "cancelled" /* CANCELLED */,
                   children: displayArgs
                 }
               ) })
@@ -5179,7 +5160,7 @@ var SubagentProgressDisplay = ({ progress, terminalWidth, historyOverrides }) =>
         MarkdownDisplay,
         {
           text: safeJsonToMarkdown(progress.result),
-          isPending: progress.state !== SubagentState.COMPLETED,
+          isPending: progress.state !== "completed" /* COMPLETED */,
           terminalWidth
         }
       )
@@ -5534,7 +5515,7 @@ var ToolActionsProvider = (props) => {
       }
       const details = tool.confirmationDetails;
       if (details?.type === "edit" && isDiffingEnabled && "filePath" in details) {
-        const cliOutcome = outcome === ToolConfirmationOutcome.Cancel ? "rejected" : "accepted";
+        const cliOutcome = outcome === "cancel" /* Cancel */ ? "rejected" : "accepted";
         if (ideClient) {
           void ideClient.resolveDiffFromCli(details.filePath, cliOutcome)?.catch((error) => {
             debugLogger.error(
@@ -5546,9 +5527,9 @@ var ToolActionsProvider = (props) => {
       }
       if (tool.correlationId) {
         await config.getMessageBus().publish({
-          type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+          type: "tool-confirmation-response" /* TOOL_CONFIRMATION_RESPONSE */,
           correlationId: tool.correlationId,
-          confirmed: outcome !== ToolConfirmationOutcome.Cancel,
+          confirmed: outcome !== "cancel" /* Cancel */,
           requiresUserConfirmation: false,
           outcome,
           payload
@@ -5567,7 +5548,7 @@ var ToolActionsProvider = (props) => {
   );
   const cancel = (0, import_react10.useCallback)(
     async (callId) => {
-      await confirm(callId, ToolConfirmationOutcome.Cancel);
+      await confirm(callId, "cancel" /* Cancel */);
     },
     [confirm]
   );
@@ -5688,7 +5669,7 @@ var ToolMessage = ({
         paddingX: 1,
         flexDirection: "column",
         children: [
-          status === CoreToolCallStatus.Executing && progress !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+          status === "executing" /* Executing */ && progress !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
             McpProgressIndicator,
             {
               progress,
@@ -5705,8 +5686,8 @@ var ToolMessage = ({
               terminalWidth: safeTerminalWidth,
               renderOutputAsMarkdown,
               hasFocus: isThisShellFocused2,
-              maxLines: kind === Kind.Agent && availableTerminalHeight !== void 0 ? SUBAGENT_MAX_LINES : void 0,
-              overflowDirection: kind === Kind.Agent ? "bottom" : "top"
+              maxLines: kind === "agent" /* Agent */ && availableTerminalHeight !== void 0 ? SUBAGENT_MAX_LINES : void 0,
+              overflowDirection: kind === "agent" /* Agent */ ? "bottom" : "top"
             }
           ),
           isThisShellFocused2 && config && /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(Box_default, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
@@ -6022,7 +6003,7 @@ function getInitialTrustState(settings, cwd5, isCurrentWorkspace) {
     settings.merged,
     process3.cwd()
   );
-  const isInheritedTrust = isTrusted && (!explicitTrustLevel || explicitTrustLevel === TrustLevel.DO_NOT_TRUST);
+  const isInheritedTrust = isTrusted && (!explicitTrustLevel || explicitTrustLevel === "DO_NOT_TRUST" /* DO_NOT_TRUST */);
   return {
     currentTrustLevel: explicitTrustLevel,
     isInheritedTrustFromParent: !!(source === "file" && isInheritedTrust),
@@ -6067,7 +6048,7 @@ var usePermissionsModifyTrust = (onExit, addItem, targetDirectory) => {
         process3.cwd(),
         newConfig
       );
-      if (trustLevel === TrustLevel.DO_NOT_TRUST && isTrusted) {
+      if (trustLevel === "DO_NOT_TRUST" /* DO_NOT_TRUST */ && isTrusted) {
         let message = "Note: This folder is still trusted because the connected IDE workspace is trusted.";
         if (source === "file") {
           message = "Note: This folder is still trusted because a parent folder is trusted.";
@@ -6141,18 +6122,18 @@ function PermissionsModifyTrustDialog({
   const TRUST_LEVEL_ITEMS = [
     {
       label: `Trust this folder (${dirName})`,
-      value: TrustLevel.TRUST_FOLDER,
-      key: TrustLevel.TRUST_FOLDER
+      value: "TRUST_FOLDER" /* TRUST_FOLDER */,
+      key: "TRUST_FOLDER" /* TRUST_FOLDER */
     },
     {
       label: `Trust parent folder (${parentFolder})`,
-      value: TrustLevel.TRUST_PARENT,
-      key: TrustLevel.TRUST_PARENT
+      value: "TRUST_PARENT" /* TRUST_PARENT */,
+      key: "TRUST_PARENT" /* TRUST_PARENT */
     },
     {
       label: "Don't trust",
-      value: TrustLevel.DO_NOT_TRUST,
-      key: TrustLevel.DO_NOT_TRUST
+      value: "DO_NOT_TRUST" /* DO_NOT_TRUST */,
+      key: "DO_NOT_TRUST" /* DO_NOT_TRUST */
     }
   ];
   const {
@@ -6393,7 +6374,7 @@ var ShellToolMessage = ({
     maxLinesLimit: maxLines
   });
   import_react15.default.useEffect(() => {
-    const isExecuting = status === CoreToolCallStatus.Executing;
+    const isExecuting = status === "executing" /* Executing */;
     if (isExecuting && ptyId) {
       try {
         const childWidth = safeTerminalWidth - 4;
@@ -6607,13 +6588,13 @@ var SubagentGroupDisplay = ({
     const singleAgent = toolCalls[0].resultDisplay;
     if (isSubagentProgress(singleAgent)) {
       switch (singleAgent.state) {
-        case SubagentState.COMPLETED:
+        case "completed" /* COMPLETED */:
           headerText = "Agent Completed";
           break;
-        case SubagentState.CANCELLED:
+        case "cancelled" /* CANCELLED */:
           headerText = "Agent Cancelled";
           break;
-        case SubagentState.ERROR:
+        case "error" /* ERROR */:
           headerText = "Agent Error";
           break;
         default:
@@ -6629,8 +6610,8 @@ var SubagentGroupDisplay = ({
     for (const tc of toolCalls) {
       const progress = tc.resultDisplay;
       if (isSubagentProgress(progress)) {
-        if (progress.state === SubagentState.COMPLETED) completedCount++;
-        else if (progress.state === SubagentState.RUNNING) runningCount++;
+        if (progress.state === "completed" /* COMPLETED */) completedCount++;
+        else if (progress.state === "running" /* RUNNING */) runningCount++;
       } else {
         runningCount++;
       }
@@ -6709,7 +6690,7 @@ var SubagentGroupDisplay = ({
           if (!isExpanded) {
             let content = "Starting...";
             let formattedArgs;
-            if (progress.state === SubagentState.COMPLETED) {
+            if (progress.state === "completed" /* COMPLETED */) {
               if (progress.terminateReason && progress.terminateReason !== "GOAL") {
                 content = `Finished Early (${progress.terminateReason})`;
               } else {
@@ -6723,17 +6704,17 @@ var SubagentGroupDisplay = ({
                 formattedArgs = formatToolArgs(lastActivity.args);
               }
             }
-            const displayArgs = progress.state === SubagentState.COMPLETED ? "" : formattedArgs;
+            const displayArgs = progress.state === "completed" /* COMPLETED */ ? "" : formattedArgs;
             const renderStatusIcon = () => {
-              const state = progress.state ?? SubagentState.RUNNING;
+              const state = progress.state ?? "running" /* RUNNING */;
               switch (state) {
-                case SubagentState.RUNNING:
+                case "running" /* RUNNING */:
                   return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.primary, children: "!" });
-                case SubagentState.COMPLETED:
+                case "completed" /* COMPLETED */:
                   return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.status.success, children: "\u2713" });
-                case SubagentState.CANCELLED:
+                case "cancelled" /* CANCELLED */:
                   return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.status.warning, children: "\u2139" });
-                case SubagentState.ERROR:
+                case "error" /* ERROR */:
                   return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.status.error, children: "\u2717" });
                 default:
                   return checkExhaustive(state);
@@ -6786,22 +6767,22 @@ var hasPayload = (res) => {
 function getFileOpData(diff, status, resultDisplay, terminalWidth, availableTerminalHeight, isClickable) {
   const added = (diff.diffStat?.model_added_lines ?? 0) + (diff.diffStat?.user_added_lines ?? 0);
   const removed = (diff.diffStat?.model_removed_lines ?? 0) + (diff.diffStat?.user_removed_lines ?? 0);
-  const isAcceptedOrConfirming = status === CoreToolCallStatus.Success || status === CoreToolCallStatus.Executing || status === CoreToolCallStatus.AwaitingApproval;
+  const isAcceptedOrConfirming = status === "success" /* Success */ || status === "executing" /* Executing */ || status === "awaiting_approval" /* AwaitingApproval */;
   const addColor = isAcceptedOrConfirming ? theme.status.success : theme.text.secondary;
   const removeColor = isAcceptedOrConfirming ? theme.status.error : theme.text.secondary;
   const showDiffStat = !!diff.diffStat;
   const description = /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Box_default, { flexDirection: "row", children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Text, { color: theme.text.secondary, wrap: "truncate-end", children: diff.fileName }) });
   let resultSummary = "";
   let resultColor = theme.text.secondary;
-  if (status === CoreToolCallStatus.AwaitingApproval) {
+  if (status === "awaiting_approval" /* AwaitingApproval */) {
     resultSummary = "Confirming";
-  } else if (status === CoreToolCallStatus.Success || status === CoreToolCallStatus.Executing) {
+  } else if (status === "success" /* Success */ || status === "executing" /* Executing */) {
     resultSummary = "Accepted";
     resultColor = theme.text.accent;
-  } else if (status === CoreToolCallStatus.Cancelled) {
+  } else if (status === "cancelled" /* Cancelled */) {
     resultSummary = "Rejected";
     resultColor = theme.status.error;
-  } else if (status === CoreToolCallStatus.Error) {
+  } else if (status === "error" /* Error */) {
     resultSummary = typeof resultDisplay === "string" ? resultDisplay : "Failed";
     resultColor = theme.status.error;
   }
@@ -6832,7 +6813,7 @@ function getFileOpData(diff, status, resultDisplay, terminalWidth, availableTerm
       filename: diff.fileName,
       terminalWidth: Math.max(0, (terminalWidth || 0) - PAYLOAD_MARGIN_LEFT),
       availableTerminalHeight,
-      disableColor: status === CoreToolCallStatus.Cancelled
+      disableColor: status === "cancelled" /* Cancelled */
     }
   );
   return { description, summary, payload };
@@ -6960,10 +6941,10 @@ var DenseToolMessage = (props) => {
     if (isGrepResult(resultDisplay)) {
       return getGenericSuccessData(resultDisplay, originalDescription);
     }
-    if (status === CoreToolCallStatus.Success && resultDisplay) {
+    if (status === "success" /* Success */ && resultDisplay) {
       return getGenericSuccessData(resultDisplay, originalDescription);
     }
-    if (status === CoreToolCallStatus.Error) {
+    if (status === "error" /* Error */) {
       const text = typeof resultDisplay === "string" ? resultDisplay.replace(/\n/g, " ") : "Failed";
       const errorSummary = /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(Text, { color: theme.status.error, wrap: "truncate-end", children: [
         "\u2192 ",
@@ -7004,7 +6985,7 @@ var DenseToolMessage = (props) => {
         language: fileExtension,
         maxWidth: Math.max(0, (terminalWidth || 0) - PAYLOAD_MARGIN_LEFT),
         settings,
-        disableColor: status === CoreToolCallStatus.Cancelled,
+        disableColor: status === "cancelled" /* Cancelled */,
         returnLines: true
       });
     } else {
@@ -7012,7 +6993,7 @@ var DenseToolMessage = (props) => {
         parsedLines,
         filename: diff.fileName,
         terminalWidth: Math.max(0, (terminalWidth || 0) - PAYLOAD_MARGIN_LEFT),
-        disableColor: status === CoreToolCallStatus.Cancelled
+        disableColor: status === "cancelled" /* Cancelled */
       });
     }
   }, [diff, isExpanded, isAlternateBuffer, terminalWidth, settings, status]);
@@ -7149,7 +7130,7 @@ function isToolExecuting(pendingHistoryItems) {
   return pendingHistoryItems.some((item) => {
     if (item && item.type === "tool_group") {
       return item.tools.some(
-        (tool) => CoreToolCallStatus.Executing === tool.status
+        (tool) => "executing" /* Executing */ === tool.status
       );
     }
     return false;
@@ -7158,7 +7139,7 @@ function isToolExecuting(pendingHistoryItems) {
 function isToolAwaitingConfirmation(pendingHistoryItems) {
   return pendingHistoryItems.filter((item) => item.type === "tool_group").some(
     (item) => item.tools.some(
-      (tool) => CoreToolCallStatus.AwaitingApproval === tool.status
+      (tool) => "awaiting_approval" /* AwaitingApproval */ === tool.status
     )
   );
 }
@@ -7246,7 +7227,7 @@ var ToolGroupMessage = ({
   const groupedTools = (0, import_react19.useMemo)(() => {
     const groups = [];
     for (const tool of visibleToolCalls) {
-      if (tool.kind === Kind.Agent) {
+      if (tool.kind === "agent" /* Agent */) {
         const lastGroup = groups[groups.length - 1];
         if (Array.isArray(lastGroup)) {
           lastGroup.push(tool);
@@ -7301,7 +7282,7 @@ var ToolGroupMessage = ({
   }, [groupedTools, isCompactModeEnabled, borderTopOverride]);
   let countToolCallsWithResults = 0;
   for (const tool of visibleToolCalls) {
-    if (tool.kind !== Kind.Agent) {
+    if (tool.kind !== "agent" /* Agent */) {
       if (isCompactTool(tool, isCompactModeEnabled)) {
         if (hasDensePayload(tool)) {
           countToolCallsWithResults++;
@@ -7492,7 +7473,7 @@ var ToolGroupDisplay = ({
   }
   const { tools, borderColor, borderDimColor, borderTop, borderBottom } = item;
   const visibleTools = tools.filter(
-    (t) => t.status !== CoreToolCallStatus.AwaitingApproval
+    (t) => t.status !== "awaiting_approval" /* AwaitingApproval */
   );
   const noticeTools = visibleTools.filter((t) => t.format === "notice");
   const otherTools = visibleTools.filter(
@@ -7694,18 +7675,18 @@ function CompressionMessage({
       return "Compressing chat history";
     }
     switch (compressionStatus) {
-      case CompressionStatus.COMPRESSED:
+      case 1 /* COMPRESSED */:
         return `Chat history compressed from ${originalTokens} to ${newTokens} tokens.`;
-      case CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT:
+      case 2 /* COMPRESSION_FAILED_INFLATED_TOKEN_COUNT */:
         if (originalTokens < 5e4) {
           return "Compression was not beneficial for this history size.";
         }
         return "Chat history compression did not reduce size. This may indicate issues with the compression prompt.";
-      case CompressionStatus.COMPRESSION_FAILED_TOKEN_COUNT_ERROR:
+      case 3 /* COMPRESSION_FAILED_TOKEN_COUNT_ERROR */:
         return "Could not compress chat history due to a token counting error.";
-      case CompressionStatus.COMPRESSION_FAILED_EMPTY_SUMMARY:
+      case 4 /* COMPRESSION_FAILED_EMPTY_SUMMARY */:
         return "Chat history compression failed: the model returned an empty summary.";
-      case CompressionStatus.NOOP:
+      case 5 /* NOOP */:
         return "Nothing to compress.";
       default:
         return "";
@@ -8143,8 +8124,8 @@ var ModelUsageTable = ({ models }) => {
       );
       roleEntries.sort(([a], [b]) => {
         if (a === b) return 0;
-        if (a === LlmRole.MAIN) return -1;
-        if (b === LlmRole.MAIN) return 1;
+        if (a === "main" /* MAIN */) return -1;
+        if (b === "main" /* MAIN */) return 1;
         return a.localeCompare(b);
       });
       roleEntries.forEach(([role, roleMetrics]) => {
@@ -8475,8 +8456,8 @@ var ModelStatsDisplay = ({
     return validRoles.includes(role);
   }).sort((a, b) => {
     if (a === b) return 0;
-    if (a === LlmRole.MAIN) return -1;
-    if (b === LlmRole.MAIN) return 1;
+    if (a === "main" /* MAIN */) return -1;
+    if (b === "main" /* MAIN */) return 1;
     return a.localeCompare(b);
   });
   const createRow = (metric, getValue, options = {}) => {
@@ -9267,7 +9248,7 @@ var McpStatus = ({
       );
       const originalStatus = serverStatus(serverName);
       const hasCachedItems = serverTools.length > 0 || serverPrompts.length > 0 || serverResources.length > 0;
-      const status = originalStatus === MCPServerStatus.DISCONNECTED && hasCachedItems ? MCPServerStatus.CONNECTED : originalStatus;
+      const status = originalStatus === "disconnected" /* DISCONNECTED */ && hasCachedItems ? "connected" /* CONNECTED */ : originalStatus;
       let statusIndicator = "";
       let statusText = "";
       let statusColor = theme.text.primary;
@@ -9279,17 +9260,17 @@ var McpStatus = ({
         statusColor = theme.text.secondary;
       } else {
         switch (status) {
-          case MCPServerStatus.CONNECTED:
+          case "connected" /* CONNECTED */:
             statusIndicator = "\u{1F7E2}";
             statusText = "Ready";
             statusColor = theme.status.success;
             break;
-          case MCPServerStatus.CONNECTING:
+          case "connecting" /* CONNECTING */:
             statusIndicator = "\u{1F504}";
             statusText = "Starting... (first startup may take longer)";
             statusColor = theme.status.warning;
             break;
-          case MCPServerStatus.DISCONNECTED:
+          case "disconnected" /* DISCONNECTED */:
           default:
             statusIndicator = "\u{1F534}";
             statusText = "Disconnected";
@@ -9337,12 +9318,12 @@ var McpStatus = ({
           /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { children: [
             " - ",
             statusText,
-            status === MCPServerStatus.CONNECTED && parts.length > 0 && ` (${parts.join(", ")})`
+            status === "connected" /* CONNECTED */ && parts.length > 0 && ` (${parts.join(", ")})`
           ] }),
           authStatusNode
         ] }),
-        status === MCPServerStatus.CONNECTING && /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { children: " (tools and prompts will appear when ready)" }),
-        status === MCPServerStatus.DISCONNECTED && toolCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { children: [
+        status === "connecting" /* CONNECTING */ && /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { children: " (tools and prompts will appear when ready)" }),
+        status === "disconnected" /* DISCONNECTED */ && toolCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { children: [
           " (",
           toolCount,
           " tools cached)"
@@ -9903,7 +9884,7 @@ var Notifications = () => {
     if (dismissed) return [];
     const counts = persistentState.get("startupWarningCounts") || {};
     return startupWarnings.filter((w) => {
-      if (w.priority === WarningPriority.Low) {
+      if (w.priority === "low" /* Low */) {
         const count = counts[w.id] || 0;
         return count < MAX_STARTUP_WARNING_SHOW_COUNT;
       }
@@ -9916,7 +9897,7 @@ var Notifications = () => {
       const counts = { ...persistentState.get("startupWarningCounts") || {} };
       let changed = false;
       visibleWarnings.forEach((w) => {
-        if (w.priority === WarningPriority.Low) {
+        if (w.priority === "low" /* Low */) {
           counts[w.id] = (counts[w.id] || 0) + 1;
           changed = true;
         }
@@ -10023,7 +10004,7 @@ var UserIdentity = ({ config }) => {
   }
   return /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(Box_default, { flexDirection: "column", children: [
     /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(Box_default, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Text, { color: theme.text.primary, wrap: "truncate-end", children: authType === AuthType.LOGIN_WITH_GOOGLE ? /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(Text, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Text, { color: theme.text.primary, wrap: "truncate-end", children: authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ ? /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(Text, { children: [
         /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(Text, { bold: true, children: [
           "Signed in with Google",
           email ? ":" : ""
@@ -10266,7 +10247,7 @@ var import_react30 = __toESM(require_react(), 1);
 function getConfirmingToolState(pendingHistoryItems) {
   const allPendingTools = getAllToolCalls(pendingHistoryItems);
   const confirmingTools = allPendingTools.filter(
-    (tool) => tool.status === CoreToolCallStatus.AwaitingApproval
+    (tool) => tool.status === "awaiting_approval" /* AwaitingApproval */
   );
   if (confirmingTools.length === 0) {
     return null;
@@ -11576,7 +11557,7 @@ var ExitPlanModeDialog = ({
     {
       questions: [
         {
-          type: QuestionType.CHOICE,
+          type: "choice" /* CHOICE */,
           header: "Approval",
           question: planContent,
           options: [
@@ -11597,9 +11578,9 @@ var ExitPlanModeDialog = ({
       onSubmit: (answers) => {
         const answer = answers["0"];
         if (answer === "Yes, automatically accept edits" /* Auto */) {
-          onApprove(ApprovalMode.AUTO_EDIT);
+          onApprove("autoEdit" /* AUTO_EDIT */);
         } else if (answer === "Yes, manually accept edits" /* Manual */) {
-          onApprove(ApprovalMode.DEFAULT);
+          onApprove("default" /* DEFAULT */);
         } else if (answer) {
           onFeedback(answer);
         }
@@ -11811,7 +11792,7 @@ ${deceptiveUrlWarnings.map(
   );
   (0, import_react35.useEffect)(() => {
     if (isCancelling) {
-      handleConfirm(ToolConfirmationOutcome.Cancel);
+      handleConfirm("cancel" /* Cancel */);
     }
   }, [isCancelling, handleConfirm]);
   const handleSelect = (0, import_react35.useCallback)(
@@ -11824,19 +11805,19 @@ ${deceptiveUrlWarnings.map(
       if (!confirmationDetails.isModifying) {
         options2.push({
           label: "Allow once",
-          value: ToolConfirmationOutcome.ProceedOnce,
+          value: "proceed_once" /* ProceedOnce */,
           key: "Allow once"
         });
         if (isTrustedFolder && !confirmationDetails.isBuildFile) {
           options2.push({
             label: "Allow for this session",
-            value: ToolConfirmationOutcome.ProceedAlways,
+            value: "proceed_always" /* ProceedAlways */,
             key: "Allow for this session"
           });
           if (allowPermanentApproval) {
             options2.push({
               label: "Allow for this file in all future sessions",
-              value: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+              value: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
               key: "Allow for this file in all future sessions"
             });
           }
@@ -11844,45 +11825,45 @@ ${deceptiveUrlWarnings.map(
         if (!config.getIdeMode() || !isDiffingEnabled) {
           options2.push({
             label: "Modify with external editor",
-            value: ToolConfirmationOutcome.ModifyWithEditor,
+            value: "modify_with_editor" /* ModifyWithEditor */,
             key: "Modify with external editor"
           });
         }
         options2.push({
           label: "No, suggest changes (esc)",
-          value: ToolConfirmationOutcome.Cancel,
+          value: "cancel" /* Cancel */,
           key: "No, suggest changes (esc)"
         });
       }
     } else if (confirmationDetails.type === "sandbox_expansion") {
       options2.push({
         label: "Allow once",
-        value: ToolConfirmationOutcome.ProceedOnce,
+        value: "proceed_once" /* ProceedOnce */,
         key: "Allow once"
       });
       if (isTrustedFolder) {
         options2.push({
           label: "Allow for this session",
-          value: ToolConfirmationOutcome.ProceedAlways,
+          value: "proceed_always" /* ProceedAlways */,
           key: "Allow for this session"
         });
         if (allowPermanentApproval) {
           options2.push({
             label: "Allow for all future sessions",
-            value: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+            value: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
             key: "Allow for all future sessions"
           });
         }
       }
       options2.push({
         label: "No, suggest changes (esc)",
-        value: ToolConfirmationOutcome.Cancel,
+        value: "cancel" /* Cancel */,
         key: "No, suggest changes (esc)"
       });
     } else if (confirmationDetails.type === "exec") {
       options2.push({
         label: "Allow once",
-        value: ToolConfirmationOutcome.ProceedOnce,
+        value: "proceed_once" /* ProceedOnce */,
         key: "Allow once"
       });
       const hasUntrustedFlags = confirmationDetails.untrustedFlags && confirmationDetails.untrustedFlags.length > 0;
@@ -11890,75 +11871,75 @@ ${deceptiveUrlWarnings.map(
       if (isTrustedFolder && !hasUntrustedFlags && !hasModifiedBuildFiles) {
         options2.push({
           label: `Allow for this session`,
-          value: ToolConfirmationOutcome.ProceedAlways,
+          value: "proceed_always" /* ProceedAlways */,
           key: `Allow for this session`
         });
         if (allowPermanentApproval) {
           options2.push({
             label: `Allow this command for all future sessions`,
-            value: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+            value: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
             key: `Allow for all future sessions`
           });
         }
       }
       options2.push({
         label: "No, suggest changes (esc)",
-        value: ToolConfirmationOutcome.Cancel,
+        value: "cancel" /* Cancel */,
         key: "No, suggest changes (esc)"
       });
     } else if (confirmationDetails.type === "info") {
       options2.push({
         label: "Allow once",
-        value: ToolConfirmationOutcome.ProceedOnce,
+        value: "proceed_once" /* ProceedOnce */,
         key: "Allow once"
       });
       if (isTrustedFolder) {
         options2.push({
           label: "Allow for this session",
-          value: ToolConfirmationOutcome.ProceedAlways,
+          value: "proceed_always" /* ProceedAlways */,
           key: "Allow for this session"
         });
         if (allowPermanentApproval) {
           options2.push({
             label: "Allow for all future sessions",
-            value: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+            value: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
             key: "Allow for all future sessions"
           });
         }
       }
       options2.push({
         label: "No, suggest changes (esc)",
-        value: ToolConfirmationOutcome.Cancel,
+        value: "cancel" /* Cancel */,
         key: "No, suggest changes (esc)"
       });
     } else if (confirmationDetails.type === "mcp") {
       options2.push({
         label: "Allow once",
-        value: ToolConfirmationOutcome.ProceedOnce,
+        value: "proceed_once" /* ProceedOnce */,
         key: "Allow once"
       });
       if (isTrustedFolder) {
         options2.push({
           label: "Allow tool for this session",
-          value: ToolConfirmationOutcome.ProceedAlwaysTool,
+          value: "proceed_always_tool" /* ProceedAlwaysTool */,
           key: "Allow tool for this session"
         });
         options2.push({
           label: "Allow all server tools for this session",
-          value: ToolConfirmationOutcome.ProceedAlwaysServer,
+          value: "proceed_always_server" /* ProceedAlwaysServer */,
           key: "Allow all server tools for this session"
         });
         if (allowPermanentApproval) {
           options2.push({
             label: "Allow tool for all future sessions",
-            value: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+            value: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
             key: "Allow tool for all future sessions"
           });
         }
       }
       options2.push({
         label: "No, suggest changes (esc)",
-        value: ToolConfirmationOutcome.Cancel,
+        value: "cancel" /* Cancel */,
         key: "No, suggest changes (esc)"
       });
     }
@@ -11999,7 +11980,7 @@ ${deceptiveUrlWarnings.map(
       const containsRedirection = commandsToDisplay.some(
         (cmd) => hasRedirection(cmd)
       );
-      const isAutoEdit = config.getApprovalMode() === ApprovalMode.YOLO || config.getApprovalMode() === ApprovalMode.AUTO_EDIT;
+      const isAutoEdit = config.getApprovalMode() === "yolo" /* YOLO */ || config.getApprovalMode() === "autoEdit" /* AUTO_EDIT */;
       if (containsRedirection && !isAutoEdit) {
         extraInfoLines = 1;
       }
@@ -12026,7 +12007,7 @@ ${deceptiveUrlWarnings.map(
       const isSafeToPersist = confirmationDetails.type === "info" || confirmationDetails.type === "edit" || confirmationDetails.type === "mcp";
       if (isSafeToPersist && settings.merged.security.autoAddToPolicyByDefault) {
         const alwaysAndSaveIndex = options2.findIndex(
-          (o) => o.value === ToolConfirmationOutcome.ProceedAlwaysAndSave
+          (o) => o.value === "proceed_always_and_save" /* ProceedAlwaysAndSave */
         );
         if (alwaysAndSaveIndex !== -1) {
           initialIndex2 = alwaysAndSaveIndex;
@@ -12075,10 +12056,10 @@ Ensure you trust all modifications made to build files before approving executio
         {
           questions: confirmationDetails.questions,
           onSubmit: (answers) => {
-            handleConfirm(ToolConfirmationOutcome.ProceedOnce, { answers });
+            handleConfirm("proceed_once" /* ProceedOnce */, { answers });
           },
           onCancel: () => {
-            handleConfirm(ToolConfirmationOutcome.Cancel);
+            handleConfirm("cancel" /* Cancel */);
           },
           width: safeTerminalWidth,
           availableHeight: bodyHeight
@@ -12099,19 +12080,19 @@ Ensure you trust all modifications made to build files before approving executio
           planPath: confirmationDetails.planPath,
           getPreferredEditor,
           onApprove: (approvalMode) => {
-            handleConfirm(ToolConfirmationOutcome.ProceedOnce, {
+            handleConfirm("proceed_once" /* ProceedOnce */, {
               approved: true,
               approvalMode
             });
           },
           onFeedback: (feedback) => {
-            handleConfirm(ToolConfirmationOutcome.ProceedOnce, {
+            handleConfirm("proceed_once" /* ProceedOnce */, {
               approved: false,
               feedback
             });
           },
           onCancel: () => {
-            handleConfirm(ToolConfirmationOutcome.Cancel);
+            handleConfirm("cancel" /* Cancel */);
           },
           width: safeTerminalWidth,
           availableHeight: bodyHeight
@@ -12221,7 +12202,7 @@ Ensure you trust all modifications made to build files before approving executio
       const containsRedirection = commandsToDisplay.some(
         (cmd) => hasRedirection(cmd)
       );
-      const isAutoEdit = config.getApprovalMode() === ApprovalMode.YOLO || config.getApprovalMode() === ApprovalMode.AUTO_EDIT;
+      const isAutoEdit = config.getApprovalMode() === "yolo" /* YOLO */ || config.getApprovalMode() === "autoEdit" /* AUTO_EDIT */;
       let warnings = null;
       if (containsRedirection && !isAutoEdit) {
         const tipText = `To auto-accept, press ${formatCommand("app.cycleApprovalMode" /* CYCLE_APPROVAL_MODE */)}`;
@@ -12380,7 +12361,7 @@ Ensure you trust all modifications made to build files before approving executio
   const bodyOverflowDirection = confirmationDetails.type === "mcp" && isMcpToolDetailsExpanded ? "bottom" : "top";
   const renderRadioItem = (0, import_react35.useCallback)(
     (item, { titleColor }) => {
-      if (item.value === ToolConfirmationOutcome.ProceedAlwaysAndSave) {
+      if (item.value === "proceed_always_and_save" /* ProceedAlwaysAndSave */) {
         return /* @__PURE__ */ (0, import_jsx_runtime64.jsxs)(Text, { color: titleColor, wrap: "truncate", children: [
           item.label,
           " ",
@@ -12769,7 +12750,7 @@ var MainContent = () => {
     const hasConfirmationQueue = Boolean(
       showConfirmationQueue && confirmingTool
     );
-    const isVisiblePendingItem = (item) => item.type !== "tool_group" || item.tools.some((t) => t.status !== CoreToolCallStatus.AwaitingApproval);
+    const isVisiblePendingItem = (item) => item.type !== "tool_group" || item.tools.some((t) => t.status !== "awaiting_approval" /* AwaitingApproval */);
     const visiblePendingCount = pendingHistoryItems.filter(isVisiblePendingItem).length;
     const shouldPartitionHeight = !isAlternateBufferOrTerminalBuffer && hasConfirmationQueue && visiblePendingCount > 0;
     const pendingCount = Math.max(1, visiblePendingCount);
@@ -14473,7 +14454,7 @@ async function validateAuthMethodWithSettings(authType, settings) {
   if (settings.merged.security.auth.useExternal) {
     return null;
   }
-  if (authType === AuthType.USE_GEMINI) {
+  if (authType === "gemini-api-key" /* USE_GEMINI */) {
     return null;
   }
   return validateAuthMethod(authType);
@@ -14525,7 +14506,7 @@ var useAuthCommand = (settings, config, initialAuthError = null, initialAccountS
         }
         return;
       }
-      if (authType === AuthType.USE_GEMINI) {
+      if (authType === "gemini-api-key" /* USE_GEMINI */) {
         const key = await reloadApiKey();
         if (!key) {
           setAuthState("awaiting_api_key_input" /* AwaitingApiKeyInput */);
@@ -14608,31 +14589,31 @@ function AuthDialog({
   let items = [
     {
       label: "Sign in with Google",
-      value: AuthType.LOGIN_WITH_GOOGLE,
-      key: AuthType.LOGIN_WITH_GOOGLE
+      value: "oauth-personal" /* LOGIN_WITH_GOOGLE */,
+      key: "oauth-personal" /* LOGIN_WITH_GOOGLE */
     },
     ...process.env["CLOUD_SHELL"] === "true" ? [
       {
         label: "Use Cloud Shell user credentials",
-        value: AuthType.COMPUTE_ADC,
-        key: AuthType.COMPUTE_ADC
+        value: "compute-default-credentials" /* COMPUTE_ADC */,
+        key: "compute-default-credentials" /* COMPUTE_ADC */
       }
     ] : process.env["GEMINI_CLI_USE_COMPUTE_ADC"] === "true" ? [
       {
         label: "Use metadata server application default credentials",
-        value: AuthType.COMPUTE_ADC,
-        key: AuthType.COMPUTE_ADC
+        value: "compute-default-credentials" /* COMPUTE_ADC */,
+        key: "compute-default-credentials" /* COMPUTE_ADC */
       }
     ] : [],
     {
       label: "Use Gemini API Key",
-      value: AuthType.USE_GEMINI,
-      key: AuthType.USE_GEMINI
+      value: "gemini-api-key" /* USE_GEMINI */,
+      key: "gemini-api-key" /* USE_GEMINI */
     },
     {
       label: "Vertex AI",
-      value: AuthType.USE_VERTEX_AI,
-      key: AuthType.USE_VERTEX_AI
+      value: "vertex-ai" /* USE_VERTEX_AI */,
+      key: "vertex-ai" /* USE_VERTEX_AI */
     }
   ];
   if (settings.merged.security.auth.enforcedType) {
@@ -14654,9 +14635,9 @@ function AuthDialog({
       return item.value === defaultAuthType;
     }
     if (process.env["GEMINI_API_KEY"]) {
-      return item.value === AuthType.USE_GEMINI;
+      return item.value === "gemini-api-key" /* USE_GEMINI */;
     }
-    return item.value === AuthType.LOGIN_WITH_GOOGLE;
+    return item.value === "oauth-personal" /* LOGIN_WITH_GOOGLE */;
   });
   if (settings.merged.security.auth.enforcedType) {
     initialAuthIndex = 0;
@@ -14667,14 +14648,14 @@ function AuthDialog({
         return;
       }
       if (authType) {
-        const needsRestart = authType === AuthType.LOGIN_WITH_GOOGLE || authType === AuthType.USE_VERTEX_AI && process.env["CLOUD_SHELL"] === "true";
+        const needsRestart = authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ || authType === "vertex-ai" /* USE_VERTEX_AI */ && process.env["CLOUD_SHELL"] === "true";
         if (needsRestart) {
           setAuthContext({ requiresRestart: true });
         } else {
           setAuthContext({});
         }
         const currentAuthType = settings.merged.security?.auth?.selectedType;
-        if (authType === AuthType.LOGIN_WITH_GOOGLE || currentAuthType === AuthType.LOGIN_WITH_GOOGLE) {
+        if (authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ || currentAuthType === "oauth-personal" /* LOGIN_WITH_GOOGLE */) {
           try {
             await clearCachedCredentialFile();
           } catch (error) {
@@ -14682,13 +14663,13 @@ function AuthDialog({
             onAuthError(
               "Failed to clear cached credentials: " + (error instanceof Error ? error.message : String(error))
             );
-            if (authType === AuthType.LOGIN_WITH_GOOGLE) {
+            if (authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */) {
               return;
             }
           }
         }
         settings.setValue(scope, "security.auth.selectedType", authType);
-        if (authType === AuthType.LOGIN_WITH_GOOGLE && config.isBrowserLaunchSuppressed()) {
+        if (authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ && config.isBrowserLaunchSuppressed()) {
           setExiting(true);
           setTimeout(() => {
             void relaunchApp({ overrideAuthType: authType }).catch((err) => {
@@ -14698,7 +14679,7 @@ function AuthDialog({
           }, 100);
           return;
         }
-        if (authType === AuthType.USE_GEMINI) {
+        if (authType === "gemini-api-key" /* USE_GEMINI */) {
           setAuthState("awaiting_api_key_input" /* AwaitingApiKeyInput */);
           return;
         }
@@ -15510,11 +15491,11 @@ var PrivacyNoticeText = ({
 }) => {
   const authType = config.getContentGeneratorConfig()?.authType;
   switch (authType) {
-    case AuthType.USE_GEMINI:
+    case "gemini-api-key" /* USE_GEMINI */:
       return /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(GeminiPrivacyNotice, { onExit });
-    case AuthType.USE_VERTEX_AI:
+    case "vertex-ai" /* USE_VERTEX_AI */:
       return /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(CloudPaidPrivacyNotice, { onExit });
-    case AuthType.LOGIN_WITH_GOOGLE:
+    case "oauth-personal" /* LOGIN_WITH_GOOGLE */:
     default:
       return /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(CloudFreePrivacyNotice, { config, onExit });
   }
@@ -15574,7 +15555,7 @@ function ProQuotaDialog({
         value: "retry_always",
         key: "retry_always"
       },
-      ...authType === AuthType.LOGIN_WITH_GOOGLE && !isUltra ? [
+      ...authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ && !isUltra ? [
         {
           label: "Upgrade for higher limits",
           value: "upgrade",
@@ -16747,7 +16728,7 @@ function ModelDialog({ onClose }) {
   const useLatestFlash = config?.hasLatestFlashGAAccess?.() ?? false;
   const useLatestFlashLite = config?.hasLatestFlashLiteGAAccess?.() ?? false;
   const selectedAuthType = settings.merged.security.auth.selectedType;
-  const useCustomToolModel = useGemini31 && selectedAuthType === AuthType.USE_GEMINI;
+  const useCustomToolModel = useGemini31 && selectedAuthType === "gemini-api-key" /* USE_GEMINI */;
   const manualModelSelected = (0, import_react53.useMemo)(() => {
     if (config?.getExperimentalDynamicModelConfiguration?.() === true && config.getModelConfigService) {
       const def = config.getModelConfigService().getModelDefinition(preferredModel);
@@ -18075,10 +18056,10 @@ function initializeConsoleStore() {
   globalConsoleMessages = [];
   globalErrorCount = 0;
   notifyListeners();
-  coreEvents.off(CoreEvent.ConsoleLog, handleConsoleLog);
-  coreEvents.off(CoreEvent.Output, handleOutput);
-  coreEvents.on(CoreEvent.ConsoleLog, handleConsoleLog);
-  coreEvents.on(CoreEvent.Output, handleOutput);
+  coreEvents.off("console-log" /* ConsoleLog */, handleConsoleLog);
+  coreEvents.off("output" /* Output */, handleOutput);
+  coreEvents.on("console-log" /* ConsoleLog */, handleConsoleLog);
+  coreEvents.on("output" /* Output */, handleOutput);
 }
 function notifyListeners() {
   for (const listener of listeners) {
@@ -18733,6 +18714,9 @@ function useDebouncedValue(value, delay2 = 200) {
   }, [value, delay2]);
   return debounced;
 }
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
 function useReverseSearchCompletion(buffer, history, reverseSearchActive) {
   const {
     suggestions,
@@ -18762,11 +18746,12 @@ function useReverseSearchCompletion(buffer, history, reverseSearchActive) {
   const searchHistory = (0, import_react63.useCallback)(
     (query, items) => {
       const out = [];
+      const regex = new RegExp(escapeRegExp(query), "iu");
       for (let i = 0; i < items.length; i++) {
         const cmd = items[i];
-        const idx = cmd.toLowerCase().indexOf(query);
-        if (idx !== -1) {
-          out.push({ label: cmd, value: cmd, matchedIndex: idx });
+        const match = regex.exec(cmd);
+        if (match) {
+          out.push({ label: cmd, value: cmd, matchedIndex: match.index });
         }
       }
       return out;
@@ -18781,10 +18766,10 @@ function useReverseSearchCompletion(buffer, history, reverseSearchActive) {
         value: cmd,
         matchedIndex: -1
       }));
-    const query = debouncedQuery.toLowerCase();
-    const canUseCache = prevQueryRef.current && query.startsWith(prevQueryRef.current) && prevMatchesRef.current.length > 0;
+    const lowerQuery = debouncedQuery.toLowerCase();
+    const canUseCache = prevQueryRef.current && lowerQuery.startsWith(prevQueryRef.current) && prevMatchesRef.current.length > 0;
     const source = canUseCache ? prevMatchesRef.current.map((m) => m.value) : history;
-    return searchHistory(query, source);
+    return searchHistory(debouncedQuery, source);
   }, [debouncedQuery, history, reverseSearchActive, searchHistory]);
   (0, import_react63.useEffect)(() => {
     if (!reverseSearchActive) {
@@ -20215,7 +20200,7 @@ function usePromptCompletion({
         { model: "prompt-completion" },
         contents,
         signal,
-        LlmRole.UTILITY_AUTOCOMPLETE
+        "utility_autocomplete" /* UTILITY_AUTOCOMPLETE */
       );
       if (signal.aborted) {
         return;
@@ -22294,9 +22279,9 @@ var InputPrompt = ({
       onSuggestionsVisibilityChange(shouldShowSuggestions);
     }
   }, [shouldShowSuggestions, onSuggestionsVisibilityChange]);
-  const showAutoAcceptStyling = !shellModeActive && approvalMode === ApprovalMode.AUTO_EDIT;
-  const showYoloStyling = !shellModeActive && approvalMode === ApprovalMode.YOLO;
-  const showPlanStyling = !shellModeActive && approvalMode === ApprovalMode.PLAN;
+  const showAutoAcceptStyling = !shellModeActive && approvalMode === "autoEdit" /* AUTO_EDIT */;
+  const showYoloStyling = !shellModeActive && approvalMode === "yolo" /* YOLO */;
+  const showPlanStyling = !shellModeActive && approvalMode === "plan" /* PLAN */;
   let statusColor;
   let statusText = "";
   if (shellModeActive) {
@@ -23130,22 +23115,22 @@ var ApprovalModeIndicator = ({
   const cycleHint = formatCommand("app.cycleApprovalMode" /* CYCLE_APPROVAL_MODE */);
   const yoloHint = formatCommand("app.toggleYolo" /* TOGGLE_YOLO */);
   switch (approvalMode) {
-    case ApprovalMode.AUTO_EDIT:
+    case "autoEdit" /* AUTO_EDIT */:
       textColor = theme.status.warning;
       textContent = "auto-accept edits";
       subText = allowPlanMode ? `${cycleHint} to plan` : `${cycleHint} to manual`;
       break;
-    case ApprovalMode.PLAN:
+    case "plan" /* PLAN */:
       textColor = theme.status.success;
       textContent = "plan";
       subText = `${cycleHint} to manual`;
       break;
-    case ApprovalMode.YOLO:
+    case "yolo" /* YOLO */:
       textColor = theme.status.error;
       textContent = "YOLO";
       subText = yoloHint;
       break;
-    case ApprovalMode.DEFAULT:
+    case "default" /* DEFAULT */:
     default:
       textColor = theme.text.accent;
       textContent = "";
@@ -23193,7 +23178,7 @@ var useComposerStatus = () => {
       (item) => item.type === "tool_group"
     ).some(
       (item) => item.tools.some(
-        (tool) => tool.status === CoreToolCallStatus.AwaitingApproval
+        (tool) => tool.status === "awaiting_approval" /* AwaitingApproval */
       )
     ),
     [uiState.pendingHistoryItems]
@@ -23208,13 +23193,13 @@ var useComposerStatus = () => {
     const hideMinimalModeHintWhileBusy = !uiState.cleanUiDetailsVisible && (showLoadingIndicator || uiState.activeHooks.length > 0);
     if (hideMinimalModeHintWhileBusy) return null;
     switch (showApprovalModeIndicator) {
-      case ApprovalMode.YOLO:
+      case "yolo" /* YOLO */:
         return { text: "YOLO", color: theme.status.error };
-      case ApprovalMode.PLAN:
+      case "plan" /* PLAN */:
         return { text: "plan", color: theme.status.success };
-      case ApprovalMode.AUTO_EDIT:
+      case "autoEdit" /* AUTO_EDIT */:
         return { text: "auto edit", color: theme.status.warning };
-      case ApprovalMode.DEFAULT:
+      case "default" /* DEFAULT */:
       default:
         return null;
     }
@@ -23576,7 +23561,7 @@ var ConfigInitDisplay = ({
       let connected = 0;
       const connecting = [];
       for (const [name, client] of clients.entries()) {
-        if (client.getStatus() === MCPServerStatus.CONNECTED) {
+        if (client.getStatus() === "connected" /* CONNECTED */) {
           connected++;
         } else {
           connecting.push(name);
@@ -23598,9 +23583,9 @@ var ConfigInitDisplay = ({
         );
       }
     };
-    coreEvents.on(CoreEvent.McpClientUpdate, onChange);
+    coreEvents.on("mcp-client-update" /* McpClientUpdate */, onChange);
     return () => {
-      coreEvents.off(CoreEvent.McpClientUpdate, onChange);
+      coreEvents.off("mcp-client-update" /* McpClientUpdate */, onChange);
     };
   }, [initialMessage]);
   return /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)(Text, { children: [
@@ -24321,7 +24306,7 @@ var useExecutionLifecycle = (addItemToHistory, setPendingHistoryItem, onExec, on
           callId,
           name: SHELL_COMMAND_NAME,
           description: rawQuery,
-          status: CoreToolCallStatus.Executing,
+          status: "executing" /* Executing */,
           isClientInitiated: true,
           resultDisplay: "",
           confirmationDetails: void 0
@@ -24462,7 +24447,7 @@ __code=$?; pwd > ${escapedPwdFilePath}; exit $__code`;
             mainContent = result.output.trim() || "(Command produced no output)";
           }
           let finalOutput = result.ansiOutput && result.ansiOutput.length > 0 ? result.ansiOutput : mainContent;
-          let finalStatus = CoreToolCallStatus.Success;
+          let finalStatus = "success" /* Success */;
           const prependToAnsiOutput = (output, text) => {
             const newLines = text.split("\n").map((line) => [
               {
@@ -24481,20 +24466,20 @@ __code=$?; pwd > ${escapedPwdFilePath}; exit $__code`;
           };
           let prefix = "";
           if (result.error) {
-            finalStatus = CoreToolCallStatus.Error;
+            finalStatus = "error" /* Error */;
             prefix = result.error.message;
           } else if (result.aborted) {
-            finalStatus = CoreToolCallStatus.Cancelled;
+            finalStatus = "cancelled" /* Cancelled */;
             prefix = "Command was cancelled.";
           } else if (result.backgrounded) {
-            finalStatus = CoreToolCallStatus.Success;
+            finalStatus = "success" /* Success */;
             finalOutput = `Command moved to background (PID: ${result.pid}). Output hidden. Press Ctrl+B to view.`;
             mainContent = finalOutput;
           } else if (result.signal) {
-            finalStatus = CoreToolCallStatus.Error;
+            finalStatus = "error" /* Error */;
             prefix = `Command terminated by signal: ${result.signal}.`;
           } else if (result.exitCode !== 0) {
-            finalStatus = CoreToolCallStatus.Error;
+            finalStatus = "error" /* Error */;
             prefix = `Command exited with code ${result.exitCode}.`;
           }
           if (prefix) {
@@ -24520,7 +24505,7 @@ ${mainContent}`;
             status: finalStatus,
             resultDisplay: finalOutput
           };
-          if (finalStatus !== CoreToolCallStatus.Cancelled) {
+          if (finalStatus !== "cancelled" /* Cancelled */) {
             addItemToHistory(
               {
                 type: "tool_group",
@@ -25530,13 +25515,13 @@ function useQuotaAndFallback({
             error.retryDelayMs ? `Access resets at ${getResetTimeMessage(error.retryDelayMs)}.` : null,
             `/stats model for usage details`,
             `/model to switch models.`,
-            contentGeneratorConfig?.authType === AuthType.LOGIN_WITH_GOOGLE ? `/auth to switch to API key.` : null
+            contentGeneratorConfig?.authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ ? `/auth to switch to API key.` : null
           ].filter(Boolean);
           message = messageLines.join("\n");
         }
       } else if (error instanceof ModelNotFoundError) {
         isModelNotFoundError = true;
-        if (contentGeneratorConfig?.authType === AuthType.USE_VERTEX_AI && VALID_GEMINI_MODELS.has(failedModel)) {
+        if (contentGeneratorConfig?.authType === "vertex-ai" /* USE_VERTEX_AI */ && VALID_GEMINI_MODELS.has(failedModel)) {
           const location = process.env["GOOGLE_CLOUD_LOCATION"] || "your configured region";
           const messageLines = [
             `Model "${failedModel}" is not available in region "${location}".`,
@@ -25730,7 +25715,7 @@ var useEditorSettings = (loadedSettings, setEditorError, addItem) => {
         );
         setEditorError(null);
         setIsEditorDialogOpen(false);
-        coreEvents.emit(CoreEvent.EditorSelected, { editor: editorType });
+        coreEvents.emit("editor-selected" /* EditorSelected */, { editor: editorType });
       } catch (error) {
         setEditorError(`Failed to set editor preference: ${error}`);
       }
@@ -25739,7 +25724,7 @@ var useEditorSettings = (loadedSettings, setEditorError, addItem) => {
   );
   const exitEditorDialog = (0, import_react89.useCallback)(() => {
     setIsEditorDialogOpen(false);
-    coreEvents.emit(CoreEvent.EditorSelected, { editor: void 0 });
+    coreEvents.emit("editor-selected" /* EditorSelected */, { editor: void 0 });
   }, []);
   return {
     isEditorDialogOpen,
@@ -26116,7 +26101,7 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
         canonicalPath: resolvedCommandPath
       } = parseSlashCommand(trimmed, commands);
       if (!commandToExecute) {
-        const isMcpLoading = config?.getMcpClientManager()?.getDiscoveryState() === MCPDiscoveryState.IN_PROGRESS;
+        const isMcpLoading = config?.getMcpClientManager()?.getDiscoveryState() === "in_progress" /* IN_PROGRESS */;
         if (isMcpLoading) {
           setIsProcessing(true);
           if (addToHistory) {
@@ -26296,7 +26281,7 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
                       onConfirm: async (resolvedOutcome) => {
                         resolve3({
                           outcome: resolvedOutcome,
-                          approvedCommands: resolvedOutcome === ToolConfirmationOutcome.Cancel ? [] : result.commandsToConfirm
+                          approvedCommands: resolvedOutcome === "cancel" /* Cancel */ ? [] : result.commandsToConfirm
                         });
                       }
                     };
@@ -26304,7 +26289,7 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
                       callId,
                       name: "Expansion",
                       description: "Command expansion needs shell access",
-                      status: CoreToolCallStatus.AwaitingApproval,
+                      status: "awaiting_approval" /* AwaitingApproval */,
                       isClientInitiated: true,
                       resultDisplay: void 0,
                       confirmationDetails
@@ -26315,7 +26300,7 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
                     });
                   });
                   setPendingItem(null);
-                  if (outcome === ToolConfirmationOutcome.Cancel || !approvedCommands || approvedCommands.length === 0) {
+                  if (outcome === "cancel" /* Cancel */ || !approvedCommands || approvedCommands.length === 0) {
                     addItem(
                       {
                         type: "info" /* INFO */,
@@ -26325,7 +26310,7 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
                     );
                     return { type: "handled" };
                   }
-                  if (outcome === ToolConfirmationOutcome.ProceedAlways) {
+                  if (outcome === "proceed_always" /* ProceedAlways */) {
                     setSessionShellAllowlist(
                       (prev) => /* @__PURE__ */ new Set([...prev, ...approvedCommands])
                     );
@@ -26709,7 +26694,7 @@ var useLogger = (config) => {
 };
 
 // packages/cli/src/ui/hooks/useGeminiStream.ts
-var import_react97 = __toESM(require_react(), 1);
+var import_react99 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/utils/markdownUtilities.ts
 var isIndexInsideCodeBlock = (content, indexToTest) => {
@@ -26801,7 +26786,7 @@ function mapToDisplay(toolOrTools, options = {}) {
     let description;
     let renderOutputAsMarkdown = false;
     const displayName = call.tool?.displayName ?? call.request.name;
-    if (call.status === CoreToolCallStatus.Error) {
+    if (call.status === "error" /* Error */) {
       description = JSON.stringify(call.request.args);
     } else {
       description = call.invocation.getDescription();
@@ -26824,27 +26809,27 @@ function mapToDisplay(toolOrTools, options = {}) {
     let progress = void 0;
     let progressTotal = void 0;
     switch (call.status) {
-      case CoreToolCallStatus.Success:
+      case "success" /* Success */:
         resultDisplay = call.response.resultDisplay;
         outputFile = call.response.outputFile;
         break;
-      case CoreToolCallStatus.Error:
-      case CoreToolCallStatus.Cancelled:
+      case "error" /* Error */:
+      case "cancelled" /* Cancelled */:
         resultDisplay = call.response.resultDisplay;
         break;
-      case CoreToolCallStatus.AwaitingApproval:
+      case "awaiting_approval" /* AwaitingApproval */:
         correlationId = call.correlationId;
         confirmationDetails = call.confirmationDetails;
         break;
-      case CoreToolCallStatus.Executing:
+      case "executing" /* Executing */:
         resultDisplay = call.liveOutput;
         ptyId = call.pid;
         progressMessage = call.progressMessage;
         progress = call.progress;
         progressTotal = call.progressTotal;
         break;
-      case CoreToolCallStatus.Scheduled:
-      case CoreToolCallStatus.Validating:
+      case "scheduled" /* Scheduled */:
+      case "validating" /* Validating */:
         break;
       default: {
         const exhaustiveCheck = call;
@@ -26915,7 +26900,7 @@ function useToolScheduler(onComplete, config, getPreferredEditor) {
     const handler = (event) => {
       const isRoot = event.schedulerId === ROOT_SCHEDULER_ID;
       const hasExecuting = event.toolCalls.some(
-        (tc) => tc.status === CoreToolCallStatus.Executing || (tc.status === CoreToolCallStatus.Success || tc.status === CoreToolCallStatus.Error) && "tailToolCallRequest" in tc && tc.tailToolCallRequest != null
+        (tc) => tc.status === "executing" /* Executing */ || (tc.status === "success" /* Success */ || tc.status === "error" /* Error */) && "tailToolCallRequest" in tc && tc.tailToolCallRequest != null
       );
       if (hasExecuting) {
         setLastToolOutputTime(Date.now());
@@ -26924,7 +26909,7 @@ function useToolScheduler(onComplete, config, getPreferredEditor) {
         const prevCalls = prev[event.schedulerId] ?? [];
         const prevCallIds = new Set(prevCalls.map((tc) => tc.request.callId));
         const filteredToolCalls = isRoot ? event.toolCalls : event.toolCalls.filter(
-          (tc) => tc.status === CoreToolCallStatus.AwaitingApproval || prevCallIds.has(tc.request.callId)
+          (tc) => tc.status === "awaiting_approval" /* AwaitingApproval */ || prevCallIds.has(tc.request.callId)
         );
         if (!isRoot && filteredToolCalls.length === 0 && prevCalls.length === 0) {
           return prev;
@@ -26936,9 +26921,9 @@ function useToolScheduler(onComplete, config, getPreferredEditor) {
         };
       });
     };
-    messageBus.subscribe(MessageBusType.TOOL_CALLS_UPDATE, handler);
+    messageBus.subscribe("tool-calls-update" /* TOOL_CALLS_UPDATE */, handler);
     return () => {
-      messageBus.unsubscribe(MessageBusType.TOOL_CALLS_UPDATE, handler);
+      messageBus.unsubscribe("tool-calls-update" /* TOOL_CALLS_UPDATE */, handler);
     };
   }, [messageBus, internalAdaptToolCalls]);
   (0, import_react96.useEffect)(() => {
@@ -26960,9 +26945,9 @@ function useToolScheduler(onComplete, config, getPreferredEditor) {
         };
       });
     };
-    messageBus.subscribe(MessageBusType.SUBAGENT_ACTIVITY, handler);
+    messageBus.subscribe("subagent-activity" /* SUBAGENT_ACTIVITY */, handler);
     return () => {
-      messageBus.unsubscribe(MessageBusType.SUBAGENT_ACTIVITY, handler);
+      messageBus.unsubscribe("subagent-activity" /* SUBAGENT_ACTIVITY */, handler);
     };
   }, [messageBus]);
   const schedule = (0, import_react96.useCallback)(
@@ -27061,8 +27046,8 @@ function adaptToolCalls(coreCalls, prevTracked) {
     const prev = prevMap.get(coreCall.request.callId);
     const responseSubmittedToGemini = prev?.responseSubmittedToGemini ?? false;
     let status = coreCall.status;
-    if ((status === CoreToolCallStatus.Success || status === CoreToolCallStatus.Error) && "tailToolCallRequest" in coreCall && coreCall.tailToolCallRequest != null) {
-      status = CoreToolCallStatus.Executing;
+    if ((status === "success" /* Success */ || status === "error" /* Error */) && "tailToolCallRequest" in coreCall && coreCall.tailToolCallRequest != null) {
+      status = "executing" /* Executing */;
     }
     return {
       ...coreCall,
@@ -27075,6 +27060,638 @@ function adaptToolCalls(coreCalls, prevTracked) {
 // packages/cli/src/ui/hooks/useGeminiStream.ts
 import { promises as fs6 } from "node:fs";
 import path13 from "node:path";
+
+// packages/cli/src/ui/hooks/useAgentStream.ts
+var import_react98 = __toESM(require_react(), 1);
+
+// packages/cli/src/ui/hooks/useTurnActivityMonitor.ts
+var import_react97 = __toESM(require_react(), 1);
+var useTurnActivityMonitor = (streamingState, activePtyId, pendingToolCalls = []) => {
+  const [operationStartTime, setOperationStartTime] = (0, import_react97.useState)(0);
+  const prevPtyIdRef = (0, import_react97.useRef)(void 0);
+  const prevStreamingStateRef = (0, import_react97.useRef)(void 0);
+  (0, import_react97.useEffect)(() => {
+    const isNowResponding = streamingState === "responding" /* Responding */;
+    const wasResponding = prevStreamingStateRef.current === "responding" /* Responding */;
+    const ptyChanged = activePtyId !== prevPtyIdRef.current;
+    if (isNowResponding && (!wasResponding || ptyChanged)) {
+      setOperationStartTime(Date.now());
+    } else if (!isNowResponding && wasResponding) {
+      setOperationStartTime(0);
+    }
+    prevPtyIdRef.current = activePtyId;
+    prevStreamingStateRef.current = streamingState;
+  }, [streamingState, activePtyId]);
+  const isRedirectionActive = (0, import_react97.useMemo)(
+    () => (
+      // Check active tool calls for run_shell_command
+      pendingToolCalls.some((tc) => {
+        if (tc.request.name !== "run_shell_command") return false;
+        const command = tc.request.args?.command || "";
+        return hasRedirection(command);
+      })
+    ),
+    [pendingToolCalls]
+  );
+  return {
+    operationStartTime,
+    isRedirectionActive
+  };
+};
+
+// packages/cli/src/ui/hooks/useAgentStream.ts
+var CANCELLED_TOOL_ERROR_MESSAGE = "[Operation Cancelled] Reason: User cancelled operation";
+function createCancelledToolCall(request, tool, invocation) {
+  const fallbackToolName = request.name.trim() || "generic_tool";
+  return {
+    status: "cancelled" /* Cancelled */,
+    request,
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    tool: tool ?? {
+      name: fallbackToolName,
+      displayName: fallbackToolName
+    },
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    invocation: invocation ?? {
+      getDescription: () => fallbackToolName
+    },
+    response: {
+      callId: request.callId,
+      responseParts: [
+        {
+          functionResponse: {
+            id: request.callId,
+            name: request.name,
+            response: {
+              error: CANCELLED_TOOL_ERROR_MESSAGE
+            }
+          }
+        }
+      ],
+      resultDisplay: void 0,
+      error: new Error(CANCELLED_TOOL_ERROR_MESSAGE),
+      errorType: "unhandled_exception" /* UNHANDLED_EXCEPTION */
+    }
+  };
+}
+var useAgentStream = ({
+  agent,
+  config,
+  addItem,
+  onCancelSubmit,
+  isShellFocused,
+  logger
+}) => {
+  const [initError] = (0, import_react98.useState)(null);
+  const [retryStatus] = (0, import_react98.useState)(null);
+  const [streamingState, setStreamingState] = (0, import_react98.useState)(
+    "idle" /* Idle */
+  );
+  const [thought, setThought] = (0, import_react98.useState)(null);
+  const [lastOutputTime, setLastOutputTime] = (0, import_react98.useState)(Date.now());
+  const currentStreamIdRef = (0, import_react98.useRef)(null);
+  const userMessageTimestampRef = (0, import_react98.useRef)(0);
+  const geminiMessageBufferRef = (0, import_react98.useRef)("");
+  const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
+  const [trackedTools, trackedToolsRef, setTrackedTools] = useStateAndRef([]);
+  const toolRequestArgsRef = (0, import_react98.useRef)(
+    /* @__PURE__ */ new Map()
+  );
+  const cancellationStateRef = (0, import_react98.useRef)(
+    "idle" /* Idle */
+  );
+  const cancelPromiseRef = (0, import_react98.useRef)(Promise.resolve());
+  const [pushedToolCallIds, pushedToolCallIdsRef, setPushedToolCallIds] = useStateAndRef(/* @__PURE__ */ new Set());
+  const [_isFirstToolInGroup, isFirstToolInGroupRef, setIsFirstToolInGroup] = useStateAndRef(true);
+  const [_hasEmittedBoxInTurn, hasEmittedBoxInTurnRef, setHasEmittedBoxInTurn] = useStateAndRef(false);
+  const { startNewPrompt } = useSessionStats();
+  const activePtyId = void 0;
+  const backgroundTaskCount = 0;
+  const isBackgroundTaskVisible = false;
+  const toggleBackgroundTasks = (0, import_react98.useCallback)(() => {
+  }, []);
+  const backgroundCurrentExecution = void 0;
+  const backgroundTasks = (0, import_react98.useMemo)(() => /* @__PURE__ */ new Map(), []);
+  const dismissBackgroundTask = (0, import_react98.useCallback)(async (_pid) => {
+  }, []);
+  const pendingToolCalls = (0, import_react98.useMemo)(
+    () => trackedTools.map((t) => ({
+      request: {
+        name: t.originalRequestName || t.name,
+        args: { command: t.description },
+        callId: t.callId,
+        isClientInitiated: t.isClientInitiated ?? false,
+        prompt_id: ""
+      },
+      status: t.status
+    })),
+    [trackedTools]
+  );
+  const [loopDetectionConfirmationRequest] = (0, import_react98.useState)(null);
+  const flushPendingText = (0, import_react98.useCallback)(() => {
+    if (pendingHistoryItemRef.current) {
+      addItem(pendingHistoryItemRef.current, userMessageTimestampRef.current);
+      setPendingHistoryItem(null);
+      geminiMessageBufferRef.current = "";
+    }
+  }, [addItem, pendingHistoryItemRef, setPendingHistoryItem]);
+  const cancelOngoingRequest = (0, import_react98.useCallback)(
+    async (clearBuffer = true) => {
+      if (!agent) {
+        return;
+      }
+      if (cancellationStateRef.current === "cancelling" /* Cancelling */) {
+        if (clearBuffer) {
+          onCancelSubmit(false, true);
+        }
+        try {
+          await cancelPromiseRef.current;
+        } catch (error) {
+          debugLogger.warn(`Error awaiting cancelTask: ${error}`);
+        }
+        return;
+      }
+      cancellationStateRef.current = "cancelling" /* Cancelling */;
+      const cancelTask = (async () => {
+        try {
+          let timeoutId2;
+          try {
+            await Promise.race([
+              agent.abort(),
+              new Promise((resolve3) => {
+                timeoutId2 = setTimeout(resolve3, 1e3);
+              })
+            ]);
+          } finally {
+            if (timeoutId2 !== void 0) {
+              clearTimeout(timeoutId2);
+            }
+          }
+          const unpushedTools = trackedToolsRef.current.filter(
+            (tc) => !pushedToolCallIdsRef.current.has(tc.callId)
+          );
+          if (unpushedTools.length > 0) {
+            setTrackedTools(
+              (prev) => prev.map((tc) => {
+                if (!pushedToolCallIdsRef.current.has(tc.callId) && tc.status !== "success" /* Success */ && tc.status !== "error" /* Error */ && tc.status !== "cancelled" /* Cancelled */) {
+                  return {
+                    ...tc,
+                    status: "cancelled" /* Cancelled */
+                  };
+                }
+                return tc;
+              })
+            );
+          }
+          try {
+            const client = config?.getGeminiClient?.();
+            const chat = client?.getChat?.();
+            if (chat) {
+              const seenCallIds = /* @__PURE__ */ new Set();
+              const synthesizedCalls = [];
+              for (const tc of unpushedTools) {
+                if (tc.isClientInitiated) {
+                  continue;
+                }
+                seenCallIds.add(tc.callId);
+                const name = tc.originalRequestName || tc.name;
+                const args = toolRequestArgsRef.current.get(tc.callId) ?? {};
+                synthesizedCalls.push(
+                  createCancelledToolCall({
+                    callId: tc.callId,
+                    name,
+                    args,
+                    isClientInitiated: false,
+                    prompt_id: ""
+                  })
+                );
+              }
+              const clientHistory = client?.getHistory?.() ?? [];
+              const lastTurn = clientHistory.at(-1);
+              if (lastTurn?.role === "model" && Array.isArray(lastTurn.parts)) {
+                let index = 0;
+                for (const part of lastTurn.parts) {
+                  const fc = part.functionCall;
+                  if (fc?.name) {
+                    const callId = fc.id ?? `${fc.name}-${Date.now()}-${index++}`;
+                    if (!seenCallIds.has(callId)) {
+                      seenCallIds.add(callId);
+                      synthesizedCalls.push(
+                        createCancelledToolCall({
+                          callId,
+                          name: fc.name,
+                          args: fc.args ?? {},
+                          isClientInitiated: false,
+                          prompt_id: ""
+                        })
+                      );
+                    }
+                  }
+                }
+              }
+              if (synthesizedCalls.length > 0) {
+                const currentModel = client?.getCurrentSequenceModel?.() ?? config?.getModel?.() ?? "";
+                chat.recordCompletedToolCalls(currentModel, synthesizedCalls);
+              }
+            }
+          } catch (error) {
+            debugLogger.warn(
+              `Error recording cancelled tool calls in agent stream: ${error}`
+            );
+          }
+          setStreamingState("idle" /* Idle */);
+          onCancelSubmit(false, clearBuffer);
+        } finally {
+          cancellationStateRef.current = "idle" /* Idle */;
+        }
+      })();
+      cancelPromiseRef.current = cancelTask;
+      try {
+        await cancelTask;
+      } catch (error) {
+        debugLogger.warn(`Error awaiting cancelTask: ${error}`);
+      }
+    },
+    [
+      agent,
+      config,
+      onCancelSubmit,
+      pushedToolCallIdsRef,
+      setStreamingState,
+      setTrackedTools,
+      trackedToolsRef
+    ]
+  );
+  const handleApprovalModeChange = (0, import_react98.useCallback)(
+    async (newApprovalMode) => {
+      debugLogger.debug(`Approval mode changed to ${newApprovalMode} (stub)`);
+    },
+    []
+  );
+  const handleEvent = (0, import_react98.useCallback)(
+    (event) => {
+      setLastOutputTime(Date.now());
+      switch (event.type) {
+        case "agent_start":
+          setStreamingState("responding" /* Responding */);
+          break;
+        case "agent_end":
+          setStreamingState("idle" /* Idle */);
+          flushPendingText();
+          break;
+        case "message":
+          if (event.role === "agent") {
+            for (const part of event.content) {
+              if (part.type === "text") {
+                geminiMessageBufferRef.current += part.text;
+                const splitPoint = findLastSafeSplitPoint(
+                  geminiMessageBufferRef.current
+                );
+                if (splitPoint === geminiMessageBufferRef.current.length) {
+                  setPendingHistoryItem({
+                    type: "gemini",
+                    text: geminiMessageBufferRef.current
+                  });
+                } else {
+                  const before = geminiMessageBufferRef.current.substring(
+                    0,
+                    splitPoint
+                  );
+                  const after = geminiMessageBufferRef.current.substring(splitPoint);
+                  addItem(
+                    { type: "gemini", text: before },
+                    userMessageTimestampRef.current
+                  );
+                  geminiMessageBufferRef.current = after;
+                  setPendingHistoryItem({
+                    type: "gemini_content",
+                    text: after
+                  });
+                }
+              } else if (part.type === "thought") {
+                setThought(parseThought(part.thought));
+              }
+            }
+          }
+          break;
+        case "tool_request": {
+          flushPendingText();
+          toolRequestArgsRef.current.set(event.requestId, event.args);
+          const legacyState = event._meta?.legacyState;
+          const displayName = legacyState?.displayName ?? event.name;
+          const isOutputMarkdown = legacyState?.isOutputMarkdown ?? false;
+          const desc = legacyState?.description ?? "";
+          const fallbackKind = "other" /* Other */;
+          const newCall = {
+            callId: event.requestId,
+            name: displayName,
+            originalRequestName: event.name,
+            description: desc,
+            display: event.display,
+            status: "scheduled" /* Scheduled */,
+            isClientInitiated: false,
+            renderOutputAsMarkdown: isOutputMarkdown,
+            kind: legacyState?.kind ?? fallbackKind,
+            confirmationDetails: void 0,
+            resultDisplay: void 0
+          };
+          setTrackedTools((prev) => [...prev, newCall]);
+          break;
+        }
+        case "tool_update": {
+          setTrackedTools(
+            (prev) => prev.map((tc) => {
+              if (tc.callId !== event.requestId) return tc;
+              const legacyState = event._meta?.legacyState;
+              const evtStatus = legacyState?.status;
+              let status = tc.status;
+              if (evtStatus === "executing")
+                status = "executing" /* Executing */;
+              else if (evtStatus === "error") status = "error" /* Error */;
+              else if (evtStatus === "success")
+                status = "success" /* Success */;
+              const display = event.display?.result;
+              const liveOutput = displayContentToString(display) ?? tc.resultDisplay;
+              const progressMessage = legacyState?.progressMessage ?? tc.progressMessage;
+              const progress = legacyState?.progress ?? tc.progress;
+              const progressTotal = legacyState?.progressTotal ?? tc.progressTotal;
+              const ptyId = legacyState?.pid ?? tc.ptyId;
+              const description = legacyState?.description ?? tc.description;
+              return {
+                ...tc,
+                status,
+                display: event.display ? { ...tc.display, ...event.display } : tc.display,
+                resultDisplay: liveOutput,
+                progressMessage,
+                progress,
+                progressTotal,
+                ptyId,
+                description
+              };
+            })
+          );
+          break;
+        }
+        case "tool_response": {
+          setTrackedTools(
+            (prev) => prev.map((tc) => {
+              if (tc.callId !== event.requestId) return tc;
+              const legacyState = event._meta?.legacyState;
+              const outputFile = legacyState?.outputFile;
+              const display = event.display?.result;
+              const resultDisplay = displayContentToString(display) ?? tc.resultDisplay;
+              return {
+                ...tc,
+                status: event.isError ? "error" /* Error */ : "success" /* Success */,
+                display: event.display ? { ...tc.display, ...event.display } : tc.display,
+                resultDisplay,
+                outputFile
+              };
+            })
+          );
+          break;
+        }
+        case "error": {
+          const message = event._meta?.["code"] === "AGENT_EXECUTION_BLOCKED" ? `Agent execution blocked: ${event.message}` : event.message;
+          addItem(
+            { type: "error" /* ERROR */, text: message },
+            userMessageTimestampRef.current
+          );
+          break;
+        }
+        case "initialize":
+        case "session_update":
+        case "elicitation_request":
+        case "elicitation_response":
+        case "usage":
+        case "custom":
+          break;
+        default:
+          debugLogger.error("Unknown agent event type:", event);
+          event;
+          break;
+      }
+    },
+    [
+      addItem,
+      flushPendingText,
+      setPendingHistoryItem,
+      setTrackedTools,
+      setStreamingState,
+      setThought,
+      setLastOutputTime
+    ]
+  );
+  (0, import_react98.useEffect)(() => {
+    const unsubscribe = agent?.subscribe(handleEvent);
+    return () => unsubscribe?.();
+  }, [agent, handleEvent]);
+  useKeypress(
+    (key) => {
+      if (key.name === "escape" && !isShellFocused) {
+        void cancelOngoingRequest(false);
+        return true;
+      }
+      return false;
+    },
+    {
+      isActive: streamingState === "responding" /* Responding */ || streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */
+    }
+  );
+  const submitQuery = (0, import_react98.useCallback)(
+    async (query, options, _prompt_id) => {
+      if (!agent) return;
+      const timestamp = Date.now();
+      setLastOutputTime(timestamp);
+      userMessageTimestampRef.current = timestamp;
+      geminiMessageBufferRef.current = "";
+      if (!options?.isContinuation) {
+        toolRequestArgsRef.current.clear();
+        if (typeof query === "string") {
+          addItem({ type: "user" /* USER */, text: query }, timestamp);
+          void logger?.logMessage("user" /* USER */, query);
+        }
+        startNewPrompt();
+      }
+      const parts = geminiPartsToContentParts(
+        typeof query === "string" ? [{ text: query }] : query
+      );
+      try {
+        const { streamId } = await agent.send({
+          message: { content: parts }
+        });
+        currentStreamIdRef.current = streamId;
+      } catch (err) {
+        addItem(
+          { type: "error" /* ERROR */, text: getErrorMessage(err) },
+          timestamp
+        );
+      }
+    },
+    [agent, addItem, logger, startNewPrompt]
+  );
+  (0, import_react98.useEffect)(() => {
+    if (trackedTools.length > 0) {
+      const isNewBatch = !trackedTools.some(
+        (tc) => pushedToolCallIdsRef.current.has(tc.callId)
+      );
+      if (isNewBatch) {
+        setPushedToolCallIds(/* @__PURE__ */ new Set());
+        setIsFirstToolInGroup(true);
+      }
+    } else if (streamingState === "idle" /* Idle */) {
+      setPushedToolCallIds(/* @__PURE__ */ new Set());
+      setIsFirstToolInGroup(true);
+    }
+  }, [
+    trackedTools,
+    pushedToolCallIdsRef,
+    setPushedToolCallIds,
+    setIsFirstToolInGroup,
+    streamingState
+  ]);
+  (0, import_react98.useEffect)(() => {
+    if (trackedTools.length === 0) return;
+    const allTerminal = trackedTools.every(
+      (tc) => tc.status === "success" || tc.status === "error" || tc.status === "cancelled"
+    );
+    const toolsToPush = trackedTools.filter(
+      (tc) => !pushedToolCallIdsRef.current.has(tc.callId)
+    );
+    if (allTerminal && toolsToPush.length > 0) {
+      const newPushed = new Set(pushedToolCallIdsRef.current);
+      for (const tc of toolsToPush) {
+        newPushed.add(tc.callId);
+      }
+      const appearance = getToolGroupBorderAppearance(
+        { type: "tool_group", tools: trackedTools },
+        activePtyId,
+        !!isShellFocused,
+        [],
+        backgroundTasks
+      );
+      const hasBoxInBatch = toolsToPush.some(
+        (tc) => tc.display?.format !== "notice"
+      );
+      const shouldStartNewBlock = isFirstToolInGroupRef.current || !hasEmittedBoxInTurnRef.current && hasBoxInBatch;
+      const historyItem = {
+        type: "tool_display_group",
+        tools: toolsToPush.map((tc) => ({
+          name: tc.name,
+          description: tc.description,
+          ...tc.display,
+          status: tc.status,
+          originalRequestName: tc.originalRequestName
+        })),
+        borderTop: shouldStartNewBlock,
+        borderBottom: true,
+        ...appearance
+      };
+      addItem(historyItem);
+      setPushedToolCallIds(newPushed);
+      if (hasBoxInBatch) {
+        setHasEmittedBoxInTurn(true);
+      }
+      setIsFirstToolInGroup(false);
+    }
+  }, [
+    trackedTools,
+    pushedToolCallIdsRef,
+    isFirstToolInGroupRef,
+    hasEmittedBoxInTurnRef,
+    setPushedToolCallIds,
+    setIsFirstToolInGroup,
+    setHasEmittedBoxInTurn,
+    addItem,
+    activePtyId,
+    isShellFocused,
+    backgroundTasks
+  ]);
+  const pendingToolGroupItems = (0, import_react98.useMemo)(() => {
+    const remainingTools = trackedTools.filter(
+      (tc) => !pushedToolCallIdsRef.current.has(tc.callId)
+    );
+    const items = [];
+    const appearance = getToolGroupBorderAppearance(
+      { type: "tool_group", tools: trackedTools },
+      activePtyId,
+      !!isShellFocused,
+      [],
+      backgroundTasks
+    );
+    if (remainingTools.length > 0) {
+      const hasBoxInPending = remainingTools.some(
+        (tc) => tc.display?.format !== "notice"
+      );
+      const shouldStartNewBlock = pushedToolCallIds.size === 0 || !hasEmittedBoxInTurnRef.current && hasBoxInPending;
+      items.push({
+        type: "tool_display_group",
+        tools: remainingTools.map((tc) => ({
+          name: tc.name,
+          description: tc.description,
+          ...tc.display,
+          status: tc.status,
+          originalRequestName: tc.originalRequestName
+        })),
+        borderTop: shouldStartNewBlock,
+        borderBottom: false,
+        ...appearance
+      });
+    }
+    const allTerminal = trackedTools.length > 0 && trackedTools.every(
+      (tc) => tc.status === "success" || tc.status === "error" || tc.status === "cancelled"
+    );
+    const allPushed = trackedTools.length > 0 && trackedTools.every((tc) => pushedToolCallIds.has(tc.callId));
+    const anyVisibleInHistory = pushedToolCallIds.size > 0;
+    const anyVisibleInPending = remainingTools.length > 0;
+    if (trackedTools.length > 0 && !(allTerminal && allPushed) && (anyVisibleInHistory || anyVisibleInPending)) {
+      items.push({
+        type: "tool_display_group",
+        tools: [],
+        borderTop: false,
+        borderBottom: true,
+        ...appearance
+      });
+    }
+    return items;
+  }, [
+    trackedTools,
+    pushedToolCallIds,
+    pushedToolCallIdsRef,
+    hasEmittedBoxInTurnRef,
+    activePtyId,
+    isShellFocused,
+    backgroundTasks
+  ]);
+  const pendingHistoryItems = (0, import_react98.useMemo)(
+    () => [pendingHistoryItem, ...pendingToolGroupItems].filter(
+      (i) => i !== void 0 && i !== null
+    ),
+    [pendingHistoryItem, pendingToolGroupItems]
+  );
+  return {
+    streamingState,
+    submitQuery,
+    initError,
+    pendingHistoryItems,
+    thought,
+    cancelOngoingRequest,
+    pendingToolCalls,
+    handleApprovalModeChange,
+    activePtyId,
+    loopDetectionConfirmationRequest,
+    lastOutputTime,
+    backgroundTaskCount,
+    isBackgroundTaskVisible,
+    toggleBackgroundTasks,
+    backgroundCurrentExecution,
+    backgroundTasks,
+    retryStatus,
+    dismissBackgroundTask
+  };
+};
+
+// packages/cli/src/ui/hooks/useGeminiStream.ts
 var isTopicTool2 = (name) => name === UPDATE_TOPIC_TOOL_NAME || name === UPDATE_TOPIC_DISPLAY_NAME;
 var SUPPRESSED_TOOL_ERRORS_NOTE = 'Some internal tool attempts failed before this final error. Press F12 for diagnostics, or run /settings and change "Error Verbosity" to full for details.';
 var LOW_VERBOSITY_FAILURE_NOTE = 'This request failed. Press F12 for diagnostics, or run /settings and change "Error Verbosity" to full for full details.';
@@ -27094,7 +27711,7 @@ function getBackgroundedToolInfo(toolCall) {
   };
 }
 function isBackgroundableExecutingToolCall(toolCall) {
-  return toolCall.status === CoreToolCallStatus.Executing && typeof toolCall.pid === "number";
+  return toolCall.status === "executing" /* Executing */ && typeof toolCall.pid === "number";
 }
 function showCitations(settings) {
   const enabled = settings.merged.ui.showCitations;
@@ -27104,14 +27721,14 @@ function showCitations(settings) {
   return true;
 }
 function calculateStreamingState(isResponding, toolCalls) {
-  if (toolCalls.some((tc) => tc.status === CoreToolCallStatus.AwaitingApproval)) {
+  if (toolCalls.some((tc) => tc.status === "awaiting_approval" /* AwaitingApproval */)) {
     return "waiting_for_confirmation" /* WaitingForConfirmation */;
   }
   const isAnyToolActive = toolCalls.some((tc) => {
-    if (tc.status === CoreToolCallStatus.Executing || tc.status === CoreToolCallStatus.Scheduled || tc.status === CoreToolCallStatus.Validating) {
+    if (tc.status === "executing" /* Executing */ || tc.status === "scheduled" /* Scheduled */ || tc.status === "validating" /* Validating */) {
       return true;
     }
-    if (tc.status === CoreToolCallStatus.Success || tc.status === CoreToolCallStatus.Error || tc.status === CoreToolCallStatus.Cancelled) {
+    if (tc.status === "success" /* Success */ || tc.status === "error" /* Error */ || tc.status === "cancelled" /* Cancelled */) {
       return !tc.responseSubmittedToGemini;
     }
     return false;
@@ -27122,44 +27739,50 @@ function calculateStreamingState(isResponding, toolCalls) {
   return "idle" /* Idle */;
 }
 var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, _performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onCancelSubmit, setShellInputFocused, terminalWidth, terminalHeight, isShellFocused, consumeUserHint) => {
-  const [initError, setInitError] = (0, import_react97.useState)(null);
-  const [retryStatus, setRetryStatus] = (0, import_react97.useState)(
+  const [initError, setInitError] = (0, import_react99.useState)(null);
+  const [retryStatus, setRetryStatus] = (0, import_react99.useState)(
     null
   );
   const isLowErrorVerbosity = settings.merged.ui?.errorVerbosity !== "full";
-  const suppressedToolErrorCountRef = (0, import_react97.useRef)(0);
-  const suppressedToolErrorNoteShownRef = (0, import_react97.useRef)(false);
-  const lowVerbosityFailureNoteShownRef = (0, import_react97.useRef)(false);
-  const abortControllerRef = (0, import_react97.useRef)(null);
-  const turnCancelledRef = (0, import_react97.useRef)(false);
-  const activeQueryIdRef = (0, import_react97.useRef)(null);
-  const previousApprovalModeRef = (0, import_react97.useRef)(
+  const suppressedToolErrorCountRef = (0, import_react99.useRef)(0);
+  const suppressedToolErrorNoteShownRef = (0, import_react99.useRef)(false);
+  const lowVerbosityFailureNoteShownRef = (0, import_react99.useRef)(false);
+  const abortControllerRef = (0, import_react99.useRef)(null);
+  const turnCancelledRef = (0, import_react99.useRef)(false);
+  const pendingToolCallRequestsRef = (0, import_react99.useRef)([]);
+  const activeSchedulePromiseRef = (0, import_react99.useRef)(null);
+  const cancellationStateRef = (0, import_react99.useRef)(
+    "idle" /* Idle */
+  );
+  const cancelPromiseRef = (0, import_react99.useRef)(Promise.resolve());
+  const activeQueryIdRef = (0, import_react99.useRef)(null);
+  const previousApprovalModeRef = (0, import_react99.useRef)(
     config.getApprovalMode()
   );
   const [isResponding, isRespondingRef, setIsResponding] = useStateAndRef(false);
   const [thought, thoughtRef, setThought] = useStateAndRef(null);
   const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
-  const [lastGeminiActivityTime, setLastGeminiActivityTime] = (0, import_react97.useState)(0);
+  const [lastGeminiActivityTime, setLastGeminiActivityTime] = (0, import_react99.useState)(0);
   const [pushedToolCallIds, pushedToolCallIdsRef, setPushedToolCallIds] = useStateAndRef(/* @__PURE__ */ new Set());
   const [_isFirstToolInGroup, isFirstToolInGroupRef, setIsFirstToolInGroup] = useStateAndRef(true);
   const { startNewPrompt, getPromptCount } = useSessionStats();
   const logger = useLogger(config);
-  const gitService = (0, import_react97.useMemo)(() => {
+  const gitService = (0, import_react99.useMemo)(() => {
     if (!config.getProjectRoot()) {
       return;
     }
     return new GitService(config.getProjectRoot(), config.storage);
   }, [config]);
-  (0, import_react97.useEffect)(() => {
+  (0, import_react99.useEffect)(() => {
     const handleRetryAttempt = (payload) => {
       if (turnCancelledRef.current || !isRespondingRef.current) {
         return;
       }
       setRetryStatus(payload);
     };
-    coreEvents.on(CoreEvent.RetryAttempt, handleRetryAttempt);
+    coreEvents.on("retry-attempt" /* RetryAttempt */, handleRetryAttempt);
     return () => {
-      coreEvents.off(CoreEvent.RetryAttempt, handleRetryAttempt);
+      coreEvents.off("retry-attempt" /* RetryAttempt */, handleRetryAttempt);
     };
   }, [isRespondingRef]);
   const [
@@ -27171,6 +27794,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     lastToolOutputTime
   ] = useToolScheduler(
     async (completedToolCallsFromScheduler) => {
+      pendingToolCallRequestsRef.current = [];
       if (completedToolCallsFromScheduler.length > 0) {
         const toolsToPush = completedToolCallsFromScheduler.filter(
           (tc) => !pushedToolCallIdsRef.current.has(tc.request.callId)
@@ -27205,15 +27829,25 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
         }
         setToolCallsForDisplay([]);
         try {
-          const currentModel = config.getGeminiClient().getCurrentSequenceModel() ?? config.getModel();
-          config.getGeminiClient().getChat().recordCompletedToolCalls(
-            currentModel,
-            completedToolCallsFromScheduler
-          );
-          await recordToolCallInteractions(
-            config,
-            completedToolCallsFromScheduler
+          const client = geminiClient ?? config.getGeminiClient();
+          const currentModel = client?.getCurrentSequenceModel?.() ?? config.getModel();
+          const normalizedCompletedCalls = completedToolCallsFromScheduler.map(
+            (tc) => {
+              if (tc.status === "cancelled" /* Cancelled */ && (!tc.response?.responseParts || tc.response.responseParts.length === 0)) {
+                return {
+                  ...tc,
+                  response: createCancelledToolCall(
+                    tc.request,
+                    tc.tool,
+                    tc.invocation
+                  ).response
+                };
+              }
+              return tc;
+            }
           );
+          client?.getChat?.()?.recordCompletedToolCalls(currentModel, normalizedCompletedCalls);
+          await recordToolCallInteractions(config, normalizedCompletedCalls);
         } catch (error) {
           debugLogger.warn(
             `Error recording completed tool call information: ${error}`
@@ -27225,13 +27859,13 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     config,
     getPreferredEditor
   );
-  const activeBackgroundExecutionId = (0, import_react97.useMemo)(() => {
+  const activeBackgroundExecutionId = (0, import_react99.useMemo)(() => {
     const executingBackgroundableTool = toolCalls.find(
       isBackgroundableExecutingToolCall
     );
     return executingBackgroundableTool?.pid;
   }, [toolCalls]);
-  const onExec = (0, import_react97.useCallback)(
+  const onExec = (0, import_react99.useCallback)(
     async (done) => {
       setIsResponding(true);
       await done;
@@ -27262,11 +27896,11 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     terminalHeight,
     activeBackgroundExecutionId
   );
-  const streamingState = (0, import_react97.useMemo)(
+  const streamingState = (0, import_react99.useMemo)(
     () => calculateStreamingState(isResponding, toolCalls),
     [isResponding, toolCalls]
   );
-  (0, import_react97.useEffect)(() => {
+  (0, import_react99.useEffect)(() => {
     if (toolCalls.length > 0) {
       const isNewBatch = !toolCalls.some(
         (tc) => pushedToolCallIdsRef.current.has(tc.request.callId)
@@ -27286,18 +27920,18 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     setIsFirstToolInGroup,
     streamingState
   ]);
-  (0, import_react97.useEffect)(() => {
+  (0, import_react99.useEffect)(() => {
     const toolsToPush = [];
     for (let i = 0; i < toolCalls.length; i++) {
       const tc = toolCalls[i];
       if (pushedToolCallIdsRef.current.has(tc.request.callId)) continue;
       if (tc.status === "success" || tc.status === "error" || tc.status === "cancelled") {
-        const isAgent = tc.tool?.kind === Kind.Agent;
+        const isAgent = tc.tool?.kind === "agent" /* Agent */;
         if (isAgent) {
           let contigAgentsComplete = true;
           for (let j = i + 1; j < toolCalls.length; j++) {
             const nextTc = toolCalls[j];
-            if (nextTc.tool?.kind === Kind.Agent) {
+            if (nextTc.tool?.kind === "agent" /* Agent */) {
               if (nextTc.status !== "success" && nextTc.status !== "error" && nextTc.status !== "cancelled") {
                 contigAgentsComplete = false;
                 break;
@@ -27323,7 +27957,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       let currentGroup = [];
       for (const tc of toolsToPush) {
         newPushed.add(tc.request.callId);
-        if (tc.tool?.kind === Kind.Agent) {
+        if (tc.tool?.kind === "agent" /* Agent */) {
           currentGroup.push(tc);
         } else {
           if (currentGroup.length > 0) {
@@ -27386,7 +28020,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     backgroundTasks,
     settings.merged.ui?.compactToolOutput
   ]);
-  const pendingToolGroupItems = (0, import_react97.useMemo)(() => {
+  const pendingToolGroupItems = (0, import_react99.useMemo)(() => {
     const remainingTools = toolCalls.filter(
       (tc) => !pushedToolCallIds.has(tc.request.callId)
     );
@@ -27456,27 +28090,27 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     backgroundTasks,
     settings.merged.ui?.compactToolOutput
   ]);
-  const lastQueryRef = (0, import_react97.useRef)(null);
-  const lastPromptIdRef = (0, import_react97.useRef)(null);
-  const loopDetectedRef = (0, import_react97.useRef)(false);
-  const autoNudgeAttemptCountRef = (0, import_react97.useRef)(0);
+  const lastQueryRef = (0, import_react99.useRef)(null);
+  const lastPromptIdRef = (0, import_react99.useRef)(null);
+  const loopDetectedRef = (0, import_react99.useRef)(false);
+  const autoNudgeAttemptCountRef = (0, import_react99.useRef)(0);
   const MAX_AUTO_NUDGE_ATTEMPTS = 2;
-  const submitQueryRef = (0, import_react97.useRef)(null);
+  const submitQueryRef = (0, import_react99.useRef)(null);
   const [
     loopDetectionConfirmationRequest,
     setLoopDetectionConfirmationRequest
-  ] = (0, import_react97.useState)(null);
+  ] = (0, import_react99.useState)(null);
   const activePtyId = activeShellPtyId ?? activeBackgroundExecutionId ?? void 0;
-  const prevActiveShellPtyIdRef = (0, import_react97.useRef)(null);
-  (0, import_react97.useEffect)(() => {
+  const prevActiveShellPtyIdRef = (0, import_react99.useRef)(null);
+  (0, import_react99.useEffect)(() => {
     if (turnCancelledRef.current && prevActiveShellPtyIdRef.current !== null && activeShellPtyId === null) {
       addItem({ type: "info" /* INFO */, text: "Request cancelled." });
       setIsResponding(false);
     }
     prevActiveShellPtyIdRef.current = activeShellPtyId;
   }, [activeShellPtyId, addItem, setIsResponding]);
-  (0, import_react97.useEffect)(() => {
-    if (config.getApprovalMode() === ApprovalMode.YOLO && streamingState === "idle" /* Idle */) {
+  (0, import_react99.useEffect)(() => {
+    if (config.getApprovalMode() === "yolo" /* YOLO */ && streamingState === "idle" /* Idle */) {
       const lastUserMessageIndex = history.findLastIndex(
         (item) => item.type === "user" /* USER */
       );
@@ -27489,12 +28123,12 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       }
     }
   }, [streamingState, config, history]);
-  (0, import_react97.useEffect)(() => {
+  (0, import_react99.useEffect)(() => {
     if (!isResponding) {
       setRetryStatus(null);
     }
   }, [isResponding]);
-  const maybeAddSuppressedToolErrorNote = (0, import_react97.useCallback)(
+  const maybeAddSuppressedToolErrorNote = (0, import_react99.useCallback)(
     (userMessageTimestamp) => {
       if (!isLowErrorVerbosity) {
         return;
@@ -27516,7 +28150,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, isLowErrorVerbosity]
   );
-  const maybeAddLowVerbosityFailureNote = (0, import_react97.useCallback)(
+  const maybeAddLowVerbosityFailureNote = (0, import_react99.useCallback)(
     (userMessageTimestamp) => {
       if (!isLowErrorVerbosity || config.getDebugMode()) {
         return;
@@ -27535,16 +28169,25 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, config, isLowErrorVerbosity]
   );
-  const cancelOngoingRequest = (0, import_react97.useCallback)(
-    (clearBuffer = true) => {
+  const cancelOngoingRequest = (0, import_react99.useCallback)(
+    async (clearBuffer = true) => {
       if (turnCancelledRef.current) {
         if (clearBuffer) {
           onCancelSubmit(false, true);
         }
+        if (cancellationStateRef.current === "cancelling" /* Cancelling */) {
+          try {
+            await cancelPromiseRef.current;
+          } catch (error) {
+            debugLogger.warn(
+              `Error awaiting schedulePromise on cancel: ${error}`
+            );
+          }
+        }
         return;
       }
-      const hasActiveTools = toolCalls.some(
-        (tc) => tc.status === CoreToolCallStatus.Executing || tc.status === CoreToolCallStatus.Scheduled || tc.status === CoreToolCallStatus.Validating
+      const hasActiveTools = pendingToolCallRequestsRef.current.length > 0 || toolCalls.some(
+        (tc) => tc.status === "executing" /* Executing */ || tc.status === "scheduled" /* Scheduled */ || tc.status === "validating" /* Validating */ || tc.status === "awaiting_approval" /* AwaitingApproval */
       );
       if (streamingState === "idle" /* Idle */ && !isRespondingRef.current && !hasActiveTools) {
         if (clearBuffer) {
@@ -27562,6 +28205,74 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       }
       abortControllerRef.current.abort();
       cancelAllToolCalls(abortControllerRef.current.signal);
+      try {
+        const client = geminiClient ?? config.getGeminiClient?.();
+        const chat = client?.getChat?.();
+        if (chat) {
+          const seenCallIds = /* @__PURE__ */ new Set();
+          const synthesizedCalls = [];
+          for (const tc of toolCalls) {
+            if (tc.request.isClientInitiated) {
+              continue;
+            }
+            const isAlreadySubmitted = (tc.status === "success" /* Success */ || tc.status === "error" /* Error */ || tc.status === "cancelled" /* Cancelled */) && tc.responseSubmittedToGemini;
+            if (isAlreadySubmitted) {
+              seenCallIds.add(tc.request.callId);
+              continue;
+            }
+            seenCallIds.add(tc.request.callId);
+            if ((tc.status === "success" /* Success */ || tc.status === "error" /* Error */ || tc.status === "cancelled" /* Cancelled */) && (tc.response?.responseParts?.length ?? 0) > 0) {
+              synthesizedCalls.push(tc);
+            } else {
+              synthesizedCalls.push(
+                createCancelledToolCall(
+                  tc.request,
+                  tc.tool,
+                  "invocation" in tc ? tc.invocation : void 0
+                )
+              );
+            }
+          }
+          for (const req of pendingToolCallRequestsRef.current) {
+            if (req.isClientInitiated || seenCallIds.has(req.callId)) {
+              continue;
+            }
+            seenCallIds.add(req.callId);
+            synthesizedCalls.push(createCancelledToolCall(req));
+          }
+          const clientHistory = client?.getHistory?.() ?? [];
+          const lastTurn = clientHistory.at(-1);
+          if (lastTurn?.role === "model" && Array.isArray(lastTurn.parts)) {
+            let index = 0;
+            for (const part of lastTurn.parts) {
+              const fc = part.functionCall;
+              if (fc?.name) {
+                const callId = fc.id ?? `${fc.name}-${Date.now()}-${index++}`;
+                if (!seenCallIds.has(callId)) {
+                  seenCallIds.add(callId);
+                  synthesizedCalls.push(
+                    createCancelledToolCall({
+                      callId,
+                      name: fc.name,
+                      args: fc.args ?? {},
+                      isClientInitiated: false,
+                      prompt_id: lastPromptIdRef.current ?? ""
+                    })
+                  );
+                }
+              }
+            }
+          }
+          if (synthesizedCalls.length > 0) {
+            const currentModel = client?.getCurrentSequenceModel?.() ?? config.getModel?.() ?? "";
+            chat.recordCompletedToolCalls(currentModel, synthesizedCalls);
+          }
+        }
+      } catch (error) {
+        debugLogger.warn(
+          `Error recording cancelled tool calls on abort: ${error}`
+        );
+      }
       if (pendingHistoryItemRef.current) {
         if (pendingHistoryItemRef.current.type === "tool_group" && pendingHistoryItemRef.current.tools.some(
           (t) => t.name === SHELL_COMMAND_NAME
@@ -27571,7 +28282,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
             if (tool.name === SHELL_COMMAND_NAME) {
               return {
                 ...tool,
-                status: CoreToolCallStatus.Cancelled,
+                status: "cancelled" /* Cancelled */,
                 resultDisplay: tool.resultDisplay
               };
             }
@@ -27598,6 +28309,35 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       }
       onCancelSubmit(false, clearBuffer);
       setShellInputFocused(false);
+      const schedulePromise = activeSchedulePromiseRef.current;
+      if (schedulePromise) {
+        cancellationStateRef.current = "cancelling" /* Cancelling */;
+        const cancelTask = (async () => {
+          let timeoutId2;
+          try {
+            await Promise.race([
+              Promise.resolve(schedulePromise).catch(() => {
+              }),
+              new Promise((resolve3) => {
+                timeoutId2 = setTimeout(resolve3, 1e3);
+              })
+            ]);
+          } finally {
+            if (timeoutId2 !== void 0) {
+              clearTimeout(timeoutId2);
+            }
+            cancellationStateRef.current = "idle" /* Idle */;
+          }
+        })();
+        cancelPromiseRef.current = cancelTask;
+        try {
+          await cancelTask;
+        } catch (error) {
+          debugLogger.warn(
+            `Error awaiting schedulePromise on cancel: ${error}`
+          );
+        }
+      }
     },
     [
       streamingState,
@@ -27610,13 +28350,15 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       cancelAllToolCalls,
       toolCalls,
       activeShellPtyId,
-      setIsResponding
+      setIsResponding,
+      geminiClient,
+      config
     ]
   );
   useKeypress(
     (key) => {
       if (key.name === "escape" && !isShellFocused) {
-        cancelOngoingRequest(false);
+        void cancelOngoingRequest(false);
         return true;
       }
       return false;
@@ -27625,7 +28367,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       isActive: streamingState === "responding" /* Responding */ || streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */
     }
   );
-  const prepareQueryForGemini = (0, import_react97.useCallback)(
+  const prepareQueryForGemini = (0, import_react99.useCallback)(
     async (query, userMessageTimestamp, abortSignal, prompt_id) => {
       if (turnCancelledRef.current) {
         return { queryToSend: null, shouldProceed: false };
@@ -27636,7 +28378,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       let localQueryToSendToGemini = null;
       if (typeof query === "string") {
         const trimmedQuery = query.trim();
-        await logger?.logMessage(MessageSenderType.USER, trimmedQuery);
+        await logger?.logMessage("user" /* USER */, trimmedQuery);
         if (!shellModeActive) {
           const slashCommandResult = isSlashCommand(trimmedQuery) ? await handleSlashCommand(trimmedQuery) : false;
           if (slashCommandResult) {
@@ -27731,7 +28473,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       settings
     ]
   );
-  const handleContentEvent = (0, import_react97.useCallback)(
+  const handleContentEvent = (0, import_react99.useCallback)(
     (eventValue, currentGeminiMessageBuffer, userMessageTimestamp) => {
       setRetryStatus(null);
       if (turnCancelledRef.current) {
@@ -27772,7 +28514,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, pendingHistoryItemRef, setPendingHistoryItem]
   );
-  const handleThoughtEvent = (0, import_react97.useCallback)(
+  const handleThoughtEvent = (0, import_react99.useCallback)(
     (eventValue, _userMessageTimestamp) => {
       setThought(eventValue);
       if (getInlineThinkingMode(settings) === "full") {
@@ -27784,7 +28526,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, settings, setThought]
   );
-  const handleUserCancelledEvent = (0, import_react97.useCallback)(
+  const handleUserCancelledEvent = (0, import_react99.useCallback)(
     (userMessageTimestamp) => {
       if (turnCancelledRef.current) {
         return;
@@ -27792,7 +28534,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       if (pendingHistoryItemRef.current) {
         if (pendingHistoryItemRef.current.type === "tool_group") {
           const updatedTools = pendingHistoryItemRef.current.tools.map(
-            (tool) => tool.status === CoreToolCallStatus.Validating || tool.status === CoreToolCallStatus.Scheduled || tool.status === CoreToolCallStatus.AwaitingApproval || tool.status === CoreToolCallStatus.Executing ? { ...tool, status: CoreToolCallStatus.Cancelled } : tool
+            (tool) => tool.status === "validating" /* Validating */ || tool.status === "scheduled" /* Scheduled */ || tool.status === "awaiting_approval" /* AwaitingApproval */ || tool.status === "executing" /* Executing */ ? { ...tool, status: "cancelled" /* Cancelled */ } : tool
           );
           const pendingItem = {
             ...pendingHistoryItemRef.current,
@@ -27819,7 +28561,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       setIsResponding
     ]
   );
-  const handleErrorEvent = (0, import_react97.useCallback)(
+  const handleErrorEvent = (0, import_react99.useCallback)(
     (eventValue, userMessageTimestamp) => {
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -27852,7 +28594,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       maybeAddLowVerbosityFailureNote
     ]
   );
-  const handleInvalidStreamEvent = (0, import_react97.useCallback)(
+  const handleInvalidStreamEvent = (0, import_react99.useCallback)(
     (eventValue, userMessageTimestamp) => {
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -27898,7 +28640,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       geminiClient
     ]
   );
-  const handleCitationEvent = (0, import_react97.useCallback)(
+  const handleCitationEvent = (0, import_react99.useCallback)(
     (text, userMessageTimestamp) => {
       if (!showCitations(settings)) {
         return;
@@ -27911,7 +28653,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, pendingHistoryItemRef, setPendingHistoryItem, settings]
   );
-  const handleFinishedEvent = (0, import_react97.useCallback)(
+  const handleFinishedEvent = (0, import_react99.useCallback)(
     (event, userMessageTimestamp) => {
       const finishReason = event.value.reason;
       if (!finishReason) {
@@ -27947,7 +28689,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem]
   );
-  const handleChatCompressionEvent = (0, import_react97.useCallback)(
+  const handleChatCompressionEvent = (0, import_react99.useCallback)(
     (eventValue, userMessageTimestamp) => {
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -27973,14 +28715,14 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, pendingHistoryItemRef, setPendingHistoryItem, config]
   );
-  const handleMaxSessionTurnsEvent = (0, import_react97.useCallback)(
+  const handleMaxSessionTurnsEvent = (0, import_react99.useCallback)(
     () => addItem({
       type: "info",
       text: `The session has reached the maximum number of turns: ${config.getMaxSessionTurns()}. Please update this limit in your setting.json file.`
     }),
     [addItem, config]
   );
-  const handleContextWindowWillOverflowEvent = (0, import_react97.useCallback)(
+  const handleContextWindowWillOverflowEvent = (0, import_react99.useCallback)(
     (estimatedRequestTokenCount, remainingTokenCount) => {
       onCancelSubmit(true);
       const limit = tokenLimit(config.getModel());
@@ -27996,7 +28738,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, onCancelSubmit, config]
   );
-  const handleChatModelEvent = (0, import_react97.useCallback)(
+  const handleChatModelEvent = (0, import_react99.useCallback)(
     (eventValue, userMessageTimestamp) => {
       if (!settings.merged.ui.showModelInfoInChat) {
         return;
@@ -28015,7 +28757,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [addItem, pendingHistoryItemRef, setPendingHistoryItem, settings]
   );
-  const handleAgentExecutionStoppedEvent = (0, import_react97.useCallback)(
+  const handleAgentExecutionStoppedEvent = (0, import_react99.useCallback)(
     (reason, userMessageTimestamp, systemMessage, contextCleared) => {
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -28048,7 +28790,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       maybeAddLowVerbosityFailureNote
     ]
   );
-  const handleAgentExecutionBlockedEvent = (0, import_react97.useCallback)(
+  const handleAgentExecutionBlockedEvent = (0, import_react99.useCallback)(
     (reason, userMessageTimestamp, systemMessage, contextCleared) => {
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -28079,20 +28821,20 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       maybeAddLowVerbosityFailureNote
     ]
   );
-  const processGeminiStreamEvents = (0, import_react97.useCallback)(
+  const processGeminiStreamEvents = (0, import_react99.useCallback)(
     async (stream, userMessageTimestamp, signal, isContinuation, prompt_id) => {
       let geminiMessageBuffer = "";
       const toolCallRequests = [];
       for await (const event of stream) {
-        if (event.type !== GeminiEventType.Thought && thoughtRef.current !== null) {
+        if (event.type !== "thought" /* Thought */ && thoughtRef.current !== null) {
           setThought(null);
         }
         switch (event.type) {
-          case GeminiEventType.Thought:
+          case "thought" /* Thought */:
             setLastGeminiActivityTime(Date.now());
             handleThoughtEvent(event.value, userMessageTimestamp);
             break;
-          case GeminiEventType.Content:
+          case "content" /* Content */:
             setLastGeminiActivityTime(Date.now());
             geminiMessageBuffer = handleContentEvent(
               event.value,
@@ -28100,16 +28842,17 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
               userMessageTimestamp
             );
             break;
-          case GeminiEventType.ToolCallRequest:
+          case "tool_call_request" /* ToolCallRequest */:
             toolCallRequests.push(event.value);
+            pendingToolCallRequestsRef.current.push(event.value);
             break;
-          case GeminiEventType.UserCancelled:
+          case "user_cancelled" /* UserCancelled */:
             handleUserCancelledEvent(userMessageTimestamp);
             break;
-          case GeminiEventType.Error:
+          case "error" /* Error */:
             handleErrorEvent(event.value, userMessageTimestamp);
             break;
-          case GeminiEventType.AgentExecutionStopped:
+          case "agent_execution_stopped" /* AgentExecutionStopped */:
             handleAgentExecutionStoppedEvent(
               event.value.reason,
               userMessageTimestamp,
@@ -28117,7 +28860,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
               event.value.contextCleared
             );
             break;
-          case GeminiEventType.AgentExecutionBlocked:
+          case "agent_execution_blocked" /* AgentExecutionBlocked */:
             handleAgentExecutionBlockedEvent(
               event.value.reason,
               userMessageTimestamp,
@@ -28125,36 +28868,36 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
               event.value.contextCleared
             );
             break;
-          case GeminiEventType.ChatCompressed:
+          case "chat_compressed" /* ChatCompressed */:
             handleChatCompressionEvent(event.value, userMessageTimestamp);
             break;
-          case GeminiEventType.ToolCallConfirmation:
-          case GeminiEventType.ToolCallResponse:
+          case "tool_call_confirmation" /* ToolCallConfirmation */:
+          case "tool_call_response" /* ToolCallResponse */:
             break;
-          case GeminiEventType.MaxSessionTurns:
+          case "max_session_turns" /* MaxSessionTurns */:
             handleMaxSessionTurnsEvent();
             break;
-          case GeminiEventType.ContextWindowWillOverflow:
+          case "context_window_will_overflow" /* ContextWindowWillOverflow */:
             handleContextWindowWillOverflowEvent(
               event.value.estimatedRequestTokenCount,
               event.value.remainingTokenCount
             );
             break;
-          case GeminiEventType.Finished:
+          case "finished" /* Finished */:
             handleFinishedEvent(event, userMessageTimestamp);
             break;
-          case GeminiEventType.Citation:
+          case "citation" /* Citation */:
             handleCitationEvent(event.value, userMessageTimestamp);
             break;
-          case GeminiEventType.ModelInfo:
+          case "model_info" /* ModelInfo */:
             handleChatModelEvent(event.value, userMessageTimestamp);
             break;
-          case GeminiEventType.LoopDetected:
+          case "loop_detected" /* LoopDetected */:
             loopDetectedRef.current = true;
             break;
-          case GeminiEventType.Retry:
+          case "retry" /* Retry */:
             break;
-          case GeminiEventType.InvalidStream:
+          case "invalid_stream" /* InvalidStream */:
             handleInvalidStreamEvent(event.value, userMessageTimestamp);
             break;
           default: {
@@ -28168,7 +28911,18 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
           addItem(pendingHistoryItemRef.current, userMessageTimestamp);
           setPendingHistoryItem(null);
         }
-        await scheduleToolCalls(toolCallRequests, signal);
+        const schedulePromise = Promise.resolve(
+          scheduleToolCalls(toolCallRequests, signal)
+        );
+        activeSchedulePromiseRef.current = schedulePromise;
+        try {
+          await schedulePromise;
+        } finally {
+          if (activeSchedulePromiseRef.current === schedulePromise) {
+            activeSchedulePromiseRef.current = null;
+          }
+          pendingToolCallRequestsRef.current = [];
+        }
       } else {
         const hasVisibleText = geminiMessageBuffer.trim().length > 0;
         if (isContinuation && !hasVisibleText && autoNudgeAttemptCountRef.current < MAX_AUTO_NUDGE_ATTEMPTS) {
@@ -28205,10 +28959,10 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       setThought
     ]
   );
-  const submitQuery = (0, import_react97.useCallback)(
+  const submitQuery = (0, import_react99.useCallback)(
     async (query, options, prompt_id) => runInDevTraceSpan(
       {
-        operation: options?.isContinuation ? GeminiCliOperation.SystemPrompt : GeminiCliOperation.UserPrompt,
+        operation: options?.isContinuation ? "system_prompt" /* SystemPrompt */ : "user_prompt" /* UserPrompt */,
         sessionId: config.getSessionId()
       },
       async ({ metadata: spanMetadata }) => {
@@ -28219,6 +28973,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
         activeQueryIdRef.current = queryId;
         const userMessageTimestamp = Date.now();
         if (!options?.isContinuation) {
+          pendingToolCallRequestsRef.current = [];
           autoNudgeAttemptCountRef.current = 0;
           setModelSwitchedFromQuotaError(false);
           config.setQuotaErrorOccurred(false);
@@ -28370,9 +29125,9 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     ]
   );
   submitQueryRef.current = submitQuery;
-  const handleApprovalModeChange = (0, import_react97.useCallback)(
+  const handleApprovalModeChange = (0, import_react99.useCallback)(
     async (newApprovalMode) => {
-      if (previousApprovalModeRef.current === ApprovalMode.PLAN && newApprovalMode !== ApprovalMode.PLAN && streamingState === "idle" /* Idle */) {
+      if (previousApprovalModeRef.current === "plan" /* PLAN */ && newApprovalMode !== "plan" /* PLAN */ && streamingState === "idle" /* Idle */) {
         if (geminiClient) {
           try {
             await geminiClient.addHistory({
@@ -28395,11 +29150,11 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
         }
       }
       previousApprovalModeRef.current = newApprovalMode;
-      if (newApprovalMode === ApprovalMode.YOLO || newApprovalMode === ApprovalMode.AUTO_EDIT) {
+      if (newApprovalMode === "yolo" /* YOLO */ || newApprovalMode === "autoEdit" /* AUTO_EDIT */) {
         let awaitingApprovalCalls = toolCalls.filter(
           (call) => call.status === "awaiting_approval" && !call.request.forcedAsk
         );
-        if (newApprovalMode === ApprovalMode.AUTO_EDIT) {
+        if (newApprovalMode === "autoEdit" /* AUTO_EDIT */) {
           awaitingApprovalCalls = awaitingApprovalCalls.filter((call) => {
             if (EDIT_TOOL_NAMES.has(call.request.name)) {
               return true;
@@ -28415,11 +29170,11 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
           if (call.correlationId) {
             try {
               await config.getMessageBus().publish({
-                type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+                type: "tool-confirmation-response" /* TOOL_CONFIRMATION_RESPONSE */,
                 correlationId: call.correlationId,
                 confirmed: true,
                 requiresUserConfirmation: false,
-                outcome: ToolConfirmationOutcome.ProceedOnce
+                outcome: "proceed_once" /* ProceedOnce */
               });
             } catch (error) {
               debugLogger.warn(
@@ -28433,7 +29188,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     },
     [config, toolCalls, geminiClient, streamingState, addItem, onDebugMessage]
   );
-  const handleCompletedTools = (0, import_react97.useCallback)(
+  const handleCompletedTools = (0, import_react99.useCallback)(
     async (completedToolCallsFromScheduler) => {
       const completedAndReadyToSubmitTools = completedToolCallsFromScheduler.filter(
         (tc) => {
@@ -28510,14 +29265,14 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       );
       if (isLowErrorVerbosity) {
         suppressedToolErrorCountRef.current += geminiTools.filter(
-          (tc) => tc.status === CoreToolCallStatus.Error
+          (tc) => tc.status === "error" /* Error */
         ).length;
       }
       if (geminiTools.length === 0) {
         return;
       }
       const stopExecutionTool = geminiTools.find(
-        (tc) => tc.response.errorType === ToolErrorType.STOP_EXECUTION
+        (tc) => tc.response.errorType === "stop_execution" /* STOP_EXECUTION */
       );
       if (stopExecutionTool && stopExecutionTool.response.error) {
         maybeAddSuppressedToolErrorNote();
@@ -28537,9 +29292,9 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
         (tc) => !isTopicTool2(tc.request.name)
       );
       const allDeclinableToolsCancelled = declinableTools.length > 0 && declinableTools.every(
-        (tc) => tc.status === CoreToolCallStatus.Cancelled
+        (tc) => tc.status === "cancelled" /* Cancelled */
       );
-      const allToolsCancelled = geminiTools.length > 0 && geminiTools.every((tc) => tc.status === CoreToolCallStatus.Cancelled);
+      const allToolsCancelled = geminiTools.length > 0 && geminiTools.every((tc) => tc.status === "cancelled" /* Cancelled */);
       if (allDeclinableToolsCancelled || allToolsCancelled) {
         if (!turnCancelledRef.current) {
           addItem({
@@ -28606,19 +29361,19 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       toolCalls
     ]
   );
-  const pendingHistoryItems = (0, import_react97.useMemo)(
+  const pendingHistoryItems = (0, import_react99.useMemo)(
     () => [pendingHistoryItem, ...pendingToolGroupItems].filter(
       (i) => i !== void 0 && i !== null
     ),
     [pendingHistoryItem, pendingToolGroupItems]
   );
-  (0, import_react97.useEffect)(() => {
+  (0, import_react99.useEffect)(() => {
     const saveRestorableToolCalls = async () => {
       if (!config.getCheckpointingEnabled()) {
         return;
       }
       const restorableToolCalls = toolCalls.filter(
-        (toolCall) => EDIT_TOOL_NAMES.has(toolCall.request.name) && toolCall.status === CoreToolCallStatus.AwaitingApproval
+        (toolCall) => EDIT_TOOL_NAMES.has(toolCall.request.name) && toolCall.status === "awaiting_approval" /* AwaitingApproval */
       );
       if (restorableToolCalls.length > 0) {
         if (!gitService) {
@@ -28681,475 +29436,6 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
   };
 };
 
-// packages/cli/src/ui/hooks/useAgentStream.ts
-var import_react99 = __toESM(require_react(), 1);
-
-// packages/cli/src/ui/hooks/useTurnActivityMonitor.ts
-var import_react98 = __toESM(require_react(), 1);
-var useTurnActivityMonitor = (streamingState, activePtyId, pendingToolCalls = []) => {
-  const [operationStartTime, setOperationStartTime] = (0, import_react98.useState)(0);
-  const prevPtyIdRef = (0, import_react98.useRef)(void 0);
-  const prevStreamingStateRef = (0, import_react98.useRef)(void 0);
-  (0, import_react98.useEffect)(() => {
-    const isNowResponding = streamingState === "responding" /* Responding */;
-    const wasResponding = prevStreamingStateRef.current === "responding" /* Responding */;
-    const ptyChanged = activePtyId !== prevPtyIdRef.current;
-    if (isNowResponding && (!wasResponding || ptyChanged)) {
-      setOperationStartTime(Date.now());
-    } else if (!isNowResponding && wasResponding) {
-      setOperationStartTime(0);
-    }
-    prevPtyIdRef.current = activePtyId;
-    prevStreamingStateRef.current = streamingState;
-  }, [streamingState, activePtyId]);
-  const isRedirectionActive = (0, import_react98.useMemo)(
-    () => (
-      // Check active tool calls for run_shell_command
-      pendingToolCalls.some((tc) => {
-        if (tc.request.name !== "run_shell_command") return false;
-        const command = tc.request.args?.command || "";
-        return hasRedirection(command);
-      })
-    ),
-    [pendingToolCalls]
-  );
-  return {
-    operationStartTime,
-    isRedirectionActive
-  };
-};
-
-// packages/cli/src/ui/hooks/useAgentStream.ts
-var useAgentStream = ({
-  agent,
-  addItem,
-  onCancelSubmit,
-  isShellFocused,
-  logger
-}) => {
-  const [initError] = (0, import_react99.useState)(null);
-  const [retryStatus] = (0, import_react99.useState)(null);
-  const [streamingState, setStreamingState] = (0, import_react99.useState)(
-    "idle" /* Idle */
-  );
-  const [thought, setThought] = (0, import_react99.useState)(null);
-  const [lastOutputTime, setLastOutputTime] = (0, import_react99.useState)(Date.now());
-  const currentStreamIdRef = (0, import_react99.useRef)(null);
-  const userMessageTimestampRef = (0, import_react99.useRef)(0);
-  const geminiMessageBufferRef = (0, import_react99.useRef)("");
-  const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
-  const [trackedTools, , setTrackedTools] = useStateAndRef([]);
-  const [pushedToolCallIds, pushedToolCallIdsRef, setPushedToolCallIds] = useStateAndRef(/* @__PURE__ */ new Set());
-  const [_isFirstToolInGroup, isFirstToolInGroupRef, setIsFirstToolInGroup] = useStateAndRef(true);
-  const [_hasEmittedBoxInTurn, hasEmittedBoxInTurnRef, setHasEmittedBoxInTurn] = useStateAndRef(false);
-  const { startNewPrompt } = useSessionStats();
-  const activePtyId = void 0;
-  const backgroundTaskCount = 0;
-  const isBackgroundTaskVisible = false;
-  const toggleBackgroundTasks = (0, import_react99.useCallback)(() => {
-  }, []);
-  const backgroundCurrentExecution = void 0;
-  const backgroundTasks = (0, import_react99.useMemo)(() => /* @__PURE__ */ new Map(), []);
-  const dismissBackgroundTask = (0, import_react99.useCallback)(async (_pid) => {
-  }, []);
-  const pendingToolCalls = (0, import_react99.useMemo)(
-    () => trackedTools.map((t) => ({
-      request: {
-        name: t.originalRequestName || t.name,
-        args: { command: t.description },
-        callId: t.callId,
-        isClientInitiated: t.isClientInitiated ?? false,
-        prompt_id: ""
-      },
-      status: t.status
-    })),
-    [trackedTools]
-  );
-  const [loopDetectionConfirmationRequest] = (0, import_react99.useState)(null);
-  const flushPendingText = (0, import_react99.useCallback)(() => {
-    if (pendingHistoryItemRef.current) {
-      addItem(pendingHistoryItemRef.current, userMessageTimestampRef.current);
-      setPendingHistoryItem(null);
-      geminiMessageBufferRef.current = "";
-    }
-  }, [addItem, pendingHistoryItemRef, setPendingHistoryItem]);
-  const cancelOngoingRequest = (0, import_react99.useCallback)(
-    async (clearBuffer = true) => {
-      if (agent) {
-        await agent.abort();
-        setStreamingState("idle" /* Idle */);
-        onCancelSubmit(false, clearBuffer);
-      }
-    },
-    [agent, onCancelSubmit]
-  );
-  const handleApprovalModeChange = (0, import_react99.useCallback)(
-    async (newApprovalMode) => {
-      debugLogger.debug(`Approval mode changed to ${newApprovalMode} (stub)`);
-    },
-    []
-  );
-  const handleEvent = (0, import_react99.useCallback)(
-    (event) => {
-      setLastOutputTime(Date.now());
-      switch (event.type) {
-        case "agent_start":
-          setStreamingState("responding" /* Responding */);
-          break;
-        case "agent_end":
-          setStreamingState("idle" /* Idle */);
-          flushPendingText();
-          break;
-        case "message":
-          if (event.role === "agent") {
-            for (const part of event.content) {
-              if (part.type === "text") {
-                geminiMessageBufferRef.current += part.text;
-                const splitPoint = findLastSafeSplitPoint(
-                  geminiMessageBufferRef.current
-                );
-                if (splitPoint === geminiMessageBufferRef.current.length) {
-                  setPendingHistoryItem({
-                    type: "gemini",
-                    text: geminiMessageBufferRef.current
-                  });
-                } else {
-                  const before = geminiMessageBufferRef.current.substring(
-                    0,
-                    splitPoint
-                  );
-                  const after = geminiMessageBufferRef.current.substring(splitPoint);
-                  addItem(
-                    { type: "gemini", text: before },
-                    userMessageTimestampRef.current
-                  );
-                  geminiMessageBufferRef.current = after;
-                  setPendingHistoryItem({
-                    type: "gemini_content",
-                    text: after
-                  });
-                }
-              } else if (part.type === "thought") {
-                setThought(parseThought(part.thought));
-              }
-            }
-          }
-          break;
-        case "tool_request": {
-          flushPendingText();
-          const legacyState = event._meta?.legacyState;
-          const displayName = legacyState?.displayName ?? event.name;
-          const isOutputMarkdown = legacyState?.isOutputMarkdown ?? false;
-          const desc = legacyState?.description ?? "";
-          const fallbackKind = Kind.Other;
-          const newCall = {
-            callId: event.requestId,
-            name: displayName,
-            originalRequestName: event.name,
-            description: desc,
-            display: event.display,
-            status: CoreToolCallStatus.Scheduled,
-            isClientInitiated: false,
-            renderOutputAsMarkdown: isOutputMarkdown,
-            kind: legacyState?.kind ?? fallbackKind,
-            confirmationDetails: void 0,
-            resultDisplay: void 0
-          };
-          setTrackedTools((prev) => [...prev, newCall]);
-          break;
-        }
-        case "tool_update": {
-          setTrackedTools(
-            (prev) => prev.map((tc) => {
-              if (tc.callId !== event.requestId) return tc;
-              const legacyState = event._meta?.legacyState;
-              const evtStatus = legacyState?.status;
-              let status = tc.status;
-              if (evtStatus === "executing")
-                status = CoreToolCallStatus.Executing;
-              else if (evtStatus === "error") status = CoreToolCallStatus.Error;
-              else if (evtStatus === "success")
-                status = CoreToolCallStatus.Success;
-              const display = event.display?.result;
-              const liveOutput = displayContentToString(display) ?? tc.resultDisplay;
-              const progressMessage = legacyState?.progressMessage ?? tc.progressMessage;
-              const progress = legacyState?.progress ?? tc.progress;
-              const progressTotal = legacyState?.progressTotal ?? tc.progressTotal;
-              const ptyId = legacyState?.pid ?? tc.ptyId;
-              const description = legacyState?.description ?? tc.description;
-              return {
-                ...tc,
-                status,
-                display: event.display ? { ...tc.display, ...event.display } : tc.display,
-                resultDisplay: liveOutput,
-                progressMessage,
-                progress,
-                progressTotal,
-                ptyId,
-                description
-              };
-            })
-          );
-          break;
-        }
-        case "tool_response": {
-          setTrackedTools(
-            (prev) => prev.map((tc) => {
-              if (tc.callId !== event.requestId) return tc;
-              const legacyState = event._meta?.legacyState;
-              const outputFile = legacyState?.outputFile;
-              const display = event.display?.result;
-              const resultDisplay = displayContentToString(display) ?? tc.resultDisplay;
-              return {
-                ...tc,
-                status: event.isError ? CoreToolCallStatus.Error : CoreToolCallStatus.Success,
-                display: event.display ? { ...tc.display, ...event.display } : tc.display,
-                resultDisplay,
-                outputFile
-              };
-            })
-          );
-          break;
-        }
-        case "error": {
-          const message = event._meta?.["code"] === "AGENT_EXECUTION_BLOCKED" ? `Agent execution blocked: ${event.message}` : event.message;
-          addItem(
-            { type: "error" /* ERROR */, text: message },
-            userMessageTimestampRef.current
-          );
-          break;
-        }
-        case "initialize":
-        case "session_update":
-        case "elicitation_request":
-        case "elicitation_response":
-        case "usage":
-        case "custom":
-          break;
-        default:
-          debugLogger.error("Unknown agent event type:", event);
-          event;
-          break;
-      }
-    },
-    [
-      addItem,
-      flushPendingText,
-      setPendingHistoryItem,
-      setTrackedTools,
-      setStreamingState,
-      setThought,
-      setLastOutputTime
-    ]
-  );
-  (0, import_react99.useEffect)(() => {
-    const unsubscribe = agent?.subscribe(handleEvent);
-    return () => unsubscribe?.();
-  }, [agent, handleEvent]);
-  useKeypress(
-    (key) => {
-      if (key.name === "escape" && !isShellFocused) {
-        void cancelOngoingRequest(false);
-        return true;
-      }
-      return false;
-    },
-    {
-      isActive: streamingState === "responding" /* Responding */ || streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */
-    }
-  );
-  const submitQuery = (0, import_react99.useCallback)(
-    async (query, options, _prompt_id) => {
-      if (!agent) return;
-      const timestamp = Date.now();
-      setLastOutputTime(timestamp);
-      userMessageTimestampRef.current = timestamp;
-      geminiMessageBufferRef.current = "";
-      if (!options?.isContinuation) {
-        if (typeof query === "string") {
-          addItem({ type: "user" /* USER */, text: query }, timestamp);
-          void logger?.logMessage(MessageSenderType.USER, query);
-        }
-        startNewPrompt();
-      }
-      const parts = geminiPartsToContentParts(
-        typeof query === "string" ? [{ text: query }] : query
-      );
-      try {
-        const { streamId } = await agent.send({
-          message: { content: parts }
-        });
-        currentStreamIdRef.current = streamId;
-      } catch (err) {
-        addItem(
-          { type: "error" /* ERROR */, text: getErrorMessage(err) },
-          timestamp
-        );
-      }
-    },
-    [agent, addItem, logger, startNewPrompt]
-  );
-  (0, import_react99.useEffect)(() => {
-    if (trackedTools.length > 0) {
-      const isNewBatch = !trackedTools.some(
-        (tc) => pushedToolCallIdsRef.current.has(tc.callId)
-      );
-      if (isNewBatch) {
-        setPushedToolCallIds(/* @__PURE__ */ new Set());
-        setIsFirstToolInGroup(true);
-      }
-    } else if (streamingState === "idle" /* Idle */) {
-      setPushedToolCallIds(/* @__PURE__ */ new Set());
-      setIsFirstToolInGroup(true);
-    }
-  }, [
-    trackedTools,
-    pushedToolCallIdsRef,
-    setPushedToolCallIds,
-    setIsFirstToolInGroup,
-    streamingState
-  ]);
-  (0, import_react99.useEffect)(() => {
-    if (trackedTools.length === 0) return;
-    const allTerminal = trackedTools.every(
-      (tc) => tc.status === "success" || tc.status === "error" || tc.status === "cancelled"
-    );
-    const toolsToPush = trackedTools.filter(
-      (tc) => !pushedToolCallIdsRef.current.has(tc.callId)
-    );
-    if (allTerminal && toolsToPush.length > 0) {
-      const newPushed = new Set(pushedToolCallIdsRef.current);
-      for (const tc of toolsToPush) {
-        newPushed.add(tc.callId);
-      }
-      const appearance = getToolGroupBorderAppearance(
-        { type: "tool_group", tools: trackedTools },
-        activePtyId,
-        !!isShellFocused,
-        [],
-        backgroundTasks
-      );
-      const hasBoxInBatch = toolsToPush.some(
-        (tc) => tc.display?.format !== "notice"
-      );
-      const shouldStartNewBlock = isFirstToolInGroupRef.current || !hasEmittedBoxInTurnRef.current && hasBoxInBatch;
-      const historyItem = {
-        type: "tool_display_group",
-        tools: toolsToPush.map((tc) => ({
-          name: tc.name,
-          description: tc.description,
-          ...tc.display,
-          status: tc.status,
-          originalRequestName: tc.originalRequestName
-        })),
-        borderTop: shouldStartNewBlock,
-        borderBottom: true,
-        ...appearance
-      };
-      addItem(historyItem);
-      setPushedToolCallIds(newPushed);
-      if (hasBoxInBatch) {
-        setHasEmittedBoxInTurn(true);
-      }
-      setIsFirstToolInGroup(false);
-    }
-  }, [
-    trackedTools,
-    pushedToolCallIdsRef,
-    isFirstToolInGroupRef,
-    hasEmittedBoxInTurnRef,
-    setPushedToolCallIds,
-    setIsFirstToolInGroup,
-    setHasEmittedBoxInTurn,
-    addItem,
-    activePtyId,
-    isShellFocused,
-    backgroundTasks
-  ]);
-  const pendingToolGroupItems = (0, import_react99.useMemo)(() => {
-    const remainingTools = trackedTools.filter(
-      (tc) => !pushedToolCallIdsRef.current.has(tc.callId)
-    );
-    const items = [];
-    const appearance = getToolGroupBorderAppearance(
-      { type: "tool_group", tools: trackedTools },
-      activePtyId,
-      !!isShellFocused,
-      [],
-      backgroundTasks
-    );
-    if (remainingTools.length > 0) {
-      const hasBoxInPending = remainingTools.some(
-        (tc) => tc.display?.format !== "notice"
-      );
-      const shouldStartNewBlock = pushedToolCallIds.size === 0 || !hasEmittedBoxInTurnRef.current && hasBoxInPending;
-      items.push({
-        type: "tool_display_group",
-        tools: remainingTools.map((tc) => ({
-          name: tc.name,
-          description: tc.description,
-          ...tc.display,
-          status: tc.status,
-          originalRequestName: tc.originalRequestName
-        })),
-        borderTop: shouldStartNewBlock,
-        borderBottom: false,
-        ...appearance
-      });
-    }
-    const allTerminal = trackedTools.length > 0 && trackedTools.every(
-      (tc) => tc.status === "success" || tc.status === "error" || tc.status === "cancelled"
-    );
-    const allPushed = trackedTools.length > 0 && trackedTools.every((tc) => pushedToolCallIds.has(tc.callId));
-    const anyVisibleInHistory = pushedToolCallIds.size > 0;
-    const anyVisibleInPending = remainingTools.length > 0;
-    if (trackedTools.length > 0 && !(allTerminal && allPushed) && (anyVisibleInHistory || anyVisibleInPending)) {
-      items.push({
-        type: "tool_display_group",
-        tools: [],
-        borderTop: false,
-        borderBottom: true,
-        ...appearance
-      });
-    }
-    return items;
-  }, [
-    trackedTools,
-    pushedToolCallIds,
-    pushedToolCallIdsRef,
-    hasEmittedBoxInTurnRef,
-    activePtyId,
-    isShellFocused,
-    backgroundTasks
-  ]);
-  const pendingHistoryItems = (0, import_react99.useMemo)(
-    () => [pendingHistoryItem, ...pendingToolGroupItems].filter(
-      (i) => i !== void 0 && i !== null
-    ),
-    [pendingHistoryItem, pendingToolGroupItems]
-  );
-  return {
-    streamingState,
-    submitQuery,
-    initError,
-    pendingHistoryItems,
-    thought,
-    cancelOngoingRequest,
-    pendingToolCalls,
-    handleApprovalModeChange,
-    activePtyId,
-    loopDetectionConfirmationRequest,
-    lastOutputTime,
-    backgroundTaskCount,
-    isBackgroundTaskVisible,
-    toggleBackgroundTasks,
-    backgroundCurrentExecution,
-    backgroundTasks,
-    retryStatus,
-    dismissBackgroundTask
-  };
-};
-
 // packages/cli/src/ui/hooks/vim.ts
 var import_react100 = __toESM(require_react(), 1);
 var DIGIT_MULTIPLIER = 10;
@@ -30500,9 +30786,9 @@ var useFolderTrust = (settings, onTrustChange, addItem) => {
   const handleFolderTrustSelect = (0, import_react103.useCallback)(
     async (choice) => {
       const trustLevelMap = {
-        ["trust_folder" /* TRUST_FOLDER */]: TrustLevel.TRUST_FOLDER,
-        ["trust_parent" /* TRUST_PARENT */]: TrustLevel.TRUST_PARENT,
-        ["do_not_trust" /* DO_NOT_TRUST */]: TrustLevel.DO_NOT_TRUST
+        ["trust_folder" /* TRUST_FOLDER */]: "TRUST_FOLDER" /* TRUST_FOLDER */,
+        ["trust_parent" /* TRUST_PARENT */]: "TRUST_PARENT" /* TRUST_PARENT */,
+        ["do_not_trust" /* DO_NOT_TRUST */]: "DO_NOT_TRUST" /* DO_NOT_TRUST */
       };
       const trustLevel = trustLevelMap[choice];
       if (!trustLevel) return;
@@ -30521,7 +30807,7 @@ var useFolderTrust = (settings, onTrustChange, addItem) => {
         }, 100);
         return;
       }
-      const currentIsTrusted = trustLevel === TrustLevel.TRUST_FOLDER || trustLevel === TrustLevel.TRUST_PARENT;
+      const currentIsTrusted = trustLevel === "TRUST_FOLDER" /* TRUST_FOLDER */ || trustLevel === "TRUST_PARENT" /* TRUST_PARENT */;
       onTrustChangeRef.current(currentIsTrusted);
       setIsTrusted(currentIsTrusted);
       const wasTrusted = isTrusted ?? false;
@@ -31529,7 +31815,7 @@ function useMessageQueue({
 var import_react105 = __toESM(require_react(), 1);
 function useMcpStatus(config) {
   const [discoveryState, setDiscoveryState] = (0, import_react105.useState)(
-    () => config.getMcpClientManager()?.getDiscoveryState() ?? MCPDiscoveryState.NOT_STARTED
+    () => config.getMcpClientManager()?.getDiscoveryState() ?? "not_started" /* NOT_STARTED */
   );
   const [mcpServerCount, setMcpServerCount] = (0, import_react105.useState)(
     () => config.getMcpClientManager()?.getMcpServerCount() ?? 0
@@ -31542,12 +31828,12 @@ function useMcpStatus(config) {
         setMcpServerCount(manager.getMcpServerCount());
       }
     };
-    coreEvents.on(CoreEvent.McpClientUpdate, onChange);
+    coreEvents.on("mcp-client-update" /* McpClientUpdate */, onChange);
     return () => {
-      coreEvents.off(CoreEvent.McpClientUpdate, onChange);
+      coreEvents.off("mcp-client-update" /* McpClientUpdate */, onChange);
     };
   }, [config]);
-  const isMcpReady = discoveryState === MCPDiscoveryState.COMPLETED || discoveryState === MCPDiscoveryState.NOT_STARTED && mcpServerCount === 0;
+  const isMcpReady = discoveryState === "completed" /* COMPLETED */ || discoveryState === "not_started" /* NOT_STARTED */ && mcpServerCount === 0;
   return {
     discoveryState,
     mcpServerCount,
@@ -31574,7 +31860,7 @@ function useApprovalModeIndicator({
     (key) => {
       let nextApprovalMode;
       if (keyMatchers["app.toggleYolo" /* TOGGLE_YOLO */](key)) {
-        if (config.isYoloModeDisabled() && config.getApprovalMode() !== ApprovalMode.YOLO) {
+        if (config.isYoloModeDisabled() && config.getApprovalMode() !== "yolo" /* YOLO */) {
           if (addItem) {
             let text = "You cannot enter YOLO mode since it is disabled in your settings.";
             const adminSettings = config.getRemoteAdminSettings();
@@ -31592,21 +31878,21 @@ function useApprovalModeIndicator({
           }
           return;
         }
-        nextApprovalMode = config.getApprovalMode() === ApprovalMode.YOLO ? ApprovalMode.DEFAULT : ApprovalMode.YOLO;
+        nextApprovalMode = config.getApprovalMode() === "yolo" /* YOLO */ ? "default" /* DEFAULT */ : "yolo" /* YOLO */;
       } else if (keyMatchers["app.cycleApprovalMode" /* CYCLE_APPROVAL_MODE */](key)) {
         const currentMode = config.getApprovalMode();
         switch (currentMode) {
-          case ApprovalMode.DEFAULT:
-            nextApprovalMode = ApprovalMode.AUTO_EDIT;
+          case "default" /* DEFAULT */:
+            nextApprovalMode = "autoEdit" /* AUTO_EDIT */;
             break;
-          case ApprovalMode.AUTO_EDIT:
-            nextApprovalMode = allowPlanMode ? ApprovalMode.PLAN : ApprovalMode.DEFAULT;
+          case "autoEdit" /* AUTO_EDIT */:
+            nextApprovalMode = allowPlanMode ? "plan" /* PLAN */ : "default" /* DEFAULT */;
             break;
-          case ApprovalMode.PLAN:
-            nextApprovalMode = ApprovalMode.DEFAULT;
+          case "plan" /* PLAN */:
+            nextApprovalMode = "default" /* DEFAULT */;
             break;
-          case ApprovalMode.YOLO:
-            nextApprovalMode = ApprovalMode.AUTO_EDIT;
+          case "yolo" /* YOLO */:
+            nextApprovalMode = "autoEdit" /* AUTO_EDIT */;
             break;
           default:
         }
@@ -32016,11 +32302,11 @@ var useHookDisplayState = () => {
         removeHook();
       }
     };
-    coreEvents.on(CoreEvent.HookStart, handleHookStart);
-    coreEvents.on(CoreEvent.HookEnd, handleHookEnd);
+    coreEvents.on("hook-start" /* HookStart */, handleHookStart);
+    coreEvents.on("hook-end" /* HookEnd */, handleHookEnd);
     return () => {
-      coreEvents.off(CoreEvent.HookStart, handleHookStart);
-      coreEvents.off(CoreEvent.HookEnd, handleHookEnd);
+      coreEvents.off("hook-start" /* HookStart */, handleHookStart);
+      coreEvents.off("hook-end" /* HookEnd */, handleHookEnd);
       activeTimeouts.forEach(clearTimeout);
       activeTimeouts.clear();
     };
@@ -32663,6 +32949,49 @@ function useVisibilityToggle() {
 var import_jsx_runtime137 = __toESM(require_jsx_runtime(), 1);
 var SHELL_WIDTH_FRACTION = 0.89;
 var SHELL_HEIGHT_PADDING = 10;
+var ENTER_SYNCHRONIZED_OUTPUT = "\x1B[?2026h";
+var EXIT_SYNCHRONIZED_OUTPUT = "\x1B[?2026l";
+var RESIZE_DEBOUNCE_MS = 100;
+var RESIZE_CORK_SAFETY_TIMEOUT_MS = 1e3;
+function discardCorkedStdoutBuffer(stream) {
+  try {
+    const state = stream._writableState;
+    if (state && (state.corked ?? 0) > 0 && Array.isArray(state.buffered)) {
+      const startIndex = state.bufferedIndex ?? 0;
+      const entries = state.buffered.slice(startIndex);
+      let discardedLength = 0;
+      for (const entry of entries) {
+        if (entry?.chunk) {
+          if (typeof entry.chunk === "string") {
+            discardedLength += Buffer.byteLength(
+              entry.chunk,
+              entry.encoding ?? "utf8"
+            );
+          } else if ("length" in entry.chunk && typeof entry.chunk.length === "number") {
+            discardedLength += entry.chunk.length;
+          }
+        }
+      }
+      state.buffered.length = startIndex;
+      state.length = Math.max(0, (state.length ?? 0) - discardedLength);
+      if ("allBuffers" in state) state.allBuffers = true;
+      if ("allNoop" in state) state.allNoop = true;
+      for (const entry of entries) {
+        if (entry && typeof entry.callback === "function") {
+          entry.callback(null);
+        }
+      }
+    }
+  } catch (error) {
+    debugLogger.warn("Failed to discard corked stdout buffer safely:", error);
+  }
+}
+function refreshStdoutSize(stream) {
+  const resizableStream = stream;
+  if (typeof resizableStream._refreshSize === "function") {
+    resizableStream._refreshSize();
+  }
+}
 var AppContainer = (props) => {
   const isHelpDismissKey = useIsHelpDismissKey();
   const keyMatchers = useKeyMatchers();
@@ -32861,7 +33190,7 @@ var AppContainer = (props) => {
       setConfigInitialized(true);
       startupProfiler.flush(config);
       startAutoMemoryIfEnabled(config);
-      const sessionStartSource = resumedSessionData ? SessionStartSource.Resume : SessionStartSource.Startup;
+      const sessionStartSource = resumedSessionData ? "resume" /* Resume */ : "startup" /* Startup */;
       const result = await config.getHookSystem()?.fireSessionStartEvent(sessionStartSource);
       if (result) {
         const additionalContext = result.getAdditionalContext();
@@ -32888,7 +33217,7 @@ var AppContainer = (props) => {
       );
       const ideClient = await IdeClient.getInstance();
       await ideClient.disconnect();
-      await config?.getHookSystem()?.fireSessionEndEvent(SessionEndReason.Exit);
+      await config?.getHookSystem()?.fireSessionEndEvent("exit" /* Exit */);
     };
     registerCleanup(cleanupFn);
     return () => {
@@ -32913,11 +33242,11 @@ var AppContainer = (props) => {
         resetTime: payload.resetTime
       });
     };
-    coreEvents.on(CoreEvent.ModelChanged, handleModelChanged);
-    coreEvents.on(CoreEvent.QuotaChanged, handleQuotaChanged);
+    coreEvents.on("model-changed" /* ModelChanged */, handleModelChanged);
+    coreEvents.on("quota-changed" /* QuotaChanged */, handleQuotaChanged);
     return () => {
-      coreEvents.off(CoreEvent.ModelChanged, handleModelChanged);
-      coreEvents.off(CoreEvent.QuotaChanged, handleQuotaChanged);
+      coreEvents.off("model-changed" /* ModelChanged */, handleModelChanged);
+      coreEvents.off("quota-changed" /* QuotaChanged */, handleQuotaChanged);
     };
   }, [config]);
   (0, import_react119.useEffect)(() => {
@@ -32930,16 +33259,16 @@ var AppContainer = (props) => {
     const handleAgentsDiscovered = (payload) => {
       setNewAgents(payload.agents);
     };
-    coreEvents.on(CoreEvent.SettingsChanged, handleSettingsChanged);
-    coreEvents.on(CoreEvent.AdminSettingsChanged, handleAdminSettingsChanged);
-    coreEvents.on(CoreEvent.AgentsDiscovered, handleAgentsDiscovered);
+    coreEvents.on("settings-changed" /* SettingsChanged */, handleSettingsChanged);
+    coreEvents.on("admin-settings-changed" /* AdminSettingsChanged */, handleAdminSettingsChanged);
+    coreEvents.on("agents-discovered" /* AgentsDiscovered */, handleAgentsDiscovered);
     return () => {
-      coreEvents.off(CoreEvent.SettingsChanged, handleSettingsChanged);
+      coreEvents.off("settings-changed" /* SettingsChanged */, handleSettingsChanged);
       coreEvents.off(
-        CoreEvent.AdminSettingsChanged,
+        "admin-settings-changed" /* AdminSettingsChanged */,
         handleAdminSettingsChanged
       );
-      coreEvents.off(CoreEvent.AgentsDiscovered, handleAgentsDiscovered);
+      coreEvents.off("agents-discovered" /* AgentsDiscovered */, handleAgentsDiscovered);
     };
   }, [settings]);
   const { errorCount, clearErrorCount } = useErrorCount();
@@ -32976,12 +33305,89 @@ var AppContainer = (props) => {
     addConfirmUpdateExtensionRequest,
     addItem: historyManager.addItem
   });
+  const isStdoutCorkedRef = (0, import_react119.useRef)(false);
+  const isRefreshingStaticRef = (0, import_react119.useRef)(false);
+  const resizeCorkSafetyTimerRef = (0, import_react119.useRef)(null);
+  const resizeDebounceTimerRef = (0, import_react119.useRef)(null);
+  const lastStdoutColumnsRef = (0, import_react119.useRef)(
+    stdout.columns ?? process12.stdout.columns ?? terminalWidth
+  );
+  const lastRefreshedColumnsRef = (0, import_react119.useRef)(terminalWidth);
+  const terminalWidthRef = (0, import_react119.useRef)(terminalWidth);
+  terminalWidthRef.current = terminalWidth;
+  const clearResizeCorkSafetyTimer = (0, import_react119.useCallback)(() => {
+    if (resizeCorkSafetyTimerRef.current) {
+      clearTimeout(resizeCorkSafetyTimerRef.current);
+      resizeCorkSafetyTimerRef.current = null;
+    }
+  }, []);
+  const clearResizeDebounceTimer = (0, import_react119.useCallback)(() => {
+    if (resizeDebounceTimerRef.current) {
+      clearTimeout(resizeDebounceTimerRef.current);
+      resizeDebounceTimerRef.current = null;
+    }
+  }, []);
+  const corkStdout = (0, import_react119.useCallback)(() => {
+    if (!isStdoutCorkedRef.current && typeof stdout.cork === "function") {
+      stdout.cork();
+      isStdoutCorkedRef.current = true;
+    }
+  }, [stdout]);
+  const uncorkStdout = (0, import_react119.useCallback)(() => {
+    clearResizeCorkSafetyTimer();
+    if (isStdoutCorkedRef.current && typeof stdout.uncork === "function") {
+      isStdoutCorkedRef.current = false;
+      stdout.uncork();
+    }
+  }, [stdout, clearResizeCorkSafetyTimer]);
   const refreshStatic = (0, import_react119.useCallback)(() => {
     if (!isAlternateBuffer && !config.getUseTerminalBuffer()) {
+      clearResizeDebounceTimer();
+      refreshStdoutSize(stdout);
+      if (typeof stdout.prependListener === "function" && stdout.columns !== void 0 && stdout.columns !== terminalWidthRef.current) {
+        corkStdout();
+        clearResizeCorkSafetyTimer();
+        resizeCorkSafetyTimerRef.current = setTimeout(() => {
+          discardCorkedStdoutBuffer(stdout);
+          uncorkStdout();
+        }, RESIZE_CORK_SAFETY_TIMEOUT_MS);
+        return;
+      }
+      clearResizeCorkSafetyTimer();
+      lastRefreshedColumnsRef.current = terminalWidthRef.current;
+      if (typeof stdout.cork === "function") {
+        corkStdout();
+        discardCorkedStdoutBuffer(stdout);
+        isRefreshingStaticRef.current = true;
+        stdout.write(ENTER_SYNCHRONIZED_OUTPUT);
+      }
       stdout.write(base_exports.clearTerminal);
       setHistoryRemountKey((prev) => prev + 1);
     }
-  }, [setHistoryRemountKey, isAlternateBuffer, stdout, config]);
+  }, [
+    setHistoryRemountKey,
+    isAlternateBuffer,
+    stdout,
+    config,
+    clearResizeDebounceTimer,
+    clearResizeCorkSafetyTimer,
+    corkStdout,
+    uncorkStdout
+  ]);
+  (0, import_react119.useLayoutEffect)(() => {
+    if (isRefreshingStaticRef.current) {
+      isRefreshingStaticRef.current = false;
+      refreshStdoutSize(stdout);
+      if (stdout.columns !== void 0 && stdout.columns !== lastRefreshedColumnsRef.current) {
+        discardCorkedStdoutBuffer(stdout);
+        stdout.write(EXIT_SYNCHRONIZED_OUTPUT);
+        uncorkStdout();
+        return;
+      }
+      stdout.write(EXIT_SYNCHRONIZED_OUTPUT);
+      uncorkStdout();
+    }
+  }, [historyRemountKey, stdout, uncorkStdout]);
   const shouldUseAlternateScreen = shouldEnterAlternateScreen(
     isAlternateBuffer,
     config.getScreenReader()
@@ -33006,11 +33412,11 @@ var AppContainer = (props) => {
     exitEditorDialog
   } = useEditorSettings(settings, setEditorError, historyManager.addItem);
   (0, import_react119.useEffect)(() => {
-    coreEvents.on(CoreEvent.ExternalEditorClosed, handleEditorClose);
-    coreEvents.on(CoreEvent.RequestEditorSelection, openEditorDialog);
+    coreEvents.on("external-editor-closed" /* ExternalEditorClosed */, handleEditorClose);
+    coreEvents.on("request-editor-selection" /* RequestEditorSelection */, openEditorDialog);
     return () => {
-      coreEvents.off(CoreEvent.ExternalEditorClosed, handleEditorClose);
-      coreEvents.off(CoreEvent.RequestEditorSelection, openEditorDialog);
+      coreEvents.off("external-editor-closed" /* ExternalEditorClosed */, handleEditorClose);
+      coreEvents.off("request-editor-selection" /* RequestEditorSelection */, openEditorDialog);
     };
   }, [handleEditorClose, openEditorDialog]);
   (0, import_react119.useEffect)(() => {
@@ -33081,7 +33487,7 @@ var AppContainer = (props) => {
     errorVerbosity: settings.merged.ui.errorVerbosity
   });
   const isAuthDialogOpen = authState === "updating" /* Updating */;
-  const isAuthenticating = authState === "unauthenticated" /* Unauthenticated */ && settings.merged.security.auth.selectedType !== AuthType.USE_GEMINI;
+  const isAuthenticating = authState === "unauthenticated" /* Unauthenticated */ && settings.merged.security.auth.selectedType !== "gemini-api-key" /* USE_GEMINI */;
   const isGeminiClientInitialized = config.getGeminiClient()?.isInitialized();
   const { loadHistoryForResume, isResuming } = useSessionResume({
     config,
@@ -33109,7 +33515,7 @@ var AppContainer = (props) => {
     async (authType, scope) => {
       if (authType) {
         const previousAuthType = config.getContentGeneratorConfig()?.authType ?? "unknown";
-        if (authType === AuthType.LOGIN_WITH_GOOGLE) {
+        if (authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */) {
           setAuthContext({ requiresRestart: true });
         } else {
           setAuthContext({});
@@ -33137,7 +33543,7 @@ var AppContainer = (props) => {
           );
           return;
         }
-        if (authType === AuthType.LOGIN_WITH_GOOGLE && config.isBrowserLaunchSuppressed()) {
+        if (authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ && config.isBrowserLaunchSuppressed()) {
           writeToStdout(`
 ----------------------------------------------------------------
 Logging in with Google... Restarting Gemini CLI to continue.
@@ -33160,7 +33566,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         }
         await saveApiKey(apiKey);
         await reloadApiKey();
-        await config.refreshAuth(AuthType.USE_GEMINI);
+        await config.refreshAuth("gemini-api-key" /* USE_GEMINI */);
         setAuthState("authenticated" /* Authenticated */);
       } catch (e) {
         onAuthError(
@@ -33185,7 +33591,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         `Authentication is enforced to be ${settings.merged.security.auth.enforcedType}, but you are currently using ${settings.merged.security.auth.selectedType}.`
       );
     } else if (settings.merged.security.auth.selectedType && !settings.merged.security.auth.useExternal) {
-      if (settings.merged.security.auth.selectedType === AuthType.USE_GEMINI) {
+      if (settings.merged.security.auth.selectedType === "gemini-api-key" /* USE_GEMINI */) {
         return;
       }
       const authMethod = settings.merged.security.auth.selectedType;
@@ -33226,6 +33632,28 @@ Logging in with Google... Restarting Gemini CLI to continue.
     toggleCleanUiDetailsVisible,
     revealCleanUiDetailsTemporarily
   } = useVisibilityToggle();
+  const cancelPromiseRef = (0, import_react119.useRef)(null);
+  const awaitCancelPromise = (0, import_react119.useCallback)(async () => {
+    if (!cancelPromiseRef.current) {
+      return;
+    }
+    let timeoutId2;
+    try {
+      await Promise.race([
+        cancelPromiseRef.current,
+        new Promise((resolve3) => {
+          timeoutId2 = setTimeout(resolve3, 1e3);
+        })
+      ]);
+    } catch (error) {
+      debugLogger.warn(`Error awaiting cancellation: ${error}`);
+    } finally {
+      if (timeoutId2 !== void 0) {
+        clearTimeout(timeoutId2);
+      }
+      cancelPromiseRef.current = null;
+    }
+  }, []);
   const slashCommandActions = (0, import_react119.useMemo)(
     () => ({
       openAuthDialog: () => setAuthState("updating" /* Updating */),
@@ -33242,6 +33670,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         closeThemeDialog();
         setQuittingMessages(messages);
         setTimeout(async () => {
+          await awaitCancelPromise();
           await runExitCleanup();
           process12.exit(0);
         }, 100);
@@ -33277,6 +33706,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       openVoiceModelDialog,
       openAgentConfigDialog,
       setQuittingMessages,
+      awaitCancelPromise,
       setDebugMessage,
       setShowPrivacyNotice,
       setCorgiMode,
@@ -33321,9 +33751,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
         }
       });
     };
-    coreEvents.on(CoreEvent.ConsentRequest, handleConsentRequest);
+    coreEvents.on("consent-request" /* ConsentRequest */, handleConsentRequest);
     return () => {
-      coreEvents.off(CoreEvent.ConsentRequest, handleConsentRequest);
+      coreEvents.off("consent-request" /* ConsentRequest */, handleConsentRequest);
     };
   }, []);
   const performMemoryRefresh = (0, import_react119.useCallback)(async () => {
@@ -33423,6 +33853,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useAgentStream({
       agent: streamAgent,
+      config,
       addItem: historyManager.addItem,
       onCancelSubmit,
       isShellFocused: embeddedShellFocused,
@@ -33777,15 +34208,18 @@ ${queuedText}` : queuedText;
   const [showFullTodos, setShowFullTodos] = (0, import_react119.useState)(false);
   const [renderMarkdown, setRenderMarkdown] = (0, import_react119.useState)(true);
   const handleExitRepeat = (0, import_react119.useCallback)(
-    (count) => {
+    async (count) => {
       if (count > 2) {
         recordExitFail(config);
       }
       if (count > 1) {
-        void handleSlashCommand("/quit", void 0, void 0, false);
+        if (cancelPromiseRef.current) {
+          await awaitCancelPromise();
+        }
+        await handleSlashCommand("/quit", void 0, void 0, false);
       }
     },
-    [config, handleSlashCommand]
+    [config, handleSlashCommand, awaitCancelPromise]
   );
   const { pressCount: ctrlCPressCount, handlePress: handleCtrlCPress } = useRepeatedKeyPress({
     windowMs: WARNING_PROMPT_DURATION_MS,
@@ -33813,6 +34247,7 @@ ${queuedText}` : queuedText;
     needsRestart: ideNeedsRestart,
     restartReason: ideTrustRestartReason
   } = useIdeTrustListener();
+  const prevWidthRef = (0, import_react119.useRef)(terminalWidth);
   useIncludeDirsTrust(config, isTrustedFolder, historyManager, setCustomDialog);
   const tabFocusTimeoutRef = (0, import_react119.useRef)(null);
   (0, import_react119.useEffect)(() => {
@@ -33862,6 +34297,64 @@ ${queuedText}` : queuedText;
       setShowIdeRestartPrompt(true);
     }
   }, [ideNeedsRestart]);
+  (0, import_react119.useEffect)(() => {
+    if (isAlternateBuffer || config.getUseTerminalBuffer() || typeof stdout.prependListener !== "function") {
+      return;
+    }
+    const handleResizeStart = () => {
+      const currentColumns = stdout.columns ?? process12.stdout.columns;
+      if (currentColumns !== void 0 && currentColumns !== lastStdoutColumnsRef.current) {
+        lastStdoutColumnsRef.current = currentColumns;
+        corkStdout();
+        clearResizeCorkSafetyTimer();
+        resizeCorkSafetyTimerRef.current = setTimeout(() => {
+          discardCorkedStdoutBuffer(stdout);
+          uncorkStdout();
+        }, RESIZE_CORK_SAFETY_TIMEOUT_MS);
+      }
+    };
+    stdout.prependListener("resize", handleResizeStart);
+    return () => {
+      stdout.off("resize", handleResizeStart);
+      clearResizeDebounceTimer();
+      if (isRefreshingStaticRef.current) {
+        isRefreshingStaticRef.current = false;
+        stdout.write(EXIT_SYNCHRONIZED_OUTPUT);
+      }
+      uncorkStdout();
+    };
+  }, [
+    stdout,
+    isAlternateBuffer,
+    config,
+    corkStdout,
+    uncorkStdout,
+    clearResizeDebounceTimer,
+    clearResizeCorkSafetyTimer
+  ]);
+  (0, import_react119.useEffect)(() => {
+    if (prevWidthRef.current === terminalWidth) {
+      return;
+    }
+    prevWidthRef.current = terminalWidth;
+    if (isAlternateBuffer || config.getUseTerminalBuffer()) {
+      clearResizeDebounceTimer();
+      return;
+    }
+    clearResizeDebounceTimer();
+    resizeDebounceTimerRef.current = setTimeout(() => {
+      refreshStatic();
+    }, RESIZE_DEBOUNCE_MS);
+    return () => {
+      clearResizeDebounceTimer();
+    };
+  }, [
+    terminalWidth,
+    refreshStatic,
+    clearResizeDebounceTimer,
+    isAlternateBuffer,
+    config
+  ]);
   (0, import_react119.useEffect)(() => {
     const unsubscribe = ideContextStore.subscribe(setIdeContextState);
     setIdeContextState(ideContextStore.get());
@@ -33893,7 +34386,7 @@ ${queuedText}` : queuedText;
     [handleSlashCommand, settings]
   );
   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 loginRestartMessage = settings.merged.security.auth.selectedType === "vertex-ai" /* USE_VERTEX_AI */ ? "Authenticating to Vertex AI in Cloud Shell requires a restart to apply project settings." : void 0;
   const dialogsVisible = shouldShowIdePrompt || isFolderTrustDialogOpen || isPolicyUpdateDialogOpen || adminSettingsChanged || !!commandConfirmationRequest || !!authConsentRequest || !!permissionConfirmationRequest || !!customDialog || confirmUpdateExtensionRequests.length > 0 || !!loopDetectionConfirmationRequest || isThemeDialogOpen || isSettingsDialogOpen || isModelDialogOpen || isVoiceModelDialogOpen || isAgentConfigDialogOpen || isPermissionsDialogOpen || isAuthenticating || isAuthDialogOpen || isEditorDialogOpen || showPrivacyNotice || showIdeRestartPrompt || !!proQuotaRequest || !!validationRequest || !!overageMenuRequest || !!emptyWalletRequest || isSessionBrowserOpen || authState === "awaiting_api_key_input" /* AwaitingApiKeyInput */ || isAwaitingLoginRestart || !!newAgents;
   const handleGlobalKeypress = (0, import_react119.useCallback)(
     (key) => {
@@ -33916,7 +34409,10 @@ ${queuedText}` : queuedText;
         return true;
       }
       if (keyMatchers["basic.quit" /* QUIT */](key)) {
-        void cancelOngoingRequest?.();
+        const cancelPromise = cancelOngoingRequest?.();
+        if (cancelPromise) {
+          cancelPromiseRef.current = cancelPromise;
+        }
         handleCtrlCPress();
         return true;
       } else if (keyMatchers["basic.exit" /* EXIT */](key)) {
@@ -33983,7 +34479,7 @@ ${queuedText}` : queuedText;
       if (keyMatchers["app.showErrorDetails" /* SHOW_ERROR_DETAILS */](key)) {
         if (settings.merged.general.devtools) {
           void (async () => {
-            const { toggleDevToolsPanel } = await import("./devtoolsService-CSRUFNFL.js");
+            const { toggleDevToolsPanel } = await import("./devtoolsService-HIZA3JGR.js");
             await toggleDevToolsPanel(
               config,
               showErrorDetails,
@@ -34204,12 +34700,12 @@ ${queuedText}` : queuedText;
         Date.now()
       );
     };
-    coreEvents.on(CoreEvent.UserFeedback, handleUserFeedback);
-    coreEvents.on(CoreEvent.HookSystemMessage, handleHookSystemMessage);
+    coreEvents.on("user-feedback" /* UserFeedback */, handleUserFeedback);
+    coreEvents.on("hook-system-message" /* HookSystemMessage */, handleHookSystemMessage);
     coreEvents.drainBacklogs();
     return () => {
-      coreEvents.off(CoreEvent.UserFeedback, handleUserFeedback);
-      coreEvents.off(CoreEvent.HookSystemMessage, handleHookSystemMessage);
+      coreEvents.off("user-feedback" /* UserFeedback */, handleUserFeedback);
+      coreEvents.off("hook-system-message" /* HookSystemMessage */, handleHookSystemMessage);
     };
   }, [historyManager]);
   const nightly = props.version.includes("nightly");
@@ -34318,9 +34814,9 @@ ${queuedText}` : queuedText;
     const handleMemoryChanged = (result) => {
       setGeminiMdFileCount(result.fileCount);
     };
-    coreEvents.on(CoreEvent.MemoryChanged, handleMemoryChanged);
+    coreEvents.on("memory-changed" /* MemoryChanged */, handleMemoryChanged);
     return () => {
-      coreEvents.off(CoreEvent.MemoryChanged, handleMemoryChanged);
+      coreEvents.off("memory-changed" /* MemoryChanged */, handleMemoryChanged);
     };
   }, []);
   (0, import_react119.useEffect)(() => {