@nick3/copilot-api 1.4.0 → 1.4.4

package/dist/{server-D3sySKxC.js → server-BKsjCvqp.js}

@@ -1,8 +1,8 @@
 import { PATHS } from "./paths-DoT4SZ8f.js";
 import { listAccountsFromRegistry } from "./accounts-registry-c7rs5Ed9.js";
-import { HTTPError, accountFromState, cacheModels, copilotBaseUrl, copilotHeaders, forwardError, generateRequestIdFromPayload, getCopilotUsage, getRootSessionId, getUUID, isNullish, parseUserIdMetadata, prepareForCompact, prepareInteractionHeaders, sleep, state } from "./utils-D8j9lvS0.js";
-import "./get-copilot-token-BA1FaCgQ.js";
-import { PROVIDER_TYPE_ANTHROPIC, accountsManager, getAliasTargetSet, getConfig, getExtraPromptForModel, getModelAliases, getModelAliasesInfo, getModelRefreshIntervalMs, getProviderConfig, getReasoningEffortForModel, getSmallModel, isForceAgentEnabled, isFreeModelLoadBalancingEnabled, isMessageStartInputTokensFallbackEnabled, isMessagesApiEnabled, isResponsesApiContextManagementModel, mergeConfigWithDefaults, shouldCompactUseSmallModel } from "./accounts-manager-BQCAoBZp.js";
+import { HTTPError, accountFromState, cacheModels, copilotBaseUrl, copilotHeaders, forwardError, generateRequestIdFromPayload, getCopilotUsage, getRootSessionId, getUUID, isNullish, parseUserIdMetadata, prepareForCompact, prepareInteractionHeaders, sleep, state } from "./utils-DkUv9TDj.js";
+import "./get-copilot-token-CbzXMTE5.js";
+import { PROVIDER_TYPE_ANTHROPIC, accountsManager, getAliasTargetSet, getAnthropicApiKey, getConfig, getExtraPromptForModel, getModelAliases, getModelAliasesInfo, getModelRefreshIntervalMs, getProviderConfig, getReasoningEffortForModel, getSmallModel, isForceAgentEnabled, isFreeModelLoadBalancingEnabled, isMessageStartInputTokensFallbackEnabled, isMessagesApiEnabled, isResponsesApiContextManagementModel, mergeConfigWithDefaults, shouldCompactUseSmallModel } from "./accounts-manager-BvbpPVp1.js";
 import consola from "consola";
 import fs, { readFile } from "node:fs/promises";
 import * as path$1 from "node:path";
@@ -765,6 +765,7 @@ const CONFIG_KEYS = new Set([
 	"smallModel",
 	"freeModelLoadBalancing",
 	"apiKey",
+	"anthropicApiKey",
 	"providers",
 	"responsesApiContextManagementModels",
 	"modelReasoningEfforts",
@@ -1125,6 +1126,7 @@ const CONFIG_PATCH_HANDLERS = {
 	smallModel: (next, value) => applyOptionalString(next, "smallModel", value),
 	freeModelLoadBalancing: (next, value) => applyOptionalBoolean(next, "freeModelLoadBalancing", value),
 	apiKey: (next, value) => applyOptionalString(next, "apiKey", value),
+	anthropicApiKey: (next, value) => applyOptionalString(next, "anthropicApiKey", value),
 	providers: applyProvidersConfig,
 	responsesApiContextManagementModels: applyResponsesApiContextManagementModels,
 	modelReasoningEfforts: applyReasoningEfforts,
@@ -3459,12 +3461,48 @@ function getAnthropicToolUseBlocks(toolCalls) {
 //#endregion
 //#region src/routes/messages/count-tokens-handler.ts
 /**
-* Handles token counting for Anthropic messages
+* Forwards token counting to Anthropic's real /v1/messages/count_tokens endpoint.
+* Returns the result on success, or null to fall through to estimation.
+*/
+async function countTokensViaAnthropic(c, payload) {
+	if (!payload.model.startsWith("claude")) return null;
+	const apiKey = getAnthropicApiKey();
+	if (!apiKey) return null;
+	const model = payload.model.replaceAll(".", "-");
+	const res = await fetch("https://api.anthropic.com/v1/messages/count_tokens", {
+		method: "POST",
+		headers: {
+			"content-type": "application/json",
+			"x-api-key": apiKey,
+			"anthropic-version": "2023-06-01",
+			"anthropic-beta": "token-counting-2024-11-01"
+		},
+		body: JSON.stringify({
+			...payload,
+			model
+		})
+	});
+	if (!res.ok) {
+		consola.warn("Anthropic count_tokens failed:", res.status, await res.text().catch(() => ""), "- falling back to estimation");
+		return null;
+	}
+	const result = await res.json();
+	consola.info("Token count (Anthropic API):", result.input_tokens);
+	return c.json(result);
+}
+/**
+* Handles token counting for Anthropic messages.
+*
+* When an Anthropic API key is available (via config or ANTHROPIC_API_KEY env var)
+* and the model is a Claude model, forwards to Anthropic's free /v1/messages/count_tokens
+* endpoint for accurate counts. Otherwise falls back to GPT tokenizer estimation.
 */
 async function handleCountTokens(c) {
 	try {
-		const anthropicBeta = c.req.header("anthropic-beta");
 		const anthropicPayload = await c.req.json();
+		const anthropicResult = await countTokensViaAnthropic(c, anthropicPayload);
+		if (anthropicResult) return anthropicResult;
+		const anthropicBeta = c.req.header("anthropic-beta");
 		const openAIPayload = translateToOpenAI(anthropicPayload);
 		const selectedModel = findEndpointModel(anthropicPayload.model);
 		anthropicPayload.model = selectedModel?.id ?? anthropicPayload.model;
@@ -5728,6 +5766,7 @@ async function handleProviderMessages(c) {
 					}
 					let data = chunk.data;
 					if (!data) continue;
+					if (chunk.data === "[DONE]") break;
 					try {
 						const parsed = JSON.parse(data);
 						if (parsed.type === "message_start") adjustInputTokens(providerConfig, parsed.message.usage);
@@ -6395,4 +6434,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 
 //#endregion
 export { server };
-//# sourceMappingURL=server-D3sySKxC.js.map
+//# sourceMappingURL=server-BKsjCvqp.js.map