ai 5.0.239 → 5.0.241

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # ai
 
+## 5.0.241
+
+### Patch Changes
+
+- 9d0b84c: fix: reject `streamObject` result promises and report failed completion when the provider stream errors
+- 05df123: Filter preliminary tool outputs when `ignoreIncompleteToolCalls` is enabled.
+- e532644: Prevent automatic tool execution when a model call ends with an unsafe finish reason.
+
+## 5.0.240
+
+### Patch Changes
+
+- Updated dependencies [bef36a6]
+  - @ai-sdk/gateway@2.0.137
+
 ## 5.0.239
 
 ### Patch Changes

package/dist/index.js

@@ -816,7 +816,7 @@ function detectMediaType({
 var import_provider_utils2 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "5.0.239" : "0.0.0-test";
+var VERSION = true ? "5.0.241" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -2012,6 +2012,11 @@ var DefaultGeneratedFileWithType = class extends DefaultGeneratedFile {
   }
 };
 
+// src/generate-text/is-tool-execution-allowed-finish-reason.ts
+function isToolExecutionAllowedFinishReason(finishReason) {
+  return finishReason === "stop" || finishReason === "tool-calls";
+}
+
 // src/generate-text/parse-tool-call.ts
 var import_provider_utils9 = require("@ai-sdk/provider-utils");
 async function parseToolCall({
@@ -2573,7 +2578,9 @@ async function generateText({
           clientToolCalls = stepToolCalls.filter(
             (toolCall) => !toolCall.providerExecuted
           );
-          if (stepToolSet != null) {
+          if (stepToolSet != null && isToolExecutionAllowedFinishReason(
+            currentModelResponse.finishReason
+          )) {
             clientToolOutputs.push(
               ...await executeTools({
                 toolCalls: clientToolCalls.filter(
@@ -4340,32 +4347,33 @@ function createResolvablePromise() {
 
 // src/util/create-stitchable-stream.ts
 function createStitchableStream() {
-  let innerStreamReaders = [];
+  let innerStreams = [];
   let controller = null;
   let isClosed = false;
   let waitForNewStream = createResolvablePromise();
   const terminate = () => {
     isClosed = true;
     waitForNewStream.resolve();
-    innerStreamReaders.forEach((reader) => reader.cancel());
-    innerStreamReaders = [];
+    innerStreams.forEach(({ reader }) => reader.cancel());
+    innerStreams = [];
     controller == null ? void 0 : controller.close();
   };
   const processPull = async () => {
-    if (isClosed && innerStreamReaders.length === 0) {
+    var _a16, _b;
+    if (isClosed && innerStreams.length === 0) {
       controller == null ? void 0 : controller.close();
       return;
     }
-    if (innerStreamReaders.length === 0) {
+    if (innerStreams.length === 0) {
       waitForNewStream = createResolvablePromise();
       await waitForNewStream.promise;
       return processPull();
     }
     try {
-      const { value, done } = await innerStreamReaders[0].read();
+      const { value, done } = await innerStreams[0].reader.read();
       if (done) {
-        innerStreamReaders.shift();
-        if (innerStreamReaders.length > 0) {
+        innerStreams.shift();
+        if (innerStreams.length > 0) {
           await processPull();
         } else if (isClosed) {
           controller == null ? void 0 : controller.close();
@@ -4374,8 +4382,9 @@ function createStitchableStream() {
         controller == null ? void 0 : controller.enqueue(value);
       }
     } catch (error) {
+      (_b = (_a16 = innerStreams[0]).onError) == null ? void 0 : _b.call(_a16, error);
       controller == null ? void 0 : controller.error(error);
-      innerStreamReaders.shift();
+      innerStreams.shift();
       terminate();
     }
   };
@@ -4386,18 +4395,21 @@ function createStitchableStream() {
       },
       pull: processPull,
       async cancel() {
-        for (const reader of innerStreamReaders) {
+        for (const { reader } of innerStreams) {
           await reader.cancel();
         }
-        innerStreamReaders = [];
+        innerStreams = [];
         isClosed = true;
       }
     }),
-    addStream: (innerStream) => {
+    addStream: (innerStream, callbacks) => {
       if (isClosed) {
         throw new Error("Cannot add inner stream: outer stream is closed");
       }
-      innerStreamReaders.push(innerStream.getReader());
+      innerStreams.push({
+        reader: innerStream.getReader(),
+        ...callbacks
+      });
       waitForNewStream.resolve();
     },
     /**
@@ -4407,7 +4419,7 @@ function createStitchableStream() {
     close: () => {
       isClosed = true;
       waitForNewStream.resolve();
-      if (innerStreamReaders.length === 0) {
+      if (innerStreams.length === 0) {
         controller == null ? void 0 : controller.close();
       }
     },
@@ -4469,6 +4481,7 @@ function runToolsTransformation({
     }
   }
   const outstandingToolResults = /* @__PURE__ */ new Set();
+  const pendingToolCalls = [];
   const toolInputs = /* @__PURE__ */ new Map();
   let canClose = false;
   let finishChunk = void 0;
@@ -4480,6 +4493,82 @@ function runToolsTransformation({
       closeToolResultsStream();
     }
   }
+  function executePendingToolCall(toolCall) {
+    const tool2 = tools[toolCall.toolName];
+    const toolExecutionId = (0, import_provider_utils14.generateId)();
+    outstandingToolResults.add(toolExecutionId);
+    recordSpan({
+      name: "ai.toolCall",
+      attributes: selectTelemetryAttributes({
+        telemetry,
+        attributes: {
+          ...assembleOperationName({
+            operationId: "ai.toolCall",
+            telemetry
+          }),
+          "ai.toolCall.name": toolCall.toolName,
+          "ai.toolCall.id": toolCall.toolCallId,
+          "ai.toolCall.args": {
+            output: () => JSON.stringify(toolCall.input)
+          }
+        }
+      }),
+      tracer,
+      fn: async (span) => {
+        let output;
+        try {
+          const stream = (0, import_provider_utils14.executeTool)({
+            execute: tool2.execute.bind(tool2),
+            input: toolCall.input,
+            options: {
+              toolCallId: toolCall.toolCallId,
+              messages,
+              abortSignal,
+              experimental_context
+            }
+          });
+          for await (const part of stream) {
+            enqueueToolResult({
+              ...toolCall,
+              type: "tool-result",
+              output: part.output,
+              ...part.type === "preliminary" && {
+                preliminary: true
+              }
+            });
+            if (part.type === "final") {
+              output = part.output;
+            }
+          }
+        } catch (error) {
+          recordErrorOnSpan(span, error);
+          enqueueToolResult({
+            ...toolCall,
+            type: "tool-error",
+            error
+          });
+          outstandingToolResults.delete(toolExecutionId);
+          attemptClose();
+          return;
+        }
+        outstandingToolResults.delete(toolExecutionId);
+        attemptClose();
+        try {
+          span.setAttributes(
+            selectTelemetryAttributes({
+              telemetry,
+              attributes: {
+                "ai.toolCall.result": {
+                  output: () => JSON.stringify(output)
+                }
+              }
+            })
+          );
+        } catch (ignored) {
+        }
+      }
+    });
+  }
   const forwardStream = new TransformStream({
     async transform(chunk, controller) {
       const chunkType = chunk.type;
@@ -4518,6 +4607,13 @@ function runToolsTransformation({
             usage: chunk.usage,
             providerMetadata: chunk.providerMetadata
           };
+          if (isToolExecutionAllowedFinishReason(chunk.finishReason)) {
+            for (const toolCall of pendingToolCalls.splice(0)) {
+              executePendingToolCall(toolCall);
+            }
+          } else {
+            pendingToolCalls.length = 0;
+          }
           break;
         }
         case "tool-call": {
@@ -4553,79 +4649,7 @@ function runToolsTransformation({
               });
             }
             if (tool2.execute != null && toolCall.providerExecuted !== true) {
-              const toolExecutionId = (0, import_provider_utils14.generateId)();
-              outstandingToolResults.add(toolExecutionId);
-              recordSpan({
-                name: "ai.toolCall",
-                attributes: selectTelemetryAttributes({
-                  telemetry,
-                  attributes: {
-                    ...assembleOperationName({
-                      operationId: "ai.toolCall",
-                      telemetry
-                    }),
-                    "ai.toolCall.name": toolCall.toolName,
-                    "ai.toolCall.id": toolCall.toolCallId,
-                    "ai.toolCall.args": {
-                      output: () => JSON.stringify(toolCall.input)
-                    }
-                  }
-                }),
-                tracer,
-                fn: async (span) => {
-                  let output;
-                  try {
-                    const stream = (0, import_provider_utils14.executeTool)({
-                      execute: tool2.execute.bind(tool2),
-                      input: toolCall.input,
-                      options: {
-                        toolCallId: toolCall.toolCallId,
-                        messages,
-                        abortSignal,
-                        experimental_context
-                      }
-                    });
-                    for await (const part of stream) {
-                      enqueueToolResult({
-                        ...toolCall,
-                        type: "tool-result",
-                        output: part.output,
-                        ...part.type === "preliminary" && {
-                          preliminary: true
-                        }
-                      });
-                      if (part.type === "final") {
-                        output = part.output;
-                      }
-                    }
-                  } catch (error) {
-                    recordErrorOnSpan(span, error);
-                    enqueueToolResult({
-                      ...toolCall,
-                      type: "tool-error",
-                      error
-                    });
-                    outstandingToolResults.delete(toolExecutionId);
-                    attemptClose();
-                    return;
-                  }
-                  outstandingToolResults.delete(toolExecutionId);
-                  attemptClose();
-                  try {
-                    span.setAttributes(
-                      selectTelemetryAttributes({
-                        telemetry,
-                        attributes: {
-                          "ai.toolCall.result": {
-                            output: () => JSON.stringify(output)
-                          }
-                        }
-                      })
-                    );
-                  } catch (ignored) {
-                  }
-                }
-              });
+              pendingToolCalls.push({ ...toolCall });
             }
           } catch (error) {
             enqueueToolResult({ type: "error", error });
@@ -6050,7 +6074,7 @@ function convertToModelMessages(messages, options) {
     messages = messages.map((message) => ({
       ...message,
       parts: message.parts.filter(
-        (part) => !isToolOrDynamicToolUIPart(part) || part.state !== "input-streaming" && part.state !== "input-available"
+        (part) => !isToolOrDynamicToolUIPart(part) || part.state !== "input-streaming" && part.state !== "input-available" && (part.state !== "output-available" || part.preliminary !== true)
       )
     }));
   }
@@ -7619,6 +7643,12 @@ function simulateReadableStream({
 
 // src/generate-object/stream-object.ts
 var originalGenerateId4 = (0, import_provider_utils23.createIdGenerator)({ prefix: "aiobj", size: 24 });
+async function markPromiseAsHandled(promise) {
+  try {
+    await promise;
+  } catch (e) {
+  }
+}
 function streamObject(options) {
   const {
     model,
@@ -7855,6 +7885,7 @@ var DefaultStreamObjectResult = class {
         let providerMetadata;
         let object2;
         let error;
+        let terminalError;
         let accumulatedText = "";
         let textDelta = "";
         let fullResponse = {
@@ -7925,11 +7956,22 @@ var DefaultStreamObjectResult = class {
                   };
                   break;
                 }
+                case "error": {
+                  if (terminalError === void 0) {
+                    const wrappedError = wrapGatewayError(chunk.error);
+                    terminalError = { error: wrappedError };
+                    error = wrappedError;
+                    finishReason = "error";
+                    self.rejectResultPromises(wrappedError);
+                  }
+                  controller.enqueue(chunk);
+                  break;
+                }
                 case "finish": {
                   if (textDelta !== "") {
                     controller.enqueue({ type: "text-delta", textDelta });
                   }
-                  finishReason = chunk.finishReason;
+                  finishReason = terminalError === void 0 ? chunk.finishReason : "error";
                   usage = chunk.usage;
                   providerMetadata = chunk.providerMetadata;
                   controller.enqueue({
@@ -7938,6 +7980,9 @@ var DefaultStreamObjectResult = class {
                     response: fullResponse
                   });
                   logWarnings(warnings != null ? warnings : []);
+                  if (terminalError !== void 0) {
+                    break;
+                  }
                   self._usage.resolve(usage);
                   self._providerMetadata.resolve(providerMetadata);
                   self._warnings.resolve(warnings);
@@ -8040,9 +8085,16 @@ var DefaultStreamObjectResult = class {
             }
           })
         );
-        stitchableStream.addStream(transformedStream);
+        stitchableStream.addStream(transformedStream, {
+          onError(error2) {
+            const wrappedError = wrapGatewayError(error2);
+            self.rejectResultPromises(wrappedError);
+            void onError({ error: wrappedError });
+          }
+        });
       }
     }).catch((error) => {
+      self.rejectResultPromises(error);
       stitchableStream.addStream(
         new ReadableStream({
           start(controller) {
@@ -8056,6 +8108,24 @@ var DefaultStreamObjectResult = class {
     });
     this.outputStrategy = outputStrategy;
   }
+  rejectResultPromises(error) {
+    this.rejectResultPromise({ delayedPromise: this._object, error });
+    this.rejectResultPromise({ delayedPromise: this._usage, error });
+    this.rejectResultPromise({ delayedPromise: this._providerMetadata, error });
+    this.rejectResultPromise({ delayedPromise: this._warnings, error });
+    this.rejectResultPromise({ delayedPromise: this._request, error });
+    this.rejectResultPromise({ delayedPromise: this._response, error });
+    this.rejectResultPromise({ delayedPromise: this._finishReason, error });
+  }
+  rejectResultPromise({
+    delayedPromise,
+    error
+  }) {
+    if (delayedPromise.isPending()) {
+      delayedPromise.reject(error);
+      markPromiseAsHandled(delayedPromise.promise);
+    }
+  }
   get object() {
     return this._object.promise;
   }