@google/gemini-cli 0.33.0-preview.2 → 0.33.0-preview.4

package/bundle/gemini.js

@@ -113281,7 +113281,7 @@ async function initOauthClient(authType, config2) {
     }
     await triggerPostAuthCallbacks(client.credentials);
   } else {
-    if (!config2.getExperimentalZedIntegration()) {
+    if (!config2.getAcpMode()) {
       const userConsent = await getConsentForOauth("");
       if (!userConsent) {
         throw new FatalCancellationError("Authentication cancelled by user.");
@@ -196293,8 +196293,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "59702f913";
-    CLI_VERSION = "0.33.0-preview.2";
+    GIT_COMMIT_INFO = "7e6e40c81";
+    CLI_VERSION = "0.33.0-preview.4";
   }
 });
 
@@ -292762,7 +292762,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname3);
-    return "0.33.0-preview.2";
+    return "0.33.0-preview.4";
   })();
   return versionPromise;
 }
@@ -294201,14 +294201,16 @@ function getAuthTypeFromEnv() {
   }
   return void 0;
 }
-async function createContentGeneratorConfig(config2, authType, apiKey) {
+async function createContentGeneratorConfig(config2, authType, apiKey, baseUrl, customHeaders) {
   const geminiApiKey = apiKey || process.env["GEMINI_API_KEY"] || await loadApiKey() || void 0;
   const googleApiKey = process.env["GOOGLE_API_KEY"] || void 0;
   const googleCloudProject = process.env["GOOGLE_CLOUD_PROJECT"] || process.env["GOOGLE_CLOUD_PROJECT_ID"] || void 0;
   const googleCloudLocation = process.env["GOOGLE_CLOUD_LOCATION"] || void 0;
   const contentGeneratorConfig = {
     authType,
-    proxy: config2?.getProxy()
+    proxy: config2?.getProxy(),
+    baseUrl,
+    customHeaders
   };
   if (authType === AuthType2.LOGIN_WITH_GOOGLE || authType === AuthType2.COMPUTE_ADC) {
     return contentGeneratorConfig;
@@ -294249,8 +294251,11 @@ async function createContentGenerator(config2, gcConfig, sessionId2) {
       const httpOptions = { headers: baseHeaders };
       return new LoggingContentGenerator(await createCodeAssistContentGenerator(httpOptions, config2.authType, gcConfig, sessionId2), gcConfig);
     }
-    if (config2.authType === AuthType2.USE_GEMINI || config2.authType === AuthType2.USE_VERTEX_AI) {
+    if (config2.authType === AuthType2.USE_GEMINI || config2.authType === AuthType2.USE_VERTEX_AI || config2.authType === AuthType2.GATEWAY) {
       let headers = { ...baseHeaders };
+      if (config2.customHeaders) {
+        headers = { ...headers, ...config2.customHeaders };
+      }
       if (gcConfig?.getUsageStatisticsEnabled()) {
         const installationManager2 = new InstallationManager();
         const installationId = installationManager2.getInstallationId();
@@ -294260,6 +294265,9 @@ async function createContentGenerator(config2, gcConfig, sessionId2) {
         };
       }
       const httpOptions = { headers };
+      if (config2.baseUrl) {
+        httpOptions.baseUrl = config2.baseUrl;
+      }
       const googleGenAI = new GoogleGenAI({
         apiKey: config2.apiKey === "" ? void 0 : config2.apiKey,
         vertexai: config2.vertexai,
@@ -294294,6 +294302,7 @@ var init_contentGenerator = __esm({
       AuthType3["USE_VERTEX_AI"] = "vertex-ai";
       AuthType3["LEGACY_CLOUD_SHELL"] = "cloud-shell";
       AuthType3["COMPUTE_ADC"] = "compute-default-credentials";
+      AuthType3["GATEWAY"] = "gateway";
     })(AuthType2 || (AuthType2 = {}));
   }
 });
@@ -433404,7 +433413,7 @@ var init_config4 = __esm({
         }
       }
       summarizeToolOutput;
-      experimentalZedIntegration = false;
+      acpMode = false;
       loadMemoryFromIncludeDirectories = false;
       includeDirectoryTree = true;
       importFormat;
@@ -433558,7 +433567,7 @@ var init_config4 = __esm({
           protectLatestTurn: params.toolOutputMasking?.protectLatestTurn ?? DEFAULT_PROTECT_LATEST_TURN
         };
         this.maxSessionTurns = params.maxSessionTurns ?? -1;
-        this.experimentalZedIntegration = params.experimentalZedIntegration ?? false;
+        this.acpMode = params.acpMode ?? false;
         this.listSessions = params.listSessions ?? false;
         this.deleteSession = params.deleteSession;
         this.listExtensions = params.listExtensions ?? false;
@@ -433736,7 +433745,7 @@ var init_config4 = __esm({
             }
           }
         });
-        if (!this.interactive || this.experimentalZedIntegration) {
+        if (!this.interactive || this.acpMode) {
           await this.mcpInitializationPromise;
         }
         if (this.skillsSupport) {
@@ -433764,7 +433773,7 @@ var init_config4 = __esm({
       getContentGenerator() {
         return this.contentGenerator;
       }
-      async refreshAuth(authMethod, apiKey) {
+      async refreshAuth(authMethod, apiKey, baseUrl, customHeaders) {
         this.modelAvailabilityService.reset();
         if (this.contentGeneratorConfig?.authType === AuthType2.USE_GEMINI && authMethod !== AuthType2.USE_GEMINI) {
           this.geminiClient.stripThoughtsFromHistory();
@@ -433773,7 +433782,7 @@ var init_config4 = __esm({
         if (this.contentGeneratorConfig) {
           this.contentGeneratorConfig.authType = void 0;
         }
-        const newContentGeneratorConfig = await createContentGeneratorConfig(this, authMethod, apiKey);
+        const newContentGeneratorConfig = await createContentGeneratorConfig(this, authMethod, apiKey, baseUrl, customHeaders);
         this.contentGenerator = await createContentGenerator(newContentGeneratorConfig, this, this.getSessionId());
         this.contentGeneratorConfig = newContentGeneratorConfig;
         this.baseLlmClient = new BaseLlmClient(this.contentGenerator, this);
@@ -434454,8 +434463,8 @@ var init_config4 = __esm({
       getUsageStatisticsEnabled() {
         return this.usageStatisticsEnabled;
       }
-      getExperimentalZedIntegration() {
-        return this.experimentalZedIntegration;
+      getAcpMode() {
+        return this.acpMode;
       }
       async waitForMcpInit() {
         if (this.mcpInitializationPromise) {
@@ -515083,7 +515092,7 @@ var WarningMessage = ({ text }) => {
 };
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO2 = "393e9a171";
+var GIT_COMMIT_INFO2 = "c316fc6c5";
 
 // packages/cli/src/ui/components/AboutBox.tsx
 init_dist8();
@@ -563500,7 +563509,7 @@ async function loadSandboxConfig(settings, argv) {
   const sandboxOption = argv.sandbox ?? settings.tools?.sandbox;
   const command2 = getSandboxCommand(sandboxOption);
   const packageJson2 = await getPackageJson(__dirname13);
-  const image2 = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.33.0-preview.2" ?? packageJson2?.config?.sandboxImageUri;
+  const image2 = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.33.0-preview.4" ?? packageJson2?.config?.sandboxImageUri;
   return command2 && image2 ? { command: command2, image: image2 } : void 0;
 }
 
@@ -563641,9 +563650,12 @@ async function parseArguments2(settings) {
           (p) => p.split(",").map((s4) => s4.trim()).filter(Boolean)
         )
       )
-    }).option("experimental-acp", {
+    }).option("acp", {
       type: "boolean",
       description: "Starts the agent in ACP mode"
+    }).option("experimental-acp", {
+      type: "boolean",
+      description: "Starts the agent in ACP mode (deprecated, use --acp instead)"
     }).option("allowed-mcp-server-names", {
       type: "array",
       string: true,
@@ -563951,7 +563963,7 @@ async function loadCliConfig(settings, sessionId2, argv, options = {}) {
     }
     throw err2;
   }
-  const interactive = !!argv.promptInteractive || !!argv.experimentalAcp || !isHeadlessMode({ prompt: argv.prompt, query: argv.query }) && !argv.isCommand;
+  const interactive = !!argv.promptInteractive || !!argv.acp || !!argv.experimentalAcp || !isHeadlessMode({ prompt: argv.prompt, query: argv.query }) && !argv.isCommand;
   const allowedTools = argv.allowedTools || settings.tools?.allowed || [];
   const allowedToolsSet = new Set(allowedTools);
   const extraExcludes = [];
@@ -564036,6 +564048,7 @@ async function loadCliConfig(settings, sessionId2, argv, options = {}) {
     }
   }
   return new Config({
+    acpMode: !!argv.acp || !!argv.experimentalAcp,
     sessionId: sessionId2,
     clientVersion: await getVersion(),
     embeddingModel: DEFAULT_GEMINI_EMBEDDING_MODEL,
@@ -564084,7 +564097,6 @@ async function loadCliConfig(settings, sessionId2, argv, options = {}) {
     bugCommand: settings.advanced?.bugCommand,
     model: resolvedModel,
     maxSessionTurns: settings.model?.maxSessionTurns,
-    experimentalZedIntegration: argv.experimentalAcp || false,
     listExtensions: argv.listExtensions || false,
     listSessions: argv.listSessions || false,
     deleteSession: argv.deleteSession,
@@ -565645,7 +565657,7 @@ async function runNonInteractive({
 // packages/cli/src/gemini.tsx
 init_dist8();
 
-// packages/cli/src/zed-integration/zedIntegration.ts
+// packages/cli/src/acp/acpClient.ts
 init_dist8();
 
 // node_modules/@agentclientprotocol/sdk/dist/acp.js
@@ -567054,7 +567066,7 @@ var RequestError3 = class _RequestError extends Error {
   }
 };
 
-// packages/cli/src/zed-integration/fileSystemService.ts
+// packages/cli/src/acp/fileSystemService.ts
 var AcpFileSystemService = class {
   constructor(connection, sessionId2, capabilities, fallback) {
     this.connection = connection;
@@ -567084,7 +567096,7 @@ var AcpFileSystemService = class {
   }
 };
 
-// packages/cli/src/zed-integration/acpErrors.ts
+// packages/cli/src/acp/acpErrors.ts
 init_dist8();
 function getAcpErrorMessage(error40) {
   const coreMessage = getErrorMessage(error40);
@@ -567105,14 +567117,14 @@ function extractRecursiveMessage(input) {
   return input;
 }
 
-// packages/cli/src/zed-integration/zedIntegration.ts
+// packages/cli/src/acp/acpClient.ts
 import { Readable as Readable7, Writable as Writable5 } from "node:stream";
 init_zod();
 import * as fs130 from "node:fs/promises";
 import * as path151 from "node:path";
 import { randomUUID as randomUUID13 } from "node:crypto";
 
-// packages/cli/src/zed-integration/commands/commandRegistry.ts
+// packages/cli/src/acp/commands/commandRegistry.ts
 init_dist8();
 var CommandRegistry = class {
   commands = /* @__PURE__ */ new Map();
@@ -567134,7 +567146,7 @@ var CommandRegistry = class {
   }
 };
 
-// packages/cli/src/zed-integration/commands/memory.ts
+// packages/cli/src/acp/commands/memory.ts
 init_dist8();
 var DEFAULT_SANITIZATION_CONFIG = {
   allowedEnvironmentVariables: [],
@@ -567212,7 +567224,7 @@ var AddMemoryCommand = class {
   }
 };
 
-// packages/cli/src/zed-integration/commands/extensions.ts
+// packages/cli/src/acp/commands/extensions.ts
 init_dist8();
 import { stat as stat13 } from "node:fs/promises";
 var ExtensionsCommand = class {
@@ -567530,7 +567542,7 @@ var UpdateExtensionCommand = class {
   }
 };
 
-// packages/cli/src/zed-integration/commands/init.ts
+// packages/cli/src/acp/commands/init.ts
 init_dist8();
 import * as fs128 from "node:fs";
 import * as path149 from "node:path";
@@ -567574,7 +567586,7 @@ ${result2.content}`
   }
 };
 
-// packages/cli/src/zed-integration/commands/restore.ts
+// packages/cli/src/acp/commands/restore.ts
 init_dist8();
 import * as fs129 from "node:fs/promises";
 import * as path150 from "node:path";
@@ -567701,7 +567713,7 @@ ${formatted}`
   }
 };
 
-// packages/cli/src/zed-integration/commandHandler.ts
+// packages/cli/src/acp/commandHandler.ts
 var CommandHandler = class _CommandHandler {
   registry;
   constructor() {
@@ -567786,11 +567798,11 @@ var CommandHandler = class _CommandHandler {
   }
 };
 
-// packages/cli/src/zed-integration/zedIntegration.ts
+// packages/cli/src/acp/acpClient.ts
 function hasMeta(obj) {
   return typeof obj === "object" && obj !== null && "_meta" in obj;
 }
-async function runZedIntegration(config2, settings, argv) {
+async function runAcpClient(config2, settings, argv) {
   const { stdout: workingStdout } = createWorkingStdio();
   const stdout = Writable5.toWeb(workingStdout);
   const stdin = Readable7.toWeb(process.stdin);
@@ -567811,6 +567823,8 @@ var GeminiAgent = class {
   sessions = /* @__PURE__ */ new Map();
   clientCapabilities;
   apiKey;
+  baseUrl;
+  customHeaders;
   async initialize(args2) {
     this.clientCapabilities = args2.clientCapabilities;
     const authMethods = [
@@ -567833,6 +567847,17 @@ var GeminiAgent = class {
         id: AuthType2.USE_VERTEX_AI,
         name: "Vertex AI",
         description: "Use an API key with Vertex AI GenAI API"
+      },
+      {
+        id: AuthType2.GATEWAY,
+        name: "AI API Gateway",
+        description: "Use a custom AI API Gateway",
+        _meta: {
+          gateway: {
+            protocol: "google",
+            restartRequired: "false"
+          }
+        }
       }
     ];
     await this.config.initialize();
@@ -567872,7 +567897,32 @@ var GeminiAgent = class {
       if (apiKey) {
         this.apiKey = apiKey;
       }
-      await this.config.refreshAuth(method, apiKey ?? this.apiKey);
+      const gatewaySchema = external_exports.object({
+        baseUrl: external_exports.string().optional(),
+        headers: external_exports.record(external_exports.string()).optional()
+      });
+      let baseUrl;
+      let headers;
+      if (meta?.["gateway"]) {
+        const result2 = gatewaySchema.safeParse(meta["gateway"]);
+        if (result2.success) {
+          baseUrl = result2.data.baseUrl;
+          headers = result2.data.headers;
+        } else {
+          throw new RequestError3(
+            -32602,
+            `Malformed gateway payload: ${result2.error.message}`
+          );
+        }
+      }
+      this.baseUrl = baseUrl;
+      this.customHeaders = headers;
+      await this.config.refreshAuth(
+        method,
+        apiKey ?? this.apiKey,
+        baseUrl,
+        headers
+      );
     } catch (e3) {
       throw new RequestError3(-32e3, getAcpErrorMessage(e3));
     }
@@ -567898,7 +567948,12 @@ var GeminiAgent = class {
     let isAuthenticated = false;
     let authErrorMessage = "";
     try {
-      await config2.refreshAuth(authType, this.apiKey);
+      await config2.refreshAuth(
+        authType,
+        this.apiKey,
+        this.baseUrl,
+        this.customHeaders
+      );
       isAuthenticated = true;
       const contentGeneratorConfig = config2.getContentGeneratorConfig();
       if (authType === AuthType2.USE_GEMINI && (!contentGeneratorConfig || !contentGeneratorConfig.apiKey)) {
@@ -568022,7 +568077,12 @@ var GeminiAgent = class {
     }
     const config2 = await this.newSessionConfig(sessionId2, cwd7, mcpServers);
     try {
-      await config2.refreshAuth(selectedAuthType, this.apiKey);
+      await config2.refreshAuth(
+        selectedAuthType,
+        this.apiKey,
+        this.baseUrl,
+        this.customHeaders
+      );
     } catch (e3) {
       debugLogger.error(`Authentication failed: ${e3}`);
       throw RequestError3.authRequired();
@@ -569631,8 +569691,8 @@ ${finalArgs[promptIndex + 1]}`;
     if (settings.merged.security.auth.selectedType === AuthType2.LOGIN_WITH_GOOGLE && config2.isBrowserLaunchSuppressed()) {
       await getOauthClient(settings.merged.security.auth.selectedType, config2);
     }
-    if (config2.getExperimentalZedIntegration()) {
-      return runZedIntegration(config2, settings, argv);
+    if (config2.getAcpMode()) {
+      return runAcpClient(config2, settings, argv);
     }
     let input = config2.getQuestion();
     const useAlternateBuffer2 = shouldEnterAlternateScreen(

package/bundle/node_modules/@google/gemini-cli-devtools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli-devtools",
-  "version": "0.33.0-preview.2",
+  "version": "0.33.0-preview.4",
   "license": "Apache-2.0",
   "type": "module",
   "main": "dist/src/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.33.0-preview.2",
+  "version": "0.33.0-preview.4",
   "description": "Gemini CLI",
   "license": "Apache-2.0",
   "repository": {