@google/adk 2.4.0 → 2.5.0

package/dist/esm/a2a/a2a_remote_agent.js

@@ -10,9 +10,15 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 import {
   AGENT_CARD_PATH
 } from "@a2a-js/sdk";
-import { ClientFactory } from "@a2a-js/sdk/client";
+import {
+  ClientFactory,
+  ClientFactoryOptions,
+  JsonRpcTransportFactory,
+  RestTransportFactory
+} from "@a2a-js/sdk/client";
 import { BaseAgent } from "../agents/base_agent.js";
 import { createEvent } from "../events/event.js";
+import { propagateTraceContext } from "../telemetry/api/instrumentation.js";
 import { randomUUID } from "../utils/env_aware_utils.js";
 import { logger } from "../utils/logger.js";
 import { MessageRole } from "./a2a_event.js";
@@ -26,6 +32,18 @@ import {
 import { resolveAgentCard } from "./agent_card.js";
 import { toAdkEvent } from "./event_converter_utils.js";
 import { getA2ASessionMetadata } from "./metadata_converter_utils.js";
+function createTracePropagatingClientFactory() {
+  const fetchImpl = propagateTraceContext();
+  return new ClientFactory(
+    ClientFactoryOptions.createFrom(ClientFactoryOptions.default, {
+      transports: [
+        new JsonRpcTransportFactory({ fetchImpl }),
+        new RestTransportFactory({ fetchImpl })
+      ]
+    })
+  );
+}
+__name(createTracePropagatingClientFactory, "createTracePropagatingClientFactory");
 const _RemoteA2AAgent = class _RemoteA2AAgent extends BaseAgent {
   constructor(a2aConfig) {
     super(a2aConfig);
@@ -36,6 +54,7 @@ const _RemoteA2AAgent = class _RemoteA2AAgent extends BaseAgent {
     }
   }
   async init() {
+    var _a;
     if (this.isInitialized) {
       return;
     }
@@ -48,7 +67,7 @@ const _RemoteA2AAgent = class _RemoteA2AAgent extends BaseAgent {
         this.a2aConfig.resolveAgentCardOptions
       );
       if (!this.client) {
-        const factory = this.a2aConfig.clientFactory || new ClientFactory();
+        const factory = (_a = this.a2aConfig.clientFactory) != null ? _a : createTracePropagatingClientFactory();
         this.client = await factory.createFromAgentCard(this.card);
       }
     }
@@ -64,7 +83,8 @@ const _RemoteA2AAgent = class _RemoteA2AAgent extends BaseAgent {
       }
       const userFnCall = getUserFunctionCallAt(
         context.session,
-        events.length - 1
+        events.length - 1,
+        this.name
       );
       let parts;
       let taskId = void 0;

package/dist/esm/a2a/a2a_remote_agent_utils.js

@@ -14,7 +14,8 @@ import { camelCaseKeys } from "../utils/case_utils.js";
 import { logger } from "../utils/logger.js";
 import { AdkMetadataKeys } from "./metadata_converter_utils.js";
 import { toA2AParts } from "./part_converter_utils.js";
-function getUserFunctionCallAt(session, index) {
+function getUserFunctionCallAt(session, index, agentName) {
+  var _a, _b;
   const events = session.events;
   if (index < 0 || index >= events.length) {
     return void 0;
@@ -23,13 +24,16 @@ function getUserFunctionCallAt(session, index) {
   if (candidate.author !== "user") {
     return void 0;
   }
-  const fnCallId = getFunctionResponseCallId(candidate);
-  if (!fnCallId) {
+  const fnCallIds = (_b = (_a = candidate.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.map((part) => {
+    var _a2;
+    return (_a2 = part.functionResponse) == null ? void 0 : _a2.id;
+  }).filter((id) => !!id);
+  if (!(fnCallIds == null ? void 0 : fnCallIds.length)) {
     return void 0;
   }
   for (let i = index - 1; i >= 0; i--) {
     const request = events[i];
-    if (!isFunctionCallEvent(request, fnCallId)) {
+    if (request.author !== agentName || !fnCallIds.some((callId) => isFunctionCallEvent(request, callId))) {
       continue;
     }
     const metadata = request.customMetadata || {};

package/dist/esm/a2a/agent_card.js

@@ -10,14 +10,11 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 import { DefaultAgentCardResolver } from "@a2a-js/sdk/client";
 import * as fs from "node:fs/promises";
 import { fileURLToPath } from "node:url";
-import {
-  InvocationContext
-} from "../agents/invocation_context.js";
 import { isLlmAgent } from "../agents/llm_agent.js";
 import { isLoopAgent } from "../agents/loop_agent.js";
 import { isParallelAgent } from "../agents/parallel_agent.js";
-import { ReadonlyContext } from "../agents/readonly_context.js";
 import { isSequentialAgent } from "../agents/sequential_agent.js";
+import { propagateTraceContext } from "../telemetry/api/instrumentation.js";
 import { isBaseTool } from "../tools/base_tool.js";
 import { isBaseToolset } from "../tools/base_toolset.js";
 import { logger } from "../utils/logger.js";
@@ -36,7 +33,7 @@ async function resolveAgentCard(agentCard, options = {}) {
   if (source.startsWith("http://") || source.startsWith("https://")) {
     await refuseLinkLocalHost(source);
     const resolver = new DefaultAgentCardResolver({
-      fetchImpl: refuseRedirectFetch
+      fetchImpl: tracePropagatingRefuseRedirectFetch
     });
     const card = await resolver.resolve(source);
     validateCardRpcTargets(card, source, options);
@@ -76,6 +73,7 @@ async function refuseRedirectFetch(url, init) {
   return response;
 }
 __name(refuseRedirectFetch, "refuseRedirectFetch");
+const tracePropagatingRefuseRedirectFetch = propagateTraceContext(refuseRedirectFetch);
 function parseCardUrl(source) {
   let url;
   try {
@@ -242,7 +240,7 @@ async function buildLLMAgentSkills(agent) {
     {
       id: agent.name,
       name: "model",
-      description: await buildDescriptionFromInstructions(agent),
+      description: buildAgentDescription(agent),
       tags: ["llm"]
     }
   ];
@@ -311,7 +309,7 @@ function buildAgentDescription(agent) {
   if (agent.description) {
     descriptionParts.push(agent.description);
   }
-  if (agent.subAgents.length > 0) {
+  if (!isLlmAgent(agent) && agent.subAgents.length > 0) {
     if (isLoopAgent(agent)) {
       descriptionParts.push(buildLoopAgentDescription(agent));
     } else if (isParallelAgent(agent)) {
@@ -389,82 +387,6 @@ function buildLoopAgentDescription(agent) {
   return `${descriptions.join(" ")} in a loop (max ${maxIterations} iterations).`;
 }
 __name(buildLoopAgentDescription, "buildLoopAgentDescription");
-async function buildDescriptionFromInstructions(agent) {
-  const descriptionParts = [];
-  if (agent.description) {
-    descriptionParts.push(agent.description);
-  }
-  if (agent.instruction) {
-    let instructionStr;
-    if (typeof agent.instruction === "function") {
-      const dummyContext = new ReadonlyContext(
-        new InvocationContext({
-          agent
-        })
-      );
-      try {
-        instructionStr = await agent.instruction(dummyContext);
-      } catch (e) {
-        logger.warn("Failed to resolve dynamic instruction for AgentCard", e);
-        instructionStr = "";
-      }
-    } else {
-      instructionStr = agent.instruction;
-    }
-    if (instructionStr) {
-      descriptionParts.push(replacePronouns(instructionStr));
-    }
-  }
-  const root = agent.rootAgent;
-  if (isLlmAgent(root) && root.globalInstruction) {
-    let globalInstructionStr;
-    if (typeof root.globalInstruction === "function") {
-      const dummyContext = new ReadonlyContext(
-        new InvocationContext({
-          agent
-        })
-      );
-      try {
-        globalInstructionStr = await root.globalInstruction(dummyContext);
-      } catch (e) {
-        logger.warn(
-          "Failed to resolve dynamic global instruction for AgentCard",
-          e
-        );
-        globalInstructionStr = "";
-      }
-    } else {
-      globalInstructionStr = root.globalInstruction;
-    }
-    if (globalInstructionStr) {
-      descriptionParts.push(replacePronouns(globalInstructionStr));
-    }
-  }
-  if (descriptionParts.length > 0) {
-    return descriptionParts.join(" ");
-  } else {
-    return getDefaultAgentDescription(agent);
-  }
-}
-__name(buildDescriptionFromInstructions, "buildDescriptionFromInstructions");
-function replacePronouns(instruction) {
-  const substitutions = [
-    { original: "you were", target: "I was" },
-    { original: "you are", target: "I am" },
-    { original: "you're", target: "I am" },
-    { original: "you've", target: "I have" },
-    { original: "yours", target: "mine" },
-    { original: "your", target: "my" },
-    { original: "you", target: "I" }
-  ];
-  let result = instruction;
-  for (const sub of substitutions) {
-    const pattern = new RegExp(`\\b${sub.original}\\b`, "gi");
-    result = result.replace(pattern, sub.target);
-  }
-  return result;
-}
-__name(replacePronouns, "replacePronouns");
 function getDefaultAgentDescription(agent) {
   if (isLoopAgent(agent)) {
     return "A loop workflow agent";

package/dist/esm/a2a/agent_to_a2a.js

@@ -32,6 +32,7 @@ import { AGENT_CARD_PATH } from "@a2a-js/sdk";
 import { InMemoryTaskStore } from "@a2a-js/sdk/server";
 import { StreamingMode } from "../agents/run_config.js";
 import { InMemorySessionService } from "../sessions/in_memory_session_service.js";
+import { runWithRemoteTraceContext } from "../telemetry/api/instrumentation.js";
 import { logger } from "../utils/logger.js";
 import { loadOptionalPeer } from "../utils/optional_peer.js";
 import {
@@ -52,6 +53,10 @@ async function loadExpressBindings() {
   return { express: expressModule.default, a2aExpress };
 }
 __name(loadExpressBindings, "loadExpressBindings");
+function continueRemoteTrace(req, _res, next) {
+  runWithRemoteTraceContext(req.headers, () => next());
+}
+__name(continueRemoteTrace, "continueRemoteTrace");
 function resolveA2aUserBuilder(options, a2aExpress) {
   if (options.authentication) {
     return options.authentication;
@@ -113,6 +118,7 @@ async function toA2a(agent, options = {}) {
   );
   app.use(
     `${basePath}/rest`,
+    continueRemoteTrace,
     a2aExpress.restHandler({
       requestHandler,
       userBuilder
@@ -120,6 +126,7 @@ async function toA2a(agent, options = {}) {
   );
   app.use(
     `${basePath}/jsonrpc`,
+    continueRemoteTrace,
     a2aExpress.jsonRpcHandler({
       requestHandler,
       userBuilder

package/dist/esm/a2a/event_converter_utils.js

@@ -69,7 +69,12 @@ function messageToAdkEvent(msg, invocationId, agentName, branch) {
   return {
     ...createAdkEventFromMetadata(msg),
     invocationId,
-    author: msg.role === MessageRole.USER ? MessageRole.USER : agentName,
+    // The role on a peer's message is the peer's own claim and must not decide
+    // authorship: letting `user` through here lets a remote agent post events
+    // that read as the local user's, which is a trust anchor elsewhere (tool
+    // confirmations are approved only from user-authored events). Attribute the
+    // event to the peer, the same way the task and status converters below do.
+    author: agentName,
     branch,
     content,
     turnComplete: true,
@@ -184,8 +189,10 @@ function createAdkEventFromMetadata(a2aEvent) {
     // (set it to a shared ancestor branch, or omit it) to leak its content
     // into an unrelated sibling agent's LLM context. Every caller of the
     // `*ToAdkEvent` functions in this file force-sets `branch` from its own
-    // local `InvocationContext` instead, the same way `author` is handled.
-    author: metadata[A2AMetadataKeys.AUTHOR],
+    // local `InvocationContext` instead, the same way `author` is handled:
+    // `author` is likewise never restored from peer metadata here, since every
+    // converter sets it from the local context after the spread, so reading it
+    // from metadata would be dead and read as if a peer could set the author.
     partial: metadata[A2AMetadataKeys.PARTIAL],
     errorCode: metadata[A2AMetadataKeys.ERROR_CODE],
     errorMessage: metadata[A2AMetadataKeys.ERROR_MESSAGE],