ai 6.0.265 → 6.0.266

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # ai
 
+## 6.0.266
+
+### Patch Changes
+
+- a1bafb1: Continue approved `generateText` and `streamText` turns with a model-visible tool error when revalidated tool input is invalid.
+- 3cb50fc: Prevent aborted, errored, or cancelled `streamText` calls from retaining per-call state through abort cleanup listeners.
+- Updated dependencies [5642849]
+  - @ai-sdk/provider-utils@4.0.48
+  - @ai-sdk/gateway@3.0.181
+
 ## 6.0.265
 
 ### Patch Changes

package/dist/index.js

@@ -1304,7 +1304,7 @@ function detectMediaType({
 var import_provider_utils3 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.265" : "0.0.0-test";
+var VERSION = true ? "6.0.266" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -3323,6 +3323,7 @@ async function validateApprovedToolApprovals({
   var _a22;
   const approved = [];
   const denied = [];
+  const invalid = [];
   for (const approval of approvedToolApprovals) {
     const { toolCall, approvalRequest } = approval;
     const tool2 = tools == null ? void 0 : tools[toolCall.toolName];
@@ -3356,11 +3357,15 @@ async function validateApprovedToolApprovals({
         schema: (0, import_provider_utils12.asSchema)(tool2.inputSchema)
       });
       if (!validation.success) {
-        throw new InvalidToolInputError({
-          toolName: toolCall.toolName,
-          toolInput: JSON.stringify(toolCall.input),
-          cause: validation.error
+        invalid.push({
+          ...approval,
+          error: new InvalidToolInputError({
+            toolName: toolCall.toolName,
+            toolInput: JSON.stringify(toolCall.input),
+            cause: validation.error
+          })
         });
+        continue;
       }
     }
     const approvalNeeded = tool2 != null && await isApprovalNeeded({
@@ -3382,7 +3387,11 @@ async function validateApprovedToolApprovals({
       });
     }
   }
-  return { approvedToolApprovals: approved, deniedToolApprovals: denied };
+  return {
+    approvedToolApprovals: approved,
+    deniedToolApprovals: denied,
+    invalidToolApprovals: invalid
+  };
 }
 
 // src/generate-text/output.ts
@@ -4638,7 +4647,8 @@ async function generateText({
         } = collectToolApprovals({ messages: initialMessages });
         const {
           approvedToolApprovals: localApprovedToolApprovals,
-          deniedToolApprovals: revalidationDeniedToolApprovals
+          deniedToolApprovals: revalidationDeniedToolApprovals,
+          invalidToolApprovals
         } = await validateApprovedToolApprovals({
           approvedToolApprovals: approvedToolApprovals.filter(
             (toolApproval) => !toolApproval.toolCall.providerExecuted
@@ -4652,7 +4662,7 @@ async function generateText({
           ...collectedDeniedToolApprovals,
           ...revalidationDeniedToolApprovals
         ];
-        if (deniedToolApprovals.length > 0 || localApprovedToolApprovals.length > 0) {
+        if (deniedToolApprovals.length > 0 || localApprovedToolApprovals.length > 0 || invalidToolApprovals.length > 0) {
           const toolOutputs = await executeTools({
             toolCalls: localApprovedToolApprovals.map(
               (toolApproval) => toolApproval.toolCall
@@ -4690,6 +4700,20 @@ async function generateText({
               output: modelOutput
             });
           }
+          for (const toolApproval of invalidToolApprovals) {
+            toolContent.push({
+              type: "tool-result",
+              toolCallId: toolApproval.toolCall.toolCallId,
+              toolName: toolApproval.toolCall.toolName,
+              output: await createToolModelOutput({
+                toolCallId: toolApproval.toolCall.toolCallId,
+                input: toolApproval.toolCall.input,
+                tool: tools == null ? void 0 : tools[toolApproval.toolCall.toolName],
+                output: toolApproval.error,
+                errorMode: "text"
+              })
+            });
+          }
           for (const toolApproval of deniedToolApprovals) {
             toolContent.push({
               type: "tool-result",
@@ -6653,7 +6677,10 @@ function createStitchableStream() {
   const terminate = () => {
     isClosed = true;
     waitForNewStream.resolve();
-    innerStreams.forEach(({ reader }) => reader.cancel());
+    innerStreams.forEach(({ reader, onCancel }) => {
+      onCancel == null ? void 0 : onCancel();
+      reader.cancel();
+    });
     innerStreams = [];
     controller == null ? void 0 : controller.close();
   };
@@ -6694,7 +6721,8 @@ function createStitchableStream() {
       },
       pull: processPull,
       async cancel() {
-        for (const { reader } of innerStreams) {
+        for (const { reader, onCancel } of innerStreams) {
+          onCancel == null ? void 0 : onCancel();
           await reader.cancel();
         }
         innerStreams = [];
@@ -7697,7 +7725,8 @@ var DefaultStreamTextResult = class {
         if (deniedToolApprovals.length > 0 || approvedToolApprovals.length > 0) {
           const {
             approvedToolApprovals: localApprovedToolApprovals,
-            deniedToolApprovals: revalidationDeniedToolApprovals
+            deniedToolApprovals: revalidationDeniedToolApprovals,
+            invalidToolApprovals
           } = await validateApprovedToolApprovals({
             approvedToolApprovals: approvedToolApprovals.filter(
               (toolApproval) => !toolApproval.toolCall.providerExecuted
@@ -7734,6 +7763,18 @@ var DefaultStreamTextResult = class {
                 toolName: toolApproval.toolCall.toolName
               });
             }
+            for (const toolApproval of invalidToolApprovals) {
+              toolExecutionStepStreamController == null ? void 0 : toolExecutionStepStreamController.enqueue({
+                type: "tool-error",
+                toolCallId: toolApproval.toolCall.toolCallId,
+                toolName: toolApproval.toolCall.toolName,
+                input: toolApproval.toolCall.input,
+                error: (0, import_provider29.getErrorMessage)(toolApproval.error),
+                title: toolApproval.toolCall.title,
+                ...toolApproval.toolCall.dynamic === true ? { dynamic: true } : {},
+                ...toolApproval.toolCall.toolMetadata != null ? { toolMetadata: toolApproval.toolCall.toolMetadata } : {}
+              });
+            }
             const toolOutputs = [];
             await Promise.all(
               localApprovedToolApprovals.map(async (toolApproval) => {
@@ -7765,7 +7806,7 @@ var DefaultStreamTextResult = class {
                 }
               })
             );
-            if (toolOutputs.length > 0 || localDeniedToolApprovals.length > 0) {
+            if (toolOutputs.length > 0 || localDeniedToolApprovals.length > 0 || invalidToolApprovals.length > 0) {
               const localToolContent = [];
               for (const output2 of toolOutputs) {
                 localToolContent.push({
@@ -7781,6 +7822,20 @@ var DefaultStreamTextResult = class {
                   })
                 });
               }
+              for (const toolApproval of invalidToolApprovals) {
+                localToolContent.push({
+                  type: "tool-result",
+                  toolCallId: toolApproval.toolCall.toolCallId,
+                  toolName: toolApproval.toolCall.toolName,
+                  output: await createToolModelOutput({
+                    toolCallId: toolApproval.toolCall.toolCallId,
+                    input: toolApproval.toolCall.input,
+                    tool: tools == null ? void 0 : tools[toolApproval.toolCall.toolName],
+                    output: toolApproval.error,
+                    errorMode: "text"
+                  })
+                });
+              }
               for (const toolApproval of localDeniedToolApprovals) {
                 localToolContent.push({
                   type: "tool-result",
@@ -7836,8 +7891,17 @@ var DefaultStreamTextResult = class {
               clearTimeout(stepTimeoutId);
             }
           }
-          abortSignal == null ? void 0 : abortSignal.addEventListener("abort", clearStepTimeout);
-          abortSignal == null ? void 0 : abortSignal.addEventListener("abort", clearChunkTimeout);
+          function clearStepTimeouts() {
+            clearStepTimeout();
+            clearChunkTimeout();
+          }
+          function cleanupStepTimeouts() {
+            abortSignal == null ? void 0 : abortSignal.removeEventListener("abort", cleanupStepTimeouts);
+            clearStepTimeouts();
+          }
+          abortSignal == null ? void 0 : abortSignal.addEventListener("abort", cleanupStepTimeouts, {
+            once: true
+          });
           try {
             stepFinish = new import_provider_utils20.DelayedPromise();
             const stepInputMessages = [...initialMessages, ...responseMessages];
@@ -8214,8 +8278,7 @@ var DefaultStreamTextResult = class {
                         })
                       });
                       doStreamSpan.end();
-                      clearStepTimeout();
-                      clearChunkTimeout();
+                      cleanupStepTimeouts();
                       self.closeStream();
                       return;
                     }
@@ -8319,8 +8382,7 @@ var DefaultStreamTextResult = class {
                         pendingDeferredToolCalls.delete(output2.toolCallId);
                       }
                     }
-                    clearStepTimeout();
-                    clearChunkTimeout();
+                    cleanupStepTimeouts();
                     if (
                       // Continue if:
                       // 1. There are client tool calls that have all been executed, OR
@@ -8364,11 +8426,14 @@ var DefaultStreamTextResult = class {
                     }
                   }
                 })
-              )
+              ),
+              {
+                onError: cleanupStepTimeouts,
+                onCancel: cleanupStepTimeouts
+              }
             );
           } catch (error) {
-            clearStepTimeout();
-            clearChunkTimeout();
+            cleanupStepTimeouts();
             throw error;
           }
         }