@google/gemini-cli 0.46.0-preview.0 → 0.46.0-preview.1

package/bundle/{interactiveCli-7SIMXKNU.js → interactiveCli-OEFOYFJU.js}

@@ -155,13 +155,13 @@ import {
   widestLineFromStyledChars,
   wordBreakStyledChars,
   wrapStyledChars
-} from "./chunk-773AJHDP.js";
+} from "./chunk-O3UKVEBS.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
 import {
   require_source
-} from "./chunk-BOJOJVNV.js";
+} from "./chunk-RXYIE5L5.js";
 import {
   ACTIVE_SHELL_MAX_LINES,
   COMPACT_TOOL_SUBVIEW_MAX_LINES,
@@ -211,33 +211,37 @@ import {
   stringWidth,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-4K3E3G6Z.js";
+} from "./chunk-5CWORGE3.js";
 import {
   handleAutoUpdate,
   isDevelopment,
   relaunchApp,
   setUpdateHandler
-} from "./chunk-SHFHGDWR.js";
+} from "./chunk-JPYTHGMI.js";
 import {
   isTodoList,
   mapCoreStatusToDisplayStatus,
   require_react
-} from "./chunk-TDYUKPZH.js";
+} from "./chunk-WRWCUHAM.js";
 import {
   registerCleanup,
   removeCleanup,
   runExitCleanup,
   setupTtyCheck
-} from "./chunk-2GMVQS2Q.js";
+} from "./chunk-7Y6NU65D.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,
@@ -259,12 +263,19 @@ import {
   GEMMA_4_31B_IT_MODEL,
   GLOB_DISPLAY_NAME,
   GREP_DISPLAY_NAME,
+  GeminiCliOperation,
+  GeminiEventType,
   GitService,
   IdeClient,
+  Kind,
   LS_DISPLAY_NAME,
   LegacyAgentProtocol,
   LlmRole,
   Logger,
+  MCPDiscoveryState,
+  MCPServerStatus,
+  MessageBusType,
+  MessageSenderType,
   ModelNotFoundError,
   ModelSlashCommandEvent,
   OverageMenuShownEvent,
@@ -276,20 +287,27 @@ import {
   PREVIEW_GEMINI_MODEL,
   PolicyIntegrityManager,
   ProjectIdRequiredError,
+  QuestionType,
   READ_FILE_DISPLAY_NAME,
   READ_MANY_FILES_DISPLAY_NAME,
   RELEASE_CHANNEL_STABILITY,
   ROOT_SCHEDULER_ID,
   SHELL_TOOL_NAME,
   Scheduler,
+  SessionEndReason,
+  SessionStartSource,
   ShellExecutionService,
   SlashCommandStatus,
   Storage,
+  SubagentState,
   TOPIC_PARAM_STRATEGIC_INTENT,
   TOPIC_PARAM_SUMMARY,
   TOPIC_PARAM_TITLE,
   TerminalQuotaError,
+  ToolConfirmationOutcome,
+  ToolErrorType,
   TranscriptionFactory,
+  TrustLevel,
   UPDATE_TOPIC_DISPLAY_NAME,
   UPDATE_TOPIC_TOOL_NAME,
   UnauthorizedError,
@@ -301,6 +319,7 @@ import {
   WEB_FETCH_DISPLAY_NAME,
   WEB_SEARCH_DISPLAY_NAME,
   WRITE_FILE_DISPLAY_NAME,
+  WarningPriority,
   WhisperModelManager,
   addMCPStatusChangeListener,
   allowEditorTypeInSandbox,
@@ -410,7 +429,7 @@ import {
   validatePlanContent,
   validatePlanPath,
   writeToStdout
-} from "./chunk-HHFFICNK.js";
+} from "./chunk-ITC7TFJU.js";
 import "./chunk-6HI7VNOG.js";
 import "./chunk-TUDYL3X4.js";
 import "./chunk-IUUIT4SU.js";
@@ -5036,7 +5055,7 @@ function calculateShellMaxLines(options) {
   if (isAlternateBuffer && isThisShellFocused2 && !constrainHeight) {
     return maxLinesBasedOnHeight;
   }
-  const isExecuting = status === "executing" /* Executing */;
+  const isExecuting = status === CoreToolCallStatus.Executing;
   const shellMaxLinesLimit = isExecuting ? ACTIVE_SHELL_MAX_LINES - SHELL_CONTENT_OVERHEAD : COMPLETED_SHELL_MAX_LINES - SHELL_CONTENT_OVERHEAD;
   return Math.min(maxLinesBasedOnHeight, shellMaxLinesLimit);
 }
@@ -5070,10 +5089,10 @@ function isShellTool(name) {
   return name === SHELL_COMMAND_NAME || name === SHELL_NAME || name === SHELL_TOOL_NAME || normalized === "shell";
 }
 function isThisShellFocusable(name, status, config) {
-  return !!(isShellTool(name) && status === "executing" /* Executing */ && config?.getEnableInteractiveShell());
+  return !!(isShellTool(name) && status === CoreToolCallStatus.Executing && config?.getEnableInteractiveShell());
 }
 function isThisShellFocused(name, status, ptyId, activeShellPtyId, embeddedShellFocused) {
-  return !!(isShellTool(name) && status === "executing" /* Executing */ && ptyId === activeShellPtyId && embeddedShellFocused);
+  return !!(isShellTool(name) && status === CoreToolCallStatus.Executing && ptyId === activeShellPtyId && embeddedShellFocused);
 }
 function useFocusHint(isThisShellFocusable2, isThisShellFocused2, resultDisplay) {
   const [userHasFocused, setUserHasFocused] = (0, import_react9.useState)(false);
@@ -5233,13 +5252,13 @@ var formatToolArgs = (args) => {
 var SubagentProgressDisplay = ({ progress, terminalWidth, historyOverrides }) => {
   let headerText;
   let headerColor = theme.text.secondary;
-  if (progress.state === "cancelled" /* CANCELLED */) {
+  if (progress.state === SubagentState.CANCELLED) {
     headerText = `Subagent ${progress.agentName} was cancelled.`;
     headerColor = theme.status.warning;
-  } else if (progress.state === "error" /* ERROR */) {
+  } else if (progress.state === SubagentState.ERROR) {
     headerText = `Subagent ${progress.agentName} failed.`;
     headerColor = theme.status.error;
-  } else if (progress.state === "completed" /* COMPLETED */) {
+  } else if (progress.state === SubagentState.COMPLETED) {
     headerText = `Subagent ${progress.agentName} completed.`;
     headerColor = theme.status.success;
   } else {
@@ -5259,7 +5278,7 @@ var SubagentProgressDisplay = ({ progress, terminalWidth, historyOverrides }) =>
             /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { color, children: item.content }) })
           ] }, item.id);
         } else if (item.type === "tool_call") {
-          const statusSymbol = item.status === "running" /* RUNNING */ ? /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(build_default, { type: "dots" }) : item.status === "completed" /* COMPLETED */ ? /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { color: theme.status.success, children: TOOL_STATUS.SUCCESS }) : item.status === "cancelled" /* CANCELLED */ ? /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { color: theme.status.warning, bold: true, children: TOOL_STATUS.CANCELED }) : /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { color: theme.status.error, children: TOOL_STATUS.ERROR });
+          const statusSymbol = item.status === SubagentState.RUNNING ? /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(build_default, { type: "dots" }) : item.status === SubagentState.COMPLETED ? /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { color: theme.status.success, children: TOOL_STATUS.SUCCESS }) : item.status === SubagentState.CANCELLED ? /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { color: theme.status.warning, bold: true, children: TOOL_STATUS.CANCELED }) : /* @__PURE__ */ (0, import_jsx_runtime15.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_runtime15.jsxs)(Box_default, { flexDirection: "row", children: [
@@ -5270,7 +5289,7 @@ var SubagentProgressDisplay = ({ progress, terminalWidth, historyOverrides }) =>
                 {
                   bold: true,
                   color: theme.text.primary,
-                  strikethrough: item.status === "cancelled" /* CANCELLED */,
+                  strikethrough: item.status === SubagentState.CANCELLED,
                   children: item.displayName || item.content
                 }
               ),
@@ -5279,7 +5298,7 @@ var SubagentProgressDisplay = ({ progress, terminalWidth, historyOverrides }) =>
                 {
                   color: theme.text.secondary,
                   wrap: "truncate",
-                  strikethrough: item.status === "cancelled" /* CANCELLED */,
+                  strikethrough: item.status === SubagentState.CANCELLED,
                   children: displayArgs
                 }
               ) })
@@ -5299,7 +5318,7 @@ var SubagentProgressDisplay = ({ progress, terminalWidth, historyOverrides }) =>
         MarkdownDisplay,
         {
           text: safeJsonToMarkdown(progress.result),
-          isPending: progress.state !== "completed" /* COMPLETED */,
+          isPending: progress.state !== SubagentState.COMPLETED,
           terminalWidth
         }
       )
@@ -5653,14 +5672,14 @@ var ToolActionsProvider = (props) => {
       }
       const details = tool.confirmationDetails;
       if (details?.type === "edit" && isDiffingEnabled && "filePath" in details) {
-        const cliOutcome = outcome === "cancel" /* Cancel */ ? "rejected" : "accepted";
+        const cliOutcome = outcome === ToolConfirmationOutcome.Cancel ? "rejected" : "accepted";
         await ideClient?.resolveDiffFromCli(details.filePath, cliOutcome);
       }
       if (tool.correlationId) {
         await config.getMessageBus().publish({
-          type: "tool-confirmation-response" /* TOOL_CONFIRMATION_RESPONSE */,
+          type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
           correlationId: tool.correlationId,
-          confirmed: outcome !== "cancel" /* Cancel */,
+          confirmed: outcome !== ToolConfirmationOutcome.Cancel,
           requiresUserConfirmation: false,
           outcome,
           payload
@@ -5679,7 +5698,7 @@ var ToolActionsProvider = (props) => {
   );
   const cancel = (0, import_react12.useCallback)(
     async (callId) => {
-      await confirm(callId, "cancel" /* Cancel */);
+      await confirm(callId, ToolConfirmationOutcome.Cancel);
     },
     [confirm]
   );
@@ -5798,7 +5817,7 @@ var ToolMessage = ({
         paddingX: 1,
         flexDirection: "column",
         children: [
-          status === "executing" /* Executing */ && progress !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+          status === CoreToolCallStatus.Executing && progress !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
             McpProgressIndicator,
             {
               progress,
@@ -5815,8 +5834,8 @@ var ToolMessage = ({
               terminalWidth,
               renderOutputAsMarkdown,
               hasFocus: isThisShellFocused2,
-              maxLines: kind === "agent" /* Agent */ && availableTerminalHeight !== void 0 ? SUBAGENT_MAX_LINES : void 0,
-              overflowDirection: kind === "agent" /* Agent */ ? "bottom" : "top"
+              maxLines: kind === Kind.Agent && availableTerminalHeight !== void 0 ? SUBAGENT_MAX_LINES : void 0,
+              overflowDirection: kind === Kind.Agent ? "bottom" : "top"
             }
           ),
           isThisShellFocused2 && config && /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(Box_default, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
@@ -6132,7 +6151,7 @@ function getInitialTrustState(settings, cwd5, isCurrentWorkspace) {
     settings.merged,
     process3.cwd()
   );
-  const isInheritedTrust = isTrusted && (!explicitTrustLevel || explicitTrustLevel === "DO_NOT_TRUST" /* DO_NOT_TRUST */);
+  const isInheritedTrust = isTrusted && (!explicitTrustLevel || explicitTrustLevel === TrustLevel.DO_NOT_TRUST);
   return {
     currentTrustLevel: explicitTrustLevel,
     isInheritedTrustFromParent: !!(source === "file" && isInheritedTrust),
@@ -6177,7 +6196,7 @@ var usePermissionsModifyTrust = (onExit, addItem, targetDirectory) => {
         process3.cwd(),
         newConfig
       );
-      if (trustLevel === "DO_NOT_TRUST" /* DO_NOT_TRUST */ && isTrusted) {
+      if (trustLevel === TrustLevel.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.";
@@ -6251,18 +6270,18 @@ function PermissionsModifyTrustDialog({
   const TRUST_LEVEL_ITEMS = [
     {
       label: `Trust this folder (${dirName})`,
-      value: "TRUST_FOLDER" /* TRUST_FOLDER */,
-      key: "TRUST_FOLDER" /* TRUST_FOLDER */
+      value: TrustLevel.TRUST_FOLDER,
+      key: TrustLevel.TRUST_FOLDER
     },
     {
       label: `Trust parent folder (${parentFolder})`,
-      value: "TRUST_PARENT" /* TRUST_PARENT */,
-      key: "TRUST_PARENT" /* TRUST_PARENT */
+      value: TrustLevel.TRUST_PARENT,
+      key: TrustLevel.TRUST_PARENT
     },
     {
       label: "Don't trust",
-      value: "DO_NOT_TRUST" /* DO_NOT_TRUST */,
-      key: "DO_NOT_TRUST" /* DO_NOT_TRUST */
+      value: TrustLevel.DO_NOT_TRUST,
+      key: TrustLevel.DO_NOT_TRUST
     }
   ];
   const {
@@ -6502,7 +6521,7 @@ var ShellToolMessage = ({
     maxLinesLimit: maxLines
   });
   import_react17.default.useEffect(() => {
-    const isExecuting = status === "executing" /* Executing */;
+    const isExecuting = status === CoreToolCallStatus.Executing;
     if (isExecuting && ptyId) {
       try {
         const childWidth = terminalWidth - 4;
@@ -6715,13 +6734,13 @@ var SubagentGroupDisplay = ({
     const singleAgent = toolCalls[0].resultDisplay;
     if (isSubagentProgress(singleAgent)) {
       switch (singleAgent.state) {
-        case "completed" /* COMPLETED */:
+        case SubagentState.COMPLETED:
           headerText = "Agent Completed";
           break;
-        case "cancelled" /* CANCELLED */:
+        case SubagentState.CANCELLED:
           headerText = "Agent Cancelled";
           break;
-        case "error" /* ERROR */:
+        case SubagentState.ERROR:
           headerText = "Agent Error";
           break;
         default:
@@ -6737,8 +6756,8 @@ var SubagentGroupDisplay = ({
     for (const tc of toolCalls) {
       const progress = tc.resultDisplay;
       if (isSubagentProgress(progress)) {
-        if (progress.state === "completed" /* COMPLETED */) completedCount++;
-        else if (progress.state === "running" /* RUNNING */) runningCount++;
+        if (progress.state === SubagentState.COMPLETED) completedCount++;
+        else if (progress.state === SubagentState.RUNNING) runningCount++;
       } else {
         runningCount++;
       }
@@ -6817,7 +6836,7 @@ var SubagentGroupDisplay = ({
           if (!isExpanded) {
             let content = "Starting...";
             let formattedArgs;
-            if (progress.state === "completed" /* COMPLETED */) {
+            if (progress.state === SubagentState.COMPLETED) {
               if (progress.terminateReason && progress.terminateReason !== "GOAL") {
                 content = `Finished Early (${progress.terminateReason})`;
               } else {
@@ -6831,17 +6850,17 @@ var SubagentGroupDisplay = ({
                 formattedArgs = formatToolArgs(lastActivity.args);
               }
             }
-            const displayArgs = progress.state === "completed" /* COMPLETED */ ? "" : formattedArgs;
+            const displayArgs = progress.state === SubagentState.COMPLETED ? "" : formattedArgs;
             const renderStatusIcon = () => {
-              const state = progress.state ?? "running" /* RUNNING */;
+              const state = progress.state ?? SubagentState.RUNNING;
               switch (state) {
-                case "running" /* RUNNING */:
+                case SubagentState.RUNNING:
                   return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Text, { color: theme.text.primary, children: "!" });
-                case "completed" /* COMPLETED */:
+                case SubagentState.COMPLETED:
                   return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Text, { color: theme.status.success, children: "\u2713" });
-                case "cancelled" /* CANCELLED */:
+                case SubagentState.CANCELLED:
                   return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Text, { color: theme.status.warning, children: "\u2139" });
-                case "error" /* ERROR */:
+                case SubagentState.ERROR:
                   return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Text, { color: theme.status.error, children: "\u2717" });
                 default:
                   return checkExhaustive(state);
@@ -6894,22 +6913,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 === "success" /* Success */ || status === "executing" /* Executing */ || status === "awaiting_approval" /* AwaitingApproval */;
+  const isAcceptedOrConfirming = status === CoreToolCallStatus.Success || status === CoreToolCallStatus.Executing || status === CoreToolCallStatus.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_runtime26.jsx)(Box_default, { flexDirection: "row", children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Text, { color: theme.text.secondary, wrap: "truncate-end", children: diff.fileName }) });
   let resultSummary = "";
   let resultColor = theme.text.secondary;
-  if (status === "awaiting_approval" /* AwaitingApproval */) {
+  if (status === CoreToolCallStatus.AwaitingApproval) {
     resultSummary = "Confirming";
-  } else if (status === "success" /* Success */ || status === "executing" /* Executing */) {
+  } else if (status === CoreToolCallStatus.Success || status === CoreToolCallStatus.Executing) {
     resultSummary = "Accepted";
     resultColor = theme.text.accent;
-  } else if (status === "cancelled" /* Cancelled */) {
+  } else if (status === CoreToolCallStatus.Cancelled) {
     resultSummary = "Rejected";
     resultColor = theme.status.error;
-  } else if (status === "error" /* Error */) {
+  } else if (status === CoreToolCallStatus.Error) {
     resultSummary = typeof resultDisplay === "string" ? resultDisplay : "Failed";
     resultColor = theme.status.error;
   }
@@ -6940,7 +6959,7 @@ function getFileOpData(diff, status, resultDisplay, terminalWidth, availableTerm
       filename: diff.fileName,
       terminalWidth: terminalWidth - PAYLOAD_MARGIN_LEFT,
       availableTerminalHeight,
-      disableColor: status === "cancelled" /* Cancelled */
+      disableColor: status === CoreToolCallStatus.Cancelled
     }
   );
   return { description, summary, payload };
@@ -7068,10 +7087,10 @@ var DenseToolMessage = (props) => {
     if (isGrepResult(resultDisplay)) {
       return getGenericSuccessData(resultDisplay, originalDescription);
     }
-    if (status === "success" /* Success */ && resultDisplay) {
+    if (status === CoreToolCallStatus.Success && resultDisplay) {
       return getGenericSuccessData(resultDisplay, originalDescription);
     }
-    if (status === "error" /* Error */) {
+    if (status === CoreToolCallStatus.Error) {
       const text = typeof resultDisplay === "string" ? resultDisplay.replace(/\n/g, " ") : "Failed";
       const errorSummary = /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(Text, { color: theme.status.error, wrap: "truncate-end", children: [
         "\u2192 ",
@@ -7112,7 +7131,7 @@ var DenseToolMessage = (props) => {
         language: fileExtension,
         maxWidth: terminalWidth - PAYLOAD_MARGIN_LEFT,
         settings,
-        disableColor: status === "cancelled" /* Cancelled */,
+        disableColor: status === CoreToolCallStatus.Cancelled,
         returnLines: true
       });
     } else {
@@ -7120,7 +7139,7 @@ var DenseToolMessage = (props) => {
         parsedLines,
         filename: diff.fileName,
         terminalWidth: terminalWidth - PAYLOAD_MARGIN_LEFT,
-        disableColor: status === "cancelled" /* Cancelled */
+        disableColor: status === CoreToolCallStatus.Cancelled
       });
     }
   }, [diff, isExpanded, isAlternateBuffer, terminalWidth, settings, status]);
@@ -7250,7 +7269,7 @@ function isToolExecuting(pendingHistoryItems) {
   return pendingHistoryItems.some((item) => {
     if (item && item.type === "tool_group") {
       return item.tools.some(
-        (tool) => "executing" /* Executing */ === tool.status
+        (tool) => CoreToolCallStatus.Executing === tool.status
       );
     }
     return false;
@@ -7259,7 +7278,7 @@ function isToolExecuting(pendingHistoryItems) {
 function isToolAwaitingConfirmation(pendingHistoryItems) {
   return pendingHistoryItems.filter((item) => item.type === "tool_group").some(
     (item) => item.tools.some(
-      (tool) => "awaiting_approval" /* AwaitingApproval */ === tool.status
+      (tool) => CoreToolCallStatus.AwaitingApproval === tool.status
     )
   );
 }
@@ -7282,14 +7301,14 @@ function getToolGroupBorderAppearance(item, activeShellPtyId, embeddedShellFocus
     if (isTrackedToolCall(t)) {
       return t.status !== "success" && t.status !== "error" && t.status !== "cancelled";
     } else {
-      return t.status !== "success" /* Success */ && t.status !== "error" /* Error */ && t.status !== "cancelled" /* Cancelled */;
+      return t.status !== CoreToolCallStatus.Success && t.status !== CoreToolCallStatus.Error && t.status !== CoreToolCallStatus.Cancelled;
     }
   });
   const isEmbeddedShellFocused = toolsToInspect.some((t) => {
     if (isTrackedToolCall(t)) {
       return isShellTool(t.request.name) && t.status === "executing" && t.pid === activeShellPtyId && !!embeddedShellFocused;
     } else {
-      return isShellTool(t.name) && t.status === "executing" /* Executing */ && t.ptyId === activeShellPtyId && !!embeddedShellFocused;
+      return isShellTool(t.name) && t.status === CoreToolCallStatus.Executing && t.ptyId === activeShellPtyId && !!embeddedShellFocused;
     }
   });
   const isShellCommand = toolsToInspect.some((t) => {
@@ -7388,7 +7407,7 @@ var ToolGroupMessage = ({
   const groupedTools = (0, import_react21.useMemo)(() => {
     const groups = [];
     for (const tool of visibleToolCalls) {
-      if (tool.kind === "agent" /* Agent */) {
+      if (tool.kind === Kind.Agent) {
         const lastGroup = groups[groups.length - 1];
         if (Array.isArray(lastGroup)) {
           lastGroup.push(tool);
@@ -7443,7 +7462,7 @@ var ToolGroupMessage = ({
   }, [groupedTools, isCompactModeEnabled, borderTopOverride]);
   let countToolCallsWithResults = 0;
   for (const tool of visibleToolCalls) {
-    if (tool.kind !== "agent" /* Agent */) {
+    if (tool.kind !== Kind.Agent) {
       if (isCompactTool(tool, isCompactModeEnabled)) {
         if (hasDensePayload(tool)) {
           countToolCallsWithResults++;
@@ -7617,7 +7636,7 @@ var ToolGroupDisplay = ({
   }
   const { tools, borderColor, borderDimColor, borderTop, borderBottom } = item;
   const visibleTools = tools.filter(
-    (t) => t.status !== "awaiting_approval" /* AwaitingApproval */
+    (t) => t.status !== CoreToolCallStatus.AwaitingApproval
   );
   const noticeTools = visibleTools.filter((t) => t.format === "notice");
   const otherTools = visibleTools.filter(
@@ -7819,18 +7838,18 @@ function CompressionMessage({
       return "Compressing chat history";
     }
     switch (compressionStatus) {
-      case 1 /* COMPRESSED */:
+      case CompressionStatus.COMPRESSED:
         return `Chat history compressed from ${originalTokens} to ${newTokens} tokens.`;
-      case 2 /* COMPRESSION_FAILED_INFLATED_TOKEN_COUNT */:
+      case CompressionStatus.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 3 /* COMPRESSION_FAILED_TOKEN_COUNT_ERROR */:
+      case CompressionStatus.COMPRESSION_FAILED_TOKEN_COUNT_ERROR:
         return "Could not compress chat history due to a token counting error.";
-      case 4 /* COMPRESSION_FAILED_EMPTY_SUMMARY */:
+      case CompressionStatus.COMPRESSION_FAILED_EMPTY_SUMMARY:
         return "Chat history compression failed: the model returned an empty summary.";
-      case 5 /* NOOP */:
+      case CompressionStatus.NOOP:
         return "Nothing to compress.";
       default:
         return "";
@@ -8243,7 +8262,7 @@ var ModelUsageTable = ({ models }) => {
   Object.entries(models).forEach(([name, metrics]) => {
     rows.push({
       name,
-      displayName: name,
+      displayName: getDisplayString(name),
       requests: metrics.api.totalRequests,
       cachedTokens: metrics.tokens.cached.toLocaleString(),
       inputTokens: metrics.tokens.prompt.toLocaleString(),
@@ -8256,8 +8275,8 @@ var ModelUsageTable = ({ models }) => {
       );
       roleEntries.sort(([a], [b]) => {
         if (a === b) return 0;
-        if (a === "main" /* MAIN */) return -1;
-        if (b === "main" /* MAIN */) return 1;
+        if (a === LlmRole.MAIN) return -1;
+        if (b === LlmRole.MAIN) return 1;
         return a.localeCompare(b);
       });
       roleEntries.forEach(([role, roleMetrics]) => {
@@ -8588,8 +8607,8 @@ var ModelStatsDisplay = ({
     return validRoles.includes(role);
   }).sort((a, b) => {
     if (a === b) return 0;
-    if (a === "main" /* MAIN */) return -1;
-    if (b === "main" /* MAIN */) return 1;
+    if (a === LlmRole.MAIN) return -1;
+    if (b === LlmRole.MAIN) return 1;
     return a.localeCompare(b);
   });
   const createRow = (metric, getValue, options = {}) => {
@@ -8727,7 +8746,7 @@ var ModelStatsDisplay = ({
     },
     ...modelNames.map((name) => ({
       key: name,
-      header: name,
+      header: getDisplayString(name),
       flexGrow: 1,
       renderCell: (row) => {
         if (row.isSection) return null;
@@ -9380,7 +9399,7 @@ var McpStatus = ({
       );
       const originalStatus = serverStatus(serverName);
       const hasCachedItems = serverTools.length > 0 || serverPrompts.length > 0 || serverResources.length > 0;
-      const status = originalStatus === "disconnected" /* DISCONNECTED */ && hasCachedItems ? "connected" /* CONNECTED */ : originalStatus;
+      const status = originalStatus === MCPServerStatus.DISCONNECTED && hasCachedItems ? MCPServerStatus.CONNECTED : originalStatus;
       let statusIndicator = "";
       let statusText = "";
       let statusColor = theme.text.primary;
@@ -9392,17 +9411,17 @@ var McpStatus = ({
         statusColor = theme.text.secondary;
       } else {
         switch (status) {
-          case "connected" /* CONNECTED */:
+          case MCPServerStatus.CONNECTED:
             statusIndicator = "\u{1F7E2}";
             statusText = "Ready";
             statusColor = theme.status.success;
             break;
-          case "connecting" /* CONNECTING */:
+          case MCPServerStatus.CONNECTING:
             statusIndicator = "\u{1F504}";
             statusText = "Starting... (first startup may take longer)";
             statusColor = theme.status.warning;
             break;
-          case "disconnected" /* DISCONNECTED */:
+          case MCPServerStatus.DISCONNECTED:
           default:
             statusIndicator = "\u{1F534}";
             statusText = "Disconnected";
@@ -9450,12 +9469,12 @@ var McpStatus = ({
           /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { children: [
             " - ",
             statusText,
-            status === "connected" /* CONNECTED */ && parts.length > 0 && ` (${parts.join(", ")})`
+            status === MCPServerStatus.CONNECTED && parts.length > 0 && ` (${parts.join(", ")})`
           ] }),
           authStatusNode
         ] }),
-        status === "connecting" /* CONNECTING */ && /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { children: " (tools and prompts will appear when ready)" }),
-        status === "disconnected" /* DISCONNECTED */ && toolCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { children: [
+        status === MCPServerStatus.CONNECTING && /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { children: " (tools and prompts will appear when ready)" }),
+        status === MCPServerStatus.DISCONNECTED && toolCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { children: [
           " (",
           toolCount,
           " tools cached)"
@@ -10016,7 +10035,7 @@ var Notifications = () => {
     if (dismissed) return [];
     const counts = persistentState.get("startupWarningCounts") || {};
     return startupWarnings.filter((w) => {
-      if (w.priority === "low" /* Low */) {
+      if (w.priority === WarningPriority.Low) {
         const count = counts[w.id] || 0;
         return count < MAX_STARTUP_WARNING_SHOW_COUNT;
       }
@@ -10029,7 +10048,7 @@ var Notifications = () => {
       const counts = { ...persistentState.get("startupWarningCounts") || {} };
       let changed = false;
       visibleWarnings.forEach((w) => {
-        if (w.priority === "low" /* Low */) {
+        if (w.priority === WarningPriority.Low) {
           counts[w.id] = (counts[w.id] || 0) + 1;
           changed = true;
         }
@@ -10136,7 +10155,7 @@ var UserIdentity = ({ config }) => {
   }
   return /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(Box_default, { flexDirection: "column", children: [
     /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(Box_default, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(Text, { color: theme.text.primary, wrap: "truncate-end", children: authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ ? /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(Text, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(Text, { color: theme.text.primary, wrap: "truncate-end", children: authType === AuthType.LOGIN_WITH_GOOGLE ? /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(Text, { children: [
         /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(Text, { bold: true, children: [
           "Signed in with Google",
           email ? ":" : ""
@@ -10370,7 +10389,7 @@ var import_react32 = __toESM(require_react(), 1);
 function getConfirmingToolState(pendingHistoryItems) {
   const allPendingTools = getAllToolCalls(pendingHistoryItems);
   const confirmingTools = allPendingTools.filter(
-    (tool) => tool.status === "awaiting_approval" /* AwaitingApproval */
+    (tool) => tool.status === CoreToolCallStatus.AwaitingApproval
   );
   if (confirmingTools.length === 0) {
     return null;
@@ -11678,7 +11697,7 @@ var ExitPlanModeDialog = ({
     {
       questions: [
         {
-          type: "choice" /* CHOICE */,
+          type: QuestionType.CHOICE,
           header: "Approval",
           question: planContent,
           options: [
@@ -11699,9 +11718,9 @@ var ExitPlanModeDialog = ({
       onSubmit: (answers) => {
         const answer = answers["0"];
         if (answer === "Yes, automatically accept edits" /* Auto */) {
-          onApprove("autoEdit" /* AUTO_EDIT */);
+          onApprove(ApprovalMode.AUTO_EDIT);
         } else if (answer === "Yes, manually accept edits" /* Manual */) {
-          onApprove("default" /* DEFAULT */);
+          onApprove(ApprovalMode.DEFAULT);
         } else if (answer) {
           onFeedback(answer);
         }
@@ -11912,7 +11931,7 @@ ${deceptiveUrlWarnings.map(
   );
   (0, import_react37.useEffect)(() => {
     if (isCancelling) {
-      handleConfirm("cancel" /* Cancel */);
+      handleConfirm(ToolConfirmationOutcome.Cancel);
     }
   }, [isCancelling, handleConfirm]);
   const handleSelect = (0, import_react37.useCallback)(
@@ -11925,19 +11944,19 @@ ${deceptiveUrlWarnings.map(
       if (!confirmationDetails.isModifying) {
         options2.push({
           label: "Allow once",
-          value: "proceed_once" /* ProceedOnce */,
+          value: ToolConfirmationOutcome.ProceedOnce,
           key: "Allow once"
         });
         if (isTrustedFolder) {
           options2.push({
             label: "Allow for this session",
-            value: "proceed_always" /* ProceedAlways */,
+            value: ToolConfirmationOutcome.ProceedAlways,
             key: "Allow for this session"
           });
           if (allowPermanentApproval) {
             options2.push({
               label: "Allow for this file in all future sessions",
-              value: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
+              value: ToolConfirmationOutcome.ProceedAlwaysAndSave,
               key: "Allow for this file in all future sessions"
             });
           }
@@ -11945,119 +11964,119 @@ ${deceptiveUrlWarnings.map(
         if (!config.getIdeMode() || !isDiffingEnabled) {
           options2.push({
             label: "Modify with external editor",
-            value: "modify_with_editor" /* ModifyWithEditor */,
+            value: ToolConfirmationOutcome.ModifyWithEditor,
             key: "Modify with external editor"
           });
         }
         options2.push({
           label: "No, suggest changes (esc)",
-          value: "cancel" /* Cancel */,
+          value: ToolConfirmationOutcome.Cancel,
           key: "No, suggest changes (esc)"
         });
       }
     } else if (confirmationDetails.type === "sandbox_expansion") {
       options2.push({
         label: "Allow once",
-        value: "proceed_once" /* ProceedOnce */,
+        value: ToolConfirmationOutcome.ProceedOnce,
         key: "Allow once"
       });
       if (isTrustedFolder) {
         options2.push({
           label: "Allow for this session",
-          value: "proceed_always" /* ProceedAlways */,
+          value: ToolConfirmationOutcome.ProceedAlways,
           key: "Allow for this session"
         });
         if (allowPermanentApproval) {
           options2.push({
             label: "Allow for all future sessions",
-            value: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
+            value: ToolConfirmationOutcome.ProceedAlwaysAndSave,
             key: "Allow for all future sessions"
           });
         }
       }
       options2.push({
         label: "No, suggest changes (esc)",
-        value: "cancel" /* Cancel */,
+        value: ToolConfirmationOutcome.Cancel,
         key: "No, suggest changes (esc)"
       });
     } else if (confirmationDetails.type === "exec") {
       options2.push({
         label: "Allow once",
-        value: "proceed_once" /* ProceedOnce */,
+        value: ToolConfirmationOutcome.ProceedOnce,
         key: "Allow once"
       });
       if (isTrustedFolder) {
         options2.push({
           label: `Allow for this session`,
-          value: "proceed_always" /* ProceedAlways */,
+          value: ToolConfirmationOutcome.ProceedAlways,
           key: `Allow for this session`
         });
         if (allowPermanentApproval) {
           options2.push({
             label: `Allow this command for all future sessions`,
-            value: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
+            value: ToolConfirmationOutcome.ProceedAlwaysAndSave,
             key: `Allow for all future sessions`
           });
         }
       }
       options2.push({
         label: "No, suggest changes (esc)",
-        value: "cancel" /* Cancel */,
+        value: ToolConfirmationOutcome.Cancel,
         key: "No, suggest changes (esc)"
       });
     } else if (confirmationDetails.type === "info") {
       options2.push({
         label: "Allow once",
-        value: "proceed_once" /* ProceedOnce */,
+        value: ToolConfirmationOutcome.ProceedOnce,
         key: "Allow once"
       });
       if (isTrustedFolder) {
         options2.push({
           label: "Allow for this session",
-          value: "proceed_always" /* ProceedAlways */,
+          value: ToolConfirmationOutcome.ProceedAlways,
           key: "Allow for this session"
         });
         if (allowPermanentApproval) {
           options2.push({
             label: "Allow for all future sessions",
-            value: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
+            value: ToolConfirmationOutcome.ProceedAlwaysAndSave,
             key: "Allow for all future sessions"
           });
         }
       }
       options2.push({
         label: "No, suggest changes (esc)",
-        value: "cancel" /* Cancel */,
+        value: ToolConfirmationOutcome.Cancel,
         key: "No, suggest changes (esc)"
       });
     } else if (confirmationDetails.type === "mcp") {
       options2.push({
         label: "Allow once",
-        value: "proceed_once" /* ProceedOnce */,
+        value: ToolConfirmationOutcome.ProceedOnce,
         key: "Allow once"
       });
       if (isTrustedFolder) {
         options2.push({
           label: "Allow tool for this session",
-          value: "proceed_always_tool" /* ProceedAlwaysTool */,
+          value: ToolConfirmationOutcome.ProceedAlwaysTool,
           key: "Allow tool for this session"
         });
         options2.push({
           label: "Allow all server tools for this session",
-          value: "proceed_always_server" /* ProceedAlwaysServer */,
+          value: ToolConfirmationOutcome.ProceedAlwaysServer,
           key: "Allow all server tools for this session"
         });
         if (allowPermanentApproval) {
           options2.push({
             label: "Allow tool for all future sessions",
-            value: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
+            value: ToolConfirmationOutcome.ProceedAlwaysAndSave,
             key: "Allow tool for all future sessions"
           });
         }
       }
       options2.push({
         label: "No, suggest changes (esc)",
-        value: "cancel" /* Cancel */,
+        value: ToolConfirmationOutcome.Cancel,
         key: "No, suggest changes (esc)"
       });
     }
@@ -12096,7 +12115,7 @@ ${deceptiveUrlWarnings.map(
       const containsRedirection = commandsToDisplay.some(
         (cmd) => hasRedirection(cmd)
       );
-      const isAutoEdit = config.getApprovalMode() === "yolo" /* YOLO */ || config.getApprovalMode() === "autoEdit" /* AUTO_EDIT */;
+      const isAutoEdit = config.getApprovalMode() === ApprovalMode.YOLO || config.getApprovalMode() === ApprovalMode.AUTO_EDIT;
       if (containsRedirection && !isAutoEdit) {
         extraInfoLines = 1;
       }
@@ -12122,7 +12141,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 === "proceed_always_and_save" /* ProceedAlwaysAndSave */
+          (o) => o.value === ToolConfirmationOutcome.ProceedAlwaysAndSave
         );
         if (alwaysAndSaveIndex !== -1) {
           initialIndex2 = alwaysAndSaveIndex;
@@ -12139,10 +12158,10 @@ ${deceptiveUrlWarnings.map(
         {
           questions: confirmationDetails.questions,
           onSubmit: (answers) => {
-            handleConfirm("proceed_once" /* ProceedOnce */, { answers });
+            handleConfirm(ToolConfirmationOutcome.ProceedOnce, { answers });
           },
           onCancel: () => {
-            handleConfirm("cancel" /* Cancel */);
+            handleConfirm(ToolConfirmationOutcome.Cancel);
           },
           width: terminalWidth,
           availableHeight: bodyHeight
@@ -12163,19 +12182,19 @@ ${deceptiveUrlWarnings.map(
           planPath: confirmationDetails.planPath,
           getPreferredEditor,
           onApprove: (approvalMode) => {
-            handleConfirm("proceed_once" /* ProceedOnce */, {
+            handleConfirm(ToolConfirmationOutcome.ProceedOnce, {
               approved: true,
               approvalMode
             });
           },
           onFeedback: (feedback) => {
-            handleConfirm("proceed_once" /* ProceedOnce */, {
+            handleConfirm(ToolConfirmationOutcome.ProceedOnce, {
               approved: false,
               feedback
             });
           },
           onCancel: () => {
-            handleConfirm("cancel" /* Cancel */);
+            handleConfirm(ToolConfirmationOutcome.Cancel);
           },
           width: terminalWidth,
           availableHeight: bodyHeight
@@ -12284,7 +12303,7 @@ ${deceptiveUrlWarnings.map(
       const containsRedirection = commandsToDisplay.some(
         (cmd) => hasRedirection(cmd)
       );
-      const isAutoEdit = config.getApprovalMode() === "yolo" /* YOLO */ || config.getApprovalMode() === "autoEdit" /* AUTO_EDIT */;
+      const isAutoEdit = config.getApprovalMode() === ApprovalMode.YOLO || config.getApprovalMode() === ApprovalMode.AUTO_EDIT;
       let warnings = null;
       if (containsRedirection && !isAutoEdit) {
         const tipText = `To auto-accept, press ${formatCommand("app.cycleApprovalMode" /* CYCLE_APPROVAL_MODE */)}`;
@@ -12443,7 +12462,7 @@ ${deceptiveUrlWarnings.map(
   const bodyOverflowDirection = confirmationDetails.type === "mcp" && isMcpToolDetailsExpanded ? "bottom" : "top";
   const renderRadioItem = (0, import_react37.useCallback)(
     (item, { titleColor }) => {
-      if (item.value === "proceed_always_and_save" /* ProceedAlwaysAndSave */) {
+      if (item.value === ToolConfirmationOutcome.ProceedAlwaysAndSave) {
         return /* @__PURE__ */ (0, import_jsx_runtime65.jsxs)(Text, { color: titleColor, wrap: "truncate", children: [
           item.label,
           " ",
@@ -14473,7 +14492,7 @@ async function validateAuthMethodWithSettings(authType, settings) {
   if (settings.merged.security.auth.useExternal) {
     return null;
   }
-  if (authType === "gemini-api-key" /* USE_GEMINI */) {
+  if (authType === AuthType.USE_GEMINI) {
     return null;
   }
   return validateAuthMethod(authType);
@@ -14525,7 +14544,7 @@ var useAuthCommand = (settings, config, initialAuthError = null, initialAccountS
         }
         return;
       }
-      if (authType === "gemini-api-key" /* USE_GEMINI */) {
+      if (authType === AuthType.USE_GEMINI) {
         const key = await reloadApiKey();
         if (!key) {
           setAuthState("awaiting_api_key_input" /* AwaitingApiKeyInput */);
@@ -14603,31 +14622,31 @@ function AuthDialog({
   let items = [
     {
       label: "Sign in with Google",
-      value: "oauth-personal" /* LOGIN_WITH_GOOGLE */,
-      key: "oauth-personal" /* LOGIN_WITH_GOOGLE */
+      value: AuthType.LOGIN_WITH_GOOGLE,
+      key: AuthType.LOGIN_WITH_GOOGLE
     },
     ...process.env["CLOUD_SHELL"] === "true" ? [
       {
         label: "Use Cloud Shell user credentials",
-        value: "compute-default-credentials" /* COMPUTE_ADC */,
-        key: "compute-default-credentials" /* COMPUTE_ADC */
+        value: AuthType.COMPUTE_ADC,
+        key: AuthType.COMPUTE_ADC
       }
     ] : process.env["GEMINI_CLI_USE_COMPUTE_ADC"] === "true" ? [
       {
         label: "Use metadata server application default credentials",
-        value: "compute-default-credentials" /* COMPUTE_ADC */,
-        key: "compute-default-credentials" /* COMPUTE_ADC */
+        value: AuthType.COMPUTE_ADC,
+        key: AuthType.COMPUTE_ADC
       }
     ] : [],
     {
       label: "Use Gemini API Key",
-      value: "gemini-api-key" /* USE_GEMINI */,
-      key: "gemini-api-key" /* USE_GEMINI */
+      value: AuthType.USE_GEMINI,
+      key: AuthType.USE_GEMINI
     },
     {
       label: "Vertex AI",
-      value: "vertex-ai" /* USE_VERTEX_AI */,
-      key: "vertex-ai" /* USE_VERTEX_AI */
+      value: AuthType.USE_VERTEX_AI,
+      key: AuthType.USE_VERTEX_AI
     }
   ];
   if (settings.merged.security.auth.enforcedType) {
@@ -14649,9 +14668,9 @@ function AuthDialog({
       return item.value === defaultAuthType;
     }
     if (process.env["GEMINI_API_KEY"]) {
-      return item.value === "gemini-api-key" /* USE_GEMINI */;
+      return item.value === AuthType.USE_GEMINI;
     }
-    return item.value === "oauth-personal" /* LOGIN_WITH_GOOGLE */;
+    return item.value === AuthType.LOGIN_WITH_GOOGLE;
   });
   if (settings.merged.security.auth.enforcedType) {
     initialAuthIndex = 0;
@@ -14662,7 +14681,7 @@ function AuthDialog({
         return;
       }
       if (authType) {
-        const needsRestart = authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ || authType === "vertex-ai" /* USE_VERTEX_AI */ && process.env["CLOUD_SHELL"] === "true";
+        const needsRestart = authType === AuthType.LOGIN_WITH_GOOGLE || authType === AuthType.USE_VERTEX_AI && process.env["CLOUD_SHELL"] === "true";
         if (needsRestart) {
           setAuthContext({ requiresRestart: true });
         } else {
@@ -14670,12 +14689,12 @@ function AuthDialog({
         }
         await clearCachedCredentialFile();
         settings.setValue(scope, "security.auth.selectedType", authType);
-        if (authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ && config.isBrowserLaunchSuppressed()) {
+        if (authType === AuthType.LOGIN_WITH_GOOGLE && config.isBrowserLaunchSuppressed()) {
           setExiting(true);
           setTimeout(relaunchApp, 100);
           return;
         }
-        if (authType === "gemini-api-key" /* USE_GEMINI */) {
+        if (authType === AuthType.USE_GEMINI) {
           setAuthState("awaiting_api_key_input" /* AwaitingApiKeyInput */);
           return;
         }
@@ -15431,11 +15450,11 @@ var PrivacyNoticeText = ({
 }) => {
   const authType = config.getContentGeneratorConfig()?.authType;
   switch (authType) {
-    case "gemini-api-key" /* USE_GEMINI */:
+    case AuthType.USE_GEMINI:
       return /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(GeminiPrivacyNotice, { onExit });
-    case "vertex-ai" /* USE_VERTEX_AI */:
+    case AuthType.USE_VERTEX_AI:
       return /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(CloudPaidPrivacyNotice, { onExit });
-    case "oauth-personal" /* LOGIN_WITH_GOOGLE */:
+    case AuthType.LOGIN_WITH_GOOGLE:
     default:
       return /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(CloudFreePrivacyNotice, { config, onExit });
   }
@@ -15476,7 +15495,7 @@ function ProQuotaDialog({
         value: "retry_always",
         key: "retry_always"
       },
-      ...authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ && !isUltra ? [
+      ...authType === AuthType.LOGIN_WITH_GOOGLE && !isUltra ? [
         {
           label: "Upgrade for higher limits",
           value: "upgrade",
@@ -16633,8 +16652,9 @@ function ModelDialog({ onClose }) {
   const preferredModel = config?.getModel() || GEMINI_MODEL_ALIAS_AUTO;
   const shouldShowPreviewModels = config?.getHasAccessToPreviewModel() ?? false;
   const useGemini31 = config?.getGemini31LaunchedSync?.() ?? false;
+  const useGemini3_5Flash = config?.hasGemini35FlashGAAccess?.() ?? false;
   const selectedAuthType = settings.merged.security.auth.selectedType;
-  const useCustomToolModel = useGemini31 && selectedAuthType === "gemini-api-key" /* USE_GEMINI */;
+  const useCustomToolModel = useGemini31 && selectedAuthType === AuthType.USE_GEMINI;
   const manualModelSelected = (0, import_react55.useMemo)(() => {
     if (config?.getExperimentalDynamicModelConfiguration?.() === true && config.getModelConfigService) {
       const def = config.getModelConfigService().getModelDefinition(preferredModel);
@@ -16677,6 +16697,7 @@ function ModelDialog({ onClose }) {
     if (config?.getExperimentalDynamicModelConfiguration?.() === true && config.getModelConfigService) {
       const allOptions = config.getModelConfigService().getAvailableModelOptions({
         useGemini3_1: useGemini31,
+        useGemini3_5Flash,
         useCustomTools: useCustomToolModel,
         hasAccessToPreview: shouldShowPreviewModels,
         hasAccessToProModel
@@ -16701,7 +16722,8 @@ function ModelDialog({ onClose }) {
         title: getDisplayString(GEMINI_MODEL_ALIAS_AUTO),
         description: getAutoModelDescription(
           shouldShowPreviewModels,
-          useGemini31
+          useGemini31,
+          useGemini3_5Flash
         ),
         key: GEMINI_MODEL_ALIAS_AUTO
       },
@@ -16718,6 +16740,7 @@ function ModelDialog({ onClose }) {
     shouldShowPreviewModels,
     manualModelSelected,
     useGemini31,
+    useGemini3_5Flash,
     useCustomToolModel,
     hasAccessToProModel
   ]);
@@ -16725,6 +16748,7 @@ function ModelDialog({ onClose }) {
     if (config?.getExperimentalDynamicModelConfiguration?.() === true && config.getModelConfigService) {
       const allOptions = config.getModelConfigService().getAvailableModelOptions({
         useGemini3_1: useGemini31,
+        useGemini3_5Flash,
         useCustomTools: useCustomToolModel,
         hasAccessToPreview: shouldShowPreviewModels,
         hasAccessToProModel
@@ -16798,6 +16822,7 @@ function ModelDialog({ onClose }) {
   }, [
     shouldShowPreviewModels,
     useGemini31,
+    useGemini3_5Flash,
     useCustomToolModel,
     hasAccessToProModel,
     config
@@ -17952,10 +17977,10 @@ function initializeConsoleStore() {
   globalConsoleMessages = [];
   globalErrorCount = 0;
   notifyListeners();
-  coreEvents.off("console-log" /* ConsoleLog */, handleConsoleLog);
-  coreEvents.off("output" /* Output */, handleOutput);
-  coreEvents.on("console-log" /* ConsoleLog */, handleConsoleLog);
-  coreEvents.on("output" /* Output */, handleOutput);
+  coreEvents.off(CoreEvent.ConsoleLog, handleConsoleLog);
+  coreEvents.off(CoreEvent.Output, handleOutput);
+  coreEvents.on(CoreEvent.ConsoleLog, handleConsoleLog);
+  coreEvents.on(CoreEvent.Output, handleOutput);
 }
 function notifyListeners() {
   for (const listener of listeners) {
@@ -20092,7 +20117,7 @@ function usePromptCompletion({
         { model: "prompt-completion" },
         contents,
         signal,
-        "utility_autocomplete" /* UTILITY_AUTOCOMPLETE */
+        LlmRole.UTILITY_AUTOCOMPLETE
       );
       if (signal.aborted) {
         return;
@@ -22170,9 +22195,9 @@ var InputPrompt = ({
       onSuggestionsVisibilityChange(shouldShowSuggestions);
     }
   }, [shouldShowSuggestions, onSuggestionsVisibilityChange]);
-  const showAutoAcceptStyling = !shellModeActive && approvalMode === "autoEdit" /* AUTO_EDIT */;
-  const showYoloStyling = !shellModeActive && approvalMode === "yolo" /* YOLO */;
-  const showPlanStyling = !shellModeActive && approvalMode === "plan" /* PLAN */;
+  const showAutoAcceptStyling = !shellModeActive && approvalMode === ApprovalMode.AUTO_EDIT;
+  const showYoloStyling = !shellModeActive && approvalMode === ApprovalMode.YOLO;
+  const showPlanStyling = !shellModeActive && approvalMode === ApprovalMode.PLAN;
   let statusColor;
   let statusText = "";
   if (shellModeActive) {
@@ -23005,22 +23030,22 @@ var ApprovalModeIndicator = ({
   const cycleHint = formatCommand("app.cycleApprovalMode" /* CYCLE_APPROVAL_MODE */);
   const yoloHint = formatCommand("app.toggleYolo" /* TOGGLE_YOLO */);
   switch (approvalMode) {
-    case "autoEdit" /* AUTO_EDIT */:
+    case ApprovalMode.AUTO_EDIT:
       textColor = theme.status.warning;
       textContent = "auto-accept edits";
       subText = allowPlanMode ? `${cycleHint} to plan` : `${cycleHint} to manual`;
       break;
-    case "plan" /* PLAN */:
+    case ApprovalMode.PLAN:
       textColor = theme.status.success;
       textContent = "plan";
       subText = `${cycleHint} to manual`;
       break;
-    case "yolo" /* YOLO */:
+    case ApprovalMode.YOLO:
       textColor = theme.status.error;
       textContent = "YOLO";
       subText = yoloHint;
       break;
-    case "default" /* DEFAULT */:
+    case ApprovalMode.DEFAULT:
     default:
       textColor = theme.text.accent;
       textContent = "";
@@ -23068,7 +23093,7 @@ var useComposerStatus = () => {
       (item) => item.type === "tool_group"
     ).some(
       (item) => item.tools.some(
-        (tool) => tool.status === "awaiting_approval" /* AwaitingApproval */
+        (tool) => tool.status === CoreToolCallStatus.AwaitingApproval
       )
     ),
     [uiState.pendingHistoryItems]
@@ -23083,13 +23108,13 @@ var useComposerStatus = () => {
     const hideMinimalModeHintWhileBusy = !uiState.cleanUiDetailsVisible && (showLoadingIndicator || uiState.activeHooks.length > 0);
     if (hideMinimalModeHintWhileBusy) return null;
     switch (showApprovalModeIndicator) {
-      case "yolo" /* YOLO */:
+      case ApprovalMode.YOLO:
         return { text: "YOLO", color: theme.status.error };
-      case "plan" /* PLAN */:
+      case ApprovalMode.PLAN:
         return { text: "plan", color: theme.status.success };
-      case "autoEdit" /* AUTO_EDIT */:
+      case ApprovalMode.AUTO_EDIT:
         return { text: "auto edit", color: theme.status.warning };
-      case "default" /* DEFAULT */:
+      case ApprovalMode.DEFAULT:
       default:
         return null;
     }
@@ -23443,7 +23468,7 @@ var ConfigInitDisplay = ({
       let connected = 0;
       const connecting = [];
       for (const [name, client] of clients.entries()) {
-        if (client.getStatus() === "connected" /* CONNECTED */) {
+        if (client.getStatus() === MCPServerStatus.CONNECTED) {
           connected++;
         } else {
           connecting.push(name);
@@ -23465,9 +23490,9 @@ var ConfigInitDisplay = ({
         );
       }
     };
-    coreEvents.on("mcp-client-update" /* McpClientUpdate */, onChange);
+    coreEvents.on(CoreEvent.McpClientUpdate, onChange);
     return () => {
-      coreEvents.off("mcp-client-update" /* McpClientUpdate */, onChange);
+      coreEvents.off(CoreEvent.McpClientUpdate, onChange);
     };
   }, [initialMessage]);
   return /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime123.jsxs)(Text, { children: [
@@ -24184,7 +24209,7 @@ var useExecutionLifecycle = (addItemToHistory, setPendingHistoryItem, onExec, on
           callId,
           name: SHELL_COMMAND_NAME,
           description: rawQuery,
-          status: "executing" /* Executing */,
+          status: CoreToolCallStatus.Executing,
           isClientInitiated: true,
           resultDisplay: "",
           confirmationDetails: void 0
@@ -24325,7 +24350,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 = "success" /* Success */;
+          let finalStatus = CoreToolCallStatus.Success;
           const prependToAnsiOutput = (output, text) => {
             const newLines = text.split("\n").map((line) => [
               {
@@ -24344,20 +24369,20 @@ __code=$?; pwd > ${escapedPwdFilePath}; exit $__code`;
           };
           let prefix = "";
           if (result.error) {
-            finalStatus = "error" /* Error */;
+            finalStatus = CoreToolCallStatus.Error;
             prefix = result.error.message;
           } else if (result.aborted) {
-            finalStatus = "cancelled" /* Cancelled */;
+            finalStatus = CoreToolCallStatus.Cancelled;
             prefix = "Command was cancelled.";
           } else if (result.backgrounded) {
-            finalStatus = "success" /* Success */;
+            finalStatus = CoreToolCallStatus.Success;
             finalOutput = `Command moved to background (PID: ${result.pid}). Output hidden. Press Ctrl+B to view.`;
             mainContent = finalOutput;
           } else if (result.signal) {
-            finalStatus = "error" /* Error */;
+            finalStatus = CoreToolCallStatus.Error;
             prefix = `Command terminated by signal: ${result.signal}.`;
           } else if (result.exitCode !== 0) {
-            finalStatus = "error" /* Error */;
+            finalStatus = CoreToolCallStatus.Error;
             prefix = `Command exited with code ${result.exitCode}.`;
           }
           if (prefix) {
@@ -24383,7 +24408,7 @@ ${mainContent}`;
             status: finalStatus,
             resultDisplay: finalOutput
           };
-          if (finalStatus !== "cancelled" /* Cancelled */) {
+          if (finalStatus !== CoreToolCallStatus.Cancelled) {
             addItemToHistory(
               {
                 type: "tool_group",
@@ -25373,7 +25398,7 @@ function useQuotaAndFallback({
           error.retryDelayMs ? `Access resets at ${getResetTimeMessage(error.retryDelayMs)}.` : null,
           `/stats model for usage details`,
           `/model to switch models.`,
-          contentGeneratorConfig?.authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ ? `/auth to switch to API key.` : null
+          contentGeneratorConfig?.authType === AuthType.LOGIN_WITH_GOOGLE ? `/auth to switch to API key.` : null
         ].filter(Boolean);
         message = messageLines.join("\n");
       } else if (error instanceof ModelNotFoundError) {
@@ -25561,7 +25586,7 @@ var useEditorSettings = (loadedSettings, setEditorError, addItem) => {
         );
         setEditorError(null);
         setIsEditorDialogOpen(false);
-        coreEvents.emit("editor-selected" /* EditorSelected */, { editor: editorType });
+        coreEvents.emit(CoreEvent.EditorSelected, { editor: editorType });
       } catch (error) {
         setEditorError(`Failed to set editor preference: ${error}`);
       }
@@ -25570,7 +25595,7 @@ var useEditorSettings = (loadedSettings, setEditorError, addItem) => {
   );
   const exitEditorDialog = (0, import_react91.useCallback)(() => {
     setIsEditorDialogOpen(false);
-    coreEvents.emit("editor-selected" /* EditorSelected */, { editor: void 0 });
+    coreEvents.emit(CoreEvent.EditorSelected, { editor: void 0 });
   }, []);
   return {
     isEditorDialogOpen,
@@ -25947,7 +25972,7 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
         canonicalPath: resolvedCommandPath
       } = parseSlashCommand(trimmed, commands);
       if (!commandToExecute) {
-        const isMcpLoading = config?.getMcpClientManager()?.getDiscoveryState() === "in_progress" /* IN_PROGRESS */;
+        const isMcpLoading = config?.getMcpClientManager()?.getDiscoveryState() === MCPDiscoveryState.IN_PROGRESS;
         if (isMcpLoading) {
           setIsProcessing(true);
           if (addToHistory) {
@@ -26127,7 +26152,7 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
                       onConfirm: async (resolvedOutcome) => {
                         resolve3({
                           outcome: resolvedOutcome,
-                          approvedCommands: resolvedOutcome === "cancel" /* Cancel */ ? [] : result.commandsToConfirm
+                          approvedCommands: resolvedOutcome === ToolConfirmationOutcome.Cancel ? [] : result.commandsToConfirm
                         });
                       }
                     };
@@ -26135,7 +26160,7 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
                       callId,
                       name: "Expansion",
                       description: "Command expansion needs shell access",
-                      status: "awaiting_approval" /* AwaitingApproval */,
+                      status: CoreToolCallStatus.AwaitingApproval,
                       isClientInitiated: true,
                       resultDisplay: void 0,
                       confirmationDetails
@@ -26146,7 +26171,7 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
                     });
                   });
                   setPendingItem(null);
-                  if (outcome === "cancel" /* Cancel */ || !approvedCommands || approvedCommands.length === 0) {
+                  if (outcome === ToolConfirmationOutcome.Cancel || !approvedCommands || approvedCommands.length === 0) {
                     addItem(
                       {
                         type: "info" /* INFO */,
@@ -26156,7 +26181,7 @@ var useSlashCommandProcessor = (config, settings, addItem, clearItems, loadHisto
                     );
                     return { type: "handled" };
                   }
-                  if (outcome === "proceed_always" /* ProceedAlways */) {
+                  if (outcome === ToolConfirmationOutcome.ProceedAlways) {
                     setSessionShellAllowlist(
                       (prev) => /* @__PURE__ */ new Set([...prev, ...approvedCommands])
                     );
@@ -26632,7 +26657,7 @@ function mapToDisplay(toolOrTools, options = {}) {
     let description;
     let renderOutputAsMarkdown = false;
     const displayName = call.tool?.displayName ?? call.request.name;
-    if (call.status === "error" /* Error */) {
+    if (call.status === CoreToolCallStatus.Error) {
       description = JSON.stringify(call.request.args);
     } else {
       description = call.invocation.getDescription();
@@ -26655,27 +26680,27 @@ function mapToDisplay(toolOrTools, options = {}) {
     let progress = void 0;
     let progressTotal = void 0;
     switch (call.status) {
-      case "success" /* Success */:
+      case CoreToolCallStatus.Success:
         resultDisplay = call.response.resultDisplay;
         outputFile = call.response.outputFile;
         break;
-      case "error" /* Error */:
-      case "cancelled" /* Cancelled */:
+      case CoreToolCallStatus.Error:
+      case CoreToolCallStatus.Cancelled:
         resultDisplay = call.response.resultDisplay;
         break;
-      case "awaiting_approval" /* AwaitingApproval */:
+      case CoreToolCallStatus.AwaitingApproval:
         correlationId = call.correlationId;
         confirmationDetails = call.confirmationDetails;
         break;
-      case "executing" /* Executing */:
+      case CoreToolCallStatus.Executing:
         resultDisplay = call.liveOutput;
         ptyId = call.pid;
         progressMessage = call.progressMessage;
         progress = call.progress;
         progressTotal = call.progressTotal;
         break;
-      case "scheduled" /* Scheduled */:
-      case "validating" /* Validating */:
+      case CoreToolCallStatus.Scheduled:
+      case CoreToolCallStatus.Validating:
         break;
       default: {
         const exhaustiveCheck = call;
@@ -26746,7 +26771,7 @@ function useToolScheduler(onComplete, config, getPreferredEditor) {
     const handler = (event) => {
       const isRoot = event.schedulerId === ROOT_SCHEDULER_ID;
       const hasExecuting = event.toolCalls.some(
-        (tc) => tc.status === "executing" /* Executing */ || (tc.status === "success" /* Success */ || tc.status === "error" /* Error */) && "tailToolCallRequest" in tc && tc.tailToolCallRequest != null
+        (tc) => tc.status === CoreToolCallStatus.Executing || (tc.status === CoreToolCallStatus.Success || tc.status === CoreToolCallStatus.Error) && "tailToolCallRequest" in tc && tc.tailToolCallRequest != null
       );
       if (hasExecuting) {
         setLastToolOutputTime(Date.now());
@@ -26755,7 +26780,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 === "awaiting_approval" /* AwaitingApproval */ || prevCallIds.has(tc.request.callId)
+          (tc) => tc.status === CoreToolCallStatus.AwaitingApproval || prevCallIds.has(tc.request.callId)
         );
         if (!isRoot && filteredToolCalls.length === 0 && prevCalls.length === 0) {
           return prev;
@@ -26767,9 +26792,9 @@ function useToolScheduler(onComplete, config, getPreferredEditor) {
         };
       });
     };
-    messageBus.subscribe("tool-calls-update" /* TOOL_CALLS_UPDATE */, handler);
+    messageBus.subscribe(MessageBusType.TOOL_CALLS_UPDATE, handler);
     return () => {
-      messageBus.unsubscribe("tool-calls-update" /* TOOL_CALLS_UPDATE */, handler);
+      messageBus.unsubscribe(MessageBusType.TOOL_CALLS_UPDATE, handler);
     };
   }, [messageBus, internalAdaptToolCalls]);
   (0, import_react98.useEffect)(() => {
@@ -26791,9 +26816,9 @@ function useToolScheduler(onComplete, config, getPreferredEditor) {
         };
       });
     };
-    messageBus.subscribe("subagent-activity" /* SUBAGENT_ACTIVITY */, handler);
+    messageBus.subscribe(MessageBusType.SUBAGENT_ACTIVITY, handler);
     return () => {
-      messageBus.unsubscribe("subagent-activity" /* SUBAGENT_ACTIVITY */, handler);
+      messageBus.unsubscribe(MessageBusType.SUBAGENT_ACTIVITY, handler);
     };
   }, [messageBus]);
   const schedule = (0, import_react98.useCallback)(
@@ -26892,8 +26917,8 @@ function adaptToolCalls(coreCalls, prevTracked) {
     const prev = prevMap.get(coreCall.request.callId);
     const responseSubmittedToGemini = prev?.responseSubmittedToGemini ?? false;
     let status = coreCall.status;
-    if ((status === "success" /* Success */ || status === "error" /* Error */) && "tailToolCallRequest" in coreCall && coreCall.tailToolCallRequest != null) {
-      status = "executing" /* Executing */;
+    if ((status === CoreToolCallStatus.Success || status === CoreToolCallStatus.Error) && "tailToolCallRequest" in coreCall && coreCall.tailToolCallRequest != null) {
+      status = CoreToolCallStatus.Executing;
     }
     return {
       ...coreCall,
@@ -26925,7 +26950,7 @@ function getBackgroundedToolInfo(toolCall) {
   };
 }
 function isBackgroundableExecutingToolCall(toolCall) {
-  return toolCall.status === "executing" /* Executing */ && typeof toolCall.pid === "number";
+  return toolCall.status === CoreToolCallStatus.Executing && typeof toolCall.pid === "number";
 }
 function showCitations(settings) {
   const enabled = settings.merged.ui.showCitations;
@@ -26935,14 +26960,14 @@ function showCitations(settings) {
   return true;
 }
 function calculateStreamingState(isResponding, toolCalls) {
-  if (toolCalls.some((tc) => tc.status === "awaiting_approval" /* AwaitingApproval */)) {
+  if (toolCalls.some((tc) => tc.status === CoreToolCallStatus.AwaitingApproval)) {
     return "waiting_for_confirmation" /* WaitingForConfirmation */;
   }
   const isAnyToolActive = toolCalls.some((tc) => {
-    if (tc.status === "executing" /* Executing */ || tc.status === "scheduled" /* Scheduled */ || tc.status === "validating" /* Validating */) {
+    if (tc.status === CoreToolCallStatus.Executing || tc.status === CoreToolCallStatus.Scheduled || tc.status === CoreToolCallStatus.Validating) {
       return true;
     }
-    if (tc.status === "success" /* Success */ || tc.status === "error" /* Error */ || tc.status === "cancelled" /* Cancelled */) {
+    if (tc.status === CoreToolCallStatus.Success || tc.status === CoreToolCallStatus.Error || tc.status === CoreToolCallStatus.Cancelled) {
       return !tc.responseSubmittedToGemini;
     }
     return false;
@@ -26988,9 +27013,9 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       }
       setRetryStatus(payload);
     };
-    coreEvents.on("retry-attempt" /* RetryAttempt */, handleRetryAttempt);
+    coreEvents.on(CoreEvent.RetryAttempt, handleRetryAttempt);
     return () => {
-      coreEvents.off("retry-attempt" /* RetryAttempt */, handleRetryAttempt);
+      coreEvents.off(CoreEvent.RetryAttempt, handleRetryAttempt);
     };
   }, [isRespondingRef]);
   const [
@@ -27123,12 +27148,12 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       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 === "agent" /* Agent */;
+        const isAgent = tc.tool?.kind === Kind.Agent;
         if (isAgent) {
           let contigAgentsComplete = true;
           for (let j = i + 1; j < toolCalls.length; j++) {
             const nextTc = toolCalls[j];
-            if (nextTc.tool?.kind === "agent" /* Agent */) {
+            if (nextTc.tool?.kind === Kind.Agent) {
               if (nextTc.status !== "success" && nextTc.status !== "error" && nextTc.status !== "cancelled") {
                 contigAgentsComplete = false;
                 break;
@@ -27154,7 +27179,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 === "agent" /* Agent */) {
+        if (tc.tool?.kind === Kind.Agent) {
           currentGroup.push(tc);
         } else {
           if (currentGroup.length > 0) {
@@ -27304,7 +27329,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
     prevActiveShellPtyIdRef.current = activeShellPtyId;
   }, [activeShellPtyId, addItem, setIsResponding]);
   (0, import_react99.useEffect)(() => {
-    if (config.getApprovalMode() === "yolo" /* YOLO */ && streamingState === "idle" /* Idle */) {
+    if (config.getApprovalMode() === ApprovalMode.YOLO && streamingState === "idle" /* Idle */) {
       const lastUserMessageIndex = history.findLastIndex(
         (item) => item.type === "user" /* USER */
       );
@@ -27372,7 +27397,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
         return;
       }
       const hasActiveTools = toolCalls.some(
-        (tc) => tc.status === "executing" /* Executing */ || tc.status === "scheduled" /* Scheduled */ || tc.status === "validating" /* Validating */
+        (tc) => tc.status === CoreToolCallStatus.Executing || tc.status === CoreToolCallStatus.Scheduled || tc.status === CoreToolCallStatus.Validating
       );
       if (streamingState === "idle" /* Idle */ && !isRespondingRef.current && !hasActiveTools) {
         if (clearBuffer) {
@@ -27399,7 +27424,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
             if (tool.name === SHELL_COMMAND_NAME) {
               return {
                 ...tool,
-                status: "cancelled" /* Cancelled */,
+                status: CoreToolCallStatus.Cancelled,
                 resultDisplay: tool.resultDisplay
               };
             }
@@ -27464,7 +27489,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       let localQueryToSendToGemini = null;
       if (typeof query === "string") {
         const trimmedQuery = query.trim();
-        await logger?.logMessage("user" /* USER */, trimmedQuery);
+        await logger?.logMessage(MessageSenderType.USER, trimmedQuery);
         if (!shellModeActive) {
           const slashCommandResult = isSlashCommand(trimmedQuery) ? await handleSlashCommand(trimmedQuery) : false;
           if (slashCommandResult) {
@@ -27620,7 +27645,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 === "validating" /* Validating */ || tool.status === "scheduled" /* Scheduled */ || tool.status === "awaiting_approval" /* AwaitingApproval */ || tool.status === "executing" /* Executing */ ? { ...tool, status: "cancelled" /* Cancelled */ } : tool
+            (tool) => tool.status === CoreToolCallStatus.Validating || tool.status === CoreToolCallStatus.Scheduled || tool.status === CoreToolCallStatus.AwaitingApproval || tool.status === CoreToolCallStatus.Executing ? { ...tool, status: CoreToolCallStatus.Cancelled } : tool
           );
           const pendingItem = {
             ...pendingHistoryItemRef.current,
@@ -27866,15 +27891,15 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       let geminiMessageBuffer = "";
       const toolCallRequests = [];
       for await (const event of stream) {
-        if (event.type !== "thought" /* Thought */ && thoughtRef.current !== null) {
+        if (event.type !== GeminiEventType.Thought && thoughtRef.current !== null) {
           setThought(null);
         }
         switch (event.type) {
-          case "thought" /* Thought */:
+          case GeminiEventType.Thought:
             setLastGeminiActivityTime(Date.now());
             handleThoughtEvent(event.value, userMessageTimestamp);
             break;
-          case "content" /* Content */:
+          case GeminiEventType.Content:
             setLastGeminiActivityTime(Date.now());
             geminiMessageBuffer = handleContentEvent(
               event.value,
@@ -27882,16 +27907,16 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
               userMessageTimestamp
             );
             break;
-          case "tool_call_request" /* ToolCallRequest */:
+          case GeminiEventType.ToolCallRequest:
             toolCallRequests.push(event.value);
             break;
-          case "user_cancelled" /* UserCancelled */:
+          case GeminiEventType.UserCancelled:
             handleUserCancelledEvent(userMessageTimestamp);
             break;
-          case "error" /* Error */:
+          case GeminiEventType.Error:
             handleErrorEvent(event.value, userMessageTimestamp);
             break;
-          case "agent_execution_stopped" /* AgentExecutionStopped */:
+          case GeminiEventType.AgentExecutionStopped:
             handleAgentExecutionStoppedEvent(
               event.value.reason,
               userMessageTimestamp,
@@ -27899,7 +27924,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
               event.value.contextCleared
             );
             break;
-          case "agent_execution_blocked" /* AgentExecutionBlocked */:
+          case GeminiEventType.AgentExecutionBlocked:
             handleAgentExecutionBlockedEvent(
               event.value.reason,
               userMessageTimestamp,
@@ -27907,35 +27932,35 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
               event.value.contextCleared
             );
             break;
-          case "chat_compressed" /* ChatCompressed */:
+          case GeminiEventType.ChatCompressed:
             handleChatCompressionEvent(event.value, userMessageTimestamp);
             break;
-          case "tool_call_confirmation" /* ToolCallConfirmation */:
-          case "tool_call_response" /* ToolCallResponse */:
+          case GeminiEventType.ToolCallConfirmation:
+          case GeminiEventType.ToolCallResponse:
             break;
-          case "max_session_turns" /* MaxSessionTurns */:
+          case GeminiEventType.MaxSessionTurns:
             handleMaxSessionTurnsEvent();
             break;
-          case "context_window_will_overflow" /* ContextWindowWillOverflow */:
+          case GeminiEventType.ContextWindowWillOverflow:
             handleContextWindowWillOverflowEvent(
               event.value.estimatedRequestTokenCount,
               event.value.remainingTokenCount
             );
             break;
-          case "finished" /* Finished */:
+          case GeminiEventType.Finished:
             handleFinishedEvent(event, userMessageTimestamp);
             break;
-          case "citation" /* Citation */:
+          case GeminiEventType.Citation:
             handleCitationEvent(event.value, userMessageTimestamp);
             break;
-          case "model_info" /* ModelInfo */:
+          case GeminiEventType.ModelInfo:
             handleChatModelEvent(event.value, userMessageTimestamp);
             break;
-          case "loop_detected" /* LoopDetected */:
+          case GeminiEventType.LoopDetected:
             loopDetectedRef.current = true;
             break;
-          case "retry" /* Retry */:
-          case "invalid_stream" /* InvalidStream */:
+          case GeminiEventType.Retry:
+          case GeminiEventType.InvalidStream:
             break;
           default: {
             const unreachable = event;
@@ -27976,7 +28001,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
   const submitQuery = (0, import_react99.useCallback)(
     async (query, options, prompt_id) => runInDevTraceSpan(
       {
-        operation: options?.isContinuation ? "system_prompt" /* SystemPrompt */ : "user_prompt" /* UserPrompt */,
+        operation: options?.isContinuation ? GeminiCliOperation.SystemPrompt : GeminiCliOperation.UserPrompt,
         sessionId: config.getSessionId()
       },
       async ({ metadata: spanMetadata }) => {
@@ -28136,7 +28161,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
   );
   const handleApprovalModeChange = (0, import_react99.useCallback)(
     async (newApprovalMode) => {
-      if (previousApprovalModeRef.current === "plan" /* PLAN */ && newApprovalMode !== "plan" /* PLAN */ && streamingState === "idle" /* Idle */) {
+      if (previousApprovalModeRef.current === ApprovalMode.PLAN && newApprovalMode !== ApprovalMode.PLAN && streamingState === "idle" /* Idle */) {
         if (geminiClient) {
           try {
             await geminiClient.addHistory({
@@ -28159,11 +28184,11 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
         }
       }
       previousApprovalModeRef.current = newApprovalMode;
-      if (newApprovalMode === "yolo" /* YOLO */ || newApprovalMode === "autoEdit" /* AUTO_EDIT */) {
+      if (newApprovalMode === ApprovalMode.YOLO || newApprovalMode === ApprovalMode.AUTO_EDIT) {
         let awaitingApprovalCalls = toolCalls.filter(
           (call) => call.status === "awaiting_approval" && !call.request.forcedAsk
         );
-        if (newApprovalMode === "autoEdit" /* AUTO_EDIT */) {
+        if (newApprovalMode === ApprovalMode.AUTO_EDIT) {
           awaitingApprovalCalls = awaitingApprovalCalls.filter((call) => {
             if (EDIT_TOOL_NAMES.has(call.request.name)) {
               return true;
@@ -28179,11 +28204,11 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
           if (call.correlationId) {
             try {
               await config.getMessageBus().publish({
-                type: "tool-confirmation-response" /* TOOL_CONFIRMATION_RESPONSE */,
+                type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
                 correlationId: call.correlationId,
                 confirmed: true,
                 requiresUserConfirmation: false,
-                outcome: "proceed_once" /* ProceedOnce */
+                outcome: ToolConfirmationOutcome.ProceedOnce
               });
             } catch (error) {
               debugLogger.warn(
@@ -28252,14 +28277,14 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       );
       if (isLowErrorVerbosity) {
         suppressedToolErrorCountRef.current += geminiTools.filter(
-          (tc) => tc.status === "error" /* Error */
+          (tc) => tc.status === CoreToolCallStatus.Error
         ).length;
       }
       if (geminiTools.length === 0) {
         return;
       }
       const stopExecutionTool = geminiTools.find(
-        (tc) => tc.response.errorType === "stop_execution" /* STOP_EXECUTION */
+        (tc) => tc.response.errorType === ToolErrorType.STOP_EXECUTION
       );
       if (stopExecutionTool && stopExecutionTool.response.error) {
         maybeAddSuppressedToolErrorNote();
@@ -28279,9 +28304,9 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
         (tc) => !isTopicTool2(tc.request.name)
       );
       const allDeclinableToolsCancelled = declinableTools.length > 0 && declinableTools.every(
-        (tc) => tc.status === "cancelled" /* Cancelled */
+        (tc) => tc.status === CoreToolCallStatus.Cancelled
       );
-      const allToolsCancelled = geminiTools.length > 0 && geminiTools.every((tc) => tc.status === "cancelled" /* Cancelled */);
+      const allToolsCancelled = geminiTools.length > 0 && geminiTools.every((tc) => tc.status === CoreToolCallStatus.Cancelled);
       if (allDeclinableToolsCancelled || allToolsCancelled) {
         if (!turnCancelledRef.current) {
           addItem({
@@ -28361,7 +28386,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
         return;
       }
       const restorableToolCalls = toolCalls.filter(
-        (toolCall) => EDIT_TOOL_NAMES.has(toolCall.request.name) && toolCall.status === "awaiting_approval" /* AwaitingApproval */
+        (toolCall) => EDIT_TOOL_NAMES.has(toolCall.request.name) && toolCall.status === CoreToolCallStatus.AwaitingApproval
       );
       if (restorableToolCalls.length > 0) {
         if (!gitService) {
@@ -28584,14 +28609,14 @@ var useAgentStream = ({
           const displayName = legacyState?.displayName ?? event.name;
           const isOutputMarkdown = legacyState?.isOutputMarkdown ?? false;
           const desc = legacyState?.description ?? "";
-          const fallbackKind = "other" /* Other */;
+          const fallbackKind = Kind.Other;
           const newCall = {
             callId: event.requestId,
             name: displayName,
             originalRequestName: event.name,
             description: desc,
             display: event.display,
-            status: "scheduled" /* Scheduled */,
+            status: CoreToolCallStatus.Scheduled,
             isClientInitiated: false,
             renderOutputAsMarkdown: isOutputMarkdown,
             kind: legacyState?.kind ?? fallbackKind,
@@ -28609,10 +28634,10 @@ var useAgentStream = ({
               const evtStatus = legacyState?.status;
               let status = tc.status;
               if (evtStatus === "executing")
-                status = "executing" /* Executing */;
-              else if (evtStatus === "error") status = "error" /* Error */;
+                status = CoreToolCallStatus.Executing;
+              else if (evtStatus === "error") status = CoreToolCallStatus.Error;
               else if (evtStatus === "success")
-                status = "success" /* Success */;
+                status = CoreToolCallStatus.Success;
               const display = event.display?.result;
               const liveOutput = displayContentToString(display) ?? tc.resultDisplay;
               const progressMessage = legacyState?.progressMessage ?? tc.progressMessage;
@@ -28645,7 +28670,7 @@ var useAgentStream = ({
               const resultDisplay = displayContentToString(display) ?? tc.resultDisplay;
               return {
                 ...tc,
-                status: event.isError ? "error" /* Error */ : "success" /* Success */,
+                status: event.isError ? CoreToolCallStatus.Error : CoreToolCallStatus.Success,
                 display: event.display ? { ...tc.display, ...event.display } : tc.display,
                 resultDisplay,
                 outputFile
@@ -28711,7 +28736,7 @@ var useAgentStream = ({
       if (!options?.isContinuation) {
         if (typeof query === "string") {
           addItem({ type: "user" /* USER */, text: query }, timestamp);
-          void logger?.logMessage("user" /* USER */, query);
+          void logger?.logMessage(MessageSenderType.USER, query);
         }
         startNewPrompt();
       }
@@ -30238,9 +30263,9 @@ var useFolderTrust = (settings, onTrustChange, addItem) => {
   const handleFolderTrustSelect = (0, import_react105.useCallback)(
     async (choice) => {
       const trustLevelMap = {
-        ["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 */
+        ["trust_folder" /* TRUST_FOLDER */]: TrustLevel.TRUST_FOLDER,
+        ["trust_parent" /* TRUST_PARENT */]: TrustLevel.TRUST_PARENT,
+        ["do_not_trust" /* DO_NOT_TRUST */]: TrustLevel.DO_NOT_TRUST
       };
       const trustLevel = trustLevelMap[choice];
       if (!trustLevel) return;
@@ -30259,7 +30284,7 @@ var useFolderTrust = (settings, onTrustChange, addItem) => {
         }, 100);
         return;
       }
-      const currentIsTrusted = trustLevel === "TRUST_FOLDER" /* TRUST_FOLDER */ || trustLevel === "TRUST_PARENT" /* TRUST_PARENT */;
+      const currentIsTrusted = trustLevel === TrustLevel.TRUST_FOLDER || trustLevel === TrustLevel.TRUST_PARENT;
       onTrustChange(currentIsTrusted);
       setIsTrusted(currentIsTrusted);
       const wasTrusted = isTrusted ?? false;
@@ -31267,7 +31292,7 @@ function useMessageQueue({
 var import_react107 = __toESM(require_react(), 1);
 function useMcpStatus(config) {
   const [discoveryState, setDiscoveryState] = (0, import_react107.useState)(
-    () => config.getMcpClientManager()?.getDiscoveryState() ?? "not_started" /* NOT_STARTED */
+    () => config.getMcpClientManager()?.getDiscoveryState() ?? MCPDiscoveryState.NOT_STARTED
   );
   const [mcpServerCount, setMcpServerCount] = (0, import_react107.useState)(
     () => config.getMcpClientManager()?.getMcpServerCount() ?? 0
@@ -31280,12 +31305,12 @@ function useMcpStatus(config) {
         setMcpServerCount(manager.getMcpServerCount());
       }
     };
-    coreEvents.on("mcp-client-update" /* McpClientUpdate */, onChange);
+    coreEvents.on(CoreEvent.McpClientUpdate, onChange);
     return () => {
-      coreEvents.off("mcp-client-update" /* McpClientUpdate */, onChange);
+      coreEvents.off(CoreEvent.McpClientUpdate, onChange);
     };
   }, [config]);
-  const isMcpReady = discoveryState === "completed" /* COMPLETED */ || discoveryState === "not_started" /* NOT_STARTED */ && mcpServerCount === 0;
+  const isMcpReady = discoveryState === MCPDiscoveryState.COMPLETED || discoveryState === MCPDiscoveryState.NOT_STARTED && mcpServerCount === 0;
   return {
     discoveryState,
     mcpServerCount,
@@ -31312,7 +31337,7 @@ function useApprovalModeIndicator({
     (key) => {
       let nextApprovalMode;
       if (keyMatchers["app.toggleYolo" /* TOGGLE_YOLO */](key)) {
-        if (config.isYoloModeDisabled() && config.getApprovalMode() !== "yolo" /* YOLO */) {
+        if (config.isYoloModeDisabled() && config.getApprovalMode() !== ApprovalMode.YOLO) {
           if (addItem) {
             let text = "You cannot enter YOLO mode since it is disabled in your settings.";
             const adminSettings = config.getRemoteAdminSettings();
@@ -31330,21 +31355,21 @@ function useApprovalModeIndicator({
           }
           return;
         }
-        nextApprovalMode = config.getApprovalMode() === "yolo" /* YOLO */ ? "default" /* DEFAULT */ : "yolo" /* YOLO */;
+        nextApprovalMode = config.getApprovalMode() === ApprovalMode.YOLO ? ApprovalMode.DEFAULT : ApprovalMode.YOLO;
       } else if (keyMatchers["app.cycleApprovalMode" /* CYCLE_APPROVAL_MODE */](key)) {
         const currentMode = config.getApprovalMode();
         switch (currentMode) {
-          case "default" /* DEFAULT */:
-            nextApprovalMode = "autoEdit" /* AUTO_EDIT */;
+          case ApprovalMode.DEFAULT:
+            nextApprovalMode = ApprovalMode.AUTO_EDIT;
             break;
-          case "autoEdit" /* AUTO_EDIT */:
-            nextApprovalMode = allowPlanMode ? "plan" /* PLAN */ : "default" /* DEFAULT */;
+          case ApprovalMode.AUTO_EDIT:
+            nextApprovalMode = allowPlanMode ? ApprovalMode.PLAN : ApprovalMode.DEFAULT;
             break;
-          case "plan" /* PLAN */:
-            nextApprovalMode = "default" /* DEFAULT */;
+          case ApprovalMode.PLAN:
+            nextApprovalMode = ApprovalMode.DEFAULT;
             break;
-          case "yolo" /* YOLO */:
-            nextApprovalMode = "autoEdit" /* AUTO_EDIT */;
+          case ApprovalMode.YOLO:
+            nextApprovalMode = ApprovalMode.AUTO_EDIT;
             break;
           default:
         }
@@ -31754,11 +31779,11 @@ var useHookDisplayState = () => {
         removeHook();
       }
     };
-    coreEvents.on("hook-start" /* HookStart */, handleHookStart);
-    coreEvents.on("hook-end" /* HookEnd */, handleHookEnd);
+    coreEvents.on(CoreEvent.HookStart, handleHookStart);
+    coreEvents.on(CoreEvent.HookEnd, handleHookEnd);
     return () => {
-      coreEvents.off("hook-start" /* HookStart */, handleHookStart);
-      coreEvents.off("hook-end" /* HookEnd */, handleHookEnd);
+      coreEvents.off(CoreEvent.HookStart, handleHookStart);
+      coreEvents.off(CoreEvent.HookEnd, handleHookEnd);
       activeTimeouts.forEach(clearTimeout);
       activeTimeouts.clear();
     };
@@ -32597,7 +32622,7 @@ var AppContainer = (props) => {
       setConfigInitialized(true);
       startupProfiler.flush(config);
       startAutoMemoryIfEnabled(config);
-      const sessionStartSource = resumedSessionData ? "resume" /* Resume */ : "startup" /* Startup */;
+      const sessionStartSource = resumedSessionData ? SessionStartSource.Resume : SessionStartSource.Startup;
       const result = await config.getHookSystem()?.fireSessionStartEvent(sessionStartSource);
       if (result) {
         const additionalContext = result.getAdditionalContext();
@@ -32624,7 +32649,7 @@ var AppContainer = (props) => {
       );
       const ideClient = await IdeClient.getInstance();
       await ideClient.disconnect();
-      await config?.getHookSystem()?.fireSessionEndEvent("exit" /* Exit */);
+      await config?.getHookSystem()?.fireSessionEndEvent(SessionEndReason.Exit);
     };
     registerCleanup(cleanupFn);
     return () => {
@@ -32649,11 +32674,11 @@ var AppContainer = (props) => {
         resetTime: payload.resetTime
       });
     };
-    coreEvents.on("model-changed" /* ModelChanged */, handleModelChanged);
-    coreEvents.on("quota-changed" /* QuotaChanged */, handleQuotaChanged);
+    coreEvents.on(CoreEvent.ModelChanged, handleModelChanged);
+    coreEvents.on(CoreEvent.QuotaChanged, handleQuotaChanged);
     return () => {
-      coreEvents.off("model-changed" /* ModelChanged */, handleModelChanged);
-      coreEvents.off("quota-changed" /* QuotaChanged */, handleQuotaChanged);
+      coreEvents.off(CoreEvent.ModelChanged, handleModelChanged);
+      coreEvents.off(CoreEvent.QuotaChanged, handleQuotaChanged);
     };
   }, [config]);
   (0, import_react121.useEffect)(() => {
@@ -32666,16 +32691,16 @@ var AppContainer = (props) => {
     const handleAgentsDiscovered = (payload) => {
       setNewAgents(payload.agents);
     };
-    coreEvents.on("settings-changed" /* SettingsChanged */, handleSettingsChanged);
-    coreEvents.on("admin-settings-changed" /* AdminSettingsChanged */, handleAdminSettingsChanged);
-    coreEvents.on("agents-discovered" /* AgentsDiscovered */, handleAgentsDiscovered);
+    coreEvents.on(CoreEvent.SettingsChanged, handleSettingsChanged);
+    coreEvents.on(CoreEvent.AdminSettingsChanged, handleAdminSettingsChanged);
+    coreEvents.on(CoreEvent.AgentsDiscovered, handleAgentsDiscovered);
     return () => {
-      coreEvents.off("settings-changed" /* SettingsChanged */, handleSettingsChanged);
+      coreEvents.off(CoreEvent.SettingsChanged, handleSettingsChanged);
       coreEvents.off(
-        "admin-settings-changed" /* AdminSettingsChanged */,
+        CoreEvent.AdminSettingsChanged,
         handleAdminSettingsChanged
       );
-      coreEvents.off("agents-discovered" /* AgentsDiscovered */, handleAgentsDiscovered);
+      coreEvents.off(CoreEvent.AgentsDiscovered, handleAgentsDiscovered);
     };
   }, [settings]);
   const { errorCount, clearErrorCount } = useErrorCount();
@@ -32740,11 +32765,11 @@ var AppContainer = (props) => {
     exitEditorDialog
   } = useEditorSettings(settings, setEditorError, historyManager.addItem);
   (0, import_react121.useEffect)(() => {
-    coreEvents.on("external-editor-closed" /* ExternalEditorClosed */, handleEditorClose);
-    coreEvents.on("request-editor-selection" /* RequestEditorSelection */, openEditorDialog);
+    coreEvents.on(CoreEvent.ExternalEditorClosed, handleEditorClose);
+    coreEvents.on(CoreEvent.RequestEditorSelection, openEditorDialog);
     return () => {
-      coreEvents.off("external-editor-closed" /* ExternalEditorClosed */, handleEditorClose);
-      coreEvents.off("request-editor-selection" /* RequestEditorSelection */, openEditorDialog);
+      coreEvents.off(CoreEvent.ExternalEditorClosed, handleEditorClose);
+      coreEvents.off(CoreEvent.RequestEditorSelection, openEditorDialog);
     };
   }, [handleEditorClose, openEditorDialog]);
   (0, import_react121.useEffect)(() => {
@@ -32812,7 +32837,7 @@ var AppContainer = (props) => {
     errorVerbosity: settings.merged.ui.errorVerbosity
   });
   const isAuthDialogOpen = authState === "updating" /* Updating */;
-  const isAuthenticating = authState === "unauthenticated" /* Unauthenticated */ && settings.merged.security.auth.selectedType !== "gemini-api-key" /* USE_GEMINI */;
+  const isAuthenticating = authState === "unauthenticated" /* Unauthenticated */ && settings.merged.security.auth.selectedType !== AuthType.USE_GEMINI;
   const isGeminiClientInitialized = config.getGeminiClient()?.isInitialized();
   const { loadHistoryForResume, isResuming } = useSessionResume({
     config,
@@ -32840,7 +32865,7 @@ var AppContainer = (props) => {
     async (authType, scope) => {
       if (authType) {
         const previousAuthType = config.getContentGeneratorConfig()?.authType ?? "unknown";
-        if (authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */) {
+        if (authType === AuthType.LOGIN_WITH_GOOGLE) {
           setAuthContext({ requiresRestart: true });
         } else {
           setAuthContext({});
@@ -32868,7 +32893,7 @@ var AppContainer = (props) => {
           );
           return;
         }
-        if (authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ && config.isBrowserLaunchSuppressed()) {
+        if (authType === AuthType.LOGIN_WITH_GOOGLE && config.isBrowserLaunchSuppressed()) {
           writeToStdout(`
 ----------------------------------------------------------------
 Logging in with Google... Restarting Gemini CLI to continue.
@@ -32891,7 +32916,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         }
         await saveApiKey(apiKey);
         await reloadApiKey();
-        await config.refreshAuth("gemini-api-key" /* USE_GEMINI */);
+        await config.refreshAuth(AuthType.USE_GEMINI);
         setAuthState("authenticated" /* Authenticated */);
       } catch (e) {
         onAuthError(
@@ -32916,7 +32941,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 === "gemini-api-key" /* USE_GEMINI */) {
+      if (settings.merged.security.auth.selectedType === AuthType.USE_GEMINI) {
         return;
       }
       const authMethod = settings.merged.security.auth.selectedType;
@@ -33052,9 +33077,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
         }
       });
     };
-    coreEvents.on("consent-request" /* ConsentRequest */, handleConsentRequest);
+    coreEvents.on(CoreEvent.ConsentRequest, handleConsentRequest);
     return () => {
-      coreEvents.off("consent-request" /* ConsentRequest */, handleConsentRequest);
+      coreEvents.off(CoreEvent.ConsentRequest, handleConsentRequest);
     };
   }, []);
   const performMemoryRefresh = (0, import_react121.useCallback)(async () => {
@@ -33712,7 +33737,7 @@ ${queuedText}` : queuedText;
       if (keyMatchers["app.showErrorDetails" /* SHOW_ERROR_DETAILS */](key)) {
         if (settings.merged.general.devtools) {
           void (async () => {
-            const { toggleDevToolsPanel } = await import("./devtoolsService-E62WA3CY.js");
+            const { toggleDevToolsPanel } = await import("./devtoolsService-Z2YXVMYF.js");
             await toggleDevToolsPanel(
               config,
               showErrorDetails,
@@ -33930,17 +33955,17 @@ ${queuedText}` : queuedText;
         Date.now()
       );
     };
-    coreEvents.on("user-feedback" /* UserFeedback */, handleUserFeedback);
-    coreEvents.on("hook-system-message" /* HookSystemMessage */, handleHookSystemMessage);
+    coreEvents.on(CoreEvent.UserFeedback, handleUserFeedback);
+    coreEvents.on(CoreEvent.HookSystemMessage, handleHookSystemMessage);
     coreEvents.drainBacklogs();
     return () => {
-      coreEvents.off("user-feedback" /* UserFeedback */, handleUserFeedback);
-      coreEvents.off("hook-system-message" /* HookSystemMessage */, handleHookSystemMessage);
+      coreEvents.off(CoreEvent.UserFeedback, handleUserFeedback);
+      coreEvents.off(CoreEvent.HookSystemMessage, handleHookSystemMessage);
     };
   }, [historyManager]);
   const nightly = props.version.includes("nightly");
   const isAwaitingLoginRestart = authState === "awaiting_login_restart" /* AwaitingLoginRestart */;
-  const loginRestartMessage = settings.merged.security.auth.selectedType === "vertex-ai" /* USE_VERTEX_AI */ ? "Authenticating to Vertex AI in Cloud Shell requires a restart to apply project settings." : void 0;
+  const loginRestartMessage = settings.merged.security.auth.selectedType === AuthType.USE_VERTEX_AI ? "Authenticating to Vertex AI in Cloud Shell requires a restart to apply project settings." : void 0;
   const dialogsVisible = shouldShowIdePrompt || isFolderTrustDialogOpen || isPolicyUpdateDialogOpen || adminSettingsChanged || !!commandConfirmationRequest || !!authConsentRequest || !!permissionConfirmationRequest || !!customDialog || confirmUpdateExtensionRequests.length > 0 || !!loopDetectionConfirmationRequest || isThemeDialogOpen || isSettingsDialogOpen || isModelDialogOpen || isVoiceModelDialogOpen || isAgentConfigDialogOpen || isPermissionsDialogOpen || isAuthenticating || isAuthDialogOpen || isEditorDialogOpen || showPrivacyNotice || showIdeRestartPrompt || !!proQuotaRequest || !!validationRequest || !!overageMenuRequest || !!emptyWalletRequest || isSessionBrowserOpen || authState === "awaiting_api_key_input" /* AwaitingApiKeyInput */ || isAwaitingLoginRestart || !!newAgents;
   const hasPendingToolConfirmation = (0, import_react121.useMemo)(
     () => isToolAwaitingConfirmation(pendingHistoryItems),
@@ -34040,9 +34065,9 @@ ${queuedText}` : queuedText;
     const handleMemoryChanged = (result) => {
       setGeminiMdFileCount(result.fileCount);
     };
-    coreEvents.on("memory-changed" /* MemoryChanged */, handleMemoryChanged);
+    coreEvents.on(CoreEvent.MemoryChanged, handleMemoryChanged);
     return () => {
-      coreEvents.off("memory-changed" /* MemoryChanged */, handleMemoryChanged);
+      coreEvents.off(CoreEvent.MemoryChanged, handleMemoryChanged);
     };
   }, []);
   (0, import_react121.useEffect)(() => {