ai 6.0.218 → 6.0.220

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # ai
 
+## 6.0.220
+
+### Patch Changes
+
+- 158d027: Sort tool results by their tool call order when converting generation output to response messages.
+- eb3cdd9: Fix `extractJsonMiddleware` preserving leading whitespace in the final streamed text suffix when no markdown fence prefix was stripped.
+- Updated dependencies [7dea716]
+- Updated dependencies [4f7fe37]
+- Updated dependencies [0952964]
+  - @ai-sdk/gateway@3.0.144
+  - @ai-sdk/provider-utils@4.0.36
+
+## 6.0.219
+
+### Patch Changes
+
+- Updated dependencies [8fbadac]
+  - @ai-sdk/gateway@3.0.143
+
 ## 6.0.218
 
 ### Patch Changes

package/dist/index.d.mts

@@ -3459,6 +3459,16 @@ type ToolLoopAgentSettings<CALL_OPTIONS = never, TOOLS extends ToolSet = {}, OUT
      * Prepare the parameters for the generateText or streamText call.
      *
      * You can use this to have templates based on call options.
+     *
+     * The design requires you to pass call parameters as follows to
+     * allow for the removal of parameters from the original settings
+     * by setting them to `undefined`:
+     *
+     * ```
+     *   prepareCall: ({ options, ...rest }) => ({
+     *     ...rest,
+     *   }),
+     * ```
      */
     prepareCall?: (options: Omit<AgentCallParameters<CALL_OPTIONS, NoInfer<TOOLS>>, 'onStepFinish'> & Pick<ToolLoopAgentSettings<CALL_OPTIONS, TOOLS, OUTPUT>, 'model' | 'tools' | 'maxOutputTokens' | 'temperature' | 'topP' | 'topK' | 'presencePenalty' | 'frequencyPenalty' | 'stopSequences' | 'seed' | 'headers' | 'instructions' | 'allowSystemInMessages' | 'stopWhen' | 'experimental_telemetry' | 'activeTools' | 'providerOptions' | 'experimental_context' | 'experimental_download'>) => MaybePromiseLike<Pick<ToolLoopAgentSettings<CALL_OPTIONS, TOOLS, OUTPUT>, 'model' | 'tools' | 'maxOutputTokens' | 'temperature' | 'topP' | 'topK' | 'presencePenalty' | 'frequencyPenalty' | 'stopSequences' | 'seed' | 'headers' | 'instructions' | 'allowSystemInMessages' | 'stopWhen' | 'experimental_telemetry' | 'activeTools' | 'providerOptions' | 'experimental_context' | 'experimental_download'> & Omit<Prompt, 'system'>>;
 };

package/dist/index.d.ts

@@ -3459,6 +3459,16 @@ type ToolLoopAgentSettings<CALL_OPTIONS = never, TOOLS extends ToolSet = {}, OUT
      * Prepare the parameters for the generateText or streamText call.
      *
      * You can use this to have templates based on call options.
+     *
+     * The design requires you to pass call parameters as follows to
+     * allow for the removal of parameters from the original settings
+     * by setting them to `undefined`:
+     *
+     * ```
+     *   prepareCall: ({ options, ...rest }) => ({
+     *     ...rest,
+     *   }),
+     * ```
      */
     prepareCall?: (options: Omit<AgentCallParameters<CALL_OPTIONS, NoInfer<TOOLS>>, 'onStepFinish'> & Pick<ToolLoopAgentSettings<CALL_OPTIONS, TOOLS, OUTPUT>, 'model' | 'tools' | 'maxOutputTokens' | 'temperature' | 'topP' | 'topK' | 'presencePenalty' | 'frequencyPenalty' | 'stopSequences' | 'seed' | 'headers' | 'instructions' | 'allowSystemInMessages' | 'stopWhen' | 'experimental_telemetry' | 'activeTools' | 'providerOptions' | 'experimental_context' | 'experimental_download'>) => MaybePromiseLike<Pick<ToolLoopAgentSettings<CALL_OPTIONS, TOOLS, OUTPUT>, 'model' | 'tools' | 'maxOutputTokens' | 'temperature' | 'topP' | 'topK' | 'presencePenalty' | 'frequencyPenalty' | 'stopSequences' | 'seed' | 'headers' | 'instructions' | 'allowSystemInMessages' | 'stopWhen' | 'experimental_telemetry' | 'activeTools' | 'providerOptions' | 'experimental_context' | 'experimental_download'> & Omit<Prompt, 'system'>>;
 };

package/dist/index.js

@@ -1281,7 +1281,7 @@ function detectMediaType({
 var import_provider_utils3 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.218" : "0.0.0-test";
+var VERSION = true ? "6.0.220" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -4223,6 +4223,7 @@ async function toResponseMessages({
   tools
 }) {
   const responseMessages = [];
+  const toolCallOrder = /* @__PURE__ */ new Map();
   const content = [];
   for (const part of inputContent) {
     if (part.type === "source") {
@@ -4258,6 +4259,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,
@@ -4340,11 +4344,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) {
@@ -12093,6 +12123,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;
@@ -12187,9 +12220,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({