@google/gemini-cli-a2a-server 0.53.0-preview.0 → 0.54.0-nightly.20260726.g3818efbbf

package/dist/a2a-server.mjs

@@ -80891,7 +80891,7 @@ var require_gaxios2 = __commonJS({
     var retry_js_1 = require_retry6();
     var stream_1 = __require("stream");
     var interceptor_js_1 = require_interceptor2();
-    var randomUUID23 = async () => globalThis.crypto?.randomUUID() || (await import("crypto")).randomUUID();
+    var randomUUID24 = async () => globalThis.crypto?.randomUUID() || (await import("crypto")).randomUUID();
     var HTTP_STATUS_NO_CONTENT = 204;
     var Gaxios = class {
       agentCache = /* @__PURE__ */ new Map();
@@ -81164,7 +81164,7 @@ var require_gaxios2 = __commonJS({
          */
         ["Blob", "File", "FormData"].includes(opts.data?.constructor?.name || "");
         if (opts.multipart?.length) {
-          const boundary = await randomUUID23();
+          const boundary = await randomUUID24();
           preparedHeaders.set("content-type", `multipart/related; boundary=${boundary}`);
           opts.body = stream_1.Readable.from(this.getMultipartRequest(opts.multipart, boundary));
         } else if (shouldDirectlyPassData) {
@@ -109138,7 +109138,7 @@ var require_gaxios3 = __commonJS({
     var retry_js_1 = require_retry7();
     var stream_1 = __require("stream");
     var interceptor_js_1 = require_interceptor3();
-    var randomUUID23 = async () => globalThis.crypto?.randomUUID() || (await import("crypto")).randomUUID();
+    var randomUUID24 = async () => globalThis.crypto?.randomUUID() || (await import("crypto")).randomUUID();
     var HTTP_STATUS_NO_CONTENT = 204;
     var Gaxios = class {
       agentCache = /* @__PURE__ */ new Map();
@@ -109411,7 +109411,7 @@ var require_gaxios3 = __commonJS({
          */
         ["Blob", "File", "FormData"].includes(opts.data?.constructor?.name || "");
         if (opts.multipart?.length) {
-          const boundary = await randomUUID23();
+          const boundary = await randomUUID24();
           preparedHeaders.set("content-type", `multipart/related; boundary=${boundary}`);
           opts.body = stream_1.Readable.from(this.getMultipartRequest(opts.multipart, boundary));
         } else if (shouldDirectlyPassData) {
@@ -220929,8 +220929,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "9681621c6";
-    CLI_VERSION = "0.53.0-preview.0";
+    GIT_COMMIT_INFO = "3818efbbf";
+    CLI_VERSION = "0.54.0-nightly.20260726.g3818efbbf";
   }
 });
 
@@ -336548,7 +336548,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.53.0-preview.0";
+    return "0.54.0-nightly.20260726.g3818efbbf";
   })();
   return versionPromise;
 }
@@ -337009,6 +337009,17 @@ ${errorMessage}`, true);
   }
 });
 
+// packages/core/dist/src/utils/session.js
+import { randomUUID as randomUUID7 } from "node:crypto";
+function createSessionId() {
+  return randomUUID7();
+}
+var init_session = __esm({
+  "packages/core/dist/src/utils/session.js"() {
+    "use strict";
+  }
+});
+
 // packages/core/dist/src/utils/secure-browser-launcher.js
 import { execFile as execFile6 } from "node:child_process";
 import { promisify as promisify10 } from "node:util";
@@ -337773,6 +337784,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":
@@ -337794,6 +337806,7 @@ var UPGRADE_URL_PAGE;
 var init_handler = __esm({
   "packages/core/dist/src/fallback/handler.js"() {
     "use strict";
+    init_session();
     init_secure_browser_launcher();
     init_debugLogger();
     init_errors2();
@@ -340491,6 +340504,9 @@ var init_server = __esm({
         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);
@@ -340500,7 +340516,7 @@ var init_server = __esm({
           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;
@@ -340514,7 +340530,7 @@ var init_server = __esm({
             }
             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) {
@@ -340540,14 +340556,14 @@ var init_server = __esm({
       }
       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);
         }
@@ -365987,7 +366003,7 @@ var init_historyHardening = __esm({
 });
 
 // packages/core/dist/src/core/geminiChat.js
-import { randomUUID as randomUUID7 } from "node:crypto";
+import { randomUUID as randomUUID8 } from "node:crypto";
 function isIndexedPart(part) {
   return "callIndex" in part;
 }
@@ -366116,6 +366132,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((p2) => p2 && p2.thought);
+    if (!hasThought)
+      return turn;
+    const nonThoughtParts = turn.content.parts.filter((p2) => p2 && !p2.thought);
+    return {
+      ...turn,
+      content: {
+        ...turn.content,
+        parts: nonThoughtParts
+      }
+    };
+  }).filter((turn) => !turn.content.parts || turn.content.parts.length > 0);
+}
 var StreamEventType, MID_STREAM_RETRY_OPTIONS, SYNTHETIC_THOUGHT_SIGNATURE2, InvalidStreamError, AgentExecutionStoppedError, AgentExecutionBlockedError, GeminiChat;
 var init_geminiChat = __esm({
   "packages/core/dist/src/core/geminiChat.js"() {
@@ -366197,7 +366230,7 @@ var init_geminiChat = __esm({
         validateHistory2(history);
         let initialHistory;
         if (history.length > 0) {
-          initialHistory = history.map((item) => "id" in item && "content" in item ? item : { id: randomUUID7(), content: item });
+          initialHistory = history.map((item) => "id" in item && "content" in item ? item : { id: randomUUID8(), content: item });
         } else if (resumedSessionData) {
           initialHistory = resumedSessionData.conversation.messages.filter((m3) => m3.type === "user" || m3.type === "gemini").map((m3) => ({
             id: m3.id,
@@ -366472,7 +366505,7 @@ var init_geminiChat = __esm({
             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({
@@ -366495,7 +366528,7 @@ var init_geminiChat = __esm({
             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);
@@ -366592,7 +366625,14 @@ var init_geminiChat = __esm({
        */
       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.
@@ -374154,7 +374194,11 @@ var init_google_credentials_provider = __esm({
         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;
@@ -379789,7 +379833,7 @@ var init_state_manager = __esm({
 
 // packages/core/dist/src/scheduler/confirmation.js
 import { on as on2 } from "node:events";
-import { randomUUID as randomUUID8 } from "node:crypto";
+import { randomUUID as randomUUID9 } from "node:crypto";
 async function awaitConfirmation(messageBus, correlationId, signal) {
   if (signal.aborted) {
     throw new Error("Operation cancelled");
@@ -379835,7 +379879,7 @@ async function resolveConfirmation(toolCall, signal, deps) {
       details.systemMessage = deps.systemMessage;
     }
     await notifyHooks(deps, details);
-    const correlationId = randomUUID8();
+    const correlationId = randomUUID9();
     const serializableDetails = details;
     lastDetails = serializableDetails;
     const ideConfirmation = "ideConfirmation" in details ? details.ideConfirmation : void 0;
@@ -382010,7 +382054,7 @@ var init_formatNodesForLlm = __esm({
 });
 
 // packages/core/dist/src/context/utils/snapshotGenerator.js
-import { randomUUID as randomUUID9 } from "node:crypto";
+import { randomUUID as randomUUID10 } from "node:crypto";
 function isStringArray(value) {
   return Array.isArray(value) && value.every((item) => typeof item === "string");
 }
@@ -382223,7 +382267,7 @@ ${formatNodesForLlm(nodes)}`;
               const desc = t3["description"];
               if (typeof desc === "string" && desc) {
                 newState.active_tasks.push({
-                  id: `task_${randomUUID9().slice(0, 8)}`,
+                  id: `task_${randomUUID10().slice(0, 8)}`,
                   description: desc
                 });
               }
@@ -382814,7 +382858,7 @@ var init_configLoader = __esm({
 // packages/core/dist/src/context/tracer.js
 import * as fsSync3 from "node:fs";
 import * as path71 from "node:path";
-import { randomUUID as randomUUID10 } from "node:crypto";
+import { randomUUID as randomUUID11 } from "node:crypto";
 var ContextTracer;
 var init_tracer = __esm({
   "packages/core/dist/src/context/tracer.js"() {
@@ -382871,7 +382915,7 @@ var init_tracer = __esm({
         if (!this.enabled)
           return "asset-recording-disabled";
         try {
-          const assetId = `${Date.now()}-${randomUUID10()}-${assetName}.json`;
+          const assetId = `${Date.now()}-${randomUUID11()}-${assetName}.json`;
           const assetPath = path71.join(this.assetsDir, assetId);
           fsSync3.writeFileSync(assetPath, JSON.stringify(data, null, 2), "utf-8");
           this.logEvent(component, `Saved asset: ${assetName}`, { assetId });
@@ -382935,7 +382979,7 @@ var init_eventBus = __esm({
 });
 
 // packages/core/dist/src/context/pipeline/inbox.js
-import { randomUUID as randomUUID11 } from "node:crypto";
+import { randomUUID as randomUUID12 } from "node:crypto";
 var LiveInbox, InboxSnapshotImpl;
 var init_inbox = __esm({
   "packages/core/dist/src/context/pipeline/inbox.js"() {
@@ -382944,7 +382988,7 @@ var init_inbox = __esm({
       messages = [];
       publish(topic, payload) {
         this.messages.push({
-          id: randomUUID11(),
+          id: randomUUID12(),
           topic,
           payload,
           timestamp: Date.now()
@@ -384635,7 +384679,7 @@ var init_initializer = __esm({
 });
 
 // packages/core/dist/src/core/client.js
-import { randomUUID as randomUUID12 } from "node:crypto";
+import { randomUUID as randomUUID13 } from "node:crypto";
 var MAX_TURNS, GeminiClient;
 var init_client3 = __esm({
   "packages/core/dist/src/core/client.js"() {
@@ -385037,7 +385081,7 @@ var init_client3 = __esm({
           if (this.contextManager) {
             const rawPendingRequest = createUserContent(request);
             const pendingRequest = {
-              id: randomUUID12(),
+              id: randomUUID13(),
               content: rawPendingRequest
             };
             const { history: newHistory, apiHistory, pendingApiHistory, baseUnits } = await this.contextManager.renderHistory(pendingRequest, void 0, signal);
@@ -386891,7 +386935,7 @@ var init_scoped_config = __esm({
 });
 
 // packages/core/dist/src/confirmation-bus/message-bus.js
-import { randomUUID as randomUUID13 } from "node:crypto";
+import { randomUUID as randomUUID14 } from "node:crypto";
 import { EventEmitter as EventEmitter7 } from "node:events";
 var MessageBus;
 var init_message_bus = __esm({
@@ -387051,7 +387095,7 @@ var init_message_bus = __esm({
        * The correlation ID is generated internally and added to the request
        */
       async request(request, responseType, timeoutMs = 6e4) {
-        const correlationId = randomUUID13();
+        const correlationId = randomUUID14();
         return new Promise((resolve23, reject) => {
           const timeoutId = setTimeout(() => {
             cleanup();
@@ -387179,7 +387223,7 @@ var init_complete_task = __esm({
 });
 
 // packages/core/dist/src/agents/local-executor.js
-import { randomUUID as randomUUID14 } from "node:crypto";
+import { randomUUID as randomUUID15 } from "node:crypto";
 function createUnauthorizedToolError(toolName) {
   return `Unauthorized tool call: '${toolName}' is not available to this agent.`;
 }
@@ -387352,7 +387396,7 @@ var init_local_executor = __esm({
         this.compressionService = new ChatCompressionService();
         this.parentCallId = parentCallId;
         this.cache = new import_lru_cache.default(10);
-        this.agentId = randomUUID14();
+        this.agentId = randomUUID15();
       }
       /**
        * Executes a single turn of the agent's logic, from calling the model
@@ -387732,7 +387776,7 @@ var init_local_executor = __esm({
         } else if (info2.compressionStatus === CompressionStatus.COMPRESSED) {
           if (newHistory) {
             const turns = newHistory.map((c2) => ({
-              id: randomUUID14(),
+              id: randomUUID15(),
               content: c2
             }));
             chat.setHistory(turns);
@@ -387741,7 +387785,7 @@ var init_local_executor = __esm({
         } else if (info2.compressionStatus === CompressionStatus.CONTENT_TRUNCATED) {
           if (newHistory) {
             const turns = newHistory.map((c2) => ({
-              id: randomUUID14(),
+              id: randomUUID15(),
               content: c2
             }));
             chat.setHistory(turns);
@@ -388261,7 +388305,7 @@ var init_agent_sanitization_utils = __esm({
 });
 
 // packages/core/dist/src/agents/local-invocation.js
-import { randomUUID as randomUUID15 } from "node:crypto";
+import { randomUUID as randomUUID16 } from "node:crypto";
 var LocalSubagentInvocation;
 var init_local_invocation = __esm({
   "packages/core/dist/src/agents/local-invocation.js"() {
@@ -388336,7 +388380,7 @@ var init_local_invocation = __esm({
                   lastItem.content = sanitizeThoughtContent(text);
                 } else {
                   recentActivity.push({
-                    id: randomUUID15(),
+                    id: randomUUID16(),
                     type: "thought",
                     content: sanitizeThoughtContent(text),
                     status: SubagentState.RUNNING
@@ -388354,7 +388398,7 @@ var init_local_invocation = __esm({
                 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"]) : randomUUID15();
+                const callId = activity.data["callId"] ? String(activity.data["callId"]) : randomUUID16();
                 recentActivity.push({
                   id: callId,
                   type: "tool_call",
@@ -388405,7 +388449,7 @@ var init_local_invocation = __esm({
                   }
                 }
                 recentActivity.push({
-                  id: randomUUID15(),
+                  id: randomUUID16(),
                   type: "thought",
                   content: isCancellation || isRejection ? sanitizedError : `Error: ${sanitizedError}`,
                   status: isCancellation || isRejection ? SubagentState.CANCELLED : SubagentState.ERROR
@@ -388476,7 +388520,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
@@ -389107,7 +389151,7 @@ var init_agent_session = __esm({
 });
 
 // packages/core/dist/src/agents/local-subagent-protocol.js
-import { randomUUID as randomUUID16 } from "node:crypto";
+import { randomUUID as randomUUID17 } from "node:crypto";
 function isAbortLikeError(err2) {
   return err2 instanceof Error && err2.name === "AbortError";
 }
@@ -389143,7 +389187,7 @@ var init_local_subagent_protocol = __esm({
       _rawActivityCallback;
       _events = [];
       _subscribers = /* @__PURE__ */ new Set();
-      _streamId = randomUUID16();
+      _streamId = randomUUID17();
       _eventCounter = 0;
       _agentStartEmitted = false;
       _agentEndEmitted = false;
@@ -389221,7 +389265,7 @@ var init_local_subagent_protocol = __esm({
       // Core: execution
       // ---------------------------------------------------------------------------
       _beginNewStream() {
-        this._streamId = randomUUID16();
+        this._streamId = randomUUID17();
         this._eventCounter = 0;
         this._abortController = new AbortController();
         this._agentStartEmitted = false;
@@ -389283,7 +389327,7 @@ var init_local_subagent_protocol = __esm({
           }
           case "TOOL_CALL_START": {
             const rawCallId = activity.data["callId"];
-            const callId = String(rawCallId ?? randomUUID16());
+            const callId = String(rawCallId ?? randomUUID17());
             const rawName = activity.data["name"];
             const name3 = String(rawName ?? "unknown");
             const rawArgs = activity.data["args"];
@@ -389301,7 +389345,7 @@ var init_local_subagent_protocol = __esm({
           }
           case "TOOL_CALL_END": {
             const rawId = activity.data["id"];
-            const requestId = String(rawId ?? randomUUID16());
+            const requestId = String(rawId ?? randomUUID17());
             const rawName = activity.data["name"];
             const name3 = String(rawName ?? "unknown");
             const rawOutput = activity.data["output"];
@@ -389427,7 +389471,7 @@ var init_local_subagent_protocol = __esm({
 });
 
 // packages/core/dist/src/agents/local-session-invocation.js
-import { randomUUID as randomUUID17 } from "node:crypto";
+import { randomUUID as randomUUID18 } from "node:crypto";
 var MAX_RECENT_ACTIVITY, LocalSessionInvocation;
 var init_local_session_invocation = __esm({
   "packages/core/dist/src/agents/local-session-invocation.js"() {
@@ -389494,7 +389538,7 @@ var init_local_session_invocation = __esm({
                 lastItem.content = sanitizeThoughtContent(text);
               } else {
                 recentActivity.push({
-                  id: randomUUID17(),
+                  id: randomUUID18(),
                   type: "thought",
                   content: sanitizeThoughtContent(text),
                   status: SubagentState.RUNNING
@@ -389513,7 +389557,7 @@ var init_local_session_invocation = __esm({
               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"]) : randomUUID17();
+              const callId = activity.data["callId"] ? String(activity.data["callId"]) : randomUUID18();
               recentActivity.push({
                 id: callId,
                 type: "tool_call",
@@ -389565,7 +389609,7 @@ var init_local_session_invocation = __esm({
                 }
               }
               recentActivity.push({
-                id: randomUUID17(),
+                id: randomUUID18(),
                 type: "thought",
                 content: isCancellation || isRejection ? sanitizedError : `Error: ${sanitizedError}`,
                 status: isCancellation || isRejection ? SubagentState.CANCELLED : SubagentState.ERROR
@@ -389663,7 +389707,7 @@ ${output.result}`;
             const lastActivity = recentActivity[recentActivity.length - 1];
             if (!lastActivity || lastActivity.status !== SubagentState.ERROR) {
               recentActivity.push({
-                id: randomUUID17(),
+                id: randomUUID18(),
                 type: "thought",
                 content: `Error: ${errorMessage}`,
                 status: SubagentState.ERROR
@@ -389699,7 +389743,7 @@ ${output.result}`;
 });
 
 // packages/core/dist/src/agents/remote-subagent-protocol.js
-import { randomUUID as randomUUID18 } from "node:crypto";
+import { randomUUID as randomUUID19 } from "node:crypto";
 function isAbortLikeError2(err2) {
   return err2 instanceof Error && err2.name === "AbortError";
 }
@@ -389718,7 +389762,7 @@ var init_remote_subagent_protocol = __esm({
       context;
       _events = [];
       _subscribers = /* @__PURE__ */ new Set();
-      _streamId = randomUUID18();
+      _streamId = randomUUID19();
       _eventCounter = 0;
       _agentStartEmitted = false;
       _agentEndEmitted = false;
@@ -389798,7 +389842,7 @@ var init_remote_subagent_protocol = __esm({
       // Core: A2A streaming
       // ---------------------------------------------------------------------------
       _beginNewStream() {
-        this._streamId = randomUUID18();
+        this._streamId = randomUUID19();
         this._eventCounter = 0;
         this._abortController = new AbortController();
         this._agentStartEmitted = false;
@@ -391695,7 +391739,7 @@ var init_browserAgentFactory = __esm({
 });
 
 // packages/core/dist/src/agents/browser/browserAgentInvocation.js
-import { randomUUID as randomUUID19 } from "node:crypto";
+import { randomUUID as randomUUID20 } from "node:crypto";
 var INPUT_PREVIEW_MAX_LENGTH, DESCRIPTION_MAX_LENGTH, MAX_RECENT_ACTIVITY2, BrowserAgentInvocation;
 var init_browserAgentInvocation = __esm({
   "packages/core/dist/src/agents/browser/browserAgentInvocation.js"() {
@@ -391764,7 +391808,7 @@ var init_browserAgentInvocation = __esm({
           const printOutput = updateOutput ? (msg) => {
             const sanitizedMsg = sanitizeThoughtContent(msg);
             recentActivity.push({
-              id: randomUUID19(),
+              id: randomUUID20(),
               type: "thought",
               content: sanitizedMsg,
               status: SubagentState.COMPLETED
@@ -391796,7 +391840,7 @@ var init_browserAgentInvocation = __esm({
                   lastItem.content = sanitizeThoughtContent(text);
                 } else {
                   recentActivity.push({
-                    id: randomUUID19(),
+                    id: randomUUID20(),
                     type: "thought",
                     content: sanitizeThoughtContent(text),
                     status: SubagentState.RUNNING
@@ -391810,7 +391854,7 @@ var init_browserAgentInvocation = __esm({
                 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"]) : randomUUID19();
+                const callId = activity.data["callId"] ? String(activity.data["callId"]) : randomUUID20();
                 recentActivity.push({
                   id: callId,
                   type: "tool_call",
@@ -391859,7 +391903,7 @@ var init_browserAgentInvocation = __esm({
                 }
                 const sanitizedError = sanitizeErrorMessage(error2);
                 recentActivity.push({
-                  id: randomUUID19(),
+                  id: randomUUID20(),
                   type: "thought",
                   content: isCancellation ? sanitizedError : `Error: ${sanitizedError}`,
                   status: newStatus
@@ -406894,7 +406938,7 @@ var init_envExpansion = __esm({
 // packages/core/dist/src/tools/mcp-client.js
 import { basename as basename9 } from "node:path";
 import { pathToFileURL } from "node:url";
-import { randomUUID as randomUUID20 } from "node:crypto";
+import { randomUUID as randomUUID21 } from "node:crypto";
 function updateMCPServerStatus(serverName, status2) {
   serverStatuses.set(serverName, status2);
   for (const listener of statusChangeListeners) {
@@ -408019,7 +408063,7 @@ var init_mcp_client = __esm({
           throw new Error("McpCallableTool only supports single function call");
         }
         const call = functionCalls[0];
-        const progressToken = randomUUID20();
+        const progressToken = randomUUID21();
         const context2 = getToolCallContext();
         if (context2 && this.progressReporter) {
           this.progressReporter.registerProgressToken(progressToken, context2.callId);
@@ -412957,11 +413001,11 @@ var init_rng3 = __esm({
 });
 
 // packages/core/node_modules/uuid/dist-node/native.js
-import { randomUUID as randomUUID21 } from "node:crypto";
+import { randomUUID as randomUUID22 } from "node:crypto";
 var native_default4;
 var init_native2 = __esm({
   "packages/core/node_modules/uuid/dist-node/native.js"() {
-    native_default4 = { randomUUID: randomUUID21 };
+    native_default4 = { randomUUID: randomUUID22 };
   }
 });
 
@@ -414178,6 +414222,9 @@ var init_config4 = __esm({
           this.refreshSessionScopedPlansDirectory(previousPlansDir);
         }
       }
+      rotateSessionId(sessionId) {
+        this._sessionId = sessionId;
+      }
       resetNewSessionState(sessionId) {
         this.setSessionId(sessionId);
       }
@@ -419763,13 +419810,6 @@ ${REFERENCE_CONTENT_END}`;
   }
 });
 
-// packages/core/dist/src/utils/session.js
-var init_session = __esm({
-  "packages/core/dist/src/utils/session.js"() {
-    "use strict";
-  }
-});
-
 // packages/core/dist/src/utils/compatibility.js
 var WarningPriority;
 var init_compatibility = __esm({