@google/adk 1.3.0 → 1.5.0

package/dist/cjs/context/token_based_context_compactor.js

@@ -27,13 +27,15 @@ __export(token_based_context_compactor_exports, {
   TokenBasedContextCompactor: () => TokenBasedContextCompactor
 });
 module.exports = __toCommonJS(token_based_context_compactor_exports);
+var import_content_processor_utils = require("../agents/processors/content_processor_utils.js");
 var import_compacted_event = require("../events/compacted_event.js");
-var import_event = require("../events/event.js");
+var import_compaction_utils = require("./compaction_utils.js");
 /**
  * @license
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+const CHARS_PER_TOKEN = 4;
 class TokenBasedContextCompactor {
   constructor(options) {
     this.tokenThreshold = options.tokenThreshold;
@@ -65,11 +67,21 @@ class TokenBasedContextCompactor {
     if (rawEvents.length <= this.eventRetentionSize) {
       return false;
     }
-    let totalTokens = 0;
-    for (const event of activeEvents) {
-      totalTokens += getEventTokens(event);
+    const retainStartIndex = (0, import_compaction_utils.calculateRetainStartIndex)(
+      rawEvents,
+      this.eventRetentionSize
+    );
+    if (retainStartIndex === 0) {
+      return false;
     }
-    return totalTokens > this.tokenThreshold;
+    const promptTokenCount = latestPromptTokenCount(
+      activeEvents,
+      invocationContext
+    );
+    if (promptTokenCount === void 0) {
+      return false;
+    }
+    return promptTokenCount > this.tokenThreshold;
   }
   async compact(invocationContext) {
     const events = invocationContext.session.events;
@@ -78,19 +90,10 @@ class TokenBasedContextCompactor {
     if (rawEvents.length <= this.eventRetentionSize) {
       return;
     }
-    let retainStartIndex = Math.max(
-      0,
-      rawEvents.length - this.eventRetentionSize
+    const retainStartIndex = (0, import_compaction_utils.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;
     }
@@ -109,25 +112,41 @@ class TokenBasedContextCompactor {
     invocationContext.session.events.push(compactedEvent);
   }
 }
-function getEventTokens(event) {
+function latestPromptTokenCount(activeEvents, invocationContext) {
   var _a;
-  if (((_a = event.usageMetadata) == null ? void 0 : _a.promptTokenCount) !== void 0) {
-    return event.usageMetadata.promptTokenCount;
+  for (let i = activeEvents.length - 1; i >= 0; i--) {
+    const count = (_a = activeEvents[i].usageMetadata) == null ? void 0 : _a.promptTokenCount;
+    if (count !== void 0) {
+      return count;
+    }
   }
-  const contentStr = (0, import_event.stringifyContent)(event);
-  return Math.ceil(contentStr.length / 4);
+  return estimatePromptTokenCount(activeEvents, invocationContext);
 }
-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
-  ));
+function estimatePromptTokenCount(activeEvents, invocationContext) {
+  var _a;
+  const contents = (0, import_content_processor_utils.getContents)(
+    activeEvents,
+    invocationContext.agent.name,
+    invocationContext.branch
+  );
+  let totalChars = 0;
+  for (const content of contents) {
+    for (const part of (_a = content.parts) != null ? _a : []) {
+      if (part.text) {
+        totalChars += part.text.length;
+      }
+      if (part.functionCall) {
+        totalChars += JSON.stringify(part.functionCall).length;
+      }
+      if (part.functionResponse) {
+        totalChars += JSON.stringify(part.functionResponse).length;
+      }
+    }
+  }
+  if (totalChars <= 0) {
+    return void 0;
+  }
+  return Math.ceil(totalChars / CHARS_PER_TOKEN);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/context/trajectory_thought_pruning_compactor.js

@@ -0,0 +1,71 @@
+/**
+  * @license
+  * Copyright 2026 Google LLC
+  * SPDX-License-Identifier: Apache-2.0
+  */
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var trajectory_thought_pruning_compactor_exports = {};
+__export(trajectory_thought_pruning_compactor_exports, {
+  TrajectoryThoughtPruningCompactor: () => TrajectoryThoughtPruningCompactor
+});
+module.exports = __toCommonJS(trajectory_thought_pruning_compactor_exports);
+var import_event = require("../events/event.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+class TrajectoryThoughtPruningCompactor {
+  constructor(options) {
+    if (options.eventRetentionSize < 0) {
+      throw new Error("eventRetentionSize must be a non-negative integer.");
+    }
+    this.eventRetentionSize = options.eventRetentionSize;
+  }
+  shouldCompact(invocationContext) {
+    const events = invocationContext.session.events;
+    if (events.length <= this.eventRetentionSize) {
+      return false;
+    }
+    const olderEvents = events.slice(
+      0,
+      events.length - this.eventRetentionSize
+    );
+    return olderEvents.some((event) => (0, import_event.hasThoughts)(event));
+  }
+  compact(invocationContext) {
+    const events = invocationContext.session.events;
+    if (events.length <= this.eventRetentionSize) {
+      return;
+    }
+    const pruneLimit = events.length - this.eventRetentionSize;
+    for (let i = 0; i < pruneLimit; i++) {
+      const event = events[i];
+      if ((0, import_event.hasThoughts)(event)) {
+        events[i] = (0, import_event.pruneThoughts)(event);
+      }
+    }
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  TrajectoryThoughtPruningCompactor
+});

package/dist/cjs/events/compacted_event.js

@@ -25,7 +25,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var compacted_event_exports = {};
 __export(compacted_event_exports, {
   createCompactedEvent: () => createCompactedEvent,
-  isCompactedEvent: () => isCompactedEvent
+  isCompactedEvent: () => isCompactedEvent,
+  isScratchpadEvent: () => isScratchpadEvent
 });
 module.exports = __toCommonJS(compacted_event_exports);
 var import_event = require("./event.js");
@@ -37,17 +38,22 @@ var import_event = require("./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 {
     ...(0, import_event.createEvent)(params),
     isCompacted: params.isCompacted || true,
     startTime: params.startTime,
     endTime: params.endTime,
-    compactedContent: params.compactedContent
+    compactedContent: params.compactedContent,
+    isScratchpad: params.isScratchpad
   };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createCompactedEvent,
-  isCompactedEvent
+  isCompactedEvent,
+  isScratchpadEvent
 });

package/dist/cjs/events/event.js

@@ -24,17 +24,24 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var event_exports = {};
 __export(event_exports, {
+  AF_FUNCTION_CALL_ID_PREFIX: () => AF_FUNCTION_CALL_ID_PREFIX,
   createEvent: () => createEvent,
   createNewEventId: () => createNewEventId,
+  generateClientFunctionCallId: () => generateClientFunctionCallId,
+  getEventTokens: () => getEventTokens,
   getFunctionCalls: () => getFunctionCalls,
   getFunctionResponses: () => getFunctionResponses,
+  hasThoughts: () => hasThoughts,
   hasTrailingCodeExecutionResult: () => hasTrailingCodeExecutionResult,
   isFinalResponse: () => isFinalResponse,
+  populateClientFunctionCallId: () => populateClientFunctionCallId,
+  pruneThoughts: () => pruneThoughts,
   stringifyContent: () => stringifyContent,
   transformToCamelCaseEvent: () => transformToCamelCaseEvent,
   transformToSnakeCaseEvent: () => transformToSnakeCaseEvent
 });
 module.exports = __toCommonJS(event_exports);
+var import_env_aware_utils = require("../utils/env_aware_utils.js");
 var import_object_notation_utils = require("../utils/object_notation_utils.js");
 var import_event_actions = require("./event_actions.js");
 /**
@@ -71,6 +78,17 @@ function getFunctionCalls(event) {
   }
   return funcCalls;
 }
+const AF_FUNCTION_CALL_ID_PREFIX = "adk-";
+function generateClientFunctionCallId() {
+  return `${AF_FUNCTION_CALL_ID_PREFIX}${(0, import_env_aware_utils.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) {
@@ -100,6 +118,34 @@ 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));
+}
+function pruneThoughts(event) {
+  var _a;
+  if (!((_a = event.content) == null ? void 0 : _a.parts)) {
+    return event;
+  }
+  const prunedParts = event.content.parts.filter(
+    (part) => part.thought !== true
+  );
+  return {
+    ...event,
+    content: {
+      ...event.content,
+      parts: prunedParts
+    }
+  };
+}
 const ASCII_LETTERS_AND_NUMBERS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 function createNewEventId() {
   let id = "";
@@ -136,12 +182,18 @@ function transformToSnakeCaseEvent(event) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  AF_FUNCTION_CALL_ID_PREFIX,
   createEvent,
   createNewEventId,
+  generateClientFunctionCallId,
+  getEventTokens,
   getFunctionCalls,
   getFunctionResponses,
+  hasThoughts,
   hasTrailingCodeExecutionResult,
   isFinalResponse,
+  populateClientFunctionCallId,
+  pruneThoughts,
   stringifyContent,
   transformToCamelCaseEvent,
   transformToSnakeCaseEvent

package/dist/cjs/index.js

@@ -34,6 +34,7 @@ __export(index_exports, {
   GcsArtifactService: () => import_gcs_artifact_service.GcsArtifactService,
   InvocationContext: () => import_invocation_context.InvocationContext,
   RemoteA2AAgent: () => import_a2a_remote_agent.RemoteA2AAgent,
+  RunSkillInlineScriptErrorCode: () => import_run_skill_inline_script_tool.RunSkillInlineScriptErrorCode,
   RunSkillInlineScriptTool: () => import_run_skill_inline_script_tool.RunSkillInlineScriptTool,
   RunSkillScriptTool: () => import_run_skill_script_tool.RunSkillScriptTool,
   UnsafeLocalCodeExecutor: () => import_unsafe_local_code_executor.UnsafeLocalCodeExecutor,
@@ -68,6 +69,7 @@ var import_run_skill_script_tool = require("./tools/skill/run_skill_script_tool.
 __reExport(index_exports, require("./integrations/agent_registry/agent_registry.js"), module.exports);
 __reExport(index_exports, require("./telemetry/google_cloud.js"), module.exports);
 __reExport(index_exports, require("./telemetry/setup.js"), module.exports);
+__reExport(index_exports, require("./tools/mcp/load_mcp_resource_tool.js"), module.exports);
 __reExport(index_exports, require("./tools/mcp/mcp_session_manager.js"), module.exports);
 __reExport(index_exports, require("./tools/mcp/mcp_tool.js"), module.exports);
 __reExport(index_exports, require("./tools/mcp/mcp_toolset.js"), module.exports);
@@ -87,6 +89,7 @@ __reExport(index_exports, require("./tools/mcp/mcp_toolset.js"), module.exports)
   GcsArtifactService,
   InvocationContext,
   RemoteA2AAgent,
+  RunSkillInlineScriptErrorCode,
   RunSkillInlineScriptTool,
   RunSkillScriptTool,
   UnsafeLocalCodeExecutor,
@@ -102,6 +105,7 @@ __reExport(index_exports, require("./tools/mcp/mcp_toolset.js"), module.exports)
   ...require("./integrations/agent_registry/agent_registry.js"),
   ...require("./telemetry/google_cloud.js"),
   ...require("./telemetry/setup.js"),
+  ...require("./tools/mcp/load_mcp_resource_tool.js"),
   ...require("./tools/mcp/mcp_session_manager.js"),
   ...require("./tools/mcp/mcp_tool.js"),
   ...require("./tools/mcp/mcp_toolset.js")

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

@@ -30,6 +30,7 @@ module.exports = __toCommonJS(agent_registry_mcp_toolset_exports);
 var import_base_toolset = require("../../tools/base_toolset.js");
 var import_mcp_session_manager = require("../../tools/mcp/mcp_session_manager.js");
 var import_mcp_tool = require("../../tools/mcp/mcp_tool.js");
+var import_logger = require("../../utils/logger.js");
 var import_types2 = require("./types.js");
 /**
  * @license
@@ -90,7 +91,14 @@ class AgentRegistrySingleMCPToolset extends import_base_toolset.BaseToolset {
     };
     const sessionManager = new import_mcp_session_manager.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) => {
+        import_logger.logger.warn("Failed to close MCP discovery session", e);
+      });
+    }
     const tools = listResult.tools.map((tool) => {
       const prefixedName = this.prefix ? `${this.prefix}_${tool.name}` : tool.name;
       const mcpTool = new import_mcp_tool.MCPTool(

package/dist/cjs/models/google_llm.js

@@ -25,7 +25,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var google_llm_exports = {};
 __export(google_llm_exports, {
   Gemini: () => Gemini,
-  geminiInitParams: () => geminiInitParams
+  geminiInitParams: () => geminiInitParams,
+  isGemini: () => isGemini
 });
 module.exports = __toCommonJS(google_llm_exports);
 var import_genai = require("@google/genai");
@@ -36,13 +37,19 @@ var import_async_queue = require("../utils/async_queue.js");
 var import_streaming_utils = require("../utils/streaming_utils.js");
 var import_base_llm = require("./base_llm.js");
 var import_gemini_llm_connection = require("./gemini_llm_connection.js");
+var import_interactions_utils = require("./interactions_utils.js");
 var import_llm_response = require("./llm_response.js");
 /**
  * @license
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-class Gemini extends import_base_llm.BaseLlm {
+var _a, _b;
+const GEMINI_MODEL_SYMBOL = Symbol.for("google.adk.geminiModel");
+function isGemini(obj) {
+  return typeof obj === "object" && obj !== null && GEMINI_MODEL_SYMBOL in obj && obj[GEMINI_MODEL_SYMBOL] === true;
+}
+class Gemini extends (_b = import_base_llm.BaseLlm, _a = GEMINI_MODEL_SYMBOL, _b) {
   /**
    * @param params The parameters for creating a Gemini instance.
    */
@@ -52,12 +59,14 @@ class Gemini extends import_base_llm.BaseLlm {
     vertexai,
     project,
     location,
-    headers
+    headers,
+    useInteractionsApi
   }) {
     if (!model) {
       model = "gemini-2.5-flash";
     }
     super({ model });
+    this[_a] = true;
     const params = geminiInitParams({
       model,
       vertexai,
@@ -75,6 +84,7 @@ class Gemini extends import_base_llm.BaseLlm {
     this.apiKey = params.apiKey;
     this.headers = headers;
     this.vertexai = !!params.vertexai;
+    this.useInteractionsApi = !!useInteractionsApi;
   }
   /**
    * Sends a request to the Gemini model.
@@ -84,11 +94,15 @@ class Gemini extends import_base_llm.BaseLlm {
    * @yields LlmResponse: The model response.
    */
   async *generateContentAsync(llmRequest, stream = false, abortSignal) {
-    var _a, _b, _c;
+    var _a2, _b2, _c;
+    if (this.useInteractionsApi) {
+      yield* (0, import_interactions_utils.generateContentViaInteractions)(this.apiClient, llmRequest, stream);
+      return;
+    }
     this.preprocessRequest(llmRequest);
     this.maybeAppendUserContent(llmRequest);
     import_logger.logger.info(
-      `Sending out request, model: ${(_a = llmRequest.model) != null ? _a : this.model}, backend: ${this.apiBackend}, stream: ${stream}`
+      `Sending out request, model: ${(_a2 = llmRequest.model) != null ? _a2 : this.model}, backend: ${this.apiBackend}, stream: ${stream}`
     );
     if (!llmRequest.config) {
       llmRequest.config = {};
@@ -104,7 +118,7 @@ class Gemini extends import_base_llm.BaseLlm {
     }
     if (stream) {
       const streamResult = await this.apiClient.models.generateContentStream({
-        model: (_b = llmRequest.model) != null ? _b : this.model,
+        model: (_b2 = llmRequest.model) != null ? _b2 : this.model,
         contents: llmRequest.contents,
         config: llmRequest.config
       });
@@ -192,8 +206,8 @@ class Gemini extends import_base_llm.BaseLlm {
    * @returns BaseLlmConnection, the connection to the Gemini model.
    */
   async connect(llmRequest) {
-    var _a, _b, _c, _d;
-    if ((_a = llmRequest.liveConnectConfig) == null ? void 0 : _a.httpOptions) {
+    var _a2, _b2, _c, _d;
+    if ((_a2 = llmRequest.liveConnectConfig) == null ? void 0 : _a2.httpOptions) {
       if (!llmRequest.liveConnectConfig.httpOptions.headers) {
         llmRequest.liveConnectConfig.httpOptions.headers = {};
       }
@@ -203,7 +217,7 @@ class Gemini extends import_base_llm.BaseLlm {
       );
       llmRequest.liveConnectConfig.httpOptions.apiVersion = this.liveApiVersion;
     }
-    if ((_b = llmRequest.config) == null ? void 0 : _b.systemInstruction) {
+    if ((_b2 = llmRequest.config) == null ? void 0 : _b2.systemInstruction) {
       llmRequest.liveConnectConfig.systemInstruction = {
         role: "system",
         // TODO - b/425992518: validate type casting works well.
@@ -305,5 +319,6 @@ function geminiInitParams({
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Gemini,
-  geminiInitParams
+  geminiInitParams,
+  isGemini
 });