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

package/bundle/{gemini-R5NCXCEL.js → gemini-5WY2YO7R.js}

@@ -41,18 +41,18 @@ import {
   updateAllUpdatableExtensions,
   updateExtension,
   validateAuthMethod
-} from "./chunk-MFYAVF7Y.js";
+} from "./chunk-O3UKVEBS.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
 import {
   startCommand,
   startServer
-} from "./chunk-LBE2WKE7.js";
+} from "./chunk-ONUDATHO.js";
 import {
   exitCli,
   require_source
-} from "./chunk-HZNEV3DS.js";
+} from "./chunk-RXYIE5L5.js";
 import {
   DEFAULT_PORT,
   GEMMA_MODEL_NAME,
@@ -86,11 +86,11 @@ import {
   readServerProcessInfo,
   resolveGemmaConfig,
   saveModelChange
-} from "./chunk-ZXN4VW7M.js";
+} from "./chunk-5CWORGE3.js";
 import {
   RELAUNCH_EXIT_CODE
-} from "./chunk-F2LLVPPS.js";
-import "./chunk-YMNECODB.js";
+} from "./chunk-JPYTHGMI.js";
+import "./chunk-WRWCUHAM.js";
 import {
   cleanupCheckpoints,
   registerCleanup,
@@ -99,12 +99,15 @@ import {
   runExitCleanup,
   runSyncCleanup,
   setupSignalHandlers
-} from "./chunk-QFEJQS5X.js";
+} from "./chunk-7Y6NU65D.js";
 import {
   ASK_USER_TOOL_NAME,
+  ApprovalMode,
   AuthType,
   Client,
   Config,
+  CoreEvent,
+  CoreToolCallStatus,
   DEFAULT_CONTEXT_FILENAME,
   DEFAULT_FILE_FILTERING_OPTIONS,
   DEFAULT_GEMINI_EMBEDDING_MODEL,
@@ -126,32 +129,45 @@ import {
   FolderTrustDiscoveryService,
   GEMINI_DIR,
   GEMINI_MODEL_ALIAS_AUTO,
+  GeminiEventType,
   IdeClient,
+  IntegrityStatus,
   InvalidStreamError,
   JsonFormatter,
+  JsonStreamEventType,
+  Kind,
   LegacyAgentSession,
   Logger,
   MCPServerConfig,
+  MCPServerStatus,
+  MessageBusType,
+  OutputFormat,
   PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL,
   PREVIEW_GEMINI_3_1_MODEL,
   PREVIEW_GEMINI_FLASH_LITE_MODEL,
   PREVIEW_GEMINI_FLASH_MODEL,
   PREVIEW_GEMINI_MODEL,
+  PolicyDecision,
   PolicyIntegrityManager,
   REFERENCE_CONTENT_START,
   ROOT_SCHEDULER_ID,
   ReadManyFilesTool,
   Scheduler,
+  SessionEndReason,
+  SessionStartSource,
   ShellExecutionService,
   SimpleExtensionLoader,
   Storage,
   StreamJsonFormatter,
   ToolCallEvent,
   ToolConfirmationOutcome,
+  ToolErrorType,
+  TrustLevel,
   UserAccountManager,
   UserPromptEvent,
   ValidationCancelledError,
   ValidationRequiredError,
+  WarningPriority,
   applyAdminAllowlist,
   applyRequiredServers,
   clearCachedCredentialFile,
@@ -231,7 +247,7 @@ import {
   updatePolicy,
   writeToStderr,
   writeToStdout
-} from "./chunk-XRDSBRG4.js";
+} from "./chunk-ITC7TFJU.js";
 import "./chunk-6HI7VNOG.js";
 import "./chunk-TUDYL3X4.js";
 import "./chunk-IUUIT4SU.js";
@@ -5361,7 +5377,7 @@ var MCP_LIST_DEFAULT_TIMEOUT_MSEC = 5e3;
 async function testMCPConnection(serverName, config, isTrusted, activeSettings) {
   const isStdio = !!config.command;
   if (isStdio && !isTrusted) {
-    return "disconnected" /* DISCONNECTED */;
+    return MCPServerStatus.DISCONNECTED;
   }
   const client = new Client({
     name: "mcp-test-client",
@@ -5397,7 +5413,7 @@ async function testMCPConnection(serverName, config, isTrusted, activeSettings)
     transport = await createTransport(serverName, config, false, mcpContext);
   } catch {
     await client.close();
-    return "disconnected" /* DISCONNECTED */;
+    return MCPServerStatus.DISCONNECTED;
   }
   try {
     const timeout = config.timeout ?? MCP_LIST_DEFAULT_TIMEOUT_MSEC;
@@ -5411,10 +5427,10 @@ async function testMCPConnection(serverName, config, isTrusted, activeSettings)
       );
     }
     await client.close();
-    return "connected" /* CONNECTED */;
+    return MCPServerStatus.CONNECTED;
   } catch {
     await transport.close();
-    return "disconnected" /* DISCONNECTED */;
+    return MCPServerStatus.DISCONNECTED;
   }
 }
 async function getServerStatus(serverName, server, isTrusted, activeSettings, consolidatedExcluded, consolidatedAllowed) {
@@ -5427,12 +5443,12 @@ async function getServerStatus(serverName, server, isTrusted, activeSettings, co
   });
   if (!loadResult.allowed) {
     if (loadResult.blockType === "admin" || loadResult.blockType === "allowlist" || loadResult.blockType === "excludelist") {
-      return "blocked" /* BLOCKED */;
+      return MCPServerStatus.BLOCKED;
     }
-    return "disabled" /* DISABLED */;
+    return MCPServerStatus.DISABLED;
   }
   if (!isTrusted) {
-    return "disabled" /* DISABLED */;
+    return MCPServerStatus.DISABLED;
   }
   return testMCPConnection(serverName, server, isTrusted, activeSettings);
 }
@@ -5478,23 +5494,23 @@ async function listMcpServers(loadedSettingsArg) {
     let statusIndicator = "";
     let statusText = "";
     switch (status) {
-      case "connected" /* CONNECTED */:
+      case MCPServerStatus.CONNECTED:
         statusIndicator = import_chalk.default.green("\u2713");
         statusText = "Connected";
         break;
-      case "connecting" /* CONNECTING */:
+      case MCPServerStatus.CONNECTING:
         statusIndicator = import_chalk.default.yellow("\u2026");
         statusText = "Connecting";
         break;
-      case "blocked" /* BLOCKED */:
+      case MCPServerStatus.BLOCKED:
         statusIndicator = import_chalk.default.red("\u26D4");
         statusText = "Blocked";
         break;
-      case "disabled" /* DISABLED */:
+      case MCPServerStatus.DISABLED:
         statusIndicator = import_chalk.default.gray("\u25CB");
         statusText = "Disabled";
         break;
-      case "disconnected" /* DISCONNECTED */:
+      case MCPServerStatus.DISCONNECTED:
       default:
         statusIndicator = import_chalk.default.red("\u2717");
         statusText = "Disconnected";
@@ -5780,7 +5796,7 @@ async function handleInstall(args) {
         );
         if (confirmed) {
           const trustedFolders = loadTrustedFolders();
-          await trustedFolders.setValue(realPath, "TRUST_FOLDER" /* TRUST_FOLDER */);
+          await trustedFolders.setValue(realPath, TrustLevel.TRUST_FOLDER);
         } else {
           throw new Error(
             `Installation aborted: Folder "${absolutePath}" is not trusted.`
@@ -7825,7 +7841,7 @@ async function loadSandboxConfig(settings, argv) {
   }
   const command2 = getSandboxCommand(sandboxValue);
   const packageJson = await getPackageJson(__dirname3);
-  const image = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.45.0-nightly.20260521.g854f811be" ?? customImage ?? packageJson?.config?.sandboxImageUri;
+  const image = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.46.0-preview.1" ?? customImage ?? packageJson?.config?.sandboxImageUri;
   const isNative = command2 === "windows-native" || command2 === "sandbox-exec" || command2 === "lxc";
   return command2 && (image || isNative) ? { enabled: true, allowedPaths, networkAccess, command: command2, image } : void 0;
 }
@@ -7884,9 +7900,9 @@ async function resolveWorkspacePolicyState(options) {
       cwd,
       potentialWorkspacePoliciesDir
     );
-    if (integrityResult.status === "MATCH" /* MATCH */) {
+    if (integrityResult.status === IntegrityStatus.MATCH) {
       workspacePoliciesDir = potentialWorkspacePoliciesDir;
-    } else if (integrityResult.status === "NEW" /* NEW */ && integrityResult.fileCount === 0) {
+    } else if (integrityResult.status === IntegrityStatus.NEW && integrityResult.fileCount === 0) {
       workspacePoliciesDir = void 0;
     } else if (interactive && !autoAcceptWorkspacePolicies) {
       policyUpdateConfirmationRequest = {
@@ -8314,23 +8330,23 @@ async function loadCliConfig(settings, sessionId, argv, options = {}) {
   if (rawApprovalMode) {
     switch (rawApprovalMode) {
       case "yolo":
-        approvalMode = "yolo" /* YOLO */;
+        approvalMode = ApprovalMode.YOLO;
         break;
       case "auto_edit":
-        approvalMode = "autoEdit" /* AUTO_EDIT */;
+        approvalMode = ApprovalMode.AUTO_EDIT;
         break;
       case "plan":
         if (!(settings.general?.plan?.enabled ?? true)) {
           debugLogger.warn(
             'Approval mode "plan" is disabled in your settings. Falling back to "default".'
           );
-          approvalMode = "default" /* DEFAULT */;
+          approvalMode = ApprovalMode.DEFAULT;
         } else {
-          approvalMode = "plan" /* PLAN */;
+          approvalMode = ApprovalMode.PLAN;
         }
         break;
       case "default":
-        approvalMode = "default" /* DEFAULT */;
+        approvalMode = ApprovalMode.DEFAULT;
         break;
       default:
         throw new Error(
@@ -8338,10 +8354,10 @@ async function loadCliConfig(settings, sessionId, argv, options = {}) {
         );
     }
   } else {
-    approvalMode = "default" /* DEFAULT */;
+    approvalMode = ApprovalMode.DEFAULT;
   }
   if (settings.security?.disableYoloMode || settings.admin?.secureModeEnabled) {
-    if (approvalMode === "yolo" /* YOLO */) {
+    if (approvalMode === ApprovalMode.YOLO) {
       if (settings.admin?.secureModeEnabled) {
         debugLogger.error(
           'YOLO mode is disabled by "secureModeEnabled" setting.'
@@ -8359,16 +8375,16 @@ async function loadCliConfig(settings, sessionId, argv, options = {}) {
         )
       );
     }
-  } else if (approvalMode === "yolo" /* YOLO */) {
+  } else if (approvalMode === ApprovalMode.YOLO) {
     debugLogger.warn(
       "YOLO mode is enabled. All tool calls will be automatically approved."
     );
   }
-  if (!trustedFolder && approvalMode !== "default" /* DEFAULT */) {
+  if (!trustedFolder && approvalMode !== ApprovalMode.DEFAULT) {
     debugLogger.warn(
       `Approval mode overridden to "default" because the current folder is not trusted.`
     );
-    approvalMode = "default" /* DEFAULT */;
+    approvalMode = ApprovalMode.DEFAULT;
   }
   let telemetrySettings;
   try {
@@ -9806,7 +9822,7 @@ import path9 from "node:path";
 import process4 from "node:process";
 var homeDirectoryCheck = {
   id: "home-directory",
-  priority: "low" /* Low */,
+  priority: WarningPriority.Low,
   check: async (workspaceRoot, settings) => {
     if (settings.ui?.showHomeDirectoryWarning === false) {
       return null;
@@ -9830,7 +9846,7 @@ var homeDirectoryCheck = {
 };
 var rootDirectoryCheck = {
   id: "root-directory",
-  priority: "high" /* High */,
+  priority: WarningPriority.High,
   check: async (workspaceRoot, _settings) => {
     try {
       const workspaceRealPath = await fs9.realpath(workspaceRoot);
@@ -9846,7 +9862,7 @@ var rootDirectoryCheck = {
 };
 var folderTrustCheck = {
   id: "folder-trust",
-  priority: "high" /* High */,
+  priority: WarningPriority.High,
   check: async (workspaceRoot, settings) => {
     if (!isFolderTrustEnabled(settings)) {
       return null;
@@ -10036,12 +10052,12 @@ function handleError(error, config, customErrorCode) {
     error,
     config.getContentGeneratorConfig()?.authType
   );
-  if (config.getOutputFormat() === "stream-json" /* STREAM_JSON */) {
+  if (config.getOutputFormat() === OutputFormat.STREAM_JSON) {
     const streamFormatter = new StreamJsonFormatter();
     const errorCode = customErrorCode ?? extractErrorCode(error);
     const metrics = uiTelemetryService.getMetrics();
     streamFormatter.emitEvent({
-      type: "result" /* RESULT */,
+      type: JsonStreamEventType.RESULT,
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       status: "error",
       error: {
@@ -10052,7 +10068,7 @@ function handleError(error, config, customErrorCode) {
     });
     runSyncCleanup();
     process.exit(getNumericExitCode(errorCode));
-  } else if (config.getOutputFormat() === "json" /* JSON */) {
+  } else if (config.getOutputFormat() === OutputFormat.JSON) {
     const formatter = new JsonFormatter();
     const errorCode = customErrorCode ?? extractErrorCode(error);
     const formattedError = formatter.formatError(
@@ -10072,11 +10088,11 @@ function handleToolError(toolName, toolError, config, errorType, resultDisplay)
   const isFatal = isFatalToolError(errorType);
   if (isFatal) {
     const toolExecutionError = new FatalToolExecutionError(errorMessage);
-    if (config.getOutputFormat() === "stream-json" /* STREAM_JSON */) {
+    if (config.getOutputFormat() === OutputFormat.STREAM_JSON) {
       const streamFormatter = new StreamJsonFormatter();
       const metrics = uiTelemetryService.getMetrics();
       streamFormatter.emitEvent({
-        type: "result" /* RESULT */,
+        type: JsonStreamEventType.RESULT,
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
         status: "error",
         error: {
@@ -10085,7 +10101,7 @@ function handleToolError(toolName, toolError, config, errorType, resultDisplay)
         },
         stats: streamFormatter.convertToStreamStats(metrics, 0)
       });
-    } else if (config.getOutputFormat() === "json" /* JSON */) {
+    } else if (config.getOutputFormat() === OutputFormat.JSON) {
       const formatter = new JsonFormatter();
       const formattedError = formatter.formatError(
         toolExecutionError,
@@ -10103,11 +10119,11 @@ function handleToolError(toolName, toolError, config, errorType, resultDisplay)
 }
 function handleCancellationError(config) {
   const cancellationError = new FatalCancellationError("Operation cancelled.");
-  if (config.getOutputFormat() === "stream-json" /* STREAM_JSON */) {
+  if (config.getOutputFormat() === OutputFormat.STREAM_JSON) {
     const streamFormatter = new StreamJsonFormatter();
     const metrics = uiTelemetryService.getMetrics();
     streamFormatter.emitEvent({
-      type: "result" /* RESULT */,
+      type: JsonStreamEventType.RESULT,
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       status: "error",
       error: {
@@ -10118,7 +10134,7 @@ function handleCancellationError(config) {
     });
     runSyncCleanup();
     process.exit(cancellationError.exitCode);
-  } else if (config.getOutputFormat() === "json" /* JSON */) {
+  } else if (config.getOutputFormat() === OutputFormat.JSON) {
     const formatter = new JsonFormatter();
     const formattedError = formatter.formatError(
       cancellationError,
@@ -10138,11 +10154,11 @@ function handleMaxTurnsExceededError(config) {
   const maxTurnsError = new FatalTurnLimitedError(
     "Reached max session turns for this session. Increase the number of turns by specifying maxSessionTurns in settings.json."
   );
-  if (config.getOutputFormat() === "stream-json" /* STREAM_JSON */) {
+  if (config.getOutputFormat() === OutputFormat.STREAM_JSON) {
     const streamFormatter = new StreamJsonFormatter();
     const metrics = uiTelemetryService.getMetrics();
     streamFormatter.emitEvent({
-      type: "result" /* RESULT */,
+      type: JsonStreamEventType.RESULT,
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       status: "error",
       error: {
@@ -10153,7 +10169,7 @@ function handleMaxTurnsExceededError(config) {
     });
     runSyncCleanup();
     process.exit(maxTurnsError.exitCode);
-  } else if (config.getOutputFormat() === "json" /* JSON */) {
+  } else if (config.getOutputFormat() === OutputFormat.JSON) {
     const formatter = new JsonFormatter();
     const formattedError = formatter.formatError(
       maxTurnsError,
@@ -10233,7 +10249,7 @@ async function runNonInteractive({
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-GLW7S6PS.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-Z2YXVMYF.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -10249,7 +10265,7 @@ async function runNonInteractive({
       }
     };
     const startTime = Date.now();
-    const streamFormatter = config.getOutputFormat() === "stream-json" /* STREAM_JSON */ ? new StreamJsonFormatter() : null;
+    const streamFormatter = config.getOutputFormat() === OutputFormat.STREAM_JSON ? new StreamJsonFormatter() : null;
     const abortController = new AbortController();
     let isAborting = false;
     let cancelMessageTimer = null;
@@ -10302,13 +10318,13 @@ async function runNonInteractive({
     };
     try {
       consolePatcher.patch();
-      if (config.getRawOutput() && !config.getAcceptRawOutputRisk() && config.getOutputFormat() === "text" /* TEXT */) {
+      if (config.getRawOutput() && !config.getAcceptRawOutputRisk() && config.getOutputFormat() === OutputFormat.TEXT) {
         process.stderr.write(
           "[WARNING] --raw-output is enabled. Model output is not sanitized and may contain harmful ANSI sequences (e.g. for phishing or command injection). Use --accept-raw-output-risk to suppress this warning.\n"
         );
       }
       setupStdinCancellation();
-      coreEvents.on("user-feedback" /* UserFeedback */, handleUserFeedback);
+      coreEvents.on(CoreEvent.UserFeedback, handleUserFeedback);
       coreEvents.drainBacklogs();
       process.stdout.on("error", (err) => {
         if (err.code === "EPIPE") {
@@ -10334,7 +10350,7 @@ async function runNonInteractive({
       }
       if (streamFormatter) {
         streamFormatter.emitEvent({
-          type: "init" /* INIT */,
+          type: JsonStreamEventType.INIT,
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           session_id: config.getSessionId(),
           model: config.getModel()
@@ -10372,7 +10388,7 @@ async function runNonInteractive({
       }
       if (streamFormatter) {
         streamFormatter.emitEvent({
-          type: "message" /* MESSAGE */,
+          type: JsonStreamEventType.MESSAGE,
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           role: "user",
           content: input
@@ -10411,12 +10427,12 @@ async function runNonInteractive({
           const metrics = uiTelemetryService.getMetrics();
           const durationMs = Date.now() - startTime;
           streamFormatter.emitEvent({
-            type: "result" /* RESULT */,
+            type: JsonStreamEventType.RESULT,
             timestamp: (/* @__PURE__ */ new Date()).toISOString(),
             status: "success",
             stats: streamFormatter.convertToStreamStats(metrics, durationMs)
           });
-        } else if (config.getOutputFormat() === "json" /* JSON */) {
+        } else if (config.getOutputFormat() === OutputFormat.JSON) {
           const formatter = new JsonFormatter();
           const stats = uiTelemetryService.getMetrics();
           textOutput.write(
@@ -10509,13 +10525,13 @@ async function runNonInteractive({
                   const output = isRaw ? part.text : stripAnsi(part.text);
                   if (streamFormatter) {
                     streamFormatter.emitEvent({
-                      type: "message" /* MESSAGE */,
+                      type: JsonStreamEventType.MESSAGE,
                       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                       role: "assistant",
                       content: output,
                       delta: true
                     });
-                  } else if (config.getOutputFormat() === "json" /* JSON */) {
+                  } else if (config.getOutputFormat() === OutputFormat.JSON) {
                     responseText += output;
                   } else {
                     if (part.text) {
@@ -10528,13 +10544,13 @@ async function runNonInteractive({
             break;
           }
           case "tool_request": {
-            if (config.getOutputFormat() === "json" /* JSON */) {
+            if (config.getOutputFormat() === OutputFormat.JSON) {
               preToolResponseText = responseText || preToolResponseText;
               responseText = "";
             }
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: "tool_use" /* TOOL_USE */,
+                type: JsonStreamEventType.TOOL_USE,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 tool_name: event.name,
                 tool_id: event.requestId,
@@ -10550,7 +10566,7 @@ async function runNonInteractive({
               const displayText = displayContentToString(display);
               const errorMsg = getTextContent(event.content) ?? "Tool error";
               streamFormatter.emitEvent({
-                type: "tool_result" /* TOOL_RESULT */,
+                type: JsonStreamEventType.TOOL_RESULT,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 tool_id: event.requestId,
                 status: event.isError ? "error" : "success",
@@ -10565,17 +10581,17 @@ async function runNonInteractive({
               const display = event.display?.result;
               const displayText = displayContentToString(display);
               const errorMsg = getTextContent(event.content) ?? "Tool error";
-              if (event.data?.["errorType"] === "stop_execution" /* STOP_EXECUTION */) {
-                if (config.getOutputFormat() === "json" /* JSON */ && !responseText && preToolResponseText) {
+              if (event.data?.["errorType"] === ToolErrorType.STOP_EXECUTION) {
+                if (config.getOutputFormat() === OutputFormat.JSON && !responseText && preToolResponseText) {
                   responseText = preToolResponseText;
                 }
                 const stopMessage = `Agent execution stopped: ${errorMsg}`;
-                if (config.getOutputFormat() === "text" /* TEXT */) {
+                if (config.getOutputFormat() === OutputFormat.TEXT) {
                   process.stderr.write(`${stopMessage}
 `);
                 }
               }
-              if (event.data?.["errorType"] === "no_space_left" /* NO_SPACE_LEFT */) {
+              if (event.data?.["errorType"] === ToolErrorType.NO_SPACE_LEFT) {
                 throw new FatalToolExecutionError(
                   "Error executing tool " + event.name + ": " + (displayText || errorMsg)
                 );
@@ -10597,12 +10613,12 @@ async function runNonInteractive({
             const errorCode = event._meta?.["code"];
             if (errorCode === "AGENT_EXECUTION_BLOCKED") {
               const blockMessage = `Agent execution blocked: ${event.message.trim()}`;
-              if (config.getOutputFormat() === "text" /* TEXT */) {
+              if (config.getOutputFormat() === OutputFormat.TEXT) {
                 process.stderr.write(`[WARNING] ${blockMessage}
 `);
               } else if (streamFormatter) {
                 streamFormatter.emitEvent({
-                  type: "error" /* ERROR */,
+                  type: JsonStreamEventType.ERROR,
                   timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                   severity: "warning",
                   message: stripAnsi(blockMessage)
@@ -10612,13 +10628,13 @@ async function runNonInteractive({
               break;
             }
             const severity = event.status === "RESOURCE_EXHAUSTED" ? "error" : "warning";
-            if (config.getOutputFormat() === "text" /* TEXT */) {
+            if (config.getOutputFormat() === OutputFormat.TEXT) {
               process.stderr.write(`[WARNING] ${event.message}
 `);
             }
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: "error" /* ERROR */,
+                type: JsonStreamEventType.ERROR,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 severity,
                 message: stripAnsi(event.message)
@@ -10638,7 +10654,7 @@ async function runNonInteractive({
                 );
               } else if (streamFormatter) {
                 streamFormatter.emitEvent({
-                  type: "error" /* ERROR */,
+                  type: JsonStreamEventType.ERROR,
                   timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                   severity: "error",
                   message: "Maximum session turns exceeded"
@@ -10646,7 +10662,7 @@ async function runNonInteractive({
               }
             }
             const stopMessage = typeof event.data?.["message"] === "string" ? event.data["message"] : "";
-            if (stopMessage && config.getOutputFormat() === "text" /* TEXT */) {
+            if (stopMessage && config.getOutputFormat() === OutputFormat.TEXT) {
               process.stderr.write(`Agent execution stopped: ${stopMessage}
 `);
             }
@@ -10676,7 +10692,7 @@ async function runNonInteractive({
       abortController.signal.removeEventListener("abort", abortSession);
       scheduler?.dispose();
       consolePatcher.cleanup();
-      coreEvents.off("user-feedback" /* UserFeedback */, handleUserFeedback);
+      coreEvents.off(CoreEvent.UserFeedback, handleUserFeedback);
     }
     if (errorToHandle) {
       handleError(errorToHandle, config);
@@ -10704,7 +10720,7 @@ async function runNonInteractive2(params) {
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-GLW7S6PS.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-Z2YXVMYF.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -10720,7 +10736,7 @@ async function runNonInteractive2(params) {
       }
     };
     const startTime = Date.now();
-    const streamFormatter = config.getOutputFormat() === "stream-json" /* STREAM_JSON */ ? new StreamJsonFormatter() : null;
+    const streamFormatter = config.getOutputFormat() === OutputFormat.STREAM_JSON ? new StreamJsonFormatter() : null;
     const abortController = new AbortController();
     let isAborting = false;
     let cancelMessageTimer = null;
@@ -10771,13 +10787,13 @@ async function runNonInteractive2(params) {
     let scheduler;
     try {
       consolePatcher.patch();
-      if (config.getRawOutput() && !config.getAcceptRawOutputRisk() && config.getOutputFormat() === "text" /* TEXT */) {
+      if (config.getRawOutput() && !config.getAcceptRawOutputRisk() && config.getOutputFormat() === OutputFormat.TEXT) {
         process.stderr.write(
           "[WARNING] --raw-output is enabled. Model output is not sanitized and may contain harmful ANSI sequences (e.g. for phishing or command injection). Use --accept-raw-output-risk to suppress this warning.\n"
         );
       }
       setupStdinCancellation();
-      coreEvents.on("user-feedback" /* UserFeedback */, handleUserFeedback);
+      coreEvents.on(CoreEvent.UserFeedback, handleUserFeedback);
       coreEvents.drainBacklogs();
       process.stdout.on("error", (err) => {
         if (err.code === "EPIPE") {
@@ -10801,7 +10817,7 @@ async function runNonInteractive2(params) {
       }
       if (streamFormatter) {
         streamFormatter.emitEvent({
-          type: "init" /* INIT */,
+          type: JsonStreamEventType.INIT,
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           session_id: config.getSessionId(),
           model: config.getModel()
@@ -10839,7 +10855,7 @@ async function runNonInteractive2(params) {
       }
       if (streamFormatter) {
         streamFormatter.emitEvent({
-          type: "message" /* MESSAGE */,
+          type: JsonStreamEventType.MESSAGE,
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           role: "user",
           content: input
@@ -10867,28 +10883,28 @@ async function runNonInteractive2(params) {
           if (abortController.signal.aborted) {
             handleCancellationError(config);
           }
-          if (event.type === "content" /* Content */) {
+          if (event.type === GeminiEventType.Content) {
             const isRaw = config.getRawOutput() || config.getAcceptRawOutputRisk();
             const output = isRaw ? event.value : stripAnsi(event.value);
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: "message" /* MESSAGE */,
+                type: JsonStreamEventType.MESSAGE,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 role: "assistant",
                 content: output,
                 delta: true
               });
-            } else if (config.getOutputFormat() === "json" /* JSON */) {
+            } else if (config.getOutputFormat() === OutputFormat.JSON) {
               responseText += output;
             } else {
               if (event.value) {
                 textOutput.write(output);
               }
             }
-          } else if (event.type === "tool_call_request" /* ToolCallRequest */) {
+          } else if (event.type === GeminiEventType.ToolCallRequest) {
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: "tool_use" /* TOOL_USE */,
+                type: JsonStreamEventType.TOOL_USE,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 tool_name: event.value.name,
                 tool_id: event.value.callId,
@@ -10896,33 +10912,33 @@ async function runNonInteractive2(params) {
               });
             }
             toolCallRequests.push(event.value);
-          } else if (event.type === "loop_detected" /* LoopDetected */) {
+          } else if (event.type === GeminiEventType.LoopDetected) {
             const message = "Loop detected, stopping execution";
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: "error" /* ERROR */,
+                type: JsonStreamEventType.ERROR,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 severity: "warning",
                 message
               });
             }
             warnings.push(message);
-          } else if (event.type === "max_session_turns" /* MaxSessionTurns */) {
+          } else if (event.type === GeminiEventType.MaxSessionTurns) {
             const message = "Maximum session turns exceeded";
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: "error" /* ERROR */,
+                type: JsonStreamEventType.ERROR,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 severity: "error",
                 message
               });
             }
             warnings.push(message);
-          } else if (event.type === "error" /* Error */) {
+          } else if (event.type === GeminiEventType.Error) {
             throw event.value.error;
-          } else if (event.type === "agent_execution_stopped" /* AgentExecutionStopped */) {
+          } else if (event.type === GeminiEventType.AgentExecutionStopped) {
             const stopMessage = `Agent execution stopped: ${event.value.systemMessage?.trim() || event.value.reason}`;
-            if (config.getOutputFormat() === "text" /* TEXT */) {
+            if (config.getOutputFormat() === OutputFormat.TEXT) {
               process.stderr.write(`${stopMessage}
 `);
             }
@@ -10930,7 +10946,7 @@ async function runNonInteractive2(params) {
               const metrics = uiTelemetryService.getMetrics();
               const durationMs = Date.now() - startTime;
               streamFormatter.emitEvent({
-                type: "result" /* RESULT */,
+                type: JsonStreamEventType.RESULT,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 status: "success",
                 stats: streamFormatter.convertToStreamStats(
@@ -10938,7 +10954,7 @@ async function runNonInteractive2(params) {
                   durationMs
                 )
               });
-            } else if (config.getOutputFormat() === "json" /* JSON */) {
+            } else if (config.getOutputFormat() === OutputFormat.JSON) {
               const formatter = new JsonFormatter();
               const stats = uiTelemetryService.getMetrics();
               textOutput.write(
@@ -10954,30 +10970,30 @@ async function runNonInteractive2(params) {
               textOutput.ensureTrailingNewline();
             }
             return;
-          } else if (event.type === "agent_execution_blocked" /* AgentExecutionBlocked */) {
+          } else if (event.type === GeminiEventType.AgentExecutionBlocked) {
             const blockMessage = `Agent execution blocked: ${event.value.systemMessage?.trim() || event.value.reason}`;
-            if (config.getOutputFormat() === "text" /* TEXT */) {
+            if (config.getOutputFormat() === OutputFormat.TEXT) {
               process.stderr.write(`[WARNING] ${blockMessage}
 `);
             } else if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: "error" /* ERROR */,
+                type: JsonStreamEventType.ERROR,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 severity: "warning",
                 message: stripAnsi(blockMessage)
               });
             }
             warnings.push(blockMessage);
-          } else if (event.type === "invalid_stream" /* InvalidStream */) {
+          } else if (event.type === GeminiEventType.InvalidStream) {
             invalidStreamError = "Invalid stream: The model returned an empty response or malformed tool call.";
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: "error" /* ERROR */,
+                type: JsonStreamEventType.ERROR,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 severity: "error",
                 message: invalidStreamError
               });
-            } else if (config.getOutputFormat() === "text" /* TEXT */) {
+            } else if (config.getOutputFormat() === OutputFormat.TEXT) {
               process.stderr.write(`[ERROR] ${invalidStreamError}
 `);
             }
@@ -10997,7 +11013,7 @@ async function runNonInteractive2(params) {
             const requestInfo = completedToolCall.request;
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: "tool_result" /* TOOL_RESULT */,
+                type: JsonStreamEventType.TOOL_RESULT,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 tool_id: requestInfo.callId,
                 status: completedToolCall.status === "error" ? "error" : "success",
@@ -11031,11 +11047,11 @@ async function runNonInteractive2(params) {
             );
           }
           const stopExecutionTool = completedToolCalls.find(
-            (tc) => tc.response.errorType === "stop_execution" /* STOP_EXECUTION */
+            (tc) => tc.response.errorType === ToolErrorType.STOP_EXECUTION
           );
           if (stopExecutionTool && stopExecutionTool.response.error) {
             const stopMessage = `Agent execution stopped: ${stopExecutionTool.response.error.message}`;
-            if (config.getOutputFormat() === "text" /* TEXT */) {
+            if (config.getOutputFormat() === OutputFormat.TEXT) {
               process.stderr.write(`${stopMessage}
 `);
             }
@@ -11043,7 +11059,7 @@ async function runNonInteractive2(params) {
               const metrics = uiTelemetryService.getMetrics();
               const durationMs = Date.now() - startTime;
               streamFormatter.emitEvent({
-                type: "result" /* RESULT */,
+                type: JsonStreamEventType.RESULT,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 status: "success",
                 stats: streamFormatter.convertToStreamStats(
@@ -11051,7 +11067,7 @@ async function runNonInteractive2(params) {
                   durationMs
                 )
               });
-            } else if (config.getOutputFormat() === "json" /* JSON */) {
+            } else if (config.getOutputFormat() === OutputFormat.JSON) {
               const formatter = new JsonFormatter();
               const stats = uiTelemetryService.getMetrics();
               textOutput.write(
@@ -11074,12 +11090,12 @@ async function runNonInteractive2(params) {
             const metrics = uiTelemetryService.getMetrics();
             const durationMs = Date.now() - startTime;
             streamFormatter.emitEvent({
-              type: "result" /* RESULT */,
+              type: JsonStreamEventType.RESULT,
               timestamp: (/* @__PURE__ */ new Date()).toISOString(),
               status: invalidStreamError ? "error" : "success",
               stats: streamFormatter.convertToStreamStats(metrics, durationMs)
             });
-          } else if (config.getOutputFormat() === "json" /* JSON */) {
+          } else if (config.getOutputFormat() === OutputFormat.JSON) {
             const formatter = new JsonFormatter();
             const stats = uiTelemetryService.getMetrics();
             textOutput.write(
@@ -11103,7 +11119,7 @@ async function runNonInteractive2(params) {
       cleanupStdinCancellation();
       scheduler?.dispose();
       consolePatcher.cleanup();
-      coreEvents.off("user-feedback" /* UserFeedback */, handleUserFeedback);
+      coreEvents.off(CoreEvent.UserFeedback, handleUserFeedback);
     }
     if (errorToHandle) {
       handleError(errorToHandle, config);
@@ -13494,12 +13510,12 @@ function toToolCallContent(toolResult) {
 }
 var basicPermissionOptions = [
   {
-    optionId: "proceed_once" /* ProceedOnce */,
+    optionId: ToolConfirmationOutcome.ProceedOnce,
     name: "Allow",
     kind: "allow_once"
   },
   {
-    optionId: "cancel" /* Cancel */,
+    optionId: ToolConfirmationOutcome.Cancel,
     name: "Reject",
     kind: "reject_once"
   }
@@ -13511,13 +13527,13 @@ function toPermissionOptions(confirmation, config, enablePermanentToolApproval =
     switch (confirmation.type) {
       case "edit":
         options.push({
-          optionId: "proceed_always" /* ProceedAlways */,
+          optionId: ToolConfirmationOutcome.ProceedAlways,
           name: "Allow for this session",
           kind: "allow_always"
         });
         if (enablePermanentToolApproval) {
           options.push({
-            optionId: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
+            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
             name: "Allow for this file in all future sessions",
             kind: "allow_always"
           });
@@ -13525,13 +13541,13 @@ function toPermissionOptions(confirmation, config, enablePermanentToolApproval =
         break;
       case "exec":
         options.push({
-          optionId: "proceed_always" /* ProceedAlways */,
+          optionId: ToolConfirmationOutcome.ProceedAlways,
           name: "Allow for this session",
           kind: "allow_always"
         });
         if (enablePermanentToolApproval) {
           options.push({
-            optionId: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
+            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
             name: "Allow this command for all future sessions",
             kind: "allow_always"
           });
@@ -13540,19 +13556,19 @@ function toPermissionOptions(confirmation, config, enablePermanentToolApproval =
       case "mcp":
         options.push(
           {
-            optionId: "proceed_always_server" /* ProceedAlwaysServer */,
+            optionId: ToolConfirmationOutcome.ProceedAlwaysServer,
             name: "Allow all server tools for this session",
             kind: "allow_always"
           },
           {
-            optionId: "proceed_always_tool" /* ProceedAlwaysTool */,
+            optionId: ToolConfirmationOutcome.ProceedAlwaysTool,
             name: "Allow tool for this session",
             kind: "allow_always"
           }
         );
         if (enablePermanentToolApproval) {
           options.push({
-            optionId: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
+            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
             name: "Allow tool for all future sessions",
             kind: "allow_always"
           });
@@ -13560,13 +13576,13 @@ function toPermissionOptions(confirmation, config, enablePermanentToolApproval =
         break;
       case "info":
         options.push({
-          optionId: "proceed_always" /* ProceedAlways */,
+          optionId: ToolConfirmationOutcome.ProceedAlways,
           name: "Allow for this session",
           kind: "allow_always"
         });
         if (enablePermanentToolApproval) {
           options.push({
-            optionId: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
+            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
             name: "Allow for all future sessions",
             kind: "allow_always"
           });
@@ -13598,21 +13614,21 @@ function toPermissionOptions(confirmation, config, enablePermanentToolApproval =
 }
 function toAcpToolKind(kind) {
   switch (kind) {
-    case "read" /* Read */:
-    case "edit" /* Edit */:
-    case "execute" /* Execute */:
-    case "search" /* Search */:
-    case "delete" /* Delete */:
-    case "move" /* Move */:
-    case "think" /* Think */:
-    case "fetch" /* Fetch */:
-    case "switch_mode" /* SwitchMode */:
-    case "other" /* Other */:
+    case Kind.Read:
+    case Kind.Edit:
+    case Kind.Execute:
+    case Kind.Search:
+    case Kind.Delete:
+    case Kind.Move:
+    case Kind.Think:
+    case Kind.Fetch:
+    case Kind.SwitchMode:
+    case Kind.Other:
       return kind;
-    case "agent" /* Agent */:
+    case Kind.Agent:
       return "think";
-    case "plan" /* Plan */:
-    case "communicate" /* Communicate */:
+    case Kind.Plan:
+    case Kind.Communicate:
     default:
       return "other";
   }
@@ -13620,24 +13636,24 @@ function toAcpToolKind(kind) {
 function buildAvailableModes(isPlanEnabled) {
   const modes = [
     {
-      id: "default" /* DEFAULT */,
+      id: ApprovalMode.DEFAULT,
       name: "Default",
       description: "Prompts for approval"
     },
     {
-      id: "autoEdit" /* AUTO_EDIT */,
+      id: ApprovalMode.AUTO_EDIT,
       name: "Auto Edit",
       description: "Auto-approves edit tools"
     },
     {
-      id: "yolo" /* YOLO */,
+      id: ApprovalMode.YOLO,
       name: "YOLO",
       description: "Auto-approves all tools"
     }
   ];
   if (isPlanEnabled) {
     modes.push({
-      id: "plan" /* PLAN */,
+      id: ApprovalMode.PLAN,
       name: "Plan",
       description: "Read-only mode"
     });
@@ -13648,11 +13664,13 @@ function buildAvailableModels(config, settings) {
   const preferredModel = config.getModel() || GEMINI_MODEL_ALIAS_AUTO;
   const shouldShowPreviewModels = config.getHasAccessToPreviewModel();
   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;
   if (config.getExperimentalDynamicModelConfiguration?.() === true && config.getModelConfigService) {
     const options = config.getModelConfigService().getAvailableModelOptions({
       useGemini3_1: useGemini31,
+      useGemini3_5Flash,
       useCustomTools: useCustomToolModel,
       hasAccessToPreview: shouldShowPreviewModels
     });
@@ -13667,7 +13685,8 @@ function buildAvailableModels(config, settings) {
       title: getDisplayString(GEMINI_MODEL_ALIAS_AUTO),
       description: getAutoModelDescription(
         shouldShowPreviewModels,
-        useGemini31
+        useGemini31,
+        useGemini3_5Flash
       )
     }
   ];
@@ -13733,11 +13752,11 @@ var Session = class {
     this.connection = connection;
     this.settings = settings;
     coreEvents.on(
-      "approval-mode-changed" /* ApprovalModeChanged */,
+      CoreEvent.ApprovalModeChanged,
       this.handleApprovalModeChanged
     );
     this.context.config.getMessageBus()?.subscribe(
-      "tool-confirmation-request" /* TOOL_CONFIRMATION_REQUEST */,
+      MessageBusType.TOOL_CONFIRMATION_REQUEST,
       this.handleToolConfirmationRequest,
       { signal: this.disposeController.signal }
     );
@@ -13761,7 +13780,7 @@ var Session = class {
           "Policy engine missing. Denying tool confirmation request."
         );
         await messageBus.publish({
-          type: "tool-confirmation-response" /* TOOL_CONFIRMATION_RESPONSE */,
+          type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
           correlationId: request.correlationId,
           confirmed: false,
           requiresUserConfirmation: false
@@ -13774,7 +13793,7 @@ var Session = class {
           "Tool confirmation request missing tool name. Denying."
         );
         await messageBus.publish({
-          type: "tool-confirmation-response" /* TOOL_CONFIRMATION_RESPONSE */,
+          type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
           correlationId: request.correlationId,
           confirmed: false,
           requiresUserConfirmation: false
@@ -13787,7 +13806,7 @@ var Session = class {
           `Tool confirmation request for unknown tool: ${toolName}. Denying.`
         );
         await messageBus.publish({
-          type: "tool-confirmation-response" /* TOOL_CONFIRMATION_RESPONSE */,
+          type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
           correlationId: request.correlationId,
           confirmed: false,
           requiresUserConfirmation: false
@@ -13803,15 +13822,15 @@ var Session = class {
         request.subagent
       );
       await messageBus.publish({
-        type: "tool-confirmation-response" /* TOOL_CONFIRMATION_RESPONSE */,
+        type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
         correlationId: request.correlationId,
-        confirmed: result.decision === "allow" /* ALLOW */,
-        requiresUserConfirmation: result.decision === "ask_user" /* ASK_USER */
+        confirmed: result.decision === PolicyDecision.ALLOW,
+        requiresUserConfirmation: result.decision === PolicyDecision.ASK_USER
       });
     } catch (error) {
       debugLogger.error("Error handling tool confirmation request:", error);
       await this.context.config.getMessageBus()?.publish({
-        type: "tool-confirmation-response" /* TOOL_CONFIRMATION_RESPONSE */,
+        type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
         correlationId: request.correlationId,
         confirmed: false,
         requiresUserConfirmation: false
@@ -13831,7 +13850,7 @@ var Session = class {
   };
   dispose() {
     coreEvents.off(
-      "approval-mode-changed" /* ApprovalModeChanged */,
+      CoreEvent.ApprovalModeChanged,
       this.handleApprovalModeChanged
     );
     this.disposeController.abort();
@@ -13920,7 +13939,7 @@ ${thought.description}`;
             await this.sendUpdate({
               sessionUpdate: "tool_call",
               toolCallId: toolCall.id,
-              status: toolCall.status === "success" /* Success */ ? "completed" : "failed",
+              status: toolCall.status === CoreToolCallStatus.Success ? "completed" : "failed",
               title: toolCall.displayName || toolCall.name,
               content: toolCallContent,
               kind: tool ? toAcpToolKind(tool.kind) : "other"
@@ -14012,7 +14031,7 @@ ${thought.description}`;
             return { stopReason: "cancelled" };
           }
           switch (event.type) {
-            case "content" /* Content */: {
+            case GeminiEventType.Content: {
               const content = {
                 type: "text",
                 text: event.value
@@ -14023,7 +14042,7 @@ ${thought.description}`;
               });
               break;
             }
-            case "thought" /* Thought */: {
+            case GeminiEventType.Thought: {
               const thoughtText = `**${event.value.subject}**
 ${event.value.description}`;
               await this.sendUpdate({
@@ -14032,10 +14051,10 @@ ${event.value.description}`;
               });
               break;
             }
-            case "tool_call_request" /* ToolCallRequest */:
+            case GeminiEventType.ToolCallRequest:
               toolCallRequests.push(event.value);
               break;
-            case "finished" /* Finished */: {
+            case GeminiEventType.Finished: {
               const usage2 = event.value.usageMetadata;
               if (usage2) {
                 turnInputTokens = usage2.promptTokenCount ?? turnInputTokens;
@@ -14043,19 +14062,19 @@ ${event.value.description}`;
               }
               break;
             }
-            case "model_info" /* ModelInfo */:
+            case GeminiEventType.ModelInfo:
               turnModelId = event.value;
               break;
-            case "max_session_turns" /* MaxSessionTurns */:
+            case GeminiEventType.MaxSessionTurns:
               stopReason = "max_turn_requests";
               break;
-            case "loop_detected" /* LoopDetected */:
+            case GeminiEventType.LoopDetected:
               stopReason = "max_turn_requests";
               break;
-            case "context_window_will_overflow" /* ContextWindowWillOverflow */:
+            case GeminiEventType.ContextWindowWillOverflow:
               stopReason = "max_tokens";
               break;
-            case "error" /* Error */: {
+            case GeminiEventType.Error: {
               const parseResult = StructuredErrorSchema.safeParse(
                 event.value.error
               );
@@ -14283,7 +14302,7 @@ ${event.value.description}`;
         const output = RequestPermissionResponseSchema.parse(
           await this.connection.requestPermission(params)
         );
-        const outcome = output.outcome.outcome === "cancelled" ? "cancel" /* Cancel */ : external_exports.nativeEnum(ToolConfirmationOutcome).parse(output.outcome.optionId);
+        const outcome = output.outcome.outcome === "cancelled" ? ToolConfirmationOutcome.Cancel : external_exports.nativeEnum(ToolConfirmationOutcome).parse(output.outcome.optionId);
         await confirmationDetails.onConfirm(outcome);
         await updatePolicy(
           tool,
@@ -14294,16 +14313,16 @@ ${event.value.description}`;
           invocation
         );
         switch (outcome) {
-          case "cancel" /* Cancel */:
+          case ToolConfirmationOutcome.Cancel:
             return errorResponse(
               new Error(`Tool "${fc.name}" was canceled by the user.`)
             );
-          case "proceed_once" /* ProceedOnce */:
-          case "proceed_always" /* ProceedAlways */:
-          case "proceed_always_and_save" /* ProceedAlwaysAndSave */:
-          case "proceed_always_server" /* ProceedAlwaysServer */:
-          case "proceed_always_tool" /* ProceedAlwaysTool */:
-          case "modify_with_editor" /* ModifyWithEditor */:
+          case ToolConfirmationOutcome.ProceedOnce:
+          case ToolConfirmationOutcome.ProceedAlways:
+          case ToolConfirmationOutcome.ProceedAlwaysAndSave:
+          case ToolConfirmationOutcome.ProceedAlwaysServer:
+          case ToolConfirmationOutcome.ProceedAlwaysTool:
+          case ToolConfirmationOutcome.ModifyWithEditor:
             break;
           default: {
             const resultOutcome = outcome;
@@ -14357,7 +14376,7 @@ ${event.value.description}`;
       );
       this.chat.recordCompletedToolCalls(this.context.config.getActiveModel(), [
         {
-          status: "success" /* Success */,
+          status: CoreToolCallStatus.Success,
           request: {
             callId,
             name: fc.name,
@@ -14402,7 +14421,7 @@ ${event.value.description}`;
       });
       this.chat.recordCompletedToolCalls(this.context.config.getActiveModel(), [
         {
-          status: "error" /* Error */,
+          status: CoreToolCallStatus.Error,
           request: {
             callId,
             name: fc.name,
@@ -14530,12 +14549,12 @@ ${event.value.description}`;
               sessionId: this.id,
               options: [
                 {
-                  optionId: "proceed_once" /* ProceedOnce */,
+                  optionId: ToolConfirmationOutcome.ProceedOnce,
                   name: "Allow once",
                   kind: "allow_once"
                 },
                 {
-                  optionId: "cancel" /* Cancel */,
+                  optionId: ToolConfirmationOutcome.Cancel,
                   name: "Deny",
                   kind: "reject_once"
                 }
@@ -14560,8 +14579,8 @@ ${event.value.description}`;
             const output = RequestPermissionResponseSchema.parse(
               await this.connection.requestPermission(params)
             );
-            const outcome = output.outcome.outcome === "cancelled" ? "cancel" /* Cancel */ : external_exports.nativeEnum(ToolConfirmationOutcome).parse(output.outcome.optionId);
-            if (outcome === "proceed_once" /* ProceedOnce */) {
+            const outcome = output.outcome.outcome === "cancelled" ? ToolConfirmationOutcome.Cancel : external_exports.nativeEnum(ToolConfirmationOutcome).parse(output.outcome.optionId);
+            if (outcome === ToolConfirmationOutcome.ProceedOnce) {
               this.context.config.getWorkspaceContext().addReadOnlyPath(absolutePath);
               validationError = null;
             } else {
@@ -14998,7 +15017,7 @@ var AcpSessionManager = class {
       mcpServers,
       loadedSettings
     );
-    const authType = loadedSettings.merged.security.auth.selectedType || (authDetails.baseUrl || process.env["GOOGLE_GEMINI_BASE_URL"] ? "gateway" /* GATEWAY */ : "gemini-api-key" /* USE_GEMINI */);
+    const authType = loadedSettings.merged.security.auth.selectedType || (authDetails.baseUrl || process.env["GOOGLE_GEMINI_BASE_URL"] ? AuthType.GATEWAY : AuthType.USE_GEMINI);
     let isAuthenticated = false;
     let authErrorMessage = "";
     try {
@@ -15010,7 +15029,7 @@ var AcpSessionManager = class {
       );
       isAuthenticated = true;
       const contentGeneratorConfig = config.getContentGeneratorConfig();
-      if (authType === "gemini-api-key" /* USE_GEMINI */ && (!contentGeneratorConfig || !contentGeneratorConfig.apiKey)) {
+      if (authType === AuthType.USE_GEMINI && (!contentGeneratorConfig || !contentGeneratorConfig.apiKey)) {
         isAuthenticated = false;
         authErrorMessage = "Gemini API key is missing or not configured.";
       }
@@ -15119,7 +15138,7 @@ var AcpSessionManager = class {
     return response;
   }
   async initializeSessionConfig(sessionId, cwd, mcpServers, authDetails) {
-    const selectedAuthType = this.settings.merged.security.auth.selectedType || (authDetails.baseUrl || process.env["GOOGLE_GEMINI_BASE_URL"] ? "gateway" /* GATEWAY */ : void 0);
+    const selectedAuthType = this.settings.merged.security.auth.selectedType || (authDetails.baseUrl || process.env["GOOGLE_GEMINI_BASE_URL"] ? AuthType.GATEWAY : void 0);
     if (!selectedAuthType) {
       throw RequestError.authRequired();
     }
@@ -15220,12 +15239,12 @@ var GeminiAgent = class {
     }
     const authMethods = [
       {
-        id: "oauth-personal" /* LOGIN_WITH_GOOGLE */,
+        id: AuthType.LOGIN_WITH_GOOGLE,
         name: "Log in with Google",
         description: "Log in with your Google account"
       },
       {
-        id: "gemini-api-key" /* USE_GEMINI */,
+        id: AuthType.USE_GEMINI,
         name: "Gemini API key",
         description: "Use an API key with Gemini Developer API",
         _meta: {
@@ -15235,12 +15254,12 @@ var GeminiAgent = class {
         }
       },
       {
-        id: "vertex-ai" /* USE_VERTEX_AI */,
+        id: AuthType.USE_VERTEX_AI,
         name: "Vertex AI",
         description: "Use an API key with Vertex AI GenAI API"
       },
       {
-        id: "gateway" /* GATEWAY */,
+        id: AuthType.GATEWAY,
         name: "AI API Gateway",
         description: "Use a custom AI API Gateway",
         _meta: {
@@ -15413,7 +15432,7 @@ async function validateNonInteractiveAuth(configuredAuthType, useExternalAuth, n
     }
     return authType;
   } catch (error) {
-    if (nonInteractiveConfig.getOutputFormat() === "json" /* JSON */) {
+    if (nonInteractiveConfig.getOutputFormat() === OutputFormat.JSON) {
       handleError(
         error instanceof Error ? error : new Error(String(error)),
         nonInteractiveConfig,
@@ -15608,10 +15627,10 @@ var SlashCommandConflictHandler = class {
     this.handleConflicts = this.handleConflicts.bind(this);
   }
   start() {
-    coreEvents.on("slash-command-conflicts" /* SlashCommandConflicts */, this.handleConflicts);
+    coreEvents.on(CoreEvent.SlashCommandConflicts, this.handleConflicts);
   }
   stop() {
-    coreEvents.off("slash-command-conflicts" /* SlashCommandConflicts */, this.handleConflicts);
+    coreEvents.off(CoreEvent.SlashCommandConflicts, this.handleConflicts);
     if (this.flushTimeout) {
       clearTimeout(this.flushTimeout);
       this.flushTimeout = null;
@@ -15892,7 +15911,7 @@ async function resolveSessionId(resumeArg, sessionIdArg, sessionFileArg) {
   }
 }
 async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), resumedSessionData, initializationResult) {
-  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-HVAQTBJK.js");
+  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-OEFOYFJU.js");
   await doStartUI(
     config,
     settings,
@@ -15995,12 +16014,12 @@ async function main() {
   dns.setDefaultResultOrder(
     validateDnsResolutionOrder(settings.merged.advanced.dnsResolutionOrder)
   );
-  if (!settings.merged.security.auth.selectedType || settings.merged.security.auth.selectedType === "cloud-shell" /* LEGACY_CLOUD_SHELL */) {
+  if (!settings.merged.security.auth.selectedType || settings.merged.security.auth.selectedType === AuthType.LEGACY_CLOUD_SHELL) {
     if (process.env["CLOUD_SHELL"] === "true" || process.env["GEMINI_CLI_USE_COMPUTE_ADC"] === "true") {
       settings.setValue(
         "User" /* User */,
         "security.auth.selectedType",
-        "compute-default-credentials" /* COMPUTE_ADC */
+        AuthType.COMPUTE_ADC
       );
     }
   }
@@ -16101,7 +16120,7 @@ ${finalArgs[promptIndex + 1]}`;
     await config.storage.initialize();
     adminControlsListner.setConfig(config);
     if (config.isInteractive() && settings.merged.general.devtools) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-GLW7S6PS.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-Z2YXVMYF.js");
       setupInitialActivityLogger(config);
     }
     registerTelemetryConfig(config);
@@ -16109,7 +16128,7 @@ ${finalArgs[promptIndex + 1]}`;
     const messageBus = config.getMessageBus();
     createPolicyUpdater2(policyEngine, messageBus, config.storage);
     registerCleanup(async () => {
-      await config.getHookSystem()?.fireSessionEndEvent("exit" /* Exit */);
+      await config.getHookSystem()?.fireSessionEndEvent(SessionEndReason.Exit);
     });
     if (!config.getAcpMode()) {
       registerCleanup(consolePatcher.cleanup);
@@ -16160,7 +16179,7 @@ ${finalArgs[promptIndex + 1]}`;
     const initAppHandle = startupProfiler.start("initialize_app");
     const initializationResult = await initializeApp(config, settings);
     initAppHandle?.end();
-    import("./liteRtServerManager-BP7XKGNU.js").then(({ LiteRtServerManager }) => {
+    import("./liteRtServerManager-3QOJEGNL.js").then(({ LiteRtServerManager }) => {
       const mergedGemma = settings.merged.experimental?.gemmaModelRouter;
       if (!mergedGemma) return;
       const userGemma = settings.forScope("User" /* User */).settings.experimental?.gemmaModelRouter;
@@ -16170,7 +16189,7 @@ ${finalArgs[promptIndex + 1]}`;
         autoStartServer: userGemma?.autoStartServer
       });
     }).catch((e) => debugLogger.warn("LiteRT auto-start import failed:", e));
-    if (settings.merged.security.auth.selectedType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ && config.isBrowserLaunchSuppressed()) {
+    if (settings.merged.security.auth.selectedType === AuthType.LOGIN_WITH_GOOGLE && config.isBrowserLaunchSuppressed()) {
       await getOauthClient(settings.merged.security.auth.selectedType, config);
     }
     if (config.getAcpMode()) {
@@ -16186,7 +16205,7 @@ ${finalArgs[promptIndex + 1]}`;
       ...rawStartupWarnings.map((message) => ({
         id: `startup-${createHash2("sha256").update(message).digest("hex").substring(0, 16)}`,
         message,
-        priority: "high" /* High */
+        priority: WarningPriority.High
       })),
       ...await getUserStartupWarnings(settings.merged, void 0, {
         isAlternateBuffer: useAlternateBuffer
@@ -16223,7 +16242,7 @@ ${finalArgs[promptIndex + 1]}`;
 ${input}` : stdinData;
       }
     }
-    const sessionStartSource = resumedSessionData ? "resume" /* Resume */ : "startup" /* Startup */;
+    const sessionStartSource = resumedSessionData ? SessionStartSource.Resume : SessionStartSource.Startup;
     const hookSystem = config?.getHookSystem();
     if (hookSystem) {
       const result = await hookSystem.fireSessionStartEvent(sessionStartSource);
@@ -16280,8 +16299,8 @@ ${input}` : wrappedContext;
   }
 }
 function initializeOutputListenersAndFlush(config) {
-  if (coreEvents.listenerCount("output" /* Output */) === 0) {
-    coreEvents.on("output" /* Output */, (payload) => {
+  if (coreEvents.listenerCount(CoreEvent.Output) === 0) {
+    coreEvents.on(CoreEvent.Output, (payload) => {
       if (payload.isStderr) {
         writeToStderr(payload.chunk, payload.encoding);
       } else {
@@ -16289,8 +16308,8 @@ function initializeOutputListenersAndFlush(config) {
       }
     });
   }
-  if (coreEvents.listenerCount("console-log" /* ConsoleLog */) === 0) {
-    coreEvents.on("console-log" /* ConsoleLog */, (payload) => {
+  if (coreEvents.listenerCount(CoreEvent.ConsoleLog) === 0) {
+    coreEvents.on(CoreEvent.ConsoleLog, (payload) => {
       if (payload.type === "error" || payload.type === "warn") {
         writeToStderr(payload.content + "\n");
       } else {
@@ -16298,8 +16317,8 @@ function initializeOutputListenersAndFlush(config) {
       }
     });
   }
-  if (coreEvents.listenerCount("user-feedback" /* UserFeedback */) === 0) {
-    coreEvents.on("user-feedback" /* UserFeedback */, (payload) => {
+  if (coreEvents.listenerCount(CoreEvent.UserFeedback) === 0) {
+    coreEvents.on(CoreEvent.UserFeedback, (payload) => {
       writeToStderr(payload.message + "\n");
     });
   }
@@ -16307,7 +16326,7 @@ function initializeOutputListenersAndFlush(config) {
   const forceToStderr = outputFormat === "json";
   coreEvents.drainBacklogs(
     (event, args) => {
-      if (forceToStderr && event === "output" /* Output */) {
+      if (forceToStderr && event === CoreEvent.Output) {
         const payload = args[0];
         if (!payload.isStderr) {
           return {