@google/adk 2.2.1 → 2.4.0

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/streaming_utils.js

@@ -25,7 +25,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var streaming_utils_exports = {};
 __export(streaming_utils_exports, {
-  StreamingResponseAggregator: () => StreamingResponseAggregator,
+  GeminiStreamingResponseAggregator: () => GeminiStreamingResponseAggregator,
   isEmptyContentPart: () => isEmptyContentPart
 });
 module.exports = __toCommonJS(streaming_utils_exports);
@@ -231,7 +231,7 @@ const _NonProgressiveStrategy = class _NonProgressiveStrategy {
     this.thoughtText = "";
   }
   async *processResponse(llmResponse) {
-    var _a;
+    var _a, _b;
     if ((_a = llmResponse.content) == null ? void 0 : _a.parts) {
       const nonTextParts = [];
       let sawTextPart = false;
@@ -251,7 +251,8 @@ const _NonProgressiveStrategy = class _NonProgressiveStrategy {
         nonTextParts.push(part);
       }
       if (nonTextParts.length > 0) {
-        if (this.thoughtText || this.text) {
+        const startsWithInlineData = !!((_b = llmResponse.content.parts[0]) == null ? void 0 : _b.inlineData);
+        if (!startsWithInlineData && (this.thoughtText || this.text)) {
           const parts = [];
           if (this.thoughtText) {
             parts.push({ text: this.thoughtText, thought: true });
@@ -302,13 +303,12 @@ const _NonProgressiveStrategy = class _NonProgressiveStrategy {
 };
 __name(_NonProgressiveStrategy, "NonProgressiveStrategy");
 let NonProgressiveStrategy = _NonProgressiveStrategy;
-const _StreamingResponseAggregator = class _StreamingResponseAggregator {
-  constructor(isProgressiveMode = (0, import_feature_registry.isFeatureEnabled)(
-    import_feature_registry.FeatureName.PROGRESSIVE_SSE_STREAMING
-  )) {
-    this.isProgressiveMode = isProgressiveMode;
+const _GeminiStreamingResponseAggregator = class _GeminiStreamingResponseAggregator {
+  constructor({
+    isProgressiveMode = (0, import_feature_registry.isFeatureEnabled)(import_feature_registry.FeatureName.PROGRESSIVE_SSE_STREAMING)
+  } = {}) {
     this.lastThoughtSignature = {};
-    this.strategy = this.isProgressiveMode ? new ProgressiveStrategy() : new NonProgressiveStrategy();
+    this.strategy = isProgressiveMode ? new ProgressiveStrategy() : new NonProgressiveStrategy();
   }
   async *processResponse(response) {
     var _a, _b;
@@ -381,14 +381,14 @@ const _StreamingResponseAggregator = class _StreamingResponseAggregator {
     };
   }
 };
-__name(_StreamingResponseAggregator, "StreamingResponseAggregator");
-let StreamingResponseAggregator = _StreamingResponseAggregator;
+__name(_GeminiStreamingResponseAggregator, "GeminiStreamingResponseAggregator");
+let GeminiStreamingResponseAggregator = _GeminiStreamingResponseAggregator;
 function isEmptyContentPart(part) {
   return !part.functionCall && !part.functionResponse && !part.fileData && !part.inlineData && !part.executableCode && !part.codeExecutionResult && (!part.text || part.text === "");
 }
 __name(isEmptyContentPart, "isEmptyContentPart");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  StreamingResponseAggregator,
+  GeminiStreamingResponseAggregator,
   isEmptyContentPart
 });

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.2.1";
+const version = "2.4.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   version

package/dist/esm/a2a/a2a_remote_agent.js

@@ -43,7 +43,10 @@ const _RemoteA2AAgent = class _RemoteA2AAgent extends BaseAgent {
       this.client = this.a2aConfig.client;
     }
     if (this.a2aConfig.agentCard) {
-      this.card = await resolveAgentCard(this.a2aConfig.agentCard);
+      this.card = await resolveAgentCard(
+        this.a2aConfig.agentCard,
+        this.a2aConfig.resolveAgentCardOptions
+      );
       if (!this.client) {
         const factory = this.a2aConfig.clientFactory || new ClientFactory();
         this.client = await factory.createFromAgentCard(this.card);

package/dist/esm/a2a/agent_card.js

@@ -22,25 +22,27 @@ import { isBaseTool } from "../tools/base_tool.js";
 import { isBaseToolset } from "../tools/base_toolset.js";
 import { logger } from "../utils/logger.js";
 import {
-  isHttpUrl,
   isLinkLocalAddress,
+  isLocalhostHostname,
   normalizeHost,
   resolveHostAddresses
 } from "../utils/ssrf_guard.js";
 import { isWorkflow } from "../workflow/workflow.js";
-const WINDOWS_DRIVE_PROTOCOL = /^[a-z]:$/i;
-async function resolveAgentCard(agentCard) {
+async function resolveAgentCard(agentCard, options = {}) {
   if (typeof agentCard === "object") {
     return agentCard;
   }
-  const url = parseCardUrl(agentCard);
-  if (url && isHttpUrl(url)) {
-    await assertHostAllowed(url);
+  const source = agentCard;
+  if (source.startsWith("http://") || source.startsWith("https://")) {
+    await refuseLinkLocalHost(source);
     const resolver = new DefaultAgentCardResolver({
-      fetchImpl: noRedirectFetch(agentCard)
+      fetchImpl: refuseRedirectFetch
     });
-    return resolver.resolve(agentCard);
+    const card = await resolver.resolve(source);
+    validateCardRpcTargets(card, source, options);
+    return card;
   }
+  const url = parseCardUrl(source);
   if (url && url.protocol !== "file:") {
     throw new Error(
       `Unsupported agent card URL scheme "${url.protocol}": ${agentCard}. Use http://, https:// or file://, or pass a filesystem path with no scheme.`
@@ -49,6 +51,31 @@ async function resolveAgentCard(agentCard) {
   return readAgentCardFile(agentCard, url);
 }
 __name(resolveAgentCard, "resolveAgentCard");
+const WINDOWS_DRIVE_PROTOCOL = /^[a-z]:$/i;
+async function refuseLinkLocalHost(source) {
+  const hostname = normalizeHost(new URL(source).hostname);
+  if (isLocalhostHostname(hostname)) {
+    return;
+  }
+  const addresses = await resolveHostAddresses(hostname);
+  if (addresses.some((address) => isLinkLocalAddress(address))) {
+    throw new Error(
+      `Refusing to fetch agent card from a link-local address: ${hostname}`
+    );
+  }
+}
+__name(refuseLinkLocalHost, "refuseLinkLocalHost");
+async function refuseRedirectFetch(url, init) {
+  const response = await fetch(url, { ...init, redirect: "manual" });
+  if (response.status === 0 || response.status >= 300 && response.status < 400) {
+    const location = response.headers.get("location");
+    throw new Error(
+      `Refusing to follow a redirect from the agent card endpoint (status ${response.status}, location ${location}): ${url}`
+    );
+  }
+  return response;
+}
+__name(refuseRedirectFetch, "refuseRedirectFetch");
 function parseCardUrl(source) {
   let url;
   try {
@@ -71,32 +98,81 @@ async function readAgentCardFile(source, url) {
   }
 }
 __name(readAgentCardFile, "readAgentCardFile");
-function noRedirectFetch(source) {
-  return async (input, init) => {
-    const response = await fetch(input, { ...init, redirect: "manual" });
-    if (isRedirect(response.status)) {
+function validateCardRpcTargets(card, source, options) {
+  var _a;
+  let parsedSource;
+  try {
+    parsedSource = new URL(source);
+  } catch (err) {
+    throw new Error(
+      `Invalid agent card source URL: ${source}: ${err.message}`
+    );
+  }
+  const rpcUrls = [
+    card.url,
+    ...((_a = card.additionalInterfaces) != null ? _a : []).map((i) => i.url)
+  ];
+  for (const rpcUrl of rpcUrls) {
+    let parsed;
+    try {
+      parsed = new URL(rpcUrl);
+    } catch (err) {
       throw new Error(
-        `Refusing to follow a redirect while fetching the agent card from ${source} (status ${response.status}, location ${response.headers.get("location")}). Configure the final URL instead.`
+        `Invalid RPC URL in agent card: ${rpcUrl}: ${err.message}`
       );
     }
-    return response;
-  };
+    if (parsed.protocol !== "https:" && !isLoopbackHost(parsed.hostname)) {
+      if (options.allowInsecureRpc === true) {
+        logger.warn(
+          `SECURITY WARNING: accepting a plaintext http RPC URL on a non-loopback host because \`allowInsecureRpc: true\` was set: ${rpcUrl}. This connection can be intercepted or altered by anything on the network path.`
+        );
+      } else {
+        throw new Error(
+          `Agent card RPC URL must use https, or http on a loopback host: ${rpcUrl}`
+        );
+      }
+    }
+    if (!sameOriginForRpc(parsedSource, parsed)) {
+      if (options.allowCrossOriginRpc === true) {
+        logger.warn(
+          `SECURITY WARNING: accepting an agent card RPC URL whose origin differs from the location the card was fetched from because \`allowCrossOriginRpc: true\` was set (fetched from ${source}): ${rpcUrl}.`
+        );
+      } else {
+        throw new Error(
+          `Agent card RPC URL must have the same origin as the location the card was fetched from (${source}): ${rpcUrl}`
+        );
+      }
+    }
+  }
 }
-__name(noRedirectFetch, "noRedirectFetch");
-function isRedirect(status) {
-  return status === 0 || status >= 300 && status < 400;
+__name(validateCardRpcTargets, "validateCardRpcTargets");
+function sameOriginForRpc(source, rpc) {
+  const sourceIsLoopback = isLoopbackHost(source.hostname);
+  const rpcIsLoopback = isLoopbackHost(rpc.hostname);
+  if (sourceIsLoopback && rpcIsLoopback) {
+    return source.protocol === rpc.protocol && effectivePort(source) === effectivePort(rpc);
+  }
+  return source.origin === rpc.origin;
 }
-__name(isRedirect, "isRedirect");
-async function assertHostAllowed(url) {
-  const host = normalizeHost(url.hostname);
-  const addresses = await resolveHostAddresses(host);
-  if (addresses.some(isLinkLocalAddress)) {
-    throw new Error(
-      `Refusing to fetch agent card from a link-local address: ${host}`
-    );
+__name(sameOriginForRpc, "sameOriginForRpc");
+function effectivePort(url) {
+  if (url.port) {
+    return url.port;
+  }
+  if (url.protocol === "https:") {
+    return "443";
   }
+  if (url.protocol === "http:") {
+    return "80";
+  }
+  return url.port;
+}
+__name(effectivePort, "effectivePort");
+function isLoopbackHost(hostname) {
+  const bare = hostname.replace(/^\[|\]$/g, "").toLowerCase();
+  return bare === "localhost" || bare === "127.0.0.1" || bare === "::1" || bare === "0.0.0.0" || bare === "::" || /^127\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(bare);
 }
-__name(assertHostAllowed, "assertHostAllowed");
+__name(isLoopbackHost, "isLoopbackHost");
 async function getA2AAgentCard(agent, transports) {
   return {
     name: agent.name,

package/dist/esm/a2a/agent_to_a2a.js

@@ -34,7 +34,10 @@ import { StreamingMode } from "../agents/run_config.js";
 import { InMemorySessionService } from "../sessions/in_memory_session_service.js";
 import { logger } from "../utils/logger.js";
 import { loadOptionalPeer } from "../utils/optional_peer.js";
-import { getA2AAgentCard, resolveAgentCard } from "./agent_card.js";
+import {
+  getA2AAgentCard,
+  resolveAgentCard
+} from "./agent_card.js";
 import { A2AAgentExecutor } from "./agent_executor.js";
 import {
   AdkDefaultRequestHandler,
@@ -73,7 +76,7 @@ async function toA2a(agent, options = {}) {
   const protocol = (_c = options.protocol) != null ? _c : "http";
   const basePath = options.basePath || "";
   const rpcUrl = `${protocol}://${host}:${port}${basePath}`;
-  const agentCard = options.agentCard ? await resolveAgentCard(options.agentCard) : await getA2AAgentCard(agent, [
+  const agentCard = options.agentCard ? await resolveAgentCard(options.agentCard, options.resolveAgentCardOptions) : await getA2AAgentCard(agent, [
     {
       url: `${rpcUrl}/jsonrpc`,
       transport: "JSONRPC"

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;