@nick3/copilot-api 1.2.7 → 1.3.1

package/dist/main.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { HTTPError, PATHS, accountsManager, addAccountToRegistry, cacheMacMachineId, cacheVSCodeVersion, cacheVsCodeSessionId, ensurePaths, getCopilotUsage, getGitHubUser, getModelRefreshIntervalMs, getOauthAppConfig, getOauthUrls, isFreeModelLoadBalancingEnabled, listAccountsFromRegistry, loadAccountToken, mergeConfigWithDefaults, removeAccountFromRegistry, removeAccountToken, saveAccountToken, saveRegistry, sleep, state } from "./accounts-manager-iJwqQUkM.js";
+import { HTTPError, PATHS, accountsManager, addAccountToRegistry, cacheMacMachineId, cacheVSCodeVersion, cacheVsCodeSessionId, ensurePaths, getCopilotUsage, getGitHubUser, getModelRefreshIntervalMs, getOauthAppConfig, getOauthUrls, isFreeModelLoadBalancingEnabled, listAccountsFromRegistry, loadAccountToken, mergeConfigWithDefaults, removeAccountFromRegistry, removeAccountToken, saveAccountToken, saveRegistry, sleep, state } from "./accounts-manager-BeKvbv0T.js";
 import { defineCommand, runMain } from "citty";
 import consola from "consola";
 import fs from "node:fs/promises";
@@ -639,7 +639,7 @@ async function runServer(options) {
 		}
 	}
 	consola.box(`🌐 Admin UI: ${serverUrl}/admin`);
-	const { server } = await import("./server-BgJ8vqcw.js");
+	const { server } = await import("./server-D3A61KAx.js");
 	serve({
 		fetch: server.fetch,
 		port: options.port,

package/dist/{server-BgJ8vqcw.js → server-D3A61KAx.js}

@@ -1,4 +1,4 @@
-import { HTTPError, PATHS, accountFromState, accountsManager, copilotBaseUrl, copilotHeaders, forwardError, generateRequestIdFromPayload, getAliasTargetSet, getConfig, getCopilotUsage, getExtraPromptForModel, getModelAliases, getModelAliasesInfo, getModelRefreshIntervalMs, getProviderConfig, getReasoningEffortForModel, getRootSessionId, getSmallModel, getUUID, isForceAgentEnabled, isFreeModelLoadBalancingEnabled, isMessageStartInputTokensFallbackEnabled, isNullish, isResponsesApiContextManagementModel, listAccountsFromRegistry, mergeConfigWithDefaults, prepareInteractionHeaders, shouldCompactUseSmallModel, sleep, state } from "./accounts-manager-iJwqQUkM.js";
+import { HTTPError, PATHS, accountFromState, accountsManager, copilotBaseUrl, copilotHeaders, forwardError, generateRequestIdFromPayload, getAliasTargetSet, getConfig, getCopilotUsage, getExtraPromptForModel, getModelAliases, getModelAliasesInfo, getModelRefreshIntervalMs, getProviderConfig, getReasoningEffortForModel, getRootSessionId, getSmallModel, getUUID, isForceAgentEnabled, isFreeModelLoadBalancingEnabled, isMessageStartInputTokensFallbackEnabled, isNullish, isResponsesApiContextManagementModel, listAccountsFromRegistry, mergeConfigWithDefaults, prepareInteractionHeaders, shouldCompactUseSmallModel, sleep, state } from "./accounts-manager-BeKvbv0T.js";
 import consola from "consola";
 import fs, { readFile } from "node:fs/promises";
 import * as path$1 from "node:path";
@@ -3314,6 +3314,57 @@ async function runEmbeddingsWithAccount({ c, store, ctx, payload, clientModel, s
 	}
 }
 
+//#endregion
+//#region src/lib/models.ts
+const findEndpointModel = (sdkModelId) => {
+	const models = state.models?.data ?? [];
+	const exactMatch = models.find((m) => m.id === sdkModelId);
+	if (exactMatch) return exactMatch;
+	const normalized = _normalizeSdkModelId(sdkModelId);
+	if (!normalized) return;
+	const modelName = `claude-${normalized.family}-${normalized.version}`;
+	const model = models.find((m) => m.id === modelName);
+	if (model) return model;
+};
+/**
+* Normalizes an SDK model ID to extract the model family and version.
+* this method from github copilot extension
+* Examples:
+* - "claude-opus-4-5-20251101" -> { family: "opus", version: "4.5" }
+* - "claude-3-5-sonnet-20241022" -> { family: "sonnet", version: "3.5" }
+* - "claude-sonnet-4-20250514" -> { family: "sonnet", version: "4" }
+* - "claude-haiku-3-5-20250514" -> { family: "haiku", version: "3.5" }
+* - "claude-haiku-4.5" -> { family: "haiku", version: "4.5" }
+*/
+const _normalizeSdkModelId = (sdkModelId) => {
+	const withoutDate = sdkModelId.toLowerCase().replace(/-\d{8}$/, "");
+	const pattern1 = withoutDate.match(/^claude-(\w+)-(\d+)-(\d+)$/);
+	if (pattern1) return {
+		family: pattern1[1],
+		version: `${pattern1[2]}.${pattern1[3]}`
+	};
+	const pattern2 = withoutDate.match(/^claude-(\d+)-(\d+)-(\w+)$/);
+	if (pattern2) return {
+		family: pattern2[3],
+		version: `${pattern2[1]}.${pattern2[2]}`
+	};
+	const pattern3 = withoutDate.match(/^claude-(\w+)-(\d+)\.(\d+)$/);
+	if (pattern3) return {
+		family: pattern3[1],
+		version: `${pattern3[2]}.${pattern3[3]}`
+	};
+	const pattern4 = withoutDate.match(/^claude-(\w+)-(\d+)$/);
+	if (pattern4) return {
+		family: pattern4[1],
+		version: pattern4[2]
+	};
+	const pattern5 = withoutDate.match(/^claude-(\d+)-(\w+)$/);
+	if (pattern5) return {
+		family: pattern5[2],
+		version: pattern5[1]
+	};
+};
+
 //#endregion
 //#region src/routes/messages/utils.ts
 function mapOpenAIStopReasonToAnthropic(finishReason) {
@@ -3438,7 +3489,7 @@ const maybeBlockOriginalModelName = (context) => {
 //#region src/routes/messages/non-stream-translation.ts
 const THINKING_TEXT = "Thinking...";
 function translateToOpenAI(payload) {
-	const modelId = translateModelName(payload.model);
+	const modelId = payload.model;
 	const model = state.models?.data.find((m) => m.id === modelId);
 	const thinkingBudget = getThinkingBudget(payload, model);
 	return {
@@ -3459,56 +3510,27 @@ function getThinkingBudget(payload, model) {
 	const thinking = payload.thinking;
 	if (model && thinking) {
 		const maxThinkingBudget = Math.min(model.capabilities.supports.max_thinking_budget ?? 0, (model.capabilities.limits.max_output_tokens ?? 0) - 1);
-		if (maxThinkingBudget > 0 && thinking.budget_tokens !== void 0) {
+		thinking.budget_tokens ??= maxThinkingBudget;
+		if (maxThinkingBudget > 0) {
 			const budgetTokens = Math.min(thinking.budget_tokens, maxThinkingBudget);
 			return Math.max(budgetTokens, model.capabilities.supports.min_thinking_budget ?? 1024);
 		}
 	}
 }
-function translateModelName(model) {
-	if (model.startsWith("claude-sonnet-4-")) return model.replace(/^claude-sonnet-4-.*/, "claude-sonnet-4");
-	else if (model.startsWith("claude-opus-4-")) return model.replace(/^claude-opus-4-.*/, "claude-opus-4");
-	return model;
-}
-function translateAnthropicMessagesToOpenAI(payload, modelId, thinkingBudget) {
-	const systemMessages = handleSystemPrompt(payload.system, modelId, thinkingBudget);
+function translateAnthropicMessagesToOpenAI(payload, modelId, _thinkingBudget) {
+	const systemMessages = handleSystemPrompt(payload.system);
 	const otherMessages = payload.messages.flatMap((message) => message.role === "user" ? handleUserMessage(message) : handleAssistantMessage(message, modelId));
-	if (modelId.startsWith("claude") && thinkingBudget) {
-		const reminder = "<system-reminder>you MUST follow interleaved_thinking_protocol</system-reminder>";
-		const firstUserIndex = otherMessages.findIndex((m) => m.role === "user");
-		if (firstUserIndex !== -1) {
-			const userMessage = otherMessages[firstUserIndex];
-			if (typeof userMessage.content === "string") userMessage.content = reminder + "\n\n" + userMessage.content;
-			else if (Array.isArray(userMessage.content)) userMessage.content = [{
-				type: "text",
-				text: reminder
-			}, ...userMessage.content];
-		}
-	}
 	return [...systemMessages, ...otherMessages];
 }
-function handleSystemPrompt(system, modelId, thinkingBudget) {
+function handleSystemPrompt(system) {
 	if (!system) return [];
-	let extraPrompt = "";
-	if (modelId.startsWith("claude") && thinkingBudget) extraPrompt = `
-<interleaved_thinking_protocol>
-ABSOLUTE REQUIREMENT - NON-NEGOTIABLE:
-The current thinking_mode is interleaved, Whenever you have the result of a function call, think carefully , MUST output a thinking block
-RULES:
-Tool result → thinking block (ALWAYS, no exceptions)
-This is NOT optional - it is a hard requirement
-The thinking block must contain substantive reasoning (minimum 3-5 sentences)
-Think about: what the results mean, what to do next, how to answer the user
-NEVER skip this step, even if the result seems simple or obvious
-</interleaved_thinking_protocol>`;
 	if (typeof system === "string") return [{
 		role: "system",
-		content: system + extraPrompt
+		content: system
 	}];
 	else return [{
 		role: "system",
-		content: system.map((block, index) => {
-			if (index === 0) return block.text + extraPrompt;
+		content: system.map((block) => {
 			return block.text;
 		}).join("\n\n")
 	}];
@@ -3680,7 +3702,8 @@ async function handleCountTokens(c) {
 		const anthropicBeta = c.req.header("anthropic-beta");
 		const anthropicPayload = await c.req.json();
 		const openAIPayload = translateToOpenAI(anthropicPayload);
-		const selectedModel = state.models?.data.find((model) => model.id === anthropicPayload.model);
+		const selectedModel = findEndpointModel(anthropicPayload.model);
+		anthropicPayload.model = selectedModel?.id ?? anthropicPayload.model;
 		if (!selectedModel) {
 			consola.warn("Model not found, returning default token count");
 			return c.json({ input_tokens: 1 });
@@ -4618,17 +4641,19 @@ async function handleCompletion(c) {
 	if (blockedResponse) return blockedResponse;
 	const openAIPayload = translateToOpenAI(anthropicPayload);
 	const fallbackInitiator = initiatorOverride ?? getChatInitiator(openAIPayload.messages);
+	const endpointModel = findEndpointModel(clientModel);
+	const resolvedClientModel = endpointModel?.id ?? clientModel;
 	const selection = await accountsManager.selectAccountForRequest([
 		{
-			modelId: clientModel,
+			modelId: resolvedClientModel,
 			endpoint: MESSAGES_ENDPOINT
 		},
 		{
-			modelId: clientModel,
+			modelId: resolvedClientModel,
 			endpoint: RESPONSES_ENDPOINT$1
 		},
 		{
-			modelId: openAIPayload.model,
+			modelId: endpointModel?.id ?? openAIPayload.model,
 			endpoint: CHAT_COMPLETIONS_ENDPOINT
 		}
 	]);
@@ -5396,6 +5421,18 @@ const FORWARDABLE_HEADERS = [
 	"accept",
 	"user-agent"
 ];
+const STRIPPED_RESPONSE_HEADERS = [
+	"connection",
+	"content-encoding",
+	"content-length",
+	"keep-alive",
+	"proxy-authenticate",
+	"proxy-authorization",
+	"te",
+	"trailer",
+	"transfer-encoding",
+	"upgrade"
+];
 function buildProviderUpstreamHeaders(providerConfig, requestHeaders) {
 	const headers = {
 		"content-type": "application/json",
@@ -5408,6 +5445,15 @@ function buildProviderUpstreamHeaders(providerConfig, requestHeaders) {
 	}
 	return headers;
 }
+function createProviderProxyResponse(upstreamResponse) {
+	const headers = new Headers(upstreamResponse.headers);
+	for (const headerName of STRIPPED_RESPONSE_HEADERS) headers.delete(headerName);
+	return new Response(upstreamResponse.body, {
+		headers,
+		status: upstreamResponse.status,
+		statusText: upstreamResponse.statusText
+	});
+}
 async function forwardProviderMessages(providerConfig, payload, requestHeaders) {
 	return await fetch(`${providerConfig.baseUrl}/v1/messages`, {
 		method: "POST",
@@ -5434,9 +5480,10 @@ async function handleProviderMessages(c) {
 	} }, 404);
 	try {
 		const payload = await c.req.json();
-		payload.temperature ??= providerConfig.defaultTemperature;
-		payload.top_p ??= providerConfig.defaultTopP;
-		payload.top_k ??= providerConfig.defaultTopK;
+		const modelConfig = providerConfig.models?.[payload.model];
+		payload.temperature ??= modelConfig?.temperature;
+		payload.top_p ??= modelConfig?.topP;
+		payload.top_k ??= modelConfig?.topK;
 		logger$3.debug("provider.messages.request", JSON.stringify({
 			payload,
 			provider
@@ -5457,7 +5504,7 @@ async function handleProviderMessages(c) {
 				}
 			});
 		}
-		return upstreamResponse;
+		return createProviderProxyResponse(upstreamResponse);
 	} catch (error) {
 		logger$3.error("provider.messages.error", {
 			provider,
@@ -5502,7 +5549,7 @@ providerModelRoutes.get("/", async (c) => {
 			provider,
 			statusCode: upstreamResponse.status
 		});
-		return upstreamResponse;
+		return createProviderProxyResponse(upstreamResponse);
 	} catch (error) {
 		logger$2.error("provider.models.error", {
 			provider,
@@ -6097,4 +6144,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 
 //#endregion
 export { server };
-//# sourceMappingURL=server-BgJ8vqcw.js.map
+//# sourceMappingURL=server-D3A61KAx.js.map