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

package/bundle/{chunk-BG2B4WV5.js → chunk-ISVXSEBZ.js}

@@ -278743,72 +278743,96 @@ 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 === "compute-default-credentials" /* COMPUTE_ADC */) {
     try {
       debugLogger.log(
@@ -279188,13 +279212,24 @@ 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) {
@@ -279203,9 +279238,10 @@ 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}:`,
@@ -279213,7 +279249,7 @@ async function fetchCachedCredentials() {
       );
     }
   }
-  return null;
+  return credentialsList;
 }
 function clearOauthClientCache() {
   oauthClientPromises.clear();
@@ -282727,8 +282763,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/src/generated/git-commit.ts
-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/src/ide/detect-ide.ts
 var IDE_DEFINITIONS = {
@@ -290472,6 +290508,12 @@ 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.");
@@ -306216,7 +306258,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.52.0";
+    return "0.54.0-nightly.20260722.gf743ab579";
   })();
   return versionPromise;
 }
@@ -306735,6 +306777,12 @@ ${errorMessage}`,
 // packages/core/src/utils/llm-edit-fixer.ts
 import { createHash as createHash5 } from "node:crypto";
 
+// packages/core/src/utils/session.ts
+import { randomUUID as randomUUID5 } from "node:crypto";
+function createSessionId() {
+  return randomUUID5();
+}
+
 // packages/core/src/utils/secure-browser-launcher.ts
 import { execFile as execFile6 } from "node:child_process";
 import { promisify as promisify7 } from "node:util";
@@ -307555,6 +307603,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":
@@ -310474,6 +310523,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,
@@ -310492,7 +310544,7 @@ var CodeAssistServer = class {
         req,
         userPromptId,
         this.projectId,
-        this.sessionId,
+        this.getEffectiveSessionId(),
         enabledCreditTypes
       ),
       req.config?.abortSignal
@@ -310520,7 +310572,7 @@ var CodeAssistServer = class {
           translatedResponse,
           streamingLatency,
           req.config?.abortSignal,
-          server.sessionId
+          server.getEffectiveSessionId()
           // Use sessionId as trajectoryId
         );
         if (response.consumedCredits) {
@@ -310561,7 +310613,7 @@ var CodeAssistServer = class {
         req,
         userPromptId,
         this.projectId,
-        this.sessionId,
+        this.getEffectiveSessionId(),
         void 0
       ),
       req.config?.abortSignal,
@@ -310579,7 +310631,7 @@ var CodeAssistServer = class {
       translatedResponse,
       streamingLatency,
       req.config?.abortSignal,
-      this.sessionId
+      this.getEffectiveSessionId()
       // Use sessionId as trajectoryId
     );
     if (response.remainingCredits) {
@@ -312064,13 +312116,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 === "oauth-personal" /* LOGIN_WITH_GOOGLE */ || authType === "compute-default-credentials" /* 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 === "gemini-api-key" /* USE_GEMINI */ && geminiApiKey) {
     contentGeneratorConfig.apiKey = geminiApiKey;
     contentGeneratorConfig.vertexai = false;
@@ -312082,7 +312140,7 @@ async function createContentGeneratorConfig(config2, authType, apiKey, baseUrl,
     return contentGeneratorConfig;
   }
   if (authType === "gateway" /* GATEWAY */) {
-    contentGeneratorConfig.apiKey = apiKey || process.env["GEMINI_API_KEY"] || "";
+    contentGeneratorConfig.apiKey = apiKey || getEnv3("GEMINI_API_KEY") || "";
     contentGeneratorConfig.vertexai = false;
     return contentGeneratorConfig;
   }
@@ -322812,7 +322870,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/src/utils/terminalSerializer.ts
 var ColorMode = /* @__PURE__ */ ((ColorMode2) => {
@@ -323689,7 +323747,7 @@ var ExecutionLifecycleService = class {
 };
 
 // packages/core/src/services/shellExecutionService.ts
-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";
@@ -323903,9 +323961,10 @@ ${truncated}`;
       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);
         }
@@ -323918,7 +323977,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,
@@ -323928,7 +323987,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}`;
@@ -325414,6 +325473,7 @@ exit $__code`;
         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,
@@ -332028,10 +332088,10 @@ var TopicState = class {
 };
 
 // packages/core/src/agents/local-executor.ts
-import { randomUUID as randomUUID12 } from "node:crypto";
+import { randomUUID as randomUUID13 } from "node:crypto";
 
 // packages/core/src/core/geminiChat.ts
-import { randomUUID as randomUUID5 } from "node:crypto";
+import { randomUUID as randomUUID6 } from "node:crypto";
 
 // packages/core/src/utils/messageInspectors.ts
 function isFunctionResponse(content) {
@@ -332498,7 +332558,7 @@ var GeminiChat = class {
     let initialHistory;
     if (history.length > 0) {
       initialHistory = history.map(
-        (item) => "id" in item && "content" in item ? item : { id: randomUUID5(), content: item }
+        (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) => ({
@@ -332786,7 +332846,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);
@@ -332841,7 +332902,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({
@@ -332876,7 +332937,7 @@ var GeminiChat = class {
             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);
@@ -332985,7 +333046,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.
@@ -333388,6 +333456,44 @@ 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/src/utils/ragLogger.ts
 import * as fs50 from "node:fs";
@@ -340689,7 +340795,13 @@ var GoogleCredentialsAuthProvider = class extends BaseA2AAuthProvider {
         "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;
@@ -340803,7 +340915,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-THDZ27ZX.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-3THMIWTP.js");
         const provider = new OAuth2AuthProvider(
           authConfig,
           options.agentName ?? "unknown",
@@ -342497,7 +342609,7 @@ var SchedulerStateManager = class {
 
 // packages/core/src/scheduler/confirmation.ts
 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");
@@ -342549,7 +342661,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;
@@ -343158,8 +343270,7 @@ var LoopDetectionService = class {
   promptId = "";
   userPrompt = "";
   // Tool call tracking
-  lastToolCallKey = null;
-  toolCallRepetitionCount = 0;
+  toolCallHistory = [];
   // Content streaming tracking
   streamContentHistory = "";
   contentStats = /* @__PURE__ */ new Map();
@@ -343301,14 +343412,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;
   }
@@ -343608,8 +343736,7 @@ ${this.userPrompt}
     this.loopDetected = false;
   }
   resetToolCallCount() {
-    this.lastToolCallKey = null;
-    this.toolCallRepetitionCount = 0;
+    this.toolCallHistory = [];
   }
   resetContentTracking(resetHistory = true) {
     if (resetHistory) {
@@ -344211,7 +344338,7 @@ Output too large. Full output available at: ${filePath}
 };
 
 // packages/core/src/core/client.ts
-import { randomUUID as randomUUID10 } from "node:crypto";
+import { randomUUID as randomUUID11 } from "node:crypto";
 
 // packages/core/src/context/config/registry.ts
 var ContextProcessorRegistry = class {
@@ -344793,7 +344920,7 @@ function formatNodesForLlm(nodes, options = {}) {
 }
 
 // packages/core/src/context/utils/snapshotGenerator.ts
-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");
 }
@@ -345006,7 +345133,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
             });
           }
@@ -345664,7 +345791,7 @@ async function loadContextManagementConfig(sidecarPath, registry2) {
 // packages/core/src/context/tracer.ts
 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;
@@ -345718,7 +345845,7 @@ var ContextTracer = class {
   saveAsset(component, assetName, data) {
     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 });
@@ -345774,12 +345901,12 @@ var ContextEventBus = class extends EventEmitter5 {
 };
 
 // packages/core/src/context/pipeline/inbox.ts
-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()
@@ -347876,7 +348003,7 @@ var GeminiClient = class {
       if (this.contextManager) {
         const rawPendingRequest = createUserContent(request);
         const pendingRequest = {
-          id: randomUUID10(),
+          id: randomUUID11(),
           content: rawPendingRequest
         };
         const {
@@ -350157,7 +350284,7 @@ function createScopedWorkspaceContext(parentContext, additionalDirectories) {
 }
 
 // packages/core/src/confirmation-bus/message-bus.ts
-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 {
   constructor(policyEngine, debug2 = false, isTrusted = true) {
@@ -350318,7 +350445,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();
@@ -350602,7 +350729,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
@@ -351047,7 +351174,7 @@ var LocalAgentExecutor = class _LocalAgentExecutor {
     } else if (info2.compressionStatus === 1 /* COMPRESSED */) {
       if (newHistory) {
         const turns = newHistory.map((c4) => ({
-          id: randomUUID12(),
+          id: randomUUID13(),
           content: c4
         }));
         chat.setHistory(turns);
@@ -351056,7 +351183,7 @@ var LocalAgentExecutor = class _LocalAgentExecutor {
     } else if (info2.compressionStatus === 6 /* CONTENT_TRUNCATED */) {
       if (newHistory) {
         const turns = newHistory.map((c4) => ({
-          id: randomUUID12(),
+          id: randomUUID13(),
           content: c4
         }));
         chat.setHistory(turns);
@@ -351510,7 +351637,7 @@ Important Rules:
 };
 
 // packages/core/src/agents/local-invocation.ts
-import { randomUUID as randomUUID13 } from "node:crypto";
+import { randomUUID as randomUUID14 } from "node:crypto";
 
 // packages/core/src/utils/agent-sanitization-utils.ts
 var SENSITIVE_KEY_PATTERNS = [
@@ -351686,7 +351813,7 @@ var LocalSubagentInvocation = class extends BaseToolInvocation {
               lastItem.content = sanitizeThoughtContent(text);
             } else {
               recentActivity.push({
-                id: randomUUID13(),
+                id: randomUUID14(),
                 type: "thought",
                 content: sanitizeThoughtContent(text),
                 status: "running" /* RUNNING */
@@ -351706,7 +351833,7 @@ var LocalSubagentInvocation = class extends BaseToolInvocation {
             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",
@@ -351757,7 +351884,7 @@ var LocalSubagentInvocation = class extends BaseToolInvocation {
               }
             }
             recentActivity.push({
-              id: randomUUID13(),
+              id: randomUUID14(),
               type: "thought",
               content: isCancellation || isRejection ? sanitizedError : `Error: ${sanitizedError}`,
               status: isCancellation || isRejection ? "cancelled" /* CANCELLED */ : "error" /* ERROR */
@@ -351832,7 +351959,7 @@ ${output.result}`;
         const lastActivity = recentActivity[recentActivity.length - 1];
         if (!lastActivity || lastActivity.status !== "error" /* ERROR */) {
           recentActivity.push({
-            id: randomUUID13(),
+            id: randomUUID14(),
             type: "thought",
             content: `Error: ${errorMessage}`,
             status: "error" /* ERROR */
@@ -352288,7 +352415,7 @@ ${errorMessage}` : errorMessage;
 };
 
 // packages/core/src/agents/local-session-invocation.ts
-import { randomUUID as randomUUID15 } from "node:crypto";
+import { randomUUID as randomUUID16 } from "node:crypto";
 
 // packages/core/src/utils/checks.ts
 function assumeExhaustive(_value) {
@@ -352299,7 +352426,7 @@ function checkExhaustive(value, msg = `unexpected value ${value}!`) {
 }
 
 // packages/core/src/agents/local-subagent-protocol.ts
-import { randomUUID as randomUUID14 } from "node:crypto";
+import { randomUUID as randomUUID15 } from "node:crypto";
 
 // packages/core/src/agent/agent-session.ts
 var AgentSession = class {
@@ -352494,7 +352621,7 @@ var LocalSubagentProtocol = class {
   }
   _events = [];
   _subscribers = /* @__PURE__ */ new Set();
-  _streamId = randomUUID14();
+  _streamId = randomUUID15();
   _eventCounter = 0;
   _agentStartEmitted = false;
   _agentEndEmitted = false;
@@ -352569,7 +352696,7 @@ var LocalSubagentProtocol = class {
   // Core: execution
   // ---------------------------------------------------------------------------
   _beginNewStream() {
-    this._streamId = randomUUID14();
+    this._streamId = randomUUID15();
     this._eventCounter = 0;
     this._abortController = new AbortController();
     this._agentStartEmitted = false;
@@ -352635,7 +352762,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"];
@@ -352653,7 +352780,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"];
@@ -352838,7 +352965,7 @@ var LocalSessionInvocation = class extends BaseToolInvocation {
             lastItem.content = sanitizeThoughtContent(text);
           } else {
             recentActivity.push({
-              id: randomUUID15(),
+              id: randomUUID16(),
               type: "thought",
               content: sanitizeThoughtContent(text),
               status: "running" /* RUNNING */
@@ -352857,7 +352984,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",
@@ -352909,7 +353036,7 @@ var LocalSessionInvocation = class extends BaseToolInvocation {
             }
           }
           recentActivity.push({
-            id: randomUUID15(),
+            id: randomUUID16(),
             type: "thought",
             content: isCancellation || isRejection ? sanitizedError : `Error: ${sanitizedError}`,
             status: isCancellation || isRejection ? "cancelled" /* CANCELLED */ : "error" /* ERROR */
@@ -353012,7 +353139,7 @@ ${output.result}`;
         const lastActivity = recentActivity[recentActivity.length - 1];
         if (!lastActivity || lastActivity.status !== "error" /* ERROR */) {
           recentActivity.push({
-            id: randomUUID15(),
+            id: randomUUID16(),
             type: "thought",
             content: `Error: ${errorMessage}`,
             status: "error" /* ERROR */
@@ -353046,7 +353173,7 @@ ${output.result}`;
 };
 
 // packages/core/src/agents/remote-subagent-protocol.ts
-import { randomUUID as randomUUID16 } from "node:crypto";
+import { randomUUID as randomUUID17 } from "node:crypto";
 function isAbortLikeError2(err2) {
   return err2 instanceof Error && err2.name === "AbortError";
 }
@@ -353062,7 +353189,7 @@ var RemoteSubagentProtocol = class {
   }
   _events = [];
   _subscribers = /* @__PURE__ */ new Set();
-  _streamId = randomUUID16();
+  _streamId = randomUUID17();
   _eventCounter = 0;
   _agentStartEmitted = false;
   _agentEndEmitted = false;
@@ -353135,7 +353262,7 @@ var RemoteSubagentProtocol = class {
   // Core: A2A streaming
   // ---------------------------------------------------------------------------
   _beginNewStream() {
-    this._streamId = randomUUID16();
+    this._streamId = randomUUID17();
     this._eventCounter = 0;
     this._abortController = new AbortController();
     this._agentStartEmitted = false;
@@ -353549,7 +353676,7 @@ ${errorMessage}` : errorMessage;
 };
 
 // packages/core/src/agents/browser/browserAgentInvocation.ts
-import { randomUUID as randomUUID17 } from "node:crypto";
+import { randomUUID as randomUUID18 } from "node:crypto";
 
 // packages/core/src/utils/browserConsent.ts
 import * as fs59 from "node:fs/promises";
@@ -355229,7 +355356,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: "completed" /* COMPLETED */
@@ -355264,7 +355391,7 @@ var BrowserAgentInvocation = class extends BaseToolInvocation {
               lastItem.content = sanitizeThoughtContent(text);
             } else {
               recentActivity.push({
-                id: randomUUID17(),
+                id: randomUUID18(),
                 type: "thought",
                 content: sanitizeThoughtContent(text),
                 status: "running" /* RUNNING */
@@ -355280,7 +355407,7 @@ var BrowserAgentInvocation = class extends BaseToolInvocation {
             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",
@@ -355329,7 +355456,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
@@ -368681,7 +368808,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 = "";
@@ -368787,6 +368916,9 @@ var ContextBuilder = class {
   constructor(context2) {
     this.context = context2;
   }
+  get config() {
+    return this.context.config;
+  }
   /**
    * Builds the full context object with all available data.
    */
@@ -370439,7 +370571,7 @@ var McpComplianceTransport = class extends EventEmitter8 {
 // packages/core/src/tools/mcp-client.ts
 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/src/mcp/oauth-token-storage.ts
 import { promises as fs75 } from "node:fs";
@@ -372412,7 +372544,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(
@@ -381149,8 +381281,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) {
@@ -381555,6 +381687,7 @@ var Config = class {
   useTerminalBuffer;
   useRenderProcess;
   shellExecutionConfig;
+  env;
   extensionManagement = true;
   extensionRegistryURI;
   truncateToolOutputThreshold;
@@ -381728,6 +381861,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;
@@ -382289,6 +382423,9 @@ var Config = class {
       this.refreshSessionScopedPlansDirectory(previousPlansDir);
     }
   }
+  rotateSessionId(sessionId) {
+    this._sessionId = sessionId;
+  }
   resetNewSessionState(sessionId) {
     this.setSessionId(sessionId);
   }
@@ -384760,7 +384897,7 @@ Write the complete content to the \`GEMINI.md\` file. The output must be well-fo
 }
 
 // packages/core/src/commands/memory.ts
-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";
@@ -385249,7 +385386,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/src/agents/skill-extraction-agent.ts
 var SkillExtractionSchema = external_exports.object({
@@ -386268,7 +386405,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(),
@@ -387436,7 +387573,7 @@ async function restoreCommittedInboxPatchTarget(stagedTarget) {
   );
   const restorePath = path93.join(
     restoreDir,
-    `.${path93.basename(stagedTarget.targetPath)}.${randomUUID21()}.rollback`
+    `.${path93.basename(stagedTarget.targetPath)}.${randomUUID22()}.rollback`
   );
   await writeExclusiveFile(
     restorePath,
@@ -387459,7 +387596,7 @@ async function stageInboxPatchTargets(targets) {
       );
       const tempPath = path93.join(
         tempDir,
-        `.${path93.basename(target.targetPath)}.${randomUUID21()}.patch-tmp`
+        `.${path93.basename(target.targetPath)}.${randomUUID22()}.patch-tmp`
       );
       await writeExclusiveFile(tempPath, target.patched, mode);
       stagedTargets.push({
@@ -393690,12 +393827,6 @@ var ReadManyFilesTool = class _ReadManyFilesTool extends BaseDeclarativeTool {
   }
 };
 
-// packages/core/src/utils/session.ts
-import { randomUUID as randomUUID22 } from "node:crypto";
-function createSessionId() {
-  return randomUUID22();
-}
-
 // packages/core/src/utils/compatibility.ts
 import os32 from "node:os";
 function isWindows10() {
@@ -402312,6 +402443,7 @@ export {
   resetVersionCache,
   IDEConnectionStatus,
   IdeClient,
+  createSessionId,
   openBrowserSecurely,
   shouldLaunchBrowser,
   getErrorStatus,
@@ -402449,6 +402581,8 @@ export {
   isSchemaDepthError,
   isInvalidArgumentError,
   stripToolCallIdPrefixes,
+  coalesceConsecutiveRoles,
+  stripThoughts2 as stripThoughts,
   populateToolDisplay,
   toolResultDisplayToDisplayContent,
   renderDisplayDiff,
@@ -402738,7 +402872,6 @@ export {
   LegacyAgentProtocol,
   LegacyAgentSession,
   ReadManyFilesTool,
-  createSessionId,
   isWindows10,
   isJetBrainsTerminal,
   isTmux,