ai 6.0.294 → 6.0.296

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # ai
 
+## 6.0.296
+
+### Patch Changes
+
+- 0741da8: fix(ai): allow agent UI streams to use original messages as input
+- a63fa9b: fix(ai): preserve tool metadata from tool output chunks
+- a61bea9: Preserve provider metadata on corresponding `smoothStream` chunks without carrying it into subsequent metadata-free deltas.
+
+## 6.0.295
+
+### Patch Changes
+
+- 0b38b6b: fix(ai): continue active UI message parts when resuming after a disconnect
+- Updated dependencies [358683e]
+  - @ai-sdk/gateway@3.0.205
+
 ## 6.0.294
 
 ### Patch Changes

package/dist/index.d.mts

@@ -3564,7 +3564,7 @@ type InferAgentUIMessage<AGENT, MESSAGE_METADATA = unknown> = UIMessage<MESSAGE_
  * Runs the agent and returns a response object with a UI message stream.
  *
  * @param agent - The agent to run.
- * @param uiMessages - The input UI messages.
+ * @param uiMessages - The input UI messages. Defaults to originalMessages.
  * @param abortSignal - Abort signal. Optional.
  * @param timeout - Timeout in milliseconds. Optional.
  * @param options - The options for the agent. Optional.
@@ -3579,7 +3579,7 @@ type InferAgentUIMessage<AGENT, MESSAGE_METADATA = unknown> = UIMessage<MESSAGE_
  */
 declare function createAgentUIStreamResponse<CALL_OPTIONS = never, TOOLS extends ToolSet = {}, OUTPUT extends Output = never, MESSAGE_METADATA = unknown>({ headers, status, statusText, consumeSseStream, ...options }: {
     agent: Agent<CALL_OPTIONS, TOOLS, OUTPUT>;
-    uiMessages: unknown[];
+    uiMessages?: unknown[];
     abortSignal?: AbortSignal;
     timeout?: TimeoutConfiguration;
     options?: CALL_OPTIONS;
@@ -3862,6 +3862,7 @@ declare abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
     private pendingApprovalMessageId;
     private activeResponse;
     private activeResumeRequest;
+    private resumableStreamState;
     private jobExecutor;
     constructor({ generateId, id, transport, messageMetadataSchema, dataPartSchemas, state, onError, onToolCall, onFinish, onData, sendAutomaticallyWhen, }: Omit<ChatInit<UI_MESSAGE>, 'messages'> & {
         state: ChatState<UI_MESSAGE>;
@@ -4366,7 +4367,7 @@ declare const UI_MESSAGE_STREAM_HEADERS: {
  * Runs the agent and stream the output as a UI message stream.
  *
  * @param agent - The agent to run.
- * @param uiMessages - The input UI messages.
+ * @param uiMessages - The input UI messages. Defaults to originalMessages.
  * @param abortSignal - The abort signal. Optional.
  * @param timeout - Timeout in milliseconds. Optional.
  * @param options - The options for the agent.
@@ -4377,7 +4378,7 @@ declare const UI_MESSAGE_STREAM_HEADERS: {
  */
 declare function createAgentUIStream<CALL_OPTIONS = never, TOOLS extends ToolSet = {}, OUTPUT extends Output = never, MESSAGE_METADATA = unknown>({ agent, uiMessages, options, abortSignal, timeout, experimental_transform, onStepFinish, ...uiMessageStreamOptions }: {
     agent: Agent<CALL_OPTIONS, TOOLS, OUTPUT>;
-    uiMessages: unknown[];
+    uiMessages?: unknown[];
     abortSignal?: AbortSignal;
     timeout?: TimeoutConfiguration;
     options?: CALL_OPTIONS;
@@ -4390,7 +4391,7 @@ declare function createAgentUIStream<CALL_OPTIONS = never, TOOLS extends ToolSet
  *
  * @param response - The Node.js ServerResponse object to pipe to.
  * @param agent - The agent to run.
- * @param uiMessages - The input UI messages.
+ * @param uiMessages - The input UI messages. Defaults to originalMessages.
  * @param abortSignal - Abort signal. Optional.
  * @param timeout - Timeout in milliseconds. Optional.
  * @param options - The options for the agent. Optional.
@@ -4404,7 +4405,7 @@ declare function createAgentUIStream<CALL_OPTIONS = never, TOOLS extends ToolSet
 declare function pipeAgentUIStreamToResponse<CALL_OPTIONS = never, TOOLS extends ToolSet = {}, OUTPUT extends Output = never, MESSAGE_METADATA = unknown>({ response, headers, status, statusText, consumeSseStream, ...options }: {
     response: ServerResponse;
     agent: Agent<CALL_OPTIONS, TOOLS, OUTPUT>;
-    uiMessages: unknown[];
+    uiMessages?: unknown[];
     abortSignal?: AbortSignal;
     timeout?: TimeoutConfiguration;
     options?: CALL_OPTIONS;

package/dist/index.d.ts

@@ -3564,7 +3564,7 @@ type InferAgentUIMessage<AGENT, MESSAGE_METADATA = unknown> = UIMessage<MESSAGE_
  * Runs the agent and returns a response object with a UI message stream.
  *
  * @param agent - The agent to run.
- * @param uiMessages - The input UI messages.
+ * @param uiMessages - The input UI messages. Defaults to originalMessages.
  * @param abortSignal - Abort signal. Optional.
  * @param timeout - Timeout in milliseconds. Optional.
  * @param options - The options for the agent. Optional.
@@ -3579,7 +3579,7 @@ type InferAgentUIMessage<AGENT, MESSAGE_METADATA = unknown> = UIMessage<MESSAGE_
  */
 declare function createAgentUIStreamResponse<CALL_OPTIONS = never, TOOLS extends ToolSet = {}, OUTPUT extends Output = never, MESSAGE_METADATA = unknown>({ headers, status, statusText, consumeSseStream, ...options }: {
     agent: Agent<CALL_OPTIONS, TOOLS, OUTPUT>;
-    uiMessages: unknown[];
+    uiMessages?: unknown[];
     abortSignal?: AbortSignal;
     timeout?: TimeoutConfiguration;
     options?: CALL_OPTIONS;
@@ -3862,6 +3862,7 @@ declare abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
     private pendingApprovalMessageId;
     private activeResponse;
     private activeResumeRequest;
+    private resumableStreamState;
     private jobExecutor;
     constructor({ generateId, id, transport, messageMetadataSchema, dataPartSchemas, state, onError, onToolCall, onFinish, onData, sendAutomaticallyWhen, }: Omit<ChatInit<UI_MESSAGE>, 'messages'> & {
         state: ChatState<UI_MESSAGE>;
@@ -4366,7 +4367,7 @@ declare const UI_MESSAGE_STREAM_HEADERS: {
  * Runs the agent and stream the output as a UI message stream.
  *
  * @param agent - The agent to run.
- * @param uiMessages - The input UI messages.
+ * @param uiMessages - The input UI messages. Defaults to originalMessages.
  * @param abortSignal - The abort signal. Optional.
  * @param timeout - Timeout in milliseconds. Optional.
  * @param options - The options for the agent.
@@ -4377,7 +4378,7 @@ declare const UI_MESSAGE_STREAM_HEADERS: {
  */
 declare function createAgentUIStream<CALL_OPTIONS = never, TOOLS extends ToolSet = {}, OUTPUT extends Output = never, MESSAGE_METADATA = unknown>({ agent, uiMessages, options, abortSignal, timeout, experimental_transform, onStepFinish, ...uiMessageStreamOptions }: {
     agent: Agent<CALL_OPTIONS, TOOLS, OUTPUT>;
-    uiMessages: unknown[];
+    uiMessages?: unknown[];
     abortSignal?: AbortSignal;
     timeout?: TimeoutConfiguration;
     options?: CALL_OPTIONS;
@@ -4390,7 +4391,7 @@ declare function createAgentUIStream<CALL_OPTIONS = never, TOOLS extends ToolSet
  *
  * @param response - The Node.js ServerResponse object to pipe to.
  * @param agent - The agent to run.
- * @param uiMessages - The input UI messages.
+ * @param uiMessages - The input UI messages. Defaults to originalMessages.
  * @param abortSignal - Abort signal. Optional.
  * @param timeout - Timeout in milliseconds. Optional.
  * @param options - The options for the agent. Optional.
@@ -4404,7 +4405,7 @@ declare function createAgentUIStream<CALL_OPTIONS = never, TOOLS extends ToolSet
 declare function pipeAgentUIStreamToResponse<CALL_OPTIONS = never, TOOLS extends ToolSet = {}, OUTPUT extends Output = never, MESSAGE_METADATA = unknown>({ response, headers, status, statusText, consumeSseStream, ...options }: {
     response: ServerResponse;
     agent: Agent<CALL_OPTIONS, TOOLS, OUTPUT>;
-    uiMessages: unknown[];
+    uiMessages?: unknown[];
     abortSignal?: AbortSignal;
     timeout?: TimeoutConfiguration;
     options?: CALL_OPTIONS;

package/dist/index.js

@@ -1334,7 +1334,7 @@ function detectMediaType({
 var import_provider_utils3 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.294" : "0.0.0-test";
+var VERSION = true ? "6.0.296" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -6023,7 +6023,7 @@ function processUIMessageStream({
     new TransformStream({
       async transform(chunk, controller) {
         await runUpdateMessageJob(async ({ state, write }) => {
-          var _a23, _b, _c, _d;
+          var _a23, _b, _c, _d, _e, _f, _g, _h;
           function getCurrentStepParts() {
             const parts = state.message.parts;
             let currentStepStartIndex = parts.length - 1;
@@ -6457,7 +6457,7 @@ function processUIMessageStream({
                     providerExecuted: chunk.providerExecuted,
                     providerMetadata: chunk.providerMetadata,
                     title: toolInvocation.title,
-                    toolMetadata: toolInvocation.toolMetadata
+                    toolMetadata: (_e = chunk.toolMetadata) != null ? _e : toolInvocation.toolMetadata
                   },
                   toolInvocation
                 );
@@ -6473,7 +6473,7 @@ function processUIMessageStream({
                     preliminary: chunk.preliminary,
                     providerMetadata: chunk.providerMetadata,
                     title: toolInvocation.title,
-                    toolMetadata: toolInvocation.toolMetadata
+                    toolMetadata: (_f = chunk.toolMetadata) != null ? _f : toolInvocation.toolMetadata
                   },
                   toolInvocation
                 );
@@ -6494,7 +6494,7 @@ function processUIMessageStream({
                     providerExecuted: chunk.providerExecuted,
                     providerMetadata: chunk.providerMetadata,
                     title: toolInvocation.title,
-                    toolMetadata: toolInvocation.toolMetadata
+                    toolMetadata: (_g = chunk.toolMetadata) != null ? _g : toolInvocation.toolMetadata
                   },
                   toolInvocation
                 );
@@ -6510,7 +6510,7 @@ function processUIMessageStream({
                     providerExecuted: chunk.providerExecuted,
                     providerMetadata: chunk.providerMetadata,
                     title: toolInvocation.title,
-                    toolMetadata: toolInvocation.toolMetadata
+                    toolMetadata: (_h = chunk.toolMetadata) != null ? _h : toolInvocation.toolMetadata
                   },
                   toolInvocation
                 );
@@ -10332,8 +10332,9 @@ async function createAgentUIStream({
   ...uiMessageStreamOptions
 }) {
   var _a23;
+  const inputMessages = uiMessages != null ? uiMessages : uiMessageStreamOptions.originalMessages;
   const validatedMessages = await validateUIMessagesForAgent({
-    messages: uiMessages,
+    messages: inputMessages,
     tools: agent.tools
   });
   const modelMessages = await convertToModelMessages(validatedMessages, {
@@ -12737,21 +12738,32 @@ function smoothStream({
           controller.enqueue(chunk);
           return;
         }
-        if ((chunk.type !== type || chunk.id !== id) && (buffer.length > 0 || providerMetadata != null)) {
+        if (chunk.text.length === 0 && chunk.providerMetadata != null) {
+          flushBuffer(controller);
+          controller.enqueue(chunk);
+          return;
+        }
+        if (buffer.length > 0 && (chunk.type !== type || chunk.id !== id || providerMetadata != null || chunk.providerMetadata != null)) {
           flushBuffer(controller);
         }
         buffer += chunk.text;
         id = chunk.id;
         type = chunk.type;
-        if (chunk.providerMetadata != null) {
-          providerMetadata = chunk.providerMetadata;
-        }
+        providerMetadata = chunk.providerMetadata;
         let match;
         while ((match = detectChunk(buffer)) != null) {
-          controller.enqueue({ type, text: match, id });
+          controller.enqueue({
+            type,
+            text: match,
+            id,
+            ...providerMetadata != null ? { providerMetadata } : {}
+          });
           buffer = buffer.slice(match.length);
           await delay(isDocumentHidden() ? null : delayInMs);
         }
+        if (buffer.length === 0) {
+          providerMetadata = void 0;
+        }
       }
     });
   };
@@ -14450,6 +14462,7 @@ var AbstractChat = class {
   }) {
     this.activeResponse = void 0;
     this.activeResumeRequest = void 0;
+    this.resumableStreamState = void 0;
     this.jobExecutor = new SerialJobExecutor();
     /**
      * Appends or replaces a user message to the chat list. This triggers the API call to fetch
@@ -14729,6 +14742,9 @@ var AbstractChat = class {
     messageId
   }) {
     var _a23, _b, _c;
+    if (trigger !== "resume-stream") {
+      this.resumableStreamState = void 0;
+    }
     const abortController = new AbortController();
     const activeResumeRequest = trigger === "resume-stream" ? { abortController } : void 0;
     if (activeResumeRequest) {
@@ -14756,12 +14772,14 @@ var AbstractChat = class {
           }));
           if (isCurrentRequest()) {
             this.setStatus({ status: "ready" });
+            this.resumableStreamState = void 0;
           }
           clearActiveResumeRequest();
           return;
         }
         if (reconnect == null) {
           this.setStatus({ status: "ready" });
+          this.resumableStreamState = void 0;
           clearActiveResumeRequest();
           return;
         }
@@ -14770,6 +14788,7 @@ var AbstractChat = class {
         if (abortController.signal.aborted || err.name === "AbortError") {
           if (isCurrentRequest()) {
             this.setStatus({ status: "ready" });
+            this.resumableStreamState = void 0;
           }
           clearActiveResumeRequest();
           return;
@@ -14796,7 +14815,7 @@ var AbstractChat = class {
     let activeResponse;
     try {
       const response = {
-        state: createStreamingUIMessageState({
+        state: trigger === "resume-stream" && this.resumableStreamState != null ? this.resumableStreamState : createStreamingUIMessageState({
           lastMessage: trigger === "resume-stream" || trigger === "regenerate-message" ? void 0 : this.state.snapshot(responseMessage),
           messageId: this.generateId()
         }),
@@ -14875,17 +14894,26 @@ var AbstractChat = class {
       if (isAbort) {
         if (isCurrentRequest()) {
           this.setStatus({ status: "ready" });
+          if (this.resumableStreamState === response.state) {
+            this.resumableStreamState = void 0;
+          }
         }
         return null;
       }
       if (isCurrentRequest()) {
         this.setStatus({ status: "ready" });
+        if (this.resumableStreamState === response.state) {
+          this.resumableStreamState = void 0;
+        }
       }
     } catch (err) {
       if (isAbort || err.name === "AbortError") {
         isAbort = true;
         if (isCurrentRequest()) {
           this.setStatus({ status: "ready" });
+          if (this.resumableStreamState === (activeResponse == null ? void 0 : activeResponse.state)) {
+            this.resumableStreamState = void 0;
+          }
         }
         return null;
       }
@@ -14896,6 +14924,11 @@ var AbstractChat = class {
       if (err instanceof TypeError && (err.message.toLowerCase().includes("fetch") || err.message.toLowerCase().includes("network"))) {
         isDisconnect = true;
       }
+      if (isDisconnect) {
+        this.resumableStreamState = activeResponse == null ? void 0 : activeResponse.state;
+      } else if (this.resumableStreamState === (activeResponse == null ? void 0 : activeResponse.state)) {
+        this.resumableStreamState = void 0;
+      }
       if (this.onError && err instanceof Error) {
         this.onError(err);
       }