@google/gemini-cli 0.52.0 → 0.54.0-nightly.20260726.g3818efbbf

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

@@ -278401,66 +278401,85 @@ 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) {
-  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
+  function createBaseOAuth2Client() {
+    const client2 = new import_google_auth_library3.OAuth2Client({
+      clientId: OAUTH_CLIENT_ID,
+      clientSecret: OAUTH_CLIENT_SECRET,
+      transporterOptions: {
+        proxy: config2.getProxy()
+      }
     });
-    const byoidClient = auth2.fromJSON({
-      ...credentials3,
-      refresh_token: credentials3.refresh_token ?? void 0
+    const useEncryptedStorage = getUseEncryptedStorageFlag();
+    client2.on("tokens", async (tokens) => {
+      if (useEncryptedStorage) {
+        await OAuthCredentialStorage.saveCredentials(tokens);
+      } else {
+        await cacheCredentials(tokens);
+      }
+      await triggerPostAuthCallbacks(tokens);
     });
-    const token2 = await byoidClient.getAccessToken();
-    if (token2) {
-      debugLogger.debug(`Created ${credentials3.type} auth client.`);
-      return byoidClient;
-    }
+    return client2;
   }
-  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"]) {
-    client.setCredentials({
+    const client2 = createBaseOAuth2Client();
+    client2.setCredentials({
       access_token: process.env["GOOGLE_CLOUD_ACCESS_TOKEN"]
     });
-    await fetchAndCacheUserInfo(client);
-    return client;
+    await fetchAndCacheUserInfo(client2);
+    return client2;
   }
-  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));
+  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));
+            }
           }
+          debugLogger.log("Loaded cached credentials.");
+          await triggerPostAuthCallbacks(client2.credentials || credentials3);
+          return client2;
         }
-        debugLogger.log("Loaded cached credentials.");
-        await triggerPostAuthCallbacks(credentials3);
-        return client;
+      } catch (error40) {
+        debugLogger.debug("Cached credentials are not valid:", getErrorMessage(error40));
       }
-    } 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.");
@@ -278769,13 +278788,21 @@ function getAvailablePort() {
     }
   });
 }
-async function fetchCachedCredentials() {
+async function fetchCachedCredentialsList() {
+  const credentialsList = [];
   const useEncryptedStorage = getUseEncryptedStorageFlag();
   if (useEncryptedStorage) {
-    return OAuthCredentialStorage.loadCredentials();
+    try {
+      const creds = await OAuthCredentialStorage.loadCredentials();
+      if (creds) {
+        credentialsList.push(creds);
+      }
+    } catch (error40) {
+      debugLogger.debug("Failed to load credentials from encrypted storage:", error40);
+    }
   }
   const pathsToTry = [
-    Storage.getOAuthCredsPath(),
+    ...!useEncryptedStorage ? [Storage.getOAuthCredsPath()] : [],
     process.env["GOOGLE_APPLICATION_CREDENTIALS"]
   ].filter((p) => !!p);
   for (const keyFile of pathsToTry) {
@@ -278784,14 +278811,15 @@ async function fetchCachedCredentials() {
       const parsed = JSON.parse(keyFileString);
       const isOAuthCreds = (val) => typeof val === "object" && val !== null;
       if (isOAuthCreds(parsed)) {
-        return parsed;
+        credentialsList.push(parsed);
+      } else {
+        throw new Error("Invalid credentials format");
       }
-      throw new Error("Invalid credentials format");
     } catch (error40) {
       debugLogger.debug(`Failed to load credentials from ${keyFile}:`, getErrorMessage(error40));
     }
   }
-  return null;
+  return credentialsList;
 }
 function clearOauthClientCache() {
   oauthClientPromises.clear();
@@ -282465,8 +282493,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "5de3b24af";
-var CLI_VERSION = "0.52.0";
+var GIT_COMMIT_INFO = "3818efbbf";
+var CLI_VERSION = "0.54.0-nightly.20260722.gf743ab579";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -289959,6 +289987,10 @@ 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.");
@@ -305643,7 +305675,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.52.0";
+    return "0.54.0-nightly.20260726.g3818efbbf";
   })();
   return versionPromise;
 }
@@ -306084,6 +306116,12 @@ ${errorMessage}`, true);
 // packages/core/dist/src/utils/llm-edit-fixer.js
 import { createHash as createHash5 } from "node:crypto";
 
+// packages/core/dist/src/utils/session.js
+import { randomUUID as randomUUID5 } from "node:crypto";
+function createSessionId() {
+  return randomUUID5();
+}
+
 // packages/core/dist/src/utils/secure-browser-launcher.js
 import { execFile as execFile6 } from "node:child_process";
 import { promisify as promisify7 } from "node:util";
@@ -306802,6 +306840,7 @@ async function handleUpgrade() {
 async function processIntent(config2, intent, fallbackModel, failedModel) {
   switch (intent) {
     case "retry_always":
+      config2.rotateSessionId(createSessionId());
       config2.activateFallbackMode(fallbackModel, failedModel);
       return true;
     case "retry_once":
@@ -309298,6 +309337,9 @@ var CodeAssistServer = class {
     this.paidTier = paidTier;
     this.config = config2;
   }
+  getEffectiveSessionId() {
+    return this.config?.getSessionId() ?? this.sessionId;
+  }
   async generateContentStream(req, userPromptId, role) {
     const autoUse = this.config ? shouldAutoUseCredits(this.config.getBillingSettings().overageStrategy, getG1CreditBalance(this.paidTier)) : false;
     const modelIsEligible = isOverageEligibleModel(req.model);
@@ -309307,7 +309349,7 @@ var CodeAssistServer = class {
       coreEvents.emitFeedback("info", "Using AI Credits for this request.");
     }
     const enabledCreditTypes = shouldEnableCredits ? [G1_CREDIT_TYPE] : void 0;
-    const responses = await this.requestStreamingPost("streamGenerateContent", toGenerateContentRequest(req, userPromptId, this.projectId, this.sessionId, enabledCreditTypes), req.config?.abortSignal);
+    const responses = await this.requestStreamingPost("streamGenerateContent", toGenerateContentRequest(req, userPromptId, this.projectId, this.getEffectiveSessionId(), enabledCreditTypes), req.config?.abortSignal);
     const streamingLatency = {};
     const start2 = Date.now();
     let isFirst = true;
@@ -309321,7 +309363,7 @@ var CodeAssistServer = class {
         }
         streamingLatency.totalLatency = formatProtoJsonDuration(Date.now() - start2);
         const translatedResponse = fromGenerateContentResponse(response);
-        await recordConversationOffered(server, response.traceId, translatedResponse, streamingLatency, req.config?.abortSignal, server.sessionId);
+        await recordConversationOffered(server, response.traceId, translatedResponse, streamingLatency, req.config?.abortSignal, server.getEffectiveSessionId());
         if (response.consumedCredits) {
           for (const credit of response.consumedCredits) {
             if (credit.creditType === G1_CREDIT_TYPE && credit.creditAmount) {
@@ -309347,14 +309389,14 @@ var CodeAssistServer = class {
   }
   async generateContent(req, userPromptId, role) {
     const start2 = Date.now();
-    const response = await this.requestPost("generateContent", toGenerateContentRequest(req, userPromptId, this.projectId, this.sessionId, void 0), req.config?.abortSignal, GENERATE_CONTENT_RETRY_DELAY_IN_MILLISECONDS);
+    const response = await this.requestPost("generateContent", toGenerateContentRequest(req, userPromptId, this.projectId, this.getEffectiveSessionId(), void 0), req.config?.abortSignal, GENERATE_CONTENT_RETRY_DELAY_IN_MILLISECONDS);
     const duration3 = formatProtoJsonDuration(Date.now() - start2);
     const streamingLatency = {
       totalLatency: duration3,
       firstMessageLatency: duration3
     };
     const translatedResponse = fromGenerateContentResponse(response);
-    await recordConversationOffered(this, response.traceId, translatedResponse, streamingLatency, req.config?.abortSignal, this.sessionId);
+    await recordConversationOffered(this, response.traceId, translatedResponse, streamingLatency, req.config?.abortSignal, this.getEffectiveSessionId());
     if (response.remainingCredits) {
       this.updateCredits(response.remainingCredits);
     }
@@ -310612,13 +310654,19 @@ 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 || 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 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;
   if (authType === AuthType2.USE_GEMINI && geminiApiKey) {
     contentGeneratorConfig.apiKey = geminiApiKey;
     contentGeneratorConfig.vertexai = false;
@@ -310630,7 +310678,7 @@ async function createContentGeneratorConfig(config2, authType, apiKey, baseUrl,
     return contentGeneratorConfig;
   }
   if (authType === AuthType2.GATEWAY) {
-    contentGeneratorConfig.apiKey = apiKey || process.env["GEMINI_API_KEY"] || "";
+    contentGeneratorConfig.apiKey = apiKey || getEnv3("GEMINI_API_KEY") || "";
     contentGeneratorConfig.vertexai = false;
     return contentGeneratorConfig;
   }
@@ -320914,7 +320962,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_headless2 = __toESM(require_xterm_headless(), 1);
+var import_headless3 = __toESM(require_xterm_headless(), 1);
 
 // packages/core/dist/src/utils/terminalSerializer.js
 var Attribute;
@@ -321789,7 +321837,7 @@ var ExecutionLifecycleService = class {
 };
 
 // packages/core/dist/src/services/shellExecutionService.js
-var { Terminal } = import_headless2.default;
+var { Terminal } = import_headless3.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";
@@ -321987,9 +322035,10 @@ ${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 process.env) {
+      for (const key in sourceEnv) {
         if (key.startsWith("GIT_CONFIG_")) {
           gitConfigKeys.push(key);
         }
@@ -322002,7 +322051,7 @@ ${truncated}`;
         ...gitConfigKeys
       ]
     };
-    const sanitizedEnv = sanitizeEnvironment(process.env, sanitizationConfig);
+    const sanitizedEnv = sanitizeEnvironment(sourceEnv, sanitizationConfig);
     const baseEnv = {
       ...sanitizedEnv,
       [GEMINI_CLI_IDENTIFICATION_ENV_VAR]: GEMINI_CLI_IDENTIFICATION_ENV_VAR_VALUE,
@@ -322012,7 +322061,7 @@ ${truncated}`;
     };
     if (!isInteractive) {
       for (const key of gitConfigKeys) {
-        baseEnv[key] = process.env[key];
+        baseEnv[key] = sourceEnv[key];
       }
       const gitConfigCount = parseInt(baseEnv["GIT_CONFIG_COUNT"] || "0", 10);
       const newKey = `GIT_CONFIG_KEY_${gitConfigCount}`;
@@ -323385,6 +323434,7 @@ 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,
@@ -329817,10 +329867,10 @@ var TopicState = class {
 };
 
 // packages/core/dist/src/agents/local-executor.js
-import { randomUUID as randomUUID12 } from "node:crypto";
+import { randomUUID as randomUUID13 } from "node:crypto";
 
 // packages/core/dist/src/core/geminiChat.js
-import { randomUUID as randomUUID5 } from "node:crypto";
+import { randomUUID as randomUUID6 } from "node:crypto";
 
 // packages/core/dist/src/utils/messageInspectors.js
 function isFunctionResponse(content) {
@@ -330286,7 +330336,7 @@ var GeminiChat = class {
     validateHistory2(history);
     let initialHistory;
     if (history.length > 0) {
-      initialHistory = history.map((item) => "id" in item && "content" in item ? item : { id: randomUUID5(), content: item });
+      initialHistory = history.map((item) => "id" in item && "content" in item ? item : { id: randomUUID6(), content: item });
     } else if (resumedSessionData) {
       initialHistory = resumedSessionData.conversation.messages.filter((m) => m.type === "user" || m.type === "gemini").map((m) => ({
         id: m.id,
@@ -330526,7 +330576,8 @@ var GeminiChat = class {
     return binaryParts.length > 0 ? binaryParts : void 0;
   }
   async makeApiCallAndProcessStream(modelConfigKey, requestHistory, prompt_id, abortSignal, role, apiHistoryOverride) {
-    const scrubbedHistory = this.context.config.isContextManagementEnabled() ? scrubHistory([...requestHistory]) : [...requestHistory];
+    let scrubbedHistory = this.context.config.isContextManagementEnabled() ? scrubHistory([...requestHistory]) : [...requestHistory];
+    scrubbedHistory = coalesceConsecutiveRoles(scrubbedHistory);
     const scrubbedContents = scrubbedHistory.map((h2) => h2.content);
     const requestContents = apiHistoryOverride ? scrubContents(apiHistoryOverride) : scrubbedContents;
     const contentsForPreviewModel = this.ensureActiveLoopHasThoughtSignatures(requestContents);
@@ -330560,7 +330611,7 @@ var GeminiChat = class {
         tools: this.tools,
         abortSignal
       };
-      let contentsToUse = supportsModernFeatures(modelToUse) ? [...contentsForPreviewModel] : [...requestContents];
+      let contentsToUse = supportsModernFeatures(modelToUse) || isGemini2Model(modelToUse) ? [...contentsForPreviewModel] : [...requestContents];
       const hookSystem = this.context.config.getHookSystem();
       if (hookSystem) {
         const beforeModelResult = await hookSystem.fireBeforeModelEvent({
@@ -330583,7 +330634,7 @@ var GeminiChat = class {
         if (beforeModelResult.modifiedModel) {
           modelToUse = resolveModel(beforeModelResult.modifiedModel, useGemini3_1, false, hasAccessToPreview, this.context.config, this.context.config.hasGemini35FlashGAAccess?.() ?? false);
           lastModelToUse = modelToUse;
-          contentsToUse = supportsModernFeatures(modelToUse) ? [...contentsForPreviewModel] : [...requestContents];
+          contentsToUse = supportsModernFeatures(modelToUse) || isGemini2Model(modelToUse) ? [...contentsForPreviewModel] : [...requestContents];
         }
         if (beforeModelResult.modifiedConfig) {
           Object.assign(config2, beforeModelResult.modifiedConfig);
@@ -330680,7 +330731,14 @@ var GeminiChat = class {
    */
   getHistoryTurns(curated = false) {
     const history = curated ? extractCuratedHistory2(this.agentHistory.get()) : [...this.agentHistory.get()];
-    return this.context.config.isContextManagementEnabled() ? scrubHistory(history) : history;
+    if (this.context.config.isContextManagementEnabled()) {
+      return scrubHistory(history);
+    }
+    const model = this.context.config.getModel();
+    if (isGemini2Model(model) || supportsModernFeatures(model)) {
+      return coalesceConsecutiveRoles(stripThoughts2(history));
+    }
+    return history;
   }
   /**
    * Clears the chat history.
@@ -331046,6 +331104,46 @@ 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;
+}
+function stripThoughts2(history) {
+  return history.map((turn) => {
+    if (!turn.content.parts)
+      return turn;
+    const hasThought = turn.content.parts.some((p) => p && p.thought);
+    if (!hasThought)
+      return turn;
+    const nonThoughtParts = turn.content.parts.filter((p) => p && !p.thought);
+    return {
+      ...turn,
+      content: {
+        ...turn.content,
+        parts: nonThoughtParts
+      }
+    };
+  }).filter((turn) => !turn.content.parts || turn.content.parts.length > 0);
+}
 
 // packages/core/dist/src/utils/ragLogger.js
 import * as fs50 from "node:fs";
@@ -338074,7 +338172,11 @@ var GoogleCredentialsAuthProvider = class extends BaseA2AAuthProvider {
     if (!targetUrl) {
       throw new Error("targetUrl must be provided to GoogleCredentialsAuthProvider to determine token audience.");
     }
-    const hostname3 = new URL(targetUrl).hostname;
+    const urlObj = new URL(targetUrl);
+    if (urlObj.protocol !== "https:") {
+      throw new Error(`Protocol "${urlObj.protocol}" is not secure. Google Credential provider requires HTTPS.`);
+    }
+    const hostname3 = urlObj.hostname;
     const isRunAppHost = CLOUD_RUN_HOST_REGEX.test(hostname3);
     if (isRunAppHost) {
       this.useIdToken = true;
@@ -338173,7 +338275,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-5JL2PKRR.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-NVAVQTFM.js");
         const provider = new OAuth2AuthProvider(authConfig, options.agentName ?? "unknown", agentCard, options.agentCardUrl);
         await provider.initialize();
         return provider;
@@ -339732,7 +339834,7 @@ var SchedulerStateManager = class {
 
 // packages/core/dist/src/scheduler/confirmation.js
 import { on } from "node:events";
-import { randomUUID as randomUUID6 } from "node:crypto";
+import { randomUUID as randomUUID7 } from "node:crypto";
 async function awaitConfirmation(messageBus, correlationId, signal) {
   if (signal.aborted) {
     throw new Error("Operation cancelled");
@@ -339778,7 +339880,7 @@ async function resolveConfirmation(toolCall, signal, deps) {
       details.systemMessage = deps.systemMessage;
     }
     await notifyHooks(deps, details);
-    const correlationId = randomUUID6();
+    const correlationId = randomUUID7();
     const serializableDetails = details;
     lastDetails = serializableDetails;
     const ideConfirmation = "ideConfirmation" in details ? details.ideConfirmation : void 0;
@@ -340320,8 +340422,7 @@ var LoopDetectionService = class {
   promptId = "";
   userPrompt = "";
   // Tool call tracking
-  lastToolCallKey = null;
-  toolCallRepetitionCount = 0;
+  toolCallHistory = [];
   // Content streaming tracking
   streamContentHistory = "";
   contentStats = /* @__PURE__ */ new Map();
@@ -340443,14 +340544,31 @@ var LoopDetectionService = class {
   }
   checkToolCallLoop(toolCall) {
     const key = this.getToolCallKey(toolCall);
-    if (this.lastToolCallKey === key) {
-      this.toolCallRepetitionCount++;
-    } else {
-      this.lastToolCallKey = key;
-      this.toolCallRepetitionCount = 1;
-    }
-    if (this.toolCallRepetitionCount >= TOOL_CALL_LOOP_THRESHOLD) {
-      return true;
+    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;
+        }
+      }
     }
     return false;
   }
@@ -340708,8 +340826,7 @@ ${this.userPrompt}
     this.loopDetected = false;
   }
   resetToolCallCount() {
-    this.lastToolCallKey = null;
-    this.toolCallRepetitionCount = 0;
+    this.toolCallHistory = [];
   }
   resetContentTracking(resetHistory = true) {
     if (resetHistory) {
@@ -341266,7 +341383,7 @@ Output too large. Full output available at: ${filePath}
 };
 
 // packages/core/dist/src/core/client.js
-import { randomUUID as randomUUID10 } from "node:crypto";
+import { randomUUID as randomUUID11 } from "node:crypto";
 
 // packages/core/dist/src/context/config/registry.js
 var ContextProcessorRegistry = class {
@@ -341825,7 +341942,7 @@ function formatNodesForLlm(nodes, options = {}) {
 }
 
 // packages/core/dist/src/context/utils/snapshotGenerator.js
-import { randomUUID as randomUUID7 } from "node:crypto";
+import { randomUUID as randomUUID8 } from "node:crypto";
 function isStringArray(value) {
   return Array.isArray(value) && value.every((item) => typeof item === "string");
 }
@@ -342029,7 +342146,7 @@ ${formatNodesForLlm(nodes)}`;
           const desc = t2["description"];
           if (typeof desc === "string" && desc) {
             newState.active_tasks.push({
-              id: `task_${randomUUID7().slice(0, 8)}`,
+              id: `task_${randomUUID8().slice(0, 8)}`,
               description: desc
             });
           }
@@ -342571,7 +342688,7 @@ async function loadContextManagementConfig(sidecarPath, registry2) {
 // packages/core/dist/src/context/tracer.js
 import * as fsSync3 from "node:fs";
 import * as path69 from "node:path";
-import { randomUUID as randomUUID8 } from "node:crypto";
+import { randomUUID as randomUUID9 } from "node:crypto";
 var ContextTracer = class {
   traceDir;
   assetsDir;
@@ -342623,7 +342740,7 @@ var ContextTracer = class {
     if (!this.enabled)
       return "asset-recording-disabled";
     try {
-      const assetId = `${Date.now()}-${randomUUID8()}-${assetName}.json`;
+      const assetId = `${Date.now()}-${randomUUID9()}-${assetName}.json`;
       const assetPath = path69.join(this.assetsDir, assetId);
       fsSync3.writeFileSync(assetPath, JSON.stringify(data, null, 2), "utf-8");
       this.logEvent(component, `Saved asset: ${assetName}`, { assetId });
@@ -342679,12 +342796,12 @@ var ContextEventBus = class extends EventEmitter5 {
 };
 
 // packages/core/dist/src/context/pipeline/inbox.js
-import { randomUUID as randomUUID9 } from "node:crypto";
+import { randomUUID as randomUUID10 } from "node:crypto";
 var LiveInbox = class {
   messages = [];
   publish(topic, payload) {
     this.messages.push({
-      id: randomUUID9(),
+      id: randomUUID10(),
       topic,
       payload,
       timestamp: Date.now()
@@ -344586,7 +344703,7 @@ var GeminiClient = class {
       if (this.contextManager) {
         const rawPendingRequest = createUserContent(request);
         const pendingRequest = {
-          id: randomUUID10(),
+          id: randomUUID11(),
           content: rawPendingRequest
         };
         const { history: newHistory, apiHistory, pendingApiHistory, baseUnits } = await this.contextManager.renderHistory(pendingRequest, void 0, signal);
@@ -346444,7 +346561,7 @@ function createScopedWorkspaceContext(parentContext, additionalDirectories) {
 }
 
 // packages/core/dist/src/confirmation-bus/message-bus.js
-import { randomUUID as randomUUID11 } from "node:crypto";
+import { randomUUID as randomUUID12 } from "node:crypto";
 import { EventEmitter as EventEmitter6 } from "node:events";
 var MessageBus = class _MessageBus extends EventEmitter6 {
   policyEngine;
@@ -346596,7 +346713,7 @@ var MessageBus = class _MessageBus extends EventEmitter6 {
    * The correlation ID is generated internally and added to the request
    */
   async request(request, responseType, timeoutMs = 6e4) {
-    const correlationId = randomUUID11();
+    const correlationId = randomUUID12();
     return new Promise((resolve29, reject) => {
       const timeoutId = setTimeout(() => {
         cleanup();
@@ -346845,7 +346962,7 @@ var LocalAgentExecutor = class _LocalAgentExecutor {
     this.compressionService = new ChatCompressionService();
     this.parentCallId = parentCallId;
     this.cache = new import_lru_cache.default(10);
-    this.agentId = randomUUID12();
+    this.agentId = randomUUID13();
   }
   /**
    * Executes a single turn of the agent's logic, from calling the model
@@ -347225,7 +347342,7 @@ var LocalAgentExecutor = class _LocalAgentExecutor {
     } else if (info2.compressionStatus === CompressionStatus.COMPRESSED) {
       if (newHistory) {
         const turns = newHistory.map((c4) => ({
-          id: randomUUID12(),
+          id: randomUUID13(),
           content: c4
         }));
         chat.setHistory(turns);
@@ -347234,7 +347351,7 @@ var LocalAgentExecutor = class _LocalAgentExecutor {
     } else if (info2.compressionStatus === CompressionStatus.CONTENT_TRUNCATED) {
       if (newHistory) {
         const turns = newHistory.map((c4) => ({
-          id: randomUUID12(),
+          id: randomUUID13(),
           content: c4
         }));
         chat.setHistory(turns);
@@ -347652,7 +347769,7 @@ Important Rules:
 };
 
 // packages/core/dist/src/agents/local-invocation.js
-import { randomUUID as randomUUID13 } from "node:crypto";
+import { randomUUID as randomUUID14 } from "node:crypto";
 
 // packages/core/dist/src/utils/agent-sanitization-utils.js
 var SENSITIVE_KEY_PATTERNS = [
@@ -347812,7 +347929,7 @@ var LocalSubagentInvocation = class extends BaseToolInvocation {
               lastItem.content = sanitizeThoughtContent(text);
             } else {
               recentActivity.push({
-                id: randomUUID13(),
+                id: randomUUID14(),
                 type: "thought",
                 content: sanitizeThoughtContent(text),
                 status: SubagentState.RUNNING
@@ -347830,7 +347947,7 @@ var LocalSubagentInvocation = class extends BaseToolInvocation {
             const displayName = activity.data["displayName"] ? sanitizeErrorMessage(String(activity.data["displayName"])) : void 0;
             const description = activity.data["description"] ? sanitizeErrorMessage(String(activity.data["description"])) : void 0;
             const args2 = JSON.stringify(sanitizeToolArgs(activity.data["args"]));
-            const callId = activity.data["callId"] ? String(activity.data["callId"]) : randomUUID13();
+            const callId = activity.data["callId"] ? String(activity.data["callId"]) : randomUUID14();
             recentActivity.push({
               id: callId,
               type: "tool_call",
@@ -347881,7 +347998,7 @@ var LocalSubagentInvocation = class extends BaseToolInvocation {
               }
             }
             recentActivity.push({
-              id: randomUUID13(),
+              id: randomUUID14(),
               type: "thought",
               content: isCancellation || isRejection ? sanitizedError : `Error: ${sanitizedError}`,
               status: isCancellation || isRejection ? SubagentState.CANCELLED : SubagentState.ERROR
@@ -347952,7 +348069,7 @@ ${output.result}`;
         const lastActivity = recentActivity[recentActivity.length - 1];
         if (!lastActivity || lastActivity.status !== SubagentState.ERROR) {
           recentActivity.push({
-            id: randomUUID13(),
+            id: randomUUID14(),
             type: "thought",
             content: `Error: ${errorMessage}`,
             status: SubagentState.ERROR
@@ -348388,7 +348505,7 @@ ${errorMessage}` : errorMessage;
 };
 
 // packages/core/dist/src/agents/local-session-invocation.js
-import { randomUUID as randomUUID15 } from "node:crypto";
+import { randomUUID as randomUUID16 } from "node:crypto";
 
 // packages/core/dist/src/utils/checks.js
 function assumeExhaustive(_value) {
@@ -348399,7 +348516,7 @@ function checkExhaustive(value, msg = `unexpected value ${value}!`) {
 }
 
 // packages/core/dist/src/agents/local-subagent-protocol.js
-import { randomUUID as randomUUID14 } from "node:crypto";
+import { randomUUID as randomUUID15 } from "node:crypto";
 
 // packages/core/dist/src/agent/agent-session.js
 var AgentSession = class {
@@ -348584,7 +348701,7 @@ var LocalSubagentProtocol = class {
   _rawActivityCallback;
   _events = [];
   _subscribers = /* @__PURE__ */ new Set();
-  _streamId = randomUUID14();
+  _streamId = randomUUID15();
   _eventCounter = 0;
   _agentStartEmitted = false;
   _agentEndEmitted = false;
@@ -348662,7 +348779,7 @@ var LocalSubagentProtocol = class {
   // Core: execution
   // ---------------------------------------------------------------------------
   _beginNewStream() {
-    this._streamId = randomUUID14();
+    this._streamId = randomUUID15();
     this._eventCounter = 0;
     this._abortController = new AbortController();
     this._agentStartEmitted = false;
@@ -348724,7 +348841,7 @@ var LocalSubagentProtocol = class {
       }
       case "TOOL_CALL_START": {
         const rawCallId = activity.data["callId"];
-        const callId = String(rawCallId ?? randomUUID14());
+        const callId = String(rawCallId ?? randomUUID15());
         const rawName = activity.data["name"];
         const name3 = String(rawName ?? "unknown");
         const rawArgs = activity.data["args"];
@@ -348742,7 +348859,7 @@ var LocalSubagentProtocol = class {
       }
       case "TOOL_CALL_END": {
         const rawId = activity.data["id"];
-        const requestId = String(rawId ?? randomUUID14());
+        const requestId = String(rawId ?? randomUUID15());
         const rawName = activity.data["name"];
         const name3 = String(rawName ?? "unknown");
         const rawOutput = activity.data["output"];
@@ -348921,7 +349038,7 @@ var LocalSessionInvocation = class extends BaseToolInvocation {
             lastItem.content = sanitizeThoughtContent(text);
           } else {
             recentActivity.push({
-              id: randomUUID15(),
+              id: randomUUID16(),
               type: "thought",
               content: sanitizeThoughtContent(text),
               status: SubagentState.RUNNING
@@ -348940,7 +349057,7 @@ var LocalSessionInvocation = class extends BaseToolInvocation {
           const displayName = activity.data["displayName"] ? sanitizeErrorMessage(String(activity.data["displayName"]).trim()) : void 0;
           const description = activity.data["description"] ? sanitizeErrorMessage(String(activity.data["description"])) : void 0;
           const args2 = JSON.stringify(sanitizeToolArgs(activity.data["args"]));
-          const callId = activity.data["callId"] ? String(activity.data["callId"]) : randomUUID15();
+          const callId = activity.data["callId"] ? String(activity.data["callId"]) : randomUUID16();
           recentActivity.push({
             id: callId,
             type: "tool_call",
@@ -348992,7 +349109,7 @@ var LocalSessionInvocation = class extends BaseToolInvocation {
             }
           }
           recentActivity.push({
-            id: randomUUID15(),
+            id: randomUUID16(),
             type: "thought",
             content: isCancellation || isRejection ? sanitizedError : `Error: ${sanitizedError}`,
             status: isCancellation || isRejection ? SubagentState.CANCELLED : SubagentState.ERROR
@@ -349090,7 +349207,7 @@ ${output.result}`;
         const lastActivity = recentActivity[recentActivity.length - 1];
         if (!lastActivity || lastActivity.status !== SubagentState.ERROR) {
           recentActivity.push({
-            id: randomUUID15(),
+            id: randomUUID16(),
             type: "thought",
             content: `Error: ${errorMessage}`,
             status: SubagentState.ERROR
@@ -349124,7 +349241,7 @@ ${output.result}`;
 };
 
 // packages/core/dist/src/agents/remote-subagent-protocol.js
-import { randomUUID as randomUUID16 } from "node:crypto";
+import { randomUUID as randomUUID17 } from "node:crypto";
 function isAbortLikeError2(err2) {
   return err2 instanceof Error && err2.name === "AbortError";
 }
@@ -349133,7 +349250,7 @@ var RemoteSubagentProtocol = class {
   context;
   _events = [];
   _subscribers = /* @__PURE__ */ new Set();
-  _streamId = randomUUID16();
+  _streamId = randomUUID17();
   _eventCounter = 0;
   _agentStartEmitted = false;
   _agentEndEmitted = false;
@@ -349213,7 +349330,7 @@ var RemoteSubagentProtocol = class {
   // Core: A2A streaming
   // ---------------------------------------------------------------------------
   _beginNewStream() {
-    this._streamId = randomUUID16();
+    this._streamId = randomUUID17();
     this._eventCounter = 0;
     this._abortController = new AbortController();
     this._agentStartEmitted = false;
@@ -349588,7 +349705,7 @@ ${errorMessage}` : errorMessage;
 };
 
 // packages/core/dist/src/agents/browser/browserAgentInvocation.js
-import { randomUUID as randomUUID17 } from "node:crypto";
+import { randomUUID as randomUUID18 } from "node:crypto";
 
 // packages/core/dist/src/utils/browserConsent.js
 import * as fs59 from "node:fs/promises";
@@ -351073,7 +351190,7 @@ var BrowserAgentInvocation = class extends BaseToolInvocation {
       const printOutput = updateOutput ? (msg) => {
         const sanitizedMsg = sanitizeThoughtContent(msg);
         recentActivity.push({
-          id: randomUUID17(),
+          id: randomUUID18(),
           type: "thought",
           content: sanitizedMsg,
           status: SubagentState.COMPLETED
@@ -351105,7 +351222,7 @@ var BrowserAgentInvocation = class extends BaseToolInvocation {
               lastItem.content = sanitizeThoughtContent(text);
             } else {
               recentActivity.push({
-                id: randomUUID17(),
+                id: randomUUID18(),
                 type: "thought",
                 content: sanitizeThoughtContent(text),
                 status: SubagentState.RUNNING
@@ -351119,7 +351236,7 @@ var BrowserAgentInvocation = class extends BaseToolInvocation {
             const displayName = activity.data["displayName"] ? sanitizeErrorMessage(String(activity.data["displayName"])) : void 0;
             const description = activity.data["description"] ? sanitizeErrorMessage(String(activity.data["description"])) : void 0;
             const args2 = JSON.stringify(sanitizeToolArgs(activity.data["args"]));
-            const callId = activity.data["callId"] ? String(activity.data["callId"]) : randomUUID17();
+            const callId = activity.data["callId"] ? String(activity.data["callId"]) : randomUUID18();
             recentActivity.push({
               id: callId,
               type: "tool_call",
@@ -351168,7 +351285,7 @@ var BrowserAgentInvocation = class extends BaseToolInvocation {
             }
             const sanitizedError = sanitizeErrorMessage(error40);
             recentActivity.push({
-              id: randomUUID17(),
+              id: randomUUID18(),
               type: "thought",
               content: isCancellation ? sanitizedError : `Error: ${sanitizedError}`,
               status: newStatus
@@ -363616,7 +363733,9 @@ var CheckerRunner = class _CheckerRunner {
   executeCheckerProcess(checkerPath, input, checkerName) {
     return new Promise((resolve29) => {
       const child = spawn9(checkerPath, [], {
-        stdio: ["pipe", "pipe", "pipe"]
+        stdio: ["pipe", "pipe", "pipe"],
+        cwd: this.contextBuilder.config.getWorkingDir(),
+        env: { ...process.env, ...this.contextBuilder.config.env }
       });
       let stdout = "";
       let stderr = "";
@@ -363723,6 +363842,9 @@ var ContextBuilder = class {
   constructor(context2) {
     this.context = context2;
   }
+  get config() {
+    return this.context.config;
+  }
   /**
    * Builds the full context object with all available data.
    */
@@ -365287,7 +365409,7 @@ var McpComplianceTransport = class extends EventEmitter8 {
 // packages/core/dist/src/tools/mcp-client.js
 import { basename as basename7 } from "node:path";
 import { pathToFileURL } from "node:url";
-import { randomUUID as randomUUID18 } from "node:crypto";
+import { randomUUID as randomUUID19 } from "node:crypto";
 
 // packages/core/dist/src/mcp/oauth-token-storage.js
 import { promises as fs75 } from "node:fs";
@@ -366907,7 +367029,7 @@ var McpCallableTool2 = class {
       throw new Error("McpCallableTool only supports single function call");
     }
     const call = functionCalls[0];
-    const progressToken = randomUUID18();
+    const progressToken = randomUUID19();
     const context2 = getToolCallContext();
     if (context2 && this.progressReporter) {
       this.progressReporter.registerProgressToken(progressToken, context2.callId);
@@ -375408,8 +375530,8 @@ function rng3() {
 }
 
 // packages/core/node_modules/uuid/dist-node/native.js
-import { randomUUID as randomUUID19 } from "node:crypto";
-var native_default2 = { randomUUID: randomUUID19 };
+import { randomUUID as randomUUID20 } from "node:crypto";
+var native_default2 = { randomUUID: randomUUID20 };
 
 // packages/core/node_modules/uuid/dist-node/v4.js
 function _v4(options, buf, offset) {
@@ -375825,6 +375947,7 @@ var Config = class {
   useTerminalBuffer;
   useRenderProcess;
   shellExecutionConfig;
+  env;
   extensionManagement = true;
   extensionRegistryURI;
   truncateToolOutputThreshold;
@@ -375991,6 +376114,7 @@ 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;
@@ -376497,6 +376621,9 @@ var Config = class {
       this.refreshSessionScopedPlansDirectory(previousPlansDir);
     }
   }
+  rotateSessionId(sessionId) {
+    this._sessionId = sessionId;
+  }
   resetNewSessionState(sessionId) {
     this.setSessionId(sessionId);
   }
@@ -378742,7 +378869,7 @@ Write the complete content to the \`GEMINI.md\` file. The output must be well-fo
 }
 
 // packages/core/dist/src/commands/memory.js
-import { randomUUID as randomUUID21 } from "node:crypto";
+import { randomUUID as randomUUID22 } from "node:crypto";
 import { constants as fsConstants3 } from "node:fs";
 import * as fs81 from "node:fs/promises";
 import * as path93 from "node:path";
@@ -379161,7 +379288,7 @@ async function resolveTargetWithinAllowedRoots(targetPath, allowedRoots) {
 import * as fs80 from "node:fs/promises";
 import * as path92 from "node:path";
 import { constants as fsConstants2 } from "node:fs";
-import { randomUUID as randomUUID20 } from "node:crypto";
+import { randomUUID as randomUUID21 } from "node:crypto";
 
 // packages/core/dist/src/agents/skill-extraction-agent.js
 var SkillExtractionSchema = external_exports.object({
@@ -380149,7 +380276,7 @@ function buildAgentLoopContext(config2) {
   const autoApproveBus = new MessageBus(autoApprovePolicy);
   return {
     config: config2,
-    promptId: `skill-extraction-${randomUUID20().slice(0, 8)}`,
+    promptId: `skill-extraction-${randomUUID21().slice(0, 8)}`,
     toolRegistry: config2.getToolRegistry(),
     promptRegistry: new PromptRegistry(),
     resourceRegistry: new ResourceRegistry(),
@@ -381180,7 +381307,7 @@ async function restoreCommittedInboxPatchTarget(stagedTarget) {
     return;
   }
   const restoreDir = await findNearestExistingDirectory(path93.dirname(stagedTarget.targetPath));
-  const restorePath = path93.join(restoreDir, `.${path93.basename(stagedTarget.targetPath)}.${randomUUID21()}.rollback`);
+  const restorePath = path93.join(restoreDir, `.${path93.basename(stagedTarget.targetPath)}.${randomUUID22()}.rollback`);
   await writeExclusiveFile(restorePath, stagedTarget.original, stagedTarget.mode);
   await fs81.rename(restorePath, stagedTarget.targetPath);
 }
@@ -381194,7 +381321,7 @@ async function stageInboxPatchTargets(targets) {
         mode = (await fs81.stat(target.targetPath)).mode;
       }
       const tempDir = await findNearestExistingDirectory(path93.dirname(target.targetPath));
-      const tempPath = path93.join(tempDir, `.${path93.basename(target.targetPath)}.${randomUUID21()}.patch-tmp`);
+      const tempPath = path93.join(tempDir, `.${path93.basename(target.targetPath)}.${randomUUID22()}.patch-tmp`);
       await writeExclusiveFile(tempPath, target.patched, mode);
       stagedTargets.push({
         targetPath: target.targetPath,
@@ -387164,12 +387291,6 @@ var ReadManyFilesTool = class _ReadManyFilesTool extends BaseDeclarativeTool {
   }
 };
 
-// packages/core/dist/src/utils/session.js
-import { randomUUID as randomUUID22 } from "node:crypto";
-function createSessionId() {
-  return randomUUID22();
-}
-
 // packages/core/dist/src/utils/compatibility.js
 import os32 from "node:os";
 function isWindows10() {
@@ -395714,6 +395835,7 @@ export {
   resetVersionCache,
   IDEConnectionStatus,
   IdeClient,
+  createSessionId,
   openBrowserSecurely,
   shouldLaunchBrowser,
   getErrorStatus,
@@ -395851,6 +395973,8 @@ export {
   isSchemaDepthError,
   isInvalidArgumentError,
   stripToolCallIdPrefixes,
+  coalesceConsecutiveRoles,
+  stripThoughts2 as stripThoughts,
   populateToolDisplay,
   toolResultDisplayToDisplayContent,
   renderDisplayDiff,
@@ -396140,7 +396264,6 @@ export {
   LegacyAgentProtocol,
   LegacyAgentSession,
   ReadManyFilesTool,
-  createSessionId,
   isWindows10,
   isJetBrainsTerminal,
   isTmux,