ai 7.0.105 → 7.0.106

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # ai
 
+## 7.0.106
+
+### Patch Changes
+
+- 4775577: fix(ai): preserve provider metadata when simulating text streams
+- 6696728: fix(ai): report the prepareStep model in streamed step results
+- 09516a1: fix(ai): prevent unhandled rejections when UI message stream reading stops early
+- 1aef01e: fix(ai): preserve prototype-named properties in serialized tool outputs
+- 9c1ea74: fix(ai): close telemetry spans when provider response streams fail
+- 107343a: fix(ai): use the prepareStep-selected model for streamed response metadata fallbacks
+- 03c3e33: fix(ai): preserve tool calls required by retained pending approvals
+- 5d42ebd: fix(ai): skip input available callbacks for invalid streamed tool calls
+- 4a67783: fix(ai): cancel prompt attachment downloads when model calls are aborted or time out
+- 1058ed5: fix(ai): strip streamed JSON fences before arbitrary trailing whitespace
+- 84f5d1b: fix(ai): stream null and empty string JSON partial outputs
+- 2d53a5d: fix(ai): prevent onEnd after aborting a multi-step text stream
+- 2a5ed55: fix(ai): stream structured output from the final tool-loop step
+- Updated dependencies [4fdf51e]
+- Updated dependencies [0455398]
+  - @ai-sdk/gateway@4.0.86
+  - @ai-sdk/provider-utils@5.0.44
+
 ## 7.0.105
 
 ### Patch Changes

package/dist/index.js

@@ -1211,7 +1211,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "7.0.105" : "0.0.0-test";
+var VERSION = true ? "7.0.106" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -1258,9 +1258,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 : await download2(requestedDownload)
+    async (requestedDownload) => requestedDownload.isUrlSupportedByModel ? null : await download2({ ...requestedDownload, abortSignal })
   )
 );
 
@@ -1409,14 +1409,15 @@ function convertToLanguageModelV4FilePart(content) {
 async function convertToLanguageModelPrompt({
   prompt,
   supportedUrls,
-  download: download2 = createDefaultDownloadFunction(),
+  download: download2,
+  abortSignal,
   // `provider` is only needed here to convert legacy tool output types via `mapToolResultOutput`.
   // TODO: remove in v8 when "file-id" and "image-file-id" types are removed
   provider
 }) {
   const downloadedAssets = await downloadAssets(
     prompt.messages,
-    download2,
+    download2 != null ? download2 : createDefaultDownloadFunction(void 0, abortSignal),
     supportedUrls
   );
   const approvalIdToToolCallId = /* @__PURE__ */ new Map();
@@ -2040,9 +2041,6 @@ function getMediaTypeFromUrl(url, fallbackMediaType = "application/octet-stream"
 
 // src/prompt/create-tool-model-output.ts
 import { getErrorMessage as getErrorMessage3 } from "@ai-sdk/provider";
-import {
-  parseJSON
-} from "@ai-sdk/provider-utils";
 async function createToolModelOutput({
   toolCallId,
   input,
@@ -2053,19 +2051,19 @@ async function createToolModelOutput({
   if (errorMode === "text") {
     return { type: "error-text", value: getErrorMessage3(output) };
   } else if (errorMode === "json") {
-    return { type: "error-json", value: await toJSONValue(output) };
+    return { type: "error-json", value: toJSONValue(output) };
   }
   if (tool3 == null ? void 0 : tool3.toModelOutput) {
     return await tool3.toModelOutput({ toolCallId, input, output });
   }
-  return typeof output === "string" ? { type: "text", value: output } : { type: "json", value: await toJSONValue(output) };
+  return typeof output === "string" ? { type: "text", value: output } : { type: "json", value: toJSONValue(output) };
 }
-async function toJSONValue(value) {
+function toJSONValue(value) {
   if (value === void 0) {
     return null;
   }
   const serialized = JSON.stringify(value);
-  return serialized === void 0 ? null : await parseJSON({ text: serialized });
+  return serialized === void 0 ? null : JSON.parse(serialized);
 }
 
 // src/prompt/prepare-language-model-call-options.ts
@@ -6099,6 +6097,7 @@ async function generateText({
                 },
                 supportedUrls: await stepModel.supportedUrls,
                 download: download2,
+                abortSignal: mergedAbortSignal,
                 provider: stepModel.provider.split(".")[0]
               });
               const stepProviderOptions = mergeObjects(
@@ -8840,7 +8839,7 @@ function invokeToolCallbacksFromStream({
             const toolName = ongoingToolCallToolNames[chunk.toolCallId];
             const tool3 = getOwn(tools, toolName);
             delete ongoingToolCallToolNames[chunk.toolCallId];
-            if ((tool3 == null ? void 0 : tool3.onInputAvailable) != null) {
+            if (!chunk.invalid && (tool3 == null ? void 0 : tool3.onInputAvailable) != null) {
               await tool3.onInputAvailable({
                 input: chunk.input,
                 toolCallId: chunk.toolCallId,
@@ -8990,6 +8989,7 @@ async function streamLanguageModelCall({
     },
     supportedUrls: await resolvedModel.supportedUrls,
     download: download2,
+    abortSignal,
     provider: resolvedModel.provider.split(".")[0]
   });
   const stepTools = await prepareTools({
@@ -9680,13 +9680,15 @@ function createOutputTransformStream(output) {
   let text2 = "";
   let textChunk = "";
   let textProviderMetadata = void 0;
-  let lastPublishedValue = "";
-  function resetAttemptState() {
+  let lastPublishedValue = void 0;
+  let hasPublishedValue = false;
+  function resetOutputState() {
     firstTextChunkId = void 0;
     text2 = "";
     textChunk = "";
     textProviderMetadata = void 0;
-    lastPublishedValue = "";
+    lastPublishedValue = void 0;
+    hasPublishedValue = false;
   }
   function enqueueChunk({
     controller,
@@ -9716,10 +9718,13 @@ function createOutputTransformStream(output) {
     async transform(chunk, controller) {
       var _a25;
       if (isStreamRetryBoundaryPart(chunk)) {
-        resetAttemptState();
+        resetOutputState();
         controller.enqueue(chunk);
         return;
       }
+      if (chunk.type === "start-step") {
+        resetOutputState();
+      }
       if (chunk.type === "finish-step" && textChunk.length > 0) {
         publishTextChunk({ controller });
       }
@@ -9769,9 +9774,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;
         }
       }
     }
@@ -9934,6 +9940,8 @@ var DefaultStreamTextResult = class {
     const initialResponseMessages = [];
     let stepMessagesForNextStep;
     let currentStepMessages = [];
+    let isAborted = false;
+    let currentStepModel = model;
     const createPartIdReserver = () => {
       const usedIds = /* @__PURE__ */ new Set();
       return (id) => {
@@ -10100,8 +10108,8 @@ var DefaultStreamTextResult = class {
           const currentStepResult = new DefaultStepResult({
             callId,
             stepNumber: recordedSteps.length,
-            provider: model.provider,
-            modelId: model.modelId,
+            provider: currentStepModel.provider,
+            modelId: currentStepModel.modelId,
             runtimeContext,
             toolsContext,
             content: recordedContent,
@@ -10126,8 +10134,8 @@ var DefaultStreamTextResult = class {
           });
           logWarnings({
             warnings: recordedWarnings,
-            provider: model.provider,
-            model: model.modelId
+            provider: currentStepModel.provider,
+            model: currentStepModel.modelId
           });
           recordedSteps.push(currentStepResult);
           stepMessagesForNextStep = [
@@ -10157,6 +10165,9 @@ var DefaultStreamTextResult = class {
           self._rawFinishReason.resolve(recordedRawFinishReason);
           self._totalUsage.resolve(totalUsage);
           self._steps.resolve(recordedSteps);
+          if (isAborted) {
+            return;
+          }
           const finalStep = recordedSteps[recordedSteps.length - 1];
           const content = recordedSteps.flatMap((step) => step.content);
           const files = recordedSteps.flatMap((step) => step.files);
@@ -10243,7 +10254,9 @@ var DefaultStreamTextResult = class {
         controller.enqueue({ type: "start" });
       },
       async pull(controller) {
+        var _a25;
         async function abort() {
+          isAborted = true;
           await notify({
             event: {
               callId,
@@ -10276,6 +10289,7 @@ var DefaultStreamTextResult = class {
           if (isAbortError(error) && (abortSignal == null ? void 0 : abortSignal.aborted)) {
             await abort();
           } else {
+            await ((_a25 = telemetryDispatcher.onError) == null ? void 0 : _a25.call(telemetryDispatcher, { callId, error }));
             controller.error(error);
           }
         }
@@ -10616,6 +10630,7 @@ var DefaultStreamTextResult = class {
           const stepModel = resolveLanguageModel(
             (_e = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _e : model
           );
+          currentStepModel = stepModel;
           const stepActiveTools = filterActiveTools({
             tools,
             activeTools: (_f = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _f : activeTools
@@ -10928,7 +10943,7 @@ var DefaultStreamTextResult = class {
           const createStepResponse = () => ({
             id: generateId5(),
             timestamp: /* @__PURE__ */ new Date(),
-            modelId: model.modelId
+            modelId: stepModel.modelId
           });
           let stepResponse = createStepResponse();
           const textPartIds = /* @__PURE__ */ new Map();
@@ -11399,7 +11414,7 @@ var DefaultStreamTextResult = class {
       this.teeStream().pipeThrough(
         new TransformStream({
           transform({ partialOutput }, controller) {
-            if (partialOutput != null) {
+            if (partialOutput !== void 0) {
               controller.enqueue(partialOutput);
             }
           }
@@ -11889,9 +11904,15 @@ function readUIMessageStream({
   var _a25;
   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({
@@ -11912,15 +11933,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();
     }
   });
@@ -13322,6 +13346,7 @@ async function startBatch({
               prompt: standardizedPrompt,
               supportedUrls,
               download: void 0,
+              abortSignal: operationAbortSignal,
               provider: batchApi.provider.split(".")[0]
             }),
             tools: preparedTools,
@@ -15127,6 +15152,7 @@ async function generateObject(options) {
       prompt: standardizedPrompt,
       supportedUrls: await model.supportedUrls,
       download: download2,
+      abortSignal,
       provider: model.provider.split(".")[0]
     });
     await notify({
@@ -15575,6 +15601,7 @@ var DefaultStreamObjectResult = class {
           prompt: standardizedPrompt,
           supportedUrls: await model.supportedUrls,
           download: download2,
+          abortSignal,
           provider: model.provider.split(".")[0]
         }),
         providerOptions,
@@ -16099,11 +16126,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);
@@ -16112,6 +16141,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;
@@ -16895,6 +16930,23 @@ function defaultTransform(text2) {
 function stripMarkdownCodeFenceSuffix(text2) {
   return text2.replace(/\n?```\s*$/, "").trimEnd();
 }
+function getPotentialSuffixStart(text2) {
+  let index = text2.length;
+  while (index > 0 && /\s/.test(text2[index - 1])) {
+    index--;
+  }
+  let backtickCount = 0;
+  while (index > 0 && backtickCount < 3 && text2[index - 1] === "`") {
+    index--;
+    backtickCount++;
+  }
+  if (backtickCount > 0) {
+    while (index > 0 && /\s/.test(text2[index - 1])) {
+      index--;
+    }
+  }
+  return index;
+}
 function extractJsonMiddleware(options) {
   var _a25;
   const transform = (_a25 = options == null ? void 0 : options.transform) != null ? _a25 : defaultTransform;
@@ -16919,7 +16971,6 @@ function extractJsonMiddleware(options) {
     wrapStream: async ({ doStream }) => {
       const { stream, ...rest } = await doStream();
       const textBlocks = createIdMap();
-      const SUFFIX_BUFFER_SIZE = 12;
       return {
         stream: stream.pipeThrough(
           new TransformStream({
@@ -16968,9 +17019,15 @@ function extractJsonMiddleware(options) {
                     controller.enqueue(block.startEvent);
                   }
                 }
-                if (block.phase === "streaming" && block.buffer.length > SUFFIX_BUFFER_SIZE) {
-                  const toStream = block.buffer.slice(0, -SUFFIX_BUFFER_SIZE);
-                  block.buffer = block.buffer.slice(-SUFFIX_BUFFER_SIZE);
+                if (block.phase === "streaming") {
+                  const potentialSuffixStart = getPotentialSuffixStart(
+                    block.buffer
+                  );
+                  const toStream = block.buffer.slice(0, potentialSuffixStart);
+                  block.buffer = block.buffer.slice(potentialSuffixStart);
+                  if (toStream.length === 0) {
+                    return;
+                  }
                   controller.enqueue({
                     type: "text-delta",
                     id: chunk.id,
@@ -17211,7 +17268,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),