ai 6.0.0-beta.152 → 6.0.0-beta.154

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # ai
 
+## 6.0.0-beta.154
+
+### Patch Changes
+
+- 32223c8: feat: add toolCallId arg to toModelOutput
+- Updated dependencies [32223c8]
+  - @ai-sdk/provider-utils@4.0.0-beta.50
+  - @ai-sdk/gateway@2.0.0-beta.81
+
+## 6.0.0-beta.153
+
+### Patch Changes
+
+- 83e5744: feat: support async Tool.toModelOutput
+- Updated dependencies [83e5744]
+  - @ai-sdk/provider-utils@4.0.0-beta.49
+  - @ai-sdk/gateway@2.0.0-beta.80
+
 ## 6.0.0-beta.152
 
 ### Patch Changes

package/dist/index.d.mts

@@ -3317,7 +3317,7 @@ declare function convertToModelMessages<UI_MESSAGE extends UIMessage>(messages:
     tools?: ToolSet;
     ignoreIncompleteToolCalls?: boolean;
     convertDataPart?: (part: DataUIPart<InferUIMessageData<UI_MESSAGE>>) => TextPart | FilePart | undefined;
-}): ModelMessage[];
+}): Promise<ModelMessage[]>;
 
 type PrepareSendMessagesRequest<UI_MESSAGE extends UIMessage> = (options: {
     id: string;

package/dist/index.d.ts

@@ -3317,7 +3317,7 @@ declare function convertToModelMessages<UI_MESSAGE extends UIMessage>(messages:
     tools?: ToolSet;
     ignoreIncompleteToolCalls?: boolean;
     convertDataPart?: (part: DataUIPart<InferUIMessageData<UI_MESSAGE>>) => TextPart | FilePart | undefined;
-}): ModelMessage[];
+}): Promise<ModelMessage[]>;
 
 type PrepareSendMessagesRequest<UI_MESSAGE extends UIMessage> = (options: {
     id: string;

package/dist/index.js

@@ -964,7 +964,7 @@ function detectMediaType({
 var import_provider_utils2 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.0-beta.152" : "0.0.0-test";
+var VERSION = true ? "6.0.0-beta.154" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({ url }) => {
@@ -1374,7 +1374,8 @@ function mapToolResultOutput(output) {
 
 // src/prompt/create-tool-model-output.ts
 var import_provider18 = require("@ai-sdk/provider");
-function createToolModelOutput({
+async function createToolModelOutput({
+  toolCallId,
   output,
   tool: tool2,
   errorMode
@@ -1385,7 +1386,7 @@ function createToolModelOutput({
     return { type: "error-json", value: toJSONValue(output) };
   }
   if (tool2 == null ? void 0 : tool2.toModelOutput) {
-    return tool2.toModelOutput({ output });
+    return await tool2.toModelOutput({ toolCallId, output });
   }
   return typeof output === "string" ? { type: "text", value: output } : { type: "json", value: toJSONValue(output) };
 }
@@ -3352,93 +3353,115 @@ async function isStopConditionMet({
 }
 
 // src/generate-text/to-response-messages.ts
-function toResponseMessages({
+async function toResponseMessages({
   content: inputContent,
   tools
 }) {
   const responseMessages = [];
-  const content = inputContent.filter((part) => part.type !== "source").filter(
-    (part) => (part.type !== "tool-result" || part.providerExecuted) && (part.type !== "tool-error" || part.providerExecuted)
-  ).filter((part) => part.type !== "text" || part.text.length > 0).map((part) => {
+  const content = [];
+  for (const part of inputContent) {
+    if (part.type === "source" || (part.type === "tool-result" || part.type === "tool-error") && !part.providerExecuted || part.type === "text" && part.text.length === 0) {
+      continue;
+    }
     switch (part.type) {
       case "text":
-        return {
+        content.push({
           type: "text",
           text: part.text,
           providerOptions: part.providerMetadata
-        };
+        });
+        break;
       case "reasoning":
-        return {
+        content.push({
           type: "reasoning",
           text: part.text,
           providerOptions: part.providerMetadata
-        };
+        });
+        break;
       case "file":
-        return {
+        content.push({
           type: "file",
           data: part.file.base64,
           mediaType: part.file.mediaType,
           providerOptions: part.providerMetadata
-        };
+        });
+        break;
       case "tool-call":
-        return {
+        content.push({
           type: "tool-call",
           toolCallId: part.toolCallId,
           toolName: part.toolName,
           input: part.input,
           providerExecuted: part.providerExecuted,
           providerOptions: part.providerMetadata
-        };
-      case "tool-result":
-        return {
+        });
+        break;
+      case "tool-result": {
+        const output = await createToolModelOutput({
+          toolCallId: part.toolCallId,
+          tool: tools == null ? void 0 : tools[part.toolName],
+          output: part.output,
+          errorMode: "none"
+        });
+        content.push({
           type: "tool-result",
           toolCallId: part.toolCallId,
           toolName: part.toolName,
-          output: createToolModelOutput({
-            tool: tools == null ? void 0 : tools[part.toolName],
-            output: part.output,
-            errorMode: "none"
-          }),
-          providerExecuted: true,
+          output,
           providerOptions: part.providerMetadata
-        };
-      case "tool-error":
-        return {
+        });
+        break;
+      }
+      case "tool-error": {
+        const output = await createToolModelOutput({
+          toolCallId: part.toolCallId,
+          tool: tools == null ? void 0 : tools[part.toolName],
+          output: part.error,
+          errorMode: "json"
+        });
+        content.push({
           type: "tool-result",
           toolCallId: part.toolCallId,
           toolName: part.toolName,
-          output: createToolModelOutput({
-            tool: tools == null ? void 0 : tools[part.toolName],
-            output: part.error,
-            errorMode: "json"
-          }),
+          output,
           providerOptions: part.providerMetadata
-        };
+        });
+        break;
+      }
       case "tool-approval-request":
-        return {
+        content.push({
           type: "tool-approval-request",
           approvalId: part.approvalId,
           toolCallId: part.toolCall.toolCallId
-        };
+        });
+        break;
     }
-  });
+  }
   if (content.length > 0) {
     responseMessages.push({
       role: "assistant",
       content
     });
   }
-  const toolResultContent = inputContent.filter((part) => part.type === "tool-result" || part.type === "tool-error").filter((part) => !part.providerExecuted).map((toolResult) => ({
-    type: "tool-result",
-    toolCallId: toolResult.toolCallId,
-    toolName: toolResult.toolName,
-    output: createToolModelOutput({
-      tool: tools == null ? void 0 : tools[toolResult.toolName],
-      output: toolResult.type === "tool-result" ? toolResult.output : toolResult.error,
-      errorMode: toolResult.type === "tool-error" ? "text" : "none"
-    }),
-    ...toolResult.providerMetadata != null ? { providerOptions: toolResult.providerMetadata } : {}
-  }));
+  const toolResultContent = [];
+  for (const part of inputContent) {
+    if (!(part.type === "tool-result" || part.type === "tool-error") || part.providerExecuted) {
+      continue;
+    }
+    const output = await createToolModelOutput({
+      toolCallId: part.toolCallId,
+      tool: tools == null ? void 0 : tools[part.toolName],
+      output: part.type === "tool-result" ? part.output : part.error,
+      errorMode: part.type === "tool-error" ? "text" : "none"
+    });
+    toolResultContent.push({
+      type: "tool-result",
+      toolCallId: part.toolCallId,
+      toolName: part.toolName,
+      output,
+      ...part.providerMetadata != null ? { providerOptions: part.providerMetadata } : {}
+    });
+  }
   if (toolResultContent.length > 0) {
     responseMessages.push({
       role: "tool",
@@ -3544,31 +3567,35 @@ async function generateText({
             abortSignal,
             experimental_context
           });
+          const toolContent = [];
+          for (const output2 of toolOutputs) {
+            const modelOutput = await createToolModelOutput({
+              toolCallId: output2.toolCallId,
+              tool: tools == null ? void 0 : tools[output2.toolName],
+              output: output2.type === "tool-result" ? output2.output : output2.error,
+              errorMode: output2.type === "tool-error" ? "json" : "none"
+            });
+            toolContent.push({
+              type: "tool-result",
+              toolCallId: output2.toolCallId,
+              toolName: output2.toolName,
+              output: modelOutput
+            });
+          }
+          for (const toolApproval of deniedToolApprovals) {
+            toolContent.push({
+              type: "tool-result",
+              toolCallId: toolApproval.toolCall.toolCallId,
+              toolName: toolApproval.toolCall.toolName,
+              output: {
+                type: "execution-denied",
+                reason: toolApproval.approvalResponse.reason
+              }
+            });
+          }
           responseMessages.push({
             role: "tool",
-            content: [
-              // add regular tool results for approved tool calls:
-              ...toolOutputs.map((output2) => ({
-                type: "tool-result",
-                toolCallId: output2.toolCallId,
-                toolName: output2.toolName,
-                output: createToolModelOutput({
-                  tool: tools == null ? void 0 : tools[output2.toolName],
-                  output: output2.type === "tool-result" ? output2.output : output2.error,
-                  errorMode: output2.type === "tool-error" ? "json" : "none"
-                })
-              })),
-              // add execution denied tool results for denied tool approvals:
-              ...deniedToolApprovals.map((toolApproval) => ({
-                type: "tool-result",
-                toolCallId: toolApproval.toolCall.toolCallId,
-                toolName: toolApproval.toolCall.toolName,
-                output: {
-                  type: "execution-denied",
-                  reason: toolApproval.approvalResponse.reason
-                }
-              }))
-            ]
+            content: toolContent
           });
         }
         const callSettings2 = prepareCallSettings(settings);
@@ -3781,7 +3808,7 @@ async function generateText({
             toolApprovalRequests: Object.values(toolApprovalRequests)
           });
           responseMessages.push(
-            ...toResponseMessages({
+            ...await toResponseMessages({
               content: stepContent,
               tools
             })
@@ -5710,7 +5737,7 @@ var DefaultStreamTextResult = class {
           recordedWarnings = part.warnings;
         }
         if (part.type === "finish-step") {
-          const stepMessages = toResponseMessages({
+          const stepMessages = await toResponseMessages({
             content: recordedContent,
             tools
           });
@@ -5934,31 +5961,34 @@ var DefaultStreamTextResult = class {
                 }
               })
             );
+            const content = [];
+            for (const output2 of toolOutputs) {
+              content.push({
+                type: "tool-result",
+                toolCallId: output2.toolCallId,
+                toolName: output2.toolName,
+                output: await createToolModelOutput({
+                  toolCallId: output2.toolCallId,
+                  tool: tools == null ? void 0 : tools[output2.toolName],
+                  output: output2.type === "tool-result" ? output2.output : output2.error,
+                  errorMode: output2.type === "tool-error" ? "json" : "none"
+                })
+              });
+            }
+            for (const toolApproval of deniedToolApprovals) {
+              content.push({
+                type: "tool-result",
+                toolCallId: toolApproval.toolCall.toolCallId,
+                toolName: toolApproval.toolCall.toolName,
+                output: {
+                  type: "execution-denied",
+                  reason: toolApproval.approvalResponse.reason
+                }
+              });
+            }
             initialResponseMessages.push({
               role: "tool",
-              content: [
-                // add regular tool results for approved tool calls:
-                ...toolOutputs.map((output2) => ({
-                  type: "tool-result",
-                  toolCallId: output2.toolCallId,
-                  toolName: output2.toolName,
-                  output: createToolModelOutput({
-                    tool: tools == null ? void 0 : tools[output2.toolName],
-                    output: output2.type === "tool-result" ? output2.output : output2.error,
-                    errorMode: output2.type === "tool-error" ? "json" : "none"
-                  })
-                })),
-                // add execution denied tool results for denied tool approvals:
-                ...deniedToolApprovals.map((toolApproval) => ({
-                  type: "tool-result",
-                  toolCallId: toolApproval.toolCall.toolCallId,
-                  toolName: toolApproval.toolCall.toolName,
-                  output: {
-                    type: "execution-denied",
-                    reason: toolApproval.approvalResponse.reason
-                  }
-                }))
-              ]
+              content
             });
           } finally {
             toolExecutionStepStreamController == null ? void 0 : toolExecutionStepStreamController.close();
@@ -6306,7 +6336,7 @@ var DefaultStreamTextResult = class {
                     steps: recordedSteps
                   })) {
                     responseMessages.push(
-                      ...toResponseMessages({
+                      ...await toResponseMessages({
                         content: (
                           // use transformed content to create the messages for the next step:
                           recordedSteps[recordedSteps.length - 1].content
@@ -7035,7 +7065,7 @@ function readUIMessageStream({
 
 // src/ui/convert-to-model-messages.ts
 var import_provider_utils19 = require("@ai-sdk/provider-utils");
-function convertToModelMessages(messages, options) {
+async function convertToModelMessages(messages, options) {
   const modelMessages = [];
   if (options == null ? void 0 : options.ignoreIncompleteToolCalls) {
     messages = messages.map((message) => ({
@@ -7097,8 +7127,9 @@ function convertToModelMessages(messages, options) {
       }
       case "assistant": {
         if (message.parts != null) {
-          let processBlock2 = function() {
-            var _a15, _b, _c;
+          let block = [];
+          async function processBlock() {
+            var _a15, _b, _c, _d, _e, _f;
             if (block.length === 0) {
               return;
             }
@@ -7146,7 +7177,8 @@ function convertToModelMessages(messages, options) {
                       type: "tool-result",
                       toolCallId: part.toolCallId,
                       toolName,
-                      output: createToolModelOutput({
+                      output: await createToolModelOutput({
+                        toolCallId: part.toolCallId,
                         output: part.state === "output-error" ? part.errorText : part.output,
                         tool: (_b = options == null ? void 0 : options.tools) == null ? void 0 : _b[toolName],
                         errorMode: part.state === "output-error" ? "json" : "none"
@@ -7176,68 +7208,66 @@ function convertToModelMessages(messages, options) {
               (part) => isToolUIPart(part) && part.providerExecuted !== true
             );
             if (toolParts.length > 0) {
-              modelMessages.push({
-                role: "tool",
-                content: toolParts.flatMap(
-                  (toolPart) => {
-                    var _a16, _b2, _c2;
-                    const outputs = [];
-                    if (((_a16 = toolPart.approval) == null ? void 0 : _a16.approved) != null) {
-                      outputs.push({
-                        type: "tool-approval-response",
-                        approvalId: toolPart.approval.id,
-                        approved: toolPart.approval.approved,
-                        reason: toolPart.approval.reason
+              {
+                const content2 = [];
+                for (const toolPart of toolParts) {
+                  if (((_d = toolPart.approval) == null ? void 0 : _d.approved) != null) {
+                    content2.push({
+                      type: "tool-approval-response",
+                      approvalId: toolPart.approval.id,
+                      approved: toolPart.approval.approved,
+                      reason: toolPart.approval.reason
+                    });
+                  }
+                  switch (toolPart.state) {
+                    case "output-denied": {
+                      content2.push({
+                        type: "tool-result",
+                        toolCallId: toolPart.toolCallId,
+                        toolName: getToolName(toolPart),
+                        output: {
+                          type: "error-text",
+                          value: (_e = toolPart.approval.reason) != null ? _e : "Tool execution denied."
+                        },
+                        ...toolPart.callProviderMetadata != null ? { providerOptions: toolPart.callProviderMetadata } : {}
                       });
+                      break;
                     }
-                    switch (toolPart.state) {
-                      case "output-denied": {
-                        outputs.push({
-                          type: "tool-result",
-                          toolCallId: toolPart.toolCallId,
-                          toolName: getToolName(toolPart),
-                          output: {
-                            type: "error-text",
-                            value: (_b2 = toolPart.approval.reason) != null ? _b2 : "Tool execution denied."
-                          },
-                          ...toolPart.callProviderMetadata != null ? { providerOptions: toolPart.callProviderMetadata } : {}
-                        });
-                        break;
-                      }
-                      case "output-error":
-                      case "output-available": {
-                        const toolName = getToolName(toolPart);
-                        outputs.push({
-                          type: "tool-result",
+                    case "output-error":
+                    case "output-available": {
+                      const toolName = getToolName(toolPart);
+                      content2.push({
+                        type: "tool-result",
+                        toolCallId: toolPart.toolCallId,
+                        toolName,
+                        output: await createToolModelOutput({
                           toolCallId: toolPart.toolCallId,
-                          toolName,
-                          output: createToolModelOutput({
-                            output: toolPart.state === "output-error" ? toolPart.errorText : toolPart.output,
-                            tool: (_c2 = options == null ? void 0 : options.tools) == null ? void 0 : _c2[toolName],
-                            errorMode: toolPart.state === "output-error" ? "text" : "none"
-                          }),
-                          ...toolPart.callProviderMetadata != null ? { providerOptions: toolPart.callProviderMetadata } : {}
-                        });
-                        break;
-                      }
+                          output: toolPart.state === "output-error" ? toolPart.errorText : toolPart.output,
+                          tool: (_f = options == null ? void 0 : options.tools) == null ? void 0 : _f[toolName],
+                          errorMode: toolPart.state === "output-error" ? "text" : "none"
+                        }),
+                        ...toolPart.callProviderMetadata != null ? { providerOptions: toolPart.callProviderMetadata } : {}
+                      });
+                      break;
                     }
-                    return outputs;
                   }
-                )
-              });
+                }
+                modelMessages.push({
+                  role: "tool",
+                  content: content2
+                });
+              }
             }
             block = [];
-          };
-          var processBlock = processBlock2;
-          let block = [];
+          }
           for (const part of message.parts) {
             if (isTextUIPart(part) || isReasoningUIPart(part) || isFileUIPart(part) || isToolUIPart(part) || isDataUIPart(part)) {
               block.push(part);
             } else if (part.type === "step-start") {
-              processBlock2();
+              await processBlock();
             }
           }
-          processBlock2();
+          await processBlock();
           break;
         }
         break;
@@ -7643,7 +7673,7 @@ async function createAgentUIStream({
     messages,
     tools: agent.tools
   });
-  const modelMessages = convertToModelMessages(validatedMessages, {
+  const modelMessages = await convertToModelMessages(validatedMessages, {
     tools: agent.tools
   });
   const result = await agent.stream({