@google/gemini-cli 0.60.0-nightly.20260908.g85aca163f → 0.60.0

package/bundle/{gemini-RLSAAMB2.js → gemini-7INSUCPB.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   startCommand,
   startServer
-} from "./chunk-J5XD2NH2.js";
+} from "./chunk-S7PDUHJI.js";
 import {
   BuiltinCommandLoader,
   CommandService,
@@ -46,11 +46,11 @@ import {
   updateExtension,
   validateAuthMethod,
   validateContextFilePath
-} from "./chunk-A6IXIFRW.js";
+} from "./chunk-XRNOQZLR.js";
 import {
   exitCli,
   require_source
-} from "./chunk-4YTSRQAI.js";
+} from "./chunk-JJLODN2F.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
@@ -88,11 +88,11 @@ import {
   resolveGemmaConfig,
   saveModelChange,
   stripAnsi
-} from "./chunk-BOGYC66X.js";
+} from "./chunk-KAXMFUK5.js";
 import {
   RELAUNCH_EXIT_CODE
-} from "./chunk-WET7Q2Z2.js";
-import "./chunk-3QU7MFQ7.js";
+} from "./chunk-E62PES2E.js";
+import "./chunk-2VRC3EDT.js";
 import {
   cleanupCheckpoints,
   registerCleanup,
@@ -101,15 +101,12 @@ import {
   runExitCleanup,
   runSyncCleanup,
   setupSignalHandlers
-} from "./chunk-YMZA4EO3.js";
+} from "./chunk-D3BC6B5F.js";
 import {
   ASK_USER_TOOL_NAME,
-  ApprovalMode,
   AuthType,
   Client,
   Config,
-  CoreEvent,
-  CoreToolCallStatus,
   DEFAULT_CONTEXT_FILENAME,
   DEFAULT_FILE_FILTERING_OPTIONS,
   DEFAULT_GEMINI_EMBEDDING_MODEL,
@@ -131,27 +128,19 @@ import {
   FolderTrustDiscoveryService,
   GEMINI_DIR,
   GEMINI_MODEL_ALIAS_AUTO,
-  GeminiEventType,
   IdeClient,
-  IntegrityStatus,
   InvalidStreamError,
   JsonFormatter,
-  JsonStreamEventType,
-  Kind,
   LegacyAgentSession,
   Logger,
   MAX_TOKENS_EXCEEDED_SUGGESTION,
   MCPServerConfig,
-  MCPServerStatus,
-  MessageBusType,
   OTHER_BLOCKED_MESSAGE,
-  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,
   RECITATION_BLOCKED_MESSAGE,
   REFERENCE_CONTENT_START,
@@ -159,8 +148,6 @@ import {
   ReadManyFilesTool,
   SAFETY_BLOCKED_MESSAGE,
   Scheduler,
-  SessionEndReason,
-  SessionStartSource,
   ShellExecutionService,
   SimpleExtensionLoader,
   Storage,
@@ -169,13 +156,10 @@ import {
   TRUE_EMPTY_RESPONSE_MESSAGE,
   ToolCallEvent,
   ToolConfirmationOutcome,
-  ToolErrorType,
-  TrustLevel,
   UserAccountManager,
   UserPromptEvent,
   ValidationCancelledError,
   ValidationRequiredError,
-  WarningPriority,
   applyAdminAllowlist,
   applyRequiredServers,
   clearCachedCredentialFile,
@@ -255,7 +239,7 @@ import {
   updatePolicy,
   writeToStderr,
   writeToStdout
-} from "./chunk-M24MUPYL.js";
+} from "./chunk-MOYC3UGL.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-IUUIT4SU.js";
 import "./chunk-TUDYL3X4.js";
@@ -1540,11 +1524,11 @@ var parser = new YargsParser({
   resolve: resolve2,
   // TODO: figure  out a  way to combine ESM and CJS coverage, such  that
   // we can exercise all the lines below:
-  require: (path16) => {
+  require: (path17) => {
     if (typeof __require !== "undefined") {
-      return __require(path16);
-    } else if (path16.match(/\.json$/)) {
-      return JSON.parse(readFileSync(path16, "utf8"));
+      return __require(path17);
+    } else if (path17.match(/\.json$/)) {
+      return JSON.parse(readFileSync(path17, "utf8"));
     } else {
       throw Error("only .json config files are supported in ESM");
     }
@@ -5385,7 +5369,7 @@ var MCP_LIST_DEFAULT_TIMEOUT_MSEC = 5e3;
 async function testMCPConnection(serverName, config, isTrusted, activeSettings) {
   const isStdio = !!config.command;
   if (isStdio && !isTrusted) {
-    return MCPServerStatus.DISCONNECTED;
+    return "disconnected" /* DISCONNECTED */;
   }
   const client = new Client({
     name: "mcp-test-client",
@@ -5421,7 +5405,7 @@ async function testMCPConnection(serverName, config, isTrusted, activeSettings)
     transport = await createTransport(serverName, config, false, mcpContext);
   } catch {
     await client.close();
-    return MCPServerStatus.DISCONNECTED;
+    return "disconnected" /* DISCONNECTED */;
   }
   try {
     const timeout = config.timeout ?? MCP_LIST_DEFAULT_TIMEOUT_MSEC;
@@ -5435,10 +5419,10 @@ async function testMCPConnection(serverName, config, isTrusted, activeSettings)
       );
     }
     await client.close();
-    return MCPServerStatus.CONNECTED;
+    return "connected" /* CONNECTED */;
   } catch {
     await transport.close();
-    return MCPServerStatus.DISCONNECTED;
+    return "disconnected" /* DISCONNECTED */;
   }
 }
 async function getServerStatus(serverName, server, isTrusted, activeSettings, consolidatedExcluded, consolidatedAllowed) {
@@ -5451,12 +5435,12 @@ async function getServerStatus(serverName, server, isTrusted, activeSettings, co
   });
   if (!loadResult.allowed) {
     if (loadResult.blockType === "admin" || loadResult.blockType === "allowlist" || loadResult.blockType === "excludelist") {
-      return MCPServerStatus.BLOCKED;
+      return "blocked" /* BLOCKED */;
     }
-    return MCPServerStatus.DISABLED;
+    return "disabled" /* DISABLED */;
   }
   if (!isTrusted) {
-    return MCPServerStatus.DISABLED;
+    return "disabled" /* DISABLED */;
   }
   return testMCPConnection(serverName, server, isTrusted, activeSettings);
 }
@@ -5502,23 +5486,23 @@ async function listMcpServers(loadedSettingsArg) {
     let statusIndicator = "";
     let statusText = "";
     switch (status) {
-      case MCPServerStatus.CONNECTED:
+      case "connected" /* CONNECTED */:
         statusIndicator = import_chalk.default.green("\u2713");
         statusText = "Connected";
         break;
-      case MCPServerStatus.CONNECTING:
+      case "connecting" /* CONNECTING */:
         statusIndicator = import_chalk.default.yellow("\u2026");
         statusText = "Connecting";
         break;
-      case MCPServerStatus.BLOCKED:
+      case "blocked" /* BLOCKED */:
         statusIndicator = import_chalk.default.red("\u26D4");
         statusText = "Blocked";
         break;
-      case MCPServerStatus.DISABLED:
+      case "disabled" /* DISABLED */:
         statusIndicator = import_chalk.default.gray("\u25CB");
         statusText = "Disabled";
         break;
-      case MCPServerStatus.DISCONNECTED:
+      case "disconnected" /* DISCONNECTED */:
       default:
         statusIndicator = import_chalk.default.red("\u2717");
         statusText = "Disconnected";
@@ -5804,7 +5788,7 @@ async function handleInstall(args) {
         );
         if (confirmed) {
           const trustedFolders = loadTrustedFolders();
-          await trustedFolders.setValue(realPath, TrustLevel.TRUST_FOLDER);
+          await trustedFolders.setValue(realPath, "TRUST_FOLDER" /* TRUST_FOLDER */);
         } else {
           throw new Error(
             `Installation aborted: Folder "${absolutePath}" is not trusted.`
@@ -6329,27 +6313,27 @@ import { fileURLToPath as fileURLToPath2 } from "node:url";
 var __filename = fileURLToPath2(import.meta.url);
 var __dirname2 = dirname3(__filename);
 var EXAMPLES_PATH = join(__dirname2, "examples");
-async function pathExists(path16) {
+async function pathExists(path17) {
   try {
-    await access(path16);
+    await access(path17);
     return true;
   } catch {
     return false;
   }
 }
-async function createDirectory(path16) {
-  if (await pathExists(path16)) {
-    throw new Error(`Path already exists: ${path16}`);
+async function createDirectory(path17) {
+  if (await pathExists(path17)) {
+    throw new Error(`Path already exists: ${path17}`);
   }
-  await mkdir(path16, { recursive: true });
+  await mkdir(path17, { recursive: true });
 }
-async function copyDirectory(template, path16) {
-  await createDirectory(path16);
+async function copyDirectory(template, path17) {
+  await createDirectory(path17);
   const examplePath = join(EXAMPLES_PATH, template);
   const entries = await readdir(examplePath, { withFileTypes: true });
   for (const entry of entries) {
     const srcPath = join(examplePath, entry.name);
-    const destPath = join(path16, entry.name);
+    const destPath = join(path17, entry.name);
     await cp(srcPath, destPath, { recursive: true });
   }
 }
@@ -6630,7 +6614,7 @@ async function handleEnable3(args) {
   const result = enableSkill(settings, name);
   const feedback = renderSkillActionFeedback(
     result,
-    (label, path16) => `${import_chalk5.default.bold(label)} (${import_chalk5.default.dim(path16)})`
+    (label, path17) => `${import_chalk5.default.bold(label)} (${import_chalk5.default.dim(path17)})`
   );
   debugLogger.log(feedback);
 }
@@ -6660,7 +6644,7 @@ async function handleDisable3(args) {
   const result = disableSkill(settings, name, scope);
   const feedback = renderSkillActionFeedback(
     result,
-    (label, path16) => `${import_chalk6.default.bold(label)} (${import_chalk6.default.dim(path16)})`
+    (label, path17) => `${import_chalk6.default.bold(label)} (${import_chalk6.default.dim(path17)})`
   );
   debugLogger.log(feedback);
 }
@@ -7855,7 +7839,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.60.0-nightly.20260908.g85aca163f" ?? customImage ?? packageJson?.config?.sandboxImageUri;
+  const image = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.60.0-preview.0" ?? 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;
 }
@@ -7914,9 +7898,9 @@ async function resolveWorkspacePolicyState(options) {
       cwd,
       potentialWorkspacePoliciesDir
     );
-    if (integrityResult.status === IntegrityStatus.MATCH) {
+    if (integrityResult.status === "MATCH" /* MATCH */) {
       workspacePoliciesDir = potentialWorkspacePoliciesDir;
-    } else if (integrityResult.status === IntegrityStatus.NEW && integrityResult.fileCount === 0) {
+    } else if (integrityResult.status === "NEW" /* NEW */ && integrityResult.fileCount === 0) {
       workspacePoliciesDir = void 0;
     } else if (interactive && !autoAcceptWorkspacePolicies) {
       policyUpdateConfirmationRequest = {
@@ -8344,23 +8328,23 @@ async function loadCliConfig(settings, sessionId, argv, options = {}) {
   if (rawApprovalMode) {
     switch (rawApprovalMode) {
       case "yolo":
-        approvalMode = ApprovalMode.YOLO;
+        approvalMode = "yolo" /* YOLO */;
         break;
       case "auto_edit":
-        approvalMode = ApprovalMode.AUTO_EDIT;
+        approvalMode = "autoEdit" /* 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 = ApprovalMode.DEFAULT;
+          approvalMode = "default" /* DEFAULT */;
         } else {
-          approvalMode = ApprovalMode.PLAN;
+          approvalMode = "plan" /* PLAN */;
         }
         break;
       case "default":
-        approvalMode = ApprovalMode.DEFAULT;
+        approvalMode = "default" /* DEFAULT */;
         break;
       default:
         throw new Error(
@@ -8368,10 +8352,10 @@ async function loadCliConfig(settings, sessionId, argv, options = {}) {
         );
     }
   } else {
-    approvalMode = ApprovalMode.DEFAULT;
+    approvalMode = "default" /* DEFAULT */;
   }
   if (settings.security?.disableYoloMode || settings.admin?.secureModeEnabled) {
-    if (approvalMode === ApprovalMode.YOLO) {
+    if (approvalMode === "yolo" /* YOLO */) {
       if (settings.admin?.secureModeEnabled) {
         debugLogger.error(
           'YOLO mode is disabled by "secureModeEnabled" setting.'
@@ -8389,16 +8373,16 @@ async function loadCliConfig(settings, sessionId, argv, options = {}) {
         )
       );
     }
-  } else if (approvalMode === ApprovalMode.YOLO) {
+  } else if (approvalMode === "yolo" /* YOLO */) {
     debugLogger.warn(
       "YOLO mode is enabled. All tool calls will be automatically approved."
     );
   }
-  if (!trustedFolder && approvalMode !== ApprovalMode.DEFAULT) {
+  if (!trustedFolder && approvalMode !== "default" /* DEFAULT */) {
     debugLogger.warn(
       `Approval mode overridden to "default" because the current folder is not trusted.`
     );
-    approvalMode = ApprovalMode.DEFAULT;
+    approvalMode = "default" /* DEFAULT */;
   }
   let telemetrySettings;
   try {
@@ -8790,7 +8774,7 @@ import { createHash as createHash2 } from "node:crypto";
 import v8 from "node:v8";
 import os6 from "node:os";
 import dns from "node:dns";
-import * as path15 from "node:path";
+import * as path16 from "node:path";
 import * as fsPromises from "node:fs/promises";
 
 // packages/cli/src/utils/sandbox.ts
@@ -8802,7 +8786,7 @@ import {
   spawn as spawn2,
   spawnSync
 } from "node:child_process";
-import path8 from "node:path";
+import path9 from "node:path";
 import fs7 from "node:fs";
 import os3 from "node:os";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
@@ -8813,6 +8797,7 @@ import { randomBytes } from "node:crypto";
 var import_shell_quote = __toESM(require_shell_quote(), 1);
 import os2 from "node:os";
 import fs6 from "node:fs";
+import path8 from "node:path";
 import { readFile } from "node:fs/promises";
 var LOCAL_DEV_SANDBOX_IMAGE_NAME = "gemini-cli-sandbox";
 var SANDBOX_NETWORK_NAME = "gemini-cli-sandbox";
@@ -8827,6 +8812,58 @@ var BUILTIN_SEATBELT_PROFILES = [
   "strict-open",
   "strict-proxied"
 ];
+var SENSITIVE_SETTINGS_FILENAMES = /* @__PURE__ */ new Set([
+  "oauth_creds.json",
+  "google_accounts.json",
+  "gemini-credentials.json",
+  "mcp-oauth-tokens.json",
+  "a2a-oauth-tokens.json"
+]);
+function isCredentialOrSensitivePath(targetPath, rootDir) {
+  if (rootDir && path8.resolve(targetPath) === path8.resolve(rootDir)) {
+    return false;
+  }
+  const base = path8.basename(targetPath).toLowerCase();
+  if (SENSITIVE_SETTINGS_FILENAMES.has(base)) {
+    return true;
+  }
+  const isRootChild = rootDir ? path8.dirname(path8.resolve(targetPath)) === path8.resolve(rootDir) : true;
+  if (isRootChild && (base === "history" || base === "tmp" || base === "bin")) {
+    return true;
+  }
+  const hasSensitiveSuffix = (s) => {
+    if (base === s) return true;
+    if (base.endsWith(s)) {
+      const charBefore = base.charAt(base.length - s.length - 1);
+      return charBefore === "-" || charBefore === "_" || charBefore === ".";
+    }
+    return false;
+  };
+  if (base.endsWith(".credentials") || hasSensitiveSuffix("credentials") || hasSensitiveSuffix("credentials.json") || hasSensitiveSuffix("tokens.json") || hasSensitiveSuffix("token.json") || hasSensitiveSuffix("token") || hasSensitiveSuffix("creds.json") || hasSensitiveSuffix("cred.json") || base.endsWith(".env") || base.endsWith(".key") || base.endsWith(".pem") || base.endsWith(".p12") || hasSensitiveSuffix("key.json")) {
+    return true;
+  }
+  return false;
+}
+function prepareIsolatedSettingsDir(userSettingsDirOnHost) {
+  const baseTmpDir = os2.tmpdir() || "/tmp";
+  const isolatedDir = fs6.mkdtempSync(
+    path8.join(baseTmpDir, "gemini-sandbox-settings-")
+  );
+  fs6.chmodSync(isolatedDir, 448);
+  if (fs6.existsSync(userSettingsDirOnHost)) {
+    try {
+      fs6.cpSync(userSettingsDirOnHost, isolatedDir, {
+        recursive: true,
+        filter: (source) => !isCredentialOrSensitivePath(source, userSettingsDirOnHost)
+      });
+    } catch (err) {
+      debugLogger.warn(
+        `Failed to copy user settings to sandbox directory: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
+  return isolatedDir;
+}
 function getContainerPath(hostPath) {
   if (os2.platform() !== "win32") {
     return hostPath;
@@ -9729,7 +9766,18 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
   let stopProxy = void 0;
   let tempProfileFile = null;
   let sandboxTmpDir = null;
+  let isolatedSettingsDir = null;
   const cleanup = () => {
+    if (isolatedSettingsDir) {
+      const dirToDelete = isolatedSettingsDir;
+      isolatedSettingsDir = null;
+      try {
+        if (fs7.existsSync(dirToDelete)) {
+          fs7.rmSync(dirToDelete, { recursive: true, force: true });
+        }
+      } catch {
+      }
+    }
     if (sandboxTmpDir) {
       const dirToDelete = sandboxTmpDir;
       sandboxTmpDir = null;
@@ -9782,10 +9830,10 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
         new URL(`sandbox-macos-${profile}.sb`, import.meta.url)
       );
       if (!BUILTIN_SEATBELT_PROFILES.includes(profile)) {
-        const safeProfile = path8.basename(profile);
+        const safeProfile = path9.basename(profile);
         const fileName = `sandbox-macos-${safeProfile}.sb`;
-        const userProfileFile = path8.join(homedir(), GEMINI_DIR, fileName);
-        const projectProfileFile = path8.join(GEMINI_DIR, fileName);
+        const userProfileFile = path9.join(homedir(), GEMINI_DIR, fileName);
+        const projectProfileFile = path9.join(GEMINI_DIR, fileName);
         profileFile = fs7.existsSync(userProfileFile) ? userProfileFile : projectProfileFile;
       } else {
         if (!fs7.existsSync(profileFile)) {
@@ -9794,7 +9842,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
             try {
               const tempDir = fs7.realpathSync(os3.tmpdir());
               const rand = randomBytes(8).toString("hex");
-              tempProfileFile = path8.join(
+              tempProfileFile = path9.join(
                 tempDir,
                 `gemini-sandbox-macos-${profile}-${rand}.sb`
               );
@@ -9824,7 +9872,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
         ].join(" ");
         const hostTmpDir = fs7.realpathSync(os3.tmpdir());
         const resolvedTmpDir = fs7.mkdtempSync(
-          path8.join(hostTmpDir, "gemini-sandbox-")
+          path9.join(hostTmpDir, "gemini-sandbox-")
         );
         sandboxTmpDir = resolvedTmpDir;
         const args2 = [
@@ -9852,7 +9900,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
         }
         if (config.allowedPaths) {
           for (const hostPath of config.allowedPaths) {
-            if (hostPath && path8.isAbsolute(hostPath) && fs7.existsSync(hostPath)) {
+            if (hostPath && path9.isAbsolute(hostPath) && fs7.existsSync(hostPath)) {
               const realDir = fs7.realpathSync(hostPath);
               if (!includedDirs.includes(realDir) && realDir !== targetDir) {
                 includedDirs.push(realDir);
@@ -9958,7 +10006,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
     if (!command2) throw new FatalSandboxError("Sandbox command is required");
     debugLogger.log(`hopping into sandbox (command: ${command2}) ...`);
     const gcPath = process.argv[1] ? fs7.realpathSync(process.argv[1]) : "";
-    const projectSandboxDockerfile = path8.join(
+    const projectSandboxDockerfile = path9.join(
       GEMINI_DIR,
       "sandbox.Dockerfile"
     );
@@ -9967,7 +10015,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
     if (!image) throw new FatalSandboxError("Sandbox image is required");
     if (!/^[a-zA-Z0-9_.:/-]+$/.test(image))
       throw new FatalSandboxError("Invalid sandbox image name");
-    const workdir = path8.resolve(process.cwd());
+    const workdir = path9.resolve(process.cwd());
     const containerWorkdir = getContainerPath(workdir);
     if (process.env["BUILD_SANDBOX"]) {
       if (!gcPath.includes("gemini-cli/packages/")) {
@@ -9978,13 +10026,13 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
         debugLogger.log("building sandbox ...");
         const gcRoot = gcPath.split("/packages/")[0];
         let buildArgs = "";
-        const projectSandboxDockerfile2 = path8.join(
+        const projectSandboxDockerfile2 = path9.join(
           GEMINI_DIR,
           "sandbox.Dockerfile"
         );
         if (isCustomProjectSandbox) {
           debugLogger.log(`using ${projectSandboxDockerfile2} for sandbox`);
-          buildArgs += `-f ${path8.resolve(projectSandboxDockerfile2)} -i ${image}`;
+          buildArgs += `-f ${path9.resolve(projectSandboxDockerfile2)} -i ${image}`;
         }
         execSync(
           `cd ${gcRoot} && node scripts/build_sandbox.js -s ${buildArgs}`,
@@ -10028,18 +10076,16 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
     if (!fs7.existsSync(userHomeDirOnHost)) {
       fs7.mkdirSync(userHomeDirOnHost, { recursive: true });
     }
-    const userSettingsDirOnHost = path8.join(userHomeDirOnHost, GEMINI_DIR);
+    const userSettingsDirOnHost = path9.join(userHomeDirOnHost, GEMINI_DIR);
     if (!fs7.existsSync(userSettingsDirOnHost)) {
       fs7.mkdirSync(userSettingsDirOnHost, { recursive: true });
     }
-    args.push(
-      "--volume",
-      `${userSettingsDirOnHost}:${userSettingsDirInSandbox}`
-    );
+    isolatedSettingsDir = prepareIsolatedSettingsDir(userSettingsDirOnHost);
+    args.push("--volume", `${isolatedSettingsDir}:${userSettingsDirInSandbox}`);
     if (userSettingsDirInSandbox !== getContainerPath(userSettingsDirOnHost)) {
       args.push(
         "--volume",
-        `${userSettingsDirOnHost}:${getContainerPath(userSettingsDirOnHost)}`
+        `${isolatedSettingsDir}:${getContainerPath(userSettingsDirOnHost)}`
       );
     }
     args.push("--volume", `${os3.tmpdir()}:${getContainerPath(os3.tmpdir())}`);
@@ -10049,7 +10095,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
         `${userHomeDirOnHost}:${getContainerPath(userHomeDirOnHost)}`
       );
     }
-    const gcloudConfigDir = path8.join(homedir(), ".config", "gcloud");
+    const gcloudConfigDir = path9.join(homedir(), ".config", "gcloud");
     if (fs7.existsSync(gcloudConfigDir)) {
       args.push(
         "--volume",
@@ -10073,7 +10119,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
           to = to || from;
           opts = opts || "ro";
           mount = `${from}:${to}:${opts}`;
-          if (!path8.isAbsolute(from)) {
+          if (!path9.isAbsolute(from)) {
             throw new FatalSandboxError(
               `Path '${from}' listed in SANDBOX_MOUNTS must be absolute`
             );
@@ -10090,7 +10136,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
     }
     if (config.allowedPaths) {
       for (const hostPath of config.allowedPaths) {
-        if (hostPath && path8.isAbsolute(hostPath) && fs7.existsSync(hostPath)) {
+        if (hostPath && path9.isAbsolute(hostPath) && fs7.existsSync(hostPath)) {
           const containerPath = getContainerPath(hostPath);
           debugLogger.log(
             `Config allowedPath: ${hostPath} -> ${containerPath} (ro)`
@@ -10210,7 +10256,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
       }
     }
     if (process.env["VIRTUAL_ENV"]?.toLowerCase().startsWith(workdir.toLowerCase())) {
-      const sandboxVenvPath = path8.resolve(GEMINI_DIR, "sandbox.venv");
+      const sandboxVenvPath = path9.resolve(GEMINI_DIR, "sandbox.venv");
       if (!fs7.existsSync(sandboxVenvPath)) {
         fs7.mkdirSync(sandboxVenvPath, { recursive: true });
       }
@@ -10247,7 +10293,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
     }
     args.push("--env", `SANDBOX=${containerName}`);
     if (command2 === "podman") {
-      const emptyAuthFilePath = path8.join(os3.tmpdir(), "empty_auth.json");
+      const emptyAuthFilePath = path9.join(os3.tmpdir(), "empty_auth.json");
       fs7.writeFileSync(emptyAuthFilePath, "{}", "utf-8");
       args.push("--authfile", emptyAuthFilePath);
     }
@@ -10376,7 +10422,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
 }
 async function start_lxc_sandbox(config, nodeArgs = [], cliArgs = []) {
   const containerName = config.image || "gemini-sandbox";
-  const workdir = path8.resolve(process.cwd());
+  const workdir = path9.resolve(process.cwd());
   debugLogger.log(
     `starting lxc sandbox (container: ${containerName}, workdir: ${workdir}) ...`
   );
@@ -10457,7 +10503,7 @@ async function start_lxc_sandbox(config, nodeArgs = [], cliArgs = []) {
     }
     if (config.allowedPaths) {
       for (const hostPath of config.allowedPaths) {
-        if (hostPath && path8.isAbsolute(hostPath) && fs7.existsSync(hostPath)) {
+        if (hostPath && path9.isAbsolute(hostPath) && fs7.existsSync(hostPath)) {
           const allowedDeviceName = `gemini-allowed-${randomBytes(4).toString(
             "hex"
           )}`;
@@ -10703,11 +10749,11 @@ async function getStartupWarnings() {
 // packages/cli/src/utils/userStartupWarnings.ts
 import fs9 from "node:fs/promises";
 import { homedir as osHomedir } from "node:os";
-import path9 from "node:path";
+import path10 from "node:path";
 import process4 from "node:process";
 var homeDirectoryCheck = {
   id: "home-directory",
-  priority: WarningPriority.Low,
+  priority: "low" /* Low */,
   check: async (workspaceRoot, settings) => {
     if (settings.ui?.showHomeDirectoryWarning === false) {
       return null;
@@ -10717,7 +10763,7 @@ var homeDirectoryCheck = {
         fs9.realpath(workspaceRoot),
         fs9.realpath(osHomedir())
       ]);
-      if (path9.resolve(workspaceRealPath) === path9.resolve(homeRealPath)) {
+      if (path10.resolve(workspaceRealPath) === path10.resolve(homeRealPath)) {
         if (isFolderTrustEnabled(settings) && isWorkspaceTrusted(settings).isTrusted) {
           return null;
         }
@@ -10731,12 +10777,12 @@ var homeDirectoryCheck = {
 };
 var rootDirectoryCheck = {
   id: "root-directory",
-  priority: WarningPriority.High,
+  priority: "high" /* High */,
   check: async (workspaceRoot, _settings) => {
     try {
       const workspaceRealPath = await fs9.realpath(workspaceRoot);
       const errorMessage = "Warning: You are running Gemini CLI in the root directory. Your entire folder structure will be used for context. It is strongly recommended to run in a project-specific directory.";
-      if (path9.dirname(workspaceRealPath) === workspaceRealPath) {
+      if (path10.dirname(workspaceRealPath) === workspaceRealPath) {
         return errorMessage;
       }
       return null;
@@ -10747,7 +10793,7 @@ var rootDirectoryCheck = {
 };
 var folderTrustCheck = {
   id: "folder-trust",
-  priority: WarningPriority.High,
+  priority: "high" /* High */,
   check: async (workspaceRoot, settings) => {
     if (!isFolderTrustEnabled(settings)) {
       return null;
@@ -10937,12 +10983,12 @@ function handleError(error, config, customErrorCode) {
     error,
     config.getContentGeneratorConfig()?.authType
   );
-  if (config.getOutputFormat() === OutputFormat.STREAM_JSON) {
+  if (config.getOutputFormat() === "stream-json" /* STREAM_JSON */) {
     const streamFormatter = new StreamJsonFormatter();
     const errorCode = customErrorCode ?? extractErrorCode(error);
     const metrics = uiTelemetryService.getMetrics();
     streamFormatter.emitEvent({
-      type: JsonStreamEventType.RESULT,
+      type: "result" /* RESULT */,
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       status: "error",
       error: {
@@ -10953,7 +10999,7 @@ function handleError(error, config, customErrorCode) {
     });
     runSyncCleanup();
     process.exit(getNumericExitCode(errorCode));
-  } else if (config.getOutputFormat() === OutputFormat.JSON) {
+  } else if (config.getOutputFormat() === "json" /* JSON */) {
     const formatter = new JsonFormatter();
     const errorCode = customErrorCode ?? extractErrorCode(error);
     const formattedError = formatter.formatError(
@@ -10973,11 +11019,11 @@ function handleToolError(toolName, toolError, config, errorType, resultDisplay)
   const isFatal = isFatalToolError(errorType);
   if (isFatal) {
     const toolExecutionError = new FatalToolExecutionError(errorMessage);
-    if (config.getOutputFormat() === OutputFormat.STREAM_JSON) {
+    if (config.getOutputFormat() === "stream-json" /* STREAM_JSON */) {
       const streamFormatter = new StreamJsonFormatter();
       const metrics = uiTelemetryService.getMetrics();
       streamFormatter.emitEvent({
-        type: JsonStreamEventType.RESULT,
+        type: "result" /* RESULT */,
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
         status: "error",
         error: {
@@ -10986,7 +11032,7 @@ function handleToolError(toolName, toolError, config, errorType, resultDisplay)
         },
         stats: streamFormatter.convertToStreamStats(metrics, 0)
       });
-    } else if (config.getOutputFormat() === OutputFormat.JSON) {
+    } else if (config.getOutputFormat() === "json" /* JSON */) {
       const formatter = new JsonFormatter();
       const formattedError = formatter.formatError(
         toolExecutionError,
@@ -11004,11 +11050,11 @@ function handleToolError(toolName, toolError, config, errorType, resultDisplay)
 }
 function handleCancellationError(config) {
   const cancellationError = new FatalCancellationError("Operation cancelled.");
-  if (config.getOutputFormat() === OutputFormat.STREAM_JSON) {
+  if (config.getOutputFormat() === "stream-json" /* STREAM_JSON */) {
     const streamFormatter = new StreamJsonFormatter();
     const metrics = uiTelemetryService.getMetrics();
     streamFormatter.emitEvent({
-      type: JsonStreamEventType.RESULT,
+      type: "result" /* RESULT */,
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       status: "error",
       error: {
@@ -11019,7 +11065,7 @@ function handleCancellationError(config) {
     });
     runSyncCleanup();
     process.exit(cancellationError.exitCode);
-  } else if (config.getOutputFormat() === OutputFormat.JSON) {
+  } else if (config.getOutputFormat() === "json" /* JSON */) {
     const formatter = new JsonFormatter();
     const formattedError = formatter.formatError(
       cancellationError,
@@ -11039,11 +11085,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() === OutputFormat.STREAM_JSON) {
+  if (config.getOutputFormat() === "stream-json" /* STREAM_JSON */) {
     const streamFormatter = new StreamJsonFormatter();
     const metrics = uiTelemetryService.getMetrics();
     streamFormatter.emitEvent({
-      type: JsonStreamEventType.RESULT,
+      type: "result" /* RESULT */,
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       status: "error",
       error: {
@@ -11054,7 +11100,7 @@ function handleMaxTurnsExceededError(config) {
     });
     runSyncCleanup();
     process.exit(maxTurnsError.exitCode);
-  } else if (config.getOutputFormat() === OutputFormat.JSON) {
+  } else if (config.getOutputFormat() === "json" /* JSON */) {
     const formatter = new JsonFormatter();
     const formattedError = formatter.formatError(
       maxTurnsError,
@@ -11134,7 +11180,7 @@ async function runNonInteractive({
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-R3332TAT.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-YPPCMYGQ.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -11150,7 +11196,7 @@ async function runNonInteractive({
       }
     };
     const startTime = Date.now();
-    const streamFormatter = config.getOutputFormat() === OutputFormat.STREAM_JSON ? new StreamJsonFormatter() : null;
+    const streamFormatter = config.getOutputFormat() === "stream-json" /* STREAM_JSON */ ? new StreamJsonFormatter() : null;
     const abortController = new AbortController();
     let isAborting = false;
     let cancelMessageTimer = null;
@@ -11203,13 +11249,13 @@ async function runNonInteractive({
     };
     try {
       consolePatcher.patch();
-      if (config.getRawOutput() && !config.getAcceptRawOutputRisk() && config.getOutputFormat() === OutputFormat.TEXT) {
+      if (config.getRawOutput() && !config.getAcceptRawOutputRisk() && config.getOutputFormat() === "text" /* 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(CoreEvent.UserFeedback, handleUserFeedback);
+      coreEvents.on("user-feedback" /* UserFeedback */, handleUserFeedback);
       coreEvents.drainBacklogs();
       process.stdout.on("error", (err) => {
         if (err.code === "EPIPE") {
@@ -11235,7 +11281,7 @@ async function runNonInteractive({
       }
       if (streamFormatter) {
         streamFormatter.emitEvent({
-          type: JsonStreamEventType.INIT,
+          type: "init" /* INIT */,
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           session_id: config.getSessionId(),
           model: config.getModel()
@@ -11273,7 +11319,7 @@ async function runNonInteractive({
       }
       if (streamFormatter) {
         streamFormatter.emitEvent({
-          type: JsonStreamEventType.MESSAGE,
+          type: "message" /* MESSAGE */,
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           role: "user",
           content: input
@@ -11312,12 +11358,12 @@ async function runNonInteractive({
           const metrics = uiTelemetryService.getMetrics();
           const durationMs = Date.now() - startTime;
           streamFormatter.emitEvent({
-            type: JsonStreamEventType.RESULT,
+            type: "result" /* RESULT */,
             timestamp: (/* @__PURE__ */ new Date()).toISOString(),
             status: errorPayload ? "error" : "success",
             stats: streamFormatter.convertToStreamStats(metrics, durationMs)
           });
-        } else if (config.getOutputFormat() === OutputFormat.JSON) {
+        } else if (config.getOutputFormat() === "json" /* JSON */) {
           const formatter = new JsonFormatter();
           const stats = uiTelemetryService.getMetrics();
           textOutput.write(
@@ -11410,13 +11456,13 @@ async function runNonInteractive({
                   const output = isRaw ? part.text : stripAnsi(part.text);
                   if (streamFormatter) {
                     streamFormatter.emitEvent({
-                      type: JsonStreamEventType.MESSAGE,
+                      type: "message" /* MESSAGE */,
                       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                       role: "assistant",
                       content: output,
                       delta: true
                     });
-                  } else if (config.getOutputFormat() === OutputFormat.JSON) {
+                  } else if (config.getOutputFormat() === "json" /* JSON */) {
                     responseText += output;
                   } else {
                     if (part.text) {
@@ -11429,13 +11475,13 @@ async function runNonInteractive({
             break;
           }
           case "tool_request": {
-            if (config.getOutputFormat() === OutputFormat.JSON) {
+            if (config.getOutputFormat() === "json" /* JSON */) {
               preToolResponseText = responseText || preToolResponseText;
               responseText = "";
             }
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: JsonStreamEventType.TOOL_USE,
+                type: "tool_use" /* TOOL_USE */,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 tool_name: event.name,
                 tool_id: event.requestId,
@@ -11451,7 +11497,7 @@ async function runNonInteractive({
               const displayText = displayContentToString(display);
               const errorMsg = getTextContent(event.content) ?? "Tool error";
               streamFormatter.emitEvent({
-                type: JsonStreamEventType.TOOL_RESULT,
+                type: "tool_result" /* TOOL_RESULT */,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 tool_id: event.requestId,
                 status: event.isError ? "error" : "success",
@@ -11466,17 +11512,17 @@ async function runNonInteractive({
               const display = event.display?.result;
               const displayText = displayContentToString(display);
               const errorMsg = getTextContent(event.content) ?? "Tool error";
-              if (event.data?.["errorType"] === ToolErrorType.STOP_EXECUTION) {
-                if (config.getOutputFormat() === OutputFormat.JSON && !responseText && preToolResponseText) {
+              if (event.data?.["errorType"] === "stop_execution" /* STOP_EXECUTION */) {
+                if (config.getOutputFormat() === "json" /* JSON */ && !responseText && preToolResponseText) {
                   responseText = preToolResponseText;
                 }
                 const stopMessage = `Agent execution stopped: ${errorMsg}`;
-                if (config.getOutputFormat() === OutputFormat.TEXT) {
+                if (config.getOutputFormat() === "text" /* TEXT */) {
                   process.stderr.write(`${stopMessage}
 `);
                 }
               }
-              if (event.data?.["errorType"] === ToolErrorType.NO_SPACE_LEFT) {
+              if (event.data?.["errorType"] === "no_space_left" /* NO_SPACE_LEFT */) {
                 throw new FatalToolExecutionError(
                   "Error executing tool " + event.name + ": " + (displayText || errorMsg)
                 );
@@ -11511,12 +11557,12 @@ async function runNonInteractive({
               }
               if (streamFormatter) {
                 streamFormatter.emitEvent({
-                  type: JsonStreamEventType.ERROR,
+                  type: "error" /* ERROR */,
                   timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                   severity: "error",
                   message: errorMessage
                 });
-              } else if (config.getOutputFormat() === OutputFormat.TEXT) {
+              } else if (config.getOutputFormat() === "text" /* TEXT */) {
                 process.stderr.write(`[ERROR] ${errorMessage}
 `);
               }
@@ -11537,12 +11583,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() === OutputFormat.TEXT) {
+              if (config.getOutputFormat() === "text" /* TEXT */) {
                 process.stderr.write(`[WARNING] ${blockMessage}
 `);
               } else if (streamFormatter) {
                 streamFormatter.emitEvent({
-                  type: JsonStreamEventType.ERROR,
+                  type: "error" /* ERROR */,
                   timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                   severity: "warning",
                   message: stripAnsi(blockMessage)
@@ -11552,13 +11598,13 @@ async function runNonInteractive({
               break;
             }
             const severity = event.status === "RESOURCE_EXHAUSTED" ? "error" : "warning";
-            if (config.getOutputFormat() === OutputFormat.TEXT) {
+            if (config.getOutputFormat() === "text" /* TEXT */) {
               process.stderr.write(`[WARNING] ${event.message}
 `);
             }
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: JsonStreamEventType.ERROR,
+                type: "error" /* ERROR */,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 severity,
                 message: stripAnsi(event.message)
@@ -11578,7 +11624,7 @@ async function runNonInteractive({
                 );
               } else if (streamFormatter) {
                 streamFormatter.emitEvent({
-                  type: JsonStreamEventType.ERROR,
+                  type: "error" /* ERROR */,
                   timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                   severity: "error",
                   message: "Maximum session turns exceeded"
@@ -11586,7 +11632,7 @@ async function runNonInteractive({
               }
             }
             const stopMessage = typeof event.data?.["message"] === "string" ? event.data["message"] : "";
-            if (stopMessage && config.getOutputFormat() === OutputFormat.TEXT) {
+            if (stopMessage && config.getOutputFormat() === "text" /* TEXT */) {
               process.stderr.write(`Agent execution stopped: ${stopMessage}
 `);
             }
@@ -11616,7 +11662,7 @@ async function runNonInteractive({
       abortController.signal.removeEventListener("abort", abortSession);
       scheduler?.dispose();
       consolePatcher.cleanup();
-      coreEvents.off(CoreEvent.UserFeedback, handleUserFeedback);
+      coreEvents.off("user-feedback" /* UserFeedback */, handleUserFeedback);
     }
     if (errorToHandle) {
       handleError(errorToHandle, config);
@@ -11644,7 +11690,7 @@ async function runNonInteractive2(params) {
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-R3332TAT.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-YPPCMYGQ.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -11660,7 +11706,7 @@ async function runNonInteractive2(params) {
       }
     };
     const startTime = Date.now();
-    const streamFormatter = config.getOutputFormat() === OutputFormat.STREAM_JSON ? new StreamJsonFormatter() : null;
+    const streamFormatter = config.getOutputFormat() === "stream-json" /* STREAM_JSON */ ? new StreamJsonFormatter() : null;
     const abortController = new AbortController();
     let isAborting = false;
     let cancelMessageTimer = null;
@@ -11711,13 +11757,13 @@ async function runNonInteractive2(params) {
     let scheduler;
     try {
       consolePatcher.patch();
-      if (config.getRawOutput() && !config.getAcceptRawOutputRisk() && config.getOutputFormat() === OutputFormat.TEXT) {
+      if (config.getRawOutput() && !config.getAcceptRawOutputRisk() && config.getOutputFormat() === "text" /* 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(CoreEvent.UserFeedback, handleUserFeedback);
+      coreEvents.on("user-feedback" /* UserFeedback */, handleUserFeedback);
       coreEvents.drainBacklogs();
       process.stdout.on("error", (err) => {
         if (err.code === "EPIPE") {
@@ -11741,7 +11787,7 @@ async function runNonInteractive2(params) {
       }
       if (streamFormatter) {
         streamFormatter.emitEvent({
-          type: JsonStreamEventType.INIT,
+          type: "init" /* INIT */,
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           session_id: config.getSessionId(),
           model: config.getModel()
@@ -11779,7 +11825,7 @@ async function runNonInteractive2(params) {
       }
       if (streamFormatter) {
         streamFormatter.emitEvent({
-          type: JsonStreamEventType.MESSAGE,
+          type: "message" /* MESSAGE */,
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           role: "user",
           content: input
@@ -11807,28 +11853,28 @@ async function runNonInteractive2(params) {
           if (abortController.signal.aborted) {
             handleCancellationError(config);
           }
-          if (event.type === GeminiEventType.Content) {
+          if (event.type === "content" /* Content */) {
             const isRaw = config.getRawOutput() || config.getAcceptRawOutputRisk();
             const output = isRaw ? event.value : stripAnsi(event.value);
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: JsonStreamEventType.MESSAGE,
+                type: "message" /* MESSAGE */,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 role: "assistant",
                 content: output,
                 delta: true
               });
-            } else if (config.getOutputFormat() === OutputFormat.JSON) {
+            } else if (config.getOutputFormat() === "json" /* JSON */) {
               responseText += output;
             } else {
               if (event.value) {
                 textOutput.write(output);
               }
             }
-          } else if (event.type === GeminiEventType.ToolCallRequest) {
+          } else if (event.type === "tool_call_request" /* ToolCallRequest */) {
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: JsonStreamEventType.TOOL_USE,
+                type: "tool_use" /* TOOL_USE */,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 tool_name: event.value.name,
                 tool_id: event.value.callId,
@@ -11836,33 +11882,33 @@ async function runNonInteractive2(params) {
               });
             }
             toolCallRequests.push(event.value);
-          } else if (event.type === GeminiEventType.LoopDetected) {
+          } else if (event.type === "loop_detected" /* LoopDetected */) {
             const message = "Loop detected, stopping execution";
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: JsonStreamEventType.ERROR,
+                type: "error" /* ERROR */,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 severity: "warning",
                 message
               });
             }
             warnings.push(message);
-          } else if (event.type === GeminiEventType.MaxSessionTurns) {
+          } else if (event.type === "max_session_turns" /* MaxSessionTurns */) {
             const message = "Maximum session turns exceeded";
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: JsonStreamEventType.ERROR,
+                type: "error" /* ERROR */,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 severity: "error",
                 message
               });
             }
             warnings.push(message);
-          } else if (event.type === GeminiEventType.Error) {
+          } else if (event.type === "error" /* Error */) {
             throw event.value.error;
-          } else if (event.type === GeminiEventType.AgentExecutionStopped) {
+          } else if (event.type === "agent_execution_stopped" /* AgentExecutionStopped */) {
             const stopMessage = `Agent execution stopped: ${event.value.systemMessage?.trim() || event.value.reason}`;
-            if (config.getOutputFormat() === OutputFormat.TEXT) {
+            if (config.getOutputFormat() === "text" /* TEXT */) {
               process.stderr.write(`${stopMessage}
 `);
             }
@@ -11870,7 +11916,7 @@ async function runNonInteractive2(params) {
               const metrics = uiTelemetryService.getMetrics();
               const durationMs = Date.now() - startTime;
               streamFormatter.emitEvent({
-                type: JsonStreamEventType.RESULT,
+                type: "result" /* RESULT */,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 status: "success",
                 stats: streamFormatter.convertToStreamStats(
@@ -11878,7 +11924,7 @@ async function runNonInteractive2(params) {
                   durationMs
                 )
               });
-            } else if (config.getOutputFormat() === OutputFormat.JSON) {
+            } else if (config.getOutputFormat() === "json" /* JSON */) {
               const formatter = new JsonFormatter();
               const stats = uiTelemetryService.getMetrics();
               textOutput.write(
@@ -11894,21 +11940,21 @@ async function runNonInteractive2(params) {
               textOutput.ensureTrailingNewline();
             }
             return;
-          } else if (event.type === GeminiEventType.AgentExecutionBlocked) {
+          } else if (event.type === "agent_execution_blocked" /* AgentExecutionBlocked */) {
             const blockMessage = `Agent execution blocked: ${event.value.systemMessage?.trim() || event.value.reason}`;
-            if (config.getOutputFormat() === OutputFormat.TEXT) {
+            if (config.getOutputFormat() === "text" /* TEXT */) {
               process.stderr.write(`[WARNING] ${blockMessage}
 `);
             } else if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: JsonStreamEventType.ERROR,
+                type: "error" /* ERROR */,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 severity: "warning",
                 message: stripAnsi(blockMessage)
               });
             }
             warnings.push(blockMessage);
-          } else if (event.type === GeminiEventType.InvalidStream) {
+          } else if (event.type === "invalid_stream" /* InvalidStream */) {
             const eventValue = event.value;
             if (eventValue?.type === "NO_RESPONSE_TEXT") {
               invalidStreamError = TRUE_EMPTY_RESPONSE_MESSAGE;
@@ -11931,12 +11977,12 @@ async function runNonInteractive2(params) {
             );
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: JsonStreamEventType.ERROR,
+                type: "error" /* ERROR */,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 severity: "error",
                 message: invalidStreamError
               });
-            } else if (config.getOutputFormat() === OutputFormat.TEXT) {
+            } else if (config.getOutputFormat() === "text" /* TEXT */) {
               process.stderr.write(`[ERROR] ${invalidStreamError}
 `);
             }
@@ -11956,7 +12002,7 @@ async function runNonInteractive2(params) {
             const requestInfo = completedToolCall.request;
             if (streamFormatter) {
               streamFormatter.emitEvent({
-                type: JsonStreamEventType.TOOL_RESULT,
+                type: "tool_result" /* TOOL_RESULT */,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 tool_id: requestInfo.callId,
                 status: completedToolCall.status === "error" ? "error" : "success",
@@ -11990,11 +12036,11 @@ async function runNonInteractive2(params) {
             );
           }
           const stopExecutionTool = completedToolCalls.find(
-            (tc) => tc.response.errorType === ToolErrorType.STOP_EXECUTION
+            (tc) => tc.response.errorType === "stop_execution" /* STOP_EXECUTION */
           );
           if (stopExecutionTool && stopExecutionTool.response.error) {
             const stopMessage = `Agent execution stopped: ${stopExecutionTool.response.error.message}`;
-            if (config.getOutputFormat() === OutputFormat.TEXT) {
+            if (config.getOutputFormat() === "text" /* TEXT */) {
               process.stderr.write(`${stopMessage}
 `);
             }
@@ -12002,7 +12048,7 @@ async function runNonInteractive2(params) {
               const metrics = uiTelemetryService.getMetrics();
               const durationMs = Date.now() - startTime;
               streamFormatter.emitEvent({
-                type: JsonStreamEventType.RESULT,
+                type: "result" /* RESULT */,
                 timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                 status: "success",
                 stats: streamFormatter.convertToStreamStats(
@@ -12010,7 +12056,7 @@ async function runNonInteractive2(params) {
                   durationMs
                 )
               });
-            } else if (config.getOutputFormat() === OutputFormat.JSON) {
+            } else if (config.getOutputFormat() === "json" /* JSON */) {
               const formatter = new JsonFormatter();
               const stats = uiTelemetryService.getMetrics();
               textOutput.write(
@@ -12033,12 +12079,12 @@ async function runNonInteractive2(params) {
             const metrics = uiTelemetryService.getMetrics();
             const durationMs = Date.now() - startTime;
             streamFormatter.emitEvent({
-              type: JsonStreamEventType.RESULT,
+              type: "result" /* RESULT */,
               timestamp: (/* @__PURE__ */ new Date()).toISOString(),
               status: invalidStreamError ? "error" : "success",
               stats: streamFormatter.convertToStreamStats(metrics, durationMs)
             });
-          } else if (config.getOutputFormat() === OutputFormat.JSON) {
+          } else if (config.getOutputFormat() === "json" /* JSON */) {
             const formatter = new JsonFormatter();
             const stats = uiTelemetryService.getMetrics();
             textOutput.write(
@@ -12062,7 +12108,7 @@ async function runNonInteractive2(params) {
       cleanupStdinCancellation();
       scheduler?.dispose();
       consolePatcher.cleanup();
-      coreEvents.off(CoreEvent.UserFeedback, handleUserFeedback);
+      coreEvents.off("user-feedback" /* UserFeedback */, handleUserFeedback);
     }
     if (errorToHandle) {
       handleError(errorToHandle, config);
@@ -13635,7 +13681,7 @@ import { randomUUID as randomUUID2 } from "node:crypto";
 
 // packages/cli/src/acp/acpSession.ts
 import * as fs12 from "node:fs/promises";
-import * as path12 from "node:path";
+import * as path13 from "node:path";
 import { randomUUID } from "node:crypto";
 
 // packages/cli/src/acp/commands/commandRegistry.ts
@@ -14077,7 +14123,7 @@ var UpdateExtensionCommand = class {
 
 // packages/cli/src/acp/commands/init.ts
 import * as fs10 from "node:fs";
-import * as path10 from "node:path";
+import * as path11 from "node:path";
 var InitCommand = class {
   name = "init";
   description = "Analyzes the project and creates a tailored GEMINI.md file";
@@ -14087,7 +14133,7 @@ var InitCommand = class {
     if (!targetDir) {
       throw new Error("Command requires a workspace.");
     }
-    const geminiMdPath = path10.join(targetDir, "GEMINI.md");
+    const geminiMdPath = path11.join(targetDir, "GEMINI.md");
     const result = performInit(fs10.existsSync(geminiMdPath));
     switch (result.type) {
       case "message":
@@ -14120,7 +14166,7 @@ ${result.content}`
 
 // packages/cli/src/acp/commands/restore.ts
 import * as fs11 from "node:fs/promises";
-import * as path11 from "node:path";
+import * as path12 from "node:path";
 var RestoreCommand = class {
   name = "restore";
   description = "Restore to a previous checkpoint, or list available checkpoints to restore. This will reset the conversation and file history to the state it was in when the checkpoint was created";
@@ -14142,7 +14188,7 @@ var RestoreCommand = class {
       }
       const selectedFile = argsStr.endsWith(".json") ? argsStr : `${argsStr}.json`;
       const checkpointDir = config.storage.getProjectTempCheckpointsDir();
-      const filePath = path11.join(checkpointDir, selectedFile);
+      const filePath = path12.join(checkpointDir, selectedFile);
       let data;
       try {
         data = await fs11.readFile(filePath, "utf-8");
@@ -14216,7 +14262,7 @@ var ListCheckpointsCommand = class {
       }
       const checkpointFiles = /* @__PURE__ */ new Map();
       for (const file of jsonFiles) {
-        const filePath = path11.join(checkpointDir, file);
+        const filePath = path12.join(checkpointDir, file);
         const data = await fs11.readFile(filePath, "utf-8");
         checkpointFiles.set(file, data);
       }
@@ -14453,12 +14499,12 @@ function toToolCallContent(toolResult) {
 }
 var basicPermissionOptions = [
   {
-    optionId: ToolConfirmationOutcome.ProceedOnce,
+    optionId: "proceed_once" /* ProceedOnce */,
     name: "Allow",
     kind: "allow_once"
   },
   {
-    optionId: ToolConfirmationOutcome.Cancel,
+    optionId: "cancel" /* Cancel */,
     name: "Reject",
     kind: "reject_once"
   }
@@ -14470,13 +14516,13 @@ function toPermissionOptions(confirmation, config, enablePermanentToolApproval =
     switch (confirmation.type) {
       case "edit":
         options.push({
-          optionId: ToolConfirmationOutcome.ProceedAlways,
+          optionId: "proceed_always" /* ProceedAlways */,
           name: "Allow for this session",
           kind: "allow_always"
         });
         if (enablePermanentToolApproval) {
           options.push({
-            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+            optionId: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
             name: "Allow for this file in all future sessions",
             kind: "allow_always"
           });
@@ -14484,13 +14530,13 @@ function toPermissionOptions(confirmation, config, enablePermanentToolApproval =
         break;
       case "exec":
         options.push({
-          optionId: ToolConfirmationOutcome.ProceedAlways,
+          optionId: "proceed_always" /* ProceedAlways */,
           name: "Allow for this session",
           kind: "allow_always"
         });
         if (enablePermanentToolApproval) {
           options.push({
-            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+            optionId: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
             name: "Allow this command for all future sessions",
             kind: "allow_always"
           });
@@ -14499,19 +14545,19 @@ function toPermissionOptions(confirmation, config, enablePermanentToolApproval =
       case "mcp":
         options.push(
           {
-            optionId: ToolConfirmationOutcome.ProceedAlwaysServer,
+            optionId: "proceed_always_server" /* ProceedAlwaysServer */,
             name: "Allow all server tools for this session",
             kind: "allow_always"
           },
           {
-            optionId: ToolConfirmationOutcome.ProceedAlwaysTool,
+            optionId: "proceed_always_tool" /* ProceedAlwaysTool */,
             name: "Allow tool for this session",
             kind: "allow_always"
           }
         );
         if (enablePermanentToolApproval) {
           options.push({
-            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+            optionId: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
             name: "Allow tool for all future sessions",
             kind: "allow_always"
           });
@@ -14519,13 +14565,13 @@ function toPermissionOptions(confirmation, config, enablePermanentToolApproval =
         break;
       case "info":
         options.push({
-          optionId: ToolConfirmationOutcome.ProceedAlways,
+          optionId: "proceed_always" /* ProceedAlways */,
           name: "Allow for this session",
           kind: "allow_always"
         });
         if (enablePermanentToolApproval) {
           options.push({
-            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+            optionId: "proceed_always_and_save" /* ProceedAlwaysAndSave */,
             name: "Allow for all future sessions",
             kind: "allow_always"
           });
@@ -14557,21 +14603,21 @@ function toPermissionOptions(confirmation, config, enablePermanentToolApproval =
 }
 function toAcpToolKind(kind) {
   switch (kind) {
-    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:
+    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 */:
       return kind;
-    case Kind.Agent:
+    case "agent" /* Agent */:
       return "think";
-    case Kind.Plan:
-    case Kind.Communicate:
+    case "plan" /* Plan */:
+    case "communicate" /* Communicate */:
     default:
       return "other";
   }
@@ -14579,24 +14625,24 @@ function toAcpToolKind(kind) {
 function buildAvailableModes(isPlanEnabled) {
   const modes = [
     {
-      id: ApprovalMode.DEFAULT,
+      id: "default" /* DEFAULT */,
       name: "Default",
       description: "Prompts for approval"
     },
     {
-      id: ApprovalMode.AUTO_EDIT,
+      id: "autoEdit" /* AUTO_EDIT */,
       name: "Auto Edit",
       description: "Auto-approves edit tools"
     },
     {
-      id: ApprovalMode.YOLO,
+      id: "yolo" /* YOLO */,
       name: "YOLO",
       description: "Auto-approves all tools"
     }
   ];
   if (isPlanEnabled) {
     modes.push({
-      id: ApprovalMode.PLAN,
+      id: "plan" /* PLAN */,
       name: "Plan",
       description: "Read-only mode"
     });
@@ -14609,7 +14655,7 @@ function buildAvailableModels(config, settings) {
   const useGemini31 = config.getGemini31LaunchedSync?.() ?? false;
   const useGemini3_5Flash = config.hasGemini35FlashGAAccess?.() ?? false;
   const selectedAuthType = settings.merged.security.auth.selectedType;
-  const useCustomToolModel = useGemini31 && selectedAuthType === AuthType.USE_GEMINI;
+  const useCustomToolModel = useGemini31 && selectedAuthType === "gemini-api-key" /* USE_GEMINI */;
   if (config.getExperimentalDynamicModelConfiguration?.() === true && config.getModelConfigService) {
     const options = config.getModelConfigService().getAvailableModelOptions({
       useGemini3_1: useGemini31,
@@ -14695,11 +14741,11 @@ var Session = class {
     this.connection = connection;
     this.settings = settings;
     coreEvents.on(
-      CoreEvent.ApprovalModeChanged,
+      "approval-mode-changed" /* ApprovalModeChanged */,
       this.handleApprovalModeChanged
     );
     this.context.config.getMessageBus()?.subscribe(
-      MessageBusType.TOOL_CONFIRMATION_REQUEST,
+      "tool-confirmation-request" /* TOOL_CONFIRMATION_REQUEST */,
       this.handleToolConfirmationRequest,
       { signal: this.disposeController.signal }
     );
@@ -14723,7 +14769,7 @@ var Session = class {
           "Policy engine missing. Denying tool confirmation request."
         );
         await messageBus.publish({
-          type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+          type: "tool-confirmation-response" /* TOOL_CONFIRMATION_RESPONSE */,
           correlationId: request.correlationId,
           confirmed: false,
           requiresUserConfirmation: false
@@ -14736,7 +14782,7 @@ var Session = class {
           "Tool confirmation request missing tool name. Denying."
         );
         await messageBus.publish({
-          type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+          type: "tool-confirmation-response" /* TOOL_CONFIRMATION_RESPONSE */,
           correlationId: request.correlationId,
           confirmed: false,
           requiresUserConfirmation: false
@@ -14749,7 +14795,7 @@ var Session = class {
           `Tool confirmation request for unknown tool: ${toolName}. Denying.`
         );
         await messageBus.publish({
-          type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+          type: "tool-confirmation-response" /* TOOL_CONFIRMATION_RESPONSE */,
           correlationId: request.correlationId,
           confirmed: false,
           requiresUserConfirmation: false
@@ -14765,15 +14811,15 @@ var Session = class {
         request.subagent
       );
       await messageBus.publish({
-        type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+        type: "tool-confirmation-response" /* TOOL_CONFIRMATION_RESPONSE */,
         correlationId: request.correlationId,
-        confirmed: result.decision === PolicyDecision.ALLOW,
-        requiresUserConfirmation: result.decision === PolicyDecision.ASK_USER
+        confirmed: result.decision === "allow" /* ALLOW */,
+        requiresUserConfirmation: result.decision === "ask_user" /* ASK_USER */
       });
     } catch (error) {
       debugLogger.error("Error handling tool confirmation request:", error);
       await this.context.config.getMessageBus()?.publish({
-        type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+        type: "tool-confirmation-response" /* TOOL_CONFIRMATION_RESPONSE */,
         correlationId: request.correlationId,
         confirmed: false,
         requiresUserConfirmation: false
@@ -14793,7 +14839,7 @@ var Session = class {
   };
   dispose() {
     coreEvents.off(
-      CoreEvent.ApprovalModeChanged,
+      "approval-mode-changed" /* ApprovalModeChanged */,
       this.handleApprovalModeChanged
     );
     this.disposeController.abort();
@@ -14882,7 +14928,7 @@ ${thought.description}`;
             await this.sendUpdate({
               sessionUpdate: "tool_call",
               toolCallId: toolCall.id,
-              status: toolCall.status === CoreToolCallStatus.Success ? "completed" : "failed",
+              status: toolCall.status === "success" /* Success */ ? "completed" : "failed",
               title: toolCall.displayName || toolCall.name,
               content: toolCallContent,
               kind: tool ? toAcpToolKind(tool.kind) : "other"
@@ -14974,7 +15020,7 @@ ${thought.description}`;
             return { stopReason: "cancelled" };
           }
           switch (event.type) {
-            case GeminiEventType.Content: {
+            case "content" /* Content */: {
               const content = {
                 type: "text",
                 text: event.value
@@ -14985,7 +15031,7 @@ ${thought.description}`;
               });
               break;
             }
-            case GeminiEventType.Thought: {
+            case "thought" /* Thought */: {
               const thoughtText = `**${event.value.subject}**
 ${event.value.description}`;
               await this.sendUpdate({
@@ -14994,10 +15040,10 @@ ${event.value.description}`;
               });
               break;
             }
-            case GeminiEventType.ToolCallRequest:
+            case "tool_call_request" /* ToolCallRequest */:
               toolCallRequests.push(event.value);
               break;
-            case GeminiEventType.Finished: {
+            case "finished" /* Finished */: {
               const usage2 = event.value.usageMetadata;
               if (usage2) {
                 turnInputTokens = usage2.promptTokenCount ?? turnInputTokens;
@@ -15005,19 +15051,19 @@ ${event.value.description}`;
               }
               break;
             }
-            case GeminiEventType.ModelInfo:
+            case "model_info" /* ModelInfo */:
               turnModelId = event.value;
               break;
-            case GeminiEventType.MaxSessionTurns:
+            case "max_session_turns" /* MaxSessionTurns */:
               stopReason = "max_turn_requests";
               break;
-            case GeminiEventType.LoopDetected:
+            case "loop_detected" /* LoopDetected */:
               stopReason = "max_turn_requests";
               break;
-            case GeminiEventType.ContextWindowWillOverflow:
+            case "context_window_will_overflow" /* ContextWindowWillOverflow */:
               stopReason = "max_tokens";
               break;
-            case GeminiEventType.Error: {
+            case "error" /* Error */: {
               const parseResult = StructuredErrorSchema.safeParse(
                 event.value.error
               );
@@ -15245,7 +15291,7 @@ ${event.value.description}`;
         const output = RequestPermissionResponseSchema.parse(
           await this.connection.requestPermission(params)
         );
-        const outcome = output.outcome.outcome === "cancelled" ? ToolConfirmationOutcome.Cancel : external_exports.nativeEnum(ToolConfirmationOutcome).parse(output.outcome.optionId);
+        const outcome = output.outcome.outcome === "cancelled" ? "cancel" /* Cancel */ : external_exports.nativeEnum(ToolConfirmationOutcome).parse(output.outcome.optionId);
         await confirmationDetails.onConfirm(outcome);
         await updatePolicy(
           tool,
@@ -15256,16 +15302,16 @@ ${event.value.description}`;
           invocation
         );
         switch (outcome) {
-          case ToolConfirmationOutcome.Cancel:
+          case "cancel" /* Cancel */:
             return errorResponse(
               new Error(`Tool "${fc.name}" was canceled by the user.`)
             );
-          case ToolConfirmationOutcome.ProceedOnce:
-          case ToolConfirmationOutcome.ProceedAlways:
-          case ToolConfirmationOutcome.ProceedAlwaysAndSave:
-          case ToolConfirmationOutcome.ProceedAlwaysServer:
-          case ToolConfirmationOutcome.ProceedAlwaysTool:
-          case ToolConfirmationOutcome.ModifyWithEditor:
+          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 */:
             break;
           default: {
             const resultOutcome = outcome;
@@ -15319,7 +15365,7 @@ ${event.value.description}`;
       );
       this.chat.recordCompletedToolCalls(this.context.config.getActiveModel(), [
         {
-          status: CoreToolCallStatus.Success,
+          status: "success" /* Success */,
           request: {
             callId,
             name: fc.name,
@@ -15364,7 +15410,7 @@ ${event.value.description}`;
       });
       this.chat.recordCompletedToolCalls(this.context.config.getActiveModel(), [
         {
-          status: CoreToolCallStatus.Error,
+          status: "error" /* Error */,
           request: {
             callId,
             name: fc.name,
@@ -15478,7 +15524,7 @@ ${event.value.description}`;
       } else if (result.status === "invalid") {
         continue;
       } else {
-        absolutePath = path12.resolve(
+        absolutePath = path13.resolve(
           this.context.config.getTargetDir(),
           pathName
         );
@@ -15492,12 +15538,12 @@ ${event.value.description}`;
               sessionId: this.id,
               options: [
                 {
-                  optionId: ToolConfirmationOutcome.ProceedOnce,
+                  optionId: "proceed_once" /* ProceedOnce */,
                   name: "Allow once",
                   kind: "allow_once"
                 },
                 {
-                  optionId: ToolConfirmationOutcome.Cancel,
+                  optionId: "cancel" /* Cancel */,
                   name: "Deny",
                   kind: "reject_once"
                 }
@@ -15522,8 +15568,8 @@ ${event.value.description}`;
             const output = RequestPermissionResponseSchema.parse(
               await this.connection.requestPermission(params)
             );
-            const outcome = output.outcome.outcome === "cancelled" ? ToolConfirmationOutcome.Cancel : external_exports.nativeEnum(ToolConfirmationOutcome).parse(output.outcome.optionId);
-            if (outcome === ToolConfirmationOutcome.ProceedOnce) {
+            const outcome = output.outcome.outcome === "cancelled" ? "cancel" /* Cancel */ : external_exports.nativeEnum(ToolConfirmationOutcome).parse(output.outcome.optionId);
+            if (outcome === "proceed_once" /* ProceedOnce */) {
               this.context.config.getWorkspaceContext().addReadOnlyPath(absolutePath);
               validationError = null;
             } else {
@@ -15552,7 +15598,7 @@ ${event.value.description}`;
       }
       try {
         if (!validationError) {
-          if ((path12.isAbsolute(pathName) || !isWithinRoot(
+          if ((path13.isAbsolute(pathName) || !isWithinRoot(
             absolutePath,
             this.context.config.getTargetDir()
           )) && !readDirectly) {
@@ -15656,7 +15702,7 @@ ${contentToPush}`;
                 const lines = globResult.llmContent.split("\n");
                 if (lines.length > 1 && lines[1]) {
                   const firstMatchAbsolute = lines[1].trim();
-                  currentPathSpec = path12.relative(
+                  currentPathSpec = path13.relative(
                     this.context.config.getTargetDir(),
                     firstMatchAbsolute
                   );
@@ -15874,7 +15920,7 @@ Content from @${contextPart.uri}:
 
 // packages/cli/src/acp/acpFileSystemService.ts
 import os5 from "node:os";
-import path13 from "node:path";
+import path14 from "node:path";
 var AcpFileSystemService = class {
   constructor(connection, sessionId, capabilities, fallback, root) {
     this.connection = connection;
@@ -15883,7 +15929,7 @@ var AcpFileSystemService = class {
     this.fallback = fallback;
     this.root = root;
   }
-  geminiDir = path13.join(os5.homedir(), ".gemini");
+  geminiDir = path14.join(os5.homedir(), ".gemini");
   shouldUseFallback(filePath) {
     return !isWithinRoot(filePath, this.root) || isWithinRoot(filePath, this.geminiDir);
   }
@@ -15960,7 +16006,7 @@ var AcpSessionManager = class {
       mcpServers,
       loadedSettings
     );
-    const authType = loadedSettings.merged.security.auth.selectedType || (authDetails.baseUrl || process.env["GOOGLE_GEMINI_BASE_URL"] ? AuthType.GATEWAY : AuthType.USE_GEMINI);
+    const authType = loadedSettings.merged.security.auth.selectedType || (authDetails.baseUrl || process.env["GOOGLE_GEMINI_BASE_URL"] ? "gateway" /* GATEWAY */ : "gemini-api-key" /* USE_GEMINI */);
     let isAuthenticated = false;
     let authErrorMessage = "";
     try {
@@ -15972,7 +16018,7 @@ var AcpSessionManager = class {
       );
       isAuthenticated = true;
       const contentGeneratorConfig = config.getContentGeneratorConfig();
-      if (authType === AuthType.USE_GEMINI && (!contentGeneratorConfig || !contentGeneratorConfig.apiKey)) {
+      if (authType === "gemini-api-key" /* USE_GEMINI */ && (!contentGeneratorConfig || !contentGeneratorConfig.apiKey)) {
         isAuthenticated = false;
         authErrorMessage = "Gemini API key is missing or not configured.";
       }
@@ -16081,7 +16127,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"] ? AuthType.GATEWAY : void 0);
+    const selectedAuthType = this.settings.merged.security.auth.selectedType || (authDetails.baseUrl || process.env["GOOGLE_GEMINI_BASE_URL"] ? "gateway" /* GATEWAY */ : void 0);
     if (!selectedAuthType) {
       throw RequestError.authRequired();
     }
@@ -16182,12 +16228,12 @@ var GeminiAgent = class {
     }
     const authMethods = [
       {
-        id: AuthType.LOGIN_WITH_GOOGLE,
+        id: "oauth-personal" /* LOGIN_WITH_GOOGLE */,
         name: "Log in with Google",
         description: "Log in with your Google account"
       },
       {
-        id: AuthType.USE_GEMINI,
+        id: "gemini-api-key" /* USE_GEMINI */,
         name: "Gemini API key",
         description: "Use an API key with Gemini Developer API",
         _meta: {
@@ -16197,12 +16243,12 @@ var GeminiAgent = class {
         }
       },
       {
-        id: AuthType.USE_VERTEX_AI,
+        id: "vertex-ai" /* USE_VERTEX_AI */,
         name: "Vertex AI",
         description: "Use an API key with Vertex AI GenAI API"
       },
       {
-        id: AuthType.GATEWAY,
+        id: "gateway" /* GATEWAY */,
         name: "AI API Gateway",
         description: "Use a custom AI API Gateway",
         _meta: {
@@ -16375,7 +16421,7 @@ async function validateNonInteractiveAuth(configuredAuthType, useExternalAuth, n
     }
     return authType;
   } catch (error) {
-    if (nonInteractiveConfig.getOutputFormat() === OutputFormat.JSON) {
+    if (nonInteractiveConfig.getOutputFormat() === "json" /* JSON */) {
       handleError(
         error instanceof Error ? error : new Error(String(error)),
         nonInteractiveConfig,
@@ -16519,7 +16565,7 @@ async function setupTerminalAndTheme(config, settings) {
 
 // packages/cli/src/utils/logCleanup.ts
 import { promises as fs13 } from "node:fs";
-import * as path14 from "node:path";
+import * as path15 from "node:path";
 var RETENTION_PERIOD_MS = 7 * 24 * 60 * 60 * 1e3;
 async function cleanupBackgroundLogs(debugMode = false) {
   try {
@@ -16534,7 +16580,7 @@ async function cleanupBackgroundLogs(debugMode = false) {
     let deletedCount = 0;
     for (const entry of entries) {
       if (entry.isFile() && entry.name.endsWith(".log")) {
-        const filePath = path14.join(logDir, entry.name);
+        const filePath = path15.join(logDir, entry.name);
         try {
           const stats = await fs13.stat(filePath);
           if (now - stats.mtime.getTime() > RETENTION_PERIOD_MS) {
@@ -16570,10 +16616,10 @@ var SlashCommandConflictHandler = class {
     this.handleConflicts = this.handleConflicts.bind(this);
   }
   start() {
-    coreEvents.on(CoreEvent.SlashCommandConflicts, this.handleConflicts);
+    coreEvents.on("slash-command-conflicts" /* SlashCommandConflicts */, this.handleConflicts);
   }
   stop() {
-    coreEvents.off(CoreEvent.SlashCommandConflicts, this.handleConflicts);
+    coreEvents.off("slash-command-conflicts" /* SlashCommandConflicts */, this.handleConflicts);
     if (this.flushTimeout) {
       clearTimeout(this.flushTimeout);
       this.flushTimeout = null;
@@ -16785,8 +16831,8 @@ async function resolveSessionId(resumeArg, sessionIdArg, sessionFileArg) {
       sessionData.projectHash = getProjectHash(storage.getProjectRoot());
       sessionData.startTime = isoNow;
       sessionData.lastUpdated = isoNow;
-      const chatsDir = path15.join(storage.getProjectTempDir(), "chats");
-      const newSessionPath = path15.join(
+      const chatsDir = path16.join(storage.getProjectTempDir(), "chats");
+      const newSessionPath = path16.join(
         chatsDir,
         `session-${now}-${newSessionId.slice(0, 8)}.jsonl`
       );
@@ -16854,7 +16900,7 @@ async function resolveSessionId(resumeArg, sessionIdArg, sessionFileArg) {
   }
 }
 async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), resumedSessionData, initializationResult) {
-  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-BNCDBJK2.js");
+  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-X63QLGIH.js");
   await doStartUI(
     config,
     settings,
@@ -16957,12 +17003,12 @@ async function main() {
   dns.setDefaultResultOrder(
     validateDnsResolutionOrder(settings.merged.advanced.dnsResolutionOrder)
   );
-  if (!settings.merged.security.auth.selectedType || settings.merged.security.auth.selectedType === AuthType.LEGACY_CLOUD_SHELL) {
+  if (!settings.merged.security.auth.selectedType || settings.merged.security.auth.selectedType === "cloud-shell" /* LEGACY_CLOUD_SHELL */) {
     if (process.env["CLOUD_SHELL"] === "true" || process.env["GEMINI_CLI_USE_COMPUTE_ADC"] === "true") {
       settings.setValue(
         "User" /* User */,
         "security.auth.selectedType",
-        AuthType.COMPUTE_ADC
+        "compute-default-credentials" /* COMPUTE_ADC */
       );
     }
   }
@@ -17063,7 +17109,7 @@ ${finalArgs[promptIndex + 1]}`;
     await config.storage.initialize();
     adminControlsListner.setConfig(config);
     if (config.isInteractive() && settings.merged.general.devtools) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-R3332TAT.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-YPPCMYGQ.js");
       setupInitialActivityLogger(config);
     }
     registerTelemetryConfig(config);
@@ -17071,7 +17117,7 @@ ${finalArgs[promptIndex + 1]}`;
     const messageBus = config.getMessageBus();
     createPolicyUpdater2(policyEngine, messageBus, config.storage);
     registerCleanup(async () => {
-      await config?.getHookSystem()?.fireSessionEndEvent(SessionEndReason.Exit);
+      await config?.getHookSystem()?.fireSessionEndEvent("exit" /* Exit */);
     });
     if (!config.getAcpMode()) {
       registerCleanup(consolePatcher.cleanup);
@@ -17122,7 +17168,7 @@ ${finalArgs[promptIndex + 1]}`;
     const initAppHandle = startupProfiler.start("initialize_app");
     const initializationResult = await initializeApp(config, settings);
     initAppHandle?.end();
-    import("./liteRtServerManager-6VWY6OO6.js").then(({ LiteRtServerManager }) => {
+    import("./liteRtServerManager-7W4APCRB.js").then(({ LiteRtServerManager }) => {
       const mergedGemma = settings.merged.experimental?.gemmaModelRouter;
       if (!mergedGemma) return;
       const userGemma = settings.forScope("User" /* User */).settings.experimental?.gemmaModelRouter;
@@ -17132,7 +17178,7 @@ ${finalArgs[promptIndex + 1]}`;
         autoStartServer: userGemma?.autoStartServer
       });
     }).catch((e) => debugLogger.warn("LiteRT auto-start import failed:", e));
-    if (settings.merged.security.auth.selectedType === AuthType.LOGIN_WITH_GOOGLE && config.isBrowserLaunchSuppressed()) {
+    if (settings.merged.security.auth.selectedType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ && config.isBrowserLaunchSuppressed()) {
       await getOauthClient(settings.merged.security.auth.selectedType, config);
     }
     if (config.getAcpMode()) {
@@ -17148,7 +17194,7 @@ ${finalArgs[promptIndex + 1]}`;
       ...rawStartupWarnings.map((message) => ({
         id: `startup-${createHash2("sha256").update(message).digest("hex").substring(0, 16)}`,
         message,
-        priority: WarningPriority.High
+        priority: "high" /* High */
       })),
       ...await getUserStartupWarnings(settings.merged, void 0, {
         isAlternateBuffer: useAlternateBuffer
@@ -17185,7 +17231,7 @@ ${finalArgs[promptIndex + 1]}`;
 ${input}` : stdinData;
       }
     }
-    const sessionStartSource = resumedSessionData ? SessionStartSource.Resume : SessionStartSource.Startup;
+    const sessionStartSource = resumedSessionData ? "resume" /* Resume */ : "startup" /* Startup */;
     const hookSystem = config?.getHookSystem();
     if (hookSystem) {
       const result = await hookSystem.fireSessionStartEvent(sessionStartSource);
@@ -17242,8 +17288,8 @@ ${input}` : wrappedContext;
   }
 }
 function initializeOutputListenersAndFlush(config) {
-  if (coreEvents.listenerCount(CoreEvent.Output) === 0) {
-    coreEvents.on(CoreEvent.Output, (payload) => {
+  if (coreEvents.listenerCount("output" /* Output */) === 0) {
+    coreEvents.on("output" /* Output */, (payload) => {
       if (payload.isStderr) {
         writeToStderr(payload.chunk, payload.encoding);
       } else {
@@ -17251,8 +17297,8 @@ function initializeOutputListenersAndFlush(config) {
       }
     });
   }
-  if (coreEvents.listenerCount(CoreEvent.ConsoleLog) === 0) {
-    coreEvents.on(CoreEvent.ConsoleLog, (payload) => {
+  if (coreEvents.listenerCount("console-log" /* ConsoleLog */) === 0) {
+    coreEvents.on("console-log" /* ConsoleLog */, (payload) => {
       if (payload.type === "error" || payload.type === "warn") {
         writeToStderr(payload.content + "\n");
       } else {
@@ -17260,8 +17306,8 @@ function initializeOutputListenersAndFlush(config) {
       }
     });
   }
-  if (coreEvents.listenerCount(CoreEvent.UserFeedback) === 0) {
-    coreEvents.on(CoreEvent.UserFeedback, (payload) => {
+  if (coreEvents.listenerCount("user-feedback" /* UserFeedback */) === 0) {
+    coreEvents.on("user-feedback" /* UserFeedback */, (payload) => {
       writeToStderr(payload.message + "\n");
     });
   }
@@ -17269,7 +17315,7 @@ function initializeOutputListenersAndFlush(config) {
   const forceToStderr = outputFormat === "json";
   coreEvents.drainBacklogs(
     (event, args) => {
-      if (forceToStderr && event === CoreEvent.Output) {
+      if (forceToStderr && event === "output" /* Output */) {
         const payload = args[0];
         if (!payload.isStderr) {
           return {