ai 3.4.24 → 3.4.26

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # ai
 
+## 3.4.26
+
+### Patch Changes
+
+- 57f39ea: feat (ai/core): support multi-modal tool results in convertToCoreMessages
+
+## 3.4.25
+
+### Patch Changes
+
+- 6e0fa1c: fix (ai/core): wait for tool results to arrive before sending finish event
+
 ## 3.4.24
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1331,7 +1331,9 @@ type ConvertibleMessage = {
 Converts an array of messages from useChat into an array of CoreMessages that can be used
 with the AI core functions (e.g. `streamText`).
  */
-declare function convertToCoreMessages(messages: Array<ConvertibleMessage>): CoreMessage[];
+declare function convertToCoreMessages<TOOLS extends Record<string, CoreTool> = never>(messages: Array<ConvertibleMessage>, options?: {
+    tools: TOOLS;
+}): CoreMessage[];
 
 /**
 Create a union of the given object's values, and optionally specify which keys to get the values from.

package/dist/index.d.ts

@@ -1331,7 +1331,9 @@ type ConvertibleMessage = {
 Converts an array of messages from useChat into an array of CoreMessages that can be used
 with the AI core functions (e.g. `streamText`).
  */
-declare function convertToCoreMessages(messages: Array<ConvertibleMessage>): CoreMessage[];
+declare function convertToCoreMessages<TOOLS extends Record<string, CoreTool> = never>(messages: Array<ConvertibleMessage>, options?: {
+    tools: TOOLS;
+}): CoreMessage[];
 
 /**
 Create a union of the given object's values, and optionally specify which keys to get the values from.

package/dist/index.js

@@ -3655,8 +3655,6 @@ function runToolsTransformation({
   telemetry,
   abortSignal
 }) {
-  let canClose = false;
-  const outstandingToolCalls = /* @__PURE__ */ new Set();
   let toolResultsStreamController = null;
   const toolResultsStream = new ReadableStream({
     start(controller) {
@@ -3664,6 +3662,17 @@ function runToolsTransformation({
     }
   });
   const activeToolCalls = {};
+  const outstandingToolResults = /* @__PURE__ */ new Set();
+  let canClose = false;
+  let finishChunk = void 0;
+  function attemptClose() {
+    if (canClose && outstandingToolResults.size === 0) {
+      if (finishChunk != null) {
+        toolResultsStreamController.enqueue(finishChunk);
+      }
+      toolResultsStreamController.close();
+    }
+  }
   const forwardStream = new TransformStream({
     transform(chunk, controller) {
       const chunkType = chunk.type;
@@ -3721,7 +3730,7 @@ function runToolsTransformation({
             controller.enqueue(toolCall);
             if (tool2.execute != null) {
               const toolExecutionId = (0, import_ui_utils5.generateId)();
-              outstandingToolCalls.add(toolExecutionId);
+              outstandingToolResults.add(toolExecutionId);
               recordSpan({
                 name: "ai.toolCall",
                 attributes: selectTelemetryAttributes({
@@ -3746,10 +3755,8 @@ function runToolsTransformation({
                       type: "tool-result",
                       result
                     });
-                    outstandingToolCalls.delete(toolExecutionId);
-                    if (canClose && outstandingToolCalls.size === 0) {
-                      toolResultsStreamController.close();
-                    }
+                    outstandingToolResults.delete(toolExecutionId);
+                    attemptClose();
                     try {
                       span.setAttributes(
                         selectTelemetryAttributes({
@@ -3769,10 +3776,8 @@ function runToolsTransformation({
                       type: "error",
                       error
                     });
-                    outstandingToolCalls.delete(toolExecutionId);
-                    if (canClose && outstandingToolCalls.size === 0) {
-                      toolResultsStreamController.close();
-                    }
+                    outstandingToolResults.delete(toolExecutionId);
+                    attemptClose();
                   }
                 )
               });
@@ -3786,13 +3791,13 @@ function runToolsTransformation({
           break;
         }
         case "finish": {
-          controller.enqueue({
+          finishChunk = {
             type: "finish",
             finishReason: chunk.finishReason,
             logprobs: chunk.logprobs,
             usage: calculateLanguageModelUsage(chunk.usage),
             experimental_providerMetadata: chunk.providerMetadata
-          });
+          };
           break;
         }
         default: {
@@ -3803,9 +3808,7 @@ function runToolsTransformation({
     },
     flush() {
       canClose = true;
-      if (outstandingToolCalls.size === 0) {
-        toolResultsStreamController.close();
-      }
+      attemptClose();
     }
   });
   return new ReadableStream({
@@ -4780,7 +4783,9 @@ function attachmentsToParts(attachments) {
 }
 
 // core/prompt/convert-to-core-messages.ts
-function convertToCoreMessages(messages) {
+function convertToCoreMessages(messages, options) {
+  var _a11;
+  const tools = (_a11 = options == null ? void 0 : options.tools) != null ? _a11 : {};
   const coreMessages = [];
   for (const message of messages) {
     const { role, content, toolInvocations, experimental_attachments } = message;
@@ -4811,29 +4816,37 @@ function convertToCoreMessages(messages) {
           role: "assistant",
           content: [
             { type: "text", text: content },
-            ...toolInvocations.map(({ toolCallId, toolName, args }) => ({
-              type: "tool-call",
-              toolCallId,
-              toolName,
-              args
-            }))
+            ...toolInvocations.map(
+              ({ toolCallId, toolName, args }) => ({
+                type: "tool-call",
+                toolCallId,
+                toolName,
+                args
+              })
+            )
           ]
         });
         coreMessages.push({
           role: "tool",
-          content: toolInvocations.map((ToolInvocation) => {
-            if (!("result" in ToolInvocation)) {
+          content: toolInvocations.map((toolInvocation) => {
+            if (!("result" in toolInvocation)) {
               throw new MessageConversionError({
                 originalMessage: message,
-                message: "ToolInvocation must have a result: " + JSON.stringify(ToolInvocation)
+                message: "ToolInvocation must have a result: " + JSON.stringify(toolInvocation)
               });
             }
-            const { toolCallId, toolName, args, result } = ToolInvocation;
-            return {
+            const { toolCallId, toolName, result } = toolInvocation;
+            const tool2 = tools[toolName];
+            return (tool2 == null ? void 0 : tool2.experimental_toToolResultContent) != null ? {
+              type: "tool-result",
+              toolCallId,
+              toolName,
+              result: tool2.experimental_toToolResultContent(result),
+              experimental_content: tool2.experimental_toToolResultContent(result)
+            } : {
               type: "tool-result",
               toolCallId,
               toolName,
-              args,
               result
             };
           })