@nick3/copilot-api 1.10.7 → 1.10.9

package/dist/{server-DmDAepfa.js → server-GxNB5Syq.js}

@@ -3,7 +3,7 @@ import { a as getAccountClientIdentityByLoginAndApp, b as getCurrentIdentityEnvi
 import { r as ensurePaths, t as PATHS } from "./paths-CclKwouX.js";
 import { i as getRequestOutboundStore, r as getRedactedHeaderKeys } from "./request-outbound-Pu1kp2x8.js";
 import { a as isDeferredToolName, c as parseMcpToolSearchSentinel, i as isBridgeToolSearchName, l as selectDeferredToolsByNames, o as listDeferredToolNames, r as formatToolSearchBridgeArguments, s as normalizeToolSearchBridgeArguments, t as BRIDGE_TOOL_SEARCH_NAME, u as shouldEnableResponsesToolSearch } from "./tool-search-BrN7M0Dd.js";
-import { A as getModelRefreshIntervalMs, B as isResponsesApiWebSocketEnabled, C as getAnthropicApiKey, D as getLogLevel, E as getExtraPromptForModel, F as isForceAgentEnabled, H as resolveModelAlias, I as isMessageStartInputTokensFallbackEnabled, L as isMessagesApiEnabled, M as getReasoningEffortForModel, N as getSmallModel, O as getModelAliases, P as isAccountAffinityEnabled, R as isResponsesApiContextManagementModel, S as getAliasTargetSet, T as getConfig, U as shouldCompactUseSmallModel, V as mergeConfigWithDefaults, _ as toLocalDateString, b as isDevModeEnabled, c as applySharedSessionAffinityRetention, d as getClientIpInfo, f as getRequestHistoryStore, g as normalizeMessagesUsage, h as normalizeEmbeddingsUsage, j as getProviderConfig, k as getModelAliasesInfo, l as extractResponsesUsageFromResult, m as normalizeChatCompletionsUsage, o as updateQuotaRefreshSchedulerFromConfig, p as getStatsStore, s as accountsManager, t as getProxyEnvDispatcher, u as extractResponsesUsageFromStreamEvent, v as copilotFetch, w as getClaudeTokenMultiplier, x as PROVIDER_TYPE_ANTHROPIC, y as flushPendingCapture, z as isResponsesApiWebSearchEnabled } from "./proxy-YVh74m0I.js";
+import { A as getModelRefreshIntervalMs, B as isResponsesApiWebSocketEnabled, C as getAnthropicApiKey, D as getLogLevel, E as getExtraPromptForModel, F as isForceAgentEnabled, H as resolveModelAlias, I as isMessageStartInputTokensFallbackEnabled, L as isMessagesApiEnabled, M as getReasoningEffortForModel, N as getSmallModel, O as getModelAliases, P as isAccountAffinityEnabled, R as isResponsesApiContextManagementModel, S as getAliasTargetSet, T as getConfig, U as shouldCompactUseSmallModel, V as mergeConfigWithDefaults, _ as toLocalDateString, b as isDevModeEnabled, c as applySharedSessionAffinityRetention, d as getClientIpInfo, f as getRequestHistoryStore, g as normalizeMessagesUsage, h as normalizeEmbeddingsUsage, j as getProviderConfig, k as getModelAliasesInfo, l as extractResponsesUsageFromResult, m as normalizeChatCompletionsUsage, o as updateQuotaRefreshSchedulerFromConfig, p as getStatsStore, s as accountsManager, t as getProxyEnvDispatcher, u as extractResponsesUsageFromStreamEvent, v as copilotFetch, w as getClaudeTokenMultiplier, x as PROVIDER_TYPE_ANTHROPIC, y as flushPendingCapture, z as isResponsesApiWebSearchEnabled } from "./proxy-_U-hgwIn.js";
 import consola from "consola";
 import fs, { readFile } from "node:fs/promises";
 import { createHash, randomUUID, timingSafeEqual } from "node:crypto";
@@ -748,7 +748,7 @@ const mergeContentWithText = (tr, textBlock) => {
 	if (hasToolRef(tr)) return tr;
 	return {
 		...tr,
-		content: [...tr.content, textBlock]
+		content: [...tr.content, stripContentBlockCacheControl(textBlock)]
 	};
 };
 const mergeContentWithTexts = (tr, textBlocks) => {
@@ -762,22 +762,29 @@ const mergeContentWithTexts = (tr, textBlocks) => {
 	if (hasToolRef(tr)) return tr;
 	return {
 		...tr,
-		content: [...tr.content, ...textBlocks]
+		content: [...tr.content, ...textBlocks.map(stripContentBlockCacheControl)]
 	};
 };
 const mergeContentWithAttachments = (tr, attachments) => {
+	const cleanAttachments = attachments.map(stripContentBlockCacheControl);
 	if (typeof tr.content === "string") return {
 		...tr,
 		content: [{
 			type: "text",
 			text: tr.content
-		}, ...attachments]
+		}, ...cleanAttachments]
 	};
 	return {
 		...tr,
-		content: [...tr.content, ...attachments]
+		content: [...tr.content, ...cleanAttachments]
 	};
 };
+const stripContentBlockCacheControl = (block) => {
+	if (!Object.hasOwn(block, "cache_control")) return block;
+	const copy = { ...block };
+	delete copy.cache_control;
+	return copy;
+};
 const isAttachmentBlock = (block) => {
 	return block.type === "image" || block.type === "document";
 };
@@ -1769,7 +1776,6 @@ const CONFIG_KEYS = new Set([
 	"modelReasoningEfforts",
 	"modelAliases",
 	"allowOriginalModelNamesForAliases",
-	"useFunctionApplyPatch",
 	"forceAgent",
 	"compactUseSmallModel",
 	"messageStartInputTokensFallback",
@@ -2261,7 +2267,6 @@ const CONFIG_PATCH_HANDLERS = {
 	modelReasoningEfforts: applyReasoningEfforts,
 	modelAliases: applyModelAliases,
 	allowOriginalModelNamesForAliases: (next, value) => applyOptionalBoolean(next, "allowOriginalModelNamesForAliases", value),
-	useFunctionApplyPatch: (next, value) => applyOptionalBoolean(next, "useFunctionApplyPatch", value),
 	forceAgent: (next, value) => applyOptionalBoolean(next, "forceAgent", value),
 	compactUseSmallModel: (next, value) => applyOptionalBoolean(next, "compactUseSmallModel", value),
 	messageStartInputTokensFallback: (next, value) => applyOptionalBoolean(next, "messageStartInputTokensFallback", value),
@@ -6157,6 +6162,25 @@ const applyModelDefaults = (payload, modelConfig) => {
 const applyMissingExtraBody = (payload, options) => {
 	for (const [key, value] of Object.entries(options.extraBody ?? {})) if (!Object.hasOwn(payload, key)) payload[key] = value;
 };
+const getRequestThinkingBudget = (payload) => {
+	const budget = payload.thinking?.budget_tokens;
+	if (typeof budget !== "number" || !Number.isFinite(budget)) return;
+	return budget;
+};
+const applyOpenAICompatibleThinkingBudget = (payload, source) => {
+	const thinkingBudget = getRequestThinkingBudget(source);
+	if (thinkingBudget !== void 0) {
+		payload.thinking_budget = thinkingBudget;
+		return;
+	}
+	if (payload.thinking_budget === void 0) delete payload.thinking_budget;
+};
+const applyOpenAICompatibleExtraBodyThinkingBudget = (payload, options) => {
+	const { extraBody } = options;
+	if (!extraBody || !Object.hasOwn(extraBody, "thinking_budget")) return;
+	const rawPayload = payload;
+	rawPayload.thinking_budget = extraBody.thinking_budget;
+};
 const handleOpenAICompatibleProviderMessages = async (c, options) => {
 	const { instrumentation, modelConfig, payload, provider, providerConfig } = options;
 	const openAIPayload = createOpenAICompatiblePayload(payload, modelConfig);
@@ -6189,6 +6213,7 @@ const createOpenAICompatiblePayload = (payload, modelConfig) => {
 		supportPdf: modelConfig?.supportPdf,
 		toolContentSupportType: modelConfig?.toolContentSupportType ?? []
 	});
+	applyOpenAICompatibleThinkingBudget(openAIPayload, payload);
 	if (payload.top_k !== void 0) openAIPayload.top_k = payload.top_k;
 	if (openAIPayload.stream) openAIPayload.stream_options = { include_usage: true };
 	normalizeOpenAICompatibleReasoningContent(openAIPayload);
@@ -6197,6 +6222,7 @@ const createOpenAICompatiblePayload = (payload, modelConfig) => {
 		source: payload
 	});
 	applyMissingExtraBody(openAIPayload, { extraBody: modelConfig?.extraBody });
+	applyOpenAICompatibleExtraBodyThinkingBudget(openAIPayload, { extraBody: modelConfig?.extraBody });
 	if (!Object.hasOwn(openAIPayload, "parallel_tool_calls")) openAIPayload.parallel_tool_calls = true;
 	if (modelConfig?.contextCache !== false) applyOpenAICompatibleContextCache(openAIPayload);
 	return openAIPayload;
@@ -6997,29 +7023,6 @@ const getPayloadItems = (payload) => {
 	if (Array.isArray(input)) result.push(...input);
 	return result;
 };
-const useFunctionApplyPatch = (payload) => {
-	if (!(getConfig().useFunctionApplyPatch ?? true)) return;
-	if (Array.isArray(payload.tools)) {
-		const toolsArr = payload.tools;
-		for (let i = 0; i < toolsArr.length; i++) {
-			const t = toolsArr[i];
-			if (t.type === "custom" && t.name === "apply_patch") toolsArr[i] = {
-				type: "function",
-				name: t.name,
-				description: "Use the `apply_patch` tool to edit files",
-				parameters: {
-					type: "object",
-					properties: { input: {
-						type: "string",
-						description: "The entire contents of the apply_patch command"
-					} },
-					required: ["input"]
-				},
-				strict: false
-			};
-		}
-	}
-};
 const removeWebSearchTool = (payload) => {
 	if (!Array.isArray(payload.tools) || payload.tools.length === 0) return;
 	payload.tools = payload.tools.filter((t) => {
@@ -7388,6 +7391,8 @@ async function handleCompletion(c) {
 	const upstreamRequestId = generateRequestIdFromPayload(anthropicPayload, sessionId);
 	logger$3.debug("Generated request ID:", upstreamRequestId);
 	const clientModel = anthropicPayload.model;
+	anthropicPayload.model = resolveModelAlias(anthropicPayload.model);
+	const routingModel = anthropicPayload.model;
 	const streamRequested = Boolean(anthropicPayload.stream);
 	const rawUserId = anthropicPayload.metadata?.user_id;
 	const userId = typeof rawUserId === "string" ? rawUserId : void 0;
@@ -7419,9 +7424,9 @@ async function handleCompletion(c) {
 		selectionReason: invalidSubagentMarkerSelectionReason
 	});
 	if (blockedResponse) return blockedResponse;
-	const endpointModel = findEndpointModel(clientModel);
-	const resolvedClientModel = endpointModel?.id ?? clientModel;
-	const affinityModelId = clientModel !== originalRequestModel ? findEndpointModel(originalRequestModel)?.id ?? originalRequestModel : void 0;
+	const endpointModel = findEndpointModel(routingModel);
+	const resolvedClientModel = endpointModel?.id ?? routingModel;
+	const affinityModelId = routingModel !== originalRequestModel ? findEndpointModel(originalRequestModel)?.id ?? originalRequestModel : void 0;
 	const useMessagesApi = isMessagesApiEnabled();
 	const candidates = [];
 	if (useMessagesApi) candidates.push({
@@ -8419,7 +8424,6 @@ const handleResponses = async (c) => {
 		...payload,
 		model: selectedModel.id
 	};
-	useFunctionApplyPatch(upstreamPayload);
 	removeUnsupportedTools(upstreamPayload);
 	applyResponsesApiContextManagement(upstreamPayload, selectedModel.capabilities.limits.max_prompt_tokens);
 	compactInputByLatestCompaction(upstreamPayload);
@@ -8927,4 +8931,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 //#endregion
 export { server };
 
-//# sourceMappingURL=server-DmDAepfa.js.map
+//# sourceMappingURL=server-GxNB5Syq.js.map