@lleverage-ai/agent-sdk 0.0.12 → 0.0.14

package/dist/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA4DH,OAAO,KAAK,EACV,KAAK,EACL,YAAY,EAwBb,MAAM,YAAY,CAAC;AA6pBpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,KAAK,CA2zFxD"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA4DH,OAAO,KAAK,EACV,KAAK,EACL,YAAY,EAwBb,MAAM,YAAY,CAAC;AA6pBpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,KAAK,CAq7FxD"}

package/dist/agent.js

@@ -697,17 +697,10 @@ export function createAgent(options) {
     let hasProxiedTools = false;
     // Auto-created subagent definitions from delegated plugins
     const autoSubagents = [];
-    // Count total plugin tools for threshold calculation and collect plugin skills.
-    // Note: Function-based (streaming) tools are not counted since we don't know
-    // their count until they're invoked with a streaming context.
+    // Collect plugin skills early so they're available for skill tool creation.
     // IMPORTANT: Plugin skills must be collected BEFORE createCoreTools() is called
     // so the skill tool includes them in progressive disclosure.
-    let totalPluginToolCount = 0;
     for (const plugin of options.plugins ?? []) {
-        if (plugin.tools && typeof plugin.tools !== "function") {
-            totalPluginToolCount += Object.keys(plugin.tools).length;
-        }
-        // Collect plugin skills early so they're available for skill tool creation
         if (plugin.skills) {
             skills.push(...plugin.skills);
         }
@@ -740,10 +733,28 @@ export function createAgent(options) {
     // Note: Plugin skills are collected earlier (before createCoreTools) so
     // the skill tool can include them in progressive disclosure.
     for (const plugin of options.plugins ?? []) {
-        // Handle tools via MCP manager for unified interface
-        // Note: Function-based (streaming) tools are handled separately in
-        // getActiveToolSetWithStreaming() and are not registered here
-        if (plugin.tools && typeof plugin.tools !== "function") {
+        if (plugin.tools && typeof plugin.tools === "function") {
+            // Function-based (streaming) tools
+            const factory = plugin.tools;
+            const isDeferred = plugin.deferred === true || (pluginLoadingMode === "proxy" && plugin.deferred !== false);
+            if (isDeferred) {
+                // Deferred streaming plugin: register factory in MCP for discovery via search_tools + call_tool
+                mcpManager.registerStreamingPluginTools(plugin.name, factory, {
+                    autoLoad: false,
+                });
+                hasProxiedTools = true;
+            }
+            else if (deferredLoadingActive && plugin.deferred !== false) {
+                // Deferred loading active: register but don't auto-load
+                mcpManager.registerStreamingPluginTools(plugin.name, factory, {
+                    autoLoad: false,
+                });
+            }
+            // else: Eager non-deferred streaming plugins are handled directly in
+            // getActiveToolSetWithStreaming() — they're NOT registered in MCP.
+        }
+        else if (plugin.tools) {
+            // Static tools
             // Check if this plugin is deferred (proxy mode or per-plugin opt-in)
             const isDeferred = plugin.deferred === true || (pluginLoadingMode === "proxy" && plugin.deferred !== false);
             if (isDeferred) {
@@ -768,6 +779,8 @@ export function createAgent(options) {
             }
         }
     }
+    // Only tools registered in MCP are discoverable via search_tools.
+    const discoverablePluginToolCount = mcpManager.listTools().length;
     // Create subagent definitions from plugins with subagent config
     for (const plugin of options.plugins ?? []) {
         if (plugin.subagent) {
@@ -791,7 +804,8 @@ export function createAgent(options) {
     const hasSubagents = allSubagents.length > 0;
     // In proxy mode, create call_tool and configure search_tools with schema disclosure
     const isProxyMode = pluginLoadingMode === "proxy" || hasProxiedTools;
-    if (isProxyMode && !options.disabledCoreTools?.includes("call_tool")) {
+    const hasProxyTargets = hasProxiedTools || mcpManager.hasExternalServers();
+    if (isProxyMode && hasProxyTargets && !options.disabledCoreTools?.includes("call_tool")) {
         coreTools.call_tool = createCallToolTool({
             mcpManager,
         });
@@ -803,10 +817,11 @@ export function createAgent(options) {
     // - Create when proxy mode is active (for call_tool discovery)
     // - Create when external MCP servers exist (for MCP tool search)
     // - Always auto-load tools when found (no manual load step) — unless proxy mode
-    const shouldCreateSearchToolsForAutoThreshold = toolSearchEnabled === "auto" && totalPluginToolCount > toolSearchThreshold;
+    const shouldCreateSearchToolsForAutoThreshold = toolSearchEnabled === "auto" && discoverablePluginToolCount > toolSearchThreshold;
     const shouldCreateSearchTools = !options.disabledCoreTools?.includes("search_tools") &&
-        (deferredLoadingActive ||
-            isProxyMode ||
+        ((deferredLoadingActive &&
+            (discoverablePluginToolCount > 0 || mcpManager.hasExternalServers())) ||
+            (isProxyMode && hasProxyTargets) ||
             shouldCreateSearchToolsForAutoThreshold ||
             (mcpManager.hasExternalServers() && toolSearchEnabled !== "never"));
     if (shouldCreateSearchTools) {
@@ -919,6 +934,28 @@ export function createAgent(options) {
         // Build prompt using prompt builder
         return promptBuilder.build(context);
     };
+    const responseMessagesToModelMessages = (messages) => Array.isArray(messages) ? messages : [];
+    const appendResponseMessages = (baseMessages, responseMessages, fallbackAssistantText) => {
+        const normalized = responseMessagesToModelMessages(responseMessages);
+        if (normalized.length > 0) {
+            return [...baseMessages, ...normalized];
+        }
+        return fallbackAssistantText
+            ? [...baseMessages, { role: "assistant", content: fallbackAssistantText }]
+            : baseMessages;
+    };
+    const buildMessagesFromStepResponses = (baseMessages, steps, fallbackAssistantText) => {
+        const stepResponseMessages = steps.flatMap((step) => responseMessagesToModelMessages(step.response?.messages));
+        if (stepResponseMessages.length > 0) {
+            return [...baseMessages, ...stepResponseMessages];
+        }
+        // Fallback for providers that do not populate response.messages.
+        const lastText = steps.at(-1)?.text ?? fallbackAssistantText;
+        return [
+            ...baseMessages,
+            ...(lastText ? [{ role: "assistant", content: lastText }] : []),
+        ];
+    };
     // Runtime tools added/removed dynamically by plugins at runtime
     const runtimeTools = {};
     // Helper to get current active tools (core + runtime + MCP + dynamically loaded from registry)
@@ -953,11 +990,16 @@ export function createAgent(options) {
         const allTools = { ...coreTools };
         // Add runtime tools (added by plugins at runtime)
         Object.assign(allTools, runtimeTools);
-        // Process plugins - invoke function-based tools with streaming context
+        // Process plugins - invoke non-deferred function-based tools with streaming context.
+        // Deferred function-based plugins are registered in MCP and come via mcpManager.getToolSet().
         for (const plugin of options.plugins ?? []) {
             if (plugin.tools) {
                 if (typeof plugin.tools === "function") {
-                    // Streaming-aware tools: invoke factory with context
+                    // Skip if registered in MCP (deferred or deferredLoadingActive plugins)
+                    if (mcpManager.hasStreamingFactory(plugin.name)) {
+                        continue;
+                    }
+                    // Non-deferred: eagerly invoke factory with streaming context (original names)
                     const streamingTools = plugin.tools(streamingContext);
                     Object.assign(allTools, streamingTools);
                 }
@@ -967,8 +1009,8 @@ export function createAgent(options) {
                 }
             }
         }
-        // Add MCP tools from plugin registrations
-        const mcpTools = mcpManager.getToolSet();
+        // Add MCP tools from plugin registrations (includes streaming factory tools with live context)
+        const mcpTools = mcpManager.getToolSet(undefined, streamingContext);
         Object.assign(allTools, mcpTools);
         // Apply allowedTools filtering
         const filtered = filterToolsByAllowed(allTools);
@@ -999,6 +1041,33 @@ export function createAgent(options) {
         // Then apply hooks for observability
         return wrapToolsWithHooks(withTaskManager, effectiveHooks, agent, threadId ?? "default");
     };
+    /**
+     * Injects request-local streaming context into tool execution options.
+     *
+     * This keeps deferred streaming tools isolated per request instead of
+     * relying on mutable MCPManager state shared across concurrent generations.
+     */
+    const wrapToolsWithStreamingContext = (tools, streamingContext) => {
+        const wrapped = {};
+        for (const [name, tool] of Object.entries(tools)) {
+            if (!tool.execute) {
+                wrapped[name] = tool;
+                continue;
+            }
+            const originalExecute = tool.execute;
+            wrapped[name] = {
+                ...tool,
+                execute: async (input, toolOptions) => {
+                    const extendedOptions = {
+                        ...toolOptions,
+                        streamingContext,
+                    };
+                    return originalExecute(input, extendedOptions);
+                },
+            };
+        }
+        return wrapped;
+    };
     /**
      * Adds the task and task_output tools to a toolset.
      *
@@ -1616,10 +1685,7 @@ export function createAgent(options) {
                         // cannot find the checkpoint (or finds one without messages/interrupt).
                         if (effectiveGenOptions.threadId && options.checkpointer) {
                             const checkpointThreadId = forkedSessionId ?? effectiveGenOptions.threadId;
-                            const finalMessages = [
-                                ...messages,
-                                ...(response.text ? [{ role: "assistant", content: response.text }] : []),
-                            ];
+                            const finalMessages = appendResponseMessages(messages, response.response?.messages, response.text);
                             const savedCheckpoint = await saveCheckpoint(checkpointThreadId, finalMessages, startStep + response.steps.length);
                             if (savedCheckpoint) {
                                 const withInterrupt = updateCheckpoint(savedCheckpoint, {
@@ -1687,13 +1753,7 @@ export function createAgent(options) {
                     // Save checkpoint - use forked session ID if forking, otherwise use original threadId
                     const checkpointThreadId = forkedSessionId ?? effectiveGenOptions.threadId;
                     if (checkpointThreadId && options.checkpointer) {
-                        // Build final messages including the assistant response.
-                        // Skip empty text to avoid invalid content blocks (e.g. when
-                        // the model finishes with only tool calls).
-                        const finalMessages = [
-                            ...messages,
-                            ...(response.text ? [{ role: "assistant", content: response.text }] : []),
-                        ];
+                        const finalMessages = appendResponseMessages(messages, response.response?.messages, response.text);
                         await saveCheckpoint(checkpointThreadId, finalMessages, startStep + response.steps.length);
                     }
                     // Invoke unified PostGenerate hooks
@@ -1727,12 +1787,7 @@ export function createAgent(options) {
                     let lastResult = finalResult;
                     let runningMessages = hasCheckpointing
                         ? []
-                        : [
-                            ...messages,
-                            ...(finalResult.text
-                                ? [{ role: "assistant", content: finalResult.text }]
-                                : []),
-                        ];
+                        : appendResponseMessages(messages, response.response?.messages, finalResult.text);
                     let followUpPrompt = await getNextTaskPrompt();
                     while (followUpPrompt !== null) {
                         lastResult = await agent.generate({
@@ -2034,11 +2089,12 @@ export function createAgent(options) {
                         }
                     }
                     // Get final result for hooks - need to await all properties
-                    const [text, usage, finishReason, steps] = await Promise.all([
+                    const [text, usage, finishReason, steps, responseMeta] = await Promise.all([
                         response.text,
                         response.usage,
                         response.finishReason,
                         response.steps,
+                        response.response ?? Promise.resolve(undefined),
                     ]);
                     // Only access output if an output schema was provided
                     let output;
@@ -2060,10 +2116,10 @@ export function createAgent(options) {
                     };
                     // Save checkpoint if threadId is provided
                     if (checkpointThreadId && options.checkpointer) {
-                        const finalMessages = [
-                            ...messages,
-                            ...(text ? [{ role: "assistant", content: text }] : []),
-                        ];
+                        const responseMessages = responseMessagesToModelMessages(responseMeta?.messages);
+                        const finalMessages = responseMessages.length > 0
+                            ? [...messages, ...responseMessages]
+                            : buildMessagesFromStepResponses(messages, steps, text);
                         await saveCheckpoint(checkpointThreadId, finalMessages, startStep + steps.length);
                     }
                     // Save pending interrupt to checkpoint (mirrors generate() pattern)
@@ -2111,9 +2167,12 @@ export function createAgent(options) {
                         return;
                     }
                     const hasCheckpointing = !!(effectiveGenOptions.threadId && options.checkpointer);
+                    const initialResponseMessages = responseMessagesToModelMessages(responseMeta?.messages);
                     let currentMessages = hasCheckpointing
                         ? []
-                        : [...messages, ...(text ? [{ role: "assistant", content: text }] : [])];
+                        : initialResponseMessages.length > 0
+                            ? [...messages, ...initialResponseMessages]
+                            : buildMessagesFromStepResponses(messages, steps, text);
                     let followUpPrompt = await getNextTaskPrompt();
                     while (followUpPrompt !== null) {
                         const followUpGen = agent.stream({
@@ -2213,6 +2272,7 @@ export function createAgent(options) {
                     const signalStopCondition = () => signalState.interrupt != null;
                     // Track step count for incremental checkpointing
                     let currentStepCount = 0;
+                    let streamedMessages = [...initialParams.messages];
                     // Execute streamText OUTSIDE createUIMessageStream so errors propagate
                     // to the retry loop (if streamText throws synchronously on creation,
                     // e.g. rate limit, the catch block handles retry/fallback).
@@ -2236,14 +2296,17 @@ export function createAgent(options) {
                             ? async (stepResult) => {
                                 if (effectiveGenOptions.threadId && options.checkpointer) {
                                     currentStepCount++;
-                                    // Build messages including this step's results
-                                    const stepMessages = [
-                                        ...initialParams.messages,
-                                        ...(stepResult.text
-                                            ? [{ role: "assistant", content: stepResult.text }]
-                                            : []),
-                                    ];
-                                    await saveCheckpoint(effectiveGenOptions.threadId, stepMessages, startStep + currentStepCount);
+                                    const stepResponseMessages = responseMessagesToModelMessages(stepResult.response?.messages);
+                                    streamedMessages =
+                                        stepResponseMessages.length > 0
+                                            ? [...streamedMessages, ...stepResponseMessages]
+                                            : stepResult.text
+                                                ? [
+                                                    ...streamedMessages,
+                                                    { role: "assistant", content: stepResult.text },
+                                                ]
+                                                : streamedMessages;
+                                    await saveCheckpoint(effectiveGenOptions.threadId, streamedMessages, startStep + currentStepCount);
                                 }
                             }
                             : undefined,
@@ -2258,12 +2321,7 @@ export function createAgent(options) {
                                 });
                             }
                             if (effectiveGenOptions.threadId && options.checkpointer) {
-                                const finalMessages = [
-                                    ...initialParams.messages,
-                                    ...(finishResult.text
-                                        ? [{ role: "assistant", content: finishResult.text }]
-                                        : []),
-                                ];
+                                const finalMessages = buildMessagesFromStepResponses(initialParams.messages, finishResult.steps, finishResult.text);
                                 await saveCheckpoint(effectiveGenOptions.threadId, finalMessages, startStep + finishResult.steps.length);
                             }
                             // Invoke unified PostGenerate hooks
@@ -2294,8 +2352,9 @@ export function createAgent(options) {
                         execute: async ({ writer }) => {
                             // Merge initial generation into the stream
                             writer.merge(result.toUIMessageStream());
-                            // Wait for initial generation to complete to get final text
-                            const text = await result.text;
+                            // Wait for initial generation to complete
+                            await result.text;
+                            const resultResponse = await (result.response ?? Promise.resolve(undefined));
                             // --- Background task completion loop ---
                             if (waitForBackgroundTasks) {
                                 // Track accumulated steps for checkpoint saves
@@ -2303,7 +2362,7 @@ export function createAgent(options) {
                                 let accumulatedStepCount = initialSteps.length;
                                 let currentMessages = [
                                     ...messages,
-                                    ...(text ? [{ role: "assistant", content: text }] : []),
+                                    ...responseMessagesToModelMessages(resultResponse?.messages),
                                 ];
                                 let followUpPrompt = await getNextTaskPrompt();
                                 while (followUpPrompt !== null) {
@@ -2327,12 +2386,16 @@ export function createAgent(options) {
                                     });
                                     writer.merge(followUpResult.toUIMessageStream());
                                     const followUpText = await followUpResult.text;
+                                    const followUpResponse = await (followUpResult.response ??
+                                        Promise.resolve(undefined));
                                     currentMessages = [
                                         ...currentMessages,
                                         { role: "user", content: followUpPrompt },
-                                        ...(followUpText
-                                            ? [{ role: "assistant", content: followUpText }]
-                                            : []),
+                                        ...(responseMessagesToModelMessages(followUpResponse?.messages).length > 0
+                                            ? responseMessagesToModelMessages(followUpResponse?.messages)
+                                            : followUpText
+                                                ? [{ role: "assistant", content: followUpText }]
+                                                : []),
                                     ];
                                     // --- Post-completion bookkeeping for follow-ups ---
                                     const followUpSteps = await followUpResult.steps;
@@ -2439,6 +2502,7 @@ export function createAgent(options) {
                     };
                     // Track step count for incremental checkpointing
                     let currentStepCount = 0;
+                    let streamedMessages = [...initialParams.messages];
                     // Stop condition: stop when an interrupt signal was caught, OR when
                     // the step count reaches maxSteps.
                     const signalStopCondition = () => signalState.interrupt != null;
@@ -2463,14 +2527,17 @@ export function createAgent(options) {
                             ? async (stepResult) => {
                                 if (effectiveGenOptions.threadId && options.checkpointer) {
                                     currentStepCount++;
-                                    // Build messages including this step's results
-                                    const stepMessages = [
-                                        ...initialParams.messages,
-                                        ...(stepResult.text
-                                            ? [{ role: "assistant", content: stepResult.text }]
-                                            : []),
-                                    ];
-                                    await saveCheckpoint(effectiveGenOptions.threadId, stepMessages, startStep + currentStepCount);
+                                    const stepResponseMessages = responseMessagesToModelMessages(stepResult.response?.messages);
+                                    streamedMessages =
+                                        stepResponseMessages.length > 0
+                                            ? [...streamedMessages, ...stepResponseMessages]
+                                            : stepResult.text
+                                                ? [
+                                                    ...streamedMessages,
+                                                    { role: "assistant", content: stepResult.text },
+                                                ]
+                                                : streamedMessages;
+                                    await saveCheckpoint(effectiveGenOptions.threadId, streamedMessages, startStep + currentStepCount);
                                 }
                             }
                             : undefined,
@@ -2485,12 +2552,7 @@ export function createAgent(options) {
                                 });
                             }
                             if (effectiveGenOptions.threadId && options.checkpointer) {
-                                const finalMessages = [
-                                    ...initialParams.messages,
-                                    ...(finishResult.text
-                                        ? [{ role: "assistant", content: finishResult.text }]
-                                        : []),
-                                ];
+                                const finalMessages = buildMessagesFromStepResponses(initialParams.messages, finishResult.steps, finishResult.text);
                                 await saveCheckpoint(effectiveGenOptions.threadId, finalMessages, startStep + finishResult.steps.length);
                             }
                             // Invoke unified PostGenerate hooks
@@ -2582,7 +2644,8 @@ export function createAgent(options) {
                             // Apply hooks AFTER adding task tool so task tool is also wrapped.
                             // Then wrap with signal catching as the outermost layer.
                             const hookedStreamingTools = applyToolHooks(addTaskToolIfConfigured(getActiveToolSetWithStreaming(streamingContext, effectiveGenOptions.threadId), streamingContext), effectiveGenOptions.threadId);
-                            const streamingTools = wrapToolsWithSignalCatching(hookedStreamingTools, signalState);
+                            const requestScopedStreamingTools = wrapToolsWithStreamingContext(hookedStreamingTools, streamingContext);
+                            const streamingTools = wrapToolsWithSignalCatching(requestScopedStreamingTools, signalState);
                             // Build prompt context and generate system prompt
                             const promptContext = buildPromptContext(messages, effectiveGenOptions.threadId);
                             const systemPrompt = getSystemPrompt(promptContext);
@@ -2600,6 +2663,7 @@ export function createAgent(options) {
                             };
                             // Track step count for incremental checkpointing
                             let currentStepCount = 0;
+                            let streamedMessages = [...initialParams.messages];
                             // Stop condition: stop when a flow-control signal was caught, OR when
                             // the step count reaches maxSteps.
                             const signalStopCondition = () => signalState.interrupt != null;
@@ -2624,15 +2688,17 @@ export function createAgent(options) {
                                     ? async (stepResult) => {
                                         if (effectiveGenOptions.threadId && options.checkpointer) {
                                             currentStepCount++;
-                                            // Build messages including this step's results
-                                            const stepMessages = [
-                                                ...initialParams.messages,
-                                                {
-                                                    role: "assistant",
-                                                    content: stepResult.text,
-                                                },
-                                            ];
-                                            await saveCheckpoint(effectiveGenOptions.threadId, stepMessages, startStep + currentStepCount);
+                                            const stepResponseMessages = responseMessagesToModelMessages(stepResult.response?.messages);
+                                            streamedMessages =
+                                                stepResponseMessages.length > 0
+                                                    ? [...streamedMessages, ...stepResponseMessages]
+                                                    : stepResult.text
+                                                        ? [
+                                                            ...streamedMessages,
+                                                            { role: "assistant", content: stepResult.text },
+                                                        ]
+                                                        : streamedMessages;
+                                            await saveCheckpoint(effectiveGenOptions.threadId, streamedMessages, startStep + currentStepCount);
                                         }
                                     }
                                     : undefined,
@@ -2647,13 +2713,7 @@ export function createAgent(options) {
                                         });
                                     }
                                     if (effectiveGenOptions.threadId && options.checkpointer) {
-                                        const finalMessages = [
-                                            ...initialParams.messages,
-                                            {
-                                                role: "assistant",
-                                                content: finishResult.text,
-                                            },
-                                        ];
+                                        const finalMessages = buildMessagesFromStepResponses(initialParams.messages, finishResult.steps, finishResult.text);
                                         await saveCheckpoint(effectiveGenOptions.threadId, finalMessages, startStep + finishResult.steps.length);
                                     }
                                     // Invoke unified PostGenerate hooks
@@ -2681,8 +2741,9 @@ export function createAgent(options) {
                             });
                             // Merge the streamText output into the UI message stream
                             writer.merge(result.toUIMessageStream());
-                            // Wait for initial generation to complete to get final text
-                            const text = await result.text;
+                            // Wait for initial generation to complete
+                            await result.text;
+                            const resultResponse = await (result.response ?? Promise.resolve(undefined));
                             // Save pending interrupt to checkpoint (mirrors stream() pattern)
                             if (signalState.interrupt && effectiveGenOptions.threadId && options.checkpointer) {
                                 const interrupt = signalState.interrupt.interrupt;
@@ -2710,14 +2771,14 @@ export function createAgent(options) {
                                     await invokeHooksWithTimeout(interruptRequestedHooks, hookInput, null, agent);
                                 }
                             }
-                            // --- Background task completion loop ---
+                            // --- Background task completion loop (streamDataResponse) ---
                             if (waitForBackgroundTasks && !signalState.interrupt) {
                                 // Track accumulated steps for checkpoint saves
                                 const initialSteps = await result.steps;
                                 let accumulatedStepCount = initialSteps.length;
                                 let currentMessages = [
                                     ...messages,
-                                    ...(text ? [{ role: "assistant", content: text }] : []),
+                                    ...responseMessagesToModelMessages(resultResponse?.messages),
                                 ];
                                 let followUpPrompt = await getNextTaskPrompt();
                                 while (followUpPrompt !== null) {
@@ -2741,12 +2802,16 @@ export function createAgent(options) {
                                     });
                                     writer.merge(followUpResult.toUIMessageStream());
                                     const followUpText = await followUpResult.text;
+                                    const followUpResponse = await (followUpResult.response ??
+                                        Promise.resolve(undefined));
                                     currentMessages = [
                                         ...currentMessages,
                                         { role: "user", content: followUpPrompt },
-                                        ...(followUpText
-                                            ? [{ role: "assistant", content: followUpText }]
-                                            : []),
+                                        ...(responseMessagesToModelMessages(followUpResponse?.messages).length > 0
+                                            ? responseMessagesToModelMessages(followUpResponse?.messages)
+                                            : followUpText
+                                                ? [{ role: "assistant", content: followUpText }]
+                                                : []),
                                     ];
                                     // --- Post-completion bookkeeping for follow-ups ---
                                     const followUpSteps = await followUpResult.steps;