@google/adk 0.3.0 → 0.4.0

package/dist/esm/a2a/part_converter_utils.js

@@ -0,0 +1,171 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+var MetadataKeys = /* @__PURE__ */ ((MetadataKeys2) => {
+  MetadataKeys2["TYPE"] = "adk_type";
+  MetadataKeys2["LONG_RUNNING"] = "adk_is_long_running";
+  MetadataKeys2["THOUGHT"] = "adk_thought";
+  return MetadataKeys2;
+})(MetadataKeys || {});
+var DataPartType = /* @__PURE__ */ ((DataPartType2) => {
+  DataPartType2["FUNCTION_CALL"] = "function_call";
+  DataPartType2["FUNCTION_RESPONSE"] = "function_response";
+  DataPartType2["CODE_EXEC_RESULT"] = "code_execution_result";
+  DataPartType2["CODE_EXECUTABLE_CODE"] = "executable_code";
+  return DataPartType2;
+})(DataPartType || {});
+function toA2AParts(parts, longRunningToolIDs = []) {
+  return parts.map((part) => toA2APart(part, longRunningToolIDs));
+}
+function toA2APart(part, longRunningToolIDs) {
+  if (part.text !== void 0 && part.text !== null) {
+    return toA2ATextPart(part);
+  }
+  if (part.inlineData || part.fileData) {
+    return toA2AFilePart(part);
+  }
+  return toA2ADataPart(part, longRunningToolIDs);
+}
+function toA2ATextPart(part) {
+  const a2aPart = { kind: "text", text: part.text || "" };
+  if ("thought" in part && part["thought"]) {
+    a2aPart.metadata = {
+      ["adk_thought" /* THOUGHT */]: true
+    };
+  }
+  return a2aPart;
+}
+function toA2AFilePart(part) {
+  if (part.fileData) {
+    return {
+      kind: "file",
+      file: {
+        uri: part.fileData.fileUri || "",
+        mimeType: part.fileData.mimeType
+      },
+      metadata: {}
+    };
+  }
+  if (part.inlineData) {
+    return {
+      kind: "file",
+      file: {
+        bytes: part.inlineData.data || "",
+        mimeType: part.inlineData.mimeType
+      },
+      metadata: {}
+    };
+  }
+  throw new Error(`Not a file part: ${JSON.stringify(part)}`);
+}
+function toA2ADataPart(part, longRunningToolIDs = []) {
+  let type;
+  let data;
+  if (part.functionCall) {
+    type = "function_call" /* FUNCTION_CALL */;
+    data = part.functionCall;
+  } else if (part.functionResponse) {
+    type = "function_response" /* FUNCTION_RESPONSE */;
+    data = part.functionResponse;
+  } else if (part.executableCode) {
+    type = "executable_code" /* CODE_EXECUTABLE_CODE */;
+    data = part.executableCode;
+  } else if (part.codeExecutionResult) {
+    type = "code_execution_result" /* CODE_EXEC_RESULT */;
+    data = part.codeExecutionResult;
+  } else {
+    throw new Error(`Unknown part type: ${JSON.stringify(part)}`);
+  }
+  const metadata = {
+    ["adk_type" /* TYPE */]: type
+  };
+  if (part.functionCall && part.functionCall.name && longRunningToolIDs.includes(part.functionCall.name)) {
+    metadata["adk_is_long_running" /* LONG_RUNNING */] = true;
+  }
+  if (part.functionResponse && part.functionResponse.name && longRunningToolIDs.includes(part.functionResponse.name)) {
+    metadata["adk_is_long_running" /* LONG_RUNNING */] = true;
+  }
+  return {
+    kind: "data",
+    data,
+    metadata
+  };
+}
+function toGenAIParts(a2aParts) {
+  return a2aParts.map((a2aPart) => toGenAIPart(a2aPart));
+}
+function toGenAIPart(a2aPart) {
+  if (a2aPart.kind === "text") {
+    return toGenAIPartText(a2aPart);
+  }
+  if (a2aPart.kind === "file") {
+    return toGenAIPartFile(a2aPart);
+  }
+  if (a2aPart.kind === "data") {
+    return toGenAIPartData(a2aPart);
+  }
+  throw new Error(`Unknown part kind: ${JSON.stringify(a2aPart)}`);
+}
+function toGenAIPartText(a2aPart) {
+  var _a;
+  return {
+    text: a2aPart.text,
+    thought: !!((_a = a2aPart.metadata) == null ? void 0 : _a["adk_thought" /* THOUGHT */])
+  };
+}
+function toGenAIPartFile(a2aPart) {
+  if ("bytes" in a2aPart.file) {
+    return {
+      inlineData: {
+        data: a2aPart.file.bytes,
+        mimeType: a2aPart.file.mimeType || ""
+      }
+    };
+  }
+  if ("uri" in a2aPart.file) {
+    return {
+      fileData: {
+        fileUri: a2aPart.file.uri,
+        mimeType: a2aPart.file.mimeType || ""
+      }
+    };
+  }
+  throw new Error(`Not a file part: ${JSON.stringify(a2aPart)}`);
+}
+function toGenAIPartData(a2aPart) {
+  var _a;
+  if (!a2aPart.data) {
+    throw new Error(`No data in part: ${JSON.stringify(a2aPart)}`);
+  }
+  const data = a2aPart.data;
+  const type = (_a = a2aPart.metadata) == null ? void 0 : _a["adk_type" /* TYPE */];
+  if (type === "function_call" /* FUNCTION_CALL */) {
+    return { functionCall: data };
+  }
+  if (type === "function_response" /* FUNCTION_RESPONSE */) {
+    return { functionResponse: data };
+  }
+  if (type === "executable_code" /* CODE_EXECUTABLE_CODE */) {
+    return { executableCode: data };
+  }
+  if (type === "code_execution_result" /* CODE_EXEC_RESULT */) {
+    return { codeExecutionResult: data };
+  }
+  return {
+    text: JSON.stringify(a2aPart.data)
+  };
+}
+export {
+  toA2ADataPart,
+  toA2AFilePart,
+  toA2APart,
+  toA2AParts,
+  toA2ATextPart,
+  toGenAIPart,
+  toGenAIPartData,
+  toGenAIPartFile,
+  toGenAIPartText,
+  toGenAIParts
+};

package/dist/esm/agents/base_agent.js

@@ -225,7 +225,7 @@ class BaseAgent {
 function validateAgentName(name) {
   if (!isIdentifier(name)) {
     throw new Error(
-      `Found invalid agent name: "${name}". Agent name must be a valid identifier. It should start with a letter (a-z, A-Z) or an underscore (_), and can only contain letters, digits (0-9), and underscores.`
+      `Found invalid agent name: "${name}". Agent name must be a valid identifier. It should start with a letter (a-z, A-Z) or an underscore (_), and can only contain letters, digits (0-9), underscores, and hyphens.`
     );
   }
   if (name === "user") {
@@ -236,7 +236,7 @@ function validateAgentName(name) {
   return name;
 }
 function isIdentifier(str) {
-  return /^[\p{ID_Start}$_][\p{ID_Continue}$_]*$/u.test(str);
+  return /^[\p{ID_Start}$_][\p{ID_Continue}$_-]*$/u.test(str);
 }
 function getRootAgent(rootAgent) {
   while (rootAgent.parentAgent) {

package/dist/esm/agents/functions.js

@@ -128,6 +128,7 @@ function generateRequestConfirmationEvent({
       parts,
       role: functionResponseEvent.content.role
     },
+    actions: functionResponseEvent.actions,
     longRunningToolIds: Array.from(longRunningToolIds)
   });
 }

package/dist/esm/agents/llm_agent.js

@@ -33,7 +33,7 @@ import {
 } from "../models/llm_request.js";
 import { LLMRegistry } from "../models/registry.js";
 import { State } from "../sessions/state.js";
-import { BaseTool } from "../tools/base_tool.js";
+import { isBaseTool } from "../tools/base_tool.js";
 import { FunctionTool } from "../tools/function_tool.js";
 import { ToolConfirmation } from "../tools/tool_confirmation.js";
 import { ToolContext } from "../tools/tool_context.js";
@@ -44,6 +44,7 @@ import {
   traceCallLlm,
   tracer
 } from "../telemetry/tracing.js";
+import { isZodObject, zodObjectToSchema } from "../utils/simple_zod_to_json.js";
 import { BaseAgent } from "./base_agent.js";
 import {
   BaseLlmRequestProcessor
@@ -67,7 +68,7 @@ import { ReadonlyContext } from "./readonly_context.js";
 import { StreamingMode } from "./run_config.js";
 const ADK_AGENT_NAME_LABEL_KEY = "adk_agent_name";
 async function convertToolUnionToTools(toolUnion, context2) {
-  if (toolUnion instanceof BaseTool) {
+  if (isBaseTool(toolUnion)) {
     return [toolUnion];
   }
   return await toolUnion.getTools(context2);
@@ -116,7 +117,7 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
   // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
     const agent = invocationContext.agent;
-    if (!(agent instanceof LlmAgent) || !(agent.rootAgent instanceof LlmAgent)) {
+    if (!isLlmAgent(agent) || !isLlmAgent(agent.rootAgent)) {
       return;
     }
     const rootAgent = agent.rootAgent;
@@ -194,7 +195,7 @@ class AgentTransferLlmRequestProcessor extends BaseLlmRequestProcessor {
   }
   // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
-    if (!(invocationContext.agent instanceof LlmAgent)) {
+    if (!isLlmAgent(invocationContext.agent)) {
       return;
     }
     const transferTargets = this.getTransferTargets(invocationContext.agent);
@@ -380,7 +381,7 @@ class RequestConfirmationLlmRequestProcessor extends BaseLlmRequestProcessor {
 const REQUEST_CONFIRMATION_LLM_REQUEST_PROCESSOR = new RequestConfirmationLlmRequestProcessor();
 class CodeExecutionRequestProcessor extends BaseLlmRequestProcessor {
   async *runAsync(invocationContext, llmRequest) {
-    if (!(invocationContext.agent instanceof LlmAgent)) {
+    if (!isLlmAgent(invocationContext.agent)) {
       return;
     }
     if (!invocationContext.agent.codeExecutor) {
@@ -730,8 +731,8 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
     this.disallowTransferToParent = (_d = config.disallowTransferToParent) != null ? _d : false;
     this.disallowTransferToPeers = (_e = config.disallowTransferToPeers) != null ? _e : false;
     this.includeContents = (_f = config.includeContents) != null ? _f : "default";
-    this.inputSchema = config.inputSchema;
-    this.outputSchema = config.outputSchema;
+    this.inputSchema = isZodObject(config.inputSchema) ? zodObjectToSchema(config.inputSchema) : config.inputSchema;
+    this.outputSchema = isZodObject(config.outputSchema) ? zodObjectToSchema(config.outputSchema) : config.outputSchema;
     this.outputKey = config.outputKey;
     this.beforeModelCallback = config.beforeModelCallback;
     this.afterModelCallback = config.afterModelCallback;
@@ -776,16 +777,6 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
         this.disallowTransferToParent = true;
         this.disallowTransferToPeers = true;
       }
-      if (this.subAgents && this.subAgents.length > 0) {
-        throw new Error(
-          `Invalid config for agent ${this.name}: if outputSchema is set, subAgents must be empty to disable agent transfer.`
-        );
-      }
-      if (this.tools && this.tools.length > 0) {
-        throw new Error(
-          `Invalid config for agent ${this.name}: if outputSchema is set, tools must be empty`
-        );
-      }
     }
   }
   /**
@@ -1029,28 +1020,36 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
       ctx,
       this,
       async function* () {
-        for await (const llmResponse of this.callLlmAsync(
-          invocationContext,
-          llmRequest,
-          modelResponseEvent
-        )) {
-          for await (const event of this.postprocess(
+        const responsesGenerator = async function* () {
+          for await (const llmResponse of this.callLlmAsync(
             invocationContext,
             llmRequest,
-            llmResponse,
             modelResponseEvent
           )) {
-            modelResponseEvent.id = createNewEventId();
-            modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
-            yield event;
+            for await (const event of this.postprocess(
+              invocationContext,
+              llmRequest,
+              llmResponse,
+              modelResponseEvent
+            )) {
+              modelResponseEvent.id = createNewEventId();
+              modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
+              yield event;
+            }
           }
-        }
+        };
+        yield* this.runAndHandleError(
+          responsesGenerator.call(this),
+          invocationContext,
+          llmRequest,
+          modelResponseEvent
+        );
       }
     );
     span.end();
   }
   async *postprocess(invocationContext, llmRequest, llmResponse, modelResponseEvent) {
-    var _a2;
+    var _a2, _b2;
     for (const processor of this.responseProcessors) {
       for await (const event of processor.runAsync(
         invocationContext,
@@ -1079,6 +1078,10 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
     if (!((_a2 = getFunctionCalls(mergedEvent)) == null ? void 0 : _a2.length)) {
       return;
     }
+    if ((_b2 = invocationContext.runConfig) == null ? void 0 : _b2.pauseOnToolCalls) {
+      invocationContext.endInvocation = true;
+      return;
+    }
     const functionResponseEvent = await handleFunctionCallsAsync({
       invocationContext,
       functionCallEvent: mergedEvent,
@@ -1103,6 +1106,8 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
     });
     if (toolConfirmationEvent) {
       yield toolConfirmationEvent;
+      invocationContext.endInvocation = true;
+      return;
     }
     yield functionResponseEvent;
     const nextAgentName = functionResponseEvent.actions.transferToAgent;
@@ -1159,12 +1164,7 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
         /* stream= */
         ((_e = invocationContext.runConfig) == null ? void 0 : _e.streamingMode) === StreamingMode.SSE
       );
-      for await (const llmResponse of this.runAndHandleError(
-        responsesGenerator,
-        invocationContext,
-        llmRequest,
-        modelResponseEvent
-      )) {
+      for await (const llmResponse of responsesGenerator) {
         traceCallLlm({
           invocationContext,
           eventId: modelResponseEvent.id,
@@ -1245,11 +1245,29 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
         if (onModelErrorCallbackResponse) {
           yield onModelErrorCallbackResponse;
         } else {
-          const errorResponse = JSON.parse(modelError.message);
-          yield {
-            errorCode: String(errorResponse.error.code),
-            errorMessage: errorResponse.error.message
-          };
+          let errorCode = "UNKNOWN_ERROR";
+          let errorMessage = modelError.message;
+          try {
+            const errorResponse = JSON.parse(modelError.message);
+            if (errorResponse == null ? void 0 : errorResponse.error) {
+              errorCode = String(errorResponse.error.code || "UNKNOWN_ERROR");
+              errorMessage = errorResponse.error.message || errorMessage;
+            }
+          } catch {
+          }
+          if (modelResponseEvent.actions) {
+            yield createEvent({
+              invocationId: invocationContext.invocationId,
+              author: this.name,
+              errorCode,
+              errorMessage
+            });
+          } else {
+            yield {
+              errorCode,
+              errorMessage
+            };
+          }
         }
       } else {
         logger.error("Unknown error during response generation", modelError);

package/dist/esm/agents/readonly_context.js

@@ -20,6 +20,18 @@ class ReadonlyContext {
   get invocationId() {
     return this.invocationContext.invocationId;
   }
+  /**
+   * The user ID of the current session.
+   */
+  get userId() {
+    return this.invocationContext.userId;
+  }
+  /**
+   * The ID of the current session.
+   */
+  get sessionId() {
+    return this.invocationContext.session.id;
+  }
   /**
    * The current agent name.
    */

package/dist/esm/agents/run_config.js

@@ -17,6 +17,7 @@ function createRunConfig(params = {}) {
     enableAffectiveDialog: false,
     streamingMode: "none" /* NONE */,
     maxLlmCalls: validateMaxLlmCalls(params.maxLlmCalls || 500),
+    pauseOnToolCalls: false,
     ...params
   };
 }