@jeffreycao/copilot-api 1.5.3-beta.2 → 1.5.3-beta.4

package/README.md

@@ -614,7 +614,7 @@ Here is an example `.claude/settings.json` file:
 - Setting CLAUDE_CODE_ATTRIBUTION_HEADER to 0 can prevent Claude code from adding billing and version information in system prompts, thereby avoiding prompt cache invalidation.
 - Turning off CLAUDE_CODE_ENABLE_PROMPT_SUGGESTION can prevent quota from being consumed unnecessarily.
 - Permissions deny WebSearch because the GitHub Copilot API does not support natie websearch (some gpt models support websearch, but the current project has not adapted websearch); it is recommended to install the mcp mcp_server_fetch tool or other search tools as alternatives..
-- Please do not enable `ENABLE_TOOL_SEARCH`, as the current Claude Code uses the client tool search mode. In this mode, loading defer tools requires an additional request each time, and cache hit rates are affected, so it does not necessarily save tokens. Only server tool search mode can save tokens. The current project has compatibility issues with client tool search mode, which can also cause errors when used.
+- Please do not enable `ENABLE_TOOL_SEARCH`, as the current Claude Code uses the client tool search mode. In this mode, loading defer tools requires an additional request each time, and cache hit rates are affected, so it does not necessarily save tokens. Only server tool search mode can save tokens. If using the gpt model, do not enable it either.
 
 You can find more options here: [Claude Code settings](https://docs.anthropic.com/en/docs/claude-code/settings#environment-variables)
 

package/dist/main.js

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

package/dist/{server-DP3qGqqy.js → server-ViAUcjP9.js}

@@ -744,7 +744,6 @@ function handleAssistantMessage(message, modelId) {
 function mapContent(content) {
 	if (typeof content === "string") return content;
 	if (!Array.isArray(content)) return null;
-	if (!content.some((block) => block.type === "image")) return content.filter((block) => block.type === "text").map((block) => block.text).join("\n\n");
 	const contentParts = [];
 	for (const block of content) switch (block.type) {
 		case "text":
@@ -759,6 +758,12 @@ function mapContent(content) {
 				image_url: { url: `data:${block.source.media_type};base64,${block.source.data}` }
 			});
 			break;
+		case "tool_reference":
+			contentParts.push({
+				type: "text",
+				text: `Tool ${block.tool_name} loaded`
+			});
+			break;
 	}
 	return contentParts;
 }
@@ -1370,6 +1375,9 @@ const convertToolResultContent = (content) => {
 			case "image":
 				result.push(createImageContent(block));
 				break;
+			case "tool_reference":
+				result.push(createTextContent(`Tool ${block.tool_name} loaded`));
+				break;
 			default: break;
 		}
 		return result;
@@ -1888,7 +1896,10 @@ const buildAnthropicBetaHeader = (anthropicBetaHeader, thinking) => {
 };
 const createMessages = async (payload, anthropicBetaHeader, options) => {
 	if (!state.copilotToken) throw new Error("Copilot token not found");
-	const enableVision = payload.messages.some((message) => Array.isArray(message.content) && message.content.some((block) => block.type === "image"));
+	const enableVision = payload.messages.some((message) => {
+		if (!Array.isArray(message.content)) return false;
+		return message.content.some((block) => block.type === "image" || block.type === "tool_result" && Array.isArray(block.content) && block.content.some((inner) => inner.type === "image"));
+	});
 	let isInitiateRequest = false;
 	const lastMessage = payload.messages.at(-1);
 	if (lastMessage?.role === "user") isInitiateRequest = Array.isArray(lastMessage.content) ? lastMessage.content.some((block) => block.type !== "tool_result") : true;
@@ -1921,6 +1932,7 @@ const compactSystemPromptStart = "You are a helpful AI assistant tasked with sum
 const compactTextOnlyGuard = "CRITICAL: Respond with TEXT ONLY. Do NOT call any tools.";
 const compactSummaryPromptStart = "Your task is to create a detailed summary of the conversation so far";
 const compactMessageSections = ["Pending Tasks:", "Current Work:"];
+const TOOL_REFERENCE_TURN_BOUNDARY = "Tool loaded.";
 const getAnthropicEffortForModel = (model) => {
 	const reasoningEffort = getReasoningEffortForModel(model);
 	if (reasoningEffort === "xhigh") return "max";
@@ -1973,6 +1985,13 @@ const mergeToolResult = (toolResults, textBlocks) => {
 	const lastIndex = toolResults.length - 1;
 	return toolResults.map((tr, i) => i === lastIndex ? mergeContentWithTexts(tr, textBlocks) : tr);
 };
+const stripToolReferenceTurnBoundary = (anthropicPayload) => {
+	for (const msg of anthropicPayload.messages) {
+		if (msg.role !== "user" || !Array.isArray(msg.content)) continue;
+		if (!msg.content.some((block) => block.type === "tool_result" && Array.isArray(block.content) && block.content.some((contentBlock) => contentBlock.type === "tool_reference"))) continue;
+		msg.content = msg.content.filter((block) => block.type !== "text" || block.text.trim() !== TOOL_REFERENCE_TURN_BOUNDARY);
+	}
+};
 const mergeToolResultForClaude = (anthropicPayload) => {
 	for (const msg of anthropicPayload.messages) {
 		if (msg.role !== "user" || !Array.isArray(msg.content)) continue;
@@ -2409,7 +2428,7 @@ const isAsyncIterable$1 = (value) => Boolean(value) && typeof value[Symbol.async
 //#region src/routes/messages/subagent-marker.ts
 const subagentMarkerPrefix = "__SUBAGENT_MARKER__";
 const parseSubagentMarkerFromFirstUser = (payload) => {
-	const firstUserMessage = payload.messages.find((msg) => msg.role === "user");
+	const firstUserMessage = payload.messages.find((msg) => msg.role === "user" && Array.isArray(msg.content));
 	if (!firstUserMessage || !Array.isArray(firstUserMessage.content)) return null;
 	for (const block of firstUserMessage.content) {
 		if (block.type !== "text") continue;
@@ -2467,7 +2486,10 @@ async function handleCompletion(c) {
 	const noTools = !anthropicPayload.tools || anthropicPayload.tools.length === 0;
 	if (anthropicBeta && noTools && !isCompact) anthropicPayload.model = getSmallModel();
 	if (isCompact) logger$5.debug("Is compact request:", isCompact);
-	else mergeToolResultForClaude(anthropicPayload);
+	else {
+		stripToolReferenceTurnBoundary(anthropicPayload);
+		mergeToolResultForClaude(anthropicPayload);
+	}
 	const requestId = generateRequestIdFromPayload(anthropicPayload, sessionId);
 	logger$5.debug("Generated request ID:", requestId);
 	if (state.manualApprove) await awaitApproval();
@@ -2976,4 +2998,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 
 //#endregion
 export { server };
-//# sourceMappingURL=server-DP3qGqqy.js.map
+//# sourceMappingURL=server-ViAUcjP9.js.map