@google/gemini-cli 0.42.0-preview.2 → 0.43.0-preview.0

package/bundle/{gemini-IMX43TZ4.js → gemini-Z77GAAR6.js}

@@ -41,18 +41,18 @@ import {
   updateAllUpdatableExtensions,
   updateExtension,
   validateAuthMethod
-} from "./chunk-SJ6AOVZF.js";
+} from "./chunk-QYUN3J2L.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
 import {
   startCommand,
   startServer
-} from "./chunk-Q24MYLMP.js";
+} from "./chunk-P4UQCQUB.js";
 import {
   exitCli,
   require_source
-} from "./chunk-WRDVEMWE.js";
+} from "./chunk-LBQFRHYD.js";
 import {
   DEFAULT_PORT,
   GEMMA_MODEL_NAME,
@@ -86,11 +86,11 @@ import {
   readServerProcessInfo,
   resolveGemmaConfig,
   saveModelChange
-} from "./chunk-BLNG7CSO.js";
+} from "./chunk-SYD5SJFT.js";
 import {
   RELAUNCH_EXIT_CODE
-} from "./chunk-ODIOD5TJ.js";
-import "./chunk-LYMYMKWM.js";
+} from "./chunk-43AGRA7S.js";
+import "./chunk-46T44JOY.js";
 import {
   cleanupCheckpoints,
   registerCleanup,
@@ -99,43 +99,33 @@ import {
   runExitCleanup,
   runSyncCleanup,
   setupSignalHandlers
-} from "./chunk-JW36FWGZ.js";
+} from "./chunk-T3SUXLQQ.js";
 import {
   AuthType,
   ChatRecordingService,
   Client,
   Config,
-  CoreToolCallStatus,
   ExitCodes,
   FileDiscoveryService,
   FolderTrustDiscoveryService,
-  GeminiEventType,
   IdeClient,
-  IntegrityStatus,
   InvalidStreamError,
   JsonFormatter,
-  JsonStreamEventType,
   LegacyAgentSession,
   Logger,
   MCPServerConfig,
-  MCPServerStatus,
-  OutputFormat,
   PolicyIntegrityManager,
   ROOT_SCHEDULER_ID,
   ReadManyFilesTool,
   Scheduler,
-  SessionEndReason,
-  SessionStartSource,
   ShellExecutionService,
   SimpleExtensionLoader,
   StreamJsonFormatter,
   ToolCallEvent,
-  TrustLevel,
   UserAccountManager,
   UserPromptEvent,
   ValidationCancelledError,
   ValidationRequiredError,
-  WarningPriority,
   addMemory,
   applyAdminAllowlist,
   applyRequiredServers,
@@ -176,6 +166,7 @@ import {
   listInboxPatches,
   listInboxSkills,
   listMemoryFiles,
+  loadConversationRecord,
   logToolCall,
   logUserPrompt,
   parseAndFormatApiError,
@@ -199,11 +190,9 @@ import {
   updatePolicy,
   writeToStderr,
   writeToStdout
-} from "./chunk-E54WEGH3.js";
+} from "./chunk-UNAVBUTP.js";
 import {
   ASK_USER_TOOL_NAME,
-  ApprovalMode,
-  CoreEvent,
   DEFAULT_FILE_FILTERING_OPTIONS,
   DEFAULT_GEMINI_EMBEDDING_MODEL,
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
@@ -223,7 +212,6 @@ import {
   FatalUntrustedWorkspaceError,
   GEMINI_DIR,
   GEMINI_MODEL_ALIAS_AUTO,
-  Kind,
   PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL,
   PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL,
   PREVIEW_GEMINI_3_1_MODEL,
@@ -233,7 +221,6 @@ import {
   REFERENCE_CONTENT_START,
   Storage,
   ToolConfirmationOutcome,
-  ToolErrorType,
   coreEvents,
   debugLogger,
   external_exports,
@@ -241,13 +228,14 @@ import {
   getDisplayString,
   getErrorMessage,
   getErrorType,
+  getProjectHash,
   homedir,
   isFatalToolError,
   isNodeError,
   loadServerHierarchicalMemory,
   resolveToRealPath,
   setGeminiMdFilename
-} from "./chunk-JEW7ZIWE.js";
+} from "./chunk-N6QYTC2T.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-RJTRUG2J.js";
 import "./chunk-IUUIT4SU.js";
@@ -1532,11 +1520,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: (path15) => {
+  require: (path16) => {
     if (typeof __require !== "undefined") {
-      return __require(path15);
-    } else if (path15.match(/\.json$/)) {
-      return JSON.parse(readFileSync(path15, "utf8"));
+      return __require(path16);
+    } else if (path16.match(/\.json$/)) {
+      return JSON.parse(readFileSync(path16, "utf8"));
     } else {
       throw Error("only .json config files are supported in ESM");
     }
@@ -5377,7 +5365,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",
@@ -5413,7 +5401,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;
@@ -5427,10 +5415,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) {
@@ -5443,16 +5431,20 @@ async function getServerStatus(serverName, server, isTrusted, activeSettings) {
   });
   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 "disabled" /* DISABLED */;
   }
   return testMCPConnection(serverName, server, isTrusted, activeSettings);
 }
 async function listMcpServers(loadedSettingsArg) {
   const loadedSettings = loadedSettingsArg ?? loadSettings();
   const activeSettings = loadedSettings.merged;
-  const { mcpServers, blockedServerNames } = await getMcpServersFromConfig(activeSettings);
+  const allSettings = !loadedSettings.isTrusted ? loadedSettings.getMergedSettingsAsIfTrusted() : activeSettings;
+  const { mcpServers, blockedServerNames } = await getMcpServersFromConfig(allSettings);
   const serverNames = Object.keys(mcpServers);
   if (blockedServerNames.length > 0) {
     const message = getAdminBlockedMcpServersMessage(
@@ -5467,6 +5459,13 @@ async function listMcpServers(loadedSettingsArg) {
     }
     return;
   }
+  if (!loadedSettings.isTrusted) {
+    debugLogger.log(
+      import_chalk.default.yellow(
+        "Warning: MCP servers are configured but disabled because this folder is untrusted.\nUser-level servers are also suppressed in untrusted folders to prevent accidental side-effects.\n"
+      )
+    );
+  }
   debugLogger.log("Configured MCP servers:\n");
   for (const serverName of serverNames) {
     const server = mcpServers[serverName];
@@ -5479,23 +5478,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";
@@ -5781,7 +5780,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.`
@@ -6306,27 +6305,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(path15) {
+async function pathExists(path16) {
   try {
-    await access(path15);
+    await access(path16);
     return true;
   } catch {
     return false;
   }
 }
-async function createDirectory(path15) {
-  if (await pathExists(path15)) {
-    throw new Error(`Path already exists: ${path15}`);
+async function createDirectory(path16) {
+  if (await pathExists(path16)) {
+    throw new Error(`Path already exists: ${path16}`);
   }
-  await mkdir(path15, { recursive: true });
+  await mkdir(path16, { recursive: true });
 }
-async function copyDirectory(template, path15) {
-  await createDirectory(path15);
+async function copyDirectory(template, path16) {
+  await createDirectory(path16);
   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(path15, entry.name);
+    const destPath = join(path16, entry.name);
     await cp(srcPath, destPath, { recursive: true });
   }
 }
@@ -6601,7 +6600,7 @@ async function handleEnable3(args) {
   const result = enableSkill(settings, name);
   const feedback = renderSkillActionFeedback(
     result,
-    (label, path15) => `${import_chalk5.default.bold(label)} (${import_chalk5.default.dim(path15)})`
+    (label, path16) => `${import_chalk5.default.bold(label)} (${import_chalk5.default.dim(path16)})`
   );
   debugLogger.log(feedback);
 }
@@ -6631,7 +6630,7 @@ async function handleDisable3(args) {
   const result = disableSkill(settings, name, scope);
   const feedback = renderSkillActionFeedback(
     result,
-    (label, path15) => `${import_chalk6.default.bold(label)} (${import_chalk6.default.dim(path15)})`
+    (label, path16) => `${import_chalk6.default.bold(label)} (${import_chalk6.default.dim(path16)})`
   );
   debugLogger.log(feedback);
 }
@@ -7826,7 +7825,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.42.0-preview.2" ?? customImage ?? packageJson?.config?.sandboxImageUri;
+  const image = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.42.0-nightly.20260428.g59b2dea0e" ?? 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;
 }
@@ -7885,9 +7884,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 = {
@@ -7994,8 +7993,13 @@ async function parseArguments(settings) {
     const queryArg2 = argv["query"];
     const query = typeof queryArg2 === "string" || Array.isArray(queryArg2) ? queryArg2 : void 0;
     const hasPositionalQuery = Array.isArray(query) ? query.length > 0 : !!query;
-    if (argv["resume"] !== void 0 && argv["session-id"] !== void 0) {
-      return "Cannot use both --resume (-r) and --session-id together";
+    const sessionFlags = [
+      argv["resume"] !== void 0,
+      argv["session-id"] !== void 0,
+      argv["session-file"] !== void 0
+    ].filter(Boolean).length;
+    if (sessionFlags > 1) {
+      return "The flags --resume, --session-id, and --session-file are mutually exclusive. Please provide only one.";
     }
     if (argv["prompt"] && hasPositionalQuery) {
       return "Cannot use both a positional prompt and the --prompt (-p) flag together";
@@ -8126,6 +8130,10 @@ async function parseArguments(settings) {
         }
         return trimmed;
       }
+    }).option("session-file", {
+      type: "string",
+      nargs: 1,
+      description: "Load a session from a JSON file"
     }).option("session-id", {
       type: "string",
       nargs: 1,
@@ -8327,23 +8335,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(
@@ -8351,10 +8359,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.'
@@ -8372,16 +8380,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 {
@@ -8610,7 +8618,11 @@ async function loadCliConfig(settings, sessionId, argv, options = {}) {
     shellBackgroundCompletionBehavior: settings.tools?.shell?.backgroundCompletionBehavior,
     shellToolInactivityTimeout: settings.tools?.shell?.inactivityTimeout,
     enableShellOutputEfficiency: settings.tools?.shell?.enableShellOutputEfficiency ?? true,
-    skipNextSpeakerCheck: settings.model?.skipNextSpeakerCheck,
+    // In ACP mode, always skip the next-speaker check. This check triggers
+    // recursive continuation turns inside GeminiClient.processTurn() that
+    // conflict with ACP's explicit turn management via session/prompt,
+    // causing infinite agent_thought_chunk loops.
+    skipNextSpeakerCheck: isAcpMode || settings.model?.skipNextSpeakerCheck,
     truncateToolOutputThreshold: settings.tools?.truncateToolOutputThreshold,
     eventEmitter: coreEvents,
     useWriteTodos: argv.useWriteTodos ?? settings.useWriteTodos,
@@ -8769,6 +8781,8 @@ 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 fsPromises from "node:fs/promises";
 
 // packages/cli/src/utils/sandbox.ts
 var import_shell_quote2 = __toESM(require_shell_quote(), 1);
@@ -9229,21 +9243,11 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
     }
     const imageName = parseImageName(image);
     const isIntegrationTest = process.env["GEMINI_CLI_INTEGRATION_TEST"] === "true";
-    let containerName;
-    if (isIntegrationTest) {
-      containerName = `gemini-cli-integration-test-${randomBytes(4).toString(
-        "hex"
-      )}`;
-      debugLogger.log(`ContainerName: ${containerName}`);
-    } else {
-      let index = 0;
-      const containerNameCheck = (await execAsync(`${command2} ps -a --format "{{.Names}}"`)).stdout.trim();
-      while (containerNameCheck.includes(`${imageName}-${index}`)) {
-        index++;
-      }
-      containerName = `${imageName}-${index}`;
-      debugLogger.log(`ContainerName (regular): ${containerName}`);
-    }
+    const containerNamePrefix = isIntegrationTest ? "gemini-cli-integration-test" : imageName;
+    const containerName = `${containerNamePrefix}-${randomBytes(6).toString(
+      "hex"
+    )}`;
+    debugLogger.log(`ContainerName: ${containerName}`);
     args.push("--name", containerName, "--hostname", containerName);
     if (process.env["GEMINI_CLI_TEST_VAR"]) {
       args.push(
@@ -9802,7 +9806,7 @@ import path9 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;
@@ -9826,7 +9830,7 @@ var homeDirectoryCheck = {
 };
 var rootDirectoryCheck = {
   id: "root-directory",
-  priority: WarningPriority.High,
+  priority: "high" /* High */,
   check: async (workspaceRoot, _settings) => {
     try {
       const workspaceRealPath = await fs9.realpath(workspaceRoot);
@@ -9842,7 +9846,7 @@ var rootDirectoryCheck = {
 };
 var folderTrustCheck = {
   id: "folder-trust",
-  priority: WarningPriority.High,
+  priority: "high" /* High */,
   check: async (workspaceRoot, settings) => {
     if (!isFolderTrustEnabled(settings)) {
       return null;
@@ -10032,12 +10036,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: {
@@ -10048,7 +10052,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(
@@ -10068,11 +10072,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: {
@@ -10081,7 +10085,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,
@@ -10099,11 +10103,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: {
@@ -10114,7 +10118,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,
@@ -10134,11 +10138,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: {
@@ -10149,7 +10153,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,
@@ -10229,7 +10233,7 @@ async function runNonInteractive({
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-3XOQOECV.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-7KZDSYEF.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -10245,7 +10249,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;
@@ -10298,13 +10302,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") {
@@ -10330,7 +10334,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()
@@ -10368,7 +10372,7 @@ async function runNonInteractive({
       }
       if (streamFormatter) {
         streamFormatter.emitEvent({
-          type: JsonStreamEventType.MESSAGE,
+          type: "message" /* MESSAGE */,
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           role: "user",
           content: input
@@ -10407,12 +10411,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: "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(
@@ -10505,13 +10509,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) {
@@ -10524,13 +10528,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,
@@ -10546,7 +10550,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",
@@ -10561,17 +10565,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)
                 );
@@ -10593,12 +10597,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)
@@ -10608,13 +10612,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)
@@ -10634,7 +10638,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"
@@ -10642,7 +10646,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}
 `);
             }
@@ -10672,7 +10676,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);
@@ -10684,6 +10688,9 @@ async function runNonInteractive({
 async function runNonInteractive2(params) {
   const useAgentSession = params.config.getAgentSessionNoninteractiveEnabled();
   if (useAgentSession) {
+    debugLogger.debug(
+      "[ADK] Running non-interactive mode with ADK agent session"
+    );
     return runNonInteractive(params);
   }
   const { config, settings, input, prompt_id, resumedSessionData } = params;
@@ -10697,7 +10704,7 @@ async function runNonInteractive2(params) {
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-3XOQOECV.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-7KZDSYEF.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -10713,7 +10720,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;
@@ -10764,13 +10771,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") {
@@ -10794,7 +10801,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()
@@ -10832,7 +10839,7 @@ async function runNonInteractive2(params) {
       }
       if (streamFormatter) {
         streamFormatter.emitEvent({
-          type: JsonStreamEventType.MESSAGE,
+          type: "message" /* MESSAGE */,
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           role: "user",
           content: input
@@ -10860,28 +10867,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,
@@ -10889,33 +10896,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}
 `);
             }
@@ -10923,7 +10930,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(
@@ -10931,32 +10938,46 @@ async function runNonInteractive2(params) {
                   durationMs
                 )
               });
+            } else if (config.getOutputFormat() === "json" /* JSON */) {
+              const formatter = new JsonFormatter();
+              const stats = uiTelemetryService.getMetrics();
+              textOutput.write(
+                formatter.format(
+                  config.getSessionId(),
+                  responseText,
+                  stats,
+                  void 0,
+                  [...warnings, stopMessage]
+                )
+              );
+            } else {
+              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 */) {
             invalidStreamError = "Invalid stream: The model returned an empty response or malformed tool call.";
             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}
 `);
             }
@@ -10976,7 +10997,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",
@@ -11010,11 +11031,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}
 `);
             }
@@ -11022,7 +11043,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(
@@ -11030,7 +11051,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(
@@ -11053,12 +11074,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(
@@ -11082,7 +11103,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);
@@ -13513,12 +13534,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"
   }
@@ -13530,13 +13551,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"
           });
@@ -13544,13 +13565,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"
           });
@@ -13559,19 +13580,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"
           });
@@ -13579,13 +13600,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"
           });
@@ -13617,21 +13638,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";
   }
@@ -13639,24 +13660,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"
     });
@@ -13669,7 +13690,7 @@ function buildAvailableModels(config, settings) {
   const useGemini31 = config.getGemini31LaunchedSync?.() ?? false;
   const useGemini31FlashLite = config.getGemini31FlashLiteLaunchedSync?.() ?? 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,
@@ -13758,7 +13779,7 @@ var Session = class {
     this.connection = connection;
     this.settings = settings;
     coreEvents.on(
-      CoreEvent.ApprovalModeChanged,
+      "approval-mode-changed" /* ApprovalModeChanged */,
       this.handleApprovalModeChanged
     );
   }
@@ -13781,7 +13802,7 @@ var Session = class {
   };
   dispose() {
     coreEvents.off(
-      CoreEvent.ApprovalModeChanged,
+      "approval-mode-changed" /* ApprovalModeChanged */,
       this.handleApprovalModeChanged
     );
   }
@@ -13869,7 +13890,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"
@@ -13961,7 +13982,7 @@ ${thought.description}`;
             return { stopReason: "cancelled" };
           }
           switch (event.type) {
-            case GeminiEventType.Content: {
+            case "content" /* Content */: {
               const content = {
                 type: "text",
                 text: event.value
@@ -13972,7 +13993,7 @@ ${thought.description}`;
               });
               break;
             }
-            case GeminiEventType.Thought: {
+            case "thought" /* Thought */: {
               const thoughtText = `**${event.value.subject}**
 ${event.value.description}`;
               await this.sendUpdate({
@@ -13981,10 +14002,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;
@@ -13992,19 +14013,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
               );
@@ -14193,12 +14214,6 @@ ${event.value.description}`;
       const invocation = tool.build(args);
       const displayTitle = typeof invocation.getDisplayTitle === "function" ? invocation.getDisplayTitle() : invocation.getDescription();
       const explanation = typeof invocation.getExplanation === "function" ? invocation.getExplanation() : "";
-      if (explanation) {
-        await this.sendUpdate({
-          sessionUpdate: "agent_thought_chunk",
-          content: { type: "text", text: explanation }
-        });
-      }
       const confirmationDetails = await invocation.shouldConfirmExecute(abortSignal);
       if (confirmationDetails) {
         const content2 = [];
@@ -14213,6 +14228,12 @@ ${event.value.description}`;
             }
           });
         }
+        if (content2.length === 0 && explanation) {
+          content2.push({
+            type: "content",
+            content: { type: "text", text: explanation }
+          });
+        }
         const params = {
           sessionId: this.id,
           options: toPermissionOptions(
@@ -14232,7 +14253,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,
@@ -14243,16 +14264,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;
@@ -14261,6 +14282,12 @@ ${event.value.description}`;
         }
       } else {
         const content2 = [];
+        if (explanation) {
+          content2.push({
+            type: "content",
+            content: { type: "text", text: explanation }
+          });
+        }
         await this.sendUpdate({
           sessionUpdate: "tool_call",
           toolCallId: callId,
@@ -14300,7 +14327,7 @@ ${event.value.description}`;
       );
       this.chat.recordCompletedToolCalls(this.context.config.getActiveModel(), [
         {
-          status: CoreToolCallStatus.Success,
+          status: "success" /* Success */,
           request: {
             callId,
             name: fc.name,
@@ -14345,7 +14372,7 @@ ${event.value.description}`;
       });
       this.chat.recordCompletedToolCalls(this.context.config.getActiveModel(), [
         {
-          status: CoreToolCallStatus.Error,
+          status: "error" /* Error */,
           request: {
             callId,
             name: fc.name,
@@ -14460,12 +14487,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"
                   }
@@ -14490,8 +14517,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 {
@@ -14923,7 +14950,7 @@ var AcpSessionManager = class {
       mcpServers,
       loadedSettings
     );
-    const authType = loadedSettings.merged.security.auth.selectedType || AuthType.USE_GEMINI;
+    const authType = loadedSettings.merged.security.auth.selectedType || "gemini-api-key" /* USE_GEMINI */;
     let isAuthenticated = false;
     let authErrorMessage = "";
     try {
@@ -14935,7 +14962,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.";
       }
@@ -15145,12 +15172,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: {
@@ -15160,12 +15187,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: {
@@ -15338,7 +15365,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,
@@ -15534,10 +15561,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;
@@ -15720,13 +15747,69 @@ ${reason.stack}` : ""}`;
     }
   });
 }
-async function resolveSessionId(resumeArg, sessionIdArg) {
-  if (!resumeArg && !sessionIdArg) {
+async function resolveSessionId(resumeArg, sessionIdArg, sessionFileArg) {
+  if (!resumeArg && !sessionIdArg && !sessionFileArg) {
     return { sessionId: createSessionId() };
   }
   const storage = new Storage(process.cwd());
   await storage.initialize();
   const sessionSelector = new SessionSelector(storage);
+  if (sessionFileArg) {
+    try {
+      const sessionData = await loadConversationRecord(sessionFileArg);
+      if (!sessionData) {
+        throw new Error(`File not found or invalid format: ${sessionFileArg}`);
+      }
+      const now = Date.now();
+      const isoNow = new Date(now).toISOString();
+      sessionData.messages = (sessionData.messages || []).filter(
+        (m) => typeof m === "object" && m !== null && (m.type === "user" || m.type === "gemini") && m.content !== void 0
+      );
+      sessionData.messages.unshift({
+        id: `import-${now}`,
+        type: "info",
+        content: `Imported session from ${sessionFileArg}`,
+        timestamp: isoNow
+      });
+      const newSessionId = createSessionId();
+      sessionData.sessionId = newSessionId;
+      sessionData.projectHash = getProjectHash(storage.getProjectRoot());
+      sessionData.startTime = isoNow;
+      sessionData.lastUpdated = isoNow;
+      const chatsDir = path15.join(storage.getProjectTempDir(), "chats");
+      const newSessionPath = path15.join(
+        chatsDir,
+        `session-${now}-${newSessionId.slice(0, 8)}.jsonl`
+      );
+      const { messages: _messages, ...initialMetadata } = sessionData;
+      const lines = [JSON.stringify(initialMetadata)];
+      if (sessionData.messages) {
+        for (const msg of sessionData.messages) {
+          lines.push(JSON.stringify(msg));
+        }
+      }
+      await fsPromises.mkdir(chatsDir, { recursive: true });
+      await fsPromises.writeFile(
+        newSessionPath,
+        lines.join("\n") + "\n",
+        "utf-8"
+      );
+      return {
+        sessionId: newSessionId,
+        resumedSessionData: {
+          conversation: sessionData,
+          filePath: newSessionPath
+        }
+      };
+    } catch (error) {
+      coreEvents.emitFeedback(
+        "error",
+        `Error importing session from file: ${error instanceof Error ? error.message : "Unknown error"}`
+      );
+      await runExitCleanup();
+      process.exit(ExitCodes.FATAL_INPUT_ERROR);
+    }
+  }
   if (sessionIdArg) {
     if (await sessionSelector.sessionExists(sessionIdArg)) {
       coreEvents.emitFeedback(
@@ -15748,8 +15831,10 @@ async function resolveSessionId(resumeArg, sessionIdArg) {
     };
   } catch (error) {
     if (error instanceof SessionError && error.code === "NO_SESSIONS_FOUND") {
-      coreEvents.emitFeedback("warning", error.message);
-      return { sessionId: createSessionId() };
+      if (resumeArg === RESUME_LATEST) {
+        coreEvents.emitFeedback("warning", error.message);
+        return { sessionId: createSessionId() };
+      }
     }
     coreEvents.emitFeedback(
       "error",
@@ -15760,7 +15845,7 @@ async function resolveSessionId(resumeArg, sessionIdArg) {
   }
 }
 async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), resumedSessionData, initializationResult) {
-  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-37SKHAKX.js");
+  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-SME5QTEN.js");
   await doStartUI(
     config,
     settings,
@@ -15823,7 +15908,8 @@ async function main() {
   const argv = await argvPromise;
   const { sessionId, resumedSessionData } = await resolveSessionId(
     argv.resume,
-    argv.sessionId
+    argv.sessionId,
+    argv.sessionFile
   );
   if (argv.allowedTools && argv.allowedTools.length > 0 || settings.merged.tools?.allowed && settings.merged.tools.allowed.length > 0) {
     coreEvents.emitFeedback(
@@ -15862,12 +15948,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 */
       );
     }
   }
@@ -15967,7 +16053,7 @@ ${finalArgs[promptIndex + 1]}`;
     await config.storage.initialize();
     adminControlsListner.setConfig(config);
     if (config.isInteractive() && settings.merged.general.devtools) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-3XOQOECV.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-7KZDSYEF.js");
       setupInitialActivityLogger(config);
     }
     registerTelemetryConfig(config);
@@ -15975,7 +16061,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);
@@ -16026,7 +16112,7 @@ ${finalArgs[promptIndex + 1]}`;
     const initAppHandle = startupProfiler.start("initialize_app");
     const initializationResult = await initializeApp(config, settings);
     initAppHandle?.end();
-    import("./liteRtServerManager-OWTQEYE6.js").then(({ LiteRtServerManager }) => {
+    import("./liteRtServerManager-2QD4R3A3.js").then(({ LiteRtServerManager }) => {
       const mergedGemma = settings.merged.experimental?.gemmaModelRouter;
       if (!mergedGemma) return;
       const userGemma = settings.forScope("User" /* User */).settings.experimental?.gemmaModelRouter;
@@ -16036,7 +16122,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()) {
@@ -16052,7 +16138,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
@@ -16089,7 +16175,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);
@@ -16146,8 +16232,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 {
@@ -16155,8 +16241,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 {
@@ -16164,8 +16250,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");
     });
   }
@@ -16173,7 +16259,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 {