diff --git a/packages/agent/src/agent.ts b/packages/agent/src/agent.ts
index 46d30247..be8fa4c5 100644
--- a/packages/agent/src/agent.ts
+++ b/packages/agent/src/agent.ts
@@ -499,6 +499,20 @@ export const createAgent = (
             break
           }
           case 'tool-call':
+            // Flush any remaining buffered content before ending the text stream.
+            const remainder = attachmentsExtractor.flushRemainder()
+            if (remainder.visibleText) {
+              yield {
+                type: 'text_delta',
+                delta: remainder.visibleText,
+              }
+            }
+            if (remainder.attachments.length) {
+              yield {
+                type: 'attachment_delta',
+                attachments: remainder.attachments,
+              }
+            }
             yield {
               type: 'tool_call_start',
               toolName: chunk.toolName,