@google/gemini-cli 0.67.0-preview.0 → 0.68.0-preview.0

package/bundle/{gemini-5DCBUXWG.js → gemini-YFCTZ76S.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   startCommand,
   startServer
-} from "./chunk-JLA2J5MI.js";
+} from "./chunk-Q76ZDILI.js";
 import {
   BuiltinCommandLoader,
   CommandService,
@@ -45,11 +45,11 @@ import {
   updateExtension,
   validateAuthMethod,
   validateContextFilePath
-} from "./chunk-GTLUHCZL.js";
+} from "./chunk-B2FKXXUH.js";
 import {
   exitCli,
   require_source
-} from "./chunk-R6BM7NWC.js";
+} from "./chunk-JMHCFAD6.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
@@ -89,12 +89,12 @@ import {
   saveModelChange,
   setAmbiguousCharactersWide,
   stripAnsi
-} from "./chunk-VIWQUHCM.js";
+} from "./chunk-HRM7UWGB.js";
 import {
   RELAUNCH_EXIT_CODE,
   require_semver
-} from "./chunk-IQFMOPBP.js";
-import "./chunk-QPO46AOD.js";
+} from "./chunk-CXMHAFLN.js";
+import "./chunk-VBHMFLBY.js";
 import {
   cleanupCheckpoints,
   registerCleanup,
@@ -103,7 +103,7 @@ import {
   runExitCleanup,
   runSyncCleanup,
   setupSignalHandlers
-} from "./chunk-GI2BMP6K.js";
+} from "./chunk-RD2EMHV2.js";
 import {
   ASK_USER_TOOL_NAME,
   AjvJsonSchemaValidator,
@@ -273,7 +273,7 @@ import {
   updatePolicy,
   writeToStderr,
   writeToStdout
-} from "./chunk-EAO5GUJT.js";
+} from "./chunk-RCF66HCI.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-IUUIT4SU.js";
 import "./chunk-L6PII3GR.js";
@@ -6496,6 +6496,57 @@ async function validateExtension(args) {
       `Warning: Version '${extensionConfig.version}' does not appear to be standard semver (e.g., 1.0.0).`
     );
   }
+  if (extensionConfig.mcpServers) {
+    if (typeof extensionConfig.mcpServers !== "object" || extensionConfig.mcpServers === null || Array.isArray(extensionConfig.mcpServers)) {
+      errors.push('The "mcpServers" field must be an object.');
+    } else {
+      for (const [serverName, serverConfig] of Object.entries(
+        extensionConfig.mcpServers
+      )) {
+        if (typeof serverConfig !== "object" || serverConfig === null || Array.isArray(serverConfig)) {
+          errors.push(
+            `MCP server configuration for "${serverName}" must be an object.`
+          );
+          continue;
+        }
+        const hasCommand = typeof serverConfig.command === "string" && serverConfig.command.trim().length > 0;
+        const hasUrl = typeof serverConfig.url === "string" && serverConfig.url.trim().length > 0;
+        const hasHttpUrl = typeof serverConfig.httpUrl === "string" && serverConfig.httpUrl.trim().length > 0;
+        const hasTcp = typeof serverConfig.tcp === "string" && serverConfig.tcp.trim().length > 0 || typeof serverConfig.tcp === "number";
+        if (!hasCommand && !hasUrl && !hasHttpUrl && !hasTcp) {
+          errors.push(
+            `MCP server "${serverName}" must specify a transport (e.g., "command", "url", or "httpUrl").`
+          );
+        }
+        if (hasHttpUrl) {
+          warnings.push(
+            `MCP server "${serverName}" uses deprecated "httpUrl". Consider using "url" with "type": "http" instead.`
+          );
+        }
+        const errorPrefix = `MCP server "${serverName}" specifies an invalid `;
+        if (hasUrl && serverConfig.url) {
+          const hasPlaceholder = serverConfig.url.includes("$");
+          if (!hasPlaceholder) {
+            try {
+              new URL(serverConfig.url);
+            } catch {
+              errors.push(`${errorPrefix}URL: "${serverConfig.url}".`);
+            }
+          }
+        }
+        if (hasHttpUrl && serverConfig.httpUrl) {
+          const hasPlaceholder = serverConfig.httpUrl.includes("$");
+          if (!hasPlaceholder) {
+            try {
+              new URL(serverConfig.httpUrl);
+            } catch {
+              errors.push(`${errorPrefix}httpUrl: "${serverConfig.httpUrl}".`);
+            }
+          }
+        }
+      }
+    }
+  }
   if (warnings.length > 0) {
     debugLogger.warn("Validation warnings:");
     for (const warning of warnings) {
@@ -6940,8 +6991,10 @@ var EVENT_MAPPING = {
   PostToolUse: "AfterTool",
   UserPromptSubmit: "BeforeAgent",
   Stop: "AfterAgent",
-  SubAgentStop: "AfterAgent",
+  SubagentStop: "AfterAgent",
   // Gemini doesn't have sub-agents, map to AfterAgent
+  SubAgentStop: "AfterAgent",
+  // Fallback for alternate casing
   SessionStart: "SessionStart",
   SessionEnd: "SessionEnd",
   PreCompact: "PreCompress",
@@ -7029,7 +7082,10 @@ function migrateClaudeHooks(claudeConfig) {
       }
       return migratedDef;
     });
-    geminiHooks[geminiEventName] = migratedDefinitions;
+    geminiHooks[geminiEventName] = [
+      ...geminiHooks[geminiEventName] || [],
+      ...migratedDefinitions
+    ];
   }
   return geminiHooks;
 }
@@ -11376,6 +11432,45 @@ function isRecord3(value) {
 }
 var execAsync = promisify(exec);
 var execFileAsync = promisify(execFile);
+var PODMAN_INFO_TIMEOUT_MS = 5e3;
+async function isPodmanRootless() {
+  const formats = [
+    "{{.Host.Security.Rootless}}",
+    "{{.Host.ServiceIsRootless}}"
+  ];
+  for (const format3 of formats) {
+    try {
+      const { stdout } = await execFileAsync(
+        "podman",
+        ["info", "--format", format3],
+        {
+          encoding: "utf-8",
+          timeout: PODMAN_INFO_TIMEOUT_MS,
+          killSignal: "SIGKILL"
+        }
+      );
+      const trimmed = String(stdout ?? "").trim().toLowerCase();
+      if (trimmed === "true") {
+        return true;
+      }
+      if (trimmed === "false") {
+        return false;
+      }
+    } catch (err) {
+      const isMissingBinary = isNodeError(err) && err.code === "ENOENT";
+      const timedOut = isRecord3(err) && err["killed"] === true;
+      if (isMissingBinary || timedOut) {
+        break;
+      }
+    }
+  }
+  return false;
+}
+function hasUsernsFlag(flags) {
+  return flags.some(
+    (flag) => flag === "--userns" || flag.startsWith("--userns=")
+  );
+}
 async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
   const patcher = new ConsolePatcher({
     debugMode: cliConfig?.getDebugMode() || !!process.env["DEBUG"],
@@ -11714,12 +11809,10 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
     if (config.command === "runsc") {
       args.push("--runtime=runsc");
     }
-    if (process.env["SANDBOX_FLAGS"]) {
-      const flags = (0, import_shell_quote2.parse)(process.env["SANDBOX_FLAGS"], process.env).filter(
-        (f) => typeof f === "string"
-      );
-      args.push(...flags);
-    }
+    const customFlags = process.env["SANDBOX_FLAGS"] ? (0, import_shell_quote2.parse)(process.env["SANDBOX_FLAGS"], process.env).filter(
+      (f) => typeof f === "string"
+    ) : [];
+    args.push(...customFlags);
     if (process.stdin.isTTY) {
       args.push("-t");
     }
@@ -12032,6 +12125,9 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
       userFlag = "--user root";
     } else if (await shouldUseCurrentUserInSandbox()) {
       args.push("--user", "root");
+      if (command2 === "podman" && !hasUsernsFlag(customFlags) && await isPodmanRootless()) {
+        args.push("--userns=keep-id");
+      }
       const uid = (await execAsync("id -u")).stdout.trim();
       const gid = (await execAsync("id -g")).stdout.trim();
       const username = "gemini";
@@ -12936,7 +13032,7 @@ async function runNonInteractive({
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-WR3IFLZC.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-EWNQDTC7.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -13464,7 +13560,7 @@ async function runNonInteractive2(params) {
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-WR3IFLZC.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-EWNQDTC7.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -17714,9 +17810,11 @@ var AcpSessionManager = class {
           currentModelId
         }
       };
-      session.streamHistory(messages).catch((err) => {
+      try {
+        await session.streamHistory(messages);
+      } catch (err) {
         debugLogger.error(`Error streaming history: ${err}`);
-      });
+      }
       setTimeout(() => {
         session?.sendAvailableCommands().catch((err) => {
           debugLogger.error(`Error sending available commands: ${err}`);
@@ -18625,7 +18723,7 @@ async function resolveSessionId(resumeArg, sessionIdArg, sessionFileArg) {
   }
 }
 async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), resumedSessionData, initializationResult) {
-  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-63JD5B2Z.js");
+  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-X54KN2EM.js");
   await doStartUI(
     config,
     settings,
@@ -18850,7 +18948,7 @@ ${finalArgs[promptIndex + 1]}`;
     await config.storage.initialize();
     adminControlsListner.setConfig(config);
     if (config.isInteractive() && settings.merged.general.devtools) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-WR3IFLZC.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-EWNQDTC7.js");
       setupInitialActivityLogger(config);
     }
     registerTelemetryConfig(config);
@@ -18909,7 +19007,7 @@ ${finalArgs[promptIndex + 1]}`;
     const initAppHandle = startupProfiler.start("initialize_app");
     const initializationResult = await initializeApp(config, settings);
     initAppHandle?.end();
-    import("./liteRtServerManager-QHOOPEJV.js").then(({ LiteRtServerManager }) => {
+    import("./liteRtServerManager-FLPMMDNM.js").then(({ LiteRtServerManager }) => {
       const mergedGemma = settings.merged.experimental?.gemmaModelRouter;
       if (!mergedGemma) return;
       const userGemma = settings.forScope("User" /* User */).settings.experimental?.gemmaModelRouter;

package/bundle/gemini.js

@@ -6,10 +6,10 @@ import {
   getSpawnConfig,
   handleChildProcessClose,
   setupSignalForwarding
-} from "./chunk-6HF2HP2S.js";
-import "./chunk-4HG5TEPY.js";
-import "./chunk-THOV46FY.js";
-import "./chunk-5FYAQBC3.js";
+} from "./chunk-KKKD4FID.js";
+import "./chunk-44PCK4QK.js";
+import "./chunk-WEP47ZZU.js";
+import "./chunk-L57AYV6U.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-IUUIT4SU.js";
 import "./chunk-L6PII3GR.js";
@@ -106,9 +106,9 @@ ${error instanceof Error ? error.stack ?? error.message : String(error)}
       }
     }
   } else {
-    const { main } = await import("./gemini-K3EMSEQ5.js");
-    const { FatalError, writeToStderr } = await import("./dist-XT4ZXTSC.js");
-    const { runExitCleanup } = await import("./cleanup-R3QZGL6L.js");
+    const { main } = await import("./gemini-2P73372G.js");
+    const { FatalError, writeToStderr } = await import("./dist-OYZDNSTI.js");
+    const { runExitCleanup } = await import("./cleanup-CCR2EOHA.js");
     main().catch(async (error) => {
       const cleanupTimeout = setTimeout(() => {
         writeToStderr("Cleanup timed out, forcing exit...\n");