@nick3/copilot-api 1.3.5 → 1.3.8

package/dist/{server-CM_0PrbK.js → server-COWbIpDR.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, prepareInteractionHeaders, sleep, state } from "./utils-BUJfM1V2.js";
-import "./get-copilot-token-BwP_PxV5.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-DjGzZIcp.js";
+import { HTTPError, accountFromState, cacheModels, copilotBaseUrl, copilotHeaders, forwardError, generateRequestIdFromPayload, getCopilotUsage, getRootSessionId, getUUID, isNullish, prepareForCompact, prepareInteractionHeaders, sleep, state } from "./utils-BaoXuYkx.js";
+import "./get-copilot-token-CUT8hpgX.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-BGBtDChT.js";
 import consola from "consola";
 import fs, { readFile } from "node:fs/promises";
 import * as path$1 from "node:path";
@@ -12,6 +12,7 @@ import { Hono } from "hono";
 import { cors } from "hono/cors";
 import { logger } from "hono/logger";
 import fs$1, { existsSync } from "node:fs";
+import { AsyncLocalStorage } from "node:async_hooks";
 import { Database } from "bun:sqlite";
 import { fileURLToPath } from "node:url";
 import { streamSSE } from "hono/streaming";
@@ -104,6 +105,40 @@ function createAuthMiddleware(options = {}) {
 	};
 }
 
+//#endregion
+//#region src/lib/request-context.ts
+const TRACE_ID_MAX_LENGTH = 64;
+const TRACE_ID_PATTERN = /^\w[\w.-]*$/;
+const asyncLocalStorage = new AsyncLocalStorage();
+const requestContext = {
+	getStore: () => asyncLocalStorage.getStore(),
+	run: (context, callback) => asyncLocalStorage.run(context, callback)
+};
+function generateTraceId() {
+	const timestamp = Date.now().toString(36);
+	const random = Math.random().toString(36).slice(2, 8);
+	return `${timestamp}-${random}`;
+}
+function resolveTraceId(traceId) {
+	const candidate = traceId?.trim();
+	if (!candidate || candidate.length > TRACE_ID_MAX_LENGTH || !TRACE_ID_PATTERN.test(candidate)) return generateTraceId();
+	return candidate;
+}
+
+//#endregion
+//#region src/lib/trace.ts
+const traceIdMiddleware = async (c, next) => {
+	const traceId = resolveTraceId(c.req.header("x-trace-id"));
+	c.header("x-trace-id", traceId);
+	const context = {
+		traceId,
+		startTime: Date.now()
+	};
+	await requestContext.run(context, async () => {
+		await next();
+	});
+};
+
 //#endregion
 //#region src/lib/admin-db.ts
 const DEFAULT_DB_PATH = path.join(PATHS.APP_DIR, "admin.sqlite");
@@ -2148,12 +2183,14 @@ const createHandlerLogger = (name) => {
 			cleanupOldLogs();
 			lastCleanup = Date.now();
 		}
+		const traceId = requestContext.getStore()?.traceId;
 		const date = logObj.date;
 		const dateKey = date.toLocaleDateString("sv-SE");
 		const timestamp = date.toLocaleString("sv-SE", { hour12: false });
 		const filePath = path.join(LOG_DIR, `${sanitizedName}-${dateKey}.log`);
 		const message = formatArgs(logObj.args);
-		const line = `[${timestamp}] [${logObj.type}] [${logObj.tag || name}]${message ? ` ${message}` : ""}`;
+		const traceIdStr = traceId ? ` [${traceId}]` : "";
+		const line = `[${timestamp}] [${logObj.type}] [${logObj.tag || name}]${traceIdStr}${message ? ` ${message}` : ""}`;
 		appendLine(filePath, line);
 	} });
 	return instance;
@@ -2403,7 +2440,7 @@ const getTokenCount = async (payload, model) => {
 
 //#endregion
 //#region src/services/copilot/create-responses.ts
-const createResponses = async (payload, { vision, initiator, upstreamRequestId, subagentMarker, sessionId }, account) => {
+const createResponses = async (payload, { vision, initiator, upstreamRequestId, subagentMarker, sessionId, isCompact }, account) => {
 	const ctx = account ?? accountFromState();
 	if (!ctx.copilotToken) throw new Error("Copilot token not found");
 	const headers = {
@@ -2411,6 +2448,7 @@ const createResponses = async (payload, { vision, initiator, upstreamRequestId,
 		"x-initiator": initiator
 	};
 	prepareInteractionHeaders(sessionId, Boolean(subagentMarker), headers);
+	prepareForCompact(headers, isCompact);
 	payload.service_tier = null;
 	const response = await fetch(`${copilotBaseUrl(ctx)}/responses`, {
 		method: "POST",
@@ -2892,6 +2930,7 @@ const createChatCompletions = async (payload, account, options) => {
 	};
 	prepareInteractionHeaders(options?.sessionId, Boolean(options?.subagentMarker), headers);
 	const upstreamPayload = applyDefaultReasoningEffort(payload);
+	prepareForCompact(headers, options?.isCompact);
 	const response = await fetch(`${copilotBaseUrl(ctx)}/chat/completions`, {
 		method: "POST",
 		headers,
@@ -4441,6 +4480,7 @@ const createMessages = async (payload, account, options) => {
 		"x-initiator": options?.subagentMarker ? "agent" : initiator
 	};
 	prepareInteractionHeaders(options?.sessionId, Boolean(options?.subagentMarker), headers);
+	prepareForCompact(headers, options?.isCompact);
 	const anthropicBeta = buildAnthropicBetaHeader(options?.anthropicBetaHeader, payload.thinking);
 	if (anthropicBeta) headers["anthropic-beta"] = anthropicBeta;
 	const response = await fetch(`${copilotBaseUrl(ctx)}/v1/messages`, {
@@ -4887,7 +4927,8 @@ async function handleCompletion(c) {
 		subagentMarker,
 		sessionId,
 		instr,
-		selectedModel
+		selectedModel,
+		isCompact
 	});
 	if (endpoint === RESPONSES_ENDPOINT$1) return await handleWithResponsesApi({
 		c,
@@ -4897,7 +4938,8 @@ async function handleCompletion(c) {
 		subagentMarker,
 		sessionId,
 		selectedModel,
-		instr
+		instr,
+		isCompact
 	});
 	return await handleWithChatCompletions({
 		c,
@@ -4906,11 +4948,12 @@ async function handleCompletion(c) {
 		subagentMarker,
 		sessionId,
 		selectedModel,
-		instr
+		instr,
+		isCompact
 	});
 }
 const handleWithChatCompletions = async (params) => {
-	const { c, openAIPayload, initiatorOverride, subagentMarker, sessionId, selectedModel, instr } = params;
+	const { c, openAIPayload, initiatorOverride, subagentMarker, sessionId, selectedModel, instr, isCompact } = params;
 	logger$5.debug("Translated OpenAI request payload:", JSON.stringify(openAIPayload));
 	const ctx = toAccountContext(instr.account);
 	const initiator = initiatorOverride ?? getChatInitiator(openAIPayload.messages);
@@ -4921,7 +4964,8 @@ const handleWithChatCompletions = async (params) => {
 			upstreamRequestId: instr.upstreamRequestId,
 			initiator,
 			subagentMarker,
-			sessionId
+			sessionId,
+			isCompact
 		});
 	} catch (error) {
 		return await handleChatCompletionsCreateError({
@@ -4952,7 +4996,7 @@ const handleWithChatCompletions = async (params) => {
 	}));
 };
 const handleWithResponsesApi = async (params) => {
-	const { c, anthropicPayload, openAIPayload, initiatorOverride, subagentMarker, sessionId, selectedModel, instr } = params;
+	const { c, anthropicPayload, openAIPayload, initiatorOverride, subagentMarker, sessionId, selectedModel, instr, isCompact } = params;
 	const responsesPayload = translateAnthropicMessagesToResponsesPayload(anthropicPayload, selectedModel.id);
 	applyResponsesApiContextManagement(responsesPayload, selectedModel.capabilities.limits.max_prompt_tokens);
 	compactInputByLatestCompaction(responsesPayload);
@@ -4968,7 +5012,8 @@ const handleWithResponsesApi = async (params) => {
 			initiator: resolvedInitiator,
 			upstreamRequestId: instr.upstreamRequestId,
 			subagentMarker,
-			sessionId
+			sessionId,
+			isCompact
 		}, ctx);
 	} catch (error) {
 		return await handleResponsesCreateError({
@@ -5419,7 +5464,7 @@ async function streamMessagesAndLog(params) {
 	}
 }
 const handleWithMessagesApi = async (params) => {
-	const { c, anthropicPayload, anthropicBetaHeader, initiatorOverride, subagentMarker, sessionId, instr, selectedModel } = params;
+	const { c, anthropicPayload, anthropicBetaHeader, initiatorOverride, subagentMarker, sessionId, instr, selectedModel, isCompact } = params;
 	for (const msg of anthropicPayload.messages) if (msg.role === "assistant" && Array.isArray(msg.content)) msg.content = msg.content.filter((block) => {
 		if (block.type !== "thinking") return true;
 		return block.thinking && block.thinking !== "Thinking..." && block.signature && !block.signature.includes("@");
@@ -5443,7 +5488,8 @@ const handleWithMessagesApi = async (params) => {
 			upstreamRequestId: instr.upstreamRequestId,
 			initiator,
 			subagentMarker,
-			sessionId
+			sessionId,
+			isCompact
 		});
 	} catch (error) {
 		return await handleMessagesCreateError({
@@ -5665,14 +5711,37 @@ async function handleProviderMessages(c) {
 			provider
 		}));
 		const upstreamResponse = await forwardProviderMessages(providerConfig, payload, c.req.raw.headers);
+		if (!upstreamResponse.ok) {
+			logger$3.error("Failed to create responses", upstreamResponse);
+			throw new HTTPError("Failed to create responses", upstreamResponse);
+		}
 		const contentType = upstreamResponse.headers.get("content-type") ?? "";
 		if (Boolean(payload.stream) && contentType.includes("text/event-stream")) {
 			logger$3.debug("provider.messages.streaming");
 			return streamSSE(c, async (stream) => {
-				for await (const event of events(upstreamResponse)) {
-					const eventName = event.event;
-					const data = event.data ?? "";
-					logger$3.debug("provider.messages.raw_stream_event", data);
+				for await (const chunk of events(upstreamResponse)) {
+					logger$3.debug("provider.messages.raw_stream_event:", chunk.data);
+					const eventName = chunk.event;
+					if (eventName === "ping") {
+						await stream.writeSSE({
+							event: "ping",
+							data: "{\"type\":\"ping\"}"
+						});
+						continue;
+					}
+					let data = chunk.data;
+					if (!data) continue;
+					try {
+						const parsed = JSON.parse(data);
+						if (parsed.type === "message_start") adjustInputTokens(providerConfig, parsed.message.usage);
+						else if (parsed.type === "message_delta") adjustInputTokens(providerConfig, parsed.usage);
+						data = JSON.stringify(parsed);
+					} catch (error) {
+						logger$3.error("provider.messages.streaming.adjust_tokens_error", {
+							error,
+							originalData: data
+						});
+					}
 					await stream.writeSSE({
 						event: eventName,
 						data
@@ -5680,7 +5749,10 @@ async function handleProviderMessages(c) {
 				}
 			});
 		}
-		return createProviderProxyResponse(upstreamResponse);
+		const jsonBody = await upstreamResponse.json();
+		adjustInputTokens(providerConfig, jsonBody.usage);
+		logger$3.debug("provider.messages.no_stream result:", JSON.stringify(jsonBody));
+		return c.json(jsonBody);
 	} catch (error) {
 		logger$3.error("provider.messages.error", {
 			provider,
@@ -5689,6 +5761,11 @@ async function handleProviderMessages(c) {
 		throw error;
 	}
 }
+const adjustInputTokens = (providerConfig, usage) => {
+	if (!providerConfig.adjustInputTokens || !usage) return;
+	usage.input_tokens = Math.max(0, (usage.input_tokens ?? 0) - (usage.cache_read_input_tokens ?? 0) - (usage.cache_creation_input_tokens ?? 0));
+	logger$3.debug("provider.messages.adjusted_usage:", JSON.stringify(usage));
+};
 
 //#endregion
 //#region src/routes/provider/messages/route.ts
@@ -6295,6 +6372,7 @@ usageRoute.get("/:accountIndex", async (c) => {
 //#endregion
 //#region src/server.ts
 const server = new Hono();
+server.use(traceIdMiddleware);
 server.use(logger());
 server.use(cors());
 server.use("*", createAuthMiddleware({
@@ -6320,4 +6398,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 
 //#endregion
 export { server };
-//# sourceMappingURL=server-CM_0PrbK.js.map
+//# sourceMappingURL=server-COWbIpDR.js.map