@jeffreycao/copilot-api 1.6.3 → 1.6.5

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-DzdGfvGi.js");
+const { start } = await import("./start-BSKFZL9O.js");
 const main = defineCommand({
 	meta: {
 		name: "copilot-api",

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

@@ -1958,6 +1958,7 @@ const TOOL_REFERENCE_TURN_BOUNDARY = "Tool loaded.";
 const IDE_EXECUTE_CODE_TOOL = "mcp__ide__executeCode";
 const IDE_GET_DIAGNOSTICS_TOOL = "mcp__ide__getDiagnostics";
 const IDE_GET_DIAGNOSTICS_DESCRIPTION = "Get language diagnostics from VS Code. Returns errors, warnings, information, and hints for files in the workspace.";
+const PDF_FILE_READ_PREFIX = "PDF file read:";
 const getCompactCandidateText = (message) => {
 	if (message.role !== "user") return "";
 	if (typeof message.content === "string") return message.content;
@@ -2023,31 +2024,109 @@ const mergeContentWithAttachments = (tr, 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));
+const getMergeableToolResultIndices = (toolResults) => {
+	return toolResults.flatMap((block, index) => block.is_error || hasToolRef(block) ? [] : [index]);
+};
+const mergeAttachmentsIntoToolResults = (toolResults, attachmentsByToolResultIndex) => {
+	if (attachmentsByToolResultIndex.size === 0) return toolResults;
+	return toolResults.map((block, index) => {
+		const matchedAttachments = attachmentsByToolResultIndex.get(index);
+		if (!matchedAttachments) return block;
+		const orderedAttachments = [...matchedAttachments].sort((left, right) => left.order - right.order).map(({ attachment }) => attachment);
+		return mergeContentWithAttachments(block, orderedAttachments);
+	});
+};
+const assignAttachmentsToToolResults = (target, attachments, options) => {
+	const { toolResultIndices } = options;
+	const fallbackToolResultIndices = options.fallbackToolResultIndices ?? toolResultIndices;
+	if (attachments.length === 0) return;
+	if (toolResultIndices.length > 0 && toolResultIndices.length === attachments.length) {
+		for (const [index, toolResultIndex] of toolResultIndices.entries()) {
+			const currentAttachments$1 = target.get(toolResultIndex);
+			if (currentAttachments$1) {
+				currentAttachments$1.push(attachments[index]);
 				continue;
 			}
+			target.set(toolResultIndex, [attachments[index]]);
 		}
-		mergedContent.push(block);
+		return;
+	}
+	const lastToolResultIndex = fallbackToolResultIndices.at(-1);
+	if (lastToolResultIndex === void 0) return;
+	const currentAttachments = target.get(lastToolResultIndex);
+	if (currentAttachments) {
+		currentAttachments.push(...attachments);
+		return;
 	}
-	return mergedContent;
+	target.set(lastToolResultIndex, [...attachments]);
+};
+const startsWithPdfFileRead = (toolResult) => {
+	if (typeof toolResult.content === "string") return toolResult.content.startsWith(PDF_FILE_READ_PREFIX);
+	if (toolResult.content.some((block) => block.type === "document")) return false;
+	if (toolResult.content.length === 0) return false;
+	const firstBlock = toolResult.content[0];
+	if (firstBlock.type !== "text") return false;
+	return firstBlock.text.startsWith(PDF_FILE_READ_PREFIX);
+};
+const collectMergeableUserContent = (content) => {
+	const toolResults = [];
+	const textBlocks = [];
+	const attachments = [];
+	for (const [order, block] of content.entries()) {
+		if (block.type === "tool_result") {
+			toolResults.push(block);
+			continue;
+		}
+		if (block.type === "text") {
+			textBlocks.push(block);
+			continue;
+		}
+		if (isAttachmentBlock(block)) {
+			attachments.push({
+				attachment: block,
+				order
+			});
+			continue;
+		}
+		return null;
+	}
+	return {
+		toolResults,
+		textBlocks,
+		attachments
+	};
+};
+const mergeAttachmentsForToolResults = (toolResults, attachments) => {
+	if (attachments.length === 0) return toolResults;
+	const documentBlocks = attachments.filter(({ attachment }) => attachment.type === "document");
+	const mergeableToolResultIndices = getMergeableToolResultIndices(toolResults);
+	const pdfReadToolResultIndices = mergeableToolResultIndices.filter((index) => startsWithPdfFileRead(toolResults[index]));
+	const attachmentsByToolResultIndex = /* @__PURE__ */ new Map();
+	let remainingAttachments = attachments;
+	let countMatchToolResultIndices = mergeableToolResultIndices;
+	if (documentBlocks.length > 0 && pdfReadToolResultIndices.length > 0) {
+		const matchedDocumentCount = Math.min(pdfReadToolResultIndices.length, documentBlocks.length);
+		const matchedDocuments = documentBlocks.slice(0, matchedDocumentCount);
+		const matchedDocumentOrders = new Set(matchedDocuments.map(({ order }) => order));
+		const matchedPdfToolResultIndices = pdfReadToolResultIndices.slice(0, matchedDocumentCount);
+		const matchedPdfToolResultIndexSet = new Set(matchedPdfToolResultIndices);
+		assignAttachmentsToToolResults(attachmentsByToolResultIndex, matchedDocuments, { toolResultIndices: matchedPdfToolResultIndices });
+		countMatchToolResultIndices = mergeableToolResultIndices.filter((index) => !matchedPdfToolResultIndexSet.has(index));
+		remainingAttachments = attachments.filter(({ attachment, order }) => attachment.type !== "document" || !matchedDocumentOrders.has(order));
+	}
+	assignAttachmentsToToolResults(attachmentsByToolResultIndex, remainingAttachments, {
+		toolResultIndices: countMatchToolResultIndices,
+		fallbackToolResultIndices: mergeableToolResultIndices
+	});
+	return mergeAttachmentsIntoToolResults(toolResults, attachmentsByToolResultIndex);
+};
+const mergeUserMessageContent = (content) => {
+	const mergeableContent = collectMergeableUserContent(content);
+	if (!mergeableContent) return null;
+	const { toolResults, textBlocks, attachments } = mergeableContent;
+	if (toolResults.length === 0 || textBlocks.length === 0 && attachments.length === 0) return null;
+	const mergedToolResults = textBlocks.length === 0 ? toolResults : mergeToolResult(toolResults, textBlocks);
+	return mergeAttachmentsForToolResults(mergedToolResults, attachments);
 };
 const mergeToolResult = (toolResults, textBlocks) => {
 	if (toolResults.length === textBlocks.length) return toolResults.map((tr, i) => mergeContentWithText(tr, textBlocks[i]));
@@ -2066,18 +2145,8 @@ 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;
-		for (const block of msg.content) if (block.type === "tool_result") toolResults.push(block);
-		else if (block.type === "text") textBlocks.push(block);
-		else {
-			valid = false;
-			break;
-		}
-		if (!valid || toolResults.length === 0 || textBlocks.length === 0) continue;
-		msg.content = mergeToolResult(toolResults, textBlocks);
+		const mergedContent = mergeUserMessageContent(msg.content);
+		if (mergedContent) msg.content = mergedContent;
 	}
 };
 const sanitizeIdeTools = (payload) => {
@@ -3096,4 +3165,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 
 //#endregion
 export { server };
-//# sourceMappingURL=server-wOqxNjw_.js.map
+//# sourceMappingURL=server-COPd_KDa.js.map