@google/gemini-cli 0.52.0-nightly.20260723.g9681621c6 → 0.52.0

package/bundle/{chunk-3XOIA5WR.js → chunk-24R3JJRB.js}

@@ -1,7 +1,7 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   runExitCleanup
-} from "./chunk-KDCDG5VZ.js";
+} from "./chunk-Y5NBDPUP.js";
 import {
   __commonJS,
   __require

package/bundle/{chunk-UEI42N7R.js → chunk-6Z2GQGII.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-4OVORMGE.js";
+} from "./chunk-24R3JJRB.js";
 import {
   DEFAULT_PORT,
   SERVER_START_WAIT_MS,
@@ -14,10 +14,10 @@ import {
   isServerRunning,
   resolveGemmaConfig,
   writeServerProcessInfo
-} from "./chunk-IODN6H35.js";
+} from "./chunk-ZINRZXUN.js";
 import {
   debugLogger
-} from "./chunk-27C6XFMY.js";
+} from "./chunk-7LQRUKPT.js";
 import {
   __toESM
 } from "./chunk-34MYV7JD.js";

package/bundle/{chunk-GJXPH6YT.js → chunk-7LQRUKPT.js}

@@ -278401,85 +278401,66 @@ var oauthClientPromises = /* @__PURE__ */ new Map();
 function getUseEncryptedStorageFlag() {
   return process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] === "true";
 }
-function isAdcCredentials(credentials3) {
-  if (credentials3 && typeof credentials3 === "object" && "type" in credentials3) {
-    const type2 = credentials3.type;
-    return typeof type2 === "string" && type2 !== "authorized_user";
-  }
-  return false;
-}
 async function initOauthClient(authType, config2) {
-  function createBaseOAuth2Client() {
-    const client2 = new import_google_auth_library3.OAuth2Client({
-      clientId: OAUTH_CLIENT_ID,
-      clientSecret: OAUTH_CLIENT_SECRET,
-      transporterOptions: {
-        proxy: config2.getProxy()
-      }
+  const credentials3 = await fetchCachedCredentials();
+  if (credentials3 && typeof credentials3 === "object" && "type" in credentials3 && (credentials3.type === "external_account_authorized_user" || credentials3.type === "service_account")) {
+    const auth2 = new import_google_auth_library3.GoogleAuth({
+      scopes: OAUTH_SCOPE
     });
-    const useEncryptedStorage = getUseEncryptedStorageFlag();
-    client2.on("tokens", async (tokens) => {
-      if (useEncryptedStorage) {
-        await OAuthCredentialStorage.saveCredentials(tokens);
-      } else {
-        await cacheCredentials(tokens);
-      }
-      await triggerPostAuthCallbacks(tokens);
+    const byoidClient = auth2.fromJSON({
+      ...credentials3,
+      refresh_token: credentials3.refresh_token ?? void 0
     });
-    return client2;
+    const token2 = await byoidClient.getAccessToken();
+    if (token2) {
+      debugLogger.debug(`Created ${credentials3.type} auth client.`);
+      return byoidClient;
+    }
   }
+  const client = new import_google_auth_library3.OAuth2Client({
+    clientId: OAUTH_CLIENT_ID,
+    clientSecret: OAUTH_CLIENT_SECRET,
+    transporterOptions: {
+      proxy: config2.getProxy()
+    }
+  });
+  const useEncryptedStorage = getUseEncryptedStorageFlag();
   if (process.env["GOOGLE_GENAI_USE_GCA"] && process.env["GOOGLE_CLOUD_ACCESS_TOKEN"]) {
-    const client2 = createBaseOAuth2Client();
-    client2.setCredentials({
+    client.setCredentials({
       access_token: process.env["GOOGLE_CLOUD_ACCESS_TOKEN"]
     });
-    await fetchAndCacheUserInfo(client2);
-    return client2;
+    await fetchAndCacheUserInfo(client);
+    return client;
   }
-  const credentialsList = await fetchCachedCredentialsList();
-  for (const credentials3 of credentialsList) {
-    if (isAdcCredentials(credentials3)) {
-      try {
-        const auth2 = new import_google_auth_library3.GoogleAuth({
-          scopes: OAUTH_SCOPE
-        });
-        const adcClient = auth2.fromJSON({
-          ...credentials3,
-          refresh_token: credentials3.refresh_token ?? void 0
-        });
-        const response = await adcClient.getAccessToken();
-        const token2 = response.token ?? null;
-        if (token2) {
-          debugLogger.debug("Created " + credentials3.type + " auth client.");
-          return adcClient;
-        }
-      } catch (error40) {
-        debugLogger.debug("ADC credentials verification failed:", getErrorMessage(error40));
-      }
-    } else if (credentials3) {
-      const client2 = createBaseOAuth2Client();
-      client2.setCredentials(credentials3);
-      try {
-        const { token: token2 } = await client2.getAccessToken();
-        if (token2) {
-          await client2.getTokenInfo(token2);
-          if (!userAccountManager2.getCachedGoogleAccount()) {
-            try {
-              await fetchAndCacheUserInfo(client2);
-            } catch (error40) {
-              debugLogger.warn("Failed to fetch user info:", getErrorMessage(error40));
-            }
+  client.on("tokens", async (tokens) => {
+    if (useEncryptedStorage) {
+      await OAuthCredentialStorage.saveCredentials(tokens);
+    } else {
+      await cacheCredentials(tokens);
+    }
+    await triggerPostAuthCallbacks(tokens);
+  });
+  if (credentials3) {
+    client.setCredentials(credentials3);
+    try {
+      const { token: token2 } = await client.getAccessToken();
+      if (token2) {
+        await client.getTokenInfo(token2);
+        if (!userAccountManager2.getCachedGoogleAccount()) {
+          try {
+            await fetchAndCacheUserInfo(client);
+          } catch (error40) {
+            debugLogger.warn("Failed to fetch user info:", getErrorMessage(error40));
           }
-          debugLogger.log("Loaded cached credentials.");
-          await triggerPostAuthCallbacks(client2.credentials || credentials3);
-          return client2;
         }
-      } catch (error40) {
-        debugLogger.debug("Cached credentials are not valid:", getErrorMessage(error40));
+        debugLogger.log("Loaded cached credentials.");
+        await triggerPostAuthCallbacks(credentials3);
+        return client;
       }
+    } catch (error40) {
+      debugLogger.debug(`Cached credentials are not valid:`, getErrorMessage(error40));
     }
   }
-  const client = createBaseOAuth2Client();
   if (authType === AuthType2.COMPUTE_ADC) {
     try {
       debugLogger.log("Attempting to authenticate via metadata server application default credentials.");
@@ -278788,21 +278769,13 @@ function getAvailablePort() {
     }
   });
 }
-async function fetchCachedCredentialsList() {
-  const credentialsList = [];
+async function fetchCachedCredentials() {
   const useEncryptedStorage = getUseEncryptedStorageFlag();
   if (useEncryptedStorage) {
-    try {
-      const creds = await OAuthCredentialStorage.loadCredentials();
-      if (creds) {
-        credentialsList.push(creds);
-      }
-    } catch (error40) {
-      debugLogger.debug("Failed to load credentials from encrypted storage:", error40);
-    }
+    return OAuthCredentialStorage.loadCredentials();
   }
   const pathsToTry = [
-    ...!useEncryptedStorage ? [Storage.getOAuthCredsPath()] : [],
+    Storage.getOAuthCredsPath(),
     process.env["GOOGLE_APPLICATION_CREDENTIALS"]
   ].filter((p) => !!p);
   for (const keyFile of pathsToTry) {
@@ -278811,15 +278784,14 @@ async function fetchCachedCredentialsList() {
       const parsed = JSON.parse(keyFileString);
       const isOAuthCreds = (val) => typeof val === "object" && val !== null;
       if (isOAuthCreds(parsed)) {
-        credentialsList.push(parsed);
-      } else {
-        throw new Error("Invalid credentials format");
+        return parsed;
       }
+      throw new Error("Invalid credentials format");
     } catch (error40) {
       debugLogger.debug(`Failed to load credentials from ${keyFile}:`, getErrorMessage(error40));
     }
   }
-  return credentialsList;
+  return null;
 }
 function clearOauthClientCache() {
   oauthClientPromises.clear();
@@ -282493,8 +282465,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "9681621c6";
-var CLI_VERSION = "0.52.0-nightly.20260715.gfa975395b";
+var GIT_COMMIT_INFO = "5de3b24af";
+var CLI_VERSION = "0.52.0";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -289987,10 +289959,6 @@ function getDiffCommand(oldPath, newPath, editor) {
   }
 }
 async function openDiff(oldPath, newPath, editor) {
-  if (isHeadlessMode()) {
-    debugLogger.warn("External editor spawning is disabled in headless/server mode.");
-    return;
-  }
   const diffCommand = getDiffCommand(oldPath, newPath, editor);
   if (!diffCommand) {
     debugLogger.error("No diff tool available. Install a supported editor.");
@@ -305675,7 +305643,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.52.0-nightly.20260715.gfa975395b";
+    return "0.52.0";
   })();
   return versionPromise;
 }
@@ -310644,19 +310612,13 @@ async function createContentGeneratorConfig(config2, authType, apiKey, baseUrl,
     customHeaders,
     vertexAiRouting
   };
-  const getEnv3 = (key) => {
-    if (config2?.env && config2.env[key] !== void 0) {
-      return config2.env[key];
-    }
-    return process.env[key];
-  };
   if (authType === AuthType2.LOGIN_WITH_GOOGLE || authType === AuthType2.COMPUTE_ADC) {
     return contentGeneratorConfig;
   }
-  const geminiApiKey = apiKey || getEnv3("GEMINI_API_KEY") || await loadApiKey() || void 0;
-  const googleApiKey = getEnv3("GOOGLE_API_KEY") || void 0;
-  const googleCloudProject = getEnv3("GOOGLE_CLOUD_PROJECT") || getEnv3("GOOGLE_CLOUD_PROJECT_ID") || void 0;
-  const googleCloudLocation = getEnv3("GOOGLE_CLOUD_LOCATION") || void 0;
+  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;
   if (authType === AuthType2.USE_GEMINI && geminiApiKey) {
     contentGeneratorConfig.apiKey = geminiApiKey;
     contentGeneratorConfig.vertexai = false;
@@ -310668,7 +310630,7 @@ async function createContentGeneratorConfig(config2, authType, apiKey, baseUrl,
     return contentGeneratorConfig;
   }
   if (authType === AuthType2.GATEWAY) {
-    contentGeneratorConfig.apiKey = apiKey || getEnv3("GEMINI_API_KEY") || "";
+    contentGeneratorConfig.apiKey = apiKey || process.env["GEMINI_API_KEY"] || "";
     contentGeneratorConfig.vertexai = false;
     return contentGeneratorConfig;
   }
@@ -320952,7 +320914,7 @@ import { TextDecoder as TextDecoder2 } from "node:util";
 import os28 from "node:os";
 import fs47, { mkdirSync as mkdirSync4 } from "node:fs";
 import path57 from "node:path";
-var import_headless3 = __toESM(require_xterm_headless(), 1);
+var import_headless2 = __toESM(require_xterm_headless(), 1);
 
 // packages/core/dist/src/utils/terminalSerializer.js
 var Attribute;
@@ -321827,7 +321789,7 @@ var ExecutionLifecycleService = class {
 };
 
 // packages/core/dist/src/services/shellExecutionService.js
-var { Terminal } = import_headless3.default;
+var { Terminal } = import_headless2.default;
 var MAX_CHILD_PROCESS_BUFFER_SIZE = 16 * 1024 * 1024;
 var GEMINI_CLI_IDENTIFICATION_ENV_VAR = "GEMINI_CLI";
 var GEMINI_CLI_IDENTIFICATION_ENV_VAR_VALUE = "1";
@@ -322025,10 +321987,9 @@ ${truncated}`;
     const guardedCommand = ensurePromptvarsDisabled(commandToExecute, shell);
     const finalCommand = injectUtf8CodepageForPty(guardedCommand, shell, isWindows3, usingPty);
     const spawnArgs = [...argsPrefix, finalCommand];
-    const sourceEnv = shellExecutionConfig.env ?? process.env;
     const gitConfigKeys = [];
     if (!isInteractive) {
-      for (const key in sourceEnv) {
+      for (const key in process.env) {
         if (key.startsWith("GIT_CONFIG_")) {
           gitConfigKeys.push(key);
         }
@@ -322041,7 +322002,7 @@ ${truncated}`;
         ...gitConfigKeys
       ]
     };
-    const sanitizedEnv = sanitizeEnvironment(sourceEnv, sanitizationConfig);
+    const sanitizedEnv = sanitizeEnvironment(process.env, sanitizationConfig);
     const baseEnv = {
       ...sanitizedEnv,
       [GEMINI_CLI_IDENTIFICATION_ENV_VAR]: GEMINI_CLI_IDENTIFICATION_ENV_VAR_VALUE,
@@ -322051,7 +322012,7 @@ ${truncated}`;
     };
     if (!isInteractive) {
       for (const key of gitConfigKeys) {
-        baseEnv[key] = sourceEnv[key];
+        baseEnv[key] = process.env[key];
       }
       const gitConfigCount = parseInt(baseEnv["GIT_CONFIG_COUNT"] || "0", 10);
       const newKey = `GIT_CONFIG_KEY_${gitConfigCount}`;
@@ -323424,7 +323385,6 @@ exit $__code`;
         }
       }, combinedController.signal, this.context.config.isInteractiveShellEnabled(), {
         ...shellExecutionConfig,
-        env: this.context.config.env,
         sessionId: this.context.config?.getSessionId?.() ?? "default",
         pager: "cat",
         sanitizationConfig: shellExecutionConfig?.sanitizationConfig ?? this.context.config.sanitizationConfig,
@@ -330566,8 +330526,7 @@ var GeminiChat = class {
     return binaryParts.length > 0 ? binaryParts : void 0;
   }
   async makeApiCallAndProcessStream(modelConfigKey, requestHistory, prompt_id, abortSignal, role, apiHistoryOverride) {
-    let scrubbedHistory = this.context.config.isContextManagementEnabled() ? scrubHistory([...requestHistory]) : [...requestHistory];
-    scrubbedHistory = coalesceConsecutiveRoles(scrubbedHistory);
+    const scrubbedHistory = this.context.config.isContextManagementEnabled() ? scrubHistory([...requestHistory]) : [...requestHistory];
     const scrubbedContents = scrubbedHistory.map((h2) => h2.content);
     const requestContents = apiHistoryOverride ? scrubContents(apiHistoryOverride) : scrubbedContents;
     const contentsForPreviewModel = this.ensureActiveLoopHasThoughtSignatures(requestContents);
@@ -331087,29 +331046,6 @@ function stripToolCallIdPrefixes(contents) {
     })
   }));
 }
-function coalesceConsecutiveRoles(history) {
-  const result2 = [];
-  for (const turn of history) {
-    const lastIdx = result2.length - 1;
-    const last2 = result2[lastIdx];
-    if (last2 && last2.content.role && last2.content.role === turn.content.role) {
-      const hasParts = last2.content.parts || turn.content.parts;
-      result2[lastIdx] = {
-        id: last2.id,
-        content: {
-          ...last2.content,
-          parts: hasParts ? [...last2.content.parts || [], ...turn.content.parts || []] : void 0
-        }
-      };
-    } else {
-      result2.push({
-        id: turn.id,
-        content: { ...turn.content }
-      });
-    }
-  }
-  return result2;
-}
 
 // packages/core/dist/src/utils/ragLogger.js
 import * as fs50 from "node:fs";
@@ -338237,7 +338173,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-WWQFEGLU.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-5JL2PKRR.js");
         const provider = new OAuth2AuthProvider(authConfig, options.agentName ?? "unknown", agentCard, options.agentCardUrl);
         await provider.initialize();
         return provider;
@@ -340384,7 +340320,8 @@ var LoopDetectionService = class {
   promptId = "";
   userPrompt = "";
   // Tool call tracking
-  toolCallHistory = [];
+  lastToolCallKey = null;
+  toolCallRepetitionCount = 0;
   // Content streaming tracking
   streamContentHistory = "";
   contentStats = /* @__PURE__ */ new Map();
@@ -340506,31 +340443,14 @@ var LoopDetectionService = class {
   }
   checkToolCallLoop(toolCall) {
     const key = this.getToolCallKey(toolCall);
-    this.toolCallHistory.push(key);
-    const maxRequiredLength = 5 * TOOL_CALL_LOOP_THRESHOLD;
-    if (this.toolCallHistory.length > maxRequiredLength) {
-      this.toolCallHistory = this.toolCallHistory.slice(-maxRequiredLength);
-    }
-    const n3 = this.toolCallHistory.length;
-    const R = TOOL_CALL_LOOP_THRESHOLD;
-    for (let k = 1; k <= 5; k++) {
-      const requiredLength = k * R;
-      if (n3 >= requiredLength) {
-        const cycle = this.toolCallHistory.slice(-k);
-        let isPatternMatch = true;
-        for (let i3 = 0; i3 < requiredLength; i3++) {
-          const indexFromEnd = requiredLength - i3;
-          const actualKey = this.toolCallHistory[n3 - indexFromEnd];
-          const expectedKey = cycle[i3 % k];
-          if (actualKey !== expectedKey) {
-            isPatternMatch = false;
-            break;
-          }
-        }
-        if (isPatternMatch) {
-          return true;
-        }
-      }
+    if (this.lastToolCallKey === key) {
+      this.toolCallRepetitionCount++;
+    } else {
+      this.lastToolCallKey = key;
+      this.toolCallRepetitionCount = 1;
+    }
+    if (this.toolCallRepetitionCount >= TOOL_CALL_LOOP_THRESHOLD) {
+      return true;
     }
     return false;
   }
@@ -340788,7 +340708,8 @@ ${this.userPrompt}
     this.loopDetected = false;
   }
   resetToolCallCount() {
-    this.toolCallHistory = [];
+    this.lastToolCallKey = null;
+    this.toolCallRepetitionCount = 0;
   }
   resetContentTracking(resetHistory = true) {
     if (resetHistory) {
@@ -363695,9 +363616,7 @@ var CheckerRunner = class _CheckerRunner {
   executeCheckerProcess(checkerPath, input, checkerName) {
     return new Promise((resolve29) => {
       const child = spawn9(checkerPath, [], {
-        stdio: ["pipe", "pipe", "pipe"],
-        cwd: this.contextBuilder.config.getWorkingDir(),
-        env: { ...process.env, ...this.contextBuilder.config.env }
+        stdio: ["pipe", "pipe", "pipe"]
       });
       let stdout = "";
       let stderr = "";
@@ -363804,9 +363723,6 @@ var ContextBuilder = class {
   constructor(context2) {
     this.context = context2;
   }
-  get config() {
-    return this.context.config;
-  }
   /**
    * Builds the full context object with all available data.
    */
@@ -375909,7 +375825,6 @@ var Config = class {
   useTerminalBuffer;
   useRenderProcess;
   shellExecutionConfig;
-  env;
   extensionManagement = true;
   extensionRegistryURI;
   truncateToolOutputThreshold;
@@ -376076,7 +375991,6 @@ var Config = class {
     this.checkpointing = params.checkpointing ?? false;
     this.proxy = params.proxy;
     this.cwd = params.cwd ?? process15.cwd();
-    this.env = params.env;
     this.fileDiscoveryService = params.fileDiscoveryService ?? null;
     this.bugCommand = params.bugCommand;
     this.model = params.model;
@@ -395937,7 +395851,6 @@ export {
   isSchemaDepthError,
   isInvalidArgumentError,
   stripToolCallIdPrefixes,
-  coalesceConsecutiveRoles,
   populateToolDisplay,
   toolResultDisplayToDisplayContent,
   renderDisplayDiff,

package/bundle/{chunk-XH7QC2TB.js → chunk-ALVMXQYL.js}

@@ -1,13 +1,13 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   runExitCleanup
-} from "./chunk-PKFZO3SN.js";
+} from "./chunk-JB342GRK.js";
 import {
   RELEASE_CHANNEL_STABILITY,
   debugLogger,
   getChannelFromVersion,
   isGitRepository
-} from "./chunk-27C6XFMY.js";
+} from "./chunk-IQDAUFS5.js";
 
 // packages/cli/src/utils/installationInfo.ts
 import * as fs from "node:fs";

package/bundle/{chunk-CPNBBB75.js → chunk-B54TROKV.js}

@@ -1,13 +1,13 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   runExitCleanup
-} from "./chunk-KDCDG5VZ.js";
+} from "./chunk-OFOMMM4A.js";
 import {
   RELEASE_CHANNEL_STABILITY,
   debugLogger,
   getChannelFromVersion,
   isGitRepository
-} from "./chunk-GJXPH6YT.js";
+} from "./chunk-BG2B4WV5.js";
 
 // packages/cli/src/utils/installationInfo.ts
 import * as fs from "node:fs";