ai 6.0.312 → 6.0.314

package/dist/index.mjs

@@ -401,7 +401,7 @@ var ToolChoiceViolationError = class extends AISDKError15 {
     provider,
     modelId,
     content,
-    message = toolChoice.type === "required" ? "Model response did not contain a tool call even though tool choice was required." : `Model response did not contain a call to the required tool '${toolChoice.toolName}'.`
+    message = toolChoice.type === "none" ? "Model response contained a tool call even though tool choice was none." : toolChoice.type === "required" ? "Model response did not contain a tool call even though tool choice was required." : `Model response did not contain a call to the required tool '${toolChoice.toolName}'.`
   }) {
     super({ name: name15, message });
     this[_a15] = true;
@@ -1225,7 +1225,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "6.0.312" : "0.0.0-test";
+var VERSION = true ? "6.0.314" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -2876,6 +2876,7 @@ function collectToolApprovals({
   }
   const approvedToolApprovals = [];
   const deniedToolApprovals = [];
+  const collectedToolCallIds = /* @__PURE__ */ new Set();
   const approvalResponses = lastMessage.content.filter(
     (part) => part.type === "tool-approval-response"
   );
@@ -2896,6 +2897,10 @@ function collectToolApprovals({
         approvalId: approvalRequest.approvalId
       });
     }
+    if (collectedToolCallIds.has(toolCall.toolCallId)) {
+      continue;
+    }
+    collectedToolCallIds.add(toolCall.toolCallId);
     const approval = {
       approvalRequest,
       approvalResponse,
@@ -4960,16 +4965,18 @@ async function generateText({
                 (toolCall) => parseToolCall({
                   toolCall,
                   tools: stepToolSet,
-                  repairToolCall,
+                  // tool calls are rejected with tool choice none,
+                  // so user callbacks must not process them:
+                  repairToolCall: (stepToolChoice == null ? void 0 : stepToolChoice.type) === "none" ? void 0 : repairToolCall,
                   system,
                   messages: stepInputMessages
                 })
               )
             );
-            const enforcedToolChoice = (stepToolChoice == null ? void 0 : stepToolChoice.type) === "required" || (stepToolChoice == null ? void 0 : stepToolChoice.type) === "tool" ? stepToolChoice : void 0;
-            if (enforcedToolChoice != null && !stepToolCalls.some(
+            const enforcedToolChoice = (stepToolChoice == null ? void 0 : stepToolChoice.type) === "auto" ? void 0 : stepToolChoice;
+            if (enforcedToolChoice != null && (enforcedToolChoice.type === "none" ? stepToolCalls.length > 0 : !stepToolCalls.some(
               (toolCall) => enforcedToolChoice.type === "required" || toolCall.toolName === enforcedToolChoice.toolName
-            )) {
+            ))) {
               throw new ToolChoiceViolationError({
                 toolChoice: enforcedToolChoice,
                 finishReason: currentModelResponse.finishReason.unified,
@@ -6075,6 +6082,7 @@ function processUIMessageStream({
             const anyPart = part;
             if (part != null) {
               part.state = options.state;
+              anyPart.type = `tool-${options.toolName}`;
               anyPart.input = anyOptions.input;
               anyPart.output = anyOptions.output;
               anyPart.errorText = anyOptions.errorText;
@@ -7029,6 +7037,7 @@ import {
 } from "@ai-sdk/provider-utils";
 function runToolsTransformation({
   tools,
+  toolChoice,
   generatorStream,
   tracer,
   telemetry,
@@ -7118,10 +7127,19 @@ function runToolsTransformation({
     });
   }
   const activeToolCallToolNames = /* @__PURE__ */ new Map();
+  const withholdToolParts = (toolChoice == null ? void 0 : toolChoice.type) === "none";
+  const withheldToolContent = [];
   const forwardStream = new TransformStream({
     async transform(chunk, controller) {
-      var _a23, _b, _c, _d;
+      var _a23, _b, _c, _d, _e, _f;
       const chunkType = chunk.type;
+      if (withholdToolParts && (chunkType === "tool-input-start" || chunkType === "tool-input-delta" || chunkType === "tool-input-end" || chunkType === "tool-approval-request")) {
+        return;
+      }
+      if (withholdToolParts && (chunkType === "tool-call" || chunkType === "tool-result")) {
+        withheldToolContent.push(chunk);
+        return;
+      }
       switch (chunkType) {
         case "stream-start":
         case "text-start":
@@ -7179,13 +7197,26 @@ function runToolsTransformation({
           break;
         }
         case "finish": {
+          const toolChoiceViolationError = withholdToolParts && withheldToolContent.some((part) => part.type === "tool-call") ? new ToolChoiceViolationError({
+            toolChoice: { type: "none" },
+            finishReason: chunk.finishReason.unified,
+            provider: (_e = model == null ? void 0 : model.provider) != null ? _e : "unknown",
+            modelId: (_f = model == null ? void 0 : model.modelId) != null ? _f : "unknown",
+            content: withheldToolContent
+          }) : void 0;
           finishChunk = {
             type: "finish",
-            finishReason: chunk.finishReason.unified,
+            finishReason: toolChoiceViolationError == null ? chunk.finishReason.unified : "error",
             rawFinishReason: chunk.finishReason.raw,
             usage: asLanguageModelUsage(chunk.usage),
             providerMetadata: chunk.providerMetadata
           };
+          if (toolChoiceViolationError != null) {
+            controller.enqueue({
+              type: "error",
+              error: toolChoiceViolationError
+            });
+          }
           if (isToolExecutionAllowedFinishReason(chunk.finishReason.unified)) {
             for (const toolCall of toolCallsToExecute.splice(0)) {
               executeToolCallAfterFinish(toolCall);
@@ -8374,6 +8405,7 @@ var DefaultStreamTextResult = class {
             );
             const streamWithToolResults = runToolsTransformation({
               tools: stepToolSet,
+              toolChoice: stepToolChoice,
               generatorStream: stream2,
               tracer,
               telemetry,
@@ -12805,18 +12837,53 @@ function pruneMessages({
       if (message.role !== "assistant" && message.role !== "tool" || typeof message.content === "string" || keepLastMessagesCount && messageIndex >= messages.length - keepLastMessagesCount) {
         return message;
       }
-      return {
-        ...message,
-        content: message.content.filter((part) => {
-          if (part.type !== "tool-call" && part.type !== "tool-result" && part.type !== "tool-approval-request" && part.type !== "tool-approval-response") {
-            return true;
+      const keepParts = message.content.map((part) => {
+        if (part.type !== "tool-call" && part.type !== "tool-result" && part.type !== "tool-approval-request" && part.type !== "tool-approval-response") {
+          return true;
+        }
+        if ((part.type === "tool-call" || part.type === "tool-result") && keptToolCallIds.has(part.toolCallId) || (part.type === "tool-approval-request" || part.type === "tool-approval-response") && keptApprovalIds.has(part.approvalId)) {
+          return true;
+        }
+        const partToolName = part.type === "tool-call" || part.type === "tool-result" ? part.toolName : approvalIdToToolName.get(part.approvalId);
+        return toolCall.tools != null && partToolName != null && !toolCall.tools.includes(partToolName);
+      });
+      if (message.role === "assistant") {
+        for (let reasoningIndex = 0; reasoningIndex < message.content.length; reasoningIndex++) {
+          const part = message.content[reasoningIndex];
+          if (part.type !== "reasoning") {
+            continue;
+          }
+          let reasoningEndIndex = reasoningIndex + 1;
+          while (reasoningEndIndex < message.content.length) {
+            const nextPart = message.content[reasoningEndIndex];
+            if (nextPart.type !== "reasoning") {
+              break;
+            }
+            reasoningEndIndex++;
           }
-          if ((part.type === "tool-call" || part.type === "tool-result") && keptToolCallIds.has(part.toolCallId) || (part.type === "tool-approval-request" || part.type === "tool-approval-response") && keptApprovalIds.has(part.approvalId)) {
-            return true;
+          let followingPartIndex = reasoningEndIndex;
+          let hasFollowingPart = false;
+          let hasKeptFollowingPart = false;
+          while (followingPartIndex < message.content.length) {
+            const followingPart = message.content[followingPartIndex];
+            if (followingPart.type === "reasoning") {
+              break;
+            }
+            hasFollowingPart = true;
+            hasKeptFollowingPart || (hasKeptFollowingPart = keepParts[followingPartIndex]);
+            followingPartIndex++;
           }
-          const partToolName = part.type === "tool-call" || part.type === "tool-result" ? part.toolName : approvalIdToToolName.get(part.approvalId);
-          return toolCall.tools != null && partToolName != null && !toolCall.tools.includes(partToolName);
-        })
+          if (hasFollowingPart && !hasKeptFollowingPart) {
+            for (let index = reasoningIndex; index < reasoningEndIndex; index++) {
+              keepParts[index] = false;
+            }
+          }
+          reasoningIndex = followingPartIndex - 1;
+        }
+      }
+      return {
+        ...message,
+        content: message.content.filter((_, index) => keepParts[index])
       };
     });
   }