@google/adk 1.4.0 → 1.6.0

package/dist/web/auth/credential_service/in_memory_credential_service.js

@@ -7,7 +7,18 @@ const require = topLevelCreateRequire(import.meta.url);
  */
 class InMemoryCredentialService {
   constructor() {
-    this.credentials = {};
+    /**
+     * A map from app name to a map from user ID to a map from credential key to
+     * credential.
+     *
+     * `appName`, `userId` and `credentialKey` are all attacker-influenced, so
+     * every level is created with `Object.create(null)`. On an ordinary `{}`
+     * literal a key of `__proto__` resolves to the inherited `__proto__`
+     * accessor rather than creating an own property, so nested assignment
+     * pollutes every object in the process, and a lookup of an inherited key
+     * such as `toString` returns a function instead of `undefined`.
+     */
+    this.credentials = /* @__PURE__ */ Object.create(null);
   }
   loadCredential(authConfig, toolContext) {
     const credentialBucket = this.getBucketForCurrentContext(toolContext);
@@ -22,10 +33,10 @@ class InMemoryCredentialService {
   getBucketForCurrentContext(toolContext) {
     const { appName, userId } = toolContext.invocationContext.session;
     if (!this.credentials[appName]) {
-      this.credentials[appName] = {};
+      this.credentials[appName] = /* @__PURE__ */ Object.create(null);
     }
     if (!this.credentials[appName][userId]) {
-      this.credentials[appName][userId] = {};
+      this.credentials[appName][userId] = /* @__PURE__ */ Object.create(null);
     }
     return this.credentials[appName][userId];
   }

package/dist/web/code_executors/unsafe_local_code_executor.js

@@ -5,7 +5,7 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { spawn } from "child_process";
+import { spawn } from "node:child_process";
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
@@ -17,13 +17,21 @@ import {
   CodeExecutionLanguage
 } from "./code_execution_utils.js";
 const IS_WINDOWS = os.platform() === "win32";
+const POWERSHELL_BASE_ARGS = [
+  "-NoLogo",
+  "-NoProfile",
+  "-ExecutionPolicy",
+  "Bypass",
+  "-File"
+];
+const CMD_BASE_ARGS = ["/D", "/c"];
+function isPowerShellCommand(commandPath) {
+  return /^(powershell|pwsh)(\.exe)?$/i.test(path.win32.basename(commandPath));
+}
 async function createTempScriptFile(code, language, shellCommandPath) {
-  const tempDir = path.join(
-    os.tmpdir(),
-    "adk_js_unsafe_code_executor",
-    Date.now().toString() + "_" + Math.random().toString(36).slice(2)
+  const tempDir = await fs.mkdtemp(
+    path.join(os.tmpdir(), "adk_js_unsafe_code_executor_")
   );
-  await fs.mkdir(tempDir, { recursive: true });
   const ext = getExtensionForLanguage(language, shellCommandPath) || ".js";
   const filePath = path.join(tempDir, "script".concat(ext));
   await fs.writeFile(filePath, code);
@@ -43,6 +51,9 @@ function getExtensionForLanguage(language, shellCommandPath) {
     return ".bat";
   }
   if (language === CodeExecutionLanguage.SHELL) {
+    if (shellCommandPath && isPowerShellCommand(shellCommandPath)) {
+      return ".ps1";
+    }
     if (IS_WINDOWS) {
       if (shellCommandPath && shellCommandPath.toLowerCase().includes("cmd")) {
         return ".bat";
@@ -101,17 +112,17 @@ class UnsafeLocalCodeExecutor extends BaseCodeExecutor {
         command = this.pythonCommandPath;
       } else if (language === CodeExecutionLanguage.SHELL) {
         command = this.shellCommandPath;
-        if (this.shellCommandPath.toLowerCase().includes("powershell")) {
-          args = ["-NoLogo", "-ExecutionPolicy", "Bypass", "-File", filePath];
+        if (isPowerShellCommand(this.shellCommandPath)) {
+          args = [...POWERSHELL_BASE_ARGS, filePath];
         } else if (this.shellCommandPath.toLowerCase().includes("cmd")) {
-          args = ["/c", filePath];
+          args = [...CMD_BASE_ARGS, filePath];
         }
       } else if (language === CodeExecutionLanguage.POWERSHELL) {
         command = IS_WINDOWS ? "powershell" : "pwsh";
-        args = ["-NoLogo", "-ExecutionPolicy", "Bypass", "-File", filePath];
+        args = [...POWERSHELL_BASE_ARGS, filePath];
       } else if (language === CodeExecutionLanguage.WINDOWS_CMD) {
         command = "cmd.exe";
-        args = ["/c", filePath];
+        args = [...CMD_BASE_ARGS, filePath];
       }
       if (params.codeExecutionInput.args) {
         if (Array.isArray(params.codeExecutionInput.args)) {

package/dist/web/common.js

@@ -56,17 +56,22 @@ import {
   FileContentEncoding
 } from "./code_executors/code_execution_utils.js";
 import { AgentControlledContextCompactor } from "./context/agent_controlled_context_compactor.js";
+import { AnchoredContextCompactor } from "./context/anchored_context_compactor.js";
 import { LlmSummarizer } from "./context/summarizers/llm_summarizer.js";
 import { TokenBasedContextCompactor } from "./context/token_based_context_compactor.js";
 import { TrajectoryThoughtPruningCompactor } from "./context/trajectory_thought_pruning_compactor.js";
 import { TruncatingContextCompactor } from "./context/truncating_context_compactor.js";
-import { isCompactedEvent } from "./events/compacted_event.js";
+import { isCompactedEvent, isScratchpadEvent } from "./events/compacted_event.js";
 import {
   createEvent,
+  generateClientFunctionCallId,
   getFunctionCalls,
   getFunctionResponses,
+  hasThoughts,
   hasTrailingCodeExecutionResult,
   isFinalResponse,
+  populateClientFunctionCallId,
+  pruneThoughts,
   stringifyContent
 } from "./events/event.js";
 import { createEventActions } from "./events/event_actions.js";
@@ -83,6 +88,7 @@ import { Gemini, geminiInitParams } from "./models/google_llm.js";
 import { LLMRegistry } from "./models/registry.js";
 import { RoutedLlm } from "./models/routed_llm.js";
 import { BasePlugin, ContextCompactionTrigger } from "./plugins/base_plugin.js";
+import { GlobalInstructionPlugin } from "./plugins/global_instruction_plugin.js";
 import { LoggingPlugin } from "./plugins/logging_plugin.js";
 import { PluginManager } from "./plugins/plugin_manager.js";
 import {
@@ -108,8 +114,14 @@ import { AgentTool, isAgentTool } from "./tools/agent_tool.js";
 import { BaseTool, isBaseTool } from "./tools/base_tool.js";
 import { BaseToolset, isBaseToolset } from "./tools/base_toolset.js";
 import { ConsolidateContextTool } from "./tools/consolidate_context_tool.js";
+import {
+  ENTERPRISE_WEB_SEARCH,
+  EnterpriseWebSearchTool
+} from "./tools/enterprise_web_search_tool.js";
+import { ExampleTool } from "./tools/example_tool.js";
 import { EXIT_LOOP, ExitLoopTool } from "./tools/exit_loop_tool.js";
 import { FunctionTool, isFunctionTool } from "./tools/function_tool.js";
+import { getUserChoiceTool } from "./tools/get_user_choice_tool.js";
 import {
   GOOGLE_MAPS_GROUNDING,
   GoogleMapsGroundingTool
@@ -120,11 +132,13 @@ import {
   LoadArtifactsTool
 } from "./tools/load_artifacts_tool.js";
 import { LOAD_MEMORY, LoadMemoryTool } from "./tools/load_memory_tool.js";
+import { LOAD_WEB_PAGE, loadWebPage } from "./tools/load_web_page.js";
 import { LongRunningFunctionTool } from "./tools/long_running_tool.js";
 import {
   PRELOAD_MEMORY,
   PreloadMemoryTool
 } from "./tools/preload_memory_tool.js";
+import { requestInputTool } from "./tools/request_input_tool.js";
 import { ToolConfirmation } from "./tools/tool_confirmation.js";
 import { URL_CONTEXT, UrlContextTool } from "./tools/url_context_tool.js";
 import { VertexAiSearchTool } from "./tools/vertex_ai_search_tool.js";
@@ -174,6 +188,7 @@ export {
   AgentControlledContextCompactor,
   AgentTool,
   AgentTransferLlmRequestProcessor,
+  AnchoredContextCompactor,
   ApigeeLlm,
   AuthCredentialTypes,
   AuthHandler,
@@ -199,8 +214,11 @@ export {
   ContextCompactorRequestProcessor,
   CredentialExchangeError,
   CredentialRefresherRegistry,
+  ENTERPRISE_WEB_SEARCH,
   EXIT_LOOP,
+  EnterpriseWebSearchTool,
   EventType,
+  ExampleTool,
   ExitLoopTool,
   FileContentEncoding,
   FunctionTool,
@@ -208,6 +226,7 @@ export {
   GOOGLE_MAPS_GROUNDING,
   GOOGLE_SEARCH,
   Gemini,
+  GlobalInstructionPlugin,
   GoogleLLMVariant,
   GoogleMapsGroundingTool,
   GoogleSearchTool,
@@ -223,6 +242,7 @@ export {
   LLMRegistry,
   LOAD_ARTIFACTS,
   LOAD_MEMORY,
+  LOAD_WEB_PAGE,
   ListSkillsTool,
   LiveRequestQueue,
   LlmAgent2 as LlmAgent,
@@ -281,11 +301,14 @@ export {
   findMatchingFunctionCall,
   functionsExportedForTestingOnly,
   geminiInitParams,
+  generateClientFunctionCallId,
   getAskUserConfirmationFunctionCalls,
   getClientLabels,
   getFunctionCalls,
   getFunctionResponses,
   getLogger,
+  getUserChoiceTool,
+  hasThoughts,
   hasTrailingCodeExecutionResult,
   isAgentTool,
   isBaseAgent,
@@ -304,10 +327,15 @@ export {
   isRoutableLlmAgent,
   isRoutedAgent,
   isRunner,
+  isScratchpadEvent,
   isSequentialAgent,
   loadAllSkillsInDir,
   loadSkillFromDir,
   loadSkillFromZipBuffer,
+  loadWebPage,
+  populateClientFunctionCallId,
+  pruneThoughts,
+  requestInputTool,
   runWithClientLabel,
   setLogLevel,
   setLogger,

package/dist/web/context/agent_controlled_context_compactor.js

@@ -5,9 +5,9 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { isCompactedEvent } from "../events/compacted_event.js";
 import { createEvent } from "../events/event.js";
 import { ContextCompactionTrigger } from "../plugins/base_plugin.js";
+import { getActiveEvents } from "./compaction_utils.js";
 class AgentControlledContextCompactor {
   constructor(options) {
     this.trigger = ContextCompactionTrigger.AgentControlled;
@@ -18,7 +18,7 @@ class AgentControlledContextCompactor {
   }
   async compact(invocationContext) {
     const events = invocationContext.session.events;
-    const activeEvents = this.getActiveEvents(events);
+    const activeEvents = getActiveEvents(events);
     const consolidateToolCallIndex = activeEvents.reduce(
       (acc, e, idx) => {
         var _a, _b;
@@ -66,15 +66,6 @@ class AgentControlledContextCompactor {
     delete invocationContext.session.state["temp:consolidate_context"];
     delete invocationContext.session.state["temp:consolidate_context_detail"];
   }
-  getActiveEvents(events) {
-    const latest = events.filter(isCompactedEvent).pop();
-    return latest ? [
-      latest,
-      ...events.filter(
-        (e) => !isCompactedEvent(e) && e.timestamp > latest.endTime
-      )
-    ] : events;
-  }
 }
 export {
   AgentControlledContextCompactor

package/dist/web/context/anchored_context_compactor.js

@@ -0,0 +1,117 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { isScratchpadEvent } from "../events/compacted_event.js";
+import { getEventTokens } from "../events/event.js";
+import { calculateRetainStartIndex } from "./compaction_utils.js";
+class AnchoredContextCompactor {
+  constructor(options) {
+    this.tokenThreshold = options.tokenThreshold;
+    this.eventRetentionSize = options.eventRetentionSize;
+    this.summarizer = options.summarizer;
+  }
+  getActiveEvents(events) {
+    let latestScratchpad = void 0;
+    for (let i = events.length - 1; i >= 0; i--) {
+      const e = events[i];
+      if (isScratchpadEvent(e)) {
+        latestScratchpad = e;
+        break;
+      }
+    }
+    if (!latestScratchpad) {
+      return events;
+    }
+    const activeRawEvents = events.filter(
+      (e) => e.timestamp > latestScratchpad.endTime && !isScratchpadEvent(e)
+    );
+    return [latestScratchpad, ...activeRawEvents];
+  }
+  shouldCompact(invocationContext) {
+    const events = invocationContext.session.events;
+    const activeEvents = this.getActiveEvents(events);
+    const hasScratchpad = activeEvents.length > 0 && isScratchpadEvent(activeEvents[0]);
+    const rawEvents = hasScratchpad ? activeEvents.slice(1) : activeEvents;
+    if (rawEvents.length <= this.eventRetentionSize) {
+      return false;
+    }
+    const retainStartIndex = calculateRetainStartIndex(
+      rawEvents,
+      this.eventRetentionSize
+    );
+    if (retainStartIndex === 0) {
+      return false;
+    }
+    const totalTokens = activeEvents.reduce(
+      (sum, event) => sum + getEventTokens(event),
+      0
+    );
+    return totalTokens > this.tokenThreshold;
+  }
+  async compact(invocationContext) {
+    const events = invocationContext.session.events;
+    const activeEvents = this.getActiveEvents(events);
+    const hasScratchpad = activeEvents.length > 0 && isScratchpadEvent(activeEvents[0]);
+    const rawEvents = hasScratchpad ? activeEvents.slice(1) : activeEvents;
+    if (rawEvents.length <= this.eventRetentionSize) {
+      return;
+    }
+    const retainStartIndex = calculateRetainStartIndex(
+      rawEvents,
+      this.eventRetentionSize
+    );
+    if (retainStartIndex === 0) {
+      return;
+    }
+    const rawEventsToCompact = rawEvents.slice(0, retainStartIndex);
+    let scratchpadEvent;
+    if (hasScratchpad) {
+      const existingScratchpad = activeEvents[0];
+      scratchpadEvent = await this.summarizer.summarize([
+        existingScratchpad,
+        ...rawEventsToCompact
+      ]);
+    } else {
+      scratchpadEvent = await this.summarizer.summarize(rawEventsToCompact);
+    }
+    const updatedScratchpad = __spreadProps(__spreadValues({}, scratchpadEvent), {
+      isScratchpad: true,
+      author: "system"
+    });
+    const inactiveEvents = events.slice(0, events.indexOf(activeEvents[0]));
+    const retainedRawEvents = rawEvents.slice(retainStartIndex);
+    const newEventsList = [
+      ...inactiveEvents,
+      updatedScratchpad,
+      ...retainedRawEvents
+    ];
+    events.length = 0;
+    events.push(...newEventsList);
+  }
+}
+export {
+  AnchoredContextCompactor
+};

package/dist/web/context/compaction_utils.js

@@ -0,0 +1,38 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { isCompactedEvent } from "../events/compacted_event.js";
+import {
+  getFunctionCalls,
+  getFunctionResponses
+} from "../events/event.js";
+function getActiveEvents(events) {
+  const latest = events.filter(isCompactedEvent).pop();
+  return latest ? [
+    latest,
+    ...events.filter(
+      (e) => !isCompactedEvent(e) && e.timestamp > latest.endTime
+    )
+  ] : events;
+}
+function calculateRetainStartIndex(rawEvents, eventRetentionSize) {
+  let retainStartIndex = Math.max(0, rawEvents.length - eventRetentionSize);
+  while (retainStartIndex > 0) {
+    const eventToRetain = rawEvents[retainStartIndex];
+    const previousEvent = rawEvents[retainStartIndex - 1];
+    if (getFunctionResponses(eventToRetain).length > 0 && getFunctionCalls(previousEvent).length > 0) {
+      retainStartIndex--;
+    } else {
+      break;
+    }
+  }
+  return retainStartIndex;
+}
+export {
+  calculateRetainStartIndex,
+  getActiveEvents
+};

package/dist/web/context/token_based_context_compactor.js

@@ -7,6 +7,10 @@ const require = topLevelCreateRequire(import.meta.url);
  */
 import { getContents } from "../agents/processors/content_processor_utils.js";
 import { isCompactedEvent } from "../events/compacted_event.js";
+import {
+  calculateRetainStartIndex,
+  getActiveEvents
+} from "./compaction_utils.js";
 const CHARS_PER_TOKEN = 4;
 class TokenBasedContextCompactor {
   constructor(options) {
@@ -14,31 +18,20 @@ class TokenBasedContextCompactor {
     this.eventRetentionSize = options.eventRetentionSize;
     this.summarizer = options.summarizer;
   }
-  getActiveEvents(events) {
-    let latestCompactedEvent = void 0;
-    for (let i = events.length - 1; i >= 0; i--) {
-      const e = events[i];
-      if (isCompactedEvent(e)) {
-        if (!latestCompactedEvent || e.endTime > latestCompactedEvent.endTime) {
-          latestCompactedEvent = e;
-        }
-      }
-    }
-    if (!latestCompactedEvent) {
-      return events;
-    }
-    const activeRawEvents = events.filter(
-      (e) => !isCompactedEvent(e) && e.timestamp > latestCompactedEvent.endTime
-    );
-    return [latestCompactedEvent, ...activeRawEvents];
-  }
   shouldCompact(invocationContext) {
     const events = invocationContext.session.events;
-    const activeEvents = this.getActiveEvents(events);
+    const activeEvents = getActiveEvents(events);
     const rawEvents = activeEvents.filter((e) => !isCompactedEvent(e));
     if (rawEvents.length <= this.eventRetentionSize) {
       return false;
     }
+    const retainStartIndex = calculateRetainStartIndex(
+      rawEvents,
+      this.eventRetentionSize
+    );
+    if (retainStartIndex === 0) {
+      return false;
+    }
     const promptTokenCount = latestPromptTokenCount(
       activeEvents,
       invocationContext
@@ -50,24 +43,15 @@ class TokenBasedContextCompactor {
   }
   async compact(invocationContext) {
     const events = invocationContext.session.events;
-    const activeEvents = this.getActiveEvents(events);
+    const activeEvents = getActiveEvents(events);
     const rawEvents = activeEvents.filter((e) => !isCompactedEvent(e));
     if (rawEvents.length <= this.eventRetentionSize) {
       return;
     }
-    let retainStartIndex = Math.max(
-      0,
-      rawEvents.length - this.eventRetentionSize
+    const retainStartIndex = calculateRetainStartIndex(
+      rawEvents,
+      this.eventRetentionSize
     );
-    while (retainStartIndex > 0) {
-      const eventToRetain = rawEvents[retainStartIndex];
-      const previousEvent = rawEvents[retainStartIndex - 1];
-      if (hasFunctionResponse(eventToRetain) && hasFunctionCall(previousEvent)) {
-        retainStartIndex--;
-      } else {
-        break;
-      }
-    }
     if (retainStartIndex === 0) {
       return;
     }
@@ -122,18 +106,6 @@ function estimatePromptTokenCount(activeEvents, invocationContext) {
   }
   return Math.ceil(totalChars / CHARS_PER_TOKEN);
 }
-function hasFunctionCall(event) {
-  var _a, _b;
-  return !!((_b = (_a = event.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.some(
-    (part) => part.functionCall !== void 0
-  ));
-}
-function hasFunctionResponse(event) {
-  var _a, _b;
-  return !!((_b = (_a = event.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.some(
-    (part) => part.functionResponse !== void 0
-  ));
-}
 export {
   TokenBasedContextCompactor
 };

package/dist/web/events/compacted_event.js

@@ -28,15 +28,20 @@ import { createEvent } from "./event.js";
 function isCompactedEvent(event) {
   return "isCompacted" in event && event.isCompacted === true;
 }
+function isScratchpadEvent(event) {
+  return isCompactedEvent(event) && event.isScratchpad === true;
+}
 function createCompactedEvent(params = {}) {
   return __spreadProps(__spreadValues({}, createEvent(params)), {
     isCompacted: params.isCompacted || true,
     startTime: params.startTime,
     endTime: params.endTime,
-    compactedContent: params.compactedContent
+    compactedContent: params.compactedContent,
+    isScratchpad: params.isScratchpad
   });
 }
 export {
   createCompactedEvent,
-  isCompactedEvent
+  isCompactedEvent,
+  isScratchpadEvent
 };

package/dist/web/events/event.js

@@ -24,6 +24,7 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { randomUUID } from "../utils/env_aware_utils.js";
 import { toCamelCase, toSnakeCase } from "../utils/object_notation_utils.js";
 import { createEventActions } from "./event_actions.js";
 function createEvent(params = {}) {
@@ -54,6 +55,17 @@ function getFunctionCalls(event) {
   }
   return funcCalls;
 }
+const AF_FUNCTION_CALL_ID_PREFIX = "adk-";
+function generateClientFunctionCallId() {
+  return "".concat(AF_FUNCTION_CALL_ID_PREFIX).concat(randomUUID());
+}
+function populateClientFunctionCallId(modelResponseEvent) {
+  for (const functionCall of getFunctionCalls(modelResponseEvent)) {
+    if (!functionCall.id) {
+      functionCall.id = generateClientFunctionCallId();
+    }
+  }
+}
 function getFunctionResponses(event) {
   const funcResponses = [];
   if (event.content && event.content.parts) {
@@ -83,6 +95,14 @@ function stringifyContent(event) {
     return (_a2 = part.text) != null ? _a2 : "";
   }).join("");
 }
+function getEventTokens(event) {
+  var _a;
+  if (((_a = event.usageMetadata) == null ? void 0 : _a.promptTokenCount) !== void 0) {
+    return event.usageMetadata.promptTokenCount;
+  }
+  const contentStr = stringifyContent(event);
+  return Math.ceil(contentStr.length / 4);
+}
 function hasThoughts(event) {
   var _a, _b;
   return !!((_b = (_a = event.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.some((part) => part.thought === true));
@@ -136,13 +156,17 @@ function transformToSnakeCaseEvent(event) {
   return toSnakeCase(event, PRESERVE_KEYS_CAMEL_CASE);
 }
 export {
+  AF_FUNCTION_CALL_ID_PREFIX,
   createEvent,
   createNewEventId,
+  generateClientFunctionCallId,
+  getEventTokens,
   getFunctionCalls,
   getFunctionResponses,
   hasThoughts,
   hasTrailingCodeExecutionResult,
   isFinalResponse,
+  populateClientFunctionCallId,
   pruneThoughts,
   stringifyContent,
   transformToCamelCaseEvent,

package/dist/web/index.js

@@ -9,6 +9,7 @@ import { AGENT_CARD_PATH, RemoteA2AAgent } from "./a2a/a2a_remote_agent.js";
 import { getA2AAgentCard } from "./a2a/agent_card.js";
 import { A2AAgentExecutor } from "./a2a/agent_executor.js";
 import { toA2a } from "./a2a/agent_to_a2a.js";
+import { bearerTokenUserBuilder } from "./a2a/auth.js";
 import { InvocationContext } from "./agents/invocation_context.js";
 import { FileArtifactService } from "./artifacts/file_artifact_service.js";
 import { GcsArtifactService } from "./artifacts/gcs_artifact_service.js";
@@ -29,11 +30,15 @@ import {
   loadSkillFromDir,
   validateSkillDir
 } from "./skills/loader.js";
-import { RunSkillInlineScriptTool } from "./tools/skill/run_skill_inline_script_tool.js";
+import {
+  RunSkillInlineScriptErrorCode,
+  RunSkillInlineScriptTool
+} from "./tools/skill/run_skill_inline_script_tool.js";
 import { RunSkillScriptTool } from "./tools/skill/run_skill_script_tool.js";
 export * from "./integrations/agent_registry/agent_registry.js";
 export * from "./telemetry/google_cloud.js";
 export * from "./telemetry/setup.js";
+export * from "./tools/mcp/load_mcp_resource_tool.js";
 export * from "./tools/mcp/mcp_session_manager.js";
 export * from "./tools/mcp/mcp_tool.js";
 export * from "./tools/mcp/mcp_toolset.js";
@@ -47,10 +52,12 @@ export {
   GcsArtifactService,
   InvocationContext,
   RemoteA2AAgent,
+  RunSkillInlineScriptErrorCode,
   RunSkillInlineScriptTool,
   RunSkillScriptTool,
   UnsafeLocalCodeExecutor,
   VertexAiSessionService,
+  bearerTokenUserBuilder,
   getA2AAgentCard,
   getArtifactServiceFromUri,
   getSessionServiceFromUri,

package/dist/web/integrations/agent_registry/agent_registry_mcp_toolset.js

@@ -29,6 +29,7 @@ import {
   MCPSessionManager
 } from "../../tools/mcp/mcp_session_manager.js";
 import { MCPTool } from "../../tools/mcp/mcp_tool.js";
+import { logger } from "../../utils/logger.js";
 import { GCP_MCP_SERVER_DESTINATION_ID } from "./types.js";
 class AgentRegistrySingleMCPToolset extends BaseToolset {
   /**
@@ -78,7 +79,14 @@ class AgentRegistrySingleMCPToolset extends BaseToolset {
     });
     const sessionManager = new MCPSessionManager(connectionParamsCopy);
     const session = await sessionManager.createSession();
-    const listResult = await session.listTools();
+    let listResult;
+    try {
+      listResult = await session.listTools();
+    } finally {
+      await sessionManager.closeSession(session).catch((e) => {
+        logger.warn("Failed to close MCP discovery session", e);
+      });
+    }
     const tools = listResult.tools.map((tool) => {
       const prefixedName = this.prefix ? "".concat(this.prefix, "_").concat(tool.name) : tool.name;
       const mcpTool = new MCPTool(