ai 6.0.248 → 6.0.250

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # ai
 
+## 6.0.250
+
+### Patch Changes
+
+- a077695: Prevent streaming telemetry spans from ending twice when model calls fail.
+- 7ce3b8c: Prevent `resumeStream` from copying the previous assistant message into the resumed response.
+- Updated dependencies [b2a4d5a]
+  - @ai-sdk/provider-utils@4.0.45
+  - @ai-sdk/gateway@3.0.170
+
+## 6.0.249
+
+### Patch Changes
+
+- a774b7b: Stop pending and active resumed chat streams after cancellation, and prevent
+  overlapping resumptions from applying stale updates.
+- Updated dependencies [b39f987]
+- Updated dependencies [d79117b]
+  - @ai-sdk/gateway@3.0.169
+
 ## 6.0.248
 
 ### Patch Changes

package/dist/index.d.mts

@@ -3620,6 +3620,7 @@ interface ChatTransport<UI_MESSAGE extends UIMessage> {
      *
      * @param options - Configuration object containing:
      * @param options.chatId - Unique identifier for the chat session to reconnect to
+     * @param options.abortSignal - Signal to abort the reconnection request if needed
      * @param options.headers - Additional HTTP headers to include in the reconnection request
      * @param options.body - Additional JSON properties to include in the request body
      * @param options.metadata - Custom metadata to attach to the request
@@ -3633,6 +3634,8 @@ interface ChatTransport<UI_MESSAGE extends UIMessage> {
     reconnectToStream: (options: {
         /** Unique identifier for the chat session to reconnect to */
         chatId: string;
+        /** Signal to abort the reconnection request if needed */
+        abortSignal?: AbortSignal;
     } & ChatRequestOptions) => Promise<ReadableStream<UIMessageChunk> | null>;
 }
 
@@ -3793,6 +3796,7 @@ declare abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
     private onData?;
     private sendAutomaticallyWhen?;
     private activeResponse;
+    private activeResumeRequest;
     private jobExecutor;
     constructor({ generateId, id, transport, messageMetadataSchema, dataPartSchemas, state, onError, onToolCall, onFinish, onData, sendAutomaticallyWhen, }: Omit<ChatInit<UI_MESSAGE>, 'messages'> & {
         state: ChatState<UI_MESSAGE>;
@@ -5264,9 +5268,10 @@ declare function generateObject<SCHEMA extends FlexibleSchema<unknown> = Flexibl
  * @param options.onError - Optional callback to handle errors that occur during consumption.
  * @returns A promise that resolves when the stream is fully consumed.
  */
-declare function consumeStream({ stream, onError, }: {
+declare function consumeStream({ stream, onError, abortSignal, }: {
     stream: ReadableStream;
     onError?: (error: unknown) => void;
+    abortSignal?: AbortSignal;
 }): Promise<void>;
 
 /**

package/dist/index.d.ts

@@ -3620,6 +3620,7 @@ interface ChatTransport<UI_MESSAGE extends UIMessage> {
      *
      * @param options - Configuration object containing:
      * @param options.chatId - Unique identifier for the chat session to reconnect to
+     * @param options.abortSignal - Signal to abort the reconnection request if needed
      * @param options.headers - Additional HTTP headers to include in the reconnection request
      * @param options.body - Additional JSON properties to include in the request body
      * @param options.metadata - Custom metadata to attach to the request
@@ -3633,6 +3634,8 @@ interface ChatTransport<UI_MESSAGE extends UIMessage> {
     reconnectToStream: (options: {
         /** Unique identifier for the chat session to reconnect to */
         chatId: string;
+        /** Signal to abort the reconnection request if needed */
+        abortSignal?: AbortSignal;
     } & ChatRequestOptions) => Promise<ReadableStream<UIMessageChunk> | null>;
 }
 
@@ -3793,6 +3796,7 @@ declare abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
     private onData?;
     private sendAutomaticallyWhen?;
     private activeResponse;
+    private activeResumeRequest;
     private jobExecutor;
     constructor({ generateId, id, transport, messageMetadataSchema, dataPartSchemas, state, onError, onToolCall, onFinish, onData, sendAutomaticallyWhen, }: Omit<ChatInit<UI_MESSAGE>, 'messages'> & {
         state: ChatState<UI_MESSAGE>;
@@ -5264,9 +5268,10 @@ declare function generateObject<SCHEMA extends FlexibleSchema<unknown> = Flexibl
  * @param options.onError - Optional callback to handle errors that occur during consumption.
  * @returns A promise that resolves when the stream is fully consumed.
  */
-declare function consumeStream({ stream, onError, }: {
+declare function consumeStream({ stream, onError, abortSignal, }: {
     stream: ReadableStream;
     onError?: (error: unknown) => void;
+    abortSignal?: AbortSignal;
 }): Promise<void>;
 
 /**

package/dist/index.js

@@ -1304,7 +1304,7 @@ function detectMediaType({
 var import_provider_utils3 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.248" : "0.0.0-test";
+var VERSION = true ? "6.0.250" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -2532,7 +2532,8 @@ async function recordSpan({
   tracer,
   attributes,
   fn,
-  endWhenDone = true
+  endWhenDone = true,
+  endOnError = endWhenDone
 }) {
   return tracer.startActiveSpan(
     name22,
@@ -2549,7 +2550,9 @@ async function recordSpan({
         try {
           recordErrorOnSpan(span, error);
         } finally {
-          span.end();
+          if (endOnError) {
+            span.end();
+          }
         }
         throw error;
       }
@@ -6591,9 +6594,19 @@ function createAsyncIterableStream(source) {
 // src/util/consume-stream.ts
 async function consumeStream({
   stream,
-  onError
+  onError,
+  abortSignal
 }) {
   const reader = stream.getReader();
+  const cancelOnAbort = () => {
+    reader.cancel().catch(() => {
+    });
+  };
+  if (abortSignal == null ? void 0 : abortSignal.aborted) {
+    cancelOnAbort();
+  } else {
+    abortSignal == null ? void 0 : abortSignal.addEventListener("abort", cancelOnAbort, { once: true });
+  }
   try {
     while (true) {
       const { done } = await reader.read();
@@ -6603,6 +6616,7 @@ async function consumeStream({
   } catch (error) {
     onError == null ? void 0 : onError(error);
   } finally {
+    abortSignal == null ? void 0 : abortSignal.removeEventListener("abort", cancelOnAbort);
     reader.releaseLock();
   }
 }
@@ -7890,6 +7904,7 @@ var DefaultStreamTextResult = class {
                 }),
                 tracer,
                 endWhenDone: false,
+                endOnError: true,
                 fn: async (doStreamSpan2) => ({
                   startTimestampMs: now2(),
                   // get before the call
@@ -11388,6 +11403,7 @@ var DefaultStreamObjectResult = class {
       }),
       tracer,
       endWhenDone: false,
+      endOnError: true,
       fn: async (rootSpan) => {
         const standardizedPrompt = await standardizePrompt({
           system,
@@ -11459,6 +11475,7 @@ var DefaultStreamObjectResult = class {
             }),
             tracer,
             endWhenDone: false,
+            endOnError: true,
             fn: async (doStreamSpan2) => ({
               startTimestampMs: now2(),
               doStreamSpan: doStreamSpan2,
@@ -13672,7 +13689,8 @@ var HttpChatTransport = class {
     const response = await fetch2(api, {
       method: "GET",
       headers,
-      credentials
+      credentials,
+      signal: options.abortSignal
     });
     if (response.status === 204) {
       return null;
@@ -13727,6 +13745,7 @@ var AbstractChat = class {
     sendAutomaticallyWhen
   }) {
     this.activeResponse = void 0;
+    this.activeResumeRequest = void 0;
     this.jobExecutor = new SerialJobExecutor();
     /**
      * Appends or replaces a user message to the chat list. This triggers the API call to fetch
@@ -13896,12 +13915,9 @@ var AbstractChat = class {
      * Abort the current request immediately, keep the generated tokens if any.
      */
     this.stop = async () => {
-      var _a22;
-      if (this.status !== "streaming" && this.status !== "submitted")
-        return;
-      if ((_a22 = this.activeResponse) == null ? void 0 : _a22.abortController) {
-        this.activeResponse.abortController.abort();
-      }
+      var _a22, _b;
+      (_a22 = this.activeResumeRequest) == null ? void 0 : _a22.abortController.abort();
+      (_b = this.activeResponse) == null ? void 0 : _b.abortController.abort();
     };
     this.id = id;
     this.transport = transport;
@@ -13965,25 +13981,60 @@ var AbstractChat = class {
     body,
     messageId
   }) {
-    var _a22, _b;
+    var _a22, _b, _c;
+    const abortController = new AbortController();
+    const activeResumeRequest = trigger === "resume-stream" ? { abortController } : void 0;
+    if (activeResumeRequest) {
+      (_a22 = this.activeResumeRequest) == null ? void 0 : _a22.abortController.abort();
+      this.activeResumeRequest = activeResumeRequest;
+    }
+    const isCurrentRequest = () => activeResumeRequest == null || this.activeResumeRequest === activeResumeRequest;
+    const clearActiveResumeRequest = () => {
+      if (this.activeResumeRequest === activeResumeRequest) {
+        this.activeResumeRequest = void 0;
+      }
+    };
     let resumeStream;
     if (trigger === "resume-stream") {
       try {
         const reconnect = await this.transport.reconnectToStream({
           chatId: this.id,
+          abortSignal: abortController.signal,
           metadata,
           headers,
           body
         });
+        if (abortController.signal.aborted || !isCurrentRequest()) {
+          await (reconnect == null ? void 0 : reconnect.cancel().catch(() => {
+          }));
+          if (isCurrentRequest()) {
+            this.setStatus({ status: "ready" });
+          }
+          clearActiveResumeRequest();
+          return;
+        }
         if (reconnect == null) {
+          this.setStatus({ status: "ready" });
+          clearActiveResumeRequest();
           return;
         }
         resumeStream = reconnect;
       } catch (err) {
+        if (abortController.signal.aborted || err.name === "AbortError") {
+          if (isCurrentRequest()) {
+            this.setStatus({ status: "ready" });
+          }
+          clearActiveResumeRequest();
+          return;
+        }
+        if (!isCurrentRequest()) {
+          return;
+        }
         if (this.onError && err instanceof Error) {
           this.onError(err);
         }
         this.setStatus({ status: "error", error: err });
+        clearActiveResumeRequest();
         return;
       }
     }
@@ -13996,10 +14047,10 @@ var AbstractChat = class {
     try {
       const response = {
         state: createStreamingUIMessageState({
-          lastMessage: trigger === "regenerate-message" ? void 0 : this.state.snapshot(lastMessage),
+          lastMessage: trigger === "resume-stream" || trigger === "regenerate-message" ? void 0 : this.state.snapshot(lastMessage),
           messageId: this.generateId()
         }),
-        abortController: new AbortController()
+        abortController
       };
       activeResponse = response;
       response.abortController.signal.addEventListener("abort", () => {
@@ -14023,11 +14074,17 @@ var AbstractChat = class {
       }
       const runUpdateMessageJob = (job) => (
         // serialize the job execution to avoid race conditions:
-        this.jobExecutor.run(
-          () => job({
+        this.jobExecutor.run(() => {
+          if (response.abortController.signal.aborted) {
+            return Promise.resolve();
+          }
+          return job({
             state: response.state,
             write: () => {
               var _a23;
+              if (response.abortController.signal.aborted) {
+                return;
+              }
               this.setStatus({ status: "streaming" });
               const replaceLastMessage = response.state.message.id === ((_a23 = this.lastMessage) == null ? void 0 : _a23.id);
               if (replaceLastMessage) {
@@ -14039,8 +14096,8 @@ var AbstractChat = class {
                 this.state.pushMessage(response.state.message);
               }
             }
-          })
-        )
+          });
+        })
       );
       await consumeStream({
         stream: processUIMessageStream({
@@ -14054,15 +14111,29 @@ var AbstractChat = class {
             throw error;
           }
         }),
+        abortSignal: response.abortController.signal,
         onError: (error) => {
           throw error;
         }
       });
-      this.setStatus({ status: "ready" });
+      if (isAbort) {
+        if (isCurrentRequest()) {
+          this.setStatus({ status: "ready" });
+        }
+        return null;
+      }
+      if (isCurrentRequest()) {
+        this.setStatus({ status: "ready" });
+      }
     } catch (err) {
       if (isAbort || err.name === "AbortError") {
         isAbort = true;
-        this.setStatus({ status: "ready" });
+        if (isCurrentRequest()) {
+          this.setStatus({ status: "ready" });
+        }
+        return null;
+      }
+      if (!isCurrentRequest()) {
         return null;
       }
       isError = true;
@@ -14076,7 +14147,7 @@ var AbstractChat = class {
     } finally {
       try {
         if (activeResponse) {
-          (_a22 = this.onFinish) == null ? void 0 : _a22.call(this, {
+          (_b = this.onFinish) == null ? void 0 : _b.call(this, {
             message: activeResponse.state.message,
             messages: this.state.messages,
             isAbort,
@@ -14091,11 +14162,12 @@ var AbstractChat = class {
       if (this.activeResponse === activeResponse) {
         this.activeResponse = void 0;
       }
+      clearActiveResumeRequest();
     }
     if (!isError && await this.shouldSendAutomatically()) {
       await this.makeRequest({
         trigger: "submit-message",
-        messageId: (_b = this.lastMessage) == null ? void 0 : _b.id,
+        messageId: (_c = this.lastMessage) == null ? void 0 : _c.id,
         metadata,
         headers,
         body