@google/adk 2.4.0 → 2.5.0

package/dist/esm/agents/functions.js

@@ -8,7 +8,9 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a, _b;
-import { createUserContent } from "@google/genai";
+import {
+  createUserContent
+} from "@google/genai";
 import { isEmpty } from "lodash-es";
 import {
   createEvent,
@@ -21,6 +23,7 @@ import {
   mergeEventActions
 } from "../events/event_actions.js";
 import { BaseTool } from "../tools/base_tool.js";
+import { isComputerUseTool } from "../tools/computer_use/computer_use_tool.js";
 import { isFunctionTool } from "../tools/function_tool.js";
 import { logger } from "../utils/logger.js";
 import { Task } from "../utils/task.js";
@@ -31,10 +34,9 @@ import {
   REQUEST_CREDENTIAL_FUNCTION_CALL_NAME
 } from "./framework_function_calls.js";
 import {
-  traceMergedToolCalls,
-  tracer,
-  traceToolCall
-} from "../telemetry/tracing.js";
+  recordMergedToolCalls,
+  recordToolExecution
+} from "../telemetry/api/instrumentation.js";
 function toolEventAuthor(invocationContext) {
   var _a2, _b2;
   return (_b2 = (_a2 = invocationContext.agent) == null ? void 0 : _a2.name) != null ? _b2 : "";
@@ -145,56 +147,45 @@ function generateRequestConfirmationEvent({
 }
 __name(generateRequestConfirmationEvent, "generateRequestConfirmationEvent");
 async function callToolAsync(tool, args, toolContext) {
-  return tracer.startActiveSpan(`execute_tool ${tool.name}`, async (span) => {
-    try {
+  return recordToolExecution(
+    { tool, args, invocationContext: toolContext.invocationContext },
+    async (scope) => {
       logger.debug(`callToolAsync ${tool.name}`);
       const result = await tool.runAsync({ args, toolContext });
-      traceToolCall({
-        tool,
-        args,
-        span,
+      scope.recordSuccess({
         functionResponseEvent: buildResponseEvent(
           tool,
           result,
           toolContext,
           toolContext.invocationContext
         ),
-        errorType: getToolResponseErrorType(result),
-        invocationContext: toolContext.invocationContext
+        rawResult: result
       });
       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;
+const BASE64 = /^[A-Za-z0-9+/]*={0,2}$/;
+function buildFunctionResponse({
+  tool,
+  id,
+  response
+}) {
+  const image = isComputerUseTool(tool) ? response == null ? void 0 : response["image"] : void 0;
+  if (typeof image !== "object" || image === null || !("data" in image) || !("mimetype" in image) || typeof image.data !== "string" || typeof image.mimetype !== "string" || !BASE64.test(image.data)) {
+    return { id, name: tool.name, response };
   }
+  const rest = { ...response };
+  delete rest["image"];
+  return {
+    id,
+    name: tool.name,
+    response: rest,
+    parts: [{ inlineData: { data: image.data, mimeType: image.mimetype } }]
+  };
 }
-__name(getToolResponseErrorType, "getToolResponseErrorType");
+__name(buildFunctionResponse, "buildFunctionResponse");
 function buildResponseEvent(tool, functionResult, toolContext, invocationContext) {
   let responseResult;
   if (typeof functionResult !== "object" || functionResult == null) {
@@ -205,11 +196,11 @@ function buildResponseEvent(tool, functionResult, toolContext, invocationContext
     responseResult = functionResult;
   }
   const partFunctionResponse = {
-    functionResponse: {
-      name: tool.name,
-      response: responseResult,
-      id: toolContext.functionCallId
-    }
+    functionResponse: buildFunctionResponse({
+      tool,
+      id: toolContext.functionCallId,
+      response: responseResult
+    })
   };
   const content = {
     role: "user",
@@ -312,38 +303,35 @@ async function answerUnresolvableCall({
   toolsDict,
   toolContext
 }) {
-  return tracer.startActiveSpan(
-    `execute_tool ${functionCall.name || "<unnamed>"}`,
-    async (span) => {
-      var _a2, _b2;
-      try {
-        const toolName = functionCall.name || "<unnamed>";
-        const error = new Error(
-          `Function ${toolName} is not found in the toolsDict.`
-        );
-        const tool = new ToolNotFoundPlaceholder(toolName, error);
-        const onToolErrorResponse = await invocationContext.pluginManager.runOnToolErrorCallback({
-          tool,
-          toolArgs: (_a2 = functionCall.args) != null ? _a2 : {},
-          toolContext,
-          error
-        });
-        if (onToolErrorResponse == null) {
-          const callableTools = Object.keys(toolsDict);
-          logger.warn(
-            `Could not resolve tool '${toolName}' for function call '${(_b2 = functionCall.id) != null ? _b2 : ""}'. Callable tools: ${callableTools.length ? callableTools.join(", ") : "(none)"}.
+  var _a2;
+  const toolName = functionCall.name || "<unnamed>";
+  const error = new Error(
+    `Function ${toolName} is not found in the toolsDict.`
+  );
+  const tool = new ToolNotFoundPlaceholder(toolName, error);
+  return recordToolExecution(
+    { tool, args: (_a2 = functionCall.args) != null ? _a2 : {}, invocationContext },
+    async () => {
+      var _a3, _b2;
+      const onToolErrorResponse = await invocationContext.pluginManager.runOnToolErrorCallback({
+        tool,
+        toolArgs: (_a3 = functionCall.args) != null ? _a3 : {},
+        toolContext,
+        error
+      });
+      if (onToolErrorResponse == null) {
+        const callableTools = Object.keys(toolsDict);
+        logger.warn(
+          `Could not resolve tool '${toolName}' for function call '${(_b2 = functionCall.id) != null ? _b2 : ""}'. Callable tools: ${callableTools.length ? callableTools.join(", ") : "(none)"}.
 ` + RESOLUTION_FAILURE_CAUSES
-          );
-        }
-        return buildResponseEvent(
-          tool,
-          onToolErrorResponse != null ? onToolErrorResponse : { error: error.message },
-          toolContext,
-          invocationContext
         );
-      } finally {
-        span.end();
       }
+      return buildResponseEvent(
+        tool,
+        onToolErrorResponse != null ? onToolErrorResponse : { error: error.message },
+        toolContext,
+        invocationContext
+      );
     }
   );
 }
@@ -484,11 +472,11 @@ async function handleFunctionCallList({
       invocationId: invocationContext.invocationId,
       author: toolEventAuthor(invocationContext),
       content: createUserContent({
-        functionResponse: {
+        functionResponse: buildFunctionResponse({
+          tool,
           id: toolContext.functionCallId,
-          name: tool.name,
           response: functionResponse
-        }
+        })
       }),
       actions: toolContext.actions,
       branch: invocationContext.branch
@@ -502,18 +490,8 @@ async function handleFunctionCallList({
     functionResponseEvents
   );
   if (functionResponseEvents.length > 1) {
-    tracer.startActiveSpan("execute_tool (merged)", (span) => {
-      try {
-        logger.debug("execute_tool (merged)");
-        traceMergedToolCalls({
-          responseEventId: mergedEvent.id,
-          functionResponseEvent: mergedEvent,
-          invocationContext
-        });
-      } finally {
-        span.end();
-      }
-    });
+    logger.debug("execute_tool (merged)");
+    recordMergedToolCalls({ responseEventId: mergedEvent.id });
   }
   return mergedEvent;
 }

package/dist/esm/agents/instructions.js

@@ -37,10 +37,13 @@ async function resolveKey(key, isOptional, rawMatch, readonlyContext) {
       }
       throw new Error(`Artifact ${fileName} not found.`);
     }
-    return formatValue(asSafePartForLlm(artifact, fileName), true);
+    return formatValue(
+      asSafePartForLlm(artifact, fileName, { inlineMediaAsPlaceholder: true }),
+      true
+    );
   }
   if (isValidStateName(key)) {
-    if (key in invocationContext.session.state) {
+    if (Object.hasOwn(invocationContext.session.state, key)) {
       return formatValue(invocationContext.session.state[key], false);
     }
     if (isOptional) {
@@ -162,14 +165,12 @@ async function injectSessionState(template, readonlyContext) {
   return result.join("");
 }
 __name(injectSessionState, "injectSessionState");
-const isIdentifierPattern = /* @__PURE__ */ (() => {
-  return /^[a-zA-Z_][a-zA-Z0-9_]*$/;
-})();
+const IDENTIFIER_PATTERN = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 function isIdentifier(s) {
   if (s === "" || s === void 0) {
     return false;
   }
-  return isIdentifierPattern.test(s);
+  return IDENTIFIER_PATTERN.test(s);
 }
 __name(isIdentifier, "isIdentifier");
 const VALID_PREFIXES = [State.APP_PREFIX, State.USER_PREFIX, State.TEMP_PREFIX];

package/dist/esm/agents/invocation_context.js

@@ -8,7 +8,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a, _b;
-import { randomUUID } from "../utils/env_aware_utils.js";
+import { newId } from "../utils/id_provider.js";
 const LLM_CALLS_LIMIT_EXCEEDED_ERROR_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for(
   "google.adk.llmCallsLimitExceededError"
 );
@@ -111,7 +111,7 @@ const _InvocationContext = class _InvocationContext {
 __name(_InvocationContext, "InvocationContext");
 let InvocationContext = _InvocationContext;
 function newInvocationContextId() {
-  return `e-${randomUUID()}`;
+  return `e-${newId()}`;
 }
 __name(newInvocationContextId, "newInvocationContextId");
 function requireAgent(ctx) {

package/dist/esm/agents/llm_agent.js

@@ -9,7 +9,6 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  */
 var _a, _b;
 import { Modality } from "@google/genai";
-import { context, trace } from "@opentelemetry/api";
 import { FinishTaskTool } from "../tools/finish_task_tool.js";
 import { FunctionTool } from "../tools/function_tool.js";
 import { AsyncQueue } from "../utils/async_queue.js";
@@ -26,7 +25,10 @@ import {
   isFinalResponse,
   populateClientFunctionCallId
 } from "../events/event.js";
-import { isDefaultEventActions } from "../events/event_actions.js";
+import {
+  createEventActions,
+  isDefaultEventActions
+} from "../events/event_actions.js";
 import { isBaseLlm } from "../models/base_llm.js";
 import { LLMRegistry } from "../models/registry.js";
 import { isBuiltInPlanner } from "../planners/built_in_planner.js";
@@ -36,11 +38,9 @@ import { logger } from "../utils/logger.js";
 import { canUseOutputSchemaWithTools } from "../utils/output_schema_utils.js";
 import { Context } from "./context.js";
 import {
-  runAsyncGeneratorWithOtelContext,
-  traceCallLlm,
-  tracer,
-  traceSendData
-} from "../telemetry/tracing.js";
+  recordInference,
+  recordSendData
+} from "../telemetry/api/instrumentation.js";
 import { parseWithSchema } from "../utils/schema.js";
 import { isZodObject, zodObjectToSchema } from "../utils/simple_zod_to_json.js";
 import { BaseAgent } from "./base_agent.js";
@@ -103,6 +103,13 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 __name(sleep, "sleep");
+function hasSettledResponses(functionResponseEvent) {
+  const awaiting = functionResponseEvent.actions.requestedToolConfirmations;
+  return getFunctionResponses(functionResponseEvent).some(
+    (response) => !response.id || !Object.hasOwn(awaiting, response.id)
+  );
+}
+__name(hasSettledResponses, "hasSettledResponses");
 const LIVE_KEYS = [
   "responseModalities",
   "speechConfig",
@@ -128,14 +135,14 @@ function applyLiveRunConfig(runConfig, llmRequest) {
 }
 __name(applyLiveRunConfig, "applyLiveRunConfig");
 const ADK_AGENT_NAME_LABEL_KEY = "adk_agent_name";
-async function convertToolUnionToTools(toolUnion, context2) {
+async function convertToolUnionToTools(toolUnion, context) {
   if (isBaseTool(toolUnion)) {
     return [toolUnion];
   }
   if (isBaseNode(toolUnion)) {
     return [new NodeTool(toolUnion)];
   }
-  return await toolUnion.getTools(context2);
+  return await toolUnion.getTools(context);
 }
 __name(convertToolUnionToTools, "convertToolUnionToTools");
 const LLM_AGENT_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.llmAgent");
@@ -226,7 +233,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
       }
       if (config.generateContentConfig.responseSchema) {
         throw new Error(
-          "Response schema must be set via LlmAgent.output_schema."
+          "Response schema must be set via LlmAgent.outputSchema."
         );
       }
       if (config.generateContentConfig.thinkingConfig && isBuiltInPlanner(this.planner) && this.planner.thinkingConfig) {
@@ -287,12 +294,12 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
    * @param context The context to retrieve the session state.
    * @returns The resolved instruction field.
    */
-  async canonicalInstruction(context2) {
+  async canonicalInstruction(context) {
     if (typeof this.instruction === "string") {
       return { instruction: this.instruction, requireStateInjection: true };
     }
     return {
-      instruction: await this.instruction(context2),
+      instruction: await this.instruction(context),
       requireStateInjection: false
     };
   }
@@ -304,7 +311,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
    * @returns The resolved globalInstruction field.
    * @deprecated Use GlobalInstructionPlugin instead.
    */
-  async canonicalGlobalInstruction(context2) {
+  async canonicalGlobalInstruction(context) {
     if (typeof this.globalInstruction === "string") {
       return {
         instruction: this.globalInstruction,
@@ -312,7 +319,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
       };
     }
     return {
-      instruction: await this.globalInstruction(context2),
+      instruction: await this.globalInstruction(context),
       requireStateInjection: false
     };
   }
@@ -321,10 +328,10 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
    *
    * This method is only for use by Agent Development Kit.
    */
-  async canonicalTools(context2) {
+  async canonicalTools(context) {
     const resolvedTools = [];
     for (const toolUnion of this.tools) {
-      const tools = await convertToolUnionToTools(toolUnion, context2);
+      const tools = await convertToolUnionToTools(toolUnion, context);
       resolvedTools.push(...tools);
     }
     return resolvedTools;
@@ -414,7 +421,15 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
       );
       return;
     }
-    const resultStr = event.content.parts.map((part) => part.text ? part.text : "").join("");
+    if (!event.content.parts.some(
+      (part) => part.text !== void 0 && !part.thought
+    )) {
+      logger.debug(
+        `Skipping output save for agent ${this.name}: event has no text`
+      );
+      return;
+    }
+    const resultStr = event.content.parts.filter((part) => !part.thought).map((part) => part.text ? part.text : "").join("");
     let result = resultStr;
     if (this.outputSchema) {
       if (!resultStr.trim()) {
@@ -467,14 +482,14 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
   async *runImpl(ctx, nodeInput) {
     yield* runLlmAgentAsNode(this, ctx, nodeInput);
   }
-  async *runAsyncImpl(context2) {
+  async *runAsyncImpl(context) {
     var _a2, _b2;
     while (true) {
       let lastEvent = void 0;
       let stepHadToolCalls = false;
       let stepTransferred = false;
-      for await (const event of this.runOneStepAsync(context2)) {
-        if ((_a2 = context2.abortSignal) == null ? void 0 : _a2.aborted) {
+      for await (const event of this.runOneStepAsync(context)) {
+        if ((_a2 = context.abortSignal) == null ? void 0 : _a2.aborted) {
           return;
         }
         lastEvent = event;
@@ -500,16 +515,16 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
       }
     }
   }
-  async *runLiveImpl(context2) {
+  async *runLiveImpl(context) {
     var _a2;
-    for await (const event of this.runLiveFlow(context2)) {
-      if ((_a2 = context2.abortSignal) == null ? void 0 : _a2.aborted) {
+    for await (const event of this.runLiveFlow(context)) {
+      if ((_a2 = context.abortSignal) == null ? void 0 : _a2.aborted) {
         return;
       }
       this.maybeSaveOutputToState(event);
       yield event;
     }
-    if (context2.endInvocation) {
+    if (context.endInvocation) {
       return;
     }
   }
@@ -586,18 +601,14 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
         throw err;
       }
       if (llmRequest.contents.length > 0 && !invocationContext.liveSessionResumptionHandle) {
-        await tracer.startActiveSpan("send_data", async (span) => {
-          try {
-            await connection.sendHistory(llmRequest.contents);
-            traceSendData({
-              invocationContext,
-              eventId: createNewEventId(),
-              data: llmRequest.contents
-            });
-          } finally {
-            span.end();
-          }
-        });
+        await recordSendData(
+          {
+            invocationContext,
+            eventId: createNewEventId(),
+            data: llmRequest.contents
+          },
+          () => connection.sendHistory(llmRequest.contents)
+        );
       }
       let sendError;
       const sendAbort = new AbortController();
@@ -975,57 +986,45 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
     if (invocationContext.endInvocation || ((_d = invocationContext.abortSignal) == null ? void 0 : _d.aborted)) {
       return;
     }
-    const span = tracer.startSpan("call_llm");
-    const ctx = trace.setSpan(context.active(), span);
-    try {
-      yield* runAsyncGeneratorWithOtelContext(
-        ctx,
-        this,
-        async function* () {
-          const responsesGenerator = /* @__PURE__ */ __name(async function* () {
-            var _a3, _b3, _c2;
-            for await (const llmResponse of this.callLlmAsync(
-              invocationContext,
-              llmRequest,
-              modelResponseEvent
-            )) {
-              if ((_a3 = invocationContext.abortSignal) == null ? void 0 : _a3.aborted) {
-                return;
-              }
-              if (((_b3 = invocationContext.runConfig) == null ? void 0 : _b3.supportCfc) && isEvent(llmResponse)) {
-                modelResponseEvent.id = createNewEventId();
-                modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
-                yield llmResponse;
-                continue;
-              }
-              for await (const event of this.postprocess(
-                invocationContext,
-                llmRequest,
-                llmResponse,
-                modelResponseEvent
-              )) {
-                if ((_c2 = invocationContext.abortSignal) == null ? void 0 : _c2.aborted) {
-                  return;
-                }
-                if (!event.partial) {
-                  modelResponseEvent.id = createNewEventId();
-                  modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
-                }
-                yield event;
-              }
-            }
-          }, "responsesGenerator");
-          yield* this.runAndHandleError(
-            responsesGenerator.call(this),
-            invocationContext,
-            llmRequest,
-            modelResponseEvent
-          );
+    const responsesGenerator = /* @__PURE__ */ __name(async function* () {
+      var _a3, _b3, _c2;
+      for await (const llmResponse of this.callLlmAsync(
+        invocationContext,
+        llmRequest,
+        modelResponseEvent
+      )) {
+        if ((_a3 = invocationContext.abortSignal) == null ? void 0 : _a3.aborted) {
+          return;
         }
-      );
-    } finally {
-      span.end();
-    }
+        if (((_b3 = invocationContext.runConfig) == null ? void 0 : _b3.supportCfc) && isEvent(llmResponse)) {
+          modelResponseEvent.id = createNewEventId();
+          modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
+          yield llmResponse;
+          continue;
+        }
+        for await (const event of this.postprocess(
+          invocationContext,
+          llmRequest,
+          llmResponse,
+          modelResponseEvent
+        )) {
+          if ((_c2 = invocationContext.abortSignal) == null ? void 0 : _c2.aborted) {
+            return;
+          }
+          if (!event.partial) {
+            modelResponseEvent.id = createNewEventId();
+            modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
+          }
+          yield event;
+        }
+      }
+    }, "responsesGenerator");
+    yield* this.runAndHandleError(
+      responsesGenerator.call(this),
+      invocationContext,
+      llmRequest,
+      modelResponseEvent
+    );
   }
   async *postprocess(invocationContext, llmRequest, llmResponse, modelResponseEvent) {
     var _a2, _b2, _c, _d, _e, _f;
@@ -1068,6 +1067,9 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
     if (!((_c = getFunctionCalls(mergedEvent)) == null ? void 0 : _c.length)) {
       return;
     }
+    if (mergedEvent.partial) {
+      return;
+    }
     if ((_d = invocationContext.runConfig) == null ? void 0 : _d.pauseOnToolCalls) {
       invocationContext.endInvocation = true;
       return;
@@ -1114,6 +1116,15 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
       functionResponseEvent
     });
     if (toolConfirmationEvent) {
+      if (hasSettledResponses(functionResponseEvent)) {
+        const { requestedToolConfirmations, skipSummarization, ...settled } = functionResponseEvent.actions;
+        functionResponseEvent.actions = createEventActions(settled);
+        toolConfirmationEvent.actions = createEventActions({
+          requestedToolConfirmations,
+          skipSummarization
+        });
+        yield functionResponseEvent;
+      }
       yield toolConfirmationEvent;
       invocationContext.endInvocation = true;
       return;
@@ -1151,7 +1162,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
     return agentToRun;
   }
   async *callLlmAsync(invocationContext, llmRequest, modelResponseEvent) {
-    var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j;
     const beforeModelResponse = await this.handleBeforeModelCallback(
       invocationContext,
       llmRequest,
@@ -1199,20 +1210,20 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
         liveRequestQueue.close();
       }
     } else {
-      const responsesGenerator = llm.generateContentAsync(
-        llmRequest,
-        /* stream= */
-        ((_i = invocationContext.runConfig) == null ? void 0 : _i.streamingMode) === StreamingMode.SSE,
-        invocationContext.abortSignal
+      const responsesGenerator = recordInference(
+        { invocationContext, llmRequest, modelResponseEvent },
+        () => {
+          var _a3;
+          return llm.generateContentAsync(
+            llmRequest,
+            /* stream= */
+            ((_a3 = invocationContext.runConfig) == null ? void 0 : _a3.streamingMode) === StreamingMode.SSE,
+            invocationContext.abortSignal
+          );
+        }
       );
       for await (const llmResponse of responsesGenerator) {
-        traceCallLlm({
-          invocationContext,
-          eventId: modelResponseEvent.id,
-          llmRequest,
-          llmResponse
-        });
-        if ((_j = invocationContext.abortSignal) == null ? void 0 : _j.aborted) {
+        if ((_i = invocationContext.abortSignal) == null ? void 0 : _i.aborted) {
           return;
         }
         const alteredLlmResponse = await this.handleAfterModelCallback(
@@ -1220,7 +1231,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
           llmResponse,
           modelResponseEvent
         );
-        if ((_k = invocationContext.abortSignal) == null ? void 0 : _k.aborted) {
+        if ((_j = invocationContext.abortSignal) == null ? void 0 : _j.aborted) {
           return;
         }
         yield alteredLlmResponse != null ? alteredLlmResponse : llmResponse;