ai 3.4.24 → 3.4.25

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ai
 
+## 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.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({