ai 6.0.219 → 6.0.221

package/dist/index.mjs

@@ -1171,7 +1171,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "6.0.219" : "0.0.0-test";
+var VERSION = true ? "6.0.221" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -2756,6 +2756,26 @@ function prepareRetries({
   };
 }
 
+// src/util/set-abort-timeout.ts
+function setAbortTimeout({
+  abortController,
+  label,
+  timeoutMs
+}) {
+  if (abortController == null || timeoutMs == null) {
+    return void 0;
+  }
+  return setTimeout(
+    () => abortController.abort(
+      new DOMException(
+        `${label} timeout of ${timeoutMs}ms exceeded`,
+        "TimeoutError"
+      )
+    ),
+    timeoutMs
+  );
+}
+
 // src/generate-text/collect-tool-approvals.ts
 function collectToolApprovals({
   messages
@@ -3724,6 +3744,7 @@ var array = ({
           finishReason: context2.finishReason
         });
       }
+      const validatedElements = [];
       for (const element of outerValue.elements) {
         const validationResult = await safeValidateTypes3({
           value: element,
@@ -3739,8 +3760,9 @@ var array = ({
             finishReason: context2.finishReason
           });
         }
+        validatedElements.push(validationResult.value);
       }
-      return outerValue.elements;
+      return validatedElements;
     },
     async parsePartialOutput({ text: text2 }) {
       const result = await parsePartialJson(text2);
@@ -4143,6 +4165,7 @@ async function toResponseMessages({
   tools
 }) {
   const responseMessages = [];
+  const toolCallOrder = /* @__PURE__ */ new Map();
   const content = [];
   for (const part of inputContent) {
     if (part.type === "source") {
@@ -4178,6 +4201,9 @@ async function toResponseMessages({
         });
         break;
       case "tool-call":
+        if (!toolCallOrder.has(part.toolCallId)) {
+          toolCallOrder.set(part.toolCallId, toolCallOrder.size);
+        }
         content.push({
           type: "tool-call",
           toolCallId: part.toolCallId,
@@ -4260,11 +4286,37 @@ async function toResponseMessages({
   if (toolResultContent.length > 0) {
     responseMessages.push({
       role: "tool",
-      content: toolResultContent
+      content: sortToolResultContentByToolCallOrder({
+        toolResultContent,
+        toolCallOrder
+      })
     });
   }
   return responseMessages;
 }
+function sortToolResultContentByToolCallOrder({
+  toolResultContent,
+  toolCallOrder
+}) {
+  const sortedToolResults = toolResultContent.filter((part) => part.type === "tool-result").map((part, index) => ({ part, index })).sort((a, b) => {
+    const aOrder = toolCallOrder.get(a.part.toolCallId);
+    const bOrder = toolCallOrder.get(b.part.toolCallId);
+    if (aOrder == null && bOrder == null) {
+      return a.index - b.index;
+    }
+    if (aOrder == null) {
+      return 1;
+    }
+    if (bOrder == null) {
+      return -1;
+    }
+    return aOrder - bOrder || a.index - b.index;
+  }).map(({ part }) => part);
+  let toolResultIndex = 0;
+  return toolResultContent.map(
+    (part) => part.type === "tool-result" ? sortedToolResults[toolResultIndex++] : part
+  );
+}
 
 // src/util/merge-abort-signals.ts
 function mergeAbortSignals(...signals) {
@@ -4517,7 +4569,11 @@ async function generateText({
         const steps = [];
         const pendingDeferredToolCalls = /* @__PURE__ */ new Map();
         do {
-          const stepTimeoutId = stepTimeoutMs != null ? setTimeout(() => stepAbortController.abort(), stepTimeoutMs) : void 0;
+          const stepTimeoutId = setAbortTimeout({
+            abortController: stepAbortController,
+            label: "Step",
+            timeoutMs: stepTimeoutMs
+          });
           try {
             const stepInputMessages = [...initialMessages, ...responseMessages];
             const prepareStepResult = await (prepareStep == null ? void 0 : prepareStep({
@@ -6489,7 +6545,6 @@ function runToolsTransformation({
     }
   });
   const outstandingToolResults = /* @__PURE__ */ new Set();
-  const toolInputs = /* @__PURE__ */ new Map();
   const toolCallsByToolCallId = /* @__PURE__ */ new Map();
   let canClose = false;
   let finishChunk = void 0;
@@ -6621,7 +6676,6 @@ function runToolsTransformation({
               });
               break;
             }
-            toolInputs.set(toolCall.toolCallId, toolCall.input);
             if (tool2.execute != null && toolCall.providerExecuted !== true) {
               const toolExecutionId = generateId2();
               outstandingToolResults.add(toolExecutionId);
@@ -6665,7 +6719,7 @@ function runToolsTransformation({
               type: "tool-error",
               toolCallId: chunk.toolCallId,
               toolName,
-              input: toolInputs.get(chunk.toolCallId),
+              input: toolCall == null ? void 0 : toolCall.input,
               providerExecuted: true,
               error: chunk.result,
               dynamic: chunk.dynamic,
@@ -6677,7 +6731,7 @@ function runToolsTransformation({
               type: "tool-result",
               toolCallId: chunk.toolCallId,
               toolName,
-              input: toolInputs.get(chunk.toolCallId),
+              input: toolCall == null ? void 0 : toolCall.input,
               output: chunk.result,
               providerExecuted: true,
               dynamic: chunk.dynamic,
@@ -7477,18 +7531,21 @@ var DefaultStreamTextResult = class {
         }) {
           var _a22, _b, _c, _d, _e, _f, _g, _h, _i;
           const includeRawChunks2 = self.includeRawChunks;
-          const stepTimeoutId = stepTimeoutMs != null ? setTimeout(() => stepAbortController.abort(), stepTimeoutMs) : void 0;
+          const stepTimeoutId = setAbortTimeout({
+            abortController: stepAbortController,
+            label: "Step",
+            timeoutMs: stepTimeoutMs
+          });
           let chunkTimeoutId = void 0;
           function resetChunkTimeout() {
-            if (chunkTimeoutMs != null) {
-              if (chunkTimeoutId != null) {
-                clearTimeout(chunkTimeoutId);
-              }
-              chunkTimeoutId = setTimeout(
-                () => chunkAbortController.abort(),
-                chunkTimeoutMs
-              );
+            if (chunkTimeoutId != null) {
+              clearTimeout(chunkTimeoutId);
             }
+            chunkTimeoutId = setAbortTimeout({
+              abortController: chunkAbortController,
+              label: "Chunk",
+              timeoutMs: chunkTimeoutMs
+            });
           }
           function clearChunkTimeout() {
             if (chunkTimeoutId != null) {
@@ -7501,6 +7558,8 @@ var DefaultStreamTextResult = class {
               clearTimeout(stepTimeoutId);
             }
           }
+          abortSignal == null ? void 0 : abortSignal.addEventListener("abort", clearStepTimeout);
+          abortSignal == null ? void 0 : abortSignal.addEventListener("abort", clearChunkTimeout);
           try {
             stepFinish = new DelayedPromise();
             const stepInputMessages = [...initialMessages, ...responseMessages];
@@ -7996,9 +8055,10 @@ var DefaultStreamTextResult = class {
                 })
               )
             );
-          } finally {
+          } catch (error) {
             clearStepTimeout();
             clearChunkTimeout();
+            throw error;
           }
         }
         await streamStep({
@@ -8920,10 +8980,12 @@ async function convertToModelMessages(messages, options) {
                 throw new Error(`Unsupported part: ${_exhaustiveCheck}`);
               }
             }
-            modelMessages.push({
-              role: "assistant",
-              content
-            });
+            if (content.length > 0) {
+              modelMessages.push({
+                role: "assistant",
+                content
+              });
+            }
             const toolParts = block.filter(
               (part) => {
                 var _a23;
@@ -8954,7 +9016,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 execution denied."
+                          value: (_g = (_f = toolPart.approval) == null ? void 0 : _f.reason) != null ? _g : "Tool call execution denied."
                         },
                         ...toolPart.callProviderMetadata != null ? { providerOptions: toolPart.callProviderMetadata } : {}
                       });
@@ -12060,6 +12122,9 @@ function defaultSettingsMiddleware({
 function defaultTransform(text2) {
   return text2.replace(/^```(?:json)?\s*\n?/, "").replace(/\n?```\s*$/, "").trim();
 }
+function stripMarkdownCodeFenceSuffix(text2) {
+  return text2.replace(/\n?```\s*$/, "").trimEnd();
+}
 function extractJsonMiddleware(options) {
   var _a22;
   const transform = (_a22 = options == null ? void 0 : options.transform) != null ? _a22 : defaultTransform;
@@ -12154,9 +12219,11 @@ function extractJsonMiddleware(options) {
                   if (block.phase === "buffering") {
                     remaining = transform(remaining);
                   } else if (block.prefixStripped) {
-                    remaining = remaining.replace(/\n?```\s*$/, "").trimEnd();
-                  } else {
+                    remaining = stripMarkdownCodeFenceSuffix(remaining);
+                  } else if (block.phase === "prefix") {
                     remaining = transform(remaining);
+                  } else {
+                    remaining = stripMarkdownCodeFenceSuffix(remaining);
                   }
                   if (remaining.length > 0) {
                     controller.enqueue({
@@ -13564,7 +13631,7 @@ var AbstractChat = class {
       const updatePart = (part) => isToolUIPart(part) && part.state === "approval-requested" && part.approval.id === id ? {
         ...part,
         state: "approval-responded",
-        approval: { id, approved, reason }
+        approval: { ...part.approval, id, approved, reason }
       } : part;
       this.state.replaceMessage(messages.length - 1, {
         ...lastMessage,
@@ -14035,6 +14102,7 @@ export {
   hasToolCall,
   isDataUIPart,
   isDeepEqualData,
+  isDynamicToolUIPart,
   isFileUIPart,
   isLoopFinished,
   isReasoningUIPart,