ai 6.0.226 → 6.0.227

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # 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

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.226" : "0.0.0-test";
+var VERSION = true ? "6.0.227" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -13837,7 +13837,7 @@ var AbstractChat = class {
     body,
     messageId
   }) {
-    var _a22, _b, _c;
+    var _a22, _b;
     let resumeStream;
     if (trigger === "resume-stream") {
       try {
@@ -13864,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;
@@ -13883,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,
@@ -13895,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);
               }
             }
           })
@@ -13945,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