ai 6.0.225 → 6.0.227

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # ai
 
+## 6.0.227
+
+### Patch Changes
+
+- 6ace546: Fix chat `onFinish` handling when overlapping requests clear the active response before a resume stream finishes.
+
+## 6.0.226
+
+### Patch Changes
+
+- 94219a2: Allow validating assistant UI messages with empty parts so persisted errored responses remain loadable.
+- b1be847: Prevent pending tool executions from enqueueing results after a model stream error closes the result stream.
+- Updated dependencies [06fb54c]
+- Updated dependencies [bc46977]
+  - @ai-sdk/provider-utils@4.0.39
+  - @ai-sdk/gateway@3.0.150
+
 ## 6.0.225
 
 ### Patch Changes

package/dist/index.js

@@ -1282,7 +1282,7 @@ function detectMediaType({
 var import_provider_utils3 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.225" : "0.0.0-test";
+var VERSION = true ? "6.0.227" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -6611,11 +6611,35 @@ function runToolsTransformation({
   onToolCallFinish
 }) {
   let toolResultsStreamController = null;
+  let toolResultsStreamClosed = false;
   const toolResultsStream = new ReadableStream({
     start(controller) {
       toolResultsStreamController = controller;
+    },
+    cancel() {
+      toolResultsStreamClosed = true;
     }
   });
+  function enqueueToolResult(chunk) {
+    if (toolResultsStreamClosed) {
+      return;
+    }
+    try {
+      toolResultsStreamController.enqueue(chunk);
+    } catch (e) {
+      toolResultsStreamClosed = true;
+    }
+  }
+  function closeToolResultsStream() {
+    if (toolResultsStreamClosed) {
+      return;
+    }
+    toolResultsStreamClosed = true;
+    try {
+      toolResultsStreamController.close();
+    } catch (e) {
+    }
+  }
   const outstandingToolResults = /* @__PURE__ */ new Set();
   const toolCallsByToolCallId = /* @__PURE__ */ new Map();
   let canClose = false;
@@ -6623,9 +6647,9 @@ function runToolsTransformation({
   function attemptClose() {
     if (canClose && outstandingToolResults.size === 0) {
       if (finishChunk != null) {
-        toolResultsStreamController.enqueue(finishChunk);
+        enqueueToolResult(finishChunk);
       }
-      toolResultsStreamController.close();
+      closeToolResultsStream();
     }
   }
   const forwardStream = new TransformStream({
@@ -6673,7 +6697,7 @@ function runToolsTransformation({
         case "tool-approval-request": {
           const toolCall = toolCallsByToolCallId.get(chunk.toolCallId);
           if (toolCall == null) {
-            toolResultsStreamController.enqueue({
+            enqueueToolResult({
               type: "error",
               error: new ToolCallNotFoundForApprovalError({
                 toolCallId: chunk.toolCallId,
@@ -6701,7 +6725,7 @@ function runToolsTransformation({
             toolCallsByToolCallId.set(toolCall.toolCallId, toolCall);
             controller.enqueue(toolCall);
             if (toolCall.invalid) {
-              toolResultsStreamController.enqueue({
+              enqueueToolResult({
                 type: "tool-error",
                 toolCallId: toolCall.toolCallId,
                 toolName: toolCall.toolName,
@@ -6740,7 +6764,7 @@ function runToolsTransformation({
                 toolName: toolCall.toolName,
                 input: toolCall.input
               });
-              toolResultsStreamController.enqueue({
+              enqueueToolResult({
                 type: "tool-approval-request",
                 approvalId,
                 toolCall,
@@ -6764,12 +6788,12 @@ function runToolsTransformation({
                 onToolCallStart,
                 onToolCallFinish,
                 onPreliminaryToolResult: (result) => {
-                  toolResultsStreamController.enqueue(result);
+                  enqueueToolResult(result);
                 }
               }).then((result) => {
-                toolResultsStreamController.enqueue(result);
+                enqueueToolResult(result);
               }).catch((error) => {
-                toolResultsStreamController.enqueue({
+                enqueueToolResult({
                   type: "error",
                   error
                 });
@@ -6779,7 +6803,7 @@ function runToolsTransformation({
               });
             }
           } catch (error) {
-            toolResultsStreamController.enqueue({ type: "error", error });
+            enqueueToolResult({ type: "error", error });
           }
           break;
         }
@@ -6787,7 +6811,7 @@ function runToolsTransformation({
           const toolName = chunk.toolName;
           const toolCall = toolCallsByToolCallId.get(chunk.toolCallId);
           if (chunk.isError) {
-            toolResultsStreamController.enqueue({
+            enqueueToolResult({
               type: "tool-error",
               toolCallId: chunk.toolCallId,
               toolName,
@@ -9437,7 +9461,19 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(
               })
             })
           ])
-        ).nonempty("Message must contain at least one part")
+        )
+      }).superRefine((message, context2) => {
+        if (message.role !== "assistant" && message.parts.length === 0) {
+          context2.addIssue({
+            origin: "array",
+            code: "too_small",
+            minimum: 1,
+            inclusive: true,
+            input: message.parts,
+            path: ["parts"],
+            message: "Message must contain at least one part"
+          });
+        }
       })
     ).nonempty("Messages array must not be empty")
   )
@@ -13801,7 +13837,7 @@ var AbstractChat = class {
     body,
     messageId
   }) {
-    var _a22, _b, _c;
+    var _a22, _b;
     let resumeStream;
     if (trigger === "resume-stream") {
       try {
@@ -13828,18 +13864,20 @@ var AbstractChat = class {
     let isAbort = false;
     let isDisconnect = false;
     let isError = false;
+    let activeResponse;
     try {
-      const activeResponse = {
+      const response = {
         state: createStreamingUIMessageState({
           lastMessage: this.state.snapshot(lastMessage),
           messageId: this.generateId()
         }),
         abortController: new AbortController()
       };
-      activeResponse.abortController.signal.addEventListener("abort", () => {
+      activeResponse = response;
+      response.abortController.signal.addEventListener("abort", () => {
         isAbort = true;
       });
-      this.activeResponse = activeResponse;
+      this.activeResponse = response;
       let stream;
       if (trigger === "resume-stream") {
         stream = resumeStream;
@@ -13847,7 +13885,7 @@ var AbstractChat = class {
         stream = await this.transport.sendMessages({
           chatId: this.id,
           messages: this.state.messages,
-          abortSignal: activeResponse.abortController.signal,
+          abortSignal: response.abortController.signal,
           metadata,
           headers,
           body,
@@ -13859,18 +13897,18 @@ var AbstractChat = class {
         // serialize the job execution to avoid race conditions:
         this.jobExecutor.run(
           () => job({
-            state: activeResponse.state,
+            state: response.state,
             write: () => {
               var _a23;
               this.setStatus({ status: "streaming" });
-              const replaceLastMessage = activeResponse.state.message.id === ((_a23 = this.lastMessage) == null ? void 0 : _a23.id);
+              const replaceLastMessage = response.state.message.id === ((_a23 = this.lastMessage) == null ? void 0 : _a23.id);
               if (replaceLastMessage) {
                 this.state.replaceMessage(
                   this.state.messages.length - 1,
-                  activeResponse.state.message
+                  response.state.message
                 );
               } else {
-                this.state.pushMessage(activeResponse.state.message);
+                this.state.pushMessage(response.state.message);
               }
             }
           })
@@ -13909,23 +13947,27 @@ var AbstractChat = class {
       this.setStatus({ status: "error", error: err });
     } finally {
       try {
-        (_b = this.onFinish) == null ? void 0 : _b.call(this, {
-          message: this.activeResponse.state.message,
-          messages: this.state.messages,
-          isAbort,
-          isDisconnect,
-          isError,
-          finishReason: (_a22 = this.activeResponse) == null ? void 0 : _a22.state.finishReason
-        });
+        if (activeResponse) {
+          (_a22 = this.onFinish) == null ? void 0 : _a22.call(this, {
+            message: activeResponse.state.message,
+            messages: this.state.messages,
+            isAbort,
+            isDisconnect,
+            isError,
+            finishReason: activeResponse.state.finishReason
+          });
+        }
       } catch (err) {
         console.error(err);
       }
-      this.activeResponse = void 0;
+      if (this.activeResponse === activeResponse) {
+        this.activeResponse = void 0;
+      }
     }
     if (!isError && await this.shouldSendAutomatically()) {
       await this.makeRequest({
         trigger: "submit-message",
-        messageId: (_c = this.lastMessage) == null ? void 0 : _c.id,
+        messageId: (_b = this.lastMessage) == null ? void 0 : _b.id,
         metadata,
         headers,
         body