@codehz/ai 0.8.0 → 0.8.1

package/dist/index.d.mts

@@ -919,7 +919,7 @@ type ResponsesFunctionCall = {
 type ResponsesFunctionCallOutput = {
   type: "function_call_output";
   call_id: string;
-  output: string;
+  output: string | ResponsesInputContentPart[];
   id?: string;
   status?: "in_progress" | "completed" | "incomplete";
 };

package/dist/index.mjs

@@ -2111,6 +2111,29 @@ function mapResponsesMessageContent(role, blocks, field) {
 		throw new AIRequestError(`${mapper$7.kind} does not support ${field} block of type "${block.type}"; only text/json/image blocks are supported`, "UNSUPPORTED_CONTENT_BLOCK");
 	});
 }
+function mapResponsesToolResultOutput(blocks, field) {
+	mapper$7.ensureBlocks(blocks, field, [
+		"text",
+		"json",
+		"image"
+	], "only text/json/image blocks are supported");
+	if (!blocks.some((block) => block.type === "image")) return mapper$7.textFromBlocks(blocks, field);
+	return blocks.map((block) => {
+		if (block.type === "text") return {
+			type: "input_text",
+			text: block.text
+		};
+		if (block.type === "json") return {
+			type: "input_text",
+			text: JSON.stringify(block.json)
+		};
+		if (block.type === "image") return {
+			type: "input_image",
+			image_url: block.imageUrl
+		};
+		throw new AIRequestError(`${mapper$7.kind} does not support ${field} block of type "${block.type}"; only text/json/image blocks are supported`, "UNSUPPORTED_CONTENT_BLOCK");
+	});
+}
 function mapReasoningInput(item, index) {
 	const text = mapper$7.textFromBlocks(mapper$7.ensureReasoningBlocks(item.content, "reasoning content"), "reasoning content");
 	const id = item.id && item.id.length > 0 ? item.id : `reasoning_replay_${index}`;
@@ -2186,7 +2209,7 @@ function mapResponsesCore(request, options) {
 			});
 			break;
 		case "tool_result": {
-			const output = mapper$7.textFromBlocks(item.content, `tool_result ${item.callId} content`);
+			const output = mapResponsesToolResultOutput(item.content, `tool_result ${item.callId} content`);
 			input.push({
 				type: "function_call_output",
 				call_id: item.callId,
@@ -3207,6 +3230,15 @@ function mapMessagesUserContent(blocks, field) {
 	}
 	return blocks.map((block) => canonicalToMessagesBlock(block, field));
 }
+function mapMessagesToolResultContent(blocks, field) {
+	mapper$6.ensureBlocks(blocks, field, [
+		"text",
+		"json",
+		"image"
+	], "only text/json/image blocks are supported");
+	if (!blocks.some((block) => block.type === "image")) return mapper$6.textFromBlocks(blocks, field);
+	return blocks.map((block) => canonicalToMessagesBlock(block, field));
+}
 function buildMessagesRequest(request, options) {
 	mapper$6.assertNoServerTools(request.serverTools);
 	const messages = [];
@@ -3252,7 +3284,7 @@ function buildMessagesRequest(request, options) {
 				break;
 			}
 			case "tool_result": {
-				const content = mapper$6.textFromBlocks(item.content, `tool_result ${item.callId} content`);
+				const content = mapMessagesToolResultContent(item.content, `tool_result ${item.callId} content`);
 				const block = {
 					type: "tool_result",
 					tool_use_id: item.callId,
@@ -3688,6 +3720,29 @@ function mapChatUserContent(blocks, field) {
 		throw new AIRequestError(`${mapper$4.kind} does not support ${field} block of type "${block.type}"; only text/json/image blocks are supported`, "UNSUPPORTED_CONTENT_BLOCK");
 	});
 }
+function mapChatToolResultContent(blocks, field) {
+	mapper$4.ensureBlocks(blocks, field, [
+		"text",
+		"json",
+		"image"
+	], "only text/json/image blocks are supported");
+	if (!blocks.some((block) => block.type === "image")) return mapper$4.textFromBlocks(blocks, field);
+	return blocks.map((block) => {
+		if (block.type === "text") return {
+			type: "text",
+			text: block.text
+		};
+		if (block.type === "json") return {
+			type: "text",
+			text: JSON.stringify(block.json)
+		};
+		if (block.type === "image") return {
+			type: "image_url",
+			image_url: { url: block.imageUrl }
+		};
+		throw new AIRequestError(`${mapper$4.kind} does not support ${field} block of type "${block.type}"; only text/json/image blocks are supported`, "UNSUPPORTED_CONTENT_BLOCK");
+	});
+}
 function mapChatMessageContent(role, blocks, field) {
 	if (role === "user") return mapChatUserContent(blocks, field);
 	return mapper$4.textFromBlocks(blocks, field) || null;
@@ -3731,7 +3786,7 @@ function buildChatCompletionsRequest(request, options) {
 				role: "tool",
 				tool_call_id: item.callId,
 				name: item.toolName,
-				content: mapper$4.textFromBlocks(item.content, `tool_result ${item.callId} content`)
+				content: mapChatToolResultContent(item.content, `tool_result ${item.callId} content`)
 			});
 			break;
 		case "reasoning":
@@ -4057,6 +4112,21 @@ function mapOllamaUserMessage(blocks, field) {
 		...images.length > 0 ? { images } : {}
 	};
 }
+function mapOllamaToolResultContent(blocks, field) {
+	mapper$3.ensureBlocks(blocks, field, [
+		"text",
+		"json",
+		"image"
+	], "only text/json/image blocks are supported");
+	const textBlocks = [];
+	const images = [];
+	for (const block of blocks) if (block.type === "image") images.push(mapOllamaImageData(block.imageUrl, field));
+	else textBlocks.push(block);
+	return {
+		content: contentBlocksToText(textBlocks),
+		...images.length > 0 ? { images } : {}
+	};
+}
 function buildOllamaRequest(request, options) {
 	mapper$3.assertNoServerTools(request.serverTools);
 	const messages = [];
@@ -4104,7 +4174,7 @@ function buildOllamaRequest(request, options) {
 			if (queue && queue.length > 0) queue.shift();
 			messages.push({
 				role: "tool",
-				content: mapper$3.textFromBlocks(item.content, `tool_result ${item.callId} content`)
+				...mapOllamaToolResultContent(item.content, `tool_result ${item.callId} content`)
 			});
 			break;
 		}
@@ -4330,6 +4400,29 @@ function mapGeminiImagePart(imageUrl, field) {
 		data: dataUrl.data
 	} };
 }
+function mapGeminiToolResultContent(blocks, field) {
+	mapper$1.ensureBlocks(blocks, field, [
+		"text",
+		"json",
+		"image"
+	], "only text/json/image blocks are supported");
+	const textBlocks = [];
+	const imageParts = [];
+	for (const block of blocks) if (block.type === "image") imageParts.push(mapGeminiImagePart(block.imageUrl, field));
+	else textBlocks.push(block);
+	const text = contentBlocksToText(textBlocks);
+	let response;
+	try {
+		const parsed = text ? JSON.parse(text) : {};
+		response = parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : { result: text };
+	} catch {
+		response = { result: text };
+	}
+	return {
+		response,
+		imageParts
+	};
+}
 function textPartsFromBlocks(blocks, field) {
 	return mapper$1.ensureTextBlocks(blocks, field).map((block) => {
 		if (block.type === "text") return { text: block.text };
@@ -4381,19 +4474,13 @@ function buildGeminiRequest(request, options) {
 			} });
 			break;
 		case "tool_result": {
-			let response;
-			try {
-				const text = mapper$1.textFromBlocks(item.content, `tool_result ${item.callId} content`);
-				const parsed = text ? JSON.parse(text) : {};
-				response = parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : { result: text };
-			} catch {
-				response = { result: mapper$1.textFromBlocks(item.content, `tool_result ${item.callId} content`) };
-			}
+			const { response, imageParts } = mapGeminiToolResultContent(item.content, `tool_result ${item.callId} content`);
 			appendPart(contents, "user", { functionResponse: {
 				id: item.callId,
 				name: item.toolName,
 				response
 			} });
+			for (const imagePart of imageParts) appendPart(contents, "user", imagePart);
 			break;
 		}
 		case "reasoning":