@codehz/ai 0.1.6 → 0.1.8

package/dist/index.mjs

@@ -1062,19 +1062,19 @@ function usageFromOpenAIResponses(raw) {
 }
 /** Anthropic Messages `usage`（message_start / message_delta） */
 function usageFromAnthropicMessages(raw) {
-	const inputTokens = num(raw.input_tokens);
+	const uncachedInputTokens = num(raw.input_tokens);
 	const outputTokens = num(raw.output_tokens);
 	const cacheWriteInputTokens = num(raw.cache_creation_input_tokens);
 	const cachedInputTokens = num(raw.cache_read_input_tokens);
 	const inputParts = [
-		inputTokens,
+		uncachedInputTokens,
 		cacheWriteInputTokens,
 		cachedInputTokens
 	].filter((n) => n !== void 0);
-	const summedInput = inputParts.length > 0 ? inputParts.reduce((sum, n) => sum + n, 0) : void 0;
-	const totalTokens = summedInput !== void 0 && outputTokens !== void 0 ? summedInput + outputTokens : void 0;
+	const inputTokens = inputParts.length > 0 ? inputParts.reduce((sum, n) => sum + n, 0) : void 0;
+	const totalTokens = inputTokens !== void 0 && outputTokens !== void 0 ? inputTokens + outputTokens : void 0;
 	let billableInputTokens;
-	if (inputTokens !== void 0 || cacheWriteInputTokens !== void 0) billableInputTokens = (inputTokens ?? 0) + (cacheWriteInputTokens ?? 0);
+	if (uncachedInputTokens !== void 0 || cacheWriteInputTokens !== void 0) billableInputTokens = (uncachedInputTokens ?? 0) + (cacheWriteInputTokens ?? 0);
 	return record({
 		inputTokens,
 		outputTokens,
@@ -1539,78 +1539,86 @@ var MessagesAdapter = class extends AdapterBase {
 	buildRequest(request) {
 		const messages = [];
 		let systemPrompt;
+		let pendingToolResultMessage;
 		if (request.instructions) systemPrompt = instructionsToMessagesText(request.instructions);
-		for (const item of request.input) switch (item.type) {
-			case "message": {
-				const role = item.role === "user" ? "user" : "assistant";
-				const supportedContent = ensureMessagesTextBlocks(item.content, `input message (${item.role}) content`);
-				if (supportedContent.length === 1 && supportedContent[0]?.type === "text") messages.push({
-					role,
-					content: supportedContent[0].text
-				});
-				else messages.push({
-					role,
-					content: supportedContent.map(canonicalToMessagesBlock)
-				});
-				break;
-			}
-			case "tool_call": {
-				const lastMsg = messages[messages.length - 1];
-				const toolBlock = {
-					type: "tool_use",
-					id: item.id,
-					name: item.name,
-					input: item.argumentsJson ?? parseToolUseInput(item.argumentsText)
-				};
-				if (lastMsg && lastMsg.role === "assistant" && typeof lastMsg.content !== "string") lastMsg.content.push(toolBlock);
-				else messages.push({
-					role: "assistant",
-					content: [toolBlock]
-				});
-				break;
-			}
-			case "tool_result": {
-				assertMessagesToolResultOutcome(item.outcome);
-				const content = ensureMessagesTextBlocks(item.content, `tool_result ${item.callId} content`).map(blockToText).join("\n");
-				const block = {
-					type: "tool_result",
-					tool_use_id: item.callId,
-					content,
-					is_error: item.outcome === "error"
-				};
-				messages.push({
-					role: "user",
-					content: [block]
-				});
-				break;
-			}
-			case "reasoning": {
-				const block = {
-					type: "thinking",
-					thinking: contentBlocksToText(ensureMessagesReasoningBlocks(item.content, "reasoning content"))
-				};
-				const lastMsg = messages[messages.length - 1];
-				if (lastMsg && lastMsg.role === "assistant" && typeof lastMsg.content !== "string") lastMsg.content.push(block);
-				else messages.push({
-					role: "assistant",
-					content: [block]
-				});
-				break;
-			}
-			case "opaque":
-				if (item.purpose === "replay" && typeof item.payload === "object" && item.payload !== null) {
-					const payload = item.payload;
-					if (payload.role === "assistant" && Array.isArray(payload.content)) {
-						if (payload.content.every((b) => typeof b === "object" && b !== null && "type" in b && (b.type === "text" || b.type === "thinking" || b.type === "redacted_thinking" || b.type === "tool_use" || b.type === "tool_result"))) {
-							rollbackTrailingAssistantMessages$2(messages);
-							messages.push({
-								role: "assistant",
-								content: payload.content
-							});
-						}
+		for (const item of request.input) {
+			if (item.type !== "tool_result") pendingToolResultMessage = void 0;
+			switch (item.type) {
+				case "message": {
+					const role = item.role === "user" ? "user" : "assistant";
+					const supportedContent = ensureMessagesTextBlocks(item.content, `input message (${item.role}) content`);
+					if (supportedContent.length === 1 && supportedContent[0]?.type === "text") messages.push({
+						role,
+						content: supportedContent[0].text
+					});
+					else messages.push({
+						role,
+						content: supportedContent.map(canonicalToMessagesBlock)
+					});
+					break;
+				}
+				case "tool_call": {
+					const lastMsg = messages[messages.length - 1];
+					const toolBlock = {
+						type: "tool_use",
+						id: item.id,
+						name: item.name,
+						input: item.argumentsJson ?? parseToolUseInput(item.argumentsText)
+					};
+					if (lastMsg && lastMsg.role === "assistant" && typeof lastMsg.content !== "string") lastMsg.content.push(toolBlock);
+					else messages.push({
+						role: "assistant",
+						content: [toolBlock]
+					});
+					break;
+				}
+				case "tool_result": {
+					assertMessagesToolResultOutcome(item.outcome);
+					const content = ensureMessagesTextBlocks(item.content, `tool_result ${item.callId} content`).map(blockToText).join("\n");
+					const block = {
+						type: "tool_result",
+						tool_use_id: item.callId,
+						content,
+						is_error: item.outcome === "error"
+					};
+					if (pendingToolResultMessage && typeof pendingToolResultMessage.content !== "string") pendingToolResultMessage.content.push(block);
+					else {
+						pendingToolResultMessage = {
+							role: "user",
+							content: [block]
+						};
+						messages.push(pendingToolResultMessage);
 					}
+					break;
 				}
-				break;
+				case "reasoning": {
+					const block = {
+						type: "thinking",
+						thinking: contentBlocksToText(ensureMessagesReasoningBlocks(item.content, "reasoning content"))
+					};
+					const lastMsg = messages[messages.length - 1];
+					if (lastMsg && lastMsg.role === "assistant" && typeof lastMsg.content !== "string") lastMsg.content.push(block);
+					else messages.push({
+						role: "assistant",
+						content: [block]
+					});
+					break;
+				}
+				case "opaque":
+					if (item.purpose === "replay" && typeof item.payload === "object" && item.payload !== null) {
+						const payload = item.payload;
+						if (payload.role === "assistant" && Array.isArray(payload.content)) {
+							if (payload.content.every((b) => typeof b === "object" && b !== null && "type" in b && (b.type === "text" || b.type === "thinking" || b.type === "redacted_thinking" || b.type === "tool_use" || b.type === "tool_result"))) {
+								rollbackTrailingAssistantMessages$2(messages);
+								messages.push({
+									role: "assistant",
+									content: payload.content
+								});
+							}
+						}
+					}
+					break;
+			}
 		}
 		const body = {
 			model: request.model,