ai 6.0.302 → 6.0.303

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # ai
 
+## 6.0.303
+
+### Patch Changes
+
+- c0350be: fix(ai): prevent global type conflicts across SDK versions
+- 88aa201: fix(ai): wait for chat stream cleanup when stopping
+- 8444abe: fix(ai): discard unrelated message state when reading resumed streams
+- Updated dependencies [897cb0c]
+- Updated dependencies [7719e88]
+  - @ai-sdk/gateway@3.0.212
+
 ## 6.0.302
 
 ### Patch Changes

package/dist/index.d.mts

@@ -3305,7 +3305,15 @@ interface TelemetryIntegration {
     onFinish?: Listener<OnFinishEvent<ToolSet>>;
 }
 
+declare const aiSdkGlobalsKey: unique symbol;
 declare global {
+    interface AISDKGlobalTypes {
+        [aiSdkGlobalsKey]: {
+            provider: ProviderV3;
+            logWarnings: LogWarningsFunction;
+            telemetry: TelemetryIntegration;
+        };
+    }
     /**
      * The default provider to use for the AI SDK.
      * String model ids are resolved to the default provider and model id.
@@ -3314,7 +3322,7 @@ declare global {
      *
      * @see https://ai-sdk.dev/docs/ai-sdk-core/provider-management#global-provider-configuration
      */
-    var AI_SDK_DEFAULT_PROVIDER: ProviderV3 | undefined;
+    var AI_SDK_DEFAULT_PROVIDER: AISDKGlobalTypes[keyof AISDKGlobalTypes]['provider'] | undefined;
     /**
      * The warning logger to use for the AI SDK.
      *
@@ -3322,7 +3330,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;
     /**
      * Globally registered telemetry integrations for the AI SDK.
      *
@@ -3332,7 +3340,7 @@ declare global {
      * Prefer using `registerTelemetryIntegration()` from `'ai'` instead of
      * assigning this directly.
      */
-    var AI_SDK_TELEMETRY_INTEGRATIONS: TelemetryIntegration[] | undefined;
+    var AI_SDK_TELEMETRY_INTEGRATIONS: Array<AISDKGlobalTypes[keyof AISDKGlobalTypes]['telemetry']> | undefined;
 }
 
 type ToolLoopAgentOnStepFinishCallback<TOOLS extends ToolSet = {}> = (stepResult: OnStepFinishEvent<TOOLS>) => Promise<void> | void;
@@ -3897,6 +3905,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>;
     });
@@ -3959,12 +3969,15 @@ declare abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
     /** @deprecated Use addToolOutput */
     addToolResult: ChatAddToolOutputFunction<UI_MESSAGE>;
     /**
-     * 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 makeRequestForToolApproval;
     private makeRequest;
+    private makeRequestImpl;
 }
 
 declare function convertFileListToFileUIParts(files: FileList | undefined): Promise<Array<FileUIPart>>;
@@ -5484,8 +5497,10 @@ type Job = () => Promise<void>;
 declare class SerialJobExecutor {
     private queue;
     private isProcessing;
+    private idleWaiters;
     private processQueue;
     run(job: Job): Promise<void>;
+    waitForIdle(): Promise<void>;
 }
 
 /**

package/dist/index.d.ts

@@ -3305,7 +3305,15 @@ interface TelemetryIntegration {
     onFinish?: Listener<OnFinishEvent<ToolSet>>;
 }
 
+declare const aiSdkGlobalsKey: unique symbol;
 declare global {
+    interface AISDKGlobalTypes {
+        [aiSdkGlobalsKey]: {
+            provider: ProviderV3;
+            logWarnings: LogWarningsFunction;
+            telemetry: TelemetryIntegration;
+        };
+    }
     /**
      * The default provider to use for the AI SDK.
      * String model ids are resolved to the default provider and model id.
@@ -3314,7 +3322,7 @@ declare global {
      *
      * @see https://ai-sdk.dev/docs/ai-sdk-core/provider-management#global-provider-configuration
      */
-    var AI_SDK_DEFAULT_PROVIDER: ProviderV3 | undefined;
+    var AI_SDK_DEFAULT_PROVIDER: AISDKGlobalTypes[keyof AISDKGlobalTypes]['provider'] | undefined;
     /**
      * The warning logger to use for the AI SDK.
      *
@@ -3322,7 +3330,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;
     /**
      * Globally registered telemetry integrations for the AI SDK.
      *
@@ -3332,7 +3340,7 @@ declare global {
      * Prefer using `registerTelemetryIntegration()` from `'ai'` instead of
      * assigning this directly.
      */
-    var AI_SDK_TELEMETRY_INTEGRATIONS: TelemetryIntegration[] | undefined;
+    var AI_SDK_TELEMETRY_INTEGRATIONS: Array<AISDKGlobalTypes[keyof AISDKGlobalTypes]['telemetry']> | undefined;
 }
 
 type ToolLoopAgentOnStepFinishCallback<TOOLS extends ToolSet = {}> = (stepResult: OnStepFinishEvent<TOOLS>) => Promise<void> | void;
@@ -3897,6 +3905,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>;
     });
@@ -3959,12 +3969,15 @@ declare abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
     /** @deprecated Use addToolOutput */
     addToolResult: ChatAddToolOutputFunction<UI_MESSAGE>;
     /**
-     * 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 makeRequestForToolApproval;
     private makeRequest;
+    private makeRequestImpl;
 }
 
 declare function convertFileListToFileUIParts(files: FileList | undefined): Promise<Array<FileUIPart>>;
@@ -5484,8 +5497,10 @@ type Job = () => Promise<void>;
 declare class SerialJobExecutor {
     private queue;
     private isProcessing;
+    private idleWaiters;
     private processQueue;
     run(job: Job): Promise<void>;
+    waitForIdle(): Promise<void>;
 }
 
 /**

package/dist/index.js

@@ -1335,7 +1335,7 @@ function detectMediaType({
 var import_provider_utils3 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.302" : "0.0.0-test";
+var VERSION = true ? "6.0.303" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -6124,7 +6124,8 @@ function processUIMessageStream({
   runUpdateMessageJob,
   onError,
   onToolCall,
-  onData
+  onData,
+  resetStateOnMessageIdChange = false
 }) {
   return stream.pipeThrough(
     new TransformStream({
@@ -6637,6 +6638,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;
               }
@@ -9691,6 +9702,7 @@ function readUIMessageStream({
   consumeStream({
     stream: processUIMessageStream({
       stream,
+      resetStateOnMessageIdChange: true,
       runUpdateMessageJob(job) {
         return job({
           state,
@@ -11997,17 +12009,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 resolve3 of this.idleWaiters.splice(0)) {
+        resolve3();
+      }
     }
-    this.isProcessing = false;
   }
   async run(job) {
     return new Promise((resolve3, reject) => {
@@ -12022,6 +12041,14 @@ var SerialJobExecutor = class {
       void this.processQueue();
     });
   }
+  async waitForIdle() {
+    if (!this.isProcessing && this.queue.length === 0) {
+      return;
+    }
+    await new Promise((resolve3) => {
+      this.idleWaiters.push(resolve3);
+    });
+  }
 };
 
 // src/util/simulate-readable-stream.ts
@@ -14657,6 +14684,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.
@@ -14800,17 +14829,18 @@ var AbstractChat = class {
         this.activeResponse.state.message.parts = this.activeResponse.state.message.parts.map(updatePart);
       }
       if (this.status !== "streaming" && this.status !== "submitted" && this.sendAutomaticallyWhen) {
-        this.shouldSendAutomatically().then((shouldSend) => {
-          var _a23;
-          if (shouldSend) {
+        const shouldSend = await this.shouldSendAutomatically();
+        if (shouldSend) {
+          void this.runAutomaticRequest(() => {
+            var _a23;
             const messageId = messageIndex === -1 ? (_a23 = this.lastMessage) == null ? void 0 : _a23.id : messages[messageIndex].id;
-            this.makeRequestForToolApproval({
+            return this.makeRequestForToolApproval({
               messageId,
               messageIndex,
               ...options
             });
-          }
-        });
+          }, shouldSend);
+        }
       }
     });
     this.addToolOutput = async ({
@@ -14831,27 +14861,44 @@ var AbstractChat = class {
         this.activeResponse.state.message.parts = this.activeResponse.state.message.parts.map(updatePart);
       }
       if (this.status !== "streaming" && this.status !== "submitted" && this.sendAutomaticallyWhen) {
-        this.shouldSendAutomatically().then((shouldSend) => {
-          var _a23;
-          if (shouldSend) {
-            this.makeRequest({
-              trigger: "submit-message",
-              messageId: (_a23 = this.lastMessage) == null ? void 0 : _a23.id,
-              ...options
-            });
-          }
-        });
+        const shouldSend = await this.shouldSendAutomatically();
+        if (shouldSend) {
+          void this.runAutomaticRequest(
+            () => {
+              var _a23;
+              return this.makeRequest({
+                trigger: "submit-message",
+                messageId: (_a23 = this.lastMessage) == null ? void 0 : _a23.id,
+                ...options
+              });
+            },
+            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 _a23, _b;
-      (_a23 = this.activeResumeRequest) == null ? void 0 : _a23.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;
@@ -14912,6 +14959,17 @@ var AbstractChat = class {
     }
     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 makeRequestForToolApproval({
     messageId,
     messageIndex,
@@ -14931,19 +14989,31 @@ var AbstractChat = class {
       this.pendingApprovalMessageId = (_b = (_a23 = this.state.messages[messageIndex]) == null ? void 0 : _a23.id) != null ? _b : messageId;
     }
   }
-  async makeRequest({
+  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 _a23, _b, _c;
+    var _a23, _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) {
       (_a23 = this.activeResumeRequest) == null ? void 0 : _a23.abortController.abort();
       this.activeResumeRequest = activeResumeRequest;
@@ -15019,7 +15089,8 @@ var AbstractChat = class {
           lastMessage: trigger === "resume-stream" ? resumableResponseMessage : trigger === "regenerate-message" ? void 0 : this.state.snapshot(responseMessage),
           messageId: this.generateId()
         }),
-        abortController
+        abortController,
+        completionPromise
       };
       activeResponse = response;
       response.abortController.signal.addEventListener("abort", () => {
@@ -15152,14 +15223,19 @@ var AbstractChat = class {
         clearActiveResumeRequest();
       }
     }
-    if (!isError && await this.shouldSendAutomatically()) {
-      await this.makeRequest({
-        trigger: "submit-message",
-        messageId: (_c = this.lastMessage) == null ? void 0 : _c.id,
-        metadata,
-        headers,
-        body
-      });
+    if (!isAbort && !isError) {
+      await this.runAutomaticRequest(
+        () => {
+          var _a24;
+          return this.makeRequest({
+            trigger: "submit-message",
+            messageId: (_a24 = this.lastMessage) == null ? void 0 : _a24.id,
+            metadata,
+            headers,
+            body
+          });
+        }
+      );
     }
   }
 };