@google/gemini-cli 0.53.0-preview.0 → 0.54.0-nightly.20260727.g3818efbbf

package/bundle/{chunk-5RDOS7UZ.js → chunk-CPK5WFFK.js}

@@ -282493,8 +282493,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "9681621c6";
-var CLI_VERSION = "0.53.0-preview.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 = {
@@ -305675,7 +305675,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.53.0-preview.0";
+    return "0.54.0-nightly.20260727.g3818efbbf";
   })();
   return versionPromise;
 }
@@ -306116,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";
@@ -306834,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":
@@ -309330,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);
@@ -309339,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;
@@ -309353,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) {
@@ -309379,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);
     }
@@ -329857,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) {
@@ -330326,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,
@@ -330601,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({
@@ -330624,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);
@@ -330721,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.
@@ -331110,6 +331127,23 @@ function coalesceConsecutiveRoles(history) {
   }
   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";
@@ -338138,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;
@@ -338237,7 +338275,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-E3S5DGLL.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-EJQVJV5M.js");
         const provider = new OAuth2AuthProvider(authConfig, options.agentName ?? "unknown", agentCard, options.agentCardUrl);
         await provider.initialize();
         return provider;
@@ -339796,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");
@@ -339842,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;
@@ -341345,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 {
@@ -341904,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");
 }
@@ -342108,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
             });
           }
@@ -342650,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;
@@ -342702,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 });
@@ -342758,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()
@@ -344665,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);
@@ -346523,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;
@@ -346675,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();
@@ -346924,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
@@ -347304,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);
@@ -347313,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);
@@ -347731,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 = [
@@ -347891,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
@@ -347909,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",
@@ -347960,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
@@ -348031,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
@@ -348467,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) {
@@ -348478,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 {
@@ -348663,7 +348701,7 @@ var LocalSubagentProtocol = class {
   _rawActivityCallback;
   _events = [];
   _subscribers = /* @__PURE__ */ new Set();
-  _streamId = randomUUID14();
+  _streamId = randomUUID15();
   _eventCounter = 0;
   _agentStartEmitted = false;
   _agentEndEmitted = false;
@@ -348741,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;
@@ -348803,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"];
@@ -348821,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"];
@@ -349000,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
@@ -349019,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",
@@ -349071,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
@@ -349169,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
@@ -349203,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";
 }
@@ -349212,7 +349250,7 @@ var RemoteSubagentProtocol = class {
   context;
   _events = [];
   _subscribers = /* @__PURE__ */ new Set();
-  _streamId = randomUUID16();
+  _streamId = randomUUID17();
   _eventCounter = 0;
   _agentStartEmitted = false;
   _agentEndEmitted = false;
@@ -349292,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;
@@ -349667,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";
@@ -351152,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
@@ -351184,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
@@ -351198,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",
@@ -351247,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
@@ -365371,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";
@@ -366991,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);
@@ -375492,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) {
@@ -376583,6 +376621,9 @@ var Config = class {
       this.refreshSessionScopedPlansDirectory(previousPlansDir);
     }
   }
+  rotateSessionId(sessionId) {
+    this._sessionId = sessionId;
+  }
   resetNewSessionState(sessionId) {
     this.setSessionId(sessionId);
   }
@@ -378828,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";
@@ -379247,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({
@@ -380235,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(),
@@ -381266,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);
 }
@@ -381280,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,
@@ -387250,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() {
@@ -395800,6 +395835,7 @@ export {
   resetVersionCache,
   IDEConnectionStatus,
   IdeClient,
+  createSessionId,
   openBrowserSecurely,
   shouldLaunchBrowser,
   getErrorStatus,
@@ -395938,6 +395974,7 @@ export {
   isInvalidArgumentError,
   stripToolCallIdPrefixes,
   coalesceConsecutiveRoles,
+  stripThoughts2 as stripThoughts,
   populateToolDisplay,
   toolResultDisplayToDisplayContent,
   renderDisplayDiff,
@@ -396227,7 +396264,6 @@ export {
   LegacyAgentProtocol,
   LegacyAgentSession,
   ReadManyFilesTool,
-  createSessionId,
   isWindows10,
   isJetBrainsTerminal,
   isTmux,

package/bundle/{chunk-UEI42N7R.js → chunk-DJN5ASV2.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-QGDYKVWX.js";
 import {
   DEFAULT_PORT,
   SERVER_START_WAIT_MS,
@@ -14,10 +14,10 @@ import {
   isServerRunning,
   resolveGemmaConfig,
   writeServerProcessInfo
-} from "./chunk-IODN6H35.js";
+} from "./chunk-NPRNIWWX.js";
 import {
   debugLogger
-} from "./chunk-27C6XFMY.js";
+} from "./chunk-ISVXSEBZ.js";
 import {
   __toESM
 } from "./chunk-34MYV7JD.js";

package/bundle/{chunk-PVCJCQWY.js → chunk-DLH2UGEO.js}

@@ -5,7 +5,7 @@ import {
   isTelemetrySdkInitialized,
   resetBrowserSession,
   shutdownTelemetry
-} from "./chunk-HF533LET.js";
+} from "./chunk-OEJGR4OM.js";
 
 // packages/cli/src/utils/cleanup.ts
 import { promises as fs } from "node:fs";

package/bundle/{chunk-LUM47MYE.js → chunk-DZDRGXE7.js}

@@ -31,7 +31,7 @@ import {
   partListUnionToString,
   require_strip_json_comments,
   sanitizeFilenamePart
-} from "./chunk-5RDOS7UZ.js";
+} from "./chunk-OEJGR4OM.js";
 import {
   __commonJS,
   __require,