ai 6.0.285 → 6.0.287

package/dist/index.mjs

@@ -1224,7 +1224,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "6.0.285" : "0.0.0-test";
+var VERSION = true ? "6.0.287" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -1271,9 +1271,9 @@ var download = async ({
 };
 
 // src/util/download/download-function.ts
-var createDefaultDownloadFunction = (download2 = download) => (requestedDownloads) => Promise.all(
+var createDefaultDownloadFunction = (download2 = download, abortSignal) => (requestedDownloads) => Promise.all(
   requestedDownloads.map(
-    async (requestedDownload) => requestedDownload.isUrlSupportedByModel ? null : download2(requestedDownload)
+    async (requestedDownload) => requestedDownload.isUrlSupportedByModel ? null : await download2({ ...requestedDownload, abortSignal })
   )
 );
 
@@ -1412,11 +1412,12 @@ function convertDataContentToUint8Array(content) {
 async function convertToLanguageModelPrompt({
   prompt,
   supportedUrls,
-  download: download2 = createDefaultDownloadFunction()
+  download: download2,
+  abortSignal
 }) {
   const downloadedAssets = await downloadAssets(
     prompt.messages,
-    download2,
+    download2 != null ? download2 : createDefaultDownloadFunction(void 0, abortSignal),
     supportedUrls
   );
   const approvalIdToToolCallId = /* @__PURE__ */ new Map();
@@ -4735,7 +4736,8 @@ async function generateText({
                 messages: (_c = prepareStepResult == null ? void 0 : prepareStepResult.messages) != null ? _c : stepInputMessages
               },
               supportedUrls: await stepModel.supportedUrls,
-              download: download2
+              download: download2,
+              abortSignal: mergedAbortSignal
             });
             experimental_context = (_d = prepareStepResult == null ? void 0 : prepareStepResult.experimental_context) != null ? _d : experimental_context;
             const stepActiveTools = (_e = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _e : activeTools;
@@ -7223,7 +7225,15 @@ function createOutputTransformStream(output) {
   let text2 = "";
   let textChunk = "";
   let textProviderMetadata = void 0;
-  let lastPublishedValue = "";
+  let lastPublishedValue = void 0;
+  let hasPublishedValue = false;
+  function resetOutputState() {
+    firstTextChunkId = void 0;
+    text2 = "";
+    textChunk = "";
+    textProviderMetadata = void 0;
+    lastPublishedValue = "";
+  }
   function publishTextChunk({
     controller,
     partialOutput = void 0
@@ -7242,6 +7252,9 @@ function createOutputTransformStream(output) {
   return new TransformStream({
     async transform(chunk, controller) {
       var _a23;
+      if (chunk.type === "start-step") {
+        resetOutputState();
+      }
       if (chunk.type === "finish-step" && textChunk.length > 0) {
         publishTextChunk({ controller });
       }
@@ -7276,9 +7289,10 @@ function createOutputTransformStream(output) {
       const result = await output.parsePartialOutput({ text: text2 });
       if (result !== void 0) {
         const currentValue = typeof result.partial === "string" ? result.partial : JSON.stringify(result.partial);
-        if (currentValue !== lastPublishedValue) {
+        if (!hasPublishedValue || currentValue !== lastPublishedValue) {
           publishTextChunk({ controller, partialOutput: result.partial });
           lastPublishedValue = currentValue;
+          hasPublishedValue = true;
         }
       }
     }
@@ -7349,6 +7363,7 @@ var DefaultStreamTextResult = class {
     const recordedSteps = [];
     let recordedNoOutputError;
     let currentStepToolSet = tools;
+    let currentStepModel = model;
     const createPartIdReserver = () => {
       const usedIds = /* @__PURE__ */ new Set();
       return (id) => {
@@ -7505,7 +7520,10 @@ var DefaultStreamTextResult = class {
           });
           const currentStepResult = new DefaultStepResult({
             stepNumber: recordedSteps.length,
-            model: modelInfo,
+            model: {
+              provider: currentStepModel.provider,
+              modelId: currentStepModel.modelId
+            },
             ...callbackTelemetryProps,
             experimental_context,
             content: recordedContent,
@@ -7526,8 +7544,8 @@ var DefaultStreamTextResult = class {
           });
           logWarnings({
             warnings: recordedWarnings,
-            provider: modelInfo.provider,
-            model: modelInfo.modelId
+            provider: currentStepModel.provider,
+            model: currentStepModel.modelId
           });
           recordedSteps.push(currentStepResult);
           recordedResponseMessages.push(...stepMessages);
@@ -7966,6 +7984,7 @@ var DefaultStreamTextResult = class {
             const stepModel = resolveLanguageModel(
               (_a23 = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _a23 : model
             );
+            currentStepModel = stepModel;
             const stepModelInfo = {
               provider: stepModel.provider,
               modelId: stepModel.modelId
@@ -7976,7 +7995,8 @@ var DefaultStreamTextResult = class {
                 messages: (_c = prepareStepResult == null ? void 0 : prepareStepResult.messages) != null ? _c : stepInputMessages
               },
               supportedUrls: await stepModel.supportedUrls,
-              download: download2
+              download: download2,
+              abortSignal
             });
             const stepActiveTools = (_d = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _d : activeTools;
             const stepToolSet = filterActiveTools({
@@ -8125,7 +8145,7 @@ var DefaultStreamTextResult = class {
             let stepResponse = {
               id: generateId2(),
               timestamp: /* @__PURE__ */ new Date(),
-              modelId: modelInfo.modelId
+              modelId: stepModelInfo.modelId
             };
             let activeText = "";
             const textPartIds = /* @__PURE__ */ new Map();
@@ -8647,7 +8667,7 @@ var DefaultStreamTextResult = class {
       this.teeStream().pipeThrough(
         new TransformStream({
           transform({ partialOutput }, controller) {
-            if (partialOutput != null) {
+            if (partialOutput !== void 0) {
               controller.enqueue(partialOutput);
             }
           }
@@ -9341,9 +9361,15 @@ function readUIMessageStream({
   var _a23;
   let controller;
   let hasErrored = false;
+  let isCancelled = false;
+  const abortController = new AbortController();
   const outputStream = new ReadableStream({
     start(controllerParam) {
       controller = controllerParam;
+    },
+    cancel() {
+      isCancelled = true;
+      abortController.abort();
     }
   });
   const state = createStreamingUIMessageState({
@@ -9364,15 +9390,18 @@ function readUIMessageStream({
         return job({
           state,
           write: () => {
-            controller == null ? void 0 : controller.enqueue(createUIMessageSnapshot(state.message));
+            if (!isCancelled) {
+              controller == null ? void 0 : controller.enqueue(createUIMessageSnapshot(state.message));
+            }
           }
         });
       },
       onError: handleError
     }),
-    onError: handleError
+    onError: handleError,
+    abortSignal: abortController.signal
   }).finally(() => {
-    if (!hasErrored) {
+    if (!hasErrored && !isCancelled) {
       controller == null ? void 0 : controller.close();
     }
   });
@@ -9447,7 +9476,7 @@ async function convertToModelMessages(messages, options) {
         if (message.parts != null) {
           let block = [];
           async function processBlock() {
-            var _a23, _b, _c, _d, _e, _f, _g, _h;
+            var _a23, _b, _c, _d, _e, _f, _g, _h, _i;
             if (block.length === 0) {
               return;
             }
@@ -9476,13 +9505,14 @@ async function convertToModelMessages(messages, options) {
               } else if (isToolUIPart(part)) {
                 const toolName = getToolName(part);
                 if (part.state !== "input-streaming") {
+                  const callProviderMetadata = (_a23 = part.callProviderMetadata) != null ? _a23 : part.state === "output-error" ? part.resultProviderMetadata : void 0;
                   content.push({
                     type: "tool-call",
                     toolCallId: part.toolCallId,
                     toolName,
-                    input: part.state === "output-error" ? (_a23 = part.input) != null ? _a23 : "rawInput" in part ? part.rawInput : void 0 : part.input,
+                    input: part.state === "output-error" ? (_b = part.input) != null ? _b : "rawInput" in part ? part.rawInput : void 0 : part.input,
                     providerExecuted: part.providerExecuted,
-                    ...part.callProviderMetadata != null ? { providerOptions: part.callProviderMetadata } : {}
+                    ...callProviderMetadata != null ? { providerOptions: callProviderMetadata } : {}
                   });
                   if (part.approval != null) {
                     content.push({
@@ -9493,7 +9523,7 @@ async function convertToModelMessages(messages, options) {
                     });
                   }
                   if (part.providerExecuted === true && part.state !== "approval-responded" && (part.state === "output-available" || part.state === "output-error")) {
-                    const resultProviderMetadata = (_b = part.resultProviderMetadata) != null ? _b : part.callProviderMetadata;
+                    const resultProviderMetadata = (_c = part.resultProviderMetadata) != null ? _c : part.callProviderMetadata;
                     content.push({
                       type: "tool-result",
                       toolCallId: part.toolCallId,
@@ -9502,7 +9532,7 @@ async function convertToModelMessages(messages, options) {
                         toolCallId: part.toolCallId,
                         input: part.input,
                         output: part.state === "output-error" ? part.errorText : part.output,
-                        tool: (_c = options == null ? void 0 : options.tools) == null ? void 0 : _c[toolName],
+                        tool: (_d = options == null ? void 0 : options.tools) == null ? void 0 : _d[toolName],
                         errorMode: part.state === "output-error" ? "json" : "none"
                       }),
                       ...resultProviderMetadata != null ? { providerOptions: resultProviderMetadata } : {}
@@ -9510,7 +9540,7 @@ async function convertToModelMessages(messages, options) {
                   }
                 }
               } else if (isDataUIPart(part)) {
-                const dataPart = (_d = options == null ? void 0 : options.convertDataPart) == null ? void 0 : _d.call(
+                const dataPart = (_e = options == null ? void 0 : options.convertDataPart) == null ? void 0 : _e.call(
                   options,
                   part
                 );
@@ -9538,7 +9568,7 @@ async function convertToModelMessages(messages, options) {
               {
                 const content2 = [];
                 for (const toolPart of toolParts) {
-                  if (((_e = toolPart.approval) == null ? void 0 : _e.approved) != null) {
+                  if (((_f = toolPart.approval) == null ? void 0 : _f.approved) != null) {
                     content2.push({
                       type: "tool-approval-response",
                       approvalId: toolPart.approval.id,
@@ -9558,7 +9588,7 @@ async function convertToModelMessages(messages, options) {
                         toolName: getToolName(toolPart),
                         output: {
                           type: "error-text",
-                          value: (_g = (_f = toolPart.approval) == null ? void 0 : _f.reason) != null ? _g : "Tool call execution denied."
+                          value: (_h = (_g = toolPart.approval) == null ? void 0 : _g.reason) != null ? _h : "Tool call execution denied."
                         },
                         ...toolPart.callProviderMetadata != null ? { providerOptions: toolPart.callProviderMetadata } : {}
                       });
@@ -9575,7 +9605,7 @@ async function convertToModelMessages(messages, options) {
                           toolCallId: toolPart.toolCallId,
                           input: toolPart.input,
                           output: toolPart.state === "output-error" ? toolPart.errorText : toolPart.output,
-                          tool: (_h = options == null ? void 0 : options.tools) == null ? void 0 : _h[toolName],
+                          tool: (_i = options == null ? void 0 : options.tools) == null ? void 0 : _i[toolName],
                           errorMode: toolPart.state === "output-error" ? "text" : "none"
                         }),
                         ...toolPart.callProviderMetadata != null ? { providerOptions: toolPart.callProviderMetadata } : {}
@@ -11418,7 +11448,8 @@ async function generateObject(options) {
         const promptMessages = await convertToLanguageModelPrompt({
           prompt: standardizedPrompt,
           supportedUrls: await model.supportedUrls,
-          download: download2
+          download: download2,
+          abortSignal
         });
         const generateResult = await retry(
           () => recordSpan({
@@ -11910,7 +11941,8 @@ var DefaultStreamObjectResult = class {
           prompt: await convertToLanguageModelPrompt({
             prompt: standardizedPrompt,
             supportedUrls: await model.supportedUrls,
-            download: download2
+            download: download2,
+            abortSignal
           }),
           providerOptions,
           abortSignal,
@@ -12472,11 +12504,13 @@ function pruneMessages({
         }
       }
     }
+    const approvalIdToToolCallId = /* @__PURE__ */ new Map();
     const approvalIdToToolName = /* @__PURE__ */ new Map();
     for (const message of messages) {
       if ((message.role === "assistant" || message.role === "tool") && typeof message.content !== "string") {
         for (const part of message.content) {
           if (part.type === "tool-approval-request") {
+            approvalIdToToolCallId.set(part.approvalId, part.toolCallId);
             const toolName = toolCallIdToToolName.get(part.toolCallId);
             if (toolName != null) {
               approvalIdToToolName.set(part.approvalId, toolName);
@@ -12485,6 +12519,12 @@ function pruneMessages({
         }
       }
     }
+    for (const approvalId of keptApprovalIds) {
+      const toolCallId = approvalIdToToolCallId.get(approvalId);
+      if (toolCallId != null) {
+        keptToolCallIds.add(toolCallId);
+      }
+    }
     messages = messages.map((message, messageIndex) => {
       if (message.role !== "assistant" && message.role !== "tool" || typeof message.content === "string" || keepLastMessagesCount && messageIndex >= messages.length - keepLastMessagesCount) {
         return message;
@@ -13221,7 +13261,11 @@ function simulateStreamingMiddleware() {
             switch (part.type) {
               case "text": {
                 if (part.text.length > 0) {
-                  controller.enqueue({ type: "text-start", id: String(id) });
+                  controller.enqueue({
+                    type: "text-start",
+                    id: String(id),
+                    ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
+                  });
                   controller.enqueue({
                     type: "text-delta",
                     id: String(id),