@jeffreycao/copilot-api 1.5.3-beta.3 → 1.5.3

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.
+- If using a non-Claude model, do not enable ENABLE_TOOL_SEARCH. If using the Claude model, can enable ENABLE_TOOL_SEARCH. 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，but it can save context. Only server tool search mode can save tokens.
 
 You can find more options here: [Claude Code settings](https://docs.anthropic.com/en/docs/claude-code/settings#environment-variables)
 

package/dist/{auth-DqeBalDi.js → auth-B7io-Eju.js}

@@ -1,6 +1,6 @@
 import { PATHS, ensurePaths } from "./paths-Cla6y5eD.js";
-import { state } from "./utils-DDQKGVRQ.js";
-import { setupGitHubToken } from "./token-CEABFmH9.js";
+import { state } from "./utils-CKrfAAVw.js";
+import { setupGitHubToken } from "./token-CQKghKXN.js";
 import { defineCommand } from "citty";
 import consola from "consola";
 
@@ -43,4 +43,4 @@ const auth = defineCommand({
 
 //#endregion
 export { auth };
-//# sourceMappingURL=auth-DqeBalDi.js.map
+//# sourceMappingURL=auth-B7io-Eju.js.map

package/dist/{auth-DqeBalDi.js.map → auth-B7io-Eju.js.map}

@@ -1 +1 @@
-{"version":3,"file":"auth-DqeBalDi.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-B7io-Eju.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-BCT4zrbb.js → check-usage-DLE8UgqB.js}

@@ -1,6 +1,6 @@
 import { ensurePaths } from "./paths-Cla6y5eD.js";
-import { getCopilotUsage } from "./utils-DDQKGVRQ.js";
-import { setupGitHubToken } from "./token-CEABFmH9.js";
+import { getCopilotUsage } from "./utils-CKrfAAVw.js";
+import { setupGitHubToken } from "./token-CQKghKXN.js";
 import { defineCommand } from "citty";
 import consola from "consola";
 
@@ -41,4 +41,4 @@ const checkUsage = defineCommand({
 
 //#endregion
 export { checkUsage };
-//# sourceMappingURL=check-usage-BCT4zrbb.js.map
+//# sourceMappingURL=check-usage-DLE8UgqB.js.map

package/dist/{check-usage-BCT4zrbb.js.map → check-usage-DLE8UgqB.js.map}

@@ -1 +1 @@
-{"version":3,"file":"check-usage-BCT4zrbb.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-DLE8UgqB.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-DqeBalDi.js");
-const { checkUsage } = await import("./check-usage-BCT4zrbb.js");
+const { auth } = await import("./auth-B7io-Eju.js");
+const { checkUsage } = await import("./check-usage-DLE8UgqB.js");
 const { debug } = await import("./debug-DcC7ZPH0.js");
-const { start } = await import("./start-CrNDSGP_.js");
+const { start } = await import("./start-CuRcvtuH.js");
 const main = defineCommand({
 	meta: {
 		name: "copilot-api",

package/dist/{server-DLaz3q72.js → server-CFiXEbAJ.js}

@@ -1,5 +1,5 @@
 import { PATHS } from "./paths-Cla6y5eD.js";
-import { HTTPError, cacheModels, copilotBaseUrl, copilotHeaders, forwardError, generateRequestIdFromPayload, getCopilotUsage, getRootSessionId, getUUID, isNullish, parseUserIdMetadata, prepareForCompact, prepareInteractionHeaders, prepareMessageProxyHeaders, requestContext, resolveTraceId, sleep, state } from "./utils-DDQKGVRQ.js";
+import { HTTPError, cacheModels, copilotBaseUrl, copilotHeaders, forwardError, generateRequestIdFromPayload, getCopilotUsage, getRootSessionId, getUUID, isNullish, parseUserIdMetadata, prepareForCompact, prepareInteractionHeaders, prepareMessageProxyHeaders, requestContext, resolveTraceId, sleep, state } from "./utils-CKrfAAVw.js";
 import { getAnthropicApiKey, getClaudeTokenMultiplier, getConfig, getExtraPromptForModel, getProviderConfig, getReasoningEffortForModel, getSmallModel, isMessagesApiEnabled, isResponsesApiContextManagementModel, isResponsesApiWebSearchEnabled } from "./config-EvlyFBSs.js";
 import consola from "consola";
 import path from "node:path";
@@ -64,7 +64,9 @@ const traceIdMiddleware = async (c, next) => {
 	const context = {
 		traceId,
 		startTime: Date.now(),
-		userAgent: c.req.header("user-agent") || ""
+		userAgent: c.req.header("user-agent") || "",
+		sessionAffinity: c.req.header("x-session-affinity"),
+		parentSessionId: c.req.header("x-parent-session-id")
 	};
 	await requestContext.run(context, async () => {
 		await next();
@@ -744,7 +746,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 +760,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 +1377,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;
@@ -1924,6 +1934,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";
@@ -1953,6 +1964,7 @@ const mergeContentWithText = (tr, textBlock) => {
 		...tr,
 		content: `${tr.content}\n\n${textBlock.text}`
 	};
+	if (hasToolRef(tr)) return tr;
 	return {
 		...tr,
 		content: [...tr.content, textBlock]
@@ -1966,6 +1978,7 @@ const mergeContentWithTexts = (tr, textBlocks) => {
 			content: `${tr.content}\n\n${appendedTexts}`
 		};
 	}
+	if (hasToolRef(tr)) return tr;
 	return {
 		...tr,
 		content: [...tr.content, ...textBlocks]
@@ -1976,6 +1989,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" && hasToolRef(block))) 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;
@@ -1992,6 +2012,9 @@ const mergeToolResultForClaude = (anthropicPayload) => {
 		msg.content = mergeToolResult(toolResults, textBlocks);
 	}
 };
+const hasToolRef = (block) => {
+	return Array.isArray(block.content) && block.content.some((c) => c.type === "tool_reference");
+};
 const stripCacheControl = (payload) => {
 	if (Array.isArray(payload.system)) for (const block of payload.system) {
 		const systemBlock = block;
@@ -2412,7 +2435,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;
@@ -2470,7 +2493,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();
@@ -2979,4 +3005,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 
 //#endregion
 export { server };
-//# sourceMappingURL=server-DLaz3q72.js.map
+//# sourceMappingURL=server-CFiXEbAJ.js.map