ai 5.0.0-beta.22 → 5.0.0-beta.24

package/dist/index.mjs

@@ -2409,7 +2409,8 @@ import {
   getErrorMessage as getErrorMessage5
 } from "@ai-sdk/provider";
 import {
-  createIdGenerator as createIdGenerator2
+  createIdGenerator as createIdGenerator2,
+  isAbortError as isAbortError2
 } from "@ai-sdk/provider-utils";
 
 // src/util/prepare-headers.ts
@@ -2671,6 +2672,9 @@ var uiMessageChunkSchema = z7.union([
     type: z7.literal("finish"),
     messageMetadata: z7.unknown().optional()
   }),
+  z7.strictObject({
+    type: z7.literal("abort")
+  }),
   z7.strictObject({
     type: z7.literal("message-metadata"),
     messageMetadata: z7.unknown()
@@ -3055,7 +3059,7 @@ function isToolUIPart(part) {
   return part.type.startsWith("tool-");
 }
 function getToolName(part) {
-  return part.type.split("-")[1];
+  return part.type.split("-").slice(1).join("-");
 }
 
 // src/ui/process-ui-message-stream.ts
@@ -3414,6 +3418,7 @@ function handleUIMessageStreamFinish({
   } else {
     messageId = lastMessage.id;
   }
+  let isAborted = false;
   const idInjectedStream = stream.pipeThrough(
     new TransformStream({
       transform(chunk, controller) {
@@ -3423,6 +3428,9 @@ function handleUIMessageStreamFinish({
             startChunk.messageId = messageId;
           }
         }
+        if (chunk.type === "abort") {
+          isAborted = true;
+        }
         controller.enqueue(chunk);
       }
     })
@@ -3448,9 +3456,10 @@ function handleUIMessageStreamFinish({
       transform(chunk, controller) {
         controller.enqueue(chunk);
       },
-      flush() {
+      async flush() {
         const isContinuation = state.message.id === (lastMessage == null ? void 0 : lastMessage.id);
-        onFinish({
+        await onFinish({
+          isAborted,
           isContinuation,
           responseMessage: state.message,
           messages: [
@@ -3544,6 +3553,13 @@ function createStitchableStream() {
   let controller = null;
   let isClosed = false;
   let waitForNewStream = createResolvablePromise();
+  const terminate = () => {
+    isClosed = true;
+    waitForNewStream.resolve();
+    innerStreamReaders.forEach((reader) => reader.cancel());
+    innerStreamReaders = [];
+    controller == null ? void 0 : controller.close();
+  };
   const processPull = async () => {
     if (isClosed && innerStreamReaders.length === 0) {
       controller == null ? void 0 : controller.close();
@@ -3569,9 +3585,7 @@ function createStitchableStream() {
     } catch (error) {
       controller == null ? void 0 : controller.error(error);
       innerStreamReaders.shift();
-      if (isClosed && innerStreamReaders.length === 0) {
-        controller == null ? void 0 : controller.close();
-      }
+      terminate();
     }
   };
   return {
@@ -3610,13 +3624,7 @@ function createStitchableStream() {
      * Immediately close the outer stream. This will cancel all inner streams
      * and close the outer stream.
      */
-    terminate: () => {
-      isClosed = true;
-      waitForNewStream.resolve();
-      innerStreamReaders.forEach((reader) => reader.cancel());
-      innerStreamReaders = [];
-      controller == null ? void 0 : controller.close();
-    }
+    terminate
   };
 }
 
@@ -3664,6 +3672,30 @@ function now() {
   return (_b = (_a16 = globalThis == null ? void 0 : globalThis.performance) == null ? void 0 : _a16.now()) != null ? _b : Date.now();
 }
 
+// src/util/filter-stream-errors.ts
+function filterStreamErrors(readable, onError) {
+  return new ReadableStream({
+    async start(controller) {
+      const reader = readable.getReader();
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) {
+            controller.close();
+            break;
+          }
+          controller.enqueue(value);
+        }
+      } catch (error) {
+        await onError({ error, controller });
+      }
+    },
+    cancel(reason) {
+      return readable.cancel(reason);
+    }
+  });
+}
+
 // src/generate-text/run-tools-transformation.ts
 import { generateId } from "@ai-sdk/provider-utils";
 function runToolsTransformation({
@@ -3912,6 +3944,7 @@ function streamText({
     console.error(error);
   },
   onFinish,
+  onAbort,
   onStepFinish,
   _internal: {
     now: now2 = now,
@@ -3943,6 +3976,7 @@ function streamText({
     onChunk,
     onError,
     onFinish,
+    onAbort,
     onStepFinish,
     now: now2,
     currentDate,
@@ -4041,6 +4075,7 @@ var DefaultStreamTextResult = class {
     onChunk,
     onError,
     onFinish,
+    onAbort,
     onStepFinish
   }) {
     this._totalUsage = new DelayedPromise();
@@ -4048,7 +4083,6 @@ var DefaultStreamTextResult = class {
     this._steps = new DelayedPromise();
     this.output = output;
     this.includeRawChunks = includeRawChunks;
-    this.generateId = generateId3;
     let stepFinish;
     let recordedContent = [];
     const recordedResponseMessages = [];
@@ -4251,6 +4285,15 @@ var DefaultStreamTextResult = class {
     this.addStream = stitchableStream.addStream;
     this.closeStream = stitchableStream.close;
     let stream = stitchableStream.stream;
+    stream = filterStreamErrors(stream, ({ error, controller }) => {
+      if (isAbortError2(error) && (abortSignal == null ? void 0 : abortSignal.aborted)) {
+        onAbort == null ? void 0 : onAbort({ steps: recordedSteps });
+        controller.enqueue({ type: "abort" });
+        controller.close();
+      } else {
+        controller.error(error);
+      }
+    });
     stream = stream.pipeThrough(
       new TransformStream({
         start(controller) {
@@ -4993,6 +5036,10 @@ var DefaultStreamTextResult = class {
               }
               break;
             }
+            case "abort": {
+              controller.enqueue(part);
+              break;
+            }
             case "tool-input-end": {
               break;
             }
@@ -5013,13 +5060,15 @@ var DefaultStreamTextResult = class {
         }
       })
     );
-    return handleUIMessageStreamFinish({
-      stream: baseStream,
-      messageId: responseMessageId != null ? responseMessageId : generateMessageId == null ? void 0 : generateMessageId(),
-      originalMessages,
-      onFinish,
-      onError
-    });
+    return createAsyncIterableStream(
+      handleUIMessageStreamFinish({
+        stream: baseStream,
+        messageId: responseMessageId != null ? responseMessageId : generateMessageId == null ? void 0 : generateMessageId(),
+        originalMessages,
+        onFinish,
+        onError
+      })
+    );
   }
   pipeUIMessageStreamToResponse(response, {
     originalMessages,
@@ -9291,6 +9340,7 @@ export {
   asSchema5 as asSchema,
   assistantModelMessageSchema,
   callCompletionApi,
+  consumeStream,
   convertFileListToFileUIParts,
   convertToCoreMessages,
   convertToModelMessages,