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

package/bundle/{chunk-EDYPRCAA.js → chunk-6JF3XGX6.js}

@@ -1,13 +1,13 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   runExitCleanup
-} from "./chunk-SDWOC67Z.js";
+} from "./chunk-4TPFLAND.js";
 import {
   RELEASE_CHANNEL_STABILITY,
   debugLogger,
   getChannelFromVersion,
   isGitRepository
-} from "./chunk-6OFXOGEG.js";
+} from "./chunk-T7UXARRX.js";
 
 // packages/cli/src/utils/installationInfo.ts
 import * as fs from "node:fs";

package/bundle/{chunk-SDWOC67Z.js → chunk-7AV6KELE.js}

@@ -5,7 +5,7 @@ import {
   isTelemetrySdkInitialized,
   resetBrowserSession,
   shutdownTelemetry
-} from "./chunk-6OFXOGEG.js";
+} from "./chunk-NTBZBCDY.js";
 
 // packages/cli/src/utils/cleanup.ts
 import { promises as fs } from "node:fs";

package/bundle/{chunk-EBP6K2WG.js → chunk-7FPYEHDV.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-ZOHM7BPT.js";
+} from "./chunk-2XMCTNPW.js";
 import {
   AppEvent,
   appEvents
@@ -63,15 +63,15 @@ import {
   stripUnsafeCharacters,
   toCodePoints,
   validateCustomTheme
-} from "./chunk-HN74ORTP.js";
+} from "./chunk-46DG3MEK.js";
 import {
   isDevelopment
-} from "./chunk-VBVCLWLA.js";
+} from "./chunk-TDYDNMXH.js";
 import {
   emptyIcon,
   mapCoreStatusToDisplayStatus,
   require_react
-} from "./chunk-NX7TO2DU.js";
+} from "./chunk-H2WBGLUF.js";
 import {
   ALL_EDITORS,
   ApprovalMode,
@@ -252,7 +252,7 @@ import {
   tokenLimit,
   uiTelemetryService,
   unescapePath
-} from "./chunk-ZQW7OGUO.js";
+} from "./chunk-MN5WGELB.js";
 import {
   require_src
 } from "./chunk-L6PII3GR.js";
@@ -77764,7 +77764,7 @@ var authCommand = {
 import process29 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "fdf63956c";
+var GIT_COMMIT_INFO = "581fdbbfa";
 
 // packages/cli/src/ui/utils/historyExportUtils.ts
 import * as fsPromises from "node:fs/promises";
@@ -81891,6 +81891,18 @@ var import_react74 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/utils/rewindFileOps.ts
 import fs32 from "node:fs/promises";
+function isPartWithKey(part, key) {
+  return typeof part === "object" && part !== null && key in part;
+}
+function isToolResponseMessage(msg) {
+  if (msg.type !== "user" || !Array.isArray(msg.content) || msg.content.length === 0) {
+    return false;
+  }
+  const parts = msg.content;
+  return parts.some((p2) => isPartWithKey(p2, "functionResponse")) && parts.every(
+    (p2) => isPartWithKey(p2, "functionResponse") || isPartWithKey(p2, "inlineData") || isPartWithKey(p2, "fileData")
+  );
+}
 function calculateTurnStats(conversation, userMessage) {
   const msgIndex = conversation.messages.indexOf(userMessage);
   if (msgIndex === -1) return null;
@@ -81900,7 +81912,9 @@ function calculateTurnStats(conversation, userMessage) {
   let hasEdits = false;
   for (let i = msgIndex + 1; i < conversation.messages.length; i++) {
     const msg = conversation.messages[i];
-    if (msg.type === "user") break;
+    if (msg.type === "user" && !isToolResponseMessage(msg)) {
+      break;
+    }
     if (msg.type === "gemini" && msg.toolCalls) {
       for (const toolCall of msg.toolCalls) {
         const fileDiff = getFileDiffFromResultDisplay(toolCall.resultDisplay);
@@ -82259,7 +82273,9 @@ var RewindViewer = ({
     null
   );
   const interactions = (0, import_react76.useMemo)(
-    () => conversation.messages.filter((msg) => msg.type === "user"),
+    () => conversation.messages.filter(
+      (msg) => msg.type === "user" && !isToolResponseMessage(msg)
+    ),
     [conversation.messages]
   );
   const items = (0, import_react76.useMemo)(() => {
@@ -83545,7 +83561,7 @@ Use /mcp auth <server-name> to authenticate.`
         type: "info",
         text: `Starting OAuth authentication for MCP server '${serverName}'...`
       });
-      const { MCPOAuthProvider } = await import("./dist-7L3BRW6V.js");
+      const { MCPOAuthProvider } = await import("./dist-EOOSNLUQ.js");
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
         oauthConfig = { enabled: false };

package/bundle/{chunk-U76XPSKR.js → chunk-7OAPTXNW.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-QUCRASYB.js";
+} from "./chunk-ONZZ4MZP.js";
 import {
   AppEvent,
   appEvents
@@ -63,21 +63,23 @@ import {
   stripUnsafeCharacters,
   toCodePoints,
   validateCustomTheme
-} from "./chunk-ZPLFLZQA.js";
+} from "./chunk-L3JNREL2.js";
 import {
   isDevelopment
-} from "./chunk-EFX5XL6M.js";
+} from "./chunk-6JF3XGX6.js";
 import {
   emptyIcon,
   mapCoreStatusToDisplayStatus,
   require_react
-} from "./chunk-2VN53SWW.js";
+} from "./chunk-RQB6UOWL.js";
 import {
   ALL_EDITORS,
   ApprovalMode,
   AsyncFzf,
+  AuthType,
   Config,
   CoreEvent,
+  CoreToolCallStatus,
   DiscoveredMCPTool,
   ExtensionDisableEvent,
   ExtensionEnableEvent,
@@ -88,21 +90,32 @@ import {
   ExtensionUpdateEvent,
   GEMINI_CLI_COMPANION_EXTENSION_NAME,
   GEMINI_DIR,
+  HookType,
+  IDEConnectionStatus,
   INITIAL_HISTORY_LENGTH,
   IdeClient,
   IdeConnectionEvent,
+  IdeConnectionType,
+  IntegrityDataStatus,
   KeychainTokenStorage,
+  LlmRole,
+  MCPDiscoveryState,
   MCPOAuthTokenStorage,
+  MCPServerStatus,
   ModelSlashCommandEvent,
+  PolicyDecision,
   ProjectIdRequiredError,
   REFERENCE_CONTENT_END,
   REFERENCE_CONTENT_START,
   ReadManyFilesTool,
   RewindEvent,
   SHELL_TOOL_NAME,
+  SessionEndReason,
+  SessionStartSource,
   ShellExecutionService,
   StartSessionEvent,
   Storage,
+  TrustLevel,
   UPGRADE_URL_PAGE,
   UserAccountManager,
   ValidationRequiredError,
@@ -239,7 +252,7 @@ import {
   tokenLimit,
   uiTelemetryService,
   unescapePath
-} from "./chunk-A4TO2DY2.js";
+} from "./chunk-T7UXARRX.js";
 import {
   require_src
 } from "./chunk-L6PII3GR.js";
@@ -60107,7 +60120,7 @@ var import_react34 = __toESM(require_react(), 1);
 function useIdeTrustListener() {
   const settings = useSettings();
   const [connectionStatus, setConnectionStatus] = (0, import_react34.useState)(
-    "disconnected" /* Disconnected */
+    IDEConnectionStatus.Disconnected
   );
   const previousTrust = (0, import_react34.useRef)(void 0);
   const [restartReason, setRestartReason] = (0, import_react34.useState)("NONE");
@@ -60137,7 +60150,7 @@ function useIdeTrustListener() {
     };
   }, []);
   const getSnapshot = () => {
-    if (connectionStatus !== "connected" /* Connected */) {
+    if (connectionStatus !== IDEConnectionStatus.Connected) {
       return void 0;
     }
     return ideContextStore.get()?.workspaceState?.isTrusted;
@@ -60842,7 +60855,7 @@ async function initializeApp(config, settings) {
       await ideClient.connect();
       logIdeConnection(
         config,
-        new IdeConnectionEvent("start" /* START */)
+        new IdeConnectionEvent(IdeConnectionType.START)
       );
     }).catch((e) => {
       debugLogger.error("Failed to initialize IDE client:", e);
@@ -60860,17 +60873,17 @@ async function initializeApp(config, settings) {
 // packages/cli/src/config/auth.ts
 async function validateAuthMethod(authMethod) {
   loadEnvironment(loadSettings().merged, process.cwd());
-  if (authMethod === "oauth-personal" /* LOGIN_WITH_GOOGLE */ || authMethod === "compute-default-credentials" /* COMPUTE_ADC */) {
+  if (authMethod === AuthType.LOGIN_WITH_GOOGLE || authMethod === AuthType.COMPUTE_ADC) {
     return null;
   }
-  if (authMethod === "gemini-api-key" /* USE_GEMINI */) {
+  if (authMethod === AuthType.USE_GEMINI) {
     const key = process.env["GEMINI_API_KEY"] || await loadApiKey();
     if (!key) {
       return "When using Gemini API, you must specify the GEMINI_API_KEY environment variable.\nUpdate your environment and try again (no reload needed if using .env)!";
     }
     return null;
   }
-  if (authMethod === "vertex-ai" /* USE_VERTEX_AI */) {
+  if (authMethod === AuthType.USE_VERTEX_AI) {
     const hasVertexProjectLocationConfig = !!process.env["GOOGLE_CLOUD_PROJECT"] && !!process.env["GOOGLE_CLOUD_LOCATION"];
     const hasGoogleApiKey = !!process.env["GOOGLE_API_KEY"];
     if (!hasVertexProjectLocationConfig && !hasGoogleApiKey) {
@@ -65442,7 +65455,7 @@ var ExtensionManager = class extends ExtensionLoader {
           const trustedFolders = loadTrustedFolders();
           await trustedFolders.setValue(
             this.workspaceDir,
-            "TRUST_FOLDER" /* TRUST_FOLDER */
+            TrustLevel.TRUST_FOLDER
           );
         } else {
           throw new Error(
@@ -65628,7 +65641,7 @@ Would you like to attempt to install via "git clone" instead?`
               newExtensionConfig.version,
               previousExtensionConfig.version,
               installMetadata.type,
-              "success" /* Success */
+              CoreToolCallStatus.Success
             )
           );
           if (newExtensionName !== previousName) {
@@ -65651,7 +65664,7 @@ Would you like to attempt to install via "git clone" instead?`
               getExtensionId(newExtensionConfig, installMetadata),
               newExtensionConfig.version,
               installMetadata.type,
-              "success" /* Success */
+              CoreToolCallStatus.Success
             )
           );
           await this.enableExtension(
@@ -65690,7 +65703,7 @@ Would you like to attempt to install via "git clone" instead?`
             newExtensionConfig?.version ?? "",
             previousExtensionConfig.version,
             installMetadata.type,
-            "error" /* Error */
+            CoreToolCallStatus.Error
           )
         );
       } else {
@@ -65702,7 +65715,7 @@ Would you like to attempt to install via "git clone" instead?`
             extensionId ?? "",
             newExtensionConfig?.version ?? "",
             installMetadata.type,
-            "error" /* Error */
+            CoreToolCallStatus.Error
           )
         );
       }
@@ -65730,7 +65743,7 @@ Would you like to attempt to install via "git clone" instead?`
         extension.name,
         hashValue(extension.name),
         extension.id,
-        "success" /* Success */
+        CoreToolCallStatus.Success
       )
     );
   }
@@ -65992,7 +66005,7 @@ Would you like to attempt to install via "git clone" instead?`
             if (eventHooks) {
               for (const definition of eventHooks) {
                 for (const hook of definition.hooks) {
-                  if (hook.type === "command" /* Command */) {
+                  if (hook.type === HookType.Command) {
                     hook.env = { ...hook.env, ...hookEnv };
                   }
                 }
@@ -67139,7 +67152,7 @@ async function readMcpResources(resourceParts, config, signal) {
           callId: `mcp-resource-${resource.serverName}-${resource.uri}`,
           name: `resources/read (${resource.serverName})`,
           description: resource.uri,
-          status: "success" /* Success */,
+          status: CoreToolCallStatus.Success,
           isClientInitiated: true,
           resultDisplay: `Successfully read resource ${resource.uri}`,
           confirmationDetails: void 0
@@ -67154,7 +67167,7 @@ async function readMcpResources(resourceParts, config, signal) {
           callId: `mcp-resource-${resource.serverName}-${resource.uri}`,
           name: `resources/read (${resource.serverName})`,
           description: resource.uri,
-          status: "error" /* Error */,
+          status: CoreToolCallStatus.Error,
           isClientInitiated: true,
           resultDisplay: `Error reading resource ${resource.uri}: ${getErrorMessage(error)}`,
           confirmationDetails: void 0
@@ -67179,7 +67192,7 @@ Content from @${result.uri}:
   }
   if (hasError) {
     const firstError = displays.find(
-      (d) => d.status === "error" /* Error */
+      (d) => d.status === CoreToolCallStatus.Error
     );
     return {
       parts: [],
@@ -67220,7 +67233,7 @@ async function readLocalFiles(resolvedFiles, config, signal, userMessageTimestam
       callId: `client-read-${userMessageTimestamp}`,
       name: readManyFilesTool.displayName,
       description: invocation.getDescription(),
-      status: "success" /* Success */,
+      status: CoreToolCallStatus.Success,
       isClientInitiated: true,
       resultDisplay: result.returnDisplay || `Successfully read: ${fileLabelsForDisplay.join(", ")}`,
       confirmationDetails: void 0
@@ -67267,7 +67280,7 @@ Content from @${displayPath}:
       callId: `client-read-${userMessageTimestamp}`,
       name: readManyFilesTool.displayName,
       description: invocation?.getDescription() ?? "Error attempting to execute tool to read files",
-      status: "error" /* Error */,
+      status: CoreToolCallStatus.Error,
       isClientInitiated: true,
       resultDisplay: `Error reading files (${fileLabelsForDisplay.join(", ")}): ${getErrorMessage(error)}`,
       confirmationDetails: void 0
@@ -70534,7 +70547,7 @@ async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType
     if (wasRaw) {
       setRawMode?.(true);
     }
-    coreEvents.emit("external-editor-closed" /* ExternalEditorClosed */);
+    coreEvents.emit(CoreEvent.ExternalEditorClosed);
   }
 }
 
@@ -73228,7 +73241,7 @@ async function updateExtension(extension, extensionManager, currentState, dispat
       extension.name,
       installMetadata
     );
-    if (status === "invalid" /* INVALID */) {
+    if (status === IntegrityDataStatus.INVALID) {
       throw new Error("Extension integrity cannot be verified");
     }
   } catch (e) {
@@ -74723,11 +74736,11 @@ var ShellProcessor = class {
         },
         void 0
       );
-      if (decision === "deny" /* DENY */) {
+      if (decision === PolicyDecision.DENY) {
         throw new Error(
           `${this.commandName} cannot be run. Blocked command: "${command}". Reason: Blocked by policy.`
         );
-      } else if (decision === "ask_user" /* ASK_USER */) {
+      } else if (decision === PolicyDecision.ASK_USER) {
         commandsToConfirm.add(command);
       }
     }
@@ -75857,7 +75870,7 @@ var MultiFolderTrustDialog = ({
           if (choice === 1 /* YES_AND_REMEMBER */) {
             await trustedFolders.setValue(
               expandedPath,
-              "TRUST_FOLDER" /* TRUST_FOLDER */
+              TrustLevel.TRUST_FOLDER
             );
           }
           workspaceContext.addDirectory(expandedPath);
@@ -76143,10 +76156,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_react56.useState)(false);
@@ -76306,14 +76319,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) => {
@@ -77751,7 +77764,7 @@ var authCommand = {
 import process29 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "fb972b2f8";
+var GIT_COMMIT_INFO = "581fdbbfa";
 
 // packages/cli/src/ui/utils/historyExportUtils.ts
 import * as fsPromises from "node:fs/promises";
@@ -78397,7 +78410,7 @@ var clearCommand = {
     const config = context.services.agentContext?.config;
     const hookSystem = config?.getHookSystem();
     if (hookSystem) {
-      await hookSystem.fireSessionEndEvent("clear" /* Clear */);
+      await hookSystem.fireSessionEndEvent(SessionEndReason.Clear);
     }
     config?.injectionService.clear();
     let newSessionId;
@@ -78414,7 +78427,7 @@ var clearCommand = {
     }
     let result;
     if (hookSystem) {
-      result = await hookSystem.fireSessionStartEvent("clear" /* Clear */);
+      result = await hookSystem.fireSessionStartEvent(SessionStartSource.Clear);
     }
     await new Promise((resolve9) => setImmediate(resolve9));
     if (config) {
@@ -81413,7 +81426,7 @@ var Footer = () => {
       case "auth": {
         if (!settings.merged.ui.showUserIdentity) break;
         if (!authType) break;
-        const displayStr = authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ ? email ?? "google" : authType;
+        const displayStr = authType === AuthType.LOGIN_WITH_GOOGLE ? email ?? "google" : authType;
         addCol(
           id,
           header,
@@ -81878,6 +81891,18 @@ var import_react74 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/utils/rewindFileOps.ts
 import fs32 from "node:fs/promises";
+function isPartWithKey(part, key) {
+  return typeof part === "object" && part !== null && key in part;
+}
+function isToolResponseMessage(msg) {
+  if (msg.type !== "user" || !Array.isArray(msg.content) || msg.content.length === 0) {
+    return false;
+  }
+  const parts = msg.content;
+  return parts.some((p2) => isPartWithKey(p2, "functionResponse")) && parts.every(
+    (p2) => isPartWithKey(p2, "functionResponse") || isPartWithKey(p2, "inlineData") || isPartWithKey(p2, "fileData")
+  );
+}
 function calculateTurnStats(conversation, userMessage) {
   const msgIndex = conversation.messages.indexOf(userMessage);
   if (msgIndex === -1) return null;
@@ -81887,7 +81912,9 @@ function calculateTurnStats(conversation, userMessage) {
   let hasEdits = false;
   for (let i = msgIndex + 1; i < conversation.messages.length; i++) {
     const msg = conversation.messages[i];
-    if (msg.type === "user") break;
+    if (msg.type === "user" && !isToolResponseMessage(msg)) {
+      break;
+    }
     if (msg.type === "gemini" && msg.toolCalls) {
       for (const toolCall of msg.toolCalls) {
         const fileDiff = getFileDiffFromResultDisplay(toolCall.resultDisplay);
@@ -82246,7 +82273,9 @@ var RewindViewer = ({
     null
   );
   const interactions = (0, import_react76.useMemo)(
-    () => conversation.messages.filter((msg) => msg.type === "user"),
+    () => conversation.messages.filter(
+      (msg) => msg.type === "user" && !isToolResponseMessage(msg)
+    ),
     [conversation.messages]
   );
   const items = (0, import_react76.useMemo)(() => {
@@ -83181,12 +83210,12 @@ import path29 from "node:path";
 function getIdeStatusMessage(ideClient) {
   const connection = ideClient.getConnectionStatus();
   switch (connection.status) {
-    case "connected" /* Connected */:
+    case IDEConnectionStatus.Connected:
       return {
         messageType: "info",
         content: `\u{1F7E2} Connected to ${ideClient.getDetectedIdeDisplayName()}`
       };
-    case "connecting" /* Connecting */:
+    case IDEConnectionStatus.Connecting:
       return {
         messageType: "info",
         content: `\u{1F7E1} Connecting...`
@@ -83227,7 +83256,7 @@ ${infoMessage}`;
 async function getIdeStatusMessageWithFiles(ideClient) {
   const connection = ideClient.getConnectionStatus();
   switch (connection.status) {
-    case "connected" /* Connected */: {
+    case IDEConnectionStatus.Connected: {
       let content = `\u{1F7E2} Connected to ${ideClient.getDetectedIdeDisplayName()}`;
       const context = ideContextStore.get();
       const openFiles = context?.workspaceState?.openFiles;
@@ -83239,7 +83268,7 @@ async function getIdeStatusMessageWithFiles(ideClient) {
         content
       };
     }
-    case "connecting" /* Connecting */:
+    case IDEConnectionStatus.Connecting:
       return {
         messageType: "info",
         content: `\u{1F7E1} Connecting...`
@@ -83261,7 +83290,7 @@ async function setIdeModeAndSyncConnection(config, value, options = {}) {
   const ideClient = await IdeClient.getInstance();
   if (value) {
     await ideClient.connect(options);
-    logIdeConnection(config, new IdeConnectionEvent("session" /* SESSION */));
+    logIdeConnection(config, new IdeConnectionEvent(IdeConnectionType.SESSION));
   } else {
     await ideClient.disconnect();
   }
@@ -83349,7 +83378,7 @@ var ideCommand = async () => {
               logToConsole: false
             }
           );
-          if (ideClient.getConnectionStatus().status === "connected" /* Connected */) {
+          if (ideClient.getConnectionStatus().status === IDEConnectionStatus.Connected) {
             break;
           }
           await new Promise((resolve9) => setTimeout(resolve9, 500));
@@ -83426,7 +83455,7 @@ var ideCommand = async () => {
     }
   };
   const { status } = ideClient.getConnectionStatus();
-  const isConnected = status === "connected" /* Connected */;
+  const isConnected = status === IDEConnectionStatus.Connected;
   if (isConnected) {
     ideSlashCommand.subCommands = [statusCommand2, disableCommand5];
   } else {
@@ -83526,13 +83555,13 @@ Use /mcp auth <server-name> to authenticate.`
     const displayListener = (message) => {
       context.ui.addItem({ type: "info", text: message });
     };
-    coreEvents.on("oauth-display-message" /* OauthDisplayMessage */, displayListener);
+    coreEvents.on(CoreEvent.OauthDisplayMessage, displayListener);
     try {
       context.ui.addItem({
         type: "info",
         text: `Starting OAuth authentication for MCP server '${serverName}'...`
       });
-      const { MCPOAuthProvider } = await import("./core-IUIZE6JW.js");
+      const { MCPOAuthProvider } = await import("./dist-24APVFHT.js");
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
         oauthConfig = { enabled: false };
@@ -83569,7 +83598,7 @@ Use /mcp auth <server-name> to authenticate.`
         content: `Failed to authenticate with MCP server '${serverName}': ${getErrorMessage(error)}`
       };
     } finally {
-      coreEvents.removeListener("oauth-display-message" /* OauthDisplayMessage */, displayListener);
+      coreEvents.removeListener(CoreEvent.OauthDisplayMessage, displayListener);
     }
   },
   completion: async (context, partialArg) => {
@@ -83615,10 +83644,10 @@ var listAction2 = async (context, showDescriptions = false, showSchema = false,
   }
   const serverNames = Object.keys(mcpServers);
   const connectingServers = serverNames.filter(
-    (name) => getMCPServerStatus(name) === "connecting" /* CONNECTING */
+    (name) => getMCPServerStatus(name) === MCPServerStatus.CONNECTING
   );
   const discoveryState = getMCPDiscoveryState();
-  const discoveryInProgress = discoveryState === "in_progress" /* IN_PROGRESS */ || connectingServers.length > 0;
+  const discoveryInProgress = discoveryState === MCPDiscoveryState.IN_PROGRESS || connectingServers.length > 0;
   const allTools = toolRegistry.getAllTools();
   const mcpTools = allTools.filter((tool) => tool instanceof DiscoveredMCPTool);
   const promptRegistry = config.getPromptRegistry();
@@ -99390,7 +99419,7 @@ Return a JSON object with:
         },
         abortSignal: new AbortController().signal,
         promptId: "triage-duplicates",
-        role: "utility_tool" /* UTILITY_TOOL */
+        role: LlmRole.UTILITY_TOOL
       });
       const rec = response;
       let canonical;
@@ -100224,7 +100253,7 @@ Return a JSON object with:
         },
         abortSignal: abortControllerRef.current.signal,
         promptId: "triage-issues",
-        role: "utility_tool" /* UTILITY_TOOL */
+        role: LlmRole.UTILITY_TOOL
       });
       return response;
     },
@@ -100798,8 +100827,8 @@ var planCommand = {
       return;
     }
     const previousApprovalMode = config.getApprovalMode();
-    config.setApprovalMode("plan" /* PLAN */);
-    if (previousApprovalMode !== "plan" /* PLAN */) {
+    config.setApprovalMode(ApprovalMode.PLAN);
+    if (previousApprovalMode !== ApprovalMode.PLAN) {
       coreEvents.emitFeedback("info", "Switched to Plan Mode.");
     }
     if (context.invocation?.args) {
@@ -100858,10 +100887,10 @@ var categorizeRulesByMode = (rules) => {
   rules.forEach((rule) => {
     const modes = rule.modes?.length ? rule.modes : ALL_MODES;
     const modeSet = new Set(modes);
-    if (modeSet.has("default" /* DEFAULT */)) result.normal.push(rule);
-    if (modeSet.has("autoEdit" /* AUTO_EDIT */)) result.autoEdit.push(rule);
-    if (modeSet.has("yolo" /* YOLO */)) result.yolo.push(rule);
-    if (modeSet.has("plan" /* PLAN */)) result.plan.push(rule);
+    if (modeSet.has(ApprovalMode.DEFAULT)) result.normal.push(rule);
+    if (modeSet.has(ApprovalMode.AUTO_EDIT)) result.autoEdit.push(rule);
+    if (modeSet.has(ApprovalMode.YOLO)) result.yolo.push(rule);
+    if (modeSet.has(ApprovalMode.PLAN)) result.plan.push(rule);
   });
   return result;
 };
@@ -102242,7 +102271,7 @@ var upgradeCommand = {
   action: async (context) => {
     const config = context.services.agentContext?.config;
     const authType = config?.getContentGeneratorConfig()?.authType;
-    if (authType !== "oauth-personal" /* LOGIN_WITH_GOOGLE */) {
+    if (authType !== AuthType.LOGIN_WITH_GOOGLE) {
       return {
         type: "message",
         messageType: "error",
@@ -102471,7 +102500,7 @@ var BuiltinCommandLoader = class {
       setupGithubCommand,
       terminalSetupCommand,
       ...this.config?.isVoiceModeEnabled() ? [voiceCommand] : [],
-      ...this.config?.getContentGeneratorConfig()?.authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ ? [upgradeCommand] : []
+      ...this.config?.getContentGeneratorConfig()?.authType === AuthType.LOGIN_WITH_GOOGLE ? [upgradeCommand] : []
     ];
     handle?.end();
     return allDefinitions.filter((cmd) => cmd !== null);

package/bundle/{chunk-EFX5XL6M.js → chunk-BONG2QK5.js}

@@ -1,13 +1,13 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   runExitCleanup
-} from "./chunk-UFQDAROY.js";
+} from "./chunk-JLBO43LX.js";
 import {
   RELEASE_CHANNEL_STABILITY,
   debugLogger,
   getChannelFromVersion,
   isGitRepository
-} from "./chunk-A4TO2DY2.js";
+} from "./chunk-627EICDK.js";
 
 // packages/cli/src/utils/installationInfo.ts
 import * as fs from "node:fs";