@google/adk 1.3.0 → 1.5.0

package/dist/esm/context/anchored_context_compactor.js

@@ -0,0 +1,99 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @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 = {
+      ...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/esm/context/compaction_utils.js

@@ -0,0 +1,27 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import {
+  getFunctionCalls,
+  getFunctionResponses
+} from "../events/event.js";
+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
+};

package/dist/esm/context/token_based_context_compactor.js

@@ -5,8 +5,10 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { getContents } from "../agents/processors/content_processor_utils.js";
 import { isCompactedEvent } from "../events/compacted_event.js";
-import { stringifyContent } from "../events/event.js";
+import { calculateRetainStartIndex } from "./compaction_utils.js";
+const CHARS_PER_TOKEN = 4;
 class TokenBasedContextCompactor {
   constructor(options) {
     this.tokenThreshold = options.tokenThreshold;
@@ -38,11 +40,21 @@ class TokenBasedContextCompactor {
     if (rawEvents.length <= this.eventRetentionSize) {
       return false;
     }
-    let totalTokens = 0;
-    for (const event of activeEvents) {
-      totalTokens += getEventTokens(event);
+    const retainStartIndex = 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;
@@ -51,19 +63,10 @@ class TokenBasedContextCompactor {
     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;
     }
@@ -82,25 +85,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 = 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 = 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);
 }
 export {
   TokenBasedContextCompactor

package/dist/esm/context/trajectory_thought_pruning_compactor.js

@@ -0,0 +1,43 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { hasThoughts, pruneThoughts } from "../events/event.js";
+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) => 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 (hasThoughts(event)) {
+        events[i] = pruneThoughts(event);
+      }
+    }
+  }
+}
+export {
+  TrajectoryThoughtPruningCompactor
+};

package/dist/esm/events/compacted_event.js

@@ -9,16 +9,21 @@ 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 {
     ...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/esm/events/event.js

@@ -5,6 +5,7 @@ const require = topLevelCreateRequire(import.meta.url);
  * 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 = {}) {
@@ -36,6 +37,17 @@ function getFunctionCalls(event) {
   }
   return funcCalls;
 }
+const AF_FUNCTION_CALL_ID_PREFIX = "adk-";
+function generateClientFunctionCallId() {
+  return `${AF_FUNCTION_CALL_ID_PREFIX}${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) {
@@ -65,6 +77,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 = "";
@@ -100,12 +140,18 @@ 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,
   transformToSnakeCaseEvent

package/dist/esm/index.js

@@ -29,11 +29,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,6 +51,7 @@ export {
   GcsArtifactService,
   InvocationContext,
   RemoteA2AAgent,
+  RunSkillInlineScriptErrorCode,
   RunSkillInlineScriptTool,
   RunSkillScriptTool,
   UnsafeLocalCodeExecutor,

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

@@ -10,6 +10,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 {
   /**
@@ -65,7 +66,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 ? `${this.prefix}_${tool.name}` : tool.name;
       const mcpTool = new MCPTool(

package/dist/esm/models/google_llm.js

@@ -5,6 +5,7 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+var _a, _b;
 import {
   createPartFromText,
   GoogleGenAI
@@ -16,8 +17,13 @@ import { AsyncQueue } from "../utils/async_queue.js";
 import { StreamingResponseAggregator } from "../utils/streaming_utils.js";
 import { BaseLlm } from "./base_llm.js";
 import { GeminiLlmConnection } from "./gemini_llm_connection.js";
+import { generateContentViaInteractions } from "./interactions_utils.js";
 import { createLlmResponse } from "./llm_response.js";
-class Gemini extends BaseLlm {
+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 = BaseLlm, _a = GEMINI_MODEL_SYMBOL, _b) {
   /**
    * @param params The parameters for creating a Gemini instance.
    */
@@ -27,12 +33,14 @@ class Gemini extends BaseLlm {
     vertexai,
     project,
     location,
-    headers
+    headers,
+    useInteractionsApi
   }) {
     if (!model) {
       model = "gemini-2.5-flash";
     }
     super({ model });
+    this[_a] = true;
     const params = geminiInitParams({
       model,
       vertexai,
@@ -50,6 +58,7 @@ class Gemini extends BaseLlm {
     this.apiKey = params.apiKey;
     this.headers = headers;
     this.vertexai = !!params.vertexai;
+    this.useInteractionsApi = !!useInteractionsApi;
   }
   /**
    * Sends a request to the Gemini model.
@@ -59,11 +68,15 @@ class Gemini extends BaseLlm {
    * @yields LlmResponse: The model response.
    */
   async *generateContentAsync(llmRequest, stream = false, abortSignal) {
-    var _a, _b, _c;
+    var _a2, _b2, _c;
+    if (this.useInteractionsApi) {
+      yield* generateContentViaInteractions(this.apiClient, llmRequest, stream);
+      return;
+    }
     this.preprocessRequest(llmRequest);
     this.maybeAppendUserContent(llmRequest);
     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 = {};
@@ -79,7 +92,7 @@ class Gemini extends 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
       });
@@ -167,8 +180,8 @@ class Gemini extends 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 = {};
       }
@@ -178,7 +191,7 @@ class Gemini extends 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.
@@ -279,5 +292,6 @@ function geminiInitParams({
 }
 export {
   Gemini,
-  geminiInitParams
+  geminiInitParams,
+  isGemini
 };