ai 7.0.10 → 7.0.12

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # ai
 
+## 7.0.12
+
+### Patch Changes
+
+- ecfeb6f: Sort tool results by their tool call order when converting generation output to response messages.
+- a193137: Fix `extractJsonMiddleware` preserving leading whitespace in the final streamed text suffix when no markdown fence prefix was stripped.
+- Updated dependencies [c6f5e62]
+  - @ai-sdk/gateway@4.0.9
+  - @ai-sdk/provider-utils@5.0.4
+
+## 7.0.11
+
+### Patch Changes
+
+- 0a87626: fix(ai): replace dynamic import() with loadBuiltinModule for diagnostics_channel to fix React Native/Hermes builds
+
 ## 7.0.10
 
 ### Patch Changes

package/dist/index.js

@@ -1089,7 +1089,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "7.0.10" : "0.0.0-test";
+var VERSION = true ? "7.0.12" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -4011,10 +4011,9 @@ async function loadDiagnosticsChannel() {
     return void 0;
   }
   if (diagnosticsChannelPromise == null) {
-    diagnosticsChannelPromise = import(
-      /* webpackIgnore: true */
-      "diagnostics_channel"
-    ).catch(() => void 0);
+    diagnosticsChannelPromise = Promise.resolve(
+      loadBuiltinModule("node:diagnostics_channel")
+    );
   }
   return diagnosticsChannelPromise;
 }
@@ -4590,6 +4589,7 @@ async function toResponseMessages({
   tools
 }) {
   const responseMessages = [];
+  const toolCallOrder = /* @__PURE__ */ new Map();
   const content = [];
   for (const part of inputContent) {
     if (part.type === "source") {
@@ -4640,6 +4640,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,
@@ -4747,11 +4750,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/generate-text/tool-approval-signature.ts
 import {
@@ -13629,6 +13658,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;
@@ -13723,9 +13755,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({