@jeffreycao/copilot-api 1.6.1 → 1.6.3

package/dist/{auth-DAlTk9BR.js → auth-I-jV5RwF.js}

@@ -1,6 +1,6 @@
 import { PATHS, ensurePaths } from "./paths-Cla6y5eD.js";
-import { state } from "./utils-BWikssll.js";
-import { setupGitHubToken } from "./token-DCEVJpKB.js";
+import { state } from "./utils-C_HZ9gNe.js";
+import { setupGitHubToken } from "./token-BINhAFp5.js";
 import { defineCommand } from "citty";
 import consola from "consola";
 
@@ -43,4 +43,4 @@ const auth = defineCommand({
 
 //#endregion
 export { auth };
-//# sourceMappingURL=auth-DAlTk9BR.js.map
+//# sourceMappingURL=auth-I-jV5RwF.js.map

package/dist/{auth-DAlTk9BR.js.map → auth-I-jV5RwF.js.map}

@@ -1 +1 @@
-{"version":3,"file":"auth-DAlTk9BR.js","names":[],"sources":["../src/auth.ts"],"sourcesContent":["#!/usr/bin/env node\n\nimport { defineCommand } from \"citty\"\nimport consola from \"consola\"\n\nimport { PATHS, ensurePaths } from \"./lib/paths\"\nimport { state } from \"./lib/state\"\nimport { setupGitHubToken } from \"./lib/token\"\n\ninterface RunAuthOptions {\n  verbose: boolean\n  showToken: boolean\n}\n\nexport async function runAuth(options: RunAuthOptions): Promise<void> {\n  if (options.verbose) {\n    consola.level = 5\n    consola.info(\"Verbose logging enabled\")\n  }\n\n  state.showToken = options.showToken\n\n  await ensurePaths()\n  await setupGitHubToken({ force: true })\n  consola.success(\"GitHub token written to\", PATHS.GITHUB_TOKEN_PATH)\n}\n\nexport const auth = defineCommand({\n  meta: {\n    name: \"auth\",\n    description: \"Run GitHub auth flow without running the server\",\n  },\n  args: {\n    verbose: {\n      alias: \"v\",\n      type: \"boolean\",\n      default: false,\n      description: \"Enable verbose logging\",\n    },\n    \"show-token\": {\n      type: \"boolean\",\n      default: false,\n      description: \"Show GitHub token on auth\",\n    },\n  },\n  run({ args }) {\n    return runAuth({\n      verbose: args.verbose,\n      showToken: args[\"show-token\"],\n    })\n  },\n})\n"],"mappings":";;;;;;;AAcA,eAAsB,QAAQ,SAAwC;AACpE,KAAI,QAAQ,SAAS;AACnB,UAAQ,QAAQ;AAChB,UAAQ,KAAK,0BAA0B;;AAGzC,OAAM,YAAY,QAAQ;AAE1B,OAAM,aAAa;AACnB,OAAM,iBAAiB,EAAE,OAAO,MAAM,CAAC;AACvC,SAAQ,QAAQ,2BAA2B,MAAM,kBAAkB;;AAGrE,MAAa,OAAO,cAAc;CAChC,MAAM;EACJ,MAAM;EACN,aAAa;EACd;CACD,MAAM;EACJ,SAAS;GACP,OAAO;GACP,MAAM;GACN,SAAS;GACT,aAAa;GACd;EACD,cAAc;GACZ,MAAM;GACN,SAAS;GACT,aAAa;GACd;EACF;CACD,IAAI,EAAE,QAAQ;AACZ,SAAO,QAAQ;GACb,SAAS,KAAK;GACd,WAAW,KAAK;GACjB,CAAC;;CAEL,CAAC"}
+{"version":3,"file":"auth-I-jV5RwF.js","names":[],"sources":["../src/auth.ts"],"sourcesContent":["#!/usr/bin/env node\n\nimport { defineCommand } from \"citty\"\nimport consola from \"consola\"\n\nimport { PATHS, ensurePaths } from \"./lib/paths\"\nimport { state } from \"./lib/state\"\nimport { setupGitHubToken } from \"./lib/token\"\n\ninterface RunAuthOptions {\n  verbose: boolean\n  showToken: boolean\n}\n\nexport async function runAuth(options: RunAuthOptions): Promise<void> {\n  if (options.verbose) {\n    consola.level = 5\n    consola.info(\"Verbose logging enabled\")\n  }\n\n  state.showToken = options.showToken\n\n  await ensurePaths()\n  await setupGitHubToken({ force: true })\n  consola.success(\"GitHub token written to\", PATHS.GITHUB_TOKEN_PATH)\n}\n\nexport const auth = defineCommand({\n  meta: {\n    name: \"auth\",\n    description: \"Run GitHub auth flow without running the server\",\n  },\n  args: {\n    verbose: {\n      alias: \"v\",\n      type: \"boolean\",\n      default: false,\n      description: \"Enable verbose logging\",\n    },\n    \"show-token\": {\n      type: \"boolean\",\n      default: false,\n      description: \"Show GitHub token on auth\",\n    },\n  },\n  run({ args }) {\n    return runAuth({\n      verbose: args.verbose,\n      showToken: args[\"show-token\"],\n    })\n  },\n})\n"],"mappings":";;;;;;;AAcA,eAAsB,QAAQ,SAAwC;AACpE,KAAI,QAAQ,SAAS;AACnB,UAAQ,QAAQ;AAChB,UAAQ,KAAK,0BAA0B;;AAGzC,OAAM,YAAY,QAAQ;AAE1B,OAAM,aAAa;AACnB,OAAM,iBAAiB,EAAE,OAAO,MAAM,CAAC;AACvC,SAAQ,QAAQ,2BAA2B,MAAM,kBAAkB;;AAGrE,MAAa,OAAO,cAAc;CAChC,MAAM;EACJ,MAAM;EACN,aAAa;EACd;CACD,MAAM;EACJ,SAAS;GACP,OAAO;GACP,MAAM;GACN,SAAS;GACT,aAAa;GACd;EACD,cAAc;GACZ,MAAM;GACN,SAAS;GACT,aAAa;GACd;EACF;CACD,IAAI,EAAE,QAAQ;AACZ,SAAO,QAAQ;GACb,SAAS,KAAK;GACd,WAAW,KAAK;GACjB,CAAC;;CAEL,CAAC"}

package/dist/{check-usage-B-1bXEu4.js → check-usage-DYLFqYhN.js}

@@ -1,6 +1,6 @@
 import { ensurePaths } from "./paths-Cla6y5eD.js";
-import { getCopilotUsage } from "./utils-BWikssll.js";
-import { setupGitHubToken } from "./token-DCEVJpKB.js";
+import { getCopilotUsage } from "./utils-C_HZ9gNe.js";
+import { setupGitHubToken } from "./token-BINhAFp5.js";
 import { defineCommand } from "citty";
 import consola from "consola";
 
@@ -41,4 +41,4 @@ const checkUsage = defineCommand({
 
 //#endregion
 export { checkUsage };
-//# sourceMappingURL=check-usage-B-1bXEu4.js.map
+//# sourceMappingURL=check-usage-DYLFqYhN.js.map

package/dist/{check-usage-B-1bXEu4.js.map → check-usage-DYLFqYhN.js.map}

@@ -1 +1 @@
-{"version":3,"file":"check-usage-B-1bXEu4.js","names":[],"sources":["../src/check-usage.ts"],"sourcesContent":["import { defineCommand } from \"citty\"\nimport consola from \"consola\"\n\nimport { ensurePaths } from \"./lib/paths\"\nimport { setupGitHubToken } from \"./lib/token\"\nimport {\n  getCopilotUsage,\n  type QuotaDetail,\n} from \"./services/github/get-copilot-usage\"\n\nexport const checkUsage = defineCommand({\n  meta: {\n    name: \"check-usage\",\n    description: \"Show current GitHub Copilot usage/quota information\",\n  },\n  async run() {\n    await ensurePaths()\n    await setupGitHubToken()\n    try {\n      const usage = await getCopilotUsage()\n      const premium = usage.quota_snapshots.premium_interactions\n      const premiumTotal = premium.entitlement\n      const premiumUsed = premiumTotal - premium.remaining\n      const premiumPercentUsed =\n        premiumTotal > 0 ? (premiumUsed / premiumTotal) * 100 : 0\n      const premiumPercentRemaining = premium.percent_remaining\n\n      // Helper to summarize a quota snapshot\n      function summarizeQuota(name: string, snap: QuotaDetail | undefined) {\n        if (!snap) return `${name}: N/A`\n        const total = snap.entitlement\n        const used = total - snap.remaining\n        const percentUsed = total > 0 ? (used / total) * 100 : 0\n        const percentRemaining = snap.percent_remaining\n        return `${name}: ${used}/${total} used (${percentUsed.toFixed(1)}% used, ${percentRemaining.toFixed(1)}% remaining)`\n      }\n\n      const premiumLine = `Premium: ${premiumUsed}/${premiumTotal} used (${premiumPercentUsed.toFixed(1)}% used, ${premiumPercentRemaining.toFixed(1)}% remaining)`\n      const chatLine = summarizeQuota(\"Chat\", usage.quota_snapshots.chat)\n      const completionsLine = summarizeQuota(\n        \"Completions\",\n        usage.quota_snapshots.completions,\n      )\n\n      consola.box(\n        `Copilot Usage (plan: ${usage.copilot_plan})\\n`\n          + `Quota resets: ${usage.quota_reset_date}\\n`\n          + `\\nQuotas:\\n`\n          + `  ${premiumLine}\\n`\n          + `  ${chatLine}\\n`\n          + `  ${completionsLine}`,\n      )\n    } catch (err) {\n      consola.error(\"Failed to fetch Copilot usage:\", err)\n      process.exit(1)\n    }\n  },\n})\n"],"mappings":";;;;;;;AAUA,MAAa,aAAa,cAAc;CACtC,MAAM;EACJ,MAAM;EACN,aAAa;EACd;CACD,MAAM,MAAM;AACV,QAAM,aAAa;AACnB,QAAM,kBAAkB;AACxB,MAAI;GACF,MAAM,QAAQ,MAAM,iBAAiB;GACrC,MAAM,UAAU,MAAM,gBAAgB;GACtC,MAAM,eAAe,QAAQ;GAC7B,MAAM,cAAc,eAAe,QAAQ;GAC3C,MAAM,qBACJ,eAAe,IAAK,cAAc,eAAgB,MAAM;GAC1D,MAAM,0BAA0B,QAAQ;GAGxC,SAAS,eAAe,MAAc,MAA+B;AACnE,QAAI,CAAC,KAAM,QAAO,GAAG,KAAK;IAC1B,MAAM,QAAQ,KAAK;IACnB,MAAM,OAAO,QAAQ,KAAK;IAC1B,MAAM,cAAc,QAAQ,IAAK,OAAO,QAAS,MAAM;IACvD,MAAM,mBAAmB,KAAK;AAC9B,WAAO,GAAG,KAAK,IAAI,KAAK,GAAG,MAAM,SAAS,YAAY,QAAQ,EAAE,CAAC,UAAU,iBAAiB,QAAQ,EAAE,CAAC;;GAGzG,MAAM,cAAc,YAAY,YAAY,GAAG,aAAa,SAAS,mBAAmB,QAAQ,EAAE,CAAC,UAAU,wBAAwB,QAAQ,EAAE,CAAC;GAChJ,MAAM,WAAW,eAAe,QAAQ,MAAM,gBAAgB,KAAK;GACnE,MAAM,kBAAkB,eACtB,eACA,MAAM,gBAAgB,YACvB;AAED,WAAQ,IACN,wBAAwB,MAAM,aAAa,mBACtB,MAAM,iBAAiB,iBAEnC,YAAY,MACZ,SAAS,MACT,kBACV;WACM,KAAK;AACZ,WAAQ,MAAM,kCAAkC,IAAI;AACpD,WAAQ,KAAK,EAAE;;;CAGpB,CAAC"}
+{"version":3,"file":"check-usage-DYLFqYhN.js","names":[],"sources":["../src/check-usage.ts"],"sourcesContent":["import { defineCommand } from \"citty\"\nimport consola from \"consola\"\n\nimport { ensurePaths } from \"./lib/paths\"\nimport { setupGitHubToken } from \"./lib/token\"\nimport {\n  getCopilotUsage,\n  type QuotaDetail,\n} from \"./services/github/get-copilot-usage\"\n\nexport const checkUsage = defineCommand({\n  meta: {\n    name: \"check-usage\",\n    description: \"Show current GitHub Copilot usage/quota information\",\n  },\n  async run() {\n    await ensurePaths()\n    await setupGitHubToken()\n    try {\n      const usage = await getCopilotUsage()\n      const premium = usage.quota_snapshots.premium_interactions\n      const premiumTotal = premium.entitlement\n      const premiumUsed = premiumTotal - premium.remaining\n      const premiumPercentUsed =\n        premiumTotal > 0 ? (premiumUsed / premiumTotal) * 100 : 0\n      const premiumPercentRemaining = premium.percent_remaining\n\n      // Helper to summarize a quota snapshot\n      function summarizeQuota(name: string, snap: QuotaDetail | undefined) {\n        if (!snap) return `${name}: N/A`\n        const total = snap.entitlement\n        const used = total - snap.remaining\n        const percentUsed = total > 0 ? (used / total) * 100 : 0\n        const percentRemaining = snap.percent_remaining\n        return `${name}: ${used}/${total} used (${percentUsed.toFixed(1)}% used, ${percentRemaining.toFixed(1)}% remaining)`\n      }\n\n      const premiumLine = `Premium: ${premiumUsed}/${premiumTotal} used (${premiumPercentUsed.toFixed(1)}% used, ${premiumPercentRemaining.toFixed(1)}% remaining)`\n      const chatLine = summarizeQuota(\"Chat\", usage.quota_snapshots.chat)\n      const completionsLine = summarizeQuota(\n        \"Completions\",\n        usage.quota_snapshots.completions,\n      )\n\n      consola.box(\n        `Copilot Usage (plan: ${usage.copilot_plan})\\n`\n          + `Quota resets: ${usage.quota_reset_date}\\n`\n          + `\\nQuotas:\\n`\n          + `  ${premiumLine}\\n`\n          + `  ${chatLine}\\n`\n          + `  ${completionsLine}`,\n      )\n    } catch (err) {\n      consola.error(\"Failed to fetch Copilot usage:\", err)\n      process.exit(1)\n    }\n  },\n})\n"],"mappings":";;;;;;;AAUA,MAAa,aAAa,cAAc;CACtC,MAAM;EACJ,MAAM;EACN,aAAa;EACd;CACD,MAAM,MAAM;AACV,QAAM,aAAa;AACnB,QAAM,kBAAkB;AACxB,MAAI;GACF,MAAM,QAAQ,MAAM,iBAAiB;GACrC,MAAM,UAAU,MAAM,gBAAgB;GACtC,MAAM,eAAe,QAAQ;GAC7B,MAAM,cAAc,eAAe,QAAQ;GAC3C,MAAM,qBACJ,eAAe,IAAK,cAAc,eAAgB,MAAM;GAC1D,MAAM,0BAA0B,QAAQ;GAGxC,SAAS,eAAe,MAAc,MAA+B;AACnE,QAAI,CAAC,KAAM,QAAO,GAAG,KAAK;IAC1B,MAAM,QAAQ,KAAK;IACnB,MAAM,OAAO,QAAQ,KAAK;IAC1B,MAAM,cAAc,QAAQ,IAAK,OAAO,QAAS,MAAM;IACvD,MAAM,mBAAmB,KAAK;AAC9B,WAAO,GAAG,KAAK,IAAI,KAAK,GAAG,MAAM,SAAS,YAAY,QAAQ,EAAE,CAAC,UAAU,iBAAiB,QAAQ,EAAE,CAAC;;GAGzG,MAAM,cAAc,YAAY,YAAY,GAAG,aAAa,SAAS,mBAAmB,QAAQ,EAAE,CAAC,UAAU,wBAAwB,QAAQ,EAAE,CAAC;GAChJ,MAAM,WAAW,eAAe,QAAQ,MAAM,gBAAgB,KAAK;GACnE,MAAM,kBAAkB,eACtB,eACA,MAAM,gBAAgB,YACvB;AAED,WAAQ,IACN,wBAAwB,MAAM,aAAa,mBACtB,MAAM,iBAAiB,iBAEnC,YAAY,MACZ,SAAS,MACT,kBACV;WACM,KAAK;AACZ,WAAQ,MAAM,kCAAkC,IAAI;AACpD,WAAQ,KAAK,EAAE;;;CAGpB,CAAC"}

package/dist/main.js

@@ -20,10 +20,10 @@ const args = parseArgs(process.argv, cliArgs);
 if (typeof args["api-home"] === "string") process.env.COPILOT_API_HOME = args["api-home"];
 if (typeof args["oauth-app"] === "string") process.env.COPILOT_API_OAUTH_APP = args["oauth-app"];
 if (typeof args["enterprise-url"] === "string") process.env.COPILOT_API_ENTERPRISE_URL = args["enterprise-url"];
-const { auth } = await import("./auth-DAlTk9BR.js");
-const { checkUsage } = await import("./check-usage-B-1bXEu4.js");
+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-CZaoeGeK.js");
+const { start } = await import("./start-DzdGfvGi.js");
 const main = defineCommand({
 	meta: {
 		name: "copilot-api",

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

@@ -1,5 +1,5 @@
 import { PATHS } from "./paths-Cla6y5eD.js";
-import { COMPACT_AUTO_CONTINUE, COMPACT_REQUEST, HTTPError, cacheModels, compactAutoContinuePromptStarts, compactMessageSections, compactSummaryPromptStart, compactSystemPromptStart, compactTextOnlyGuard, copilotBaseUrl, copilotHeaders, forwardError, generateRequestIdFromPayload, getCopilotUsage, getRootSessionId, getUUID, isNullish, parseUserIdMetadata, prepareForCompact, prepareInteractionHeaders, prepareMessageProxyHeaders, requestContext, resolveTraceId, sleep, state } from "./utils-BWikssll.js";
+import { COMPACT_AUTO_CONTINUE, COMPACT_REQUEST, HTTPError, cacheModels, compactAutoContinuePromptStarts, compactMessageSections, compactSummaryPromptStart, compactSystemPromptStart, compactTextOnlyGuard, copilotBaseUrl, copilotHeaders, forwardError, generateRequestIdFromPayload, getCopilotUsage, getRootSessionId, getUUID, isNullish, parseUserIdMetadata, prepareForCompact, prepareInteractionHeaders, prepareMessageProxyHeaders, requestContext, resolveTraceId, sleep, state } from "./utils-C_HZ9gNe.js";
 import { getAnthropicApiKey, getClaudeTokenMultiplier, getConfig, getExtraPromptForModel, getProviderConfig, getReasoningEffortForModel, getSmallModel, isMessagesApiEnabled, isResponsesApiContextManagementModel, isResponsesApiWebSearchEnabled } from "./config-D44X0MP1.js";
 import consola from "consola";
 import path from "node:path";
@@ -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;
@@ -1882,11 +1900,21 @@ const allowedAnthropicBetas = new Set([
 	"context-management-2025-06-27",
 	ADVANCED_TOOL_USE_BETA
 ]);
-const buildAnthropicBetaHeader = (anthropicBetaHeader, thinking) => {
+const TOOL_SEARCH_SUPPORTED_MODELS = [
+	"claude-sonnet-4.5",
+	"claude-sonnet-4.6",
+	"claude-opus-4.5",
+	"claude-opus-4.6"
+];
+const modelSupportsToolSearch = (modelId) => {
+	return TOOL_SEARCH_SUPPORTED_MODELS.some((prefix) => modelId.toLowerCase().startsWith(prefix));
+};
+const buildAnthropicBetaHeader = (anthropicBetaHeader, thinking, model) => {
 	const isAdaptiveThinking = thinking?.type === "adaptive";
 	if (anthropicBetaHeader) {
 		const filteredBeta = anthropicBetaHeader.split(",").map((item) => item.trim()).filter((item) => item.length > 0).filter((item) => allowedAnthropicBetas.has(item));
-		const uniqueFilteredBetas = [...new Set([ADVANCED_TOOL_USE_BETA, ...filteredBeta])];
+		const copilotHeaderSet = modelSupportsToolSearch(model) ? [ADVANCED_TOOL_USE_BETA] : [];
+		const uniqueFilteredBetas = [...new Set([...copilotHeaderSet, ...filteredBeta])];
 		if (uniqueFilteredBetas.length > 0) return uniqueFilteredBetas.join(",");
 		return;
 	}
@@ -1909,7 +1937,7 @@ const createMessages = async (payload, anthropicBetaHeader, options) => {
 	prepareForCompact(headers, options.compactType);
 	const { safetyIdentifier, sessionId } = parseUserIdMetadata(payload.metadata?.user_id);
 	if (safetyIdentifier && sessionId) prepareMessageProxyHeaders(headers);
-	const anthropicBeta = buildAnthropicBetaHeader(anthropicBetaHeader, payload.thinking);
+	const anthropicBeta = buildAnthropicBetaHeader(anthropicBetaHeader, payload.thinking, payload.model);
 	if (anthropicBeta) headers["anthropic-beta"] = anthropicBeta;
 	const response = await fetch(`${copilotBaseUrl(state)}/v1/messages`, {
 		method: "POST",
@@ -1979,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;
@@ -1996,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;
@@ -2012,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
@@ -3025,4 +3096,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 
 //#endregion
 export { server };
-//# sourceMappingURL=server-CBnVrsFn.js.map
+//# sourceMappingURL=server-wOqxNjw_.js.map