ai 5.0.273 → 5.0.274

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # ai
 
+## 5.0.274
+
+### Patch Changes
+
+- f47f8e0: fix: resume interrupted chat streams when the page becomes visible again
+
+  `useChat` with `resume: true` no longer starts a second resume request on mount when the chat is already submitted or streaming, e.g. when remounting with a shared `Chat` instance mid-stream.
+
+- ab0ecab: fix(ai): update tool outputs in the message containing the matching tool call
+- dc561f0: fix(ai): prevent global type conflicts across SDK versions
+- c060bd2: fix(ai): wait for chat stream cleanup when stopping
+- dbf4338: fix(ai): update streaming chat messages by stable ID
+- 99c9177: fix(ai): discard unrelated message state when reading resumed streams
+- Updated dependencies [313a602]
+- Updated dependencies [ae1ebda]
+  - @ai-sdk/gateway@2.0.165
+
 ## 5.0.273
 
 ### Patch Changes

package/dist/index.d.mts

@@ -15,7 +15,15 @@ import { ServerResponse as ServerResponse$1 } from 'http';
 type Warning = LanguageModelV2CallWarning | ImageModelV2CallWarning | SpeechModelV2CallWarning | TranscriptionModelV2CallWarning;
 type LogWarningsFunction = (warnings: Warning[]) => void;
 
+declare const aiSdkGlobalsKey: unique symbol;
 declare global {
+    interface AISDKGlobalTypes {
+        [aiSdkGlobalsKey]: {
+            provider: ProviderV2;
+            logWarnings: LogWarningsFunction;
+            telemetry: never;
+        };
+    }
     /**
      * The default provider to use for the AI SDK.
      * String model ids are resolved to the default provider and model id.
@@ -24,7 +32,7 @@ declare global {
      *
      * @see https://ai-sdk.dev/docs/ai-sdk-core/provider-management#global-provider-configuration
      */
-    var AI_SDK_DEFAULT_PROVIDER: ProviderV2 | undefined;
+    var AI_SDK_DEFAULT_PROVIDER: AISDKGlobalTypes[keyof AISDKGlobalTypes]['provider'] | undefined;
     /**
      * The warning logger to use for the AI SDK.
      *
@@ -32,7 +40,7 @@ declare global {
      *
      * If set to false, no warnings are logged.
      */
-    var AI_SDK_LOG_WARNINGS: LogWarningsFunction | undefined | false;
+    var AI_SDK_LOG_WARNINGS: AISDKGlobalTypes[keyof AISDKGlobalTypes]['logWarnings'] | undefined | false;
 }
 
 type CallSettings = {
@@ -3212,8 +3220,10 @@ type Job = () => Promise<void>;
 declare class SerialJobExecutor {
     private queue;
     private isProcessing;
+    private idleWaiters;
     private processQueue;
     run(job: Job): Promise<void>;
+    waitForIdle(): Promise<void>;
 }
 
 /**
@@ -4188,6 +4198,8 @@ declare abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
     private activeResumeRequest;
     private resumableStreamState;
     private jobExecutor;
+    private activeStopCount;
+    private stopGeneration;
     constructor({ generateId, id, transport, messageMetadataSchema, dataPartSchemas, state, onError, onToolCall, onFinish, onData, sendAutomaticallyWhen, }: Omit<ChatInit<UI_MESSAGE>, 'messages'> & {
         state: ChatState<UI_MESSAGE>;
     });
@@ -4273,10 +4285,14 @@ declare abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
         errorText: string;
     }) => Promise<void>;
     /**
-     * Abort the current request immediately, keep the generated tokens if any.
+     * Abort the current request, keep the generated tokens if any, and wait for
+     * the request pipeline to finish.
      */
     stop: () => Promise<void>;
+    private shouldSendAutomatically;
+    private runAutomaticRequest;
     private makeRequest;
+    private makeRequestImpl;
 }
 
 declare function convertFileListToFileUIParts(files: FileList | undefined): Promise<Array<FileUIPart>>;

package/dist/index.d.ts

@@ -15,7 +15,15 @@ import { ServerResponse as ServerResponse$1 } from 'http';
 type Warning = LanguageModelV2CallWarning | ImageModelV2CallWarning | SpeechModelV2CallWarning | TranscriptionModelV2CallWarning;
 type LogWarningsFunction = (warnings: Warning[]) => void;
 
+declare const aiSdkGlobalsKey: unique symbol;
 declare global {
+    interface AISDKGlobalTypes {
+        [aiSdkGlobalsKey]: {
+            provider: ProviderV2;
+            logWarnings: LogWarningsFunction;
+            telemetry: never;
+        };
+    }
     /**
      * The default provider to use for the AI SDK.
      * String model ids are resolved to the default provider and model id.
@@ -24,7 +32,7 @@ declare global {
      *
      * @see https://ai-sdk.dev/docs/ai-sdk-core/provider-management#global-provider-configuration
      */
-    var AI_SDK_DEFAULT_PROVIDER: ProviderV2 | undefined;
+    var AI_SDK_DEFAULT_PROVIDER: AISDKGlobalTypes[keyof AISDKGlobalTypes]['provider'] | undefined;
     /**
      * The warning logger to use for the AI SDK.
      *
@@ -32,7 +40,7 @@ declare global {
      *
      * If set to false, no warnings are logged.
      */
-    var AI_SDK_LOG_WARNINGS: LogWarningsFunction | undefined | false;
+    var AI_SDK_LOG_WARNINGS: AISDKGlobalTypes[keyof AISDKGlobalTypes]['logWarnings'] | undefined | false;
 }
 
 type CallSettings = {
@@ -3212,8 +3220,10 @@ type Job = () => Promise<void>;
 declare class SerialJobExecutor {
     private queue;
     private isProcessing;
+    private idleWaiters;
     private processQueue;
     run(job: Job): Promise<void>;
+    waitForIdle(): Promise<void>;
 }
 
 /**
@@ -4188,6 +4198,8 @@ declare abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
     private activeResumeRequest;
     private resumableStreamState;
     private jobExecutor;
+    private activeStopCount;
+    private stopGeneration;
     constructor({ generateId, id, transport, messageMetadataSchema, dataPartSchemas, state, onError, onToolCall, onFinish, onData, sendAutomaticallyWhen, }: Omit<ChatInit<UI_MESSAGE>, 'messages'> & {
         state: ChatState<UI_MESSAGE>;
     });
@@ -4273,10 +4285,14 @@ declare abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
         errorText: string;
     }) => Promise<void>;
     /**
-     * Abort the current request immediately, keep the generated tokens if any.
+     * Abort the current request, keep the generated tokens if any, and wait for
+     * the request pipeline to finish.
      */
     stop: () => Promise<void>;
+    private shouldSendAutomatically;
+    private runAutomaticRequest;
     private makeRequest;
+    private makeRequestImpl;
 }
 
 declare function convertFileListToFileUIParts(files: FileList | undefined): Promise<Array<FileUIPart>>;

package/dist/index.js

@@ -817,7 +817,7 @@ function detectMediaType({
 var import_provider_utils2 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "5.0.273" : "0.0.0-test";
+var VERSION = true ? "5.0.274" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -3818,7 +3818,8 @@ function processUIMessageStream({
   runUpdateMessageJob,
   onError,
   onToolCall,
-  onData
+  onData,
+  resetStateOnMessageIdChange = false
 }) {
   return stream.pipeThrough(
     new TransformStream({
@@ -4235,6 +4236,16 @@ function processUIMessageStream({
               break;
             }
             case "start": {
+              if (resetStateOnMessageIdChange && chunk.messageId != null && chunk.messageId !== state.message.id) {
+                Object.assign(
+                  state,
+                  createStreamingUIMessageState({
+                    lastMessage: void 0,
+                    messageId: chunk.messageId
+                  }),
+                  { finishReason: void 0 }
+                );
+              }
               if (chunk.messageId != null) {
                 state.message.id = chunk.messageId;
               }
@@ -8036,17 +8047,24 @@ var SerialJobExecutor = class {
   constructor() {
     this.queue = [];
     this.isProcessing = false;
+    this.idleWaiters = [];
   }
   async processQueue() {
     if (this.isProcessing) {
       return;
     }
     this.isProcessing = true;
-    while (this.queue.length > 0) {
-      await this.queue[0]();
-      this.queue.shift();
+    try {
+      while (this.queue.length > 0) {
+        await this.queue[0]();
+        this.queue.shift();
+      }
+    } finally {
+      this.isProcessing = false;
+      for (const resolve2 of this.idleWaiters.splice(0)) {
+        resolve2();
+      }
     }
-    this.isProcessing = false;
   }
   async run(job) {
     return new Promise((resolve2, reject) => {
@@ -8061,6 +8079,14 @@ var SerialJobExecutor = class {
       void this.processQueue();
     });
   }
+  async waitForIdle() {
+    if (!this.isProcessing && this.queue.length === 0) {
+      return;
+    }
+    await new Promise((resolve2) => {
+      this.idleWaiters.push(resolve2);
+    });
+  }
 };
 
 // src/util/simulate-readable-stream.ts
@@ -9980,6 +10006,8 @@ var AbstractChat = class {
     this.activeResumeRequest = void 0;
     this.resumableStreamState = void 0;
     this.jobExecutor = new SerialJobExecutor();
+    this.activeStopCount = 0;
+    this.stopGeneration = 0;
     /**
      * Appends or replaces a user message to the chat list. This triggers the API call to fetch
      * the assistant's response.
@@ -10070,6 +10098,27 @@ var AbstractChat = class {
     this.resumeStream = async (options = {}) => {
       await this.makeRequest({ trigger: "resume-stream", ...options });
     };
+    /**
+     * Resume the stream if the latest response ended with a resumable network
+     * disconnect. If a response is still active, wait for it to settle first so
+     * disconnects reported shortly after the caller's trigger are handled.
+     *
+     * @internal
+     */
+    this["~resumeStreamIfDisconnected"] = async ({
+      shouldResume = () => true
+    } = {}) => {
+      const activeResponse = this.activeResponse;
+      if (this.resumableStreamState == null && activeResponse != null) {
+        await activeResponse.completionPromise;
+        if (this.resumableStreamState !== activeResponse.state) {
+          return;
+        }
+      }
+      if (this.resumableStreamState != null && shouldResume()) {
+        await this.resumeStream();
+      }
+    };
     /**
      * Clear the error state and set the status to ready if the chat is in an error state.
      */
@@ -10086,15 +10135,21 @@ var AbstractChat = class {
       output,
       errorText
     }) => this.jobExecutor.run(async () => {
-      var _a16, _b;
       const messages = this.state.messages;
-      const lastMessage = messages[messages.length - 1];
-      this.state.replaceMessage(messages.length - 1, {
-        ...lastMessage,
-        parts: lastMessage.parts.map(
-          (part) => isToolOrDynamicToolUIPart(part) && part.toolCallId === toolCallId ? { ...part, state, output, errorText } : part
+      const messageIndex = messages.findIndex(
+        (message) => message.parts.some(
+          (part) => isToolOrDynamicToolUIPart(part) && part.toolCallId === toolCallId
         )
-      });
+      );
+      if (messageIndex !== -1) {
+        const message = messages[messageIndex];
+        this.state.replaceMessage(messageIndex, {
+          ...message,
+          parts: message.parts.map(
+            (part) => isToolOrDynamicToolUIPart(part) && part.toolCallId === toolCallId ? { ...part, state, output, errorText } : part
+          )
+        });
+      }
       if (this.activeResponse) {
         this.activeResponse.state.message.parts = this.activeResponse.state.message.parts.map(
           (part) => isToolOrDynamicToolUIPart(part) && part.toolCallId === toolCallId ? {
@@ -10105,22 +10160,41 @@ var AbstractChat = class {
           } : part
         );
       }
-      if (this.status !== "streaming" && this.status !== "submitted" && ((_a16 = this.sendAutomaticallyWhen) == null ? void 0 : _a16.call(this, { messages: this.state.messages }))) {
-        this.makeRequest({
-          trigger: "submit-message",
-          messageId: (_b = this.lastMessage) == null ? void 0 : _b.id
-        });
+      if (messageIndex !== -1 && this.status !== "streaming" && this.status !== "submitted" && this.sendAutomaticallyWhen) {
+        const shouldSend = await this.shouldSendAutomatically();
+        if (shouldSend) {
+          void this.runAutomaticRequest(
+            () => this.makeRequest({
+              trigger: "submit-message",
+              messageId: messages[messageIndex].id
+            }),
+            shouldSend
+          );
+        }
       }
     });
     /** @deprecated Use addToolOutput */
     this.addToolResult = this.addToolOutput;
     /**
-     * Abort the current request immediately, keep the generated tokens if any.
+     * Abort the current request, keep the generated tokens if any, and wait for
+     * the request pipeline to finish.
      */
     this.stop = async () => {
-      var _a16, _b;
-      (_a16 = this.activeResumeRequest) == null ? void 0 : _a16.abortController.abort();
-      (_b = this.activeResponse) == null ? void 0 : _b.abortController.abort();
+      this.activeStopCount++;
+      this.stopGeneration++;
+      try {
+        const activeResumeRequest = this.activeResumeRequest;
+        const activeResponse = this.activeResponse;
+        activeResumeRequest == null ? void 0 : activeResumeRequest.abortController.abort();
+        activeResponse == null ? void 0 : activeResponse.abortController.abort();
+        await Promise.all([
+          activeResumeRequest == null ? void 0 : activeResumeRequest.completionPromise,
+          activeResponse == null ? void 0 : activeResponse.completionPromise
+        ]);
+        await this.jobExecutor.waitForIdle();
+      } finally {
+        this.activeStopCount--;
+      }
     };
     this.id = id;
     this.transport = transport;
@@ -10166,19 +10240,53 @@ var AbstractChat = class {
   set messages(messages) {
     this.state.messages = messages;
   }
-  async makeRequest({
+  async shouldSendAutomatically() {
+    if (!this.sendAutomaticallyWhen)
+      return false;
+    const result = this.sendAutomaticallyWhen({
+      messages: this.state.messages
+    });
+    if (result && typeof result === "object" && "then" in result) {
+      return await result;
+    }
+    return result;
+  }
+  async runAutomaticRequest(request, shouldSend) {
+    const stopGeneration = this.stopGeneration;
+    const startedWhileStopping = this.activeStopCount > 0;
+    if (!(shouldSend != null ? shouldSend : await this.shouldSendAutomatically())) {
+      return;
+    }
+    if (startedWhileStopping || stopGeneration !== this.stopGeneration || this.activeStopCount > 0) {
+      return;
+    }
+    await request();
+  }
+  async makeRequest(options) {
+    const completion = createResolvablePromise();
+    try {
+      await this.makeRequestImpl({
+        ...options,
+        completionPromise: completion.promise
+      });
+    } finally {
+      completion.resolve();
+    }
+  }
+  async makeRequestImpl({
     trigger,
     metadata,
     headers,
     body,
-    messageId
+    messageId,
+    completionPromise
   }) {
-    var _a16, _b, _c, _d;
+    var _a16, _b;
     if (trigger !== "resume-stream") {
       this.resumableStreamState = void 0;
     }
     const abortController = new AbortController();
-    const activeResumeRequest = trigger === "resume-stream" ? { abortController } : void 0;
+    const activeResumeRequest = trigger === "resume-stream" ? { abortController, completionPromise } : void 0;
     if (activeResumeRequest) {
       (_a16 = this.activeResumeRequest) == null ? void 0 : _a16.abortController.abort();
       this.activeResumeRequest = activeResumeRequest;
@@ -10191,9 +10299,13 @@ var AbstractChat = class {
     };
     this.setStatus({ status: "submitted", error: void 0 });
     const lastMessage = this.lastMessage;
+    const responseMessageIndex = trigger === "submit-message" && messageId != null ? this.state.messages.findIndex((message) => message.id === messageId) : this.state.messages.length - 1;
+    const responseMessage = responseMessageIndex === -1 ? lastMessage : this.state.messages[responseMessageIndex];
+    const originalResponseMessageId = responseMessage == null ? void 0 : responseMessage.id;
     const resumableResponseMessage = trigger === "resume-stream" && (lastMessage == null ? void 0 : lastMessage.role) === "assistant" && lastMessage.parts.some(
       (part) => isToolOrDynamicToolUIPart(part) && part.state === "input-streaming"
     ) ? this.state.snapshot(lastMessage) : void 0;
+    const usesEarlierAssistantMessage = responseMessageIndex !== -1 && responseMessageIndex < this.state.messages.length - 1 && (responseMessage == null ? void 0 : responseMessage.role) === "assistant";
     let isAbort = false;
     let isDisconnect = false;
     let isError = false;
@@ -10201,10 +10313,11 @@ var AbstractChat = class {
     try {
       const response = {
         state: trigger === "resume-stream" && this.resumableStreamState != null ? this.resumableStreamState : createStreamingUIMessageState({
-          lastMessage: trigger === "resume-stream" ? resumableResponseMessage : this.state.snapshot(lastMessage),
+          lastMessage: trigger === "resume-stream" ? resumableResponseMessage : this.state.snapshot(responseMessage),
           messageId: this.generateId()
         }),
-        abortController
+        abortController,
+        completionPromise
       };
       activeResponse = response;
       response.abortController.signal.addEventListener("abort", () => {
@@ -10258,19 +10371,32 @@ var AbstractChat = class {
           return job({
             state: response.state,
             write: ({ updateStatus = true } = {}) => {
-              var _a17;
               if (response.abortController.signal.aborted) {
                 return;
               }
               if (updateStatus) {
                 this.setStatus({ status: "streaming" });
               }
-              const replaceLastMessage = response.state.message.id === ((_a17 = this.lastMessage) == null ? void 0 : _a17.id);
-              if (replaceLastMessage) {
+              const existingMessageIndex = this.state.messages.findLastIndex(
+                (message) => message.id === response.state.message.id
+              );
+              if (existingMessageIndex !== -1) {
                 this.state.replaceMessage(
-                  this.state.messages.length - 1,
+                  existingMessageIndex,
                   response.state.message
                 );
+              } else if (usesEarlierAssistantMessage) {
+                const originalMessageIndex = this.state.messages.findLastIndex(
+                  (message) => message.id === originalResponseMessageId
+                );
+                if (originalMessageIndex !== -1) {
+                  this.state.replaceMessage(
+                    originalMessageIndex,
+                    response.state.message
+                  );
+                } else {
+                  this.state.pushMessage(response.state.message);
+                }
               } else {
                 this.state.pushMessage(response.state.message);
               }
@@ -10356,14 +10482,19 @@ var AbstractChat = class {
         clearActiveResumeRequest();
       }
     }
-    if (((_c = this.sendAutomaticallyWhen) == null ? void 0 : _c.call(this, { messages: this.state.messages })) && !isError) {
-      await this.makeRequest({
-        trigger: "submit-message",
-        messageId: (_d = this.lastMessage) == null ? void 0 : _d.id,
-        metadata,
-        headers,
-        body
-      });
+    if (!isAbort && !isError) {
+      await this.runAutomaticRequest(
+        () => {
+          var _a17;
+          return this.makeRequest({
+            trigger: "submit-message",
+            messageId: (_a17 = this.lastMessage) == null ? void 0 : _a17.id,
+            metadata,
+            headers,
+            body
+          });
+        }
+      );
     }
   }
 };
@@ -10989,6 +11120,7 @@ function readUIMessageStream({
   consumeStream({
     stream: processUIMessageStream({
       stream,
+      resetStateOnMessageIdChange: true,
       runUpdateMessageJob(job) {
         return job({
           state,