ai 6.0.313 → 6.0.315

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.313" : "0.0.0-test";
+var VERSION = true ? "6.0.315" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -4965,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,
@@ -7035,6 +7037,7 @@ import {
 } from "@ai-sdk/provider-utils";
 function runToolsTransformation({
   tools,
+  toolChoice,
   generatorStream,
   tracer,
   telemetry,
@@ -7124,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":
@@ -7185,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);
@@ -8380,6 +8405,7 @@ var DefaultStreamTextResult = class {
             );
             const streamWithToolResults = runToolsTransformation({
               tools: stepToolSet,
+              toolChoice: stepToolChoice,
               generatorStream: stream2,
               tracer,
               telemetry,