@jeffreycao/copilot-api 1.6.2 → 1.6.3

package/dist/main.js

@@ -23,7 +23,7 @@ if (typeof args["enterprise-url"] === "string") process.env.COPILOT_API_ENTERPRI
 const { auth } = await import("./auth-I-jV5RwF.js");
 const { checkUsage } = await import("./check-usage-DYLFqYhN.js");
 const { debug } = await import("./debug-DcC7ZPH0.js");
-const { start } = await import("./start-CcPjJUMF.js");
+const { start } = await import("./start-DzdGfvGi.js");
 const main = defineCommand({
 	meta: {
 		name: "copilot-api",

package/dist/{server-ABtVTO7w.js → server-wOqxNjw_.js}

@@ -756,6 +756,9 @@ function mapContent(content) {
 				image_url: { url: `data:${block.source.media_type};base64,${block.source.data}` }
 			});
 			break;
+		case "document":
+			contentParts.push(createDocumentTextPart());
+			break;
 		case "tool_reference":
 			contentParts.push({
 				type: "text",
@@ -765,6 +768,12 @@ function mapContent(content) {
 	}
 	return contentParts;
 }
+function createDocumentTextPart() {
+	return {
+		type: "text",
+		text: "A PDF document was attached, but this api cannot send PDF inputs directly. Analyze using other tools."
+	};
+}
 function translateAnthropicToolsToOpenAI(anthropicTools) {
 	if (!anthropicTools) return;
 	return anthropicTools.map((tool) => ({
@@ -1026,7 +1035,7 @@ const translateUserMessage = (message) => {
 			continue;
 		}
 		const converted = translateUserContentBlock(block);
-		if (converted) pendingContent.push(converted);
+		if (converted.length > 0) pendingContent.push(...converted);
 	}
 	flushPendingContent(pendingContent, items, { role: "user" });
 	return items;
@@ -1076,9 +1085,10 @@ const translateAssistantMessage = (message, model, applyPhase) => {
 };
 const translateUserContentBlock = (block) => {
 	switch (block.type) {
-		case "text": return createTextContent(block.text);
-		case "image": return createImageContent(block);
-		default: return;
+		case "text": return [createTextContent(block.text)];
+		case "image": return [createImageContent(block)];
+		case "document": return [createFileContent(block)];
+		default: return [];
 	}
 };
 const translateAssistantContentBlock = (block) => {
@@ -1122,6 +1132,11 @@ const createImageContent = (block) => ({
 	image_url: `data:${block.source.media_type};base64,${block.source.data}`,
 	detail: "auto"
 });
+const createFileContent = (block) => ({
+	type: "input_file",
+	file_data: `data:${block.source.media_type};base64,${block.source.data}`,
+	filename: block.title ?? "document.pdf"
+});
 const createReasoningContent = (block) => {
 	const { encryptedContent, id } = parseReasoningSignature(block.signature);
 	const thinking = block.thinking === THINKING_TEXT$1 ? "" : block.thinking;
@@ -1373,6 +1388,9 @@ const convertToolResultContent = (content) => {
 			case "image":
 				result.push(createImageContent(block));
 				break;
+			case "document":
+				result.push(createFileContent(block));
+				break;
 			case "tool_reference":
 				result.push(createTextContent(`Tool ${block.tool_name} loaded`));
 				break;
@@ -1989,6 +2007,48 @@ const mergeContentWithTexts = (tr, textBlocks) => {
 		content: [...tr.content, ...textBlocks]
 	};
 };
+const mergeContentWithAttachments = (tr, attachments) => {
+	if (typeof tr.content === "string") return {
+		...tr,
+		content: [{
+			type: "text",
+			text: tr.content
+		}, ...attachments]
+	};
+	return {
+		...tr,
+		content: [...tr.content, ...attachments]
+	};
+};
+const isAttachmentBlock = (block) => {
+	return block.type === "image" || block.type === "document";
+};
+const mergeAttachmentsIntoLastToolResult = (content) => {
+	const attachments = content.filter((block) => isAttachmentBlock(block));
+	if (attachments.length === 0) return content;
+	const mergeableToolResultIndices = content.flatMap((block, index) => block.type === "tool_result" && !hasToolRef(block) ? [index] : []);
+	if (mergeableToolResultIndices.length === 0) return content;
+	const attachmentsByToolResultIndex = /* @__PURE__ */ new Map();
+	if (mergeableToolResultIndices.length === attachments.length) for (const [index, toolResultIndex] of mergeableToolResultIndices.entries()) attachmentsByToolResultIndex.set(toolResultIndex, [attachments[index]]);
+	else {
+		const lastToolResultIndex = mergeableToolResultIndices.at(-1);
+		if (lastToolResultIndex === void 0) return content;
+		attachmentsByToolResultIndex.set(lastToolResultIndex, attachments);
+	}
+	const mergedContent = [];
+	for (const [index, block] of content.entries()) {
+		if (isAttachmentBlock(block)) continue;
+		if (block.type === "tool_result") {
+			const matchedAttachments = attachmentsByToolResultIndex.get(index);
+			if (matchedAttachments) {
+				mergedContent.push(mergeContentWithAttachments(block, matchedAttachments));
+				continue;
+			}
+		}
+		mergedContent.push(block);
+	}
+	return mergedContent;
+};
 const mergeToolResult = (toolResults, textBlocks) => {
 	if (toolResults.length === textBlocks.length) return toolResults.map((tr, i) => mergeContentWithText(tr, textBlocks[i]));
 	const lastIndex = toolResults.length - 1;
@@ -2006,6 +2066,7 @@ const mergeToolResultForClaude = (anthropicPayload, options) => {
 	for (const [index, msg] of anthropicPayload.messages.entries()) {
 		if (options?.skipLastMessage && index === lastMessageIndex) continue;
 		if (msg.role !== "user" || !Array.isArray(msg.content)) continue;
+		msg.content = mergeAttachmentsIntoLastToolResult(msg.content);
 		const toolResults = [];
 		const textBlocks = [];
 		let valid = true;
@@ -2022,7 +2083,7 @@ const mergeToolResultForClaude = (anthropicPayload, options) => {
 const sanitizeIdeTools = (payload) => {
 	if (!payload.tools || payload.tools.length === 0) return;
 	payload.tools = payload.tools.flatMap((tool) => {
-		if (tool.name === IDE_EXECUTE_CODE_TOOL) return [];
+		if (tool.name === IDE_EXECUTE_CODE_TOOL && !tool.defer_loading) return [];
 		if (tool.name === IDE_GET_DIAGNOSTICS_TOOL) return [{
 			...tool,
 			description: IDE_GET_DIAGNOSTICS_DESCRIPTION
@@ -3035,4 +3096,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 
 //#endregion
 export { server };
-//# sourceMappingURL=server-ABtVTO7w.js.map
+//# sourceMappingURL=server-wOqxNjw_.js.map