@google/adk 1.5.0 → 2.0.0

package/dist/web/a2a/part_converter_utils.js

@@ -1,5 +1,7 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2026 Google LLC
@@ -20,6 +22,7 @@ var DataPartType = /* @__PURE__ */ ((DataPartType2) => {
 function toA2AParts(parts = [], longRunningToolIDs = []) {
   return parts.map((part) => toA2APart(part, longRunningToolIDs));
 }
+__name(toA2AParts, "toA2AParts");
 function toA2APart(part, longRunningToolIDs) {
   if (part.text !== void 0 && part.text !== null) {
     return toA2ATextPart(part);
@@ -29,6 +32,7 @@ function toA2APart(part, longRunningToolIDs) {
   }
   return toA2ADataPart(part, longRunningToolIDs);
 }
+__name(toA2APart, "toA2APart");
 function toA2ATextPart(part) {
   const a2aPart = { kind: "text", text: part.text || "" };
   if (part.thought) {
@@ -38,6 +42,7 @@ function toA2ATextPart(part) {
   }
   return a2aPart;
 }
+__name(toA2ATextPart, "toA2ATextPart");
 function toA2AFilePart(part) {
   const metadata = {};
   if (part.videoMetadata) {
@@ -65,6 +70,7 @@ function toA2AFilePart(part) {
   }
   throw new Error("Not a file part: ".concat(JSON.stringify(part)));
 }
+__name(toA2AFilePart, "toA2AFilePart");
 function toA2ADataPart(part, longRunningToolIDs = []) {
   let dataPartType;
   let data;
@@ -102,13 +108,16 @@ function toA2ADataPart(part, longRunningToolIDs = []) {
     metadata
   };
 }
+__name(toA2ADataPart, "toA2ADataPart");
 function toGenAIContent(a2aMessage) {
   const parts = toGenAIParts(a2aMessage.parts);
   return a2aMessage.role === "user" ? createUserContent(parts) : createModelContent(parts);
 }
+__name(toGenAIContent, "toGenAIContent");
 function toGenAIParts(a2aParts) {
   return a2aParts.map((a2aPart) => toGenAIPart(a2aPart));
 }
+__name(toGenAIParts, "toGenAIParts");
 function toGenAIPart(a2aPart) {
   if (a2aPart.kind === "text") {
     return toGenAIPartText(a2aPart);
@@ -121,6 +130,7 @@ function toGenAIPart(a2aPart) {
   }
   throw new Error("Unknown part kind: ".concat(JSON.stringify(a2aPart)));
 }
+__name(toGenAIPart, "toGenAIPart");
 function toGenAIPartText(a2aPart) {
   var _a;
   return {
@@ -128,6 +138,7 @@ function toGenAIPartText(a2aPart) {
     thought: !!((_a = a2aPart.metadata) == null ? void 0 : _a[A2AMetadataKeys.THOUGHT])
   };
 }
+__name(toGenAIPartText, "toGenAIPartText");
 function toGenAIPartFile(a2aPart) {
   var _a;
   const part = {};
@@ -150,6 +161,7 @@ function toGenAIPartFile(a2aPart) {
   }
   throw new Error("Not a file part: ".concat(JSON.stringify(a2aPart)));
 }
+__name(toGenAIPartFile, "toGenAIPartFile");
 function toGenAIPartData(a2aPart) {
   var _a;
   if (!a2aPart.data) {
@@ -173,6 +185,7 @@ function toGenAIPartData(a2aPart) {
     text: JSON.stringify(a2aPart.data)
   };
 }
+__name(toGenAIPartData, "toGenAIPartData");
 export {
   toA2ADataPart,
   toA2AFilePart,

package/dist/web/agents/active_streaming_tool.js

@@ -1,12 +1,14 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Task } from "../utils/task.js";
-class ActiveStreamingTool {
+const _ActiveStreamingTool = class _ActiveStreamingTool {
   constructor(params = {}) {
     if (params.task instanceof Promise) {
       this.task = new Task(() => params.task);
@@ -15,7 +17,9 @@ class ActiveStreamingTool {
     }
     this.stream = params.stream;
   }
-}
+};
+__name(_ActiveStreamingTool, "ActiveStreamingTool");
+let ActiveStreamingTool = _ActiveStreamingTool;
 export {
   ActiveStreamingTool
 };

package/dist/web/agents/base_agent.js

@@ -23,6 +23,7 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __await = function(promise, isYieldStar) {
   this[0] = promise;
   this[1] = isYieldStar;
@@ -72,7 +73,7 @@ var __forAwait = (obj, it, method) => (it = obj[__knownSymbol("asyncIterator")])
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-var _a;
+var _a, _b;
 import { context, trace } from "@opentelemetry/api";
 import { createEvent } from "../events/event.js";
 import {
@@ -80,22 +81,23 @@ import {
   traceAgentInvocation,
   tracer
 } from "../telemetry/tracing.js";
+import { BaseNode } from "../workflow/base_node.js";
 import { Context } from "./context.js";
 import { InvocationContext } from "./invocation_context.js";
 const BASE_AGENT_SIGNATURE_SYMBOL = Symbol.for("google.adk.baseAgent");
 function isBaseAgent(obj) {
   return typeof obj === "object" && obj !== null && BASE_AGENT_SIGNATURE_SYMBOL in obj && obj[BASE_AGENT_SIGNATURE_SYMBOL] === true;
 }
-_a = BASE_AGENT_SIGNATURE_SYMBOL;
-class BaseAgent {
+__name(isBaseAgent, "isBaseAgent");
+const _BaseAgent = class _BaseAgent extends (_b = BaseNode, _a = BASE_AGENT_SIGNATURE_SYMBOL, _b) {
   constructor(config) {
+    super(__spreadProps(__spreadValues({}, config), { name: validateAgentName(config.name) }));
     /**
      * A unique symbol to identify ADK agent classes.
      */
     this[_a] = true;
     this.config = __spreadValues({}, config);
     this.name = validateAgentName(config.name);
-    this.description = config.description;
     this.parentAgent = config.parentAgent;
     this.subAgents = config.subAgents || [];
     this.beforeAgentCallback = getCannonicalCallback(
@@ -104,6 +106,10 @@ class BaseAgent {
     this.afterAgentCallback = getCannonicalCallback(config.afterAgentCallback);
     this.setParentAgentForSubAgents();
   }
+  // `description` is inherited from BaseNode, which declares it `string` and
+  // defaults it to ''. It used to be `string | undefined` here; every consumer
+  // already coalesced (`agent.description || ''`), so the default is
+  // equivalent for them.
   /**
    * Root agent of this agent.
    * Computed dynamically by traversing up the parent chain.
@@ -166,7 +172,7 @@ class BaseAgent {
           this,
           function() {
             return __asyncGenerator(this, null, function* () {
-              var _a2, _b;
+              var _a2, _b2;
               const context2 = this.createInvocationContext(parentContext);
               const beforeAgentCallbackEvent = yield new __await(this.handleBeforeAgentCallback(context2));
               if (beforeAgentCallbackEvent) {
@@ -191,7 +197,7 @@ class BaseAgent {
                     throw error[0];
                 }
               }
-              if (context2.endInvocation || ((_b = parentContext.abortSignal) == null ? void 0 : _b.aborted)) {
+              if (context2.endInvocation || ((_b2 = parentContext.abortSignal) == null ? void 0 : _b2.aborted)) {
                 return;
               }
               const afterAgentCallbackEvent = yield new __await(this.handleAfterAgentCallback(context2));
@@ -206,6 +212,33 @@ class BaseAgent {
       }
     });
   }
+  /**
+   * Runs this agent as a workflow node.
+   *
+   * The node runner calls this; it delegates to {@link runAsync}, so an agent
+   * behaves identically whether it is run directly or as a node. Mirrors
+   * adk-python `BaseAgent._run_impl`.
+   *
+   * The invocation context comes from {@link NodeContext.getInvocationContext}
+   * rather than the raw field, so the agent runs against whatever view of the
+   * session the workflow wants it to see.
+   *
+   * Unlike adk-python's `_run_impl`, nothing is stamped onto the events here.
+   * Python has to fix up the author and the node path because it authors
+   * in-workflow events as the workflow itself; the TypeScript node runner
+   * already owns both (`enrichEvent` keeps an author the node set, and always
+   * stamps the true node path), so repeating it would be dead code.
+   *
+   * `nodeInput` is intentionally unused: an agent's input is its conversation,
+   * which the workflow supplies through the session. A node that needs to read
+   * its input — an `LlmAgent` injecting it into the prompt, say — does so in
+   * its own wrapper.
+   */
+  runImpl(ctx, _nodeInput) {
+    return __asyncGenerator(this, null, function* () {
+      yield* __yieldStar(this.runAsync(ctx.getInvocationContext()));
+    });
+  }
   /**
    * Entry method to run an agent via video/audio-based conversation.
    *
@@ -223,7 +256,7 @@ class BaseAgent {
           this,
           function() {
             return __asyncGenerator(this, null, function* () {
-              var _a2, _b;
+              var _a2, _b2;
               const context2 = this.createInvocationContext(parentContext);
               const beforeAgentCallbackEvent = yield new __await(this.handleBeforeAgentCallback(context2));
               if (beforeAgentCallbackEvent) {
@@ -247,7 +280,7 @@ class BaseAgent {
                     throw error[0];
                 }
               }
-              if (context2.endInvocation || ((_b = parentContext.abortSignal) == null ? void 0 : _b.aborted)) {
+              if (context2.endInvocation || ((_b2 = parentContext.abortSignal) == null ? void 0 : _b2.aborted)) {
                 return;
               }
               const afterAgentCallbackEvent = yield new __await(this.handleAfterAgentCallback(context2));
@@ -387,7 +420,9 @@ class BaseAgent {
       subAgent.parentAgent = this;
     }
   }
-}
+};
+__name(_BaseAgent, "BaseAgent");
+let BaseAgent = _BaseAgent;
 function validateAgentName(name) {
   if (!isIdentifier(name)) {
     throw new Error(
@@ -401,21 +436,25 @@ function validateAgentName(name) {
   }
   return name;
 }
+__name(validateAgentName, "validateAgentName");
 function isIdentifier(str) {
   return new RegExp("^[\\p{ID_Start}$_][\\p{ID_Continue}$_-]*$", "u").test(str);
 }
+__name(isIdentifier, "isIdentifier");
 function getRootAgent(rootAgent) {
   while (rootAgent.parentAgent) {
     rootAgent = rootAgent.parentAgent;
   }
   return rootAgent;
 }
+__name(getRootAgent, "getRootAgent");
 function getCannonicalCallback(callbacks) {
   if (!callbacks) {
     return [];
   }
   return Array.isArray(callbacks) ? callbacks : [callbacks];
 }
+__name(getCannonicalCallback, "getCannonicalCallback");
 export {
   BaseAgent,
   getCannonicalCallback,

package/dist/web/agents/context.js

@@ -1,5 +1,7 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -10,7 +12,7 @@ import { createEventActions } from "../events/event_actions.js";
 import { State } from "../sessions/state.js";
 import { ToolConfirmation } from "../tools/tool_confirmation.js";
 import { ReadonlyContext } from "./readonly_context.js";
-class Context extends ReadonlyContext {
+const _Context = class _Context extends ReadonlyContext {
   /**
    * @param options The configuration options for the Context.
    * @param options.invocationContext The invocation context.
@@ -136,7 +138,9 @@ class Context extends ReadonlyContext {
       payload
     });
   }
-}
+};
+__name(_Context, "Context");
+let Context = _Context;
 export {
   Context
 };

package/dist/web/agents/framework_function_calls.js

@@ -0,0 +1,34 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const REQUEST_CONFIRMATION_FUNCTION_CALL_NAME = "adk_request_confirmation";
+const REQUEST_CREDENTIAL_FUNCTION_CALL_NAME = "adk_request_credential";
+const REQUEST_INPUT_FUNCTION_CALL_NAME = "adk_request_input";
+const RESERVED_FUNCTION_CALL_NAMES = /* @__PURE__ */ new Set([
+  REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
+  REQUEST_CREDENTIAL_FUNCTION_CALL_NAME,
+  REQUEST_INPUT_FUNCTION_CALL_NAME
+]);
+function reservedFunctionCallName(content) {
+  var _a, _b;
+  for (const part of (_a = content == null ? void 0 : content.parts) != null ? _a : []) {
+    const name = (_b = part.functionCall) == null ? void 0 : _b.name;
+    if (name && RESERVED_FUNCTION_CALL_NAMES.has(name)) {
+      return name;
+    }
+  }
+  return void 0;
+}
+__name(reservedFunctionCallName, "reservedFunctionCallName");
+export {
+  REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
+  REQUEST_CREDENTIAL_FUNCTION_CALL_NAME,
+  REQUEST_INPUT_FUNCTION_CALL_NAME,
+  reservedFunctionCallName
+};

package/dist/web/agents/functions.js

@@ -1,5 +1,7 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -16,18 +18,31 @@ import {
 import { mergeEventActions } from "../events/event_actions.js";
 import { logger } from "../utils/logger.js";
 import { Context } from "./context.js";
+import {
+  REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
+  REQUEST_CREDENTIAL_FUNCTION_CALL_NAME
+} from "./framework_function_calls.js";
 import {
   traceMergedToolCalls,
   tracer,
   traceToolCall
 } from "../telemetry/tracing.js";
+function toolEventAuthor(invocationContext) {
+  var _a, _b;
+  return (_b = (_a = invocationContext.agent) == null ? void 0 : _a.name) != null ? _b : "";
+}
+__name(toolEventAuthor, "toolEventAuthor");
 import {
   AF_FUNCTION_CALL_ID_PREFIX,
   generateClientFunctionCallId as generateClientFunctionCallId2,
   populateClientFunctionCallId
 } from "../events/event.js";
-const REQUEST_EUC_FUNCTION_CALL_NAME = "adk_request_credential";
-const REQUEST_CONFIRMATION_FUNCTION_CALL_NAME = "adk_request_confirmation";
+import {
+  REQUEST_CONFIRMATION_FUNCTION_CALL_NAME as REQUEST_CONFIRMATION_FUNCTION_CALL_NAME2,
+  REQUEST_CREDENTIAL_FUNCTION_CALL_NAME as REQUEST_CREDENTIAL_FUNCTION_CALL_NAME2,
+  REQUEST_INPUT_FUNCTION_CALL_NAME,
+  reservedFunctionCallName
+} from "./framework_function_calls.js";
 const functionsExportedForTestingOnly = {
   handleFunctionCallList,
   generateAuthEvent,
@@ -42,6 +57,7 @@ function getLongRunningFunctionCalls(functionCalls, toolsDict) {
   }
   return longRunningToolIds;
 }
+__name(getLongRunningFunctionCalls, "getLongRunningFunctionCalls");
 function generateAuthEvent(invocationContext, functionResponseEvent) {
   var _a;
   if (!((_a = functionResponseEvent.actions) == null ? void 0 : _a.requestedAuthConfigs) || isEmpty(functionResponseEvent.actions.requestedAuthConfigs)) {
@@ -52,20 +68,20 @@ function generateAuthEvent(invocationContext, functionResponseEvent) {
   for (const [functionCallId, authConfig] of Object.entries(
     functionResponseEvent.actions.requestedAuthConfigs
   )) {
-    const requestEucFunctionCall = {
-      name: REQUEST_EUC_FUNCTION_CALL_NAME,
+    const requestCredentialFunctionCall = {
+      name: REQUEST_CREDENTIAL_FUNCTION_CALL_NAME,
       args: {
         "function_call_id": functionCallId,
         "auth_config": authConfig
       },
       id: generateClientFunctionCallId()
     };
-    longRunningToolIds.add(requestEucFunctionCall.id);
-    parts.push({ functionCall: requestEucFunctionCall });
+    longRunningToolIds.add(requestCredentialFunctionCall.id);
+    parts.push({ functionCall: requestCredentialFunctionCall });
   }
   return createEvent({
     invocationId: invocationContext.invocationId,
-    author: invocationContext.agent.name,
+    author: toolEventAuthor(invocationContext),
     branch: invocationContext.branch,
     content: {
       parts,
@@ -74,6 +90,7 @@ function generateAuthEvent(invocationContext, functionResponseEvent) {
     longRunningToolIds: Array.from(longRunningToolIds)
   });
 }
+__name(generateAuthEvent, "generateAuthEvent");
 function generateRequestConfirmationEvent({
   invocationContext,
   functionCallEvent,
@@ -106,7 +123,7 @@ function generateRequestConfirmationEvent({
   }
   return createEvent({
     invocationId: invocationContext.invocationId,
-    author: invocationContext.agent.name,
+    author: toolEventAuthor(invocationContext),
     branch: invocationContext.branch,
     content: {
       parts,
@@ -116,6 +133,7 @@ function generateRequestConfirmationEvent({
     longRunningToolIds: Array.from(longRunningToolIds)
   });
 }
+__name(generateRequestConfirmationEvent, "generateRequestConfirmationEvent");
 async function callToolAsync(tool, args, toolContext) {
   return tracer.startActiveSpan("execute_tool ".concat(tool.name), async (span) => {
     try {
@@ -137,6 +155,7 @@ async function callToolAsync(tool, args, toolContext) {
     }
   });
 }
+__name(callToolAsync, "callToolAsync");
 function buildResponseEvent(tool, functionResult, toolContext, invocationContext) {
   let responseResult;
   if (typeof functionResult !== "object" || functionResult == null) {
@@ -159,12 +178,13 @@ function buildResponseEvent(tool, functionResult, toolContext, invocationContext
   };
   return createEvent({
     invocationId: invocationContext.invocationId,
-    author: invocationContext.agent.name,
+    author: toolEventAuthor(invocationContext),
     content,
     actions: toolContext.actions,
     branch: invocationContext.branch
   });
 }
+__name(buildResponseEvent, "buildResponseEvent");
 async function handleFunctionCallsAsync({
   invocationContext,
   functionCallEvent,
@@ -185,6 +205,20 @@ async function handleFunctionCallsAsync({
     toolConfirmationDict
   });
 }
+__name(handleFunctionCallsAsync, "handleFunctionCallsAsync");
+function normalizeCallbackResponse(response) {
+  if (response == null) {
+    return void 0;
+  }
+  if (typeof response !== "object") {
+    return { result: response };
+  }
+  if (Array.isArray(response)) {
+    return { results: response };
+  }
+  return response;
+}
+__name(normalizeCallbackResponse, "normalizeCallbackResponse");
 async function handleFunctionCallList({
   invocationContext,
   functionCalls,
@@ -231,6 +265,7 @@ async function handleFunctionCallList({
         }
       }
     }
+    functionResponse = normalizeCallbackResponse(functionResponse);
     if (functionResponse == null) {
       try {
         functionResponse = await callToolAsync(tool, functionArgs, toolContext);
@@ -242,8 +277,8 @@ async function handleFunctionCallList({
             toolContext,
             error: e
           });
-          if (onToolErrorResponse) {
-            functionResponse = onToolErrorResponse;
+          if (onToolErrorResponse != null) {
+            functionResponse = normalizeCallbackResponse(onToolErrorResponse);
           } else {
             functionResponseError = e.message;
           }
@@ -272,21 +307,21 @@ async function handleFunctionCallList({
       }
     }
     if (alteredFunctionResponse != null) {
-      functionResponse = alteredFunctionResponse;
+      functionResponse = normalizeCallbackResponse(alteredFunctionResponse);
     }
-    if (tool.isLongRunning && !functionResponse) {
+    if (tool.isLongRunning && functionResponse == null) {
       continue;
     }
     if (functionResponseError) {
       functionResponse = { error: functionResponseError };
-    } else if (typeof functionResponse !== "object" || functionResponse == null) {
+    } else if (functionResponse == null) {
       functionResponse = { result: functionResponse };
-    } else if (Array.isArray(functionResponse)) {
-      functionResponse = { results: functionResponse };
+    } else {
+      functionResponse = normalizeCallbackResponse(functionResponse);
     }
     const functionResponseEvent = createEvent({
       invocationId: invocationContext.invocationId,
-      author: invocationContext.agent.name,
+      author: toolEventAuthor(invocationContext),
       content: createUserContent({
         functionResponse: {
           id: toolContext.functionCallId,
@@ -329,6 +364,7 @@ async function handleFunctionCallList({
   }
   return mergedEvent;
 }
+__name(handleFunctionCallList, "handleFunctionCallList");
 function getToolAndContext({
   invocationContext,
   functionCall,
@@ -348,6 +384,7 @@ function getToolAndContext({
   const tool = toolsDict[functionCall.name];
   return { tool, toolContext };
 }
+__name(getToolAndContext, "getToolAndContext");
 function mergeParallelFunctionResponseEvents(functionResponseEvents) {
   if (!functionResponseEvents.length) {
     throw new Error("No function response events provided.");
@@ -375,6 +412,7 @@ function mergeParallelFunctionResponseEvents(functionResponseEvents) {
     timestamp: baseEvent.timestamp
   });
 }
+__name(mergeParallelFunctionResponseEvents, "mergeParallelFunctionResponseEvents");
 function findEventByFunctionCallId(events, functionCallId, endIndex = events.length) {
   for (let i = endIndex - 1; i >= 0; i--) {
     const event = events[i];
@@ -387,6 +425,7 @@ function findEventByFunctionCallId(events, functionCallId, endIndex = events.len
   }
   return void 0;
 }
+__name(findEventByFunctionCallId, "findEventByFunctionCallId");
 function findMatchingFunctionCall(events) {
   if (!events.length) {
     return void 0;
@@ -402,10 +441,12 @@ function findMatchingFunctionCall(events) {
     events.length - 1
   );
 }
+__name(findMatchingFunctionCall, "findMatchingFunctionCall");
 export {
   AF_FUNCTION_CALL_ID_PREFIX,
-  REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
-  REQUEST_EUC_FUNCTION_CALL_NAME,
+  REQUEST_CONFIRMATION_FUNCTION_CALL_NAME2 as REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
+  REQUEST_CREDENTIAL_FUNCTION_CALL_NAME2 as REQUEST_CREDENTIAL_FUNCTION_CALL_NAME,
+  REQUEST_INPUT_FUNCTION_CALL_NAME,
   findEventByFunctionCallId,
   findMatchingFunctionCall,
   functionsExportedForTestingOnly,
@@ -416,5 +457,6 @@ export {
   handleFunctionCallList,
   handleFunctionCallsAsync,
   mergeParallelFunctionResponseEvents,
-  populateClientFunctionCallId
+  populateClientFunctionCallId,
+  reservedFunctionCallName
 };