ai 7.0.148 → 7.0.149

package/dist/index.js

@@ -389,7 +389,7 @@ const symbol$6 = Symbol.for(marker$6);
 * Thrown when a model response does not satisfy an enforced tool choice.
 */
 var ToolChoiceViolationError = class extends AISDKError$1 {
-	constructor({ toolChoice, finishReason, 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}'.` }) {
+	constructor({ toolChoice, finishReason, provider, modelId, content, 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: name$6,
 			message
@@ -1174,7 +1174,7 @@ function cloneValue(value) {
 }
 //#endregion
 //#region src/version.ts
-const VERSION = "7.0.148";
+const VERSION = "7.0.149";
 //#endregion
 //#region src/util/download/download.ts
 /**
@@ -2740,6 +2740,7 @@ function collectToolApprovals({ messages }) {
 	for (const part of lastMessage.content) if (part.type === "tool-result") toolResults[part.toolCallId] = part;
 	const approvedToolApprovals = [];
 	const deniedToolApprovals = [];
+	const collectedToolCallIds = /* @__PURE__ */ new Set();
 	const approvalResponses = lastMessage.content.filter((part) => part.type === "tool-approval-response");
 	for (const approvalResponse of approvalResponses) {
 		const approvalRequest = toolApprovalRequestsByApprovalId[approvalResponse.approvalId];
@@ -2751,6 +2752,8 @@ function collectToolApprovals({ messages }) {
 			toolCallId: approvalRequest.toolCallId,
 			approvalId: approvalRequest.approvalId
 		});
+		if (collectedToolCallIds.has(toolCall.toolCallId)) continue;
+		collectedToolCallIds.add(toolCall.toolCallId);
 		const approval = {
 			approvalRequest,
 			approvalResponse,
@@ -5569,7 +5572,7 @@ async function generateText({ model: modelArg, tools, toolChoice, instructions,
 								tools,
 								activeTools: prepareStepResult?.activeTools ?? activeTools
 							});
-							const { executionTools: stepExecutionTools, modelTools: stepModelTools, toolCallerMessages } = prepareToolsForToolCallers({
+							const { executionTools, modelTools: stepModelTools, toolCallerMessages } = prepareToolsForToolCallers({
 								tools: prepareToolSearch(stepActiveTools, {
 									toolsContext,
 									experimental_sandbox: stepSandbox
@@ -5584,6 +5587,7 @@ async function generateText({ model: modelArg, tools, toolChoice, instructions,
 								experimental_sandbox: stepSandbox
 							});
 							const stepToolChoice = prepareToolChoice({ toolChoice: prepareStepResult?.toolChoice ?? toolChoice });
+							const stepExecutionTools = stepToolChoice.type === "none" ? void 0 : executionTools;
 							const stepMessages = appendToolCallerMessages({
 								messages: prepareStepResult?.messages ?? stepInputMessages,
 								toolCallerMessages
@@ -5675,8 +5679,8 @@ async function generateText({ model: modelArg, tools, toolChoice, instructions,
 							const stepToolCalls = await Promise.all(currentModelResponse.content.filter((part) => part.type === "tool-call").map((toolCall) => parseToolCall({
 								toolCall,
 								tools: stepModelTools,
-								repairToolCall,
-								refineToolInput,
+								repairToolCall: stepToolChoice.type === "none" ? void 0 : repairToolCall,
+								refineToolInput: stepToolChoice.type === "none" ? void 0 : refineToolInput,
 								instructions: stepInstructions,
 								messages: stepMessages,
 								abortSignal: mergedAbortSignal
@@ -5722,8 +5726,8 @@ async function generateText({ model: modelArg, tools, toolChoice, instructions,
 								},
 								callbacks: [resolvedOnLanguageModelCallEnd, telemetryDispatcher.onLanguageModelCallEnd]
 							});
-							const enforcedToolChoice = stepToolChoice.type === "required" || stepToolChoice.type === "tool" ? stepToolChoice : void 0;
-							if (enforcedToolChoice != null && !stepToolCalls.some((toolCall) => enforcedToolChoice.type === "required" || toolCall.toolName === enforcedToolChoice.toolName)) throw new ToolChoiceViolationError({
+							const enforcedToolChoice = stepToolChoice.type === "auto" ? void 0 : stepToolChoice;
+							if (enforcedToolChoice != null && (enforcedToolChoice.type === "none" ? stepToolCalls.length > 0 : currentModelResponse.finishReason.unified !== "interrupted" && !stepToolCalls.some((toolCall) => enforcedToolChoice.type === "required" || toolCall.toolName === enforcedToolChoice.toolName))) throw new ToolChoiceViolationError({
 								toolChoice: enforcedToolChoice,
 								finishReason: currentModelResponse.finishReason.unified,
 								provider: stepModel.provider,
@@ -5943,7 +5947,7 @@ async function generateText({ model: modelArg, tools, toolChoice, instructions,
 				} finally {
 					if (stepTimeoutId != null) clearTimeout(stepTimeoutId);
 				}
-			} while (clientToolOutputs.length + deniedToolApprovalResponses.length === clientToolCalls.length && (clientToolCalls.length > 0 || pendingDeferredToolCalls.size > 0) && !await isStopConditionMet({
+			} while (steps[steps.length - 1].finishReason !== "interrupted" && clientToolOutputs.length + deniedToolApprovalResponses.length === clientToolCalls.length && (clientToolCalls.length > 0 || pendingDeferredToolCalls.size > 0) && !await isStopConditionMet({
 				stopConditions,
 				steps
 			}));
@@ -6520,6 +6524,7 @@ const uiMessageChunkSchema = lazySchema(() => zodSchema$1(z.union([
 			"content-filter",
 			"tool-calls",
 			"error",
+			"interrupted",
 			"other"
 		]).optional(),
 		messageMetadata: z.unknown().optional()
@@ -8394,6 +8399,7 @@ function createLanguageModelV4StreamPartToLanguageModelStreamPartTransform({ too
 	let timeToFirstOutputMs;
 	let previousOutputChunkTimestampMs;
 	const timeBetweenOutputChunksMs = [];
+	const withholdToolParts = toolChoice.type === "none";
 	return new TransformStream({ async transform(chunk, controller) {
 		if (isOutputChunk(chunk)) {
 			const outputChunkTimestampMs = now();
@@ -8401,6 +8407,7 @@ function createLanguageModelV4StreamPartToLanguageModelStreamPartTransform({ too
 			else if (previousOutputChunkTimestampMs != null) timeBetweenOutputChunksMs.push(outputChunkTimestampMs - previousOutputChunkTimestampMs);
 			previousOutputChunkTimestampMs = outputChunkTimestampMs;
 		}
+		if (withholdToolParts && (chunk.type === "tool-input-start" || chunk.type === "tool-input-delta" || chunk.type === "tool-input-end")) return;
 		switch (chunk.type) {
 			case "error":
 				controller.enqueue({
@@ -8562,8 +8569,8 @@ function createLanguageModelV4StreamPartToLanguageModelStreamPartTransform({ too
 					},
 					callbacks: onLanguageModelCallEnd
 				});
-				const enforcedToolChoice = toolChoice.type === "required" || toolChoice.type === "tool" ? toolChoice : void 0;
-				const toolChoiceViolationError = enforcedToolChoice != null && ![...toolCallsByToolCallId.values()].some((toolCall) => enforcedToolChoice.type === "required" || toolCall.toolName === enforcedToolChoice.toolName) ? new ToolChoiceViolationError({
+				const enforcedToolChoice = toolChoice.type === "auto" ? void 0 : toolChoice;
+				const toolChoiceViolationError = enforcedToolChoice != null && (enforcedToolChoice.type === "none" ? toolCallsByToolCallId.size > 0 : chunk.finishReason.unified !== "interrupted" && ![...toolCallsByToolCallId.values()].some((toolCall) => enforcedToolChoice.type === "required" || toolCall.toolName === enforcedToolChoice.toolName)) ? new ToolChoiceViolationError({
 					toolChoice: enforcedToolChoice,
 					finishReason: chunk.finishReason.unified,
 					provider,
@@ -8593,15 +8600,16 @@ function createLanguageModelV4StreamPartToLanguageModelStreamPartTransform({ too
 					const toolCall = await parseToolCall({
 						toolCall: chunk,
 						tools,
-						repairToolCall,
-						refineToolInput,
+						repairToolCall: withholdToolParts ? void 0 : repairToolCall,
+						refineToolInput: withholdToolParts ? void 0 : refineToolInput,
 						instructions,
 						messages,
 						abortSignal
 					});
 					toolCallsByToolCallId.set(toolCall.toolCallId, toolCall);
-					controller.enqueue(toolCall);
 					if (collectContent) modelCallContent.push(toolCall);
+					if (withholdToolParts) break;
+					controller.enqueue(toolCall);
 					if (toolCall.invalid) {
 						if (!toolCall.providerExecuted) controller.enqueue({
 							type: "tool-error",
@@ -8624,6 +8632,7 @@ function createLanguageModelV4StreamPartToLanguageModelStreamPartTransform({ too
 				break;
 			case "tool-approval-request": {
 				if (collectContent) rawModelCallContent.push(chunk);
+				if (withholdToolParts) break;
 				const toolCall = toolCallsByToolCallId.get(chunk.toolCallId);
 				if (toolCall == null) {
 					controller.enqueue({
@@ -8669,7 +8678,7 @@ function createLanguageModelV4StreamPartToLanguageModelStreamPartTransform({ too
 					...chunk.providerMetadata != null ? { providerMetadata: chunk.providerMetadata } : {},
 					...toolCall?.toolMetadata != null ? { toolMetadata: toolCall.toolMetadata } : {}
 				};
-				controller.enqueue(toolResultPart);
+				if (!withholdToolParts) controller.enqueue(toolResultPart);
 				if (collectContent) modelCallContent.push(toolResultPart);
 				break;
 			}
@@ -9783,7 +9792,7 @@ var DefaultStreamTextResult = class {
 						tools,
 						activeTools: prepareStepResult?.activeTools ?? activeTools
 					});
-					const { executionTools: stepExecutionTools, modelTools: stepModelTools, toolCallerMessages } = prepareToolsForToolCallers({
+					const { executionTools, modelTools: stepModelTools, toolCallerMessages } = prepareToolsForToolCallers({
 						tools: prepareToolSearch(stepActiveTools, {
 							toolsContext,
 							experimental_sandbox: stepSandbox
@@ -9798,6 +9807,7 @@ var DefaultStreamTextResult = class {
 						experimental_sandbox: stepSandbox
 					});
 					const stepToolChoice = prepareToolChoice({ toolChoice: prepareStepResult?.toolChoice ?? toolChoice });
+					const stepExecutionTools = stepToolChoice.type === "none" ? void 0 : executionTools;
 					const stepMessages = appendToolCallerMessages({
 						messages: prepareStepResult?.messages ?? stepInputMessages,
 						toolCallerMessages
@@ -10244,7 +10254,7 @@ var DefaultStreamTextResult = class {
 							}
 							for (const output of stepToolOutputs) if (output.type === "tool-result" || output.type === "tool-error") pendingDeferredToolCalls.delete(output.toolCallId);
 							cleanupStepTimeouts();
-							if (clientToolCalls.length === clientToolOutputs.length + deniedToolApprovalResponses.length && (clientToolCalls.length > 0 || pendingDeferredToolCalls.size > 0) && !await isStopConditionMet({
+							if (stepFinishReason !== "interrupted" && clientToolCalls.length === clientToolOutputs.length + deniedToolApprovalResponses.length && (clientToolCalls.length > 0 || pendingDeferredToolCalls.size > 0) && !await isStopConditionMet({
 								stopConditions,
 								steps: recordedSteps
 							})) try {
@@ -20035,6 +20045,7 @@ var AbstractChat = class {
 	}
 	constructor({ generateId = generateId$1, id, transport = new DefaultChatTransport(), messageMetadataSchema, dataPartSchemas, state, onError, onToolCall, onFinish, onData, sendAutomaticallyWhen }) {
 		this.pendingMessagePreparations = /* @__PURE__ */ new Set();
+		this.interruptedMessageIds = /* @__PURE__ */ new Set();
 		this.activeResponse = void 0;
 		this.activeResumeRequest = void 0;
 		this.resumableStreamState = void 0;
@@ -20166,7 +20177,7 @@ var AbstractChat = class {
 			}
 			if (this.activeResponse) this.activeResponse.state.message.parts = this.activeResponse.state.message.parts.map(updatePart);
 			if (messageIndex !== -1 && this.status !== "streaming" && this.status !== "submitted" && this.sendAutomaticallyWhen) {
-				const shouldSend = await this.shouldSendAutomatically();
+				const shouldSend = await this.shouldSendAutomatically(messages[messageIndex].id);
 				if (shouldSend) this.runAutomaticRequest(() => {
 					const messageId = messageIndex === -1 ? this.lastMessage?.id : messages[messageIndex].id;
 					return this.makeRequestForToolApproval({
@@ -20212,7 +20223,7 @@ var AbstractChat = class {
 			}
 			if (this.activeResponse) this.activeResponse.state.message.parts = this.activeResponse.state.message.parts.map(updatePart);
 			if (messageIndex !== -1 && this.status !== "streaming" && this.status !== "submitted" && this.sendAutomaticallyWhen) {
-				const shouldSend = await this.shouldSendAutomatically();
+				const shouldSend = await this.shouldSendAutomatically(messages[messageIndex].id);
 				if (shouldSend) this.runAutomaticRequest(() => this.makeRequest({
 					trigger: "submit-message",
 					messageId: messages[messageIndex].id,
@@ -20283,11 +20294,10 @@ var AbstractChat = class {
 	set messages(messages) {
 		this.state.messages = messages;
 	}
-	async shouldSendAutomatically() {
-		if (!this.sendAutomaticallyWhen) return false;
-		const result = this.sendAutomaticallyWhen({ messages: this.state.messages });
-		if (result && typeof result === "object" && "then" in result) return await result;
-		return result;
+	async shouldSendAutomatically(messageId = this.lastMessage?.id) {
+		const isInterrupted = (id) => id != null && this.interruptedMessageIds.has(id);
+		if (!this.sendAutomaticallyWhen || isInterrupted(messageId) || isInterrupted(this.lastMessage?.id)) return false;
+		return await this.sendAutomaticallyWhen({ messages: this.state.messages }) && !isInterrupted(messageId) && !isInterrupted(this.lastMessage?.id);
 	}
 	async runAutomaticRequest(request, shouldSend) {
 		const stopGeneration = this.stopGeneration;
@@ -20486,20 +20496,25 @@ var AbstractChat = class {
 			});
 		} finally {
 			try {
-				if (activeResponse) this.onFinish?.({
-					message: activeResponse.state.message,
-					messages: this.state.messages,
-					isAbort,
-					isDisconnect,
-					isError,
-					finishReason: activeResponse.state.finishReason
-				});
+				if (activeResponse) {
+					const { message, finishReason } = activeResponse.state;
+					if (finishReason === "interrupted") this.interruptedMessageIds.add(message.id);
+					else if (!isAbort && !isError) this.interruptedMessageIds.delete(message.id);
+					this.onFinish?.({
+						message: activeResponse.state.message,
+						messages: this.state.messages,
+						isAbort,
+						isDisconnect,
+						isError,
+						finishReason: activeResponse.state.finishReason
+					});
+				}
 			} finally {
 				if (this.activeResponse === activeResponse) this.activeResponse = void 0;
 				clearActiveResumeRequest();
 			}
 		}
-		if (!isAbort && !isError) await this.runAutomaticRequest(() => this.makeRequest({
+		if (!isAbort && !isError && activeResponse?.state.finishReason !== "interrupted") await this.runAutomaticRequest(() => this.makeRequest({
 			trigger: "submit-message",
 			messageId: this.lastMessage?.id,
 			metadata,