@jeffreycao/copilot-api 1.9.11 → 1.9.13

package/dist/{server-D4pg54e1.js → server-DkUKa2I6.js}

@@ -1,6 +1,6 @@
-import { PATHS } from "./paths-Cla6y5eD.js";
-import { COMPACT_AUTO_CONTINUE, COMPACT_REQUEST, HTTPError, cacheModels, compactAutoContinuePromptStarts, compactMessageSections, compactSummaryPromptStart, compactSystemPromptStarts, compactTextOnlyGuard, copilotBaseUrl, copilotHeaders, forwardError, generateRequestIdFromPayload, generateTraceId, getCopilotUsage, getRootSessionId, getUUID, isNullish, parseUserIdMetadata, prepareForCompact, prepareInteractionHeaders, prepareMessageProxyHeaders, requestContext, resolveTraceId as resolveTraceId$1, sleep, state } from "./utils-DEJvF68W.js";
-import { getAnthropicApiKey, getClaudeTokenMultiplier, getConfig, getExtraPromptForModel, getProviderConfig, getReasoningEffortForModel, getSmallModel, isMessagesApiEnabled, isResponsesApiContextManagementModel, isResponsesApiWebSearchEnabled } from "./config-BJt9unC0.js";
+import { t as PATHS } from "./paths-DC-mqCY3.js";
+import { A as compactAutoContinuePromptStarts, C as prepareForCompact, D as requestContext, E as generateTraceId, F as state, N as compactSystemPromptStarts, O as resolveTraceId$1, T as prepareMessageProxyHeaders, c as getUUID, d as sleep, f as getCopilotUsage, g as copilotHeaders, h as copilotBaseUrl, j as compactMessageSections, l as isNullish, m as forwardError, n as cacheModels, o as generateRequestIdFromPayload, p as HTTPError, s as getRootSessionId, u as parseUserIdMetadata, w as prepareInteractionHeaders } from "./utils-Cj-ToKA6.js";
+import { a as getProviderConfig, c as isMessagesApiEnabled, i as getExtraPromptForModel, l as isResponsesApiContextManagementModel, n as getClaudeTokenMultiplier, o as getReasoningEffortForModel, r as getConfig, s as getSmallModel, t as getAnthropicApiKey, u as isResponsesApiWebSearchEnabled } from "./config-DrfmMOO-.js";
 import consola from "consola";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -11,7 +11,6 @@ import fs$1, { readFileSync } from "node:fs";
 import { streamSSE } from "hono/streaming";
 import util from "node:util";
 import { events } from "fetch-event-stream";
-
 //#region src/lib/request-auth.ts
 function normalizeApiKeys(apiKeys) {
 	if (!Array.isArray(apiKeys)) {
@@ -23,8 +22,7 @@ function normalizeApiKeys(apiKeys) {
 	return [...new Set(normalizedKeys)];
 }
 function getConfiguredApiKeys() {
-	const config = getConfig();
-	return normalizeApiKeys(config.auth?.apiKeys);
+	return normalizeApiKeys(getConfig().auth?.apiKeys);
 }
 function extractRequestApiKey(c) {
 	const xApiKey = c.req.header("x-api-key")?.trim();
@@ -56,7 +54,6 @@ function createAuthMiddleware(options = {}) {
 		return next();
 	};
 }
-
 //#endregion
 //#region src/lib/trace.ts
 const traceIdMiddleware = async (c, next) => {
@@ -73,13 +70,11 @@ const traceIdMiddleware = async (c, next) => {
 		await next();
 	});
 };
-
 //#endregion
 //#region src/lib/approval.ts
 const awaitApproval = async () => {
 	if (!await consola.prompt(`Accept incoming request?`, { type: "confirm" })) throw new HTTPError("Request rejected", Response.json({ message: "Request rejected" }, { status: 403 }));
 };
-
 //#endregion
 //#region src/lib/process-cleanup.ts
 const cleanupHandlers = /* @__PURE__ */ new Set();
@@ -131,7 +126,6 @@ function registerProcessCleanup(handler) {
 		cleanupHandlers.delete(handler);
 	};
 }
-
 //#endregion
 //#region src/lib/logger.ts
 const LOG_RETENTION_MS = 10080 * 60 * 1e3;
@@ -237,15 +231,15 @@ const appendLine = (filePath, line) => {
 	buffer.push(line);
 	if (buffer.length >= MAX_BUFFER_SIZE) flushBuffer(filePath);
 };
-const debugLazy = (logger$7, factory) => {
+const debugLazy = (logger, factory) => {
 	if (!state.verbose) return;
-	logger$7.debug(...factory());
+	logger.debug(...factory());
 };
-const debugJson = (logger$7, label, value) => {
-	debugLazy(logger$7, () => [label, JSON.stringify(value)]);
+const debugJson = (logger, label, value) => {
+	debugLazy(logger, () => [label, JSON.stringify(value)]);
 };
-const debugJsonTail = (logger$7, label, { value, tailLength = 400 }) => {
-	debugLazy(logger$7, () => [label, JSON.stringify(value).slice(-tailLength)]);
+const debugJsonTail = (logger, label, { value, tailLength = 400 }) => {
+	debugLazy(logger, () => [label, JSON.stringify(value).slice(-tailLength)]);
 };
 const createHandlerLogger = (name) => {
 	const sanitizedName = sanitizeName(name);
@@ -261,38 +255,35 @@ const createHandlerLogger = (name) => {
 		const filePath = path.join(LOG_DIR, `${sanitizedName}-${dateKey}.log`);
 		const message = formatArgs(logObj.args);
 		const traceIdStr = traceId ? ` [${traceId}]` : "";
-		const line = `[${timestamp}] [${logObj.type}] [${logObj.tag || name}]${traceIdStr}${message ? ` ${message}` : ""}`;
-		appendLine(filePath, line);
+		appendLine(filePath, `[${timestamp}] [${logObj.type}] [${logObj.tag || name}]${traceIdStr}${message ? ` ${message}` : ""}`);
 	} });
 	return instance;
 };
-
 //#endregion
 //#region src/lib/rate-limit.ts
-async function checkRateLimit(state$1) {
-	if (state$1.rateLimitSeconds === void 0) return;
+async function checkRateLimit(state) {
+	if (state.rateLimitSeconds === void 0) return;
 	const now = Date.now();
-	if (!state$1.lastRequestTimestamp) {
-		state$1.lastRequestTimestamp = now;
+	if (!state.lastRequestTimestamp) {
+		state.lastRequestTimestamp = now;
 		return;
 	}
-	const elapsedSeconds = (now - state$1.lastRequestTimestamp) / 1e3;
-	if (elapsedSeconds > state$1.rateLimitSeconds) {
-		state$1.lastRequestTimestamp = now;
+	const elapsedSeconds = (now - state.lastRequestTimestamp) / 1e3;
+	if (elapsedSeconds > state.rateLimitSeconds) {
+		state.lastRequestTimestamp = now;
 		return;
 	}
-	const waitTimeSeconds = Math.ceil(state$1.rateLimitSeconds - elapsedSeconds);
-	if (!state$1.rateLimitWait) {
+	const waitTimeSeconds = Math.ceil(state.rateLimitSeconds - elapsedSeconds);
+	if (!state.rateLimitWait) {
 		consola.warn(`Rate limit exceeded. Need to wait ${waitTimeSeconds} more seconds.`);
 		throw new HTTPError("Rate limit exceeded", Response.json({ message: "Rate limit exceeded" }, { status: 429 }));
 	}
 	const waitTimeMs = waitTimeSeconds * 1e3;
 	consola.warn(`Rate limit reached. Waiting ${waitTimeSeconds} seconds before proceeding...`);
 	await sleep(waitTimeMs);
-	state$1.lastRequestTimestamp = now;
+	state.lastRequestTimestamp = now;
 	consola.info("Rate limit wait completed, proceeding with request");
 }
-
 //#endregion
 //#region src/lib/event-bus.ts
 var EventBus = class {
@@ -316,7 +307,6 @@ var EventBus = class {
 		};
 	}
 };
-
 //#endregion
 //#region src/lib/sqlite.ts
 const MINIMUM_NODE_SQLITE_VERSION = "22.13.0";
@@ -395,7 +385,6 @@ var SqliteDbStore = class {
 		return db;
 	}
 };
-
 //#endregion
 //#region src/lib/token-usage/store.ts
 const DB_PATH_ENV = "COPILOT_API_SQLITE_DB_PATH";
@@ -573,12 +562,10 @@ function createEmptySummary(period) {
 }
 function createEmptyEventsPage(input) {
 	const range = getPeriodRange(input.period);
-	const page = Math.max(1, Math.floor(input.page));
-	const pageSize = Math.min(100, Math.max(1, Math.floor(input.pageSize)));
 	return {
 		items: [],
-		page,
-		page_size: pageSize,
+		page: Math.max(1, Math.floor(input.page)),
+		page_size: Math.min(100, Math.max(1, Math.floor(input.pageSize))),
 		period: input.period,
 		range: {
 			end_ms: range.endMs,
@@ -738,7 +725,6 @@ async function closeUsageStore() {
 	writeQueue = Promise.resolve();
 }
 registerProcessCleanup(closeUsageStore);
-
 //#endregion
 //#region src/lib/token-usage/index.ts
 const tokenUsageEventBus = new EventBus();
@@ -838,7 +824,6 @@ function mergeAnthropicUsage(current, next) {
 		total_tokens: next.total_tokens ?? current.total_tokens
 	};
 }
-
 //#endregion
 //#region src/lib/copilot-rate-limit.ts
 const copilotRateLimitTypes = ["session", "weekly"];
@@ -884,12 +869,11 @@ const logCopilotRateLimits = (headers) => {
 		consola.info(`Copilot ${usage.type} quota remaining: ${usage.remaining}, resets at: ${dateStr}`);
 	}
 };
-
 //#endregion
 //#region src/services/copilot/create-chat-completions.ts
 const createChatCompletions = async (payload, options) => {
 	if (!state.copilotToken) throw new Error("Copilot token not found");
-	const enableVision = payload.messages.some((x) => typeof x.content !== "string" && x.content?.some((x$1) => x$1.type === "image_url"));
+	const enableVision = payload.messages.some((x) => typeof x.content !== "string" && x.content?.some((x) => x.type === "image_url"));
 	let isAgentCall = false;
 	if (payload.messages.length > 0) {
 		const lastMessage = payload.messages.at(-1);
@@ -915,7 +899,6 @@ const createChatCompletions = async (payload, options) => {
 	if (payload.stream) return events(response);
 	return await response.json();
 };
-
 //#endregion
 //#region src/routes/chat-completions/handler.ts
 const logger$6 = createHandlerLogger("chat-completions-handler");
@@ -979,7 +962,6 @@ const parseChatCompletionChunk = (chunk) => {
 		return null;
 	}
 };
-
 //#endregion
 //#region src/routes/chat-completions/route.ts
 const completionRoutes = new Hono();
@@ -990,7 +972,6 @@ completionRoutes.post("/", async (c) => {
 		return await forwardError(c, error);
 	}
 });
-
 //#endregion
 //#region src/services/copilot/create-embeddings.ts
 const createEmbeddings = async (payload) => {
@@ -1003,7 +984,6 @@ const createEmbeddings = async (payload) => {
 	if (!response.ok) throw new HTTPError("Failed to create embeddings", response);
 	return await response.json();
 };
-
 //#endregion
 //#region src/routes/embeddings/route.ts
 const embeddingRoutes = new Hono();
@@ -1023,7 +1003,6 @@ embeddingRoutes.post("/", async (c) => {
 		return await forwardError(c, error);
 	}
 });
-
 //#endregion
 //#region src/lib/provider-model.ts
 const parseProviderModelAlias = (model) => {
@@ -1054,7 +1033,6 @@ const createFallbackModel = (modelId) => ({
 	vendor: "provider",
 	version: "unknown"
 });
-
 //#endregion
 //#region src/lib/tokenizer.ts
 const ENCODING_MAP = {
@@ -1259,8 +1237,7 @@ const numTokensForTools = (tools, encoder, constants) => {
 * Calculate the token count of messages, supporting multiple GPT encoders
 */
 const getTokenCount = async (payload, model) => {
-	const tokenizer = getTokenizerFromModel(model);
-	const encoder = await getEncodeChatFunction(tokenizer);
+	const encoder = await getEncodeChatFunction(getTokenizerFromModel(model));
 	const simplifiedMessages = payload.messages;
 	const inputMessages = simplifiedMessages.filter((msg) => msg.role !== "assistant");
 	const outputMessages = simplifiedMessages.filter((msg) => msg.role === "assistant");
@@ -1273,7 +1250,6 @@ const getTokenCount = async (payload, model) => {
 		output: outputTokens
 	};
 };
-
 //#endregion
 //#region src/routes/messages/utils.ts
 function mapOpenAIStopReasonToAnthropic(finishReason) {
@@ -1285,23 +1261,20 @@ function mapOpenAIStopReasonToAnthropic(finishReason) {
 		content_filter: "end_turn"
 	}[finishReason];
 }
-
 //#endregion
 //#region src/routes/messages/non-stream-translation.ts
 const THINKING_TEXT$1 = "Thinking...";
-const RICH_TOOL_RESULT_MOVED_TEXT = "Rich tool result content was moved to a user message because this upstream does not support it in tool messages.";
 const COPILOT_TOOL_CONTENT_SUPPORT_TYPE = ["array", "image"];
 function translateToOpenAI(payload, options = {}) {
 	const modelId = payload.model;
 	const model = state.models?.data.find((m) => m.id === modelId);
 	const thinkingBudget = getThinkingBudget(payload, model);
-	const capabilities = {
-		supportPdf: options.supportPdf ?? false,
-		toolContentSupportType: options.toolContentSupportType ?? COPILOT_TOOL_CONTENT_SUPPORT_TYPE
-	};
 	return {
 		model: modelId,
-		messages: translateAnthropicMessagesToOpenAI(payload, modelId, capabilities),
+		messages: translateAnthropicMessagesToOpenAI(payload, modelId, {
+			supportPdf: options.supportPdf ?? false,
+			toolContentSupportType: options.toolContentSupportType ?? COPILOT_TOOL_CONTENT_SUPPORT_TYPE
+		}),
 		max_tokens: payload.max_tokens,
 		stop: payload.stop_sequences,
 		stream: payload.stream,
@@ -1368,15 +1341,15 @@ function handleToolResultBlock(block, capabilities) {
 	if (typeof block.content === "string") return { toolMessage: createToolMessage(block.tool_use_id, block.content) };
 	if (!Array.isArray(block.content)) return { toolMessage: createToolMessage(block.tool_use_id, "") };
 	const support = getToolContentSupport(capabilities);
-	const hasImage = block.content.some((block$1) => block$1.type === "image");
-	const hasDocument = block.content.some((block$1) => block$1.type === "document");
+	const hasImage = block.content.some((block) => block.type === "image");
+	const hasDocument = block.content.some((block) => block.type === "document");
 	const content = mapContent(block.content, { supportPdf: capabilities.supportPdf });
 	const hasPdfFile = hasDocument && capabilities.supportPdf;
 	const shouldMoveImageToUserMessage = hasImage && !support.image;
 	const shouldMovePdfToUserMessage = hasPdfFile && !support.pdf;
 	if (shouldMoveImageToUserMessage || shouldMovePdfToUserMessage) return {
 		movedUserMessage: createToolResultUserMessage(block, capabilities.supportPdf),
-		toolMessage: createToolMessage(block.tool_use_id, getTextToolContent(content) || RICH_TOOL_RESULT_MOVED_TEXT)
+		toolMessage: createToolMessage(block.tool_use_id, getTextToolContent(content) || "Rich tool result content was moved to a user message because this upstream does not support it in tool messages.")
 	};
 	const hasRichContent = hasImage || hasPdfFile;
 	if (support.array || hasRichContent) return { toolMessage: createToolMessage(block.tool_use_id, content) };
@@ -1425,8 +1398,8 @@ function handleAssistantMessage(message, modelId, capabilities) {
 	}];
 	const toolUseBlocks = message.content.filter((block) => block.type === "tool_use");
 	let thinkingBlocks = message.content.filter((block) => block.type === "thinking");
-	if (modelId.startsWith("claude")) thinkingBlocks = thinkingBlocks.filter((b) => b.thinking && b.thinking !== THINKING_TEXT$1 && b.signature && !b.signature.includes("@"));
-	const thinkingContents = thinkingBlocks.filter((b) => b.thinking && b.thinking !== THINKING_TEXT$1).map((b) => b.thinking);
+	if (modelId.startsWith("claude")) thinkingBlocks = thinkingBlocks.filter((b) => b.thinking && b.thinking !== "Thinking..." && b.signature && !b.signature.includes("@"));
+	const thinkingContents = thinkingBlocks.filter((b) => b.thinking && b.thinking !== "Thinking...").map((b) => b.thinking);
 	const allThinkingContent = thinkingContents.length > 0 ? thinkingContents.join("\n\n") : void 0;
 	const signature = thinkingBlocks.find((b) => b.signature)?.signature;
 	return toolUseBlocks.length > 0 ? [{
@@ -1601,15 +1574,13 @@ function getAnthropicToolUseBlocks(toolCalls) {
 		input: JSON.parse(toolCall.function.arguments)
 	}));
 }
-
 //#endregion
 //#region src/routes/provider/messages/count-tokens-handler.ts
 const logger$5 = createHandlerLogger("provider-count-tokens-handler");
 async function handleProviderCountTokens(c) {
 	const provider = c.req.param("provider");
-	const payload = await c.req.json();
 	return await handleProviderCountTokensForProvider(c, {
-		payload,
+		payload: await c.req.json(),
 		provider
 	});
 }
@@ -1622,13 +1593,10 @@ async function handleProviderCountTokensForProvider(c, options) {
 		type: "invalid_request_error"
 	} }, 404);
 	const modelConfig = providerConfig.models?.[modelId];
-	const translationOptions = providerConfig.type === "openai-compatible" ? {
+	const tokenCount = await getTokenCount(translateToOpenAI(anthropicPayload, providerConfig.type === "openai-compatible" ? {
 		supportPdf: modelConfig?.supportPdf,
 		toolContentSupportType: modelConfig?.toolContentSupportType ?? []
-	} : void 0;
-	const openAIPayload = translateToOpenAI(anthropicPayload, translationOptions);
-	const selectedModel = createFallbackModel(modelId);
-	const tokenCount = await getTokenCount(openAIPayload, selectedModel);
+	} : void 0), createFallbackModel(modelId));
 	const finalTokenCount = tokenCount.input + tokenCount.output;
 	logger$5.debug("provider.count_tokens.success", {
 		provider,
@@ -1637,7 +1605,6 @@ async function handleProviderCountTokensForProvider(c, options) {
 	});
 	return c.json({ input_tokens: finalTokenCount });
 }
-
 //#endregion
 //#region src/lib/models.ts
 const findEndpointModel = (sdkModelId) => {
@@ -1688,7 +1655,6 @@ const _normalizeSdkModelId = (sdkModelId) => {
 		version: pattern5[1]
 	};
 };
-
 //#endregion
 //#region src/routes/messages/count-tokens-handler.ts
 const resolveCountTokensModel = (modelId, findModel = findEndpointModel) => {
@@ -1775,56 +1741,56 @@ async function handleCountTokens(c) {
 	consola.info("Token count:", finalTokenCount);
 	return c.json({ input_tokens: finalTokenCount });
 }
-
 //#endregion
 //#region src/routes/messages/stream-translation.ts
-function isToolBlockOpen(state$1) {
-	if (!state$1.contentBlockOpen) return false;
-	return Object.values(state$1.toolCalls).some((tc) => tc.anthropicBlockIndex === state$1.contentBlockIndex);
+function isToolBlockOpen(state) {
+	if (!state.contentBlockOpen) return false;
+	return Object.values(state.toolCalls).some((tc) => tc.anthropicBlockIndex === state.contentBlockIndex);
 }
-function translateChunkToAnthropicEvents(chunk, state$1) {
-	const events$1 = [];
+function translateChunkToAnthropicEvents(chunk, state) {
+	const events = [];
 	if (chunk.choices.length === 0) {
-		completePendingMessage(state$1, events$1, chunk);
-		return events$1;
+		completePendingMessage(state, events, chunk);
+		return events;
 	}
 	const choice = chunk.choices[0];
 	const { delta } = choice;
-	handleMessageStart(state$1, events$1, chunk);
-	handleThinkingText(delta, state$1, events$1);
-	handleContent(delta, state$1, events$1);
-	handleToolCalls(delta, state$1, events$1);
-	handleFinish(choice, state$1, {
-		events: events$1,
+	handleMessageStart(state, events, chunk);
+	handleThinkingText(delta, state, events);
+	handleContent(delta, state, events);
+	handleToolCalls(delta, state, events);
+	handleFinish(choice, state, {
+		events,
 		chunk
 	});
-	return events$1;
+	return events;
 }
-function flushPendingAnthropicStreamEvents(state$1) {
-	const events$1 = [];
-	completePendingMessage(state$1, events$1);
-	return events$1;
+function flushPendingAnthropicStreamEvents(state) {
+	const events = [];
+	completePendingMessage(state, events);
+	return events;
 }
-function completePendingMessage(state$1, events$1, chunk) {
-	if (!state$1.pendingMessageDelta) return;
-	if (chunk?.usage) state$1.pendingMessageDelta.usage = getAnthropicUsageFromOpenAIChunk(chunk);
-	events$1.push(state$1.pendingMessageDelta, { type: "message_stop" });
-	state$1.pendingMessageDelta = void 0;
+function completePendingMessage(state, events, chunk) {
+	if (!state.pendingMessageDelta) return;
+	if (chunk?.usage) state.pendingMessageDelta.usage = getAnthropicUsageFromOpenAIChunk(chunk);
+	events.push(state.pendingMessageDelta, { type: "message_stop" });
+	state.pendingMessageDelta = void 0;
 }
-function handleFinish(choice, state$1, context) {
-	const { events: events$1, chunk } = context;
+function handleFinish(choice, state, context) {
+	const { events, chunk } = context;
 	if (choice.finish_reason && choice.finish_reason.length > 0) {
-		if (state$1.contentBlockOpen) {
-			const toolBlockOpen = isToolBlockOpen(state$1);
+		if (state.contentBlockOpen) {
+			const toolBlockOpen = isToolBlockOpen(state);
 			context.events.push({
 				type: "content_block_stop",
-				index: state$1.contentBlockIndex
+				index: state.contentBlockIndex
 			});
-			state$1.contentBlockOpen = false;
-			state$1.contentBlockIndex++;
-			if (!toolBlockOpen) handleReasoningOpaque(choice.delta, events$1, state$1);
+			state.contentBlockOpen = false;
+			state.contentBlockIndex++;
+			if (!toolBlockOpen) handleReasoningOpaque(choice.delta, events, state);
 		}
-		state$1.pendingMessageDelta = {
+		flushDeferredContent(state, events);
+		state.pendingMessageDelta = {
 			type: "message_delta",
 			delta: {
 				stop_reason: mapOpenAIStopReasonToAnthropic(choice.finish_reason),
@@ -1832,7 +1798,7 @@ function handleFinish(choice, state$1, context) {
 			},
 			usage: getAnthropicUsageFromOpenAIChunk(chunk)
 		};
-		if (chunk.usage) completePendingMessage(state$1, events$1, chunk);
+		if (chunk.usage) completePendingMessage(state, events, chunk);
 	}
 }
 function getAnthropicUsageFromOpenAIChunk(chunk) {
@@ -1854,27 +1820,27 @@ function getOpenAIChunkUsageTokens(chunk) {
 		inputTokens: Math.max(0, promptTokens - cachedTokens - cacheCreationTokens)
 	};
 }
-function handleToolCalls(delta, state$1, events$1) {
+function handleToolCalls(delta, state, events) {
 	if (delta.tool_calls && delta.tool_calls.length > 0) {
-		closeThinkingBlockIfOpen(state$1, events$1);
-		handleReasoningOpaqueInToolCalls(state$1, events$1, delta);
+		closeThinkingBlockIfOpen(state, events);
+		handleReasoningOpaqueInToolCalls(state, events, delta);
 		for (const toolCall of delta.tool_calls) {
 			if (toolCall.id && toolCall.function?.name) {
-				if (state$1.contentBlockOpen) {
-					events$1.push({
+				if (state.contentBlockOpen) {
+					events.push({
 						type: "content_block_stop",
-						index: state$1.contentBlockIndex
+						index: state.contentBlockIndex
 					});
-					state$1.contentBlockIndex++;
-					state$1.contentBlockOpen = false;
+					state.contentBlockIndex++;
+					state.contentBlockOpen = false;
 				}
-				const anthropicBlockIndex = state$1.contentBlockIndex;
-				state$1.toolCalls[toolCall.index] = {
+				const anthropicBlockIndex = state.contentBlockIndex;
+				state.toolCalls[toolCall.index] = {
 					id: toolCall.id,
 					name: toolCall.function.name,
 					anthropicBlockIndex
 				};
-				events$1.push({
+				events.push({
 					type: "content_block_start",
 					index: anthropicBlockIndex,
 					content_block: {
@@ -1884,11 +1850,11 @@ function handleToolCalls(delta, state$1, events$1) {
 						input: {}
 					}
 				});
-				state$1.contentBlockOpen = true;
+				state.contentBlockOpen = true;
 			}
 			if (toolCall.function?.arguments) {
-				const toolCallInfo = state$1.toolCalls[toolCall.index];
-				if (toolCallInfo) events$1.push({
+				const toolCallInfo = state.toolCalls[toolCall.index];
+				if (toolCallInfo) events.push({
 					type: "content_block_delta",
 					index: toolCallInfo.anthropicBlockIndex,
 					delta: {
@@ -1900,68 +1866,95 @@ function handleToolCalls(delta, state$1, events$1) {
 		}
 	}
 }
-function handleReasoningOpaqueInToolCalls(state$1, events$1, delta) {
-	if (state$1.contentBlockOpen && !isToolBlockOpen(state$1)) {
-		events$1.push({
+function handleReasoningOpaqueInToolCalls(state, events, delta) {
+	if (state.contentBlockOpen && !isToolBlockOpen(state)) {
+		events.push({
 			type: "content_block_stop",
-			index: state$1.contentBlockIndex
+			index: state.contentBlockIndex
 		});
-		state$1.contentBlockIndex++;
-		state$1.contentBlockOpen = false;
+		state.contentBlockIndex++;
+		state.contentBlockOpen = false;
 	}
-	handleReasoningOpaque(delta, events$1, state$1);
+	handleReasoningOpaque(delta, events, state);
 }
-function handleContent(delta, state$1, events$1) {
+function handleContent(delta, state, events) {
 	if (delta.content && delta.content.length > 0) {
-		closeThinkingBlockIfOpen(state$1, events$1);
-		if (isToolBlockOpen(state$1)) {
-			events$1.push({
-				type: "content_block_stop",
-				index: state$1.contentBlockIndex
-			});
-			state$1.contentBlockIndex++;
-			state$1.contentBlockOpen = false;
+		closeThinkingBlockIfOpen(state, events);
+		if (isToolBlockOpen(state) || hasToolCallDelta(delta)) {
+			state.deferredContent = `${state.deferredContent ?? ""}${delta.content}`;
+			return;
 		}
-		if (!state$1.contentBlockOpen) {
-			events$1.push({
+		if (!state.contentBlockOpen) {
+			events.push({
 				type: "content_block_start",
-				index: state$1.contentBlockIndex,
+				index: state.contentBlockIndex,
 				content_block: {
 					type: "text",
 					text: ""
 				}
 			});
-			state$1.contentBlockOpen = true;
+			state.contentBlockOpen = true;
 		}
-		events$1.push({
+		events.push({
 			type: "content_block_delta",
-			index: state$1.contentBlockIndex,
+			index: state.contentBlockIndex,
 			delta: {
 				type: "text_delta",
 				text: delta.content
 			}
 		});
 	}
-	if (delta.content === "" && delta.reasoning_opaque && delta.reasoning_opaque.length > 0 && state$1.thinkingBlockOpen) {
-		events$1.push({
+	if (delta.content === "" && delta.reasoning_opaque && delta.reasoning_opaque.length > 0 && state.thinkingBlockOpen) {
+		events.push({
 			type: "content_block_delta",
-			index: state$1.contentBlockIndex,
+			index: state.contentBlockIndex,
 			delta: {
 				type: "signature_delta",
 				signature: delta.reasoning_opaque
 			}
 		}, {
 			type: "content_block_stop",
-			index: state$1.contentBlockIndex
+			index: state.contentBlockIndex
+		});
+		state.contentBlockIndex++;
+		state.thinkingBlockOpen = false;
+	}
+}
+function hasToolCallDelta(delta) {
+	return Boolean(delta.tool_calls && delta.tool_calls.length > 0);
+}
+function flushDeferredContent(state, events) {
+	if (!state.deferredContent) return;
+	if (!state.contentBlockOpen) {
+		events.push({
+			type: "content_block_start",
+			index: state.contentBlockIndex,
+			content_block: {
+				type: "text",
+				text: ""
+			}
 		});
-		state$1.contentBlockIndex++;
-		state$1.thinkingBlockOpen = false;
+		state.contentBlockOpen = true;
 	}
+	events.push({
+		type: "content_block_delta",
+		index: state.contentBlockIndex,
+		delta: {
+			type: "text_delta",
+			text: state.deferredContent
+		}
+	}, {
+		type: "content_block_stop",
+		index: state.contentBlockIndex
+	});
+	state.deferredContent = void 0;
+	state.contentBlockOpen = false;
+	state.contentBlockIndex++;
 }
-function handleMessageStart(state$1, events$1, chunk) {
-	if (!state$1.messageStartSent) {
+function handleMessageStart(state, events, chunk) {
+	if (!state.messageStartSent) {
 		const { cachedTokens, cacheCreationTokens, inputTokens } = getOpenAIChunkUsageTokens(chunk);
-		events$1.push({
+		events.push({
 			type: "message_start",
 			message: {
 				id: chunk.id,
@@ -1979,62 +1972,62 @@ function handleMessageStart(state$1, events$1, chunk) {
 				}
 			}
 		});
-		state$1.messageStartSent = true;
+		state.messageStartSent = true;
 	}
 }
-function handleReasoningOpaque(delta, events$1, state$1) {
+function handleReasoningOpaque(delta, events, state) {
 	if (delta.reasoning_opaque && delta.reasoning_opaque.length > 0) {
-		events$1.push({
+		events.push({
 			type: "content_block_start",
-			index: state$1.contentBlockIndex,
+			index: state.contentBlockIndex,
 			content_block: {
 				type: "thinking",
 				thinking: ""
 			}
 		}, {
 			type: "content_block_delta",
-			index: state$1.contentBlockIndex,
+			index: state.contentBlockIndex,
 			delta: {
 				type: "thinking_delta",
 				thinking: THINKING_TEXT$1
 			}
 		}, {
 			type: "content_block_delta",
-			index: state$1.contentBlockIndex,
+			index: state.contentBlockIndex,
 			delta: {
 				type: "signature_delta",
 				signature: delta.reasoning_opaque
 			}
 		}, {
 			type: "content_block_stop",
-			index: state$1.contentBlockIndex
+			index: state.contentBlockIndex
 		});
-		state$1.contentBlockIndex++;
+		state.contentBlockIndex++;
 	}
 }
-function handleThinkingText(delta, state$1, events$1) {
+function handleThinkingText(delta, state, events) {
 	const reasoningText = delta.reasoning_text ?? delta.reasoning_content;
 	if (reasoningText && reasoningText.length > 0) {
-		if (state$1.contentBlockOpen) {
+		if (state.contentBlockOpen) {
 			delta.content = reasoningText;
 			delta.reasoning_text = void 0;
 			delta.reasoning_content = void 0;
 			return;
 		}
-		if (!state$1.thinkingBlockOpen) {
-			events$1.push({
+		if (!state.thinkingBlockOpen) {
+			events.push({
 				type: "content_block_start",
-				index: state$1.contentBlockIndex,
+				index: state.contentBlockIndex,
 				content_block: {
 					type: "thinking",
 					thinking: ""
 				}
 			});
-			state$1.thinkingBlockOpen = true;
+			state.thinkingBlockOpen = true;
 		}
-		events$1.push({
+		events.push({
 			type: "content_block_delta",
-			index: state$1.contentBlockIndex,
+			index: state.contentBlockIndex,
 			delta: {
 				type: "thinking_delta",
 				thinking: reasoningText
@@ -2042,24 +2035,23 @@ function handleThinkingText(delta, state$1, events$1) {
 		});
 	}
 }
-function closeThinkingBlockIfOpen(state$1, events$1) {
-	if (state$1.thinkingBlockOpen) {
-		events$1.push({
+function closeThinkingBlockIfOpen(state, events) {
+	if (state.thinkingBlockOpen) {
+		events.push({
 			type: "content_block_delta",
-			index: state$1.contentBlockIndex,
+			index: state.contentBlockIndex,
 			delta: {
 				type: "signature_delta",
 				signature: ""
 			}
 		}, {
 			type: "content_block_stop",
-			index: state$1.contentBlockIndex
+			index: state.contentBlockIndex
 		});
-		state$1.contentBlockIndex++;
-		state$1.thinkingBlockOpen = false;
+		state.contentBlockIndex++;
+		state.thinkingBlockOpen = false;
 	}
 }
-
 //#endregion
 //#region src/services/providers/anthropic-proxy.ts
 const SHARED_FORWARDABLE_HEADERS = ["accept", "user-agent"];
@@ -2125,7 +2117,6 @@ async function forwardProviderModels(providerConfig, requestHeaders) {
 		headers: buildProviderUpstreamHeaders(providerConfig, requestHeaders)
 	});
 }
-
 //#endregion
 //#region src/routes/provider/messages/handler.ts
 const logger$4 = createHandlerLogger("provider-messages-handler");
@@ -2139,9 +2130,8 @@ const OPENAI_COMPATIBLE_CONTEXT_CACHE_ROLES = new Set([
 ]);
 async function handleProviderMessages(c) {
 	const provider = c.req.param("provider");
-	const payload = await c.req.json();
 	return await handleProviderMessagesForProvider(c, {
-		payload,
+		payload: await c.req.json(),
 		provider
 	});
 }
@@ -2179,9 +2169,8 @@ async function handleProviderMessagesForProvider(c, options) {
 			providerConfig,
 			upstreamResponse
 		});
-		const jsonBody = await upstreamResponse.json();
 		return respondProviderMessagesJson(c, {
-			body: jsonBody,
+			body: await upstreamResponse.json(),
 			payload,
 			provider,
 			providerConfig
@@ -2221,9 +2210,8 @@ const handleOpenAICompatibleProviderMessages = async (c, options) => {
 		provider,
 		upstreamResponse
 	});
-	const jsonBody = await upstreamResponse.json();
 	return respondOpenAICompatibleProviderMessagesJson(c, {
-		body: jsonBody,
+		body: await upstreamResponse.json(),
 		payload,
 		provider
 	});
@@ -2350,8 +2338,8 @@ const streamOpenAICompatibleProviderMessages = ({ c, payload, provider, upstream
 			const parsed = parseOpenAICompatibleStreamChunk(chunk.data);
 			if (!parsed) continue;
 			if (parsed.usage) usage = normalizeOpenAIUsage(parsed.usage);
-			const events$1 = translateChunkToAnthropicEvents(parsed, streamState);
-			for (const event of events$1) {
+			const events = translateChunkToAnthropicEvents(parsed, streamState);
+			for (const event of events) {
 				const eventData = JSON.stringify(event);
 				debugLazy(logger$4, () => ["provider.messages.openai_compatible.translated_event:", eventData]);
 				await stream.writeSSE({
@@ -2438,7 +2426,6 @@ const adjustInputTokens = (providerConfig, usage) => {
 	usage.input_tokens = Math.max(0, (usage.input_tokens ?? 0) - (usage.cache_read_input_tokens ?? 0) - (usage.cache_creation_input_tokens ?? 0));
 	debugJson(logger$4, "provider.messages.adjusted_usage:", usage);
 };
-
 //#endregion
 //#region src/services/copilot/create-responses.ts
 const createResponses = async (payload, { vision, initiator, subagentMarker, requestId, sessionId, compactType }) => {
@@ -2464,7 +2451,6 @@ const createResponses = async (payload, { vision, initiator, subagentMarker, req
 	if (payload.stream) return events(response);
 	return await response.json();
 };
-
 //#endregion
 //#region src/routes/messages/responses-translation.ts
 const MESSAGE_TYPE = "message";
@@ -2636,7 +2622,7 @@ const createFileContent = (block) => ({
 });
 const createReasoningContent = (block) => {
 	const { encryptedContent, id } = parseReasoningSignature(block.signature);
-	const thinking = block.thinking === THINKING_TEXT ? "" : block.thinking;
+	const thinking = block.thinking === "Thinking..." ? "" : block.thinking;
 	return {
 		id,
 		type: "reasoning",
@@ -2864,9 +2850,8 @@ const mapResponsesStopReason = (response) => {
 const mapResponsesUsage = (response) => {
 	const inputTokens = response.usage?.input_tokens ?? 0;
 	const outputTokens = response.usage?.output_tokens ?? 0;
-	const inputCachedTokens = response.usage?.input_tokens_details?.cached_tokens;
 	return {
-		input_tokens: inputTokens - (inputCachedTokens ?? 0),
+		input_tokens: inputTokens - (response.usage?.input_tokens_details?.cached_tokens ?? 0),
 		output_tokens: outputTokens,
 		...response.usage?.input_tokens_details?.cached_tokens !== void 0 && { cache_read_input_tokens: response.usage.input_tokens_details.cached_tokens }
 	};
@@ -2897,7 +2882,6 @@ const convertToolResultContent = (content) => {
 	}
 	return "";
 };
-
 //#endregion
 //#region src/routes/messages/responses-stream-translation.ts
 const MAX_CONSECUTIVE_FUNCTION_CALL_WHITESPACE = 20;
@@ -2934,40 +2918,40 @@ const createResponsesStreamState = () => ({
 	blockHasDelta: /* @__PURE__ */ new Set(),
 	functionCallStateByOutputIndex: /* @__PURE__ */ new Map()
 });
-const translateResponsesStreamEvent = (rawEvent, state$1) => {
+const translateResponsesStreamEvent = (rawEvent, state) => {
 	switch (rawEvent.type) {
-		case "response.created": return handleResponseCreated(rawEvent, state$1);
-		case "response.output_item.added": return handleOutputItemAdded$1(rawEvent, state$1);
-		case "response.reasoning_summary_text.delta": return handleReasoningSummaryTextDelta(rawEvent, state$1);
-		case "response.output_text.delta": return handleOutputTextDelta(rawEvent, state$1);
-		case "response.reasoning_summary_text.done": return handleReasoningSummaryTextDone(rawEvent, state$1);
-		case "response.output_text.done": return handleOutputTextDone(rawEvent, state$1);
-		case "response.output_item.done": return handleOutputItemDone$1(rawEvent, state$1);
-		case "response.function_call_arguments.delta": return handleFunctionCallArgumentsDelta(rawEvent, state$1);
-		case "response.function_call_arguments.done": return handleFunctionCallArgumentsDone(rawEvent, state$1);
+		case "response.created": return handleResponseCreated(rawEvent, state);
+		case "response.output_item.added": return handleOutputItemAdded$1(rawEvent, state);
+		case "response.reasoning_summary_text.delta": return handleReasoningSummaryTextDelta(rawEvent, state);
+		case "response.output_text.delta": return handleOutputTextDelta(rawEvent, state);
+		case "response.reasoning_summary_text.done": return handleReasoningSummaryTextDone(rawEvent, state);
+		case "response.output_text.done": return handleOutputTextDone(rawEvent, state);
+		case "response.output_item.done": return handleOutputItemDone$1(rawEvent, state);
+		case "response.function_call_arguments.delta": return handleFunctionCallArgumentsDelta(rawEvent, state);
+		case "response.function_call_arguments.done": return handleFunctionCallArgumentsDone(rawEvent, state);
 		case "response.completed":
-		case "response.incomplete": return handleResponseCompleted(rawEvent, state$1);
-		case "response.failed": return handleResponseFailed(rawEvent, state$1);
-		case "error": return handleErrorEvent(rawEvent, state$1);
+		case "response.incomplete": return handleResponseCompleted(rawEvent, state);
+		case "response.failed": return handleResponseFailed(rawEvent, state);
+		case "error": return handleErrorEvent(rawEvent, state);
 		default: return [];
 	}
 };
-const handleResponseCreated = (rawEvent, state$1) => {
-	return messageStart(state$1, rawEvent.response);
+const handleResponseCreated = (rawEvent, state) => {
+	return messageStart(state, rawEvent.response);
 };
-const handleOutputItemAdded$1 = (rawEvent, state$1) => {
-	const events$1 = new Array();
+const handleOutputItemAdded$1 = (rawEvent, state) => {
+	const events = new Array();
 	const functionCallDetails = extractFunctionCallDetails(rawEvent);
-	if (!functionCallDetails) return events$1;
+	if (!functionCallDetails) return events;
 	const { outputIndex, toolCallId, name, initialArguments } = functionCallDetails;
-	const blockIndex = openFunctionCallBlock(state$1, {
+	const blockIndex = openFunctionCallBlock(state, {
 		outputIndex,
 		toolCallId,
 		name,
-		events: events$1
+		events
 	});
 	if (initialArguments !== void 0 && initialArguments.length > 0) {
-		events$1.push({
+		events.push({
 			type: "content_block_delta",
 			index: blockIndex,
 			delta: {
@@ -2975,29 +2959,29 @@ const handleOutputItemAdded$1 = (rawEvent, state$1) => {
 				partial_json: initialArguments
 			}
 		});
-		state$1.blockHasDelta.add(blockIndex);
+		state.blockHasDelta.add(blockIndex);
 	}
-	return events$1;
+	return events;
 };
-const handleOutputItemDone$1 = (rawEvent, state$1) => {
-	const events$1 = new Array();
+const handleOutputItemDone$1 = (rawEvent, state) => {
+	const events = new Array();
 	const item = rawEvent.item;
 	const itemType = item.type;
 	const outputIndex = rawEvent.output_index;
 	if (itemType === "compaction") {
-		if (!item.id || !item.encrypted_content) return events$1;
-		const blockIndex$1 = openThinkingBlockIfNeeded(state$1, outputIndex, events$1);
-		if (!state$1.blockHasDelta.has(blockIndex$1)) events$1.push({
+		if (!item.id || !item.encrypted_content) return events;
+		const blockIndex = openThinkingBlockIfNeeded(state, outputIndex, events);
+		if (!state.blockHasDelta.has(blockIndex)) events.push({
 			type: "content_block_delta",
-			index: blockIndex$1,
+			index: blockIndex,
 			delta: {
 				type: "thinking_delta",
 				thinking: THINKING_TEXT
 			}
 		});
-		events$1.push({
+		events.push({
 			type: "content_block_delta",
-			index: blockIndex$1,
+			index: blockIndex,
 			delta: {
 				type: "signature_delta",
 				signature: encodeCompactionCarrierSignature({
@@ -3006,14 +2990,14 @@ const handleOutputItemDone$1 = (rawEvent, state$1) => {
 				})
 			}
 		});
-		state$1.blockHasDelta.add(blockIndex$1);
-		return events$1;
+		state.blockHasDelta.add(blockIndex);
+		return events;
 	}
-	if (itemType !== "reasoning") return events$1;
-	const blockIndex = openThinkingBlockIfNeeded(state$1, outputIndex, events$1);
+	if (itemType !== "reasoning") return events;
+	const blockIndex = openThinkingBlockIfNeeded(state, outputIndex, events);
 	const signature = (item.encrypted_content ?? "") + "@" + item.id;
 	if (signature) {
-		if (!item.summary || item.summary.length === 0) events$1.push({
+		if (!item.summary || item.summary.length === 0) events.push({
 			type: "content_block_delta",
 			index: blockIndex,
 			delta: {
@@ -3021,7 +3005,7 @@ const handleOutputItemDone$1 = (rawEvent, state$1) => {
 				thinking: THINKING_TEXT
 			}
 		});
-		events$1.push({
+		events.push({
 			type: "content_block_delta",
 			index: blockIndex,
 			delta: {
@@ -3029,25 +3013,25 @@ const handleOutputItemDone$1 = (rawEvent, state$1) => {
 				signature
 			}
 		});
-		state$1.blockHasDelta.add(blockIndex);
+		state.blockHasDelta.add(blockIndex);
 	}
-	return events$1;
+	return events;
 };
-const handleFunctionCallArgumentsDelta = (rawEvent, state$1) => {
-	const events$1 = new Array();
+const handleFunctionCallArgumentsDelta = (rawEvent, state) => {
+	const events = new Array();
 	const outputIndex = rawEvent.output_index;
 	const deltaText = rawEvent.delta;
-	if (!deltaText) return events$1;
-	const blockIndex = openFunctionCallBlock(state$1, {
+	if (!deltaText) return events;
+	const blockIndex = openFunctionCallBlock(state, {
 		outputIndex,
-		events: events$1
+		events
 	});
-	const functionCallState = state$1.functionCallStateByOutputIndex.get(outputIndex);
-	if (!functionCallState) return handleFunctionCallArgumentsValidationError(new FunctionCallArgumentsValidationError("Received function call arguments delta without an open tool call block."), state$1, events$1);
+	const functionCallState = state.functionCallStateByOutputIndex.get(outputIndex);
+	if (!functionCallState) return handleFunctionCallArgumentsValidationError(new FunctionCallArgumentsValidationError("Received function call arguments delta without an open tool call block."), state, events);
 	const { nextCount, exceeded } = updateWhitespaceRunState(functionCallState.consecutiveWhitespaceCount, deltaText);
-	if (exceeded) return handleFunctionCallArgumentsValidationError(new FunctionCallArgumentsValidationError("Received function call arguments delta containing more than 20 consecutive whitespace characters."), state$1, events$1);
+	if (exceeded) return handleFunctionCallArgumentsValidationError(new FunctionCallArgumentsValidationError("Received function call arguments delta containing more than 20 consecutive whitespace characters."), state, events);
 	functionCallState.consecutiveWhitespaceCount = nextCount;
-	events$1.push({
+	events.push({
 		type: "content_block_delta",
 		index: blockIndex,
 		delta: {
@@ -3055,19 +3039,19 @@ const handleFunctionCallArgumentsDelta = (rawEvent, state$1) => {
 			partial_json: deltaText
 		}
 	});
-	state$1.blockHasDelta.add(blockIndex);
-	return events$1;
+	state.blockHasDelta.add(blockIndex);
+	return events;
 };
-const handleFunctionCallArgumentsDone = (rawEvent, state$1) => {
-	const events$1 = new Array();
+const handleFunctionCallArgumentsDone = (rawEvent, state) => {
+	const events = new Array();
 	const outputIndex = rawEvent.output_index;
-	const blockIndex = openFunctionCallBlock(state$1, {
+	const blockIndex = openFunctionCallBlock(state, {
 		outputIndex,
-		events: events$1
+		events
 	});
 	const finalArguments = typeof rawEvent.arguments === "string" ? rawEvent.arguments : void 0;
-	if (!state$1.blockHasDelta.has(blockIndex) && finalArguments) {
-		events$1.push({
+	if (!state.blockHasDelta.has(blockIndex) && finalArguments) {
+		events.push({
 			type: "content_block_delta",
 			index: blockIndex,
 			delta: {
@@ -3075,23 +3059,23 @@ const handleFunctionCallArgumentsDone = (rawEvent, state$1) => {
 				partial_json: finalArguments
 			}
 		});
-		state$1.blockHasDelta.add(blockIndex);
+		state.blockHasDelta.add(blockIndex);
 	}
-	state$1.functionCallStateByOutputIndex.delete(outputIndex);
-	return events$1;
+	state.functionCallStateByOutputIndex.delete(outputIndex);
+	return events;
 };
-const handleOutputTextDelta = (rawEvent, state$1) => {
-	const events$1 = new Array();
+const handleOutputTextDelta = (rawEvent, state) => {
+	const events = new Array();
 	const outputIndex = rawEvent.output_index;
 	const contentIndex = rawEvent.content_index;
 	const deltaText = rawEvent.delta;
-	if (!deltaText) return events$1;
-	const blockIndex = openTextBlockIfNeeded(state$1, {
+	if (!deltaText) return events;
+	const blockIndex = openTextBlockIfNeeded(state, {
 		outputIndex,
 		contentIndex,
-		events: events$1
+		events
 	});
-	events$1.push({
+	events.push({
 		type: "content_block_delta",
 		index: blockIndex,
 		delta: {
@@ -3099,15 +3083,15 @@ const handleOutputTextDelta = (rawEvent, state$1) => {
 			text: deltaText
 		}
 	});
-	state$1.blockHasDelta.add(blockIndex);
-	return events$1;
+	state.blockHasDelta.add(blockIndex);
+	return events;
 };
-const handleReasoningSummaryTextDelta = (rawEvent, state$1) => {
+const handleReasoningSummaryTextDelta = (rawEvent, state) => {
 	const outputIndex = rawEvent.output_index;
 	const deltaText = rawEvent.delta;
-	const events$1 = new Array();
-	const blockIndex = openThinkingBlockIfNeeded(state$1, outputIndex, events$1);
-	events$1.push({
+	const events = new Array();
+	const blockIndex = openThinkingBlockIfNeeded(state, outputIndex, events);
+	events.push({
 		type: "content_block_delta",
 		index: blockIndex,
 		delta: {
@@ -3115,15 +3099,15 @@ const handleReasoningSummaryTextDelta = (rawEvent, state$1) => {
 			thinking: deltaText
 		}
 	});
-	state$1.blockHasDelta.add(blockIndex);
-	return events$1;
+	state.blockHasDelta.add(blockIndex);
+	return events;
 };
-const handleReasoningSummaryTextDone = (rawEvent, state$1) => {
+const handleReasoningSummaryTextDone = (rawEvent, state) => {
 	const outputIndex = rawEvent.output_index;
 	const text = rawEvent.text;
-	const events$1 = new Array();
-	const blockIndex = openThinkingBlockIfNeeded(state$1, outputIndex, events$1);
-	if (text && !state$1.blockHasDelta.has(blockIndex)) events$1.push({
+	const events = new Array();
+	const blockIndex = openThinkingBlockIfNeeded(state, outputIndex, events);
+	if (text && !state.blockHasDelta.has(blockIndex)) events.push({
 		type: "content_block_delta",
 		index: blockIndex,
 		delta: {
@@ -3131,19 +3115,19 @@ const handleReasoningSummaryTextDone = (rawEvent, state$1) => {
 			thinking: text
 		}
 	});
-	return events$1;
+	return events;
 };
-const handleOutputTextDone = (rawEvent, state$1) => {
-	const events$1 = new Array();
+const handleOutputTextDone = (rawEvent, state) => {
+	const events = new Array();
 	const outputIndex = rawEvent.output_index;
 	const contentIndex = rawEvent.content_index;
 	const text = rawEvent.text;
-	const blockIndex = openTextBlockIfNeeded(state$1, {
+	const blockIndex = openTextBlockIfNeeded(state, {
 		outputIndex,
 		contentIndex,
-		events: events$1
+		events
 	});
-	if (text && !state$1.blockHasDelta.has(blockIndex)) events$1.push({
+	if (text && !state.blockHasDelta.has(blockIndex)) events.push({
 		type: "content_block_delta",
 		index: blockIndex,
 		delta: {
@@ -3151,14 +3135,14 @@ const handleOutputTextDone = (rawEvent, state$1) => {
 			text
 		}
 	});
-	return events$1;
+	return events;
 };
-const handleResponseCompleted = (rawEvent, state$1) => {
+const handleResponseCompleted = (rawEvent, state) => {
 	const response = rawEvent.response;
-	const events$1 = new Array();
-	closeAllOpenBlocks(state$1, events$1);
+	const events = new Array();
+	closeAllOpenBlocks(state, events);
 	const anthropic = translateResponsesResultToAnthropic(response);
-	events$1.push({
+	events.push({
 		type: "message_delta",
 		delta: {
 			stop_reason: anthropic.stop_reason,
@@ -3166,32 +3150,32 @@ const handleResponseCompleted = (rawEvent, state$1) => {
 		},
 		usage: anthropic.usage
 	}, { type: "message_stop" });
-	state$1.messageCompleted = true;
-	return events$1;
+	state.messageCompleted = true;
+	return events;
 };
-const handleResponseFailed = (rawEvent, state$1) => {
+const handleResponseFailed = (rawEvent, state) => {
 	const response = rawEvent.response;
-	const events$1 = new Array();
-	closeAllOpenBlocks(state$1, events$1);
+	const events = new Array();
+	closeAllOpenBlocks(state, events);
 	const message = response.error?.message ?? "The response failed due to an unknown error.";
-	events$1.push(buildErrorEvent(message));
-	state$1.messageCompleted = true;
-	return events$1;
+	events.push(buildErrorEvent(message));
+	state.messageCompleted = true;
+	return events;
 };
-const handleErrorEvent = (rawEvent, state$1) => {
+const handleErrorEvent = (rawEvent, state) => {
 	const message = typeof rawEvent.message === "string" ? rawEvent.message : "An unexpected error occurred during streaming.";
-	state$1.messageCompleted = true;
+	state.messageCompleted = true;
 	return [buildErrorEvent(message)];
 };
-const handleFunctionCallArgumentsValidationError = (error, state$1, events$1 = []) => {
+const handleFunctionCallArgumentsValidationError = (error, state, events = []) => {
 	const reason = error.message;
-	closeAllOpenBlocks(state$1, events$1);
-	state$1.messageCompleted = true;
-	events$1.push(buildErrorEvent(reason));
-	return events$1;
+	closeAllOpenBlocks(state, events);
+	state.messageCompleted = true;
+	events.push(buildErrorEvent(reason));
+	return events;
 };
-const messageStart = (state$1, response) => {
-	state$1.messageStartSent = true;
+const messageStart = (state, response) => {
+	state.messageStartSent = true;
 	const inputCachedTokens = response.usage?.input_tokens_details?.cached_tokens;
 	const inputTokens = (response.usage?.input_tokens ?? 0) - (inputCachedTokens ?? 0);
 	return [{
@@ -3212,18 +3196,18 @@ const messageStart = (state$1, response) => {
 		}
 	}];
 };
-const openTextBlockIfNeeded = (state$1, params) => {
-	const { outputIndex, contentIndex, events: events$1 } = params;
+const openTextBlockIfNeeded = (state, params) => {
+	const { outputIndex, contentIndex, events } = params;
 	const key = getBlockKey(outputIndex, contentIndex);
-	let blockIndex = state$1.blockIndexByKey.get(key);
+	let blockIndex = state.blockIndexByKey.get(key);
 	if (blockIndex === void 0) {
-		blockIndex = state$1.nextContentBlockIndex;
-		state$1.nextContentBlockIndex += 1;
-		state$1.blockIndexByKey.set(key, blockIndex);
+		blockIndex = state.nextContentBlockIndex;
+		state.nextContentBlockIndex += 1;
+		state.blockIndexByKey.set(key, blockIndex);
 	}
-	if (!state$1.openBlocks.has(blockIndex)) {
-		closeOpenBlocks(state$1, events$1);
-		events$1.push({
+	if (!state.openBlocks.has(blockIndex)) {
+		closeOpenBlocks(state, events);
+		events.push({
 			type: "content_block_start",
 			index: blockIndex,
 			content_block: {
@@ -3231,21 +3215,21 @@ const openTextBlockIfNeeded = (state$1, params) => {
 				text: ""
 			}
 		});
-		state$1.openBlocks.add(blockIndex);
+		state.openBlocks.add(blockIndex);
 	}
 	return blockIndex;
 };
-const openThinkingBlockIfNeeded = (state$1, outputIndex, events$1) => {
+const openThinkingBlockIfNeeded = (state, outputIndex, events) => {
 	const key = getBlockKey(outputIndex, 0);
-	let blockIndex = state$1.blockIndexByKey.get(key);
+	let blockIndex = state.blockIndexByKey.get(key);
 	if (blockIndex === void 0) {
-		blockIndex = state$1.nextContentBlockIndex;
-		state$1.nextContentBlockIndex += 1;
-		state$1.blockIndexByKey.set(key, blockIndex);
+		blockIndex = state.nextContentBlockIndex;
+		state.nextContentBlockIndex += 1;
+		state.blockIndexByKey.set(key, blockIndex);
 	}
-	if (!state$1.openBlocks.has(blockIndex)) {
-		closeOpenBlocks(state$1, events$1);
-		events$1.push({
+	if (!state.openBlocks.has(blockIndex)) {
+		closeOpenBlocks(state, events);
+		events.push({
 			type: "content_block_start",
 			index: blockIndex,
 			content_block: {
@@ -3253,25 +3237,25 @@ const openThinkingBlockIfNeeded = (state$1, outputIndex, events$1) => {
 				thinking: ""
 			}
 		});
-		state$1.openBlocks.add(blockIndex);
+		state.openBlocks.add(blockIndex);
 	}
 	return blockIndex;
 };
-const closeBlockIfOpen = (state$1, blockIndex, events$1) => {
-	if (!state$1.openBlocks.has(blockIndex)) return;
-	events$1.push({
+const closeBlockIfOpen = (state, blockIndex, events) => {
+	if (!state.openBlocks.has(blockIndex)) return;
+	events.push({
 		type: "content_block_stop",
 		index: blockIndex
 	});
-	state$1.openBlocks.delete(blockIndex);
-	state$1.blockHasDelta.delete(blockIndex);
+	state.openBlocks.delete(blockIndex);
+	state.blockHasDelta.delete(blockIndex);
 };
-const closeOpenBlocks = (state$1, events$1) => {
-	for (const blockIndex of state$1.openBlocks) closeBlockIfOpen(state$1, blockIndex, events$1);
+const closeOpenBlocks = (state, events) => {
+	for (const blockIndex of state.openBlocks) closeBlockIfOpen(state, blockIndex, events);
 };
-const closeAllOpenBlocks = (state$1, events$1) => {
-	closeOpenBlocks(state$1, events$1);
-	state$1.functionCallStateByOutputIndex.clear();
+const closeAllOpenBlocks = (state, events) => {
+	closeOpenBlocks(state, events);
+	state.functionCallStateByOutputIndex.clear();
 };
 const buildErrorEvent = (message) => ({
 	type: "error",
@@ -3281,25 +3265,24 @@ const buildErrorEvent = (message) => ({
 	}
 });
 const getBlockKey = (outputIndex, contentIndex) => `${outputIndex}:${contentIndex}`;
-const openFunctionCallBlock = (state$1, params) => {
-	const { outputIndex, toolCallId, name, events: events$1 } = params;
-	let functionCallState = state$1.functionCallStateByOutputIndex.get(outputIndex);
+const openFunctionCallBlock = (state, params) => {
+	const { outputIndex, toolCallId, name, events } = params;
+	let functionCallState = state.functionCallStateByOutputIndex.get(outputIndex);
 	if (!functionCallState) {
-		const blockIndex$1 = state$1.nextContentBlockIndex;
-		state$1.nextContentBlockIndex += 1;
-		const resolvedToolCallId = toolCallId ?? `tool_call_${blockIndex$1}`;
+		const blockIndex = state.nextContentBlockIndex;
+		state.nextContentBlockIndex += 1;
 		functionCallState = {
-			blockIndex: blockIndex$1,
-			toolCallId: resolvedToolCallId,
+			blockIndex,
+			toolCallId: toolCallId ?? `tool_call_${blockIndex}`,
 			name: name ?? "function",
 			consecutiveWhitespaceCount: 0
 		};
-		state$1.functionCallStateByOutputIndex.set(outputIndex, functionCallState);
+		state.functionCallStateByOutputIndex.set(outputIndex, functionCallState);
 	}
 	const { blockIndex } = functionCallState;
-	if (!state$1.openBlocks.has(blockIndex)) {
-		closeOpenBlocks(state$1, events$1);
-		events$1.push({
+	if (!state.openBlocks.has(blockIndex)) {
+		closeOpenBlocks(state, events);
+		events.push({
 			type: "content_block_start",
 			index: blockIndex,
 			content_block: {
@@ -3309,33 +3292,26 @@ const openFunctionCallBlock = (state$1, params) => {
 				input: {}
 			}
 		});
-		state$1.openBlocks.add(blockIndex);
+		state.openBlocks.add(blockIndex);
 	}
 	return blockIndex;
 };
 const extractFunctionCallDetails = (rawEvent) => {
 	const item = rawEvent.item;
 	if (item.type !== "function_call") return;
-	const outputIndex = rawEvent.output_index;
-	const toolCallId = item.call_id;
-	const name = item.name;
-	const initialArguments = item.arguments;
 	return {
-		outputIndex,
-		toolCallId,
-		name,
-		initialArguments
+		outputIndex: rawEvent.output_index,
+		toolCallId: item.call_id,
+		name: item.name,
+		initialArguments: item.arguments
 	};
 };
-
 //#endregion
 //#region src/routes/responses/utils.ts
 const getResponsesRequestOptions = (payload) => {
-	const vision = hasVisionInput(payload);
-	const initiator = hasAgentInitiator(payload) ? "agent" : "user";
 	return {
-		vision,
-		initiator
+		vision: hasVisionInput(payload),
+		initiator: hasAgentInitiator(payload) ? "agent" : "user"
 	};
 };
 const hasAgentInitiator = (payload) => {
@@ -3387,7 +3363,6 @@ const containsVisionContent = (value) => {
 	if (Array.isArray(record.content)) return record.content.some((entry) => containsVisionContent(entry));
 	return false;
 };
-
 //#endregion
 //#region src/services/copilot/create-messages.ts
 const INTERLEAVED_THINKING_BETA = "interleaved-thinking-2025-05-14";
@@ -3438,10 +3413,6 @@ const createMessages = async (payload, anthropicBetaHeader, options) => {
 	if (payload.stream) return events(response);
 	return await response.json();
 };
-
-//#endregion
-//#region src/routes/messages/preprocess.ts
-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.";
@@ -3454,7 +3425,7 @@ const getCompactCandidateText = (message) => {
 const isCompactMessage = (lastMessage) => {
 	const text = getCompactCandidateText(lastMessage);
 	if (!text) return false;
-	return text.includes(compactTextOnlyGuard) && text.includes(compactSummaryPromptStart) && compactMessageSections.some((section) => text.includes(section));
+	return text.includes("CRITICAL: Respond with TEXT ONLY. Do NOT call any tools.") && text.includes("Your task is to create a detailed summary of the conversation so far") && compactMessageSections.some((section) => text.includes(section));
 };
 const isCompactAutoContinueMessage = (lastMessage) => {
 	const text = getCompactCandidateText(lastMessage);
@@ -3462,12 +3433,12 @@ const isCompactAutoContinueMessage = (lastMessage) => {
 };
 const getCompactType = (anthropicPayload) => {
 	const lastMessage = anthropicPayload.messages.at(-1);
-	if (lastMessage && isCompactMessage(lastMessage)) return COMPACT_REQUEST;
-	if (lastMessage && isCompactAutoContinueMessage(lastMessage)) return COMPACT_AUTO_CONTINUE;
+	if (lastMessage && isCompactMessage(lastMessage)) return 1;
+	if (lastMessage && isCompactAutoContinueMessage(lastMessage)) return 2;
 	const system = anthropicPayload.system;
-	if (typeof system === "string") return compactSystemPromptStarts.some((promptStart) => system.startsWith(promptStart)) ? COMPACT_REQUEST : 0;
+	if (typeof system === "string") return compactSystemPromptStarts.some((promptStart) => system.startsWith(promptStart)) ? 1 : 0;
 	if (!Array.isArray(system)) return 0;
-	if (system.some((msg) => typeof msg.text === "string" && compactSystemPromptStarts.some((promptStart) => msg.text.startsWith(promptStart)))) return COMPACT_REQUEST;
+	if (system.some((msg) => typeof msg.text === "string" && compactSystemPromptStarts.some((promptStart) => msg.text.startsWith(promptStart)))) return 1;
 	return 0;
 };
 const mergeContentWithText = (tr, textBlock) => {
@@ -3519,8 +3490,7 @@ const mergeAttachmentsIntoToolResults = (toolResults, attachmentsByToolResultInd
 	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);
+		return mergeContentWithAttachments(block, [...matchedAttachments].sort((left, right) => left.order - right.order).map(({ attachment }) => attachment));
 	});
 };
 const assignAttachmentsToToolResults = (target, attachments, options) => {
@@ -3529,9 +3499,9 @@ const assignAttachmentsToToolResults = (target, attachments, options) => {
 	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]);
+			const currentAttachments = target.get(toolResultIndex);
+			if (currentAttachments) {
+				currentAttachments.push(attachments[index]);
 				continue;
 			}
 			target.set(toolResultIndex, [attachments[index]]);
@@ -3612,8 +3582,7 @@ const mergeUserMessageContent = (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);
+	return mergeAttachmentsForToolResults(textBlocks.length === 0 ? toolResults : mergeToolResult(toolResults, textBlocks), attachments);
 };
 const mergeToolResult = (toolResults, textBlocks) => {
 	if (toolResults.length === textBlocks.length) return toolResults.map((tr, i) => mergeContentWithText(tr, textBlocks[i]));
@@ -3624,7 +3593,7 @@ 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);
+		msg.content = msg.content.filter((block) => block.type !== "text" || block.text.trim() !== "Tool loaded.");
 	}
 };
 const mergeToolResultForClaude = (anthropicPayload, options) => {
@@ -3655,7 +3624,7 @@ const stripCacheControl = (payload) => {
 		const systemBlock = block;
 		const cacheControl = systemBlock.cache_control;
 		if (cacheControl && typeof cacheControl === "object") {
-			const { scope,...rest } = cacheControl;
+			const { scope, ...rest } = cacheControl;
 			systemBlock.cache_control = rest;
 		}
 	}
@@ -3683,14 +3652,13 @@ const prepareMessagesApiPayload = (payload, selectedModel) => {
 		payload.output_config = { effort };
 	}
 };
-
 //#endregion
 //#region src/routes/messages/api-flows.ts
 const COPILOT_CONTEXT_CACHE_SYSTEM_MARKER_LIMIT = 2;
 const COPILOT_CONTEXT_CACHE_NON_SYSTEM_MARKER_LIMIT = 2;
 const COPILOT_CONTEXT_CACHE_CONTROL = { type: "ephemeral" };
 const handleWithChatCompletions = async (c, anthropicPayload, options) => {
-	const { logger: logger$7, subagentMarker, requestId, sessionId, compactType } = options;
+	const { logger, subagentMarker, requestId, sessionId, compactType } = options;
 	const openAIPayload = translateToOpenAI(anthropicPayload);
 	prepareCopilotChatCompletionsPayload(openAIPayload);
 	const recordUsage = createCopilotUsageRecorder({
@@ -3699,7 +3667,7 @@ const handleWithChatCompletions = async (c, anthropicPayload, options) => {
 		model: openAIPayload.model,
 		payload: anthropicPayload
 	});
-	debugJson(logger$7, "Translated OpenAI request payload:", openAIPayload);
+	debugJson(logger, "Translated OpenAI request payload:", openAIPayload);
 	const response = await createChatCompletions(openAIPayload, {
 		subagentMarker,
 		requestId,
@@ -3707,13 +3675,13 @@ const handleWithChatCompletions = async (c, anthropicPayload, options) => {
 		compactType
 	});
 	if (isNonStreaming(response)) {
-		debugJson(logger$7, "Non-streaming response from Copilot:", response);
+		debugJson(logger, "Non-streaming response from Copilot:", response);
 		recordUsage(normalizeOpenAIUsage(response.usage));
 		const anthropicResponse = translateToAnthropic(response);
-		debugJson(logger$7, "Translated Anthropic response:", anthropicResponse);
+		debugJson(logger, "Translated Anthropic response:", anthropicResponse);
 		return c.json(anthropicResponse);
 	}
-	logger$7.debug("Streaming response from Copilot");
+	logger.debug("Streaming response from Copilot");
 	return streamSSE(c, async (stream) => {
 		let usage = {};
 		const streamState = {
@@ -3724,15 +3692,15 @@ const handleWithChatCompletions = async (c, anthropicPayload, options) => {
 			thinkingBlockOpen: false
 		};
 		for await (const rawEvent of response) {
-			debugJson(logger$7, "Copilot raw stream event:", rawEvent);
+			debugJson(logger, "Copilot raw stream event:", rawEvent);
 			if (rawEvent.data === "[DONE]") break;
 			if (!rawEvent.data) continue;
 			const chunk = JSON.parse(rawEvent.data);
 			if (chunk.usage) usage = normalizeOpenAIUsage(chunk.usage);
-			const events$1 = translateChunkToAnthropicEvents(chunk, streamState);
-			for (const event of events$1) {
+			const events = translateChunkToAnthropicEvents(chunk, streamState);
+			for (const event of events) {
 				const eventData = JSON.stringify(event);
-				debugLazy(logger$7, () => ["Translated Anthropic event:", eventData]);
+				debugLazy(logger, () => ["Translated Anthropic event:", eventData]);
 				await stream.writeSSE({
 					event: event.type,
 					data: eventData
@@ -3741,7 +3709,7 @@ const handleWithChatCompletions = async (c, anthropicPayload, options) => {
 		}
 		for (const event of flushPendingAnthropicStreamEvents(streamState)) {
 			const eventData = JSON.stringify(event);
-			debugLazy(logger$7, () => ["Translated Anthropic event:", eventData]);
+			debugLazy(logger, () => ["Translated Anthropic event:", eventData]);
 			await stream.writeSSE({
 				event: event.type,
 				data: eventData
@@ -3751,7 +3719,7 @@ const handleWithChatCompletions = async (c, anthropicPayload, options) => {
 	});
 };
 const handleWithResponsesApi = async (c, anthropicPayload, options) => {
-	const { logger: logger$7, selectedModel,...requestOptions } = options;
+	const { logger, selectedModel, ...requestOptions } = options;
 	const responsesPayload = translateAnthropicMessagesToResponsesPayload(anthropicPayload);
 	const recordUsage = createCopilotUsageRecorder({
 		endpoint: "responses",
@@ -3761,7 +3729,7 @@ const handleWithResponsesApi = async (c, anthropicPayload, options) => {
 	});
 	applyResponsesApiContextManagement(responsesPayload, selectedModel?.capabilities.limits.max_prompt_tokens);
 	compactInputByLatestCompaction(responsesPayload);
-	debugJson(logger$7, "Translated Responses payload:", responsesPayload);
+	debugJson(logger, "Translated Responses payload:", responsesPayload);
 	const { vision, initiator } = getResponsesRequestOptions(responsesPayload);
 	const response = await createResponses(responsesPayload, {
 		vision,
@@ -3769,7 +3737,7 @@ const handleWithResponsesApi = async (c, anthropicPayload, options) => {
 		...requestOptions
 	});
 	if (responsesPayload.stream && isAsyncIterable$1(response)) {
-		logger$7.debug("Streaming response from Copilot (Responses API)");
+		logger.debug("Streaming response from Copilot (Responses API)");
 		return streamSSE(c, async (stream) => {
 			const streamState = createResponsesStreamState();
 			let usage = {};
@@ -3783,25 +3751,25 @@ const handleWithResponsesApi = async (c, anthropicPayload, options) => {
 				}
 				const data = chunk.data;
 				if (!data) continue;
-				debugLazy(logger$7, () => ["Responses raw stream event:", data]);
+				debugLazy(logger, () => ["Responses raw stream event:", data]);
 				const responseEvent = JSON.parse(data);
 				if (responseEvent.type === "response.completed" || responseEvent.type === "response.failed" || responseEvent.type === "response.incomplete") usage = normalizeResponsesUsage(responseEvent.response.usage);
-				const events$1 = translateResponsesStreamEvent(responseEvent, streamState);
-				for (const event of events$1) {
+				const events = translateResponsesStreamEvent(responseEvent, streamState);
+				for (const event of events) {
 					const eventData = JSON.stringify(event);
-					debugLazy(logger$7, () => ["Translated Anthropic event:", eventData]);
+					debugLazy(logger, () => ["Translated Anthropic event:", eventData]);
 					await stream.writeSSE({
 						event: event.type,
 						data: eventData
 					});
 				}
 				if (streamState.messageCompleted) {
-					logger$7.debug("Message completed, ending stream");
+					logger.debug("Message completed, ending stream");
 					break;
 				}
 			}
 			if (!streamState.messageCompleted) {
-				logger$7.warn("Responses stream ended without completion; sending error event");
+				logger.warn("Responses stream ended without completion; sending error event");
 				const errorEvent = buildErrorEvent("Responses stream ended without completion");
 				await stream.writeSSE({
 					event: errorEvent.type,
@@ -3811,17 +3779,17 @@ const handleWithResponsesApi = async (c, anthropicPayload, options) => {
 			recordUsage(usage);
 		});
 	}
-	debugJsonTail(logger$7, "Non-streaming Responses result:", {
+	debugJsonTail(logger, "Non-streaming Responses result:", {
 		value: response,
 		tailLength: 400
 	});
 	const anthropicResponse = translateResponsesResultToAnthropic(response);
 	recordUsage(normalizeResponsesUsage(response.usage));
-	debugJson(logger$7, "Translated Anthropic response:", anthropicResponse);
+	debugJson(logger, "Translated Anthropic response:", anthropicResponse);
 	return c.json(anthropicResponse);
 };
 const handleWithMessagesApi = async (c, anthropicPayload, options) => {
-	const { logger: logger$7, anthropicBetaHeader, subagentMarker, selectedModel, requestId, sessionId, compactType } = options;
+	const { logger, anthropicBetaHeader, subagentMarker, selectedModel, requestId, sessionId, compactType } = options;
 	prepareMessagesApiPayload(anthropicPayload, selectedModel);
 	const recordUsage = createCopilotUsageRecorder({
 		endpoint: "messages",
@@ -3829,7 +3797,7 @@ const handleWithMessagesApi = async (c, anthropicPayload, options) => {
 		model: anthropicPayload.model,
 		payload: anthropicPayload
 	});
-	debugJson(logger$7, "Translated Messages payload:", anthropicPayload);
+	debugJson(logger, "Translated Messages payload:", anthropicPayload);
 	const response = await createMessages(anthropicPayload, anthropicBetaHeader, {
 		subagentMarker,
 		requestId,
@@ -3837,7 +3805,7 @@ const handleWithMessagesApi = async (c, anthropicPayload, options) => {
 		compactType
 	});
 	if (isAsyncIterable$1(response)) {
-		logger$7.debug("Streaming response from Copilot (Messages API)");
+		logger.debug("Streaming response from Copilot (Messages API)");
 		return streamSSE(c, async (stream) => {
 			let usage = {};
 			for await (const event of response) {
@@ -3845,7 +3813,7 @@ const handleWithMessagesApi = async (c, anthropicPayload, options) => {
 				const data = event.data ?? "";
 				if (data === "[DONE]") break;
 				if (!data) continue;
-				debugLazy(logger$7, () => ["Messages raw stream event:", data]);
+				debugLazy(logger, () => ["Messages raw stream event:", data]);
 				const parsedEvent = parseAnthropicStreamEvent(data);
 				if (parsedEvent?.type === "message_start") usage = mergeAnthropicUsage(usage, normalizeAnthropicUsage(parsedEvent.message.usage));
 				else if (parsedEvent?.type === "message_delta") usage = mergeAnthropicUsage(usage, normalizeAnthropicUsage(parsedEvent.usage));
@@ -3857,7 +3825,7 @@ const handleWithMessagesApi = async (c, anthropicPayload, options) => {
 			recordUsage(usage);
 		});
 	}
-	debugJsonTail(logger$7, "Non-streaming Messages result:", {
+	debugJsonTail(logger, "Non-streaming Messages result:", {
 		value: response,
 		tailLength: 400
 	});
@@ -3900,11 +3868,9 @@ const parseAnthropicStreamEvent = (data) => {
 		return null;
 	}
 };
-
 //#endregion
 //#region src/lib/subagent.ts
 const subagentMarkerPrefix = "__SUBAGENT_MARKER__";
-
 //#endregion
 //#region src/routes/messages/subagent-marker.ts
 const parseSubagentMarkerFromFirstUser = (payload) => {
@@ -3933,7 +3899,7 @@ const parseSubagentMarkerFromSystemReminder = (text) => {
 			searchFrom = reminderEnd + 18;
 			continue;
 		}
-		const markerJson = reminderContent.slice(markerIndex + subagentMarkerPrefix.length).trim();
+		const markerJson = reminderContent.slice(markerIndex + 19).trim();
 		try {
 			const parsed = JSON.parse(markerJson);
 			if (!parsed.session_id || !parsed.agent_id || !parsed.agent_type) {
@@ -3948,7 +3914,6 @@ const parseSubagentMarkerFromSystemReminder = (text) => {
 	}
 	return null;
 };
-
 //#endregion
 //#region src/routes/messages/handler.ts
 const logger$3 = createHandlerLogger("messages-handler");
@@ -3981,7 +3946,7 @@ async function handleCompletion(c) {
 	if (anthropicBeta && noTools && compactType === 0) anthropicPayload.model = getSmallModel();
 	if (compactType) logger$3.debug("Compact request type:", compactType);
 	stripToolReferenceTurnBoundary(anthropicPayload);
-	mergeToolResultForClaude(anthropicPayload, { skipLastMessage: compactType === COMPACT_REQUEST });
+	mergeToolResultForClaude(anthropicPayload, { skipLastMessage: compactType === 1 });
 	const requestId = generateRequestIdFromPayload(anthropicPayload, sessionId);
 	logger$3.debug("Generated request ID:", requestId);
 	if (state.manualApprove) await awaitApproval();
@@ -4021,7 +3986,6 @@ const shouldUseMessagesApi = (selectedModel) => {
 	if (!isMessagesApiEnabled()) return false;
 	return selectedModel?.supported_endpoints?.includes(MESSAGES_ENDPOINT) ?? false;
 };
-
 //#endregion
 //#region src/routes/messages/route.ts
 const messageRoutes = new Hono();
@@ -4039,7 +4003,6 @@ messageRoutes.post("/count_tokens", async (c) => {
 		return await forwardError(c, error);
 	}
 });
-
 //#endregion
 //#region src/routes/models/route.ts
 const modelRoutes = new Hono();
@@ -4068,7 +4031,6 @@ modelRoutes.get("/", async (c) => {
 		return await forwardError(c, error);
 	}
 });
-
 //#endregion
 //#region src/routes/provider/messages/route.ts
 const providerMessageRoutes = new Hono();
@@ -4086,7 +4048,6 @@ providerMessageRoutes.post("/count_tokens", async (c) => {
 		return await forwardError(c, error);
 	}
 });
-
 //#endregion
 //#region src/routes/provider/models/route.ts
 const logger$2 = createHandlerLogger("provider-models-handler");
@@ -4113,7 +4074,6 @@ providerModelRoutes.get("/", async (c) => {
 		return await forwardError(c, error);
 	}
 });
-
 //#endregion
 //#region src/routes/responses/stream-id-sync.ts
 const createStreamIdTracker = () => ({ outputItems: /* @__PURE__ */ new Map() });
@@ -4150,7 +4110,6 @@ const handleItemId = (parsed, tracker) => {
 	}
 	return JSON.stringify(parsed);
 };
-
 //#endregion
 //#region src/routes/responses/handler.ts
 const logger$1 = createHandlerLogger("responses-handler");
@@ -4269,7 +4228,6 @@ const removeUnsupportedTools = (payload) => {
 	});
 	if (dropped.length > 0) logger$1.debug("Removed unsupported tools:", dropped);
 };
-
 //#endregion
 //#region src/routes/responses/route.ts
 const responsesRoutes = new Hono();
@@ -4280,7 +4238,6 @@ responsesRoutes.post("/", async (c) => {
 		return await forwardError(c, error);
 	}
 });
-
 //#endregion
 //#region src/routes/token-usage/route.ts
 const tokenUsageRoute = new Hono();
@@ -4298,22 +4255,18 @@ function parsePositiveInt(value, fallback) {
 	return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
 }
 tokenUsageRoute.get("/", async (c) => {
-	const period = parsePeriod(c.req.query("period"));
-	const summary = await getTokenUsageSummary(period);
+	const summary = await getTokenUsageSummary(parsePeriod(c.req.query("period")));
 	return c.json(summary);
 });
 tokenUsageRoute.get("/events", async (c) => {
 	const period = parsePeriod(c.req.query("period"));
-	const page = parsePositiveInt(c.req.query("page"), 1);
-	const pageSize = parsePositiveInt(c.req.query("page_size"), DEFAULT_EVENTS_PAGE_SIZE);
 	const eventsPage = await getTokenUsageEventsPage({
-		page,
-		pageSize,
+		page: parsePositiveInt(c.req.query("page"), 1),
+		pageSize: parsePositiveInt(c.req.query("page_size"), DEFAULT_EVENTS_PAGE_SIZE),
 		period
 	});
 	return c.json(eventsPage);
 });
-
 //#endregion
 //#region src/routes/token/route.ts
 const tokenRoute = new Hono();
@@ -4328,7 +4281,6 @@ tokenRoute.get("/", (c) => {
 		}, 500);
 	}
 });
-
 //#endregion
 //#region src/routes/usage/route.ts
 const usageRoute = new Hono();
@@ -4341,7 +4293,6 @@ usageRoute.get("/", async (c) => {
 		return c.json({ error: "Failed to fetch Copilot usage" }, 500);
 	}
 });
-
 //#endregion
 //#region src/server.ts
 const server = new Hono();
@@ -4373,7 +4324,7 @@ server.route("/v1/responses", responsesRoutes);
 server.route("/v1/messages", messageRoutes);
 server.route("/:provider/v1/messages", providerMessageRoutes);
 server.route("/:provider/v1/models", providerModelRoutes);
-
 //#endregion
 export { server };
-//# sourceMappingURL=server-D4pg54e1.js.map
+
+//# sourceMappingURL=server-DkUKa2I6.js.map