@revojs/ai 0.2.22 → 0.2.24

package/dist/index.d.ts

@@ -761,6 +761,7 @@ export declare function useModelsDev(id: string, resolve: (model: ModelsDevModel
     textStream: Record<string, Protocol<LanguageModelCallOptions<string>, LanguageModelStreamResult>>;
 }>;
 export declare function modelsDevProtocol(model: ModelsDevModel, provider: ModelsDevProvider): ModelsDevProtocol | undefined;
+export declare function toToolInput(value: string | undefined): string;
 export declare function mergeHeaders(...headers: Array<Record<string, string | undefined> | undefined>): Record<string, string>;
 export declare function postJson(url: string, body: unknown, options?: {
     headers?: Record<string, string | undefined>;

package/dist/index.js

@@ -371,6 +371,9 @@ function modelsDevProtocol(model, provider) {
 	if (npm === "@ai-sdk/openai") return model.provider?.shape === "completions" ? "chat-completions" : "responses";
 	if (npm === "@ai-sdk/openai-compatible") return "chat-completions";
 }
+function toToolInput(value) {
+	return value === void 0 || value.trim() === "" ? "{}" : value;
+}
 function mergeHeaders(...headers) {
 	const merged = {};
 	for (const record of headers) for (const [name, value] of Object.entries(record ?? {})) if (value !== void 0) merged[name] = value;
@@ -421,4 +424,4 @@ function toStream(read) {
 }
 var modelsDevCache = { loadedAt: 0 };
 //#endregion
-export { ModelContextProtocolConnection, defineProvider, defineTool, handleModelContextProtocol, mergeHeaders, modelsDevProtocol, postJson, readDataFrames, toStream, useAi, useModelContextProtocol, useModelsDev, useTools };
+export { ModelContextProtocolConnection, defineProvider, defineTool, handleModelContextProtocol, mergeHeaders, modelsDevProtocol, postJson, readDataFrames, toStream, toToolInput, useAi, useModelContextProtocol, useModelsDev, useTools };

package/dist/protocols/anthropic-messages.js

@@ -1,4 +1,4 @@
-import { mergeHeaders, postJson, readDataFrames, toStream } from "../index.js";
+import { mergeHeaders, postJson, readDataFrames, toStream, toToolInput } from "../index.js";
 import { toJsonSchema } from "revojs/shared";
 //#region src/protocols/anthropic-messages.ts
 function toUsage(inputTokens, cacheRead, cacheWrite, outputTokens) {
@@ -145,6 +145,24 @@ function toBody(options, stream) {
 		});
 	}
 	flushUser();
+	const cache = options.providerOptions?.messages?.cache !== false;
+	const tools = [];
+	const lastContent = wire.at(-1)?.content;
+	for (const tool of options.tools ?? []) if (tool.type === "provider") tools.push({
+		type: "custom",
+		name: `${tool.id}.${tool.name}`,
+		...tool.args
+	});
+	else tools.push({
+		name: tool.name,
+		description: tool.description,
+		input_schema: toJsonSchema(tool.inputSchema)
+	});
+	if (cache && tools.length > 0) tools[tools.length - 1].cache_control = { type: "ephemeral" };
+	if (cache && Array.isArray(lastContent)) {
+		const lastBlock = lastContent.at(-1);
+		if (lastBlock !== void 0 && lastBlock.type !== "thinking") lastBlock.cache_control = { type: "ephemeral" };
+	}
 	return [{
 		model: options.model,
 		max_tokens: options.maxOutputTokens ?? 8192,
@@ -153,16 +171,13 @@ function toBody(options, stream) {
 		...options.topP !== void 0 ? { top_p: options.topP } : {},
 		...options.topK !== void 0 ? { top_k: options.topK } : {},
 		...options.stopSequences !== void 0 ? { stop_sequences: options.stopSequences } : {},
-		...system.length > 0 ? { system } : {},
-		...options.tools !== void 0 && options.tools.length > 0 ? { tools: options.tools.map((tool) => tool.type === "provider" ? {
-			type: "custom",
-			name: `${tool.id}.${tool.name}`,
-			...tool.args
-		} : {
-			name: tool.name,
-			description: tool.description,
-			input_schema: toJsonSchema(tool.inputSchema)
-		}) } : {},
+		...system.length > 0 && cache ? { system: [{
+			type: "text",
+			text: system,
+			cache_control: { type: "ephemeral" }
+		}] } : {},
+		...system.length > 0 && !cache ? { system } : {},
+		...tools.length > 0 ? { tools } : {},
 		...options.toolChoice !== void 0 ? { tool_choice: options.toolChoice.type === "tool" ? {
 			type: "tool",
 			name: options.toolChoice.toolName
@@ -210,7 +225,8 @@ async function* readParts(response, warnings) {
 		if (chunk.type === "content_block_start") {
 			const index = chunk.index ?? 0;
 			const kind = chunk.content_block?.type ?? "";
-			const streamId = `anthropic-${kind}-${streamCount++}`;
+			const toolCallId = kind === "tool_use" ? chunk.content_block?.id ?? "" : "";
+			const streamId = toolCallId.length > 0 ? toolCallId : `anthropic-${kind}-${streamCount++}`;
 			const record = {
 				index,
 				kind,
@@ -299,7 +315,7 @@ async function* readParts(response, warnings) {
 		type: "tool-call",
 		toolCallId: record.callId,
 		toolName: record.name,
-		input: record.json
+		input: toToolInput(record.json)
 	};
 	yield {
 		type: "finish",

package/dist/protocols/openai-chat-completions.js

@@ -1,4 +1,4 @@
-import { mergeHeaders, postJson, readDataFrames, toStream } from "../index.js";
+import { mergeHeaders, postJson, readDataFrames, toStream, toToolInput } from "../index.js";
 import { toJsonSchema } from "revojs/shared";
 //#region src/protocols/openai-chat-completions.ts
 function toMessages(prompt) {
@@ -256,7 +256,7 @@ async function* readParts(response, warnings) {
 			type: "tool-call",
 			toolCallId: accumulator.callId.length > 0 ? accumulator.callId : accumulator.streamId,
 			toolName: accumulator.name,
-			input: accumulator.arguments
+			input: toToolInput(accumulator.arguments)
 		};
 	}
 	yield {
@@ -289,7 +289,7 @@ function chatCompletionsGenerateProtocol(config) {
 			type: "tool-call",
 			toolCallId: call.id ?? "",
 			toolName: call.function?.name ?? "",
-			input: call.function?.arguments ?? ""
+			input: toToolInput(call.function?.arguments)
 		});
 		return {
 			content,

package/dist/protocols/openai-responses.js

@@ -1,4 +1,4 @@
-import { mergeHeaders, postJson, readDataFrames, toStream } from "../index.js";
+import { mergeHeaders, postJson, readDataFrames, toStream, toToolInput } from "../index.js";
 import { toJsonSchema } from "revojs/shared";
 //#region src/protocols/openai-responses.ts
 function toUsage(usage) {
@@ -276,7 +276,7 @@ async function* readParts(response, warnings) {
 					type: "tool-call",
 					toolCallId: event.item.call_id ?? streamId,
 					toolName: event.item.name ?? record?.name ?? "",
-					input: event.item.arguments ?? record?.arguments ?? ""
+					input: toToolInput(event.item.arguments ?? record?.arguments)
 				};
 				continue;
 			}
@@ -318,7 +318,7 @@ async function* readParts(response, warnings) {
 			type: "tool-call",
 			toolCallId: record.callId || id,
 			toolName: record.name,
-			input: record.arguments
+			input: toToolInput(record.arguments)
 		};
 	}
 	yield {
@@ -359,7 +359,7 @@ function responsesGenerateProtocol(config) {
 					type: "tool-call",
 					toolCallId: item.call_id ?? "",
 					toolName: item.name ?? "",
-					input: item.arguments ?? ""
+					input: toToolInput(item.arguments)
 				});
 				continue;
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@revojs/ai",
-    "version": "0.2.22",
+    "version": "0.2.24",
     "license": "MIT",
     "repository": {
         "type": "git",