ai 7.0.124 → 7.0.127

package/dist/index.js

@@ -1102,7 +1102,7 @@ function cloneValue(value) {
 }
 //#endregion
 //#region src/version.ts
-const VERSION = "7.0.124";
+const VERSION = "7.0.127";
 //#endregion
 //#region src/util/download/download.ts
 /**
@@ -2949,14 +2949,21 @@ function appendToolCallerMessages({ messages, toolCallerMessages }) {
 //#endregion
 //#region src/tool-search/tool-search.ts
 const toolSearchSymbol = Symbol.for("vercel.ai.toolSearch");
+const toolSearchFunctionSymbol = Symbol.for("vercel.ai.toolSearch.search");
+const toolSearchMaxResultsSymbol = Symbol.for("vercel.ai.toolSearch.maxResults");
 /**
 * Search deferred tools by name and description. The surrounding generation
 * binds the search registry and makes matches available on the next step.
 * Use directly or through code mode with `toolDiscovery: 'conversation'`.
 */
-function toolSearch() {
+function toolSearch({ search, maxResults = 5 } = {}) {
+	if (!Number.isSafeInteger(maxResults) || maxResults < 1) throw new InvalidArgumentError({
+		parameter: "maxResults",
+		value: maxResults,
+		message: "maxResults must be a positive safe integer."
+	});
 	return Object.assign(tool$1({
-		description: "Search for tools by keywords in their names and descriptions. Returns up to five matching tools. Matches become available on the next model step, after this execution finishes. Wait for their tool definitions before calling the discovered tools. If no tools match, try different keywords.",
+		description: `${search == null ? "Search for tools by keywords in their names and descriptions." : "Search for tools matching a query."} Returns up to ${maxResults === 5 ? "five" : maxResults} matching tools. Matches become available on the next model step, after this execution finishes. Wait for their tool definitions before calling the discovered tools. If no tools match, try different keywords.`,
 		inputSchema: jsonSchema$1({
 			type: "object",
 			properties: { query: {
@@ -2988,9 +2995,17 @@ function toolSearch() {
 		}
 	}), {
 		type: "function",
-		[toolSearchSymbol]: true
+		[toolSearchSymbol]: true,
+		[toolSearchFunctionSymbol]: search,
+		[toolSearchMaxResultsSymbol]: maxResults
 	});
 }
+function getToolSearchMaxResults(tool) {
+	return tool[toolSearchMaxResultsSymbol] ?? 5;
+}
+function getToolSearchFunction(tool) {
+	return tool[toolSearchFunctionSymbol];
+}
 function isToolSearch(tool) {
 	return tool[toolSearchSymbol] === true;
 }
@@ -3020,28 +3035,39 @@ function createToolSearchState({ tools, toolCallers }) {
 			const candidates = entries.filter(([name, candidate]) => candidate.deferLoading && !isToolSearch(candidate) && callers.some((caller) => getCallers(name).includes(caller)));
 			return [searchName, {
 				...tool,
-				execute: ({ query }) => {
-					const terms = [...new Set(tokenize(query))];
-					const matches = candidates.map(([name, candidate]) => {
+				execute: async ({ query }) => {
+					const availableTools = candidates.map(([name, candidate]) => {
 						const description = resolveToolDescription({
 							tool: candidate,
 							toolName: name,
 							toolsContext,
 							experimental_sandbox
 						});
+						return {
+							name,
+							...description == null ? {} : { description }
+						};
+					});
+					const toolsByName = new Map(availableTools.map((tool) => [tool.name, tool]));
+					const customSearch = getToolSearchFunction(tool);
+					const terms = [...new Set(tokenize(query))];
+					const rankedNames = customSearch ? await customSearch({
+						query,
+						tools: availableTools.map((tool) => ({ ...tool }))
+					}) : availableTools.map(({ name, description }) => {
 						const nameTerms = tokenize(name);
 						const descriptionTerms = tokenize(description ?? "");
 						return {
 							name,
-							description,
 							score: terms.reduce((score, term) => score + (nameTerms.includes(term) ? 2 : 0) + (descriptionTerms.includes(term) ? 1 : 0), 0)
 						};
-					}).filter((match) => match.score > 0).sort((a, b) => b.score - a.score).slice(0, 5);
+					}).filter((match) => match.score > 0).sort((a, b) => b.score - a.score).map((match) => match.name);
+					const matches = [...new Set(rankedNames)].flatMap((name) => {
+						const match = toolsByName.get(name);
+						return match == null ? [] : [match];
+					}).slice(0, getToolSearchMaxResults(tool));
 					for (const { name } of matches) discovered.add(name);
-					return { tools: matches.map(({ name, description }) => ({
-						name,
-						...description == null ? {} : { description }
-					})) };
+					return { tools: matches };
 				}
 			}];
 		}));
@@ -4995,13 +5021,14 @@ async function validateApprovedToolApprovals({ approvedToolApprovals, tools, too
 			let validationError;
 			if (!validation.success) validationError = validation.error;
 			else try {
-				if (!isDeepEqualData((await refineParsedToolCallInput({
+				const revalidatedToolCall = await refineParsedToolCallInput({
 					toolCall: {
 						...toolCall,
 						input: validation.value
 					},
 					refineToolInput
-				})).input, toolCall.input)) validationError = /* @__PURE__ */ new Error("Approved tool input does not match the validated schema output.");
+				});
+				if (!isDeepEqualData(structuredClone(revalidatedToolCall.input), structuredClone(toolCall.input))) validationError = /* @__PURE__ */ new Error("Approved tool input does not match the validated schema output.");
 			} catch (error) {
 				validationError = error;
 			}
@@ -10331,10 +10358,20 @@ var ToolLoopAgent = class {
 function createUIMessageStream({ execute, onError = () => "An error occurred.", originalMessages, onStepEnd, onStepFinish, onEnd, onFinish, generateId = generateId$1 }) {
 	let controller;
 	const ongoingStreamPromises = [];
+	const activeReaders = /* @__PURE__ */ new Set();
+	let isCancelled = false;
+	let cancelReason;
 	let outcome = { status: "unknown" };
-	const stream = new ReadableStream({ start(controllerArg) {
-		controller = controllerArg;
-	} });
+	const stream = new ReadableStream({
+		start(controllerArg) {
+			controller = controllerArg;
+		},
+		async cancel(reason) {
+			isCancelled = true;
+			cancelReason = reason;
+			await Promise.all(Array.from(activeReaders, (reader) => reader.cancel(reason)));
+		}
+	});
 	function safeEnqueue(data) {
 		try {
 			controller.enqueue(data);
@@ -10375,12 +10412,22 @@ function createUIMessageStream({ execute, onError = () => "An error occurred.",
 				safeEnqueue(part);
 			},
 			merge(streamArg) {
+				if (isCancelled) {
+					streamArg.cancel(cancelReason).catch(() => {});
+					return;
+				}
 				ongoingStreamPromises.push((async () => {
 					const reader = streamArg.getReader();
-					while (true) {
-						const { done, value } = await reader.read();
-						if (done) break;
-						safeEnqueue(value);
+					activeReaders.add(reader);
+					try {
+						while (true) {
+							const { done, value } = await reader.read();
+							if (done) break;
+							safeEnqueue(value);
+						}
+					} finally {
+						activeReaders.delete(reader);
+						reader.releaseLock();
 					}
 				})().catch((error) => {
 					handleError(error);
@@ -11204,6 +11251,7 @@ async function validateUIMessagesForAgent(options) {
 *
 * @param agent - The agent to run.
 * @param uiMessages - The input UI messages.
+* @param convertDataPart - Optional function to convert custom data parts to text or file model message parts.
 * @param abortSignal - The abort signal. Optional.
 * @param timeout - Timeout in milliseconds. Optional.
 * @param experimental_sandbox - The sandbox environment that is passed through to tool execution. Optional.
@@ -11214,12 +11262,15 @@ async function validateUIMessagesForAgent(options) {
 *
 * @returns The UI message stream.
 */
-async function createAgentUIStream({ agent, uiMessages, options, abortSignal, timeout, experimental_sandbox: sandbox, experimental_transform, onStepEnd, onStepFinish, ...uiMessageStreamOptions }) {
+async function createAgentUIStream({ agent, uiMessages, convertDataPart, options, abortSignal, timeout, experimental_sandbox: sandbox, experimental_transform, onStepEnd, onStepFinish, ...uiMessageStreamOptions }) {
 	const validatedMessages = await validateUIMessagesForAgent({
 		messages: uiMessages,
 		tools: agent.tools
 	});
-	const modelMessages = await convertToModelMessages(validatedMessages, { tools: agent.tools });
+	const modelMessages = await convertToModelMessages(validatedMessages, {
+		tools: agent.tools,
+		convertDataPart
+	});
 	const result = await agent.stream({
 		prompt: modelMessages,
 		options,
@@ -11244,6 +11295,7 @@ async function createAgentUIStream({ agent, uiMessages, options, abortSignal, ti
 *
 * @param agent - The agent to run.
 * @param uiMessages - The input UI messages.
+* @param convertDataPart - Optional function to convert custom data parts to text or file model message parts.
 * @param abortSignal - Abort signal. Optional.
 * @param timeout - Timeout in milliseconds. Optional.
 * @param experimental_sandbox - The sandbox environment that is passed through to tool execution. Optional.
@@ -11277,6 +11329,7 @@ async function createAgentUIStreamResponse({ headers, status, statusText, keepAl
 * @param response - The Node.js ServerResponse object to pipe to.
 * @param agent - The agent to run.
 * @param uiMessages - The input UI messages.
+* @param convertDataPart - Optional function to convert custom data parts to text or file model message parts.
 * @param abortSignal - Abort signal. Optional.
 * @param timeout - Timeout in milliseconds. Optional.
 * @param experimental_sandbox - The sandbox environment that is passed through to tool execution. Optional.
@@ -19514,15 +19567,32 @@ var AbstractChat = class {
 				}
 			});
 		});
-		this.addToolOutput = async ({ state = "output-available", toolCallId, output, errorText, options }) => this.jobExecutor.run(async () => {
+		this.addToolOutput = async ({ state, toolCallId, output, errorText, options }) => this.jobExecutor.run(async () => {
 			const messages = this.state.messages;
 			const lastMessage = messages[messages.length - 1];
-			const updatePart = (part) => isToolUIPart(part) && part.toolCallId === toolCallId ? {
-				...part,
-				state,
-				output,
-				errorText
-			} : part;
+			const updatePart = (part) => {
+				if (!isToolUIPart(part) || part.toolCallId !== toolCallId) return part;
+				const { approval: existingApproval, ...toolPart } = part;
+				const approval = existingApproval?.approved === true ? { approval: {
+					...existingApproval,
+					approved: existingApproval.approved
+				} } : {};
+				return state === "output-error" ? {
+					...toolPart,
+					...approval,
+					state,
+					input: part.input,
+					output: void 0,
+					errorText
+				} : {
+					...toolPart,
+					...approval,
+					state: "output-available",
+					input: part.input,
+					output,
+					errorText: void 0
+				};
+			};
 			this.state.replaceMessage(messages.length - 1, {
 				...lastMessage,
 				parts: lastMessage.parts.map(updatePart)