@google/adk 2.3.0 → 2.5.0

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");
@@ -43,10 +42,11 @@ var import_base_llm = require("../models/base_llm.js");
 var import_registry = require("../models/registry.js");
 var import_built_in_planner = require("../planners/built_in_planner.js");
 var import_base_tool = require("../tools/base_tool.js");
+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");
@@ -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 (0, import_event.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 ((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");
@@ -226,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) {
@@ -287,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
     };
   }
@@ -304,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,
@@ -312,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
     };
   }
@@ -321,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;
@@ -414,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()) {
@@ -467,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;
@@ -500,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;
     }
   }
@@ -586,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();
@@ -658,7 +669,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
     }
   }
   async *runLivePreprocess(invocationContext, llmRequest) {
-    var _a2, _b2;
+    var _a2, _b2, _c;
     for (const processor of this.requestProcessors) {
       for await (const event of processor.runAsync(
         invocationContext,
@@ -672,6 +683,12 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
     }
     for (const toolUnion of this.tools) {
       const toolContext = new import_context.Context({ invocationContext });
+      if ((0, import_base_toolset.isBaseToolset)(toolUnion)) {
+        await toolUnion.processLlmRequest(toolContext, llmRequest);
+        if ((_b2 = invocationContext.abortSignal) == null ? void 0 : _b2.aborted) {
+          return;
+        }
+      }
       const tools = (await convertToolUnionToTools(
         toolUnion,
         new import_readonly_context.ReadonlyContext(invocationContext)
@@ -680,7 +697,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
       );
       for (const tool of tools) {
         await tool.processLlmRequest({ toolContext, llmRequest });
-        if ((_b2 = invocationContext.abortSignal) == null ? void 0 : _b2.aborted) {
+        if ((_c = invocationContext.abortSignal) == null ? void 0 : _c.aborted) {
           return;
         }
       }
@@ -903,7 +920,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
     yield functionResponseEvent;
   }
   async *runOneStepAsync(invocationContext) {
-    var _a2, _b2, _c;
+    var _a2, _b2, _c, _d;
     const llmRequest = {
       contents: [],
       toolsDict: {},
@@ -923,7 +940,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
     const allTools = [...this.tools];
     if (this.mode === "task") {
       allTools.push(this.finishTaskTool);
-    } else if (this.outputSchema && allTools.length > 0 && !(0, import_output_schema_utils.canUseOutputSchemaWithTools)(this.canonicalModel.model)) {
+    } else if (this.outputSchema && allTools.length > 0 && !(0, import_output_schema_utils.canUseOutputSchemaWithTools)(this.canonicalModel)) {
       const setModelResponseTool = new import_function_tool.FunctionTool({
         name: "set_model_response",
         description: "Call this tool to submit your final response conforming to the output schema. Use this tool only when you have collected all the information and are ready to return the final answer.",
@@ -947,6 +964,12 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
         invocationContext,
         eventActions: modelResponseEvent.actions
       });
+      if ((0, import_base_toolset.isBaseToolset)(toolUnion)) {
+        await toolUnion.processLlmRequest(toolContext, llmRequest);
+        if ((_b2 = invocationContext.abortSignal) == null ? void 0 : _b2.aborted) {
+          return;
+        }
+      }
       const tools = (await convertToolUnionToTools(
         toolUnion,
         new import_readonly_context.ReadonlyContext(invocationContext)
@@ -955,65 +978,53 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
       });
       for (const tool of tools) {
         await tool.processLlmRequest({ toolContext, llmRequest });
-        if ((_b2 = invocationContext.abortSignal) == null ? void 0 : _b2.aborted) {
+        if ((_c = invocationContext.abortSignal) == null ? void 0 : _c.aborted) {
           return;
         }
       }
     }
-    if (invocationContext.endInvocation || ((_c = invocationContext.abortSignal) == null ? void 0 : _c.aborted)) {
+    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;
@@ -1056,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;
@@ -1102,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;
@@ -1139,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,
@@ -1187,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(
@@ -1208,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;

package/dist/cjs/agents/processors/basic_llm_request_processor.js

@@ -55,7 +55,7 @@ const _BasicLlmRequestProcessor = class _BasicLlmRequestProcessor extends import
     }
     llmRequest.model = agent.canonicalModel.model;
     llmRequest.config = { ...(_a = agent.generateContentConfig) != null ? _a : {} };
-    if (agent.outputSchema && agent.mode !== "task" && (!((_b = agent.tools) == null ? void 0 : _b.length) || (0, import_output_schema_utils.canUseOutputSchemaWithTools)(agent.canonicalModel.model))) {
+    if (agent.outputSchema && agent.mode !== "task" && (!((_b = agent.tools) == null ? void 0 : _b.length) || (0, import_output_schema_utils.canUseOutputSchemaWithTools)(agent.canonicalModel))) {
       (0, import_llm_request.setOutputSchema)(llmRequest, agent.outputSchema);
     }
     if (invocationContext.runConfig) {

package/dist/cjs/agents/processors/code_execution_request_processor.js

@@ -83,6 +83,14 @@ const DATA_FILE_UTIL_MAP = {
 const DATA_FILE_HELPER_LIB = `
 import pandas as pd
 
+def crop(s: str, max_chars: int = 64) -> str:
+  """Crops a string to max_chars characters."""
+  if len(s) <= max_chars:
+    return s
+  if max_chars >= 3:
+    return s[:max_chars - 3] + '...'
+  return s[:max_chars]
+
 def explore_df(df: pd.DataFrame) -> None:
   """Prints some information about a pandas DataFrame."""
 

package/dist/cjs/agents/processors/content_processor_utils.js

@@ -56,7 +56,7 @@ function removeClientFunctionCallId(content) {
   }
 }
 __name(removeClientFunctionCallId, "removeClientFunctionCallId");
-function getContents(events, agentName, currentBranch, currentIsolationScope) {
+function getContents(events, agentName, currentBranch, currentIsolationScope, preserveFunctionCallIds = false) {
   const filteredEvents = [];
   for (const event of events) {
     if (!(0, import_compaction_utils.isEventVisibleInIsolationScope)(event, currentIsolationScope)) {
@@ -69,16 +69,23 @@ function getContents(events, agentName, currentBranch, currentIsolationScope) {
     if (!shouldIncludeEventInContext(event, currentBranch, currentIsolationScope)) {
       continue;
     }
-    filteredEvents.push(
-      isEventFromAnotherAgent(agentName, event) ? convertForeignEvent(event) : event
-    );
+    if (isEventFromAnotherAgent(agentName, event)) {
+      const converted = convertForeignEvent(event);
+      if (converted) {
+        filteredEvents.push(converted);
+      }
+    } else {
+      filteredEvents.push(event);
+    }
   }
   let resultEvents = rearrangeEventsForLatestFunctionResponse(filteredEvents);
   resultEvents = rearrangeEventsForAsyncFunctionResponsesInHistory(resultEvents);
   const contents = [];
   for (const event of resultEvents) {
     const content = (0, import_lodash_es.cloneDeep)(event.content);
-    removeClientFunctionCallId(content);
+    if (!preserveFunctionCallIds) {
+      removeClientFunctionCallId(content);
+    }
     contents.push(content);
   }
   return contents;
@@ -111,18 +118,20 @@ function isRequestInputEvent(event) {
   return false;
 }
 __name(isRequestInputEvent, "isRequestInputEvent");
-function getCurrentTurnContents(events, agentName, currentBranch, currentIsolationScope) {
+function getCurrentTurnContents(events, agentName, currentBranch, currentIsolationScope, preserveFunctionCallIds = false) {
+  var _a;
   for (let i = events.length - 1; i >= 0; i--) {
     const event = events[i];
     if (!shouldIncludeEventInContext(event, currentBranch, currentIsolationScope)) {
       continue;
     }
-    if (event.author === "user" || isEventFromAnotherAgent(agentName, event)) {
+    if (event.author === "user" || isEventFromAnotherAgent(agentName, event) && ((_a = event.content.parts) == null ? void 0 : _a.some(isVisibleForeignPart))) {
       return getContents(
         events.slice(turnStart(events, i)),
         agentName,
         currentBranch,
-        currentIsolationScope
+        currentIsolationScope,
+        preserveFunctionCallIds
       );
     }
   }
@@ -187,8 +196,37 @@ function isEventFromAnotherAgent(agentName, event) {
   return !!agentName && event.author !== agentName && event.author !== "user";
 }
 __name(isEventFromAnotherAgent, "isEventFromAnotherAgent");
+function withoutTextAndThought(part) {
+  const {
+    text: _text,
+    thought: _thought,
+    thoughtSignature: _thoughtSignature,
+    ...rest
+  } = part;
+  return rest;
+}
+__name(withoutTextAndThought, "withoutTextAndThought");
+function hasNonTextPayload(part) {
+  return Object.values(withoutTextAndThought(part)).some(
+    (v) => v !== void 0
+  );
+}
+__name(hasNonTextPayload, "hasNonTextPayload");
+function isVisibleForeignPart(part) {
+  if (part.functionCall || part.functionResponse) {
+    return true;
+  }
+  if (part.thought) {
+    return false;
+  }
+  if (part.text) {
+    return true;
+  }
+  return hasNonTextPayload(part);
+}
+__name(isVisibleForeignPart, "isVisibleForeignPart");
 function convertForeignEvent(event) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   if (!((_b = (_a = event.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.length)) {
     return event;
   }
@@ -201,26 +239,43 @@ function convertForeignEvent(event) {
     ]
   };
   for (const part of event.content.parts) {
-    if (part.text && !part.thought) {
-      (_c = content.parts) == null ? void 0 : _c.push({
-        text: `[${event.author}] said: ${part.text}`
-      });
-    } else if (part.functionCall) {
+    if (!isVisibleForeignPart(part)) {
+      continue;
+    }
+    if (part.functionCall) {
+      if (!part.thought && part.text) {
+        (_c = content.parts) == null ? void 0 : _c.push({
+          text: `[${event.author}] said: ${part.text}`
+        });
+      }
       (_d = content.parts) == null ? void 0 : _d.push({
         text: `[${event.author}] called tool \`${part.functionCall.name}\` with parameters: ${safeStringify(
           part.functionCall.args
         )}`
       });
     } else if (part.functionResponse) {
-      (_e = content.parts) == null ? void 0 : _e.push({
+      if (!part.thought && part.text) {
+        (_e = content.parts) == null ? void 0 : _e.push({
+          text: `[${event.author}] said: ${part.text}`
+        });
+      }
+      (_f = content.parts) == null ? void 0 : _f.push({
         text: `[${event.author}] tool \`${part.functionResponse.name}\` returned result: ${safeStringify(
           part.functionResponse.response
         )}`
       });
-    } else {
-      (_f = content.parts) == null ? void 0 : _f.push((0, import_lodash_es.cloneDeep)(part));
+    } else if (!part.thought && part.text) {
+      (_g = content.parts) == null ? void 0 : _g.push({
+        text: `[${event.author}] said: ${part.text}`
+      });
+    } else if (hasNonTextPayload(part)) {
+      (_h = content.parts) == null ? void 0 : _h.push((0, import_lodash_es.cloneDeep)(withoutTextAndThought(part)));
     }
   }
+  const preambleOnly = content.parts.length === 1;
+  if (preambleOnly) {
+    return void 0;
+  }
   return (0, import_event.createEvent)({
     invocationId: event.invocationId,
     author: "user",