@google/adk 1.6.0 → 2.1.0

package/dist/esm/agents/base_agent.js

@@ -1,11 +1,13 @@
 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
  */
-var _a;
+var _a, _b;
 import { context, trace } from "@opentelemetry/api";
 import { createEvent } from "../events/event.js";
 import {
@@ -13,22 +15,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");
+const BASE_AGENT_SIGNATURE_SYMBOL = /* @__PURE__ */ 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({ ...config, name: validateAgentName(config.name) });
     /**
      * A unique symbol to identify ADK agent classes.
      */
     this[_a] = true;
     this.config = { ...config };
     this.name = validateAgentName(config.name);
-    this.description = config.description;
     this.parentAgent = config.parentAgent;
     this.subAgents = config.subAgents || [];
     this.beforeAgentCallback = getCannonicalCallback(
@@ -37,6 +40,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.
@@ -47,15 +54,16 @@ class BaseAgent {
   /**
    * Creates a copy of this agent with the given config fields overridden.
    *
-   * Mirrors adk-python's `BaseAgent.clone(update=...)`. The clone is a detached
-   * root: its `parentAgent` is always `undefined`. Sub-agents are recursively
-   * cloned (and re-parented to the clone) unless `subAgents` is overridden.
-   * Rebuilding via the concrete constructor re-derives all state, so a cloned
-   * `LlmAgent` gets a fresh `requestProcessors` array rather than sharing the
-   * original's. See google/adk-js#534.
+   * The clone is a detached root: its `parentAgent` is always `undefined`.
+   * Sub-agents are recursively cloned (and re-parented to the clone) unless
+   * `subAgents` is overridden. Rebuilding via the concrete constructor
+   * re-derives all state, so a cloned `LlmAgent` gets a fresh
+   * `requestProcessors` array rather than sharing the original's.
+   * See google/adk-js#534.
    *
    * @param overrides Config fields to override on the clone. Overriding
-   *     `parentAgent` is rejected, matching adk-python.
+   *     `parentAgent` is rejected: parentage is assigned only when a parent
+   *     agent is constructed with its sub-agents.
    * @returns A new detached agent instance of the same concrete class.
    */
   clone(overrides) {
@@ -97,7 +105,7 @@ class BaseAgent {
         ctx,
         this,
         async function* () {
-          var _a2, _b;
+          var _a2, _b2;
           const context2 = this.createInvocationContext(parentContext);
           const beforeAgentCallbackEvent = await this.handleBeforeAgentCallback(context2);
           if (beforeAgentCallbackEvent) {
@@ -110,7 +118,7 @@ class BaseAgent {
           for await (const event of this.runAsyncImpl(context2)) {
             yield event;
           }
-          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 = await this.handleAfterAgentCallback(context2);
@@ -123,6 +131,31 @@ class BaseAgent {
       span.end();
     }
   }
+  /**
+   * 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.
+   */
+  async *runImpl(ctx, _nodeInput) {
+    yield* this.runAsync(ctx.getInvocationContext());
+  }
   /**
    * Entry method to run an agent via video/audio-based conversation.
    *
@@ -138,7 +171,7 @@ class BaseAgent {
         ctx,
         this,
         async function* () {
-          var _a2, _b;
+          var _a2, _b2;
           const context2 = this.createInvocationContext(parentContext);
           const beforeAgentCallbackEvent = await this.handleBeforeAgentCallback(context2);
           if (beforeAgentCallbackEvent) {
@@ -150,7 +183,7 @@ class BaseAgent {
           for await (const event of this.runLiveImpl(context2)) {
             yield event;
           }
-          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 = await this.handleAfterAgentCallback(context2);
@@ -289,7 +322,9 @@ class BaseAgent {
       subAgent.parentAgent = this;
     }
   }
-}
+};
+__name(_BaseAgent, "BaseAgent");
+let BaseAgent = _BaseAgent;
 function validateAgentName(name) {
   if (!isIdentifier(name)) {
     throw new Error(
@@ -303,21 +338,25 @@ function validateAgentName(name) {
   }
   return name;
 }
+__name(validateAgentName, "validateAgentName");
 function isIdentifier(str) {
   return /^[\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/esm/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.
@@ -22,8 +24,14 @@ class Context extends ReadonlyContext {
    *     call.
    * @param options.toolConfirmation The tool confirmation of the current tool
    *     call.
+   * @param options.resumeInputs The inputs the current tool call is being
+   *     resumed with, if it paused to ask for them, keyed by interrupt id.
+   *     Defaults to empty rather than absent, matching adk-python's
+   *     `Context.resume_inputs`. Carries no approval; see
+   *     {@link ResumeInputs}.
    */
   constructor(options) {
+    var _a;
     super(options.invocationContext);
     this.eventActions = options.eventActions || createEventActions();
     this._state = new State(
@@ -32,6 +40,7 @@ class Context extends ReadonlyContext {
     );
     this.functionCallId = options.functionCallId;
     this.toolConfirmation = options.toolConfirmation;
+    this.resumeInputs = (_a = options.resumeInputs) != null ? _a : {};
     this.abortSignal = options.invocationContext.abortSignal;
   }
   /**
@@ -136,7 +145,9 @@ class Context extends ReadonlyContext {
       payload
     });
   }
-}
+};
+__name(_Context, "Context");
+let Context = _Context;
 export {
   Context
 };

package/dist/esm/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
+};