@google/adk 1.3.0 → 1.5.0

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,32 @@ 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 __spreadProps(__spreadValues({}, event), {
+    content: __spreadProps(__spreadValues({}, event.content), {
+      parts: prunedParts
+    })
+  });
+}
 const ASCII_LETTERS_AND_NUMBERS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 function createNewEventId() {
   let id = "";
@@ -118,12 +156,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/web/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/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(

package/dist/web/models/google_llm.js

@@ -5,6 +5,9 @@ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
 var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
 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 = {}))
@@ -32,12 +35,41 @@ var __asyncGenerator = (__this, __arguments, generator) => {
   }, method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no)), it = {};
   return generator = generator.apply(__this, __arguments), it[__knownSymbol("asyncIterator")] = () => it, method("next"), method("throw"), method("return"), it;
 };
+var __yieldStar = (value) => {
+  var obj = value[__knownSymbol("asyncIterator")], isAwait = false, method, it = {};
+  if (obj == null) {
+    obj = value[__knownSymbol("iterator")]();
+    method = (k) => it[k] = (x) => obj[k](x);
+  } else {
+    obj = obj.call(value);
+    method = (k) => it[k] = (v) => {
+      if (isAwait) {
+        isAwait = false;
+        if (k === "throw") throw v;
+        return v;
+      }
+      isAwait = true;
+      return {
+        done: false,
+        value: new __await(new Promise((resolve) => {
+          var x = obj[k](v);
+          if (!(x instanceof Object)) __typeError("Object expected");
+          resolve(x);
+        }), 1)
+      };
+    };
+  }
+  return it[__knownSymbol("iterator")] = () => it, method("next"), "throw" in obj ? method("throw") : it.throw = (x) => {
+    throw x;
+  }, "return" in obj && method("return"), it;
+};
 var __forAwait = (obj, it, method) => (it = obj[__knownSymbol("asyncIterator")]) ? it.call(obj) : (obj = obj[__knownSymbol("iterator")](), it = {}, method = (key, fn) => (fn = obj[key]) && (it[key] = (arg) => new Promise((yes, no, done) => (arg = fn.call(obj, arg), done = arg.done, Promise.resolve(arg.value).then((value) => yes({ value, done }), no)))), method("next"), method("return"), it);
 /**
  * @license
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+var _a, _b;
 import {
   createPartFromText,
   GoogleGenAI
@@ -49,8 +81,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.
    */
@@ -60,12 +97,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,
@@ -83,6 +122,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.
@@ -93,11 +133,15 @@ class Gemini extends BaseLlm {
    */
   generateContentAsync(llmRequest, stream = false, abortSignal) {
     return __asyncGenerator(this, null, function* () {
-      var _a, _b, _c;
+      var _a2, _b2, _c;
+      if (this.useInteractionsApi) {
+        yield* __yieldStar(generateContentViaInteractions(this.apiClient, llmRequest, stream));
+        return;
+      }
       this.preprocessRequest(llmRequest);
       this.maybeAppendUserContent(llmRequest);
       logger.info(
-        "Sending out request, model: ".concat((_a = llmRequest.model) != null ? _a : this.model, ", backend: ").concat(this.apiBackend, ", stream: ").concat(stream)
+        "Sending out request, model: ".concat((_a2 = llmRequest.model) != null ? _a2 : this.model, ", backend: ").concat(this.apiBackend, ", stream: ").concat(stream)
       );
       if (!llmRequest.config) {
         llmRequest.config = {};
@@ -110,7 +154,7 @@ class Gemini extends BaseLlm {
       }
       if (stream) {
         const streamResult = yield new __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
         }));
@@ -223,8 +267,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 = {};
       }
@@ -234,7 +278,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.
@@ -335,5 +379,6 @@ function geminiInitParams({
 }
 export {
   Gemini,
-  geminiInitParams
+  geminiInitParams,
+  isGemini
 };