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

package/bundle/{gemini-MWN2MSYV.js → gemini-JKWQQTKP.js}

@@ -41,18 +41,18 @@ import {
   updateAllUpdatableExtensions,
   updateExtension,
   validateAuthMethod
-} from "./chunk-LHVIO4J4.js";
+} from "./chunk-LFGJVOVZ.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
 import {
   startCommand,
   startServer
-} from "./chunk-THNM4JU6.js";
+} from "./chunk-PSWUV2OO.js";
 import {
   exitCli,
   require_source
-} from "./chunk-OFOKTVUH.js";
+} from "./chunk-JENIU3E3.js";
 import {
   DEFAULT_PORT,
   GEMMA_MODEL_NAME,
@@ -86,11 +86,11 @@ import {
   readServerProcessInfo,
   resolveGemmaConfig,
   saveModelChange
-} from "./chunk-ZDP2ZWKG.js";
+} from "./chunk-UIG2IVPJ.js";
 import {
   RELAUNCH_EXIT_CODE
-} from "./chunk-FIIOJPLW.js";
-import "./chunk-4NXNVHPO.js";
+} from "./chunk-MXKXLNQD.js";
+import "./chunk-WQOLTO3C.js";
 import {
   cleanupCheckpoints,
   registerCleanup,
@@ -99,7 +99,7 @@ import {
   runExitCleanup,
   runSyncCleanup,
   setupSignalHandlers
-} from "./chunk-AAU5XCLJ.js";
+} from "./chunk-HQXINMBL.js";
 import {
   AuthType,
   ChatRecordingService,
@@ -176,6 +176,7 @@ import {
   listInboxPatches,
   listInboxSkills,
   listMemoryFiles,
+  loadConversationRecord,
   logToolCall,
   logUserPrompt,
   parseAndFormatApiError,
@@ -199,7 +200,7 @@ import {
   updatePolicy,
   writeToStderr,
   writeToStdout
-} from "./chunk-77HSANAH.js";
+} from "./chunk-SAISHGWW.js";
 import {
   ASK_USER_TOOL_NAME,
   ApprovalMode,
@@ -241,13 +242,14 @@ import {
   getDisplayString,
   getErrorMessage,
   getErrorType,
+  getProjectHash,
   homedir,
   isFatalToolError,
   isNodeError,
   loadServerHierarchicalMemory,
   resolveToRealPath,
   setGeminiMdFilename
-} from "./chunk-JEW7ZIWE.js";
+} from "./chunk-UJ26GAE5.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-RJTRUG2J.js";
 import "./chunk-IUUIT4SU.js";
@@ -1532,11 +1534,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");
     }
@@ -5447,12 +5449,16 @@ async function getServerStatus(serverName, server, isTrusted, activeSettings) {
     }
     return MCPServerStatus.DISABLED;
   }
+  if (!isTrusted) {
+    return MCPServerStatus.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 +5473,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];
@@ -6306,27 +6319,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 +6614,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 +6644,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 +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.42.0-preview.1" ?? customImage ?? packageJson?.config?.sandboxImageUri;
+  const image = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.43.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;
 }
@@ -7994,8 +8007,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 +8144,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,
@@ -8610,7 +8632,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 +8795,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 +9257,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(
@@ -10229,7 +10247,7 @@ async function runNonInteractive({
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-KTUMQHXG.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-FYTOIC37.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -10684,6 +10702,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 +10718,7 @@ async function runNonInteractive2(params) {
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-KTUMQHXG.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-FYTOIC37.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -10931,6 +10952,20 @@ async function runNonInteractive2(params) {
                   durationMs
                 )
               });
+            } else if (config.getOutputFormat() === OutputFormat.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) {
@@ -14193,12 +14228,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 +14242,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(
@@ -14261,6 +14296,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,
@@ -15720,13 +15761,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 +15845,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 +15859,7 @@ async function resolveSessionId(resumeArg, sessionIdArg) {
   }
 }
 async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), resumedSessionData, initializationResult) {
-  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-VX6GBWOV.js");
+  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-36WZS6KT.js");
   await doStartUI(
     config,
     settings,
@@ -15823,7 +15922,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(
@@ -15967,7 +16067,7 @@ ${finalArgs[promptIndex + 1]}`;
     await config.storage.initialize();
     adminControlsListner.setConfig(config);
     if (config.isInteractive() && settings.merged.general.devtools) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-KTUMQHXG.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-FYTOIC37.js");
       setupInitialActivityLogger(config);
     }
     registerTelemetryConfig(config);
@@ -16026,7 +16126,7 @@ ${finalArgs[promptIndex + 1]}`;
     const initAppHandle = startupProfiler.start("initialize_app");
     const initializationResult = await initializeApp(config, settings);
     initAppHandle?.end();
-    import("./liteRtServerManager-CDLVKT7N.js").then(({ LiteRtServerManager }) => {
+    import("./liteRtServerManager-N6OMT6W5.js").then(({ LiteRtServerManager }) => {
       const mergedGemma = settings.merged.experimental?.gemmaModelRouter;
       if (!mergedGemma) return;
       const userGemma = settings.forScope("User" /* User */).settings.experimental?.gemmaModelRouter;