@google/adk 0.2.4 → 0.3.0

package/dist/web/agents/llm_agent.js

@@ -3,6 +3,9 @@ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
 var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
@@ -30,22 +33,68 @@ var __asyncGenerator = (__this, __arguments, generator) => {
   }, method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no)), it = {};
   return generator = generator.apply(__this, __arguments), it[__knownSymbol("asyncIterator")] = () => it, method("next"), method("throw"), method("return"), it;
 };
+var __yieldStar = (value) => {
+  var obj = value[__knownSymbol("asyncIterator")], isAwait = false, method, it = {};
+  if (obj == null) {
+    obj = value[__knownSymbol("iterator")]();
+    method = (k) => it[k] = (x) => obj[k](x);
+  } else {
+    obj = obj.call(value);
+    method = (k) => it[k] = (v) => {
+      if (isAwait) {
+        isAwait = false;
+        if (k === "throw") throw v;
+        return v;
+      }
+      isAwait = true;
+      return {
+        done: false,
+        value: new __await(new Promise((resolve) => {
+          var x = obj[k](v);
+          if (!(x instanceof Object)) __typeError("Object expected");
+          resolve(x);
+        }), 1)
+      };
+    };
+  }
+  return it[__knownSymbol("iterator")] = () => it, method("next"), "throw" in obj ? method("throw") : it.throw = (x) => {
+    throw x;
+  }, "return" in obj && method("return"), it;
+};
 var __forAwait = (obj, it, method) => (it = obj[__knownSymbol("asyncIterator")]) ? it.call(obj) : (obj = obj[__knownSymbol("iterator")](), it = {}, method = (key, fn) => (fn = obj[key]) && (it[key] = (arg) => new Promise((yes, no, done) => (arg = fn.call(obj, arg), done = arg.done, Promise.resolve(arg.value).then((value) => yes({ value, done }), no)))), method("next"), method("return"), it);
 /**
  * @license
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+var _a, _b;
+import { context, trace } from "@opentelemetry/api";
 import { cloneDeep } from "lodash-es";
 import { z } from "zod";
-import { BaseCodeExecutor } from "../code_executors/base_code_executor.js";
-import { BuiltInCodeExecutor } from "../code_executors/built_in_code_executor.js";
-import { buildCodeExecutionResultPart, buildExecutableCodePart, convertCodeExecutionParts, extractCodeAndTruncateContent } from "../code_executors/code_execution_utils.js";
+import {
+  isBaseCodeExecutor
+} from "../code_executors/base_code_executor.js";
+import { isBuiltInCodeExecutor } from "../code_executors/built_in_code_executor.js";
+import {
+  buildCodeExecutionResultPart,
+  buildExecutableCodePart,
+  convertCodeExecutionParts,
+  extractCodeAndTruncateContent
+} from "../code_executors/code_execution_utils.js";
 import { CodeExecutorContext } from "../code_executors/code_executor_context.js";
-import { createEvent, createNewEventId, getFunctionCalls, getFunctionResponses, isFinalResponse } from "../events/event.js";
+import {
+  createEvent,
+  createNewEventId,
+  getFunctionCalls,
+  getFunctionResponses,
+  isFinalResponse
+} from "../events/event.js";
 import { createEventActions } from "../events/event_actions.js";
 import { isBaseLlm } from "../models/base_llm.js";
-import { appendInstructions, setOutputSchema } from "../models/llm_request.js";
+import {
+  appendInstructions,
+  setOutputSchema
+} from "../models/llm_request.js";
 import { LLMRegistry } from "../models/registry.js";
 import { State } from "../sessions/state.js";
 import { BaseTool } from "../tools/base_tool.js";
@@ -54,31 +103,50 @@ import { ToolConfirmation } from "../tools/tool_confirmation.js";
 import { ToolContext } from "../tools/tool_context.js";
 import { base64Decode } from "../utils/env_aware_utils.js";
 import { logger } from "../utils/logger.js";
+import {
+  runAsyncGeneratorWithOtelContext,
+  traceCallLlm,
+  tracer
+} from "../telemetry/tracing.js";
 import { BaseAgent } from "./base_agent.js";
-import { BaseLlmRequestProcessor } from "./base_llm_processor.js";
+import {
+  BaseLlmRequestProcessor
+} from "./base_llm_processor.js";
 import { CallbackContext } from "./callback_context.js";
-import { getContents, getCurrentTurnContents } from "./content_processor_utils.js";
-import { generateAuthEvent, generateRequestConfirmationEvent, getLongRunningFunctionCalls, handleFunctionCallList, handleFunctionCallsAsync, populateClientFunctionCallId, REQUEST_CONFIRMATION_FUNCTION_CALL_NAME } from "./functions.js";
+import {
+  getContents,
+  getCurrentTurnContents
+} from "./content_processor_utils.js";
+import {
+  generateAuthEvent,
+  generateRequestConfirmationEvent,
+  getLongRunningFunctionCalls,
+  handleFunctionCallList,
+  handleFunctionCallsAsync,
+  populateClientFunctionCallId,
+  REQUEST_CONFIRMATION_FUNCTION_CALL_NAME
+} from "./functions.js";
 import { injectSessionState } from "./instructions.js";
 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, context) {
+async function convertToolUnionToTools(toolUnion, context2) {
   if (toolUnion instanceof BaseTool) {
     return [toolUnion];
   }
-  return await toolUnion.getTools(context);
+  return await toolUnion.getTools(context2);
 }
 class BasicLlmRequestProcessor extends BaseLlmRequestProcessor {
+  // eslint-disable-next-line require-yield
   runAsync(invocationContext, llmRequest) {
     return __asyncGenerator(this, null, function* () {
-      var _a;
+      var _a2;
       const agent = invocationContext.agent;
-      if (!(agent instanceof LlmAgent)) {
+      if (!isLlmAgent(agent)) {
         return;
       }
       llmRequest.model = agent.canonicalModel.model;
-      llmRequest.config = __spreadValues({}, (_a = agent.generateContentConfig) != null ? _a : {});
+      llmRequest.config = __spreadValues({}, (_a2 = agent.generateContentConfig) != null ? _a2 : {});
       if (agent.outputSchema) {
         setOutputSchema(llmRequest, agent.outputSchema);
       }
@@ -96,6 +164,7 @@ class BasicLlmRequestProcessor extends BaseLlmRequestProcessor {
 }
 const BASIC_LLM_REQUEST_PROCESSOR = new BasicLlmRequestProcessor();
 class IdentityLlmRequestProcessor extends BaseLlmRequestProcessor {
+  // eslint-disable-next-line require-yield
   runAsync(invocationContext, llmRequest) {
     return __asyncGenerator(this, null, function* () {
       const agent = invocationContext.agent;
@@ -112,6 +181,7 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
   /**
    * Handles instructions and global instructions for LLM flow.
    */
+  // eslint-disable-next-line require-yield
   runAsync(invocationContext, llmRequest) {
     return __asyncGenerator(this, null, function* () {
       const agent = invocationContext.agent;
@@ -119,7 +189,7 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
         return;
       }
       const rootAgent = agent.rootAgent;
-      if (rootAgent instanceof LlmAgent && rootAgent.globalInstruction) {
+      if (isLlmAgent(rootAgent) && rootAgent.globalInstruction) {
         const { instruction, requireStateInjection } = yield new __await(rootAgent.canonicalGlobalInstruction(
           new ReadonlyContext(invocationContext)
         ));
@@ -150,10 +220,11 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
 }
 const INSTRUCTIONS_LLM_REQUEST_PROCESSOR = new InstructionsLlmRequestProcessor();
 class ContentRequestProcessor {
+  // eslint-disable-next-line require-yield
   runAsync(invocationContext, llmRequest) {
     return __asyncGenerator(this, null, function* () {
       const agent = invocationContext.agent;
-      if (!agent || !(agent instanceof LlmAgent)) {
+      if (!agent || !isLlmAgent(agent)) {
         return;
       }
       if (agent.includeContents === "default") {
@@ -193,6 +264,7 @@ class AgentTransferLlmRequestProcessor extends BaseLlmRequestProcessor {
       }
     });
   }
+  // eslint-disable-next-line require-yield
   runAsync(invocationContext, llmRequest) {
     return __asyncGenerator(this, null, function* () {
       if (!(invocationContext.agent instanceof LlmAgent)) {
@@ -225,7 +297,7 @@ class AgentTransferLlmRequestProcessor extends BaseLlmRequestProcessor {
   getTransferTargets(agent) {
     const targets = [];
     targets.push(...agent.subAgents);
-    if (!agent.parentAgent || !(agent.parentAgent instanceof LlmAgent)) {
+    if (!agent.parentAgent || !isLlmAgent(agent.parentAgent)) {
       return targets;
     }
     if (!agent.disallowTransferToParent) {
@@ -244,10 +316,10 @@ class AgentTransferLlmRequestProcessor extends BaseLlmRequestProcessor {
 const AGENT_TRANSFER_LLM_REQUEST_PROCESSOR = new AgentTransferLlmRequestProcessor();
 class RequestConfirmationLlmRequestProcessor extends BaseLlmRequestProcessor {
   /** Handles tool confirmation information to build the LLM request. */
-  runAsync(invocationContext, llmRequest) {
+  runAsync(invocationContext) {
     return __asyncGenerator(this, null, function* () {
       const agent = invocationContext.agent;
-      if (!(agent instanceof LlmAgent)) {
+      if (!isLlmAgent(agent)) {
         return;
       }
       const events = invocationContext.session.events;
@@ -273,7 +345,9 @@ class RequestConfirmationLlmRequestProcessor extends BaseLlmRequestProcessor {
           foundConfirmation = true;
           let toolConfirmation = null;
           if (functionResponse.response && Object.keys(functionResponse.response).length === 1 && "response" in functionResponse.response) {
-            toolConfirmation = JSON.parse(functionResponse.response["response"]);
+            toolConfirmation = JSON.parse(
+              functionResponse.response["response"]
+            );
           } else if (functionResponse.response) {
             toolConfirmation = new ToolConfirmation({
               hint: functionResponse.response["hint"],
@@ -337,8 +411,12 @@ class RequestConfirmationLlmRequestProcessor extends BaseLlmRequestProcessor {
         if (Object.keys(toolsToResumeWithConfirmation).length === 0) {
           continue;
         }
-        const toolsList = yield new __await(agent.canonicalTools(new ReadonlyContext(invocationContext)));
-        const toolsDict = Object.fromEntries(toolsList.map((tool) => [tool.name, tool]));
+        const toolsList = yield new __await(agent.canonicalTools(
+          new ReadonlyContext(invocationContext)
+        ));
+        const toolsDict = Object.fromEntries(
+          toolsList.map((tool) => [tool.name, tool])
+        );
         const functionResponseEvent = yield new __await(handleFunctionCallList({
           invocationContext,
           functionCalls: Object.values(toolsToResumeWithArgs),
@@ -381,12 +459,12 @@ class CodeExecutionRequestProcessor extends BaseLlmRequestProcessor {
             throw error[0];
         }
       }
-      if (!(invocationContext.agent.codeExecutor instanceof BaseCodeExecutor)) {
+      if (!isBaseCodeExecutor(invocationContext.agent.codeExecutor)) {
         return;
       }
       for (const content of llmRequest.contents) {
         const delimeters = invocationContext.agent.codeExecutor.codeBlockDelimiters.length ? invocationContext.agent.codeExecutor.codeBlockDelimiters[0] : ["", ""];
-        const codeExecutionParts = convertCodeExecutionParts(
+        convertCodeExecutionParts(
           content,
           delimeters,
           invocationContext.agent.codeExecutor.executionResultDelimiters
@@ -416,7 +494,10 @@ class CodeExecutionResponseProcessor {
         return;
       }
       try {
-        for (var iter = __forAwait(runPostProcessor(invocationContext, llmResponse)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+        for (var iter = __forAwait(runPostProcessor(
+          invocationContext,
+          llmResponse
+        )), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
           const event = temp.value;
           yield event;
         }
@@ -437,27 +518,36 @@ const responseProcessor = new CodeExecutionResponseProcessor();
 function runPreProcessor(invocationContext, llmRequest) {
   return __asyncGenerator(this, null, function* () {
     const agent = invocationContext.agent;
-    if (!(agent instanceof LlmAgent)) {
+    if (!isLlmAgent(agent)) {
       return;
     }
     const codeExecutor = agent.codeExecutor;
-    if (!codeExecutor || !(codeExecutor instanceof BaseCodeExecutor)) {
+    if (!codeExecutor || !isBaseCodeExecutor(codeExecutor)) {
       return;
     }
-    if (codeExecutor instanceof BuiltInCodeExecutor) {
+    if (isBuiltInCodeExecutor(codeExecutor)) {
       codeExecutor.processLlmRequest(llmRequest);
       return;
     }
     if (!codeExecutor.optimizeDataFile) {
       return;
     }
-    const codeExecutorContext = new CodeExecutorContext(new State(invocationContext.session.state));
+    const codeExecutorContext = new CodeExecutorContext(
+      new State(invocationContext.session.state)
+    );
     if (codeExecutorContext.getErrorCount(invocationContext.invocationId) >= codeExecutor.errorRetryAttempts) {
       return;
     }
-    const allInputFiles = extractAndReplaceInlineFiles(codeExecutorContext, llmRequest);
-    const processedFileNames = new Set(codeExecutorContext.getProcessedFileNames());
-    const filesToProcess = allInputFiles.filter((f) => !processedFileNames.has(f.name));
+    const allInputFiles = extractAndReplaceInlineFiles(
+      codeExecutorContext,
+      llmRequest
+    );
+    const processedFileNames = new Set(
+      codeExecutorContext.getProcessedFileNames()
+    );
+    const filesToProcess = allInputFiles.filter(
+      (f) => !processedFileNames.has(f.name)
+    );
     for (const file of filesToProcess) {
       const codeStr = getDataFilePreprocessingCode(file);
       if (!codeStr) {
@@ -477,7 +567,10 @@ function runPreProcessor(invocationContext, llmRequest) {
         branch: invocationContext.branch,
         content: codeContent
       });
-      const executionId = getOrSetExecutionId(invocationContext, codeExecutorContext);
+      const executionId = getOrSetExecutionId(
+        invocationContext,
+        codeExecutorContext
+      );
       const codeExecutionResult = yield new __await(codeExecutor.executeCode({
         invocationContext,
         codeExecutionInput: {
@@ -506,20 +599,22 @@ function runPreProcessor(invocationContext, llmRequest) {
 function runPostProcessor(invocationContext, llmResponse) {
   return __asyncGenerator(this, null, function* () {
     const agent = invocationContext.agent;
-    if (!(agent instanceof LlmAgent)) {
+    if (!isLlmAgent(agent)) {
       return;
     }
     const codeExecutor = agent.codeExecutor;
-    if (!codeExecutor || !(codeExecutor instanceof BaseCodeExecutor)) {
+    if (!codeExecutor || !isBaseCodeExecutor(codeExecutor)) {
       return;
     }
     if (!llmResponse || !llmResponse.content) {
       return;
     }
-    if (codeExecutor instanceof BuiltInCodeExecutor) {
+    if (isBuiltInCodeExecutor(codeExecutor)) {
       return;
     }
-    const codeExecutorContext = new CodeExecutorContext(new State(invocationContext.session.state));
+    const codeExecutorContext = new CodeExecutorContext(
+      new State(invocationContext.session.state)
+    );
     if (codeExecutorContext.getErrorCount(invocationContext.invocationId) >= codeExecutor.errorRetryAttempts) {
       return;
     }
@@ -537,7 +632,10 @@ function runPostProcessor(invocationContext, llmResponse) {
       branch: invocationContext.branch,
       content: responseContent
     });
-    const executionId = getOrSetExecutionId(invocationContext, codeExecutorContext);
+    const executionId = getOrSetExecutionId(
+      invocationContext,
+      codeExecutorContext
+    );
     const codeExecutionResult = yield new __await(codeExecutor.executeCode({
       invocationContext,
       codeExecutionInput: {
@@ -557,11 +655,11 @@ function runPostProcessor(invocationContext, llmResponse) {
       codeExecutorContext,
       codeExecutionResult
     ));
-    llmResponse.content = null;
+    llmResponse.content = void 0;
   });
 }
 function extractAndReplaceInlineFiles(codeExecutorContext, llmRequest) {
-  var _a;
+  var _a2;
   const allInputFiles = codeExecutorContext.getInputFiles();
   const savedFileNames = new Set(allInputFiles.map((f) => f.name));
   for (let i = 0; i < llmRequest.contents.length; i++) {
@@ -571,7 +669,7 @@ function extractAndReplaceInlineFiles(codeExecutorContext, llmRequest) {
     }
     for (let j = 0; j < content.parts.length; j++) {
       const part = content.parts[j];
-      const mimeType = (_a = part.inlineData) == null ? void 0 : _a.mimeType;
+      const mimeType = (_a2 = part.inlineData) == null ? void 0 : _a2.mimeType;
       if (!mimeType || !part.inlineData || !DATA_FILE_UTIL_MAP[mimeType]) {
         continue;
       }
@@ -591,9 +689,9 @@ function extractAndReplaceInlineFiles(codeExecutorContext, llmRequest) {
   return allInputFiles;
 }
 function getOrSetExecutionId(invocationContext, codeExecutorContext) {
-  var _a;
+  var _a2;
   const agent = invocationContext.agent;
-  if (!(agent instanceof LlmAgent) || !((_a = agent.codeExecutor) == null ? void 0 : _a.stateful)) {
+  if (!isLlmAgent(agent) || !((_a2 = agent.codeExecutor) == null ? void 0 : _a2.stateful)) {
     return void 0;
   }
   let executionId = codeExecutorContext.getExecutionId();
@@ -611,7 +709,9 @@ async function postProcessCodeExecutionResult(invocationContext, codeExecutorCon
     role: "model",
     parts: [buildCodeExecutionResultPart(codeExecutionResult)]
   };
-  const eventActions = createEventActions({ stateDelta: codeExecutorContext.getStateDelta() });
+  const eventActions = createEventActions({
+    stateDelta: codeExecutorContext.getStateDelta()
+  });
   if (codeExecutionResult.stderr) {
     codeExecutorContext.incrementErrorCount(invocationContext.invocationId);
   } else {
@@ -650,20 +750,23 @@ function getDataFilePreprocessingCode(file) {
     return void 0;
   }
   const varName = getNormalizedFileName(file.name);
-  const loaderCode = DATA_FILE_UTIL_MAP[file.mimeType].loaderCodeTemplate.replace(
-    "{filename}",
-    file.name
-  );
+  const loaderCode = DATA_FILE_UTIL_MAP[file.mimeType].loaderCodeTemplate.replace("{filename}", file.name);
   return "\n".concat(DATA_FILE_HELPER_LIB, "\n\n# Load the dataframe.\n").concat(varName, " = ").concat(loaderCode, "\n\n# Use `explore_df` to guide my analysis.\nexplore_df(").concat(varName, ")\n");
 }
 const CODE_EXECUTION_REQUEST_PROCESSOR = new CodeExecutionRequestProcessor();
-class LlmAgent extends BaseAgent {
+const LLM_AGENT_SIGNATURE_SYMBOL = Symbol.for("google.adk.llmAgent");
+function isLlmAgent(obj) {
+  return typeof obj === "object" && obj !== null && LLM_AGENT_SIGNATURE_SYMBOL in obj && obj[LLM_AGENT_SIGNATURE_SYMBOL] === true;
+}
+class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
   constructor(config) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a2, _b2, _c, _d, _e, _f, _g, _h, _i;
     super(config);
+    /** A unique symbol to identify ADK LLM agent class. */
+    this[_a] = true;
     this.model = config.model;
-    this.instruction = (_a = config.instruction) != null ? _a : "";
-    this.globalInstruction = (_b = config.globalInstruction) != null ? _b : "";
+    this.instruction = (_a2 = config.instruction) != null ? _a2 : "";
+    this.globalInstruction = (_b2 = config.globalInstruction) != null ? _b2 : "";
     this.tools = (_c = config.tools) != null ? _c : [];
     this.generateContentConfig = config.generateContentConfig;
     this.disallowTransferToParent = (_d = config.disallowTransferToParent) != null ? _d : false;
@@ -741,7 +844,7 @@ class LlmAgent extends BaseAgent {
     }
     let ancestorAgent = this.parentAgent;
     while (ancestorAgent) {
-      if (ancestorAgent instanceof LlmAgent) {
+      if (isLlmAgent(ancestorAgent)) {
         return ancestorAgent.canonicalModel;
       }
       ancestorAgent = ancestorAgent.parentAgent;
@@ -749,47 +852,50 @@ class LlmAgent extends BaseAgent {
     throw new Error("No model found for ".concat(this.name, "."));
   }
   /**
-   * The resolved self.instruction field to construct instruction for this
+   * The resolved instruction field to construct instruction for this
    * agent.
    *
    * This method is only for use by Agent Development Kit.
    * @param context The context to retrieve the session state.
-   * @returns The resolved self.instruction field.
+   * @returns The resolved instruction field.
    */
-  async canonicalInstruction(context) {
+  async canonicalInstruction(context2) {
     if (typeof this.instruction === "string") {
       return { instruction: this.instruction, requireStateInjection: true };
     }
     return {
-      instruction: await this.instruction(context),
+      instruction: await this.instruction(context2),
       requireStateInjection: false
     };
   }
   /**
-   * The resolved self.instruction field to construct global instruction.
+   * The resolved globalInstruction field to construct global instruction.
    *
    * This method is only for use by Agent Development Kit.
    * @param context The context to retrieve the session state.
-   * @returns The resolved self.global_instruction field.
+   * @returns The resolved globalInstruction field.
    */
-  async canonicalGlobalInstruction(context) {
+  async canonicalGlobalInstruction(context2) {
     if (typeof this.globalInstruction === "string") {
-      return { instruction: this.globalInstruction, requireStateInjection: true };
+      return {
+        instruction: this.globalInstruction,
+        requireStateInjection: true
+      };
     }
     return {
-      instruction: await this.globalInstruction(context),
+      instruction: await this.globalInstruction(context2),
       requireStateInjection: false
     };
   }
   /**
-   * The resolved self.tools field as a list of BaseTool based on the context.
+   * The resolved tools field as a list of BaseTool based on the context.
    *
    * This method is only for use by Agent Development Kit.
    */
-  async canonicalTools(context) {
+  async canonicalTools(context2) {
     const resolvedTools = [];
     for (const toolUnion of this.tools) {
-      const tools = await convertToolUnionToTools(toolUnion, context);
+      const tools = await convertToolUnionToTools(toolUnion, context2);
       resolvedTools.push(...tools);
     }
     return resolvedTools;
@@ -810,7 +916,7 @@ class LlmAgent extends BaseAgent {
     return [callback];
   }
   /**
-   * The resolved self.before_model_callback field as a list of
+   * The resolved beforeModelCallback field as a list of
    * SingleBeforeModelCallback.
    *
    * This method is only for use by Agent Development Kit.
@@ -819,7 +925,7 @@ class LlmAgent extends BaseAgent {
     return LlmAgent.normalizeCallbackArray(this.beforeModelCallback);
   }
   /**
-   * The resolved self.after_model_callback field as a list of
+   * The resolved afterModelCallback field as a list of
    * SingleAfterModelCallback.
    *
    * This method is only for use by Agent Development Kit.
@@ -828,7 +934,7 @@ class LlmAgent extends BaseAgent {
     return LlmAgent.normalizeCallbackArray(this.afterModelCallback);
   }
   /**
-   * The resolved self.before_tool_callback field as a list of
+   * The resolved beforeToolCallback field as a list of
    * BeforeToolCallback.
    *
    * This method is only for use by Agent Development Kit.
@@ -837,7 +943,7 @@ class LlmAgent extends BaseAgent {
     return LlmAgent.normalizeCallbackArray(this.beforeToolCallback);
   }
   /**
-   * The resolved self.after_tool_callback field as a list of AfterToolCallback.
+   * The resolved afterToolCallback field as a list of AfterToolCallback.
    *
    * This method is only for use by Agent Development Kit.
    */
@@ -854,7 +960,7 @@ class LlmAgent extends BaseAgent {
    * @param event The event to process.
    */
   maybeSaveOutputToState(event) {
-    var _a, _b;
+    var _a2, _b2;
     if (event.author !== this.name) {
       logger.debug(
         "Skipping output save for agent ".concat(this.name, ": event authored by ").concat(event.author)
@@ -873,7 +979,7 @@ class LlmAgent extends BaseAgent {
       );
       return;
     }
-    if (!((_b = (_a = event.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.length)) {
+    if (!((_b2 = (_a2 = event.content) == null ? void 0 : _a2.parts) == null ? void 0 : _b2.length)) {
       logger.debug(
         "Skipping output save for agent ".concat(this.name, ": event content is empty")
       );
@@ -893,12 +999,12 @@ class LlmAgent extends BaseAgent {
     }
     event.actions.stateDelta[this.outputKey] = result;
   }
-  runAsyncImpl(context) {
+  runAsyncImpl(context2) {
     return __asyncGenerator(this, null, function* () {
       while (true) {
         let lastEvent = void 0;
         try {
-          for (var iter = __forAwait(this.runOneStepAsync(context)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+          for (var iter = __forAwait(this.runOneStepAsync(context2)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
             const event = temp.value;
             lastEvent = event;
             this.maybeSaveOutputToState(event);
@@ -924,10 +1030,10 @@ class LlmAgent extends BaseAgent {
       }
     });
   }
-  runLiveImpl(context) {
+  runLiveImpl(context2) {
     return __asyncGenerator(this, null, function* () {
       try {
-        for (var iter = __forAwait(this.runLiveFlow(context)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+        for (var iter = __forAwait(this.runLiveFlow(context2)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
           const event = temp.value;
           this.maybeSaveOutputToState(event);
           yield event;
@@ -942,7 +1048,7 @@ class LlmAgent extends BaseAgent {
             throw error[0];
         }
       }
-      if (context.endInvocation) {
+      if (context2.endInvocation) {
         return;
       }
     });
@@ -950,7 +1056,8 @@ class LlmAgent extends BaseAgent {
   // --------------------------------------------------------------------------
   // #START LlmFlow Logic
   // --------------------------------------------------------------------------
-  runLiveFlow(invocationContext) {
+  // eslint-disable-next-line require-yield
+  runLiveFlow(_invocationContext) {
     return __asyncGenerator(this, null, function* () {
       yield new __await(Promise.resolve());
       throw new Error("LlmAgent.runLiveFlow not implemented");
@@ -965,7 +1072,10 @@ class LlmAgent extends BaseAgent {
       };
       for (const processor of this.requestProcessors) {
         try {
-          for (var iter = __forAwait(processor.runAsync(invocationContext, llmRequest)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+          for (var iter = __forAwait(processor.runAsync(
+            invocationContext,
+            llmRequest
+          )), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
             const event = temp.value;
             yield event;
           }
@@ -998,54 +1108,68 @@ class LlmAgent extends BaseAgent {
         author: this.name,
         branch: invocationContext.branch
       });
-      try {
-        for (var iter3 = __forAwait(this.callLlmAsync(
-          invocationContext,
-          llmRequest,
-          modelResponseEvent
-        )), more3, temp3, error3; more3 = !(temp3 = yield new __await(iter3.next())).done; more3 = false) {
-          const llmResponse = temp3.value;
-          try {
-            for (var iter2 = __forAwait(this.postprocess(
-              invocationContext,
-              llmRequest,
-              llmResponse,
-              modelResponseEvent
-            )), more2, temp2, error2; more2 = !(temp2 = yield new __await(iter2.next())).done; more2 = false) {
-              const event = temp2.value;
-              modelResponseEvent.id = createNewEventId();
-              modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
-              yield event;
-            }
-          } catch (temp2) {
-            error2 = [temp2];
-          } finally {
+      const span = tracer.startSpan("call_llm");
+      const ctx = trace.setSpan(context.active(), span);
+      yield* __yieldStar(runAsyncGeneratorWithOtelContext(
+        ctx,
+        this,
+        function() {
+          return __asyncGenerator(this, null, function* () {
             try {
-              more2 && (temp2 = iter2.return) && (yield new __await(temp2.call(iter2)));
+              for (var iter3 = __forAwait(this.callLlmAsync(
+                invocationContext,
+                llmRequest,
+                modelResponseEvent
+              )), more3, temp3, error3; more3 = !(temp3 = yield new __await(iter3.next())).done; more3 = false) {
+                const llmResponse = temp3.value;
+                try {
+                  for (var iter2 = __forAwait(this.postprocess(
+                    invocationContext,
+                    llmRequest,
+                    llmResponse,
+                    modelResponseEvent
+                  )), more2, temp2, error2; more2 = !(temp2 = yield new __await(iter2.next())).done; more2 = false) {
+                    const event = temp2.value;
+                    modelResponseEvent.id = createNewEventId();
+                    modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
+                    yield event;
+                  }
+                } catch (temp2) {
+                  error2 = [temp2];
+                } finally {
+                  try {
+                    more2 && (temp2 = iter2.return) && (yield new __await(temp2.call(iter2)));
+                  } finally {
+                    if (error2)
+                      throw error2[0];
+                  }
+                }
+              }
+            } catch (temp3) {
+              error3 = [temp3];
             } finally {
-              if (error2)
-                throw error2[0];
+              try {
+                more3 && (temp3 = iter3.return) && (yield new __await(temp3.call(iter3)));
+              } finally {
+                if (error3)
+                  throw error3[0];
+              }
             }
-          }
-        }
-      } catch (temp3) {
-        error3 = [temp3];
-      } finally {
-        try {
-          more3 && (temp3 = iter3.return) && (yield new __await(temp3.call(iter3)));
-        } finally {
-          if (error3)
-            throw error3[0];
+          });
         }
-      }
+      ));
+      span.end();
     });
   }
   postprocess(invocationContext, llmRequest, llmResponse, modelResponseEvent) {
     return __asyncGenerator(this, null, function* () {
-      var _a;
+      var _a2;
       for (const processor of this.responseProcessors) {
         try {
-          for (var iter = __forAwait(processor.runAsync(invocationContext, llmResponse)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+          for (var iter = __forAwait(processor.runAsync(
+            invocationContext,
+            llmResponse
+          )), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
             const event = temp.value;
             yield event;
           }
@@ -1074,7 +1198,7 @@ class LlmAgent extends BaseAgent {
         }
       }
       yield mergedEvent;
-      if (!((_a = getFunctionCalls(mergedEvent)) == null ? void 0 : _a.length)) {
+      if (!((_a2 = getFunctionCalls(mergedEvent)) == null ? void 0 : _a2.length)) {
         return;
       }
       const functionResponseEvent = yield new __await(handleFunctionCallsAsync({
@@ -1087,7 +1211,10 @@ class LlmAgent extends BaseAgent {
       if (!functionResponseEvent) {
         return;
       }
-      const authEvent = generateAuthEvent(invocationContext, functionResponseEvent);
+      const authEvent = generateAuthEvent(
+        invocationContext,
+        functionResponseEvent
+      );
       if (authEvent) {
         yield authEvent;
       }
@@ -1143,7 +1270,7 @@ class LlmAgent extends BaseAgent {
   }
   callLlmAsync(invocationContext, llmRequest, modelResponseEvent) {
     return __asyncGenerator(this, null, function* () {
-      var _a, _b, _c, _d, _e;
+      var _a2, _b2, _c, _d, _e;
       const beforeModelResponse = yield new __await(this.handleBeforeModelCallback(
         invocationContext,
         llmRequest,
@@ -1153,8 +1280,8 @@ class LlmAgent extends BaseAgent {
         yield beforeModelResponse;
         return;
       }
-      (_a = llmRequest.config) != null ? _a : llmRequest.config = {};
-      (_c = (_b = llmRequest.config).labels) != null ? _c : _b.labels = {};
+      (_a2 = llmRequest.config) != null ? _a2 : llmRequest.config = {};
+      (_c = (_b2 = llmRequest.config).labels) != null ? _c : _b2.labels = {};
       if (!llmRequest.config.labels[ADK_AGENT_NAME_LABEL_KEY]) {
         llmRequest.config.labels[ADK_AGENT_NAME_LABEL_KEY] = this.name;
       }
@@ -1176,6 +1303,12 @@ class LlmAgent extends BaseAgent {
             modelResponseEvent
           )), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
             const llmResponse = temp.value;
+            traceCallLlm({
+              invocationContext,
+              eventId: modelResponseEvent.id,
+              llmRequest,
+              llmResponse
+            });
             const alteredLlmResponse = yield new __await(this.handleAfterModelCallback(
               invocationContext,
               llmResponse,
@@ -1197,17 +1330,22 @@ class LlmAgent extends BaseAgent {
     });
   }
   async handleBeforeModelCallback(invocationContext, llmRequest, modelResponseEvent) {
-    const callbackContext = new CallbackContext(
-      { invocationContext, eventActions: modelResponseEvent.actions }
-    );
-    const beforeModelCallbackResponse = await invocationContext.pluginManager.runBeforeModelCallback(
-      { callbackContext, llmRequest }
-    );
+    const callbackContext = new CallbackContext({
+      invocationContext,
+      eventActions: modelResponseEvent.actions
+    });
+    const beforeModelCallbackResponse = await invocationContext.pluginManager.runBeforeModelCallback({
+      callbackContext,
+      llmRequest
+    });
     if (beforeModelCallbackResponse) {
       return beforeModelCallbackResponse;
     }
     for (const callback of this.canonicalBeforeModelCallbacks) {
-      const callbackResponse = await callback({ context: callbackContext, request: llmRequest });
+      const callbackResponse = await callback({
+        context: callbackContext,
+        request: llmRequest
+      });
       if (callbackResponse) {
         return callbackResponse;
       }
@@ -1215,17 +1353,22 @@ class LlmAgent extends BaseAgent {
     return void 0;
   }
   async handleAfterModelCallback(invocationContext, llmResponse, modelResponseEvent) {
-    const callbackContext = new CallbackContext(
-      { invocationContext, eventActions: modelResponseEvent.actions }
-    );
-    const afterModelCallbackResponse = await invocationContext.pluginManager.runAfterModelCallback(
-      { callbackContext, llmResponse }
-    );
+    const callbackContext = new CallbackContext({
+      invocationContext,
+      eventActions: modelResponseEvent.actions
+    });
+    const afterModelCallbackResponse = await invocationContext.pluginManager.runAfterModelCallback({
+      callbackContext,
+      llmResponse
+    });
     if (afterModelCallbackResponse) {
       return afterModelCallbackResponse;
     }
     for (const callback of this.canonicalAfterModelCallbacks) {
-      const callbackResponse = await callback({ context: callbackContext, response: llmResponse });
+      const callbackResponse = await callback({
+        context: callbackContext,
+        response: llmResponse
+      });
       if (callbackResponse) {
         return callbackResponse;
       }
@@ -1251,9 +1394,10 @@ class LlmAgent extends BaseAgent {
           }
         }
       } catch (modelError) {
-        const callbackContext = new CallbackContext(
-          { invocationContext, eventActions: modelResponseEvent.actions }
-        );
+        const callbackContext = new CallbackContext({
+          invocationContext,
+          eventActions: modelResponseEvent.actions
+        });
         if (modelError instanceof Error) {
           const onModelErrorCallbackResponse = yield new __await(invocationContext.pluginManager.runOnModelErrorCallback({
             callbackContext,
@@ -1286,5 +1430,6 @@ class LlmAgent extends BaseAgent {
 export {
   LlmAgent,
   REQUEST_CONFIRMATION_LLM_REQUEST_PROCESSOR,
+  isLlmAgent,
   responseProcessor
 };