@google/adk 2.2.1 → 2.4.0

package/dist/esm/agents/functions.js

@@ -21,7 +21,10 @@ import {
   mergeEventActions
 } from "../events/event_actions.js";
 import { BaseTool } from "../tools/base_tool.js";
+import { isFunctionTool } from "../tools/function_tool.js";
 import { logger } from "../utils/logger.js";
+import { Task } from "../utils/task.js";
+import { ActiveStreamingTool } from "./active_streaming_tool.js";
 import { Context } from "./context.js";
 import {
   REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
@@ -50,6 +53,8 @@ import {
 } from "./framework_function_calls.js";
 const functionsExportedForTestingOnly = {
   handleFunctionCallList,
+  handleFunctionCallsLive,
+  processFunctionLiveHelper,
   generateAuthEvent,
   generateRequestConfirmationEvent
 };
@@ -147,20 +152,49 @@ async function callToolAsync(tool, args, toolContext) {
       traceToolCall({
         tool,
         args,
+        span,
         functionResponseEvent: buildResponseEvent(
           tool,
           result,
           toolContext,
           toolContext.invocationContext
-        )
+        ),
+        errorType: getToolResponseErrorType(result),
+        invocationContext: toolContext.invocationContext
       });
       return result;
+    } catch (error) {
+      traceToolCall({
+        tool,
+        args,
+        span,
+        error,
+        invocationContext: toolContext.invocationContext
+      });
+      throw error;
     } finally {
       span.end();
     }
   });
 }
 __name(callToolAsync, "callToolAsync");
+function getToolResponseErrorType(result) {
+  var _a2;
+  if (result === null || typeof result !== "object" || Array.isArray(result)) {
+    return void 0;
+  }
+  try {
+    if (!Object.hasOwn(result, "error")) {
+      return void 0;
+    }
+    const response = result;
+    const errorType = (_a2 = response.errorType) != null ? _a2 : response.error_type;
+    return typeof errorType === "string" ? errorType : void 0;
+  } catch {
+    return void 0;
+  }
+}
+__name(getToolResponseErrorType, "getToolResponseErrorType");
 function buildResponseEvent(tool, functionResult, toolContext, invocationContext) {
   let responseResult;
   if (typeof functionResult !== "object" || functionResult == null) {
@@ -213,6 +247,30 @@ async function handleFunctionCallsAsync({
   });
 }
 __name(handleFunctionCallsAsync, "handleFunctionCallsAsync");
+async function handleFunctionCallsLive({
+  invocationContext,
+  functionCallEvent,
+  toolsDict,
+  beforeToolCallbacks,
+  afterToolCallbacks,
+  filters,
+  toolConfirmationDict,
+  resumeInputsDict
+}) {
+  const functionCalls = getFunctionCalls(functionCallEvent);
+  return handleFunctionCallList({
+    invocationContext,
+    functionCalls,
+    toolsDict,
+    beforeToolCallbacks,
+    afterToolCallbacks,
+    filters,
+    toolConfirmationDict,
+    resumeInputsDict,
+    isLive: true
+  });
+}
+__name(handleFunctionCallsLive, "handleFunctionCallsLive");
 function normalizeCallbackResponse(response) {
   if (response == null) {
     return void 0;
@@ -298,7 +356,8 @@ async function handleFunctionCallList({
   afterToolCallbacks,
   filters,
   toolConfirmationDict,
-  resumeInputsDict
+  resumeInputsDict,
+  isLive = false
 }) {
   var _a2;
   const functionResponseEvents = [];
@@ -335,7 +394,6 @@ async function handleFunctionCallList({
     logger.debug(`execute_tool ${tool.name}`);
     const functionArgs = (_a2 = functionCall.args) != null ? _a2 : {};
     let functionResponse = null;
-    let functionResponseError;
     functionResponse = await invocationContext.pluginManager.runBeforeToolCallback({
       tool,
       toolArgs: functionArgs,
@@ -356,7 +414,18 @@ async function handleFunctionCallList({
     functionResponse = normalizeCallbackResponse(functionResponse);
     if (functionResponse == null) {
       try {
-        functionResponse = await callToolAsync(tool, functionArgs, toolContext);
+        const rawFunctionResponse = isLive ? await processFunctionLiveHelper({
+          tool,
+          toolContext,
+          functionCall,
+          functionArgs,
+          invocationContext
+        }) : await callToolAsync(tool, functionArgs, toolContext);
+        if (rawFunctionResponse == null && !tool.isLongRunning) {
+          functionResponse = { result: rawFunctionResponse };
+        } else {
+          functionResponse = normalizeCallbackResponse(rawFunctionResponse);
+        }
       } catch (e) {
         if (e instanceof Error) {
           const onToolErrorResponse = await invocationContext.pluginManager.runOnToolErrorCallback({
@@ -368,18 +437,19 @@ async function handleFunctionCallList({
           if (onToolErrorResponse != null) {
             functionResponse = normalizeCallbackResponse(onToolErrorResponse);
           } else {
-            functionResponseError = e.message;
+            functionResponse = { error: e.message };
           }
         } else {
-          functionResponseError = e;
+          functionResponse = { error: e };
         }
       }
     }
+    const callbackResult = functionResponse != null ? functionResponse : {};
     let alteredFunctionResponse = await invocationContext.pluginManager.runAfterToolCallback({
       tool,
       toolArgs: functionArgs,
       toolContext,
-      result: functionResponse
+      result: callbackResult
     });
     if (alteredFunctionResponse == null) {
       for (const callback of afterToolCallbacks) {
@@ -387,7 +457,7 @@ async function handleFunctionCallList({
           tool,
           args: functionArgs,
           context: toolContext,
-          response: functionResponse
+          response: callbackResult
         });
         if (alteredFunctionResponse) {
           break;
@@ -410,13 +480,6 @@ async function handleFunctionCallList({
       }
       continue;
     }
-    if (functionResponseError) {
-      functionResponse = { error: functionResponseError };
-    } else if (functionResponse == null) {
-      functionResponse = { result: functionResponse };
-    } else {
-      functionResponse = normalizeCallbackResponse(functionResponse);
-    }
     const functionResponseEvent = createEvent({
       invocationId: invocationContext.invocationId,
       author: toolEventAuthor(invocationContext),
@@ -430,11 +493,6 @@ async function handleFunctionCallList({
       actions: toolContext.actions,
       branch: invocationContext.branch
     });
-    logger.debug("traceToolCall", {
-      tool: tool.name,
-      args: functionArgs,
-      functionResponseEvent: functionResponseEvent.id
-    });
     functionResponseEvents.push(functionResponseEvent);
   }
   if (!functionResponseEvents.length) {
@@ -447,13 +505,10 @@ async function handleFunctionCallList({
     tracer.startActiveSpan("execute_tool (merged)", (span) => {
       try {
         logger.debug("execute_tool (merged)");
-        logger.debug("traceMergedToolCalls", {
-          responseEventId: mergedEvent.id,
-          functionResponseEvent: mergedEvent.id
-        });
         traceMergedToolCalls({
           responseEventId: mergedEvent.id,
-          functionResponseEvent: mergedEvent
+          functionResponseEvent: mergedEvent,
+          invocationContext
         });
       } finally {
         span.end();
@@ -491,6 +546,151 @@ function mergeParallelFunctionResponseEvents(functionResponseEvents) {
   });
 }
 __name(mergeParallelFunctionResponseEvents, "mergeParallelFunctionResponseEvents");
+function isAsyncGeneratorFunction(fn) {
+  return typeof fn === "function" && Object.prototype.toString.call(fn) === "[object AsyncGeneratorFunction]";
+}
+__name(isAsyncGeneratorFunction, "isAsyncGeneratorFunction");
+function isStreamingTool(tool) {
+  const candidate = tool;
+  if (typeof candidate._callLive !== "function") {
+    return false;
+  }
+  if (isFunctionTool(tool)) {
+    return isAsyncGeneratorFunction(candidate.execute);
+  }
+  return isAsyncGeneratorFunction(candidate.execute) || isAsyncGeneratorFunction(candidate.func) || isAsyncGeneratorFunction(candidate._callLive);
+}
+__name(isStreamingTool, "isStreamingTool");
+async function* callToolLive({
+  tool,
+  args,
+  toolContext,
+  invocationContext
+}) {
+  const results = tool._callLive({
+    args,
+    toolContext,
+    invocationContext
+  });
+  for await (const result of results) {
+    yield result;
+  }
+}
+__name(callToolLive, "callToolLive");
+async function waitForTaskWithTimeout(task, timeoutMs) {
+  let timeoutId;
+  const timeoutPromise = new Promise((resolve) => {
+    timeoutId = setTimeout(resolve, timeoutMs);
+  });
+  try {
+    await Promise.race([
+      task.promise.then(
+        () => void 0,
+        () => void 0
+      ),
+      timeoutPromise
+    ]);
+  } finally {
+    if (timeoutId !== void 0) {
+      clearTimeout(timeoutId);
+    }
+  }
+}
+__name(waitForTaskWithTimeout, "waitForTaskWithTimeout");
+const STOP_STREAMING_FUNCTION_NAME = "stop_streaming";
+const STOP_STREAMING_TIMEOUT_MS = 1e3;
+async function processFunctionLiveHelper({
+  tool,
+  toolContext,
+  functionCall,
+  functionArgs,
+  invocationContext
+}) {
+  var _a2, _b2;
+  let functionResponse = void 0;
+  const targetFunctionName = typeof functionArgs["function_name"] === "string" ? functionArgs["function_name"] : typeof functionArgs["functionName"] === "string" ? functionArgs["functionName"] : void 0;
+  if (functionCall.name === STOP_STREAMING_FUNCTION_NAME && targetFunctionName !== void 0) {
+    const activeTasks = invocationContext.activeStreamingTools;
+    const activeTask = (_a2 = activeTasks == null ? void 0 : activeTasks[targetFunctionName]) == null ? void 0 : _a2.task;
+    if (activeTasks && activeTask && !activeTask.done()) {
+      activeTask.cancel();
+      await waitForTaskWithTimeout(activeTask, STOP_STREAMING_TIMEOUT_MS);
+      if (!activeTask.done()) {
+        logger.warn(`The task for ${targetFunctionName} is not cancelled yet.`);
+        functionResponse = {
+          status: `The task is not cancelled yet for ${targetFunctionName}.`
+        };
+      } else {
+        activeTasks[targetFunctionName].task = void 0;
+        functionResponse = {
+          status: `Successfully stopped streaming function ${targetFunctionName}`
+        };
+      }
+    } else {
+      functionResponse = {
+        status: `No active streaming function named ${targetFunctionName} found`
+      };
+    }
+  } else if (isStreamingTool(tool)) {
+    const task = new Task(async (abortSignal) => {
+      var _a3, _b3;
+      const generator = callToolLive({
+        tool,
+        args: functionArgs,
+        toolContext,
+        invocationContext
+      });
+      let abortCleanup;
+      const abortPromise = new Promise(
+        (resolve) => {
+          if (abortSignal.aborted) {
+            resolve({ value: void 0, done: true });
+            return;
+          }
+          const onAbort = /* @__PURE__ */ __name(() => {
+            resolve({ value: void 0, done: true });
+          }, "onAbort");
+          abortSignal.addEventListener("abort", onAbort, { once: true });
+          abortCleanup = /* @__PURE__ */ __name(() => abortSignal.removeEventListener("abort", onAbort), "abortCleanup");
+        }
+      );
+      try {
+        while (!abortSignal.aborted) {
+          const nextResult = await Promise.race([
+            generator.next(),
+            abortPromise
+          ]);
+          if (abortSignal.aborted || nextResult.done) {
+            break;
+          }
+          const result = nextResult.value;
+          const updatedContent = createUserContent(
+            `Function ${tool.name} returned: ${String(result)}`
+          );
+          (_a3 = invocationContext.liveRequestQueue) == null ? void 0 : _a3.sendContent(updatedContent);
+        }
+      } finally {
+        abortCleanup == null ? void 0 : abortCleanup();
+        if (abortSignal.aborted) {
+          void ((_b3 = generator.return) == null ? void 0 : _b3.call(generator, void 0));
+        }
+      }
+    });
+    (_b2 = invocationContext.activeStreamingTools) != null ? _b2 : invocationContext.activeStreamingTools = {};
+    if (tool.name in invocationContext.activeStreamingTools) {
+      invocationContext.activeStreamingTools[tool.name].task = task;
+    } else {
+      invocationContext.activeStreamingTools[tool.name] = new ActiveStreamingTool({ task });
+    }
+    functionResponse = {
+      status: "The function is running asynchronously and the results are pending."
+    };
+  } else {
+    functionResponse = await callToolAsync(tool, functionArgs, toolContext);
+  }
+  return functionResponse;
+}
+__name(processFunctionLiveHelper, "processFunctionLiveHelper");
 function findEventByFunctionCallId(events, functionCallId, endIndex = events.length) {
   for (let i = endIndex - 1; i >= 0; i--) {
     const event = events[i];
@@ -559,6 +759,7 @@ export {
   getLongRunningFunctionCalls,
   handleFunctionCallList,
   handleFunctionCallsAsync,
+  handleFunctionCallsLive,
   isToolNotFound,
   mergeParallelFunctionResponseEvents,
   populateClientFunctionCallId,

package/dist/esm/agents/instructions.js

@@ -8,6 +8,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * SPDX-License-Identifier: Apache-2.0
  */
 import { State } from "../sessions/state.js";
+import { asSafePartForLlm } from "../tools/load_artifacts_tool.js";
 const ARTIFACT_PREFIX = "artifact.";
 const WORKFLOW_FIELD_KEY = /^[A-Za-z_]\w*\.[A-Za-z_]\w*$/;
 const SOURCE_NODE_PLACEHOLDER = /<\s*[A-Za-z_]\w*\.([A-Za-z_]\w*)\s+from\s+([A-Za-z_]\w*)\s*>/g;
@@ -36,7 +37,7 @@ async function resolveKey(key, isOptional, rawMatch, readonlyContext) {
       }
       throw new Error(`Artifact ${fileName} not found.`);
     }
-    return formatValue(artifact, true);
+    return formatValue(asSafePartForLlm(artifact, fileName), true);
   }
   if (isValidStateName(key)) {
     if (key in invocationContext.session.state) {
@@ -91,7 +92,10 @@ async function injectSessionState(template, readonlyContext) {
     resolved: resolveSourceNode(match[0], match[1], match[2], scope)
   })) : [];
   const pattern = /\{+[^{}]*}+/g;
-  const matches = Array.from(template.matchAll(pattern));
+  const matches = Array.from(template.matchAll(pattern)).filter((match) => {
+    const previous = template[match.index - 1];
+    return previous !== "$" && previous !== "\\";
+  });
   if (matches.length === 0 && sourceMatches.length === 0) {
     return template;
   }

package/dist/esm/agents/invocation_context.js

@@ -7,7 +7,25 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+var _a, _b;
 import { randomUUID } from "../utils/env_aware_utils.js";
+const LLM_CALLS_LIMIT_EXCEEDED_ERROR_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for(
+  "google.adk.llmCallsLimitExceededError"
+);
+const _LlmCallsLimitExceededError = class _LlmCallsLimitExceededError extends (_b = Error, _a = LLM_CALLS_LIMIT_EXCEEDED_ERROR_SIGNATURE_SYMBOL, _b) {
+  constructor(message) {
+    super(message);
+    this[_a] = true;
+    this.name = "LlmCallsLimitExceededError";
+    Object.setPrototypeOf(this, _LlmCallsLimitExceededError.prototype);
+  }
+};
+__name(_LlmCallsLimitExceededError, "LlmCallsLimitExceededError");
+let LlmCallsLimitExceededError = _LlmCallsLimitExceededError;
+function isLlmCallsLimitExceededError(obj) {
+  return typeof obj === "object" && obj !== null && LLM_CALLS_LIMIT_EXCEEDED_ERROR_SIGNATURE_SYMBOL in obj && obj[LLM_CALLS_LIMIT_EXCEEDED_ERROR_SIGNATURE_SYMBOL] === true;
+}
+__name(isLlmCallsLimitExceededError, "isLlmCallsLimitExceededError");
 const _InvocationCostManager = class _InvocationCostManager {
   constructor() {
     this.numberOfLlmCalls = 0;
@@ -21,7 +39,7 @@ const _InvocationCostManager = class _InvocationCostManager {
   incrementAndEnforceLlmCallsLimit(runConfig) {
     this.numberOfLlmCalls++;
     if (runConfig && runConfig.maxLlmCalls > 0 && this.numberOfLlmCalls > runConfig.maxLlmCalls) {
-      throw new Error(
+      throw new LlmCallsLimitExceededError(
         `Max number of llm calls limit of ${runConfig.maxLlmCalls} exceeded`
       );
     }
@@ -34,7 +52,7 @@ const _InvocationContext = class _InvocationContext {
    * @param params The parameters for creating an invocation context.
    */
   constructor(params) {
-    var _a, _b;
+    var _a2, _b2;
     this.artifactService = params.artifactService;
     this.sessionService = params.sessionService;
     this.memoryService = params.memoryService;
@@ -51,9 +69,9 @@ const _InvocationContext = class _InvocationContext {
     this.abortSignal = params.abortSignal;
     this.workflowInstructionScope = params.workflowInstructionScope;
     this.isolationScope = params.isolationScope;
-    this.nodeToolDepth = (_a = params.nodeToolDepth) != null ? _a : 0;
+    this.nodeToolDepth = (_a2 = params.nodeToolDepth) != null ? _a2 : 0;
     this.a2aMetadata = params.a2aMetadata;
-    this.invocationCostManager = (_b = params.invocationCostManager) != null ? _b : new InvocationCostManager();
+    this.invocationCostManager = (_b2 = params.invocationCostManager) != null ? _b2 : new InvocationCostManager();
     this.liveRequestQueue = params.liveRequestQueue;
     this.liveSessionResumptionHandle = params.liveSessionResumptionHandle;
   }
@@ -107,6 +125,8 @@ function requireAgent(ctx) {
 __name(requireAgent, "requireAgent");
 export {
   InvocationContext,
+  LlmCallsLimitExceededError,
+  isLlmCallsLimitExceededError,
   newInvocationContextId,
   requireAgent
 };

package/dist/esm/agents/langgraph_agent.js

@@ -0,0 +1,123 @@
+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
+ */
+var _a, _b;
+import { createEvent } from "../events/event.js";
+import { BaseAgent } from "./base_agent.js";
+function getLastHumanMessages(events) {
+  var _a2, _b2, _c;
+  const messages = [];
+  for (let i = events.length - 1; i >= 0; i--) {
+    const event = events[i];
+    if (messages.length > 0 && event.author !== "user") {
+      break;
+    }
+    const text = (_c = (_b2 = (_a2 = event.content) == null ? void 0 : _a2.parts) == null ? void 0 : _b2[0]) == null ? void 0 : _c.text;
+    if (event.author === "user" && text !== void 0) {
+      messages.push({ type: "human", content: text });
+    }
+  }
+  return messages.reverse();
+}
+__name(getLastHumanMessages, "getLastHumanMessages");
+function extractMessageText(content) {
+  if (typeof content === "string") {
+    return content;
+  }
+  return content.map((part) => {
+    var _a2;
+    return typeof part === "string" ? part : (_a2 = part.text) != null ? _a2 : "";
+  }).join("");
+}
+__name(extractMessageText, "extractMessageText");
+const LANGGRAPH_AGENT_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for(
+  "google.adk.langGraphAgent"
+);
+function isLangGraphAgent(obj) {
+  return typeof obj === "object" && obj !== null && LANGGRAPH_AGENT_SIGNATURE_SYMBOL in obj && obj[LANGGRAPH_AGENT_SIGNATURE_SYMBOL] === true;
+}
+__name(isLangGraphAgent, "isLangGraphAgent");
+const _LangGraphAgent = class _LangGraphAgent extends (_b = BaseAgent, _a = LANGGRAPH_AGENT_SIGNATURE_SYMBOL, _b) {
+  constructor(config) {
+    var _a2;
+    super(config);
+    this[_a] = true;
+    this.graph = config.graph;
+    this.instruction = (_a2 = config.instruction) != null ? _a2 : "";
+  }
+  async *runAsyncImpl(ctx) {
+    var _a2, _b2, _c;
+    const config = {
+      // LangGraph.js checkpointers read `configurable.thread_id`.
+      configurable: { thread_id: ctx.session.id }
+    };
+    let currentGraphState;
+    if (this.graph.checkpointer) {
+      if (typeof this.graph.getState !== "function") {
+        throw new Error(
+          `LangGraphAgent '${this.name}' requires graph.getState() when graph.checkpointer is configured.`
+        );
+      }
+      currentGraphState = await this.graph.getState(config);
+    }
+    const graphMessages = (_b2 = (_a2 = currentGraphState == null ? void 0 : currentGraphState.values) == null ? void 0 : _a2.messages) != null ? _b2 : [];
+    const messages = this.instruction && graphMessages.length === 0 ? [{ type: "system", content: this.instruction }] : [];
+    messages.push(...this.getMessages(ctx.session.events));
+    const finalState = await this.graph.invoke({ messages }, config);
+    const finalMessages = (_c = finalState.messages) != null ? _c : [];
+    const lastMessage = finalMessages[finalMessages.length - 1];
+    if (!lastMessage) {
+      throw new Error(
+        `LangGraphAgent '${this.name}' received no messages from graph.invoke().`
+      );
+    }
+    yield createEvent({
+      invocationId: ctx.invocationId,
+      author: this.name,
+      branch: ctx.branch,
+      content: {
+        role: "model",
+        parts: [{ text: extractMessageText(lastMessage.content) }]
+      }
+    });
+  }
+  async *runLiveImpl(_ctx) {
+    yield* [];
+    throw new Error("This is not supported yet for LangGraphAgent.");
+  }
+  getMessages(events) {
+    if (this.graph.checkpointer) {
+      return getLastHumanMessages(events);
+    }
+    return this.getConversationWithAgent(events);
+  }
+  getConversationWithAgent(events) {
+    var _a2, _b2, _c;
+    const messages = [];
+    for (const event of events) {
+      const text = (_c = (_b2 = (_a2 = event.content) == null ? void 0 : _a2.parts) == null ? void 0 : _b2[0]) == null ? void 0 : _c.text;
+      if (text === void 0) {
+        continue;
+      }
+      if (event.author === "user") {
+        messages.push({ type: "human", content: text });
+      } else if (event.author === this.name) {
+        messages.push({ type: "ai", content: text });
+      }
+    }
+    return messages;
+  }
+};
+__name(_LangGraphAgent, "LangGraphAgent");
+let LangGraphAgent = _LangGraphAgent;
+export {
+  LangGraphAgent,
+  getLastHumanMessages,
+  isLangGraphAgent
+};