@revojs/ai 0.2.23 → 0.2.25

package/dist/protocols/anthropic-messages.js

@@ -9,8 +9,8 @@ function toUsage(inputTokens, cacheRead, cacheWrite, outputTokens) {
 	if (outputTokens !== void 0) raw.output_tokens = outputTokens;
 	return {
 		inputTokens: {
-			total: inputTokens,
-			noCache: inputTokens !== void 0 && cacheRead !== void 0 && cacheWrite !== void 0 ? Math.max(0, inputTokens - cacheRead - cacheWrite) : void 0,
+			total: inputTokens === void 0 ? void 0 : inputTokens + (cacheRead ?? 0) + (cacheWrite ?? 0),
+			noCache: inputTokens,
 			cacheRead,
 			cacheWrite
 		},
@@ -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,

package/package.json

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