@google/adk 2.4.0 → 2.5.0

package/dist/cjs/agents/functions.js

@@ -51,13 +51,14 @@ var import_lodash_es = require("lodash-es");
 var import_event = require("../events/event.js");
 var import_event_actions = require("../events/event_actions.js");
 var import_base_tool = require("../tools/base_tool.js");
+var import_computer_use_tool = require("../tools/computer_use/computer_use_tool.js");
 var import_function_tool = require("../tools/function_tool.js");
 var import_logger = require("../utils/logger.js");
 var import_task = require("../utils/task.js");
 var import_active_streaming_tool = require("./active_streaming_tool.js");
 var import_context = require("./context.js");
 var import_framework_function_calls = require("./framework_function_calls.js");
-var import_tracing = require("../telemetry/tracing.js");
+var import_instrumentation = require("../telemetry/api/instrumentation.js");
 var import_event2 = require("../events/event.js");
 var import_framework_function_calls2 = require("./framework_function_calls.js");
 /**
@@ -165,56 +166,45 @@ function generateRequestConfirmationEvent({
 }
 __name(generateRequestConfirmationEvent, "generateRequestConfirmationEvent");
 async function callToolAsync(tool, args, toolContext) {
-  return import_tracing.tracer.startActiveSpan(`execute_tool ${tool.name}`, async (span) => {
-    try {
+  return (0, import_instrumentation.recordToolExecution)(
+    { tool, args, invocationContext: toolContext.invocationContext },
+    async (scope) => {
       import_logger.logger.debug(`callToolAsync ${tool.name}`);
       const result = await tool.runAsync({ args, toolContext });
-      (0, import_tracing.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) {
-      (0, import_tracing.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 = (0, import_computer_use_tool.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) {
@@ -225,11 +215,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",
@@ -332,38 +322,35 @@ async function answerUnresolvableCall({
   toolsDict,
   toolContext
 }) {
-  return import_tracing.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);
-          import_logger.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 (0, import_instrumentation.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);
+        import_logger.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
+      );
     }
   );
 }
@@ -504,11 +491,11 @@ async function handleFunctionCallList({
       invocationId: invocationContext.invocationId,
       author: toolEventAuthor(invocationContext),
       content: (0, import_genai.createUserContent)({
-        functionResponse: {
+        functionResponse: buildFunctionResponse({
+          tool,
           id: toolContext.functionCallId,
-          name: tool.name,
           response: functionResponse
-        }
+        })
       }),
       actions: toolContext.actions,
       branch: invocationContext.branch
@@ -522,18 +509,8 @@ async function handleFunctionCallList({
     functionResponseEvents
   );
   if (functionResponseEvents.length > 1) {
-    import_tracing.tracer.startActiveSpan("execute_tool (merged)", (span) => {
-      try {
-        import_logger.logger.debug("execute_tool (merged)");
-        (0, import_tracing.traceMergedToolCalls)({
-          responseEventId: mergedEvent.id,
-          functionResponseEvent: mergedEvent,
-          invocationContext
-        });
-      } finally {
-        span.end();
-      }
-    });
+    import_logger.logger.debug("execute_tool (merged)");
+    (0, import_instrumentation.recordMergedToolCalls)({ responseEventId: mergedEvent.id });
   }
   return mergedEvent;
 }

package/dist/cjs/agents/instructions.js

@@ -63,10 +63,13 @@ async function resolveKey(key, isOptional, rawMatch, readonlyContext) {
       }
       throw new Error(`Artifact ${fileName} not found.`);
     }
-    return formatValue((0, import_load_artifacts_tool.asSafePartForLlm)(artifact, fileName), true);
+    return formatValue(
+      (0, import_load_artifacts_tool.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) {
@@ -188,14 +191,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 = [import_state.State.APP_PREFIX, import_state.State.USER_PREFIX, import_state.State.TEMP_PREFIX];

package/dist/cjs/agents/invocation_context.js

@@ -32,7 +32,7 @@ __export(invocation_context_exports, {
   requireAgent: () => requireAgent
 });
 module.exports = __toCommonJS(invocation_context_exports);
-var import_env_aware_utils = require("../utils/env_aware_utils.js");
+var import_id_provider = require("../utils/id_provider.js");
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -141,7 +141,7 @@ const _InvocationContext = class _InvocationContext {
 __name(_InvocationContext, "InvocationContext");
 let InvocationContext = _InvocationContext;
 function newInvocationContextId() {
-  return `e-${(0, import_env_aware_utils.randomUUID)()}`;
+  return `e-${(0, import_id_provider.newId)()}`;
 }
 __name(newInvocationContextId, "newInvocationContextId");
 function requireAgent(ctx) {

package/dist/cjs/agents/llm_agent.js

@@ -30,7 +30,6 @@ __export(llm_agent_exports, {
 });
 module.exports = __toCommonJS(llm_agent_exports);
 var import_genai = require("@google/genai");
-var import_api = require("@opentelemetry/api");
 var import_finish_task_tool = require("../tools/finish_task_tool.js");
 var import_function_tool = require("../tools/function_tool.js");
 var import_async_queue = require("../utils/async_queue.js");
@@ -47,7 +46,7 @@ var import_base_toolset = require("../tools/base_toolset.js");
 var import_logger = require("../utils/logger.js");
 var import_output_schema_utils = require("../utils/output_schema_utils.js");
 var import_context = require("./context.js");
-var import_tracing = require("../telemetry/tracing.js");
+var import_instrumentation = require("../telemetry/api/instrumentation.js");
 var import_schema = require("../utils/schema.js");
 var import_simple_zod_to_json = require("../utils/simple_zod_to_json.js");
 var import_base_agent = require("./base_agent.js");
@@ -104,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 (0, import_event.getFunctionResponses)(functionResponseEvent).some(
+    (response) => !response.id || !Object.hasOwn(awaiting, response.id)
+  );
+}
+__name(hasSettledResponses, "hasSettledResponses");
 const LIVE_KEYS = [
   "responseModalities",
   "speechConfig",
@@ -129,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 ((0, import_base_tool.isBaseTool)(toolUnion)) {
     return [toolUnion];
   }
   if ((0, import_base_node.isBaseNode)(toolUnion)) {
     return [new import_node_tool.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");
@@ -227,7 +233,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
       }
       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 && (0, import_built_in_planner.isBuiltInPlanner)(this.planner) && this.planner.thinkingConfig) {
@@ -288,12 +294,12 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
    * @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
     };
   }
@@ -305,7 +311,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
    * @returns The resolved globalInstruction field.
    * @deprecated Use GlobalInstructionPlugin instead.
    */
-  async canonicalGlobalInstruction(context2) {
+  async canonicalGlobalInstruction(context) {
     if (typeof this.globalInstruction === "string") {
       return {
         instruction: this.globalInstruction,
@@ -313,7 +319,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
       };
     }
     return {
-      instruction: await this.globalInstruction(context2),
+      instruction: await this.globalInstruction(context),
       requireStateInjection: false
     };
   }
@@ -322,10 +328,10 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
    *
    * 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;
@@ -415,7 +421,15 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
       );
       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
+    )) {
+      import_logger.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()) {
@@ -468,14 +482,14 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
   async *runImpl(ctx, nodeInput) {
     yield* (0, import_run_llm_agent_as_node.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;
@@ -501,16 +515,16 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
       }
     }
   }
-  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;
     }
   }
@@ -587,18 +601,14 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
         throw err;
       }
       if (llmRequest.contents.length > 0 && !invocationContext.liveSessionResumptionHandle) {
-        await import_tracing.tracer.startActiveSpan("send_data", async (span) => {
-          try {
-            await connection.sendHistory(llmRequest.contents);
-            (0, import_tracing.traceSendData)({
-              invocationContext,
-              eventId: (0, import_event.createNewEventId)(),
-              data: llmRequest.contents
-            });
-          } finally {
-            span.end();
-          }
-        });
+        await (0, import_instrumentation.recordSendData)(
+          {
+            invocationContext,
+            eventId: (0, import_event.createNewEventId)(),
+            data: llmRequest.contents
+          },
+          () => connection.sendHistory(llmRequest.contents)
+        );
       }
       let sendError;
       const sendAbort = new AbortController();
@@ -976,57 +986,45 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
     if (invocationContext.endInvocation || ((_d = invocationContext.abortSignal) == null ? void 0 : _d.aborted)) {
       return;
     }
-    const span = import_tracing.tracer.startSpan("call_llm");
-    const ctx = import_api.trace.setSpan(import_api.context.active(), span);
-    try {
-      yield* (0, import_tracing.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) && (0, import_event.isEvent)(llmResponse)) {
-                modelResponseEvent.id = (0, import_event.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 = (0, import_event.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) && (0, import_event.isEvent)(llmResponse)) {
+          modelResponseEvent.id = (0, import_event.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 = (0, import_event.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;
@@ -1069,6 +1067,9 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
     if (!((_c = (0, import_event.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;
@@ -1115,6 +1116,15 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
       functionResponseEvent
     });
     if (toolConfirmationEvent) {
+      if (hasSettledResponses(functionResponseEvent)) {
+        const { requestedToolConfirmations, skipSummarization, ...settled } = functionResponseEvent.actions;
+        functionResponseEvent.actions = (0, import_event_actions.createEventActions)(settled);
+        toolConfirmationEvent.actions = (0, import_event_actions.createEventActions)({
+          requestedToolConfirmations,
+          skipSummarization
+        });
+        yield functionResponseEvent;
+      }
       yield toolConfirmationEvent;
       invocationContext.endInvocation = true;
       return;
@@ -1152,7 +1162,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
     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,
@@ -1200,20 +1210,20 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
         liveRequestQueue.close();
       }
     } else {
-      const responsesGenerator = llm.generateContentAsync(
-        llmRequest,
-        /* stream= */
-        ((_i = invocationContext.runConfig) == null ? void 0 : _i.streamingMode) === import_run_config.StreamingMode.SSE,
-        invocationContext.abortSignal
+      const responsesGenerator = (0, import_instrumentation.recordInference)(
+        { invocationContext, llmRequest, modelResponseEvent },
+        () => {
+          var _a3;
+          return llm.generateContentAsync(
+            llmRequest,
+            /* stream= */
+            ((_a3 = invocationContext.runConfig) == null ? void 0 : _a3.streamingMode) === import_run_config.StreamingMode.SSE,
+            invocationContext.abortSignal
+          );
+        }
       );
       for await (const llmResponse of responsesGenerator) {
-        (0, import_tracing.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(
@@ -1221,7 +1231,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
           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;