@google/adk 2.3.0 → 2.4.0

package/dist/cjs/tools/openapi_tool/openapi_toolset.js

@@ -46,7 +46,7 @@ __export(openapi_toolset_exports, {
   OpenAPIToolset: () => OpenAPIToolset
 });
 module.exports = __toCommonJS(openapi_toolset_exports);
-var import_js_yaml = __toESM(require("js-yaml"), 1);
+var yaml = __toESM(require("js-yaml"), 1);
 var import_experimental = require("../../utils/experimental.js");
 var import_logger = require("../../utils/logger.js");
 var import_base_toolset = require("../base_toolset.js");
@@ -64,7 +64,7 @@ let OpenAPIToolset = class extends import_base_toolset.BaseToolset {
     let spec = options.specDict;
     if (!spec && options.specStr) {
       if (options.specType === "yaml" || !options.specType && options.specStr.trim().startsWith("---")) {
-        spec = import_js_yaml.default.load(options.specStr);
+        spec = yaml.load(options.specStr);
       } else if (options.specType === "json" || !options.specType) {
         spec = JSON.parse(options.specStr);
       } else {
@@ -75,7 +75,8 @@ let OpenAPIToolset = class extends import_base_toolset.BaseToolset {
       throw new Error("Either specDict or specStr must be provided.");
     }
     const parser = new import_openapi_spec_parser.OpenApiSpecParser({
-      preservePropertyNames: options.preservePropertyNames
+      preservePropertyNames: options.preservePropertyNames,
+      unconstrainedObjectBodyAsParameter: options.unconstrainedObjectBodyAsParameter
     });
     const parsedOperations = parser.parse(spec);
     for (const op of parsedOperations) {
@@ -96,7 +97,8 @@ let OpenAPIToolset = class extends import_base_toolset.BaseToolset {
         {
           preservePropertyNames: options.preservePropertyNames,
           headerProvider: options.headerProvider,
-          credentialKey: options.credentialKey
+          credentialKey: options.credentialKey,
+          unconstrainedObjectBodyAsParameter: options.unconstrainedObjectBodyAsParameter
         }
       );
       this.tools.push(tool);
@@ -111,15 +113,7 @@ let OpenAPIToolset = class extends import_base_toolset.BaseToolset {
     }
   }
   async getTools(context) {
-    return this.tools.filter((tool) => {
-      if (Array.isArray(this.toolFilter) && this.toolFilter.length > 0) {
-        return this.toolFilter.includes(tool.name);
-      }
-      if (context) {
-        return this.isToolSelected(tool, context);
-      }
-      return true;
-    });
+    return this.tools.filter((tool) => this.isToolSelected(tool, context));
   }
   getTool(toolName) {
     return this.tools.find((tool) => tool.name === toolName);

package/dist/cjs/tools/openapi_tool/rest_api_tool.js

@@ -203,6 +203,22 @@ function encodePathParamValue(name, value) {
   return encodeURIComponent(value);
 }
 __name(encodePathParamValue, "encodePathParamValue");
+function serializeQueryValue(value) {
+  return typeof value === "object" && value !== null ? JSON.stringify(value) : String(value);
+}
+__name(serializeQueryValue, "serializeQueryValue");
+function appendQueryParam(queryParams, name, value) {
+  if (!Array.isArray(value)) {
+    queryParams.append(name, serializeQueryValue(value));
+    return;
+  }
+  for (const item of value) {
+    if (item !== void 0 && item !== null) {
+      queryParams.append(name, serializeQueryValue(item));
+    }
+  }
+}
+__name(appendQueryParam, "appendQueryParam");
 function prepareRequestParams(endpoint, parameters, args) {
   const headers = {};
   const queryParams = new URLSearchParams();
@@ -223,7 +239,7 @@ function prepareRequestParams(endpoint, parameters, args) {
       );
     } else if (location === "query") {
       if (argValue !== void 0 && argValue !== null && argValue !== "") {
-        queryParams.append(originalName, String(argValue));
+        appendQueryParam(queryParams, originalName, argValue);
       }
     } else if (location === "header") {
       headers[originalName] = String(argValue);

package/dist/cjs/tools/toolbox_toolset.js

@@ -0,0 +1,174 @@
+/**
+  * @license
+  * Copyright 2026 Google LLC
+  * SPDX-License-Identifier: Apache-2.0
+  */
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var toolbox_toolset_exports = {};
+__export(toolbox_toolset_exports, {
+  ToolboxToolset: () => ToolboxToolset,
+  isToolboxToolset: () => isToolboxToolset
+});
+module.exports = __toCommonJS(toolbox_toolset_exports);
+var import_base_tool = require("./base_tool.js");
+var import_base_toolset = require("./base_toolset.js");
+var import_function_tool = require("./function_tool.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+var _a, _b;
+const TOOLBOX_TOOLSET_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for(
+  "google.adk.toolboxToolset"
+);
+function isToolboxToolset(obj) {
+  return typeof obj === "object" && obj !== null && TOOLBOX_TOOLSET_SIGNATURE_SYMBOL in obj && obj[TOOLBOX_TOOLSET_SIGNATURE_SYMBOL] === true;
+}
+__name(isToolboxToolset, "isToolboxToolset");
+function createUnconfiguredToolboxToolsetClient(serverUrl) {
+  const throwMissingClient = /* @__PURE__ */ __name(() => {
+    throw new Error(
+      `ToolboxToolset requires a ToolboxToolsetClientLike instance (for endpoint "${serverUrl}"). Pass {serverUrl, client} to the ToolboxToolset constructor.`
+    );
+  }, "throwMissingClient");
+  return {
+    loadTool: throwMissingClient,
+    loadToolset: throwMissingClient,
+    close: /* @__PURE__ */ __name(() => {
+    }, "close")
+  };
+}
+__name(createUnconfiguredToolboxToolsetClient, "createUnconfiguredToolboxToolsetClient");
+function isToolOptionsObject(value) {
+  return typeof value === "object" && value !== null && "execute" in value && typeof value.execute === "function";
+}
+__name(isToolOptionsObject, "isToolOptionsObject");
+function wrapLoadedTool(rawTool, prefix) {
+  var _a2;
+  if ((0, import_base_tool.isBaseTool)(rawTool)) {
+    if (!prefix) {
+      return rawTool;
+    }
+    return Object.assign(
+      Object.create(Object.getPrototypeOf(rawTool)),
+      rawTool,
+      { name: `${prefix}_${rawTool.name}` }
+    );
+  }
+  if (typeof rawTool === "function") {
+    const fn = rawTool;
+    const baseName = fn.name || "toolbox_tool";
+    const name = prefix ? `${prefix}_${baseName}` : baseName;
+    const description = (_a2 = fn.description) != null ? _a2 : "";
+    return new import_function_tool.FunctionTool({
+      name,
+      description,
+      execute: fn
+    });
+  }
+  if (isToolOptionsObject(rawTool)) {
+    const baseTool = new import_function_tool.FunctionTool(rawTool);
+    if (!prefix) {
+      return baseTool;
+    }
+    return new import_function_tool.FunctionTool({
+      ...rawTool,
+      name: `${prefix}_${baseTool.name}`
+    });
+  }
+  throw new TypeError(
+    "Unsupported Toolbox tool shape: expected a BaseTool, ToolOptions object, or function."
+  );
+}
+__name(wrapLoadedTool, "wrapLoadedTool");
+const _ToolboxToolset = class _ToolboxToolset extends (_b = import_base_toolset.BaseToolset, _a = TOOLBOX_TOOLSET_SIGNATURE_SYMBOL, _b) {
+  constructor(serverUrlOrOptions, extraOptions) {
+    var _a2, _b2, _c, _d;
+    const options = typeof serverUrlOrOptions === "string" ? { serverUrl: serverUrlOrOptions, ...extraOptions } : serverUrlOrOptions;
+    if ((!options.toolNames || options.toolNames.length === 0) && !options.toolsetName) {
+      throw new Error("toolNames and toolsetName cannot both be undefined.");
+    }
+    super((_a2 = options.toolFilter) != null ? _a2 : [], options.prefix);
+    /** A unique symbol to identify ADK ToolboxToolset class. */
+    this[_a] = true;
+    this.serverUrl = options.serverUrl;
+    this.toolsetName = options.toolsetName;
+    this.toolNames = options.toolNames;
+    this.authTokenGetters = (_b2 = options.authTokenGetters) != null ? _b2 : {};
+    this.boundParams = (_c = options.boundParams) != null ? _c : {};
+    this.toolboxClient = (_d = options.client) != null ? _d : createUnconfiguredToolboxToolsetClient(this.serverUrl);
+  }
+  /**
+   * Loads the configured toolset and/or individual tools from the Toolbox
+   * client and returns the selected {@link BaseTool} instances.
+   */
+  async getTools(context) {
+    var _a2, _b2, _c, _d, _e, _f;
+    const loadOptions = {
+      authTokenGetters: this.authTokenGetters,
+      boundParams: this.boundParams
+    };
+    const tools = [];
+    if (this.toolsetName) {
+      const loader = (_c = (_a2 = this.toolboxClient.loadToolset) == null ? void 0 : _a2.bind(this.toolboxClient)) != null ? _c : (_b2 = this.toolboxClient.load_toolset) == null ? void 0 : _b2.bind(this.toolboxClient);
+      if (!loader) {
+        throw new Error(
+          "ToolboxClient does not implement loadToolset or load_toolset."
+        );
+      }
+      const loadedToolset = await loader(this.toolsetName, loadOptions);
+      for (const rawTool of loadedToolset) {
+        tools.push(wrapLoadedTool(rawTool, this.prefix));
+      }
+    }
+    if (this.toolNames && this.toolNames.length > 0) {
+      const loader = (_f = (_d = this.toolboxClient.loadTool) == null ? void 0 : _d.bind(this.toolboxClient)) != null ? _f : (_e = this.toolboxClient.load_tool) == null ? void 0 : _e.bind(this.toolboxClient);
+      if (!loader) {
+        throw new Error(
+          "ToolboxClient does not implement loadTool or load_tool."
+        );
+      }
+      const loadedSingleTools = await Promise.all(
+        this.toolNames.map((toolName) => loader(toolName, loadOptions))
+      );
+      for (const rawTool of loadedSingleTools) {
+        tools.push(wrapLoadedTool(rawTool, this.prefix));
+      }
+    }
+    return tools.filter((tool) => this.isToolSelected(tool, context));
+  }
+  /**
+   * Closes the underlying Toolbox client.
+   */
+  async close() {
+    var _a2, _b2;
+    await ((_b2 = (_a2 = this.toolboxClient).close) == null ? void 0 : _b2.call(_a2));
+  }
+};
+__name(_ToolboxToolset, "ToolboxToolset");
+let ToolboxToolset = _ToolboxToolset;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ToolboxToolset,
+  isToolboxToolset
+});

package/dist/cjs/tools/webmcp/webmcp_toolset.js

@@ -67,20 +67,7 @@ const _WebMCPToolset = class _WebMCPToolset extends import_base_toolset.BaseTool
         document: this.doc
       })
     );
-    const filter = this.toolFilter;
-    if (!filter || Array.isArray(filter) && filter.length === 0) {
-      return tools;
-    }
-    if (Array.isArray(filter)) {
-      return tools.filter((tool) => filter.includes(tool.name));
-    }
-    if (context) {
-      return tools.filter((tool) => filter(tool, context));
-    }
-    import_logger.logger.warn(
-      "WebMCPToolset: a ToolPredicate toolFilter was provided but getTools() was called without a ReadonlyContext. The filter will not be applied."
-    );
-    return tools;
+    return tools.filter((tool) => this.isToolSelected(tool, context));
   }
   /**
    * Subscribes to the WebMCP `toolchange` event, which fires when the page

package/dist/cjs/utils/client_labels.js

@@ -129,7 +129,8 @@ function headerEntries(headers) {
 __name(headerEntries, "headerEntries");
 function mergeTrackingHeaders(headers) {
   var _a, _b;
-  const merged = {};
+  const otherHeaders = new Headers();
+  const originalNames = /* @__PURE__ */ new Map();
   const callerValues = /* @__PURE__ */ new Map();
   for (const [name, value] of headerEntries(headers)) {
     const lowerName = name.toLowerCase();
@@ -139,9 +140,25 @@ function mergeTrackingHeaders(headers) {
         value
       ]);
     } else {
-      merged[name] = value;
+      if (!originalNames.has(lowerName)) {
+        originalNames.set(lowerName, name);
+      }
+      otherHeaders.append(name, value);
     }
   }
+  const normalizedEntries = [];
+  otherHeaders.forEach((value, name) => {
+    normalizedEntries.push([name, value]);
+  });
+  const merged = Object.fromEntries(
+    normalizedEntries.map(([name, value]) => {
+      var _a2;
+      return [
+        (_a2 = originalNames.get(name)) != null ? _a2 : name,
+        value
+      ];
+    })
+  );
   for (const [name, trackingValue] of Object.entries(getTrackingHeaders())) {
     const tokens = trackingValue.split(" ");
     for (const value of (_b = callerValues.get(name)) != null ? _b : []) {

package/dist/cjs/utils/failover_utils.js

@@ -47,9 +47,9 @@ async function* runWithRouting(items, context, router, runFn) {
   }
   const triedKeys = /* @__PURE__ */ new Set([selectedKey]);
   while (true) {
-    const generatorOrPromise = runFn(selectedItem);
     let firstYielded = false;
     try {
+      const generatorOrPromise = runFn(selectedItem);
       if (isAsyncGenerator(generatorOrPromise)) {
         for await (const result2 of generatorOrPromise) {
           yield result2;

package/dist/cjs/utils/gemini_schema_util.js

@@ -25,6 +25,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var gemini_schema_util_exports = {};
 __export(gemini_schema_util_exports, {
+  normalizeJsonSchemaType: () => normalizeJsonSchemaType,
   openApiSchemaToGeminiSchema: () => openApiSchemaToGeminiSchema,
   toGeminiSchema: () => toGeminiSchema
 });
@@ -204,7 +205,6 @@ const GEMINI_REJECTED_SCHEMA_FIELDS = /* @__PURE__ */ new Set([
   "default",
   "format"
 ]);
-const EMPTY_OBJECT_PLACEHOLDER = "dummy_DO_NOT_GENERATE";
 function toGeminiSchemaField(key) {
   return (0, import_case_utils.toSnakeCaseName)(key).replace(
     /_([a-z0-9])/g,
@@ -216,6 +216,23 @@ function isPlainObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 __name(isPlainObject, "isPlainObject");
+function normalizeJsonSchemaType(jsonSchemaType) {
+  if (typeof jsonSchemaType === "string") {
+    if (jsonSchemaType === "null") {
+      return [void 0, true];
+    }
+    return [jsonSchemaType, false];
+  }
+  if (Array.isArray(jsonSchemaType)) {
+    const nullable = jsonSchemaType.includes("null");
+    const nonNullTypes = jsonSchemaType.filter(
+      (t) => typeof t === "string" && t !== "null"
+    );
+    return [nonNullTypes[0], nullable];
+  }
+  return [void 0, false];
+}
+__name(normalizeJsonSchemaType, "normalizeJsonSchemaType");
 function convertSchemaField(field, value) {
   if (field === "type") {
     return toGeminiType(typeof value === "string" ? value : void 0);
@@ -245,14 +262,14 @@ function openApiSchemaToGeminiSchema(openApiSchema) {
     throw new TypeError("openapi_schema must be a dictionary");
   }
   const source = { ...openApiSchema };
+  const [schemaType, nullable] = normalizeJsonSchemaType(source["type"]);
+  source["type"] = schemaType;
+  if (nullable) {
+    source["nullable"] = true;
+  }
   if (!source["type"]) {
     source["type"] = "object";
   }
-  const properties = source["properties"];
-  const hasProperties = isPlainObject(properties) && Object.keys(properties).length > 0;
-  if (source["type"] === "object" && !hasProperties) {
-    source["properties"] = { [EMPTY_OBJECT_PLACEHOLDER]: { type: "string" } };
-  }
   const converted = {};
   for (const [key, value] of Object.entries(source)) {
     const field = toGeminiSchemaField(key);
@@ -266,6 +283,7 @@ function openApiSchemaToGeminiSchema(openApiSchema) {
 __name(openApiSchemaToGeminiSchema, "openApiSchemaToGeminiSchema");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  normalizeJsonSchemaType,
   openApiSchemaToGeminiSchema,
   toGeminiSchema
 });

package/dist/cjs/utils/logger_node.js

@@ -62,6 +62,10 @@ const _WinstonLogger = class _WinstonLogger {
         "warn": import_logger.LogLevel.WARN,
         "error": import_logger.LogLevel.ERROR
       },
+      // `levels` above inverts winston's npm ordering, so `error` (3) is the
+      // most permissive and leaves winston pass-through. Every method already
+      // gates on `this.logLevel`; a lower value here would double-gate and
+      // drop records.
       level: "error",
       format: winston.format.combine(
         winston.format.label({ label: "ADK" }),

package/dist/cjs/utils/output_schema_utils.js

@@ -28,6 +28,7 @@ __export(output_schema_utils_exports, {
   canUseOutputSchemaWithTools: () => canUseOutputSchemaWithTools
 });
 module.exports = __toCommonJS(output_schema_utils_exports);
+var import_google_llm = require("../models/google_llm.js");
 var import_model_name = require("./model_name.js");
 var import_variant_utils = require("./variant_utils.js");
 /**
@@ -35,8 +36,10 @@ var import_variant_utils = require("./variant_utils.js");
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-function canUseOutputSchemaWithTools(modelString) {
-  return (0, import_variant_utils.getGoogleLlmVariant)() === import_variant_utils.GoogleLLMVariant.VERTEX_AI && (0, import_model_name.isGemini2OrAbove)(modelString);
+function canUseOutputSchemaWithTools(model) {
+  const modelString = typeof model === "string" ? model : model.model;
+  const variant = (0, import_google_llm.isGemini)(model) ? model.apiBackend : (0, import_variant_utils.getGoogleLlmVariant)();
+  return variant === import_variant_utils.GoogleLLMVariant.VERTEX_AI && (0, import_model_name.isGemini2OrAbove)(modelString);
 }
 __name(canUseOutputSchemaWithTools, "canUseOutputSchemaWithTools");
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/utils/task.js

@@ -42,7 +42,7 @@ const _Task = class _Task {
       this.isDone = true;
     }, "markDone");
     this.promise = executable(this.abortController.signal);
-    this.promise.then(markDone).catch(markDone);
+    this.promise.then(markDone, markDone);
   }
   /**
    * Cancels the task execution.

package/dist/cjs/version.js

@@ -32,7 +32,7 @@ module.exports = __toCommonJS(version_exports);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const version = "2.3.0";
+const version = "2.4.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   version

package/dist/esm/agents/agent_engine_client.js

@@ -0,0 +1,144 @@
+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
+ */
+import { helpers, v1 } from "@google-cloud/aiplatform";
+const _AgentExecutionError = class _AgentExecutionError extends Error {
+  constructor(message, cause) {
+    super(message);
+    this.cause = cause;
+    this.name = "AgentExecutionError";
+  }
+};
+__name(_AgentExecutionError, "AgentExecutionError");
+let AgentExecutionError = _AgentExecutionError;
+function buildInputStruct(config) {
+  var _a;
+  const value = helpers.toValue(config);
+  return (_a = value == null ? void 0 : value.structValue) != null ? _a : void 0;
+}
+__name(buildInputStruct, "buildInputStruct");
+function parseOutput(output) {
+  return helpers.fromValue(output);
+}
+__name(parseOutput, "parseOutput");
+function parseFragment(line) {
+  const trimmed = line.trim();
+  if (!trimmed) return void 0;
+  const payload = trimmed.startsWith("data:") ? trimmed.slice(5).trim() : trimmed;
+  if (payload === "[DONE]") return void 0;
+  try {
+    return JSON.parse(payload);
+  } catch (e) {
+    throw new AgentExecutionError(
+      `Failed to parse stream fragment: ${payload}`,
+      e
+    );
+  }
+}
+__name(parseFragment, "parseFragment");
+async function* parseStream(stream) {
+  let buffer = "";
+  for await (const chunk of stream) {
+    const chunkData = chunk == null ? void 0 : chunk.data;
+    if (chunkData === void 0) {
+      if (typeof chunk === "object" && chunk !== null) {
+        yield chunk;
+      }
+      continue;
+    }
+    const dataStr = chunkData instanceof Uint8Array ? new TextDecoder().decode(chunkData) : String(chunkData);
+    buffer += dataStr;
+    const lines = buffer.split("\n");
+    buffer = lines.pop() || "";
+    for (const line of lines) {
+      const fragment = parseFragment(line);
+      if (fragment !== void 0) {
+        yield fragment;
+      }
+    }
+  }
+  const last = parseFragment(buffer);
+  if (last !== void 0) {
+    yield last;
+  }
+}
+__name(parseStream, "parseStream");
+const _AgentEngineClient = class _AgentEngineClient {
+  constructor(config) {
+    this.client = new v1.ReasoningEngineExecutionServiceClient({
+      apiEndpoint: `${config.location}-aiplatform.googleapis.com`
+    });
+    this.reasoningEnginePath = this.client.reasoningEnginePath(
+      config.project,
+      config.location,
+      config.reasoningEngineId
+    );
+  }
+  /**
+   * Creates a remote session.
+   *
+   * @returns The `create_session` payload returned by the Agent Engine. When
+   *     `config.sessionId` is omitted the engine generates one, and this is the
+   *     only place the caller can read it back from.
+   */
+  async createSession(config) {
+    try {
+      const [response] = await this.client.queryReasoningEngine({
+        name: this.reasoningEnginePath,
+        classMethod: "create_session",
+        input: buildInputStruct(config)
+      });
+      return response.output ? parseOutput(response.output) : void 0;
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      throw new AgentExecutionError(
+        `Failed to create session: ${message}`,
+        err
+      );
+    }
+  }
+  async query(config) {
+    try {
+      const [response] = await this.client.queryReasoningEngine({
+        name: this.reasoningEnginePath,
+        classMethod: "query",
+        input: buildInputStruct(config)
+      });
+      return response.output ? parseOutput(response.output) : void 0;
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      throw new AgentExecutionError(`Failed to execute query: ${message}`, err);
+    }
+  }
+  async *streamQuery(config) {
+    try {
+      const stream = this.client.streamQueryReasoningEngine({
+        name: this.reasoningEnginePath,
+        classMethod: "query",
+        input: buildInputStruct(config)
+      });
+      yield* parseStream(stream);
+    } catch (err) {
+      if (err instanceof AgentExecutionError) {
+        throw err;
+      }
+      const message = err instanceof Error ? err.message : String(err);
+      throw new AgentExecutionError(
+        `Failed to execute stream query: ${message}`,
+        err
+      );
+    }
+  }
+};
+__name(_AgentEngineClient, "AgentEngineClient");
+let AgentEngineClient = _AgentEngineClient;
+export {
+  AgentEngineClient,
+  AgentExecutionError
+};

package/dist/esm/agents/base_agent.js

@@ -235,6 +235,22 @@ const _BaseAgent = class _BaseAgent extends (_b = BaseNode, _a = BASE_AGENT_SIGN
       agent: this
     });
   }
+  /**
+   * The resolved beforeAgentCallback field as a list of SingleAgentCallback.
+   *
+   * This method is only for use by Agent Development Kit.
+   */
+  get canonicalBeforeAgentCallbacks() {
+    return this.beforeAgentCallback;
+  }
+  /**
+   * The resolved afterAgentCallback field as a list of SingleAgentCallback.
+   *
+   * This method is only for use by Agent Development Kit.
+   */
+  get canonicalAfterAgentCallbacks() {
+    return this.afterAgentCallback;
+  }
   /**
    * Runs the before agent callback if it exists.
    *
@@ -244,11 +260,11 @@ const _BaseAgent = class _BaseAgent extends (_b = BaseNode, _a = BASE_AGENT_SIGN
    */
   async handleBeforeAgentCallback(invocationContext) {
     var _a2;
-    if (this.beforeAgentCallback.length === 0) {
+    if (this.canonicalBeforeAgentCallbacks.length === 0) {
       return void 0;
     }
     const callbackContext = new Context({ invocationContext });
-    for (const callback of this.beforeAgentCallback) {
+    for (const callback of this.canonicalBeforeAgentCallbacks) {
       const content = await callback(callbackContext);
       if ((_a2 = invocationContext.abortSignal) == null ? void 0 : _a2.aborted) {
         return;
@@ -283,11 +299,11 @@ const _BaseAgent = class _BaseAgent extends (_b = BaseNode, _a = BASE_AGENT_SIGN
    */
   async handleAfterAgentCallback(invocationContext) {
     var _a2;
-    if (this.afterAgentCallback.length === 0) {
+    if (this.canonicalAfterAgentCallbacks.length === 0) {
       return void 0;
     }
     const callbackContext = new Context({ invocationContext });
-    for (const callback of this.afterAgentCallback) {
+    for (const callback of this.canonicalAfterAgentCallbacks) {
       const content = await callback(callbackContext);
       if ((_a2 = invocationContext.abortSignal) == null ? void 0 : _a2.aborted) {
         return;