@jeffreycao/copilot-api 1.3.4 → 1.3.7

package/dist/paths-Cla6y5eD.js

@@ -0,0 +1,33 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+//#region src/lib/paths.ts
+const AUTH_APP = process.env.COPILOT_API_OAUTH_APP?.trim() || "";
+const ENTERPRISE_PREFIX = process.env.COPILOT_API_ENTERPRISE_URL ? "ent_" : "";
+const DEFAULT_DIR = path.join(os.homedir(), ".local", "share", "copilot-api");
+const APP_DIR = process.env.COPILOT_API_HOME || DEFAULT_DIR;
+const GITHUB_TOKEN_PATH = path.join(APP_DIR, AUTH_APP, ENTERPRISE_PREFIX + "github_token");
+const CONFIG_PATH = path.join(APP_DIR, "config.json");
+const PATHS = {
+	APP_DIR,
+	GITHUB_TOKEN_PATH,
+	CONFIG_PATH
+};
+async function ensurePaths() {
+	await fs.mkdir(path.join(PATHS.APP_DIR, AUTH_APP), { recursive: true });
+	await ensureFile(PATHS.GITHUB_TOKEN_PATH);
+	await ensureFile(PATHS.CONFIG_PATH);
+}
+async function ensureFile(filePath) {
+	try {
+		await fs.access(filePath, fs.constants.W_OK);
+	} catch {
+		await fs.writeFile(filePath, "");
+		await fs.chmod(filePath, 384);
+	}
+}
+
+//#endregion
+export { PATHS, ensurePaths };
+//# sourceMappingURL=paths-Cla6y5eD.js.map

package/dist/paths-Cla6y5eD.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"paths-Cla6y5eD.js","names":[],"sources":["../src/lib/paths.ts"],"sourcesContent":["import fs from \"node:fs/promises\"\nimport os from \"node:os\"\nimport path from \"node:path\"\n\nconst AUTH_APP = process.env.COPILOT_API_OAUTH_APP?.trim() || \"\"\nconst ENTERPRISE_PREFIX = process.env.COPILOT_API_ENTERPRISE_URL ? \"ent_\" : \"\"\n\nconst DEFAULT_DIR = path.join(os.homedir(), \".local\", \"share\", \"copilot-api\")\nconst APP_DIR = process.env.COPILOT_API_HOME || DEFAULT_DIR\n\nconst GITHUB_TOKEN_PATH = path.join(\n  APP_DIR,\n  AUTH_APP,\n  ENTERPRISE_PREFIX + \"github_token\",\n)\nconst CONFIG_PATH = path.join(APP_DIR, \"config.json\")\n\nexport const PATHS = {\n  APP_DIR,\n  GITHUB_TOKEN_PATH,\n  CONFIG_PATH,\n}\n\nexport async function ensurePaths(): Promise<void> {\n  await fs.mkdir(path.join(PATHS.APP_DIR, AUTH_APP), { recursive: true })\n  await ensureFile(PATHS.GITHUB_TOKEN_PATH)\n  await ensureFile(PATHS.CONFIG_PATH)\n}\n\nasync function ensureFile(filePath: string): Promise<void> {\n  try {\n    await fs.access(filePath, fs.constants.W_OK)\n  } catch {\n    await fs.writeFile(filePath, \"\")\n    await fs.chmod(filePath, 0o600)\n  }\n}\n"],"mappings":";;;;;AAIA,MAAM,WAAW,QAAQ,IAAI,uBAAuB,MAAM,IAAI;AAC9D,MAAM,oBAAoB,QAAQ,IAAI,6BAA6B,SAAS;AAE5E,MAAM,cAAc,KAAK,KAAK,GAAG,SAAS,EAAE,UAAU,SAAS,cAAc;AAC7E,MAAM,UAAU,QAAQ,IAAI,oBAAoB;AAEhD,MAAM,oBAAoB,KAAK,KAC7B,SACA,UACA,oBAAoB,eACrB;AACD,MAAM,cAAc,KAAK,KAAK,SAAS,cAAc;AAErD,MAAa,QAAQ;CACnB;CACA;CACA;CACD;AAED,eAAsB,cAA6B;AACjD,OAAM,GAAG,MAAM,KAAK,KAAK,MAAM,SAAS,SAAS,EAAE,EAAE,WAAW,MAAM,CAAC;AACvE,OAAM,WAAW,MAAM,kBAAkB;AACzC,OAAM,WAAW,MAAM,YAAY;;AAGrC,eAAe,WAAW,UAAiC;AACzD,KAAI;AACF,QAAM,GAAG,OAAO,UAAU,GAAG,UAAU,KAAK;SACtC;AACN,QAAM,GAAG,UAAU,UAAU,GAAG;AAChC,QAAM,GAAG,MAAM,UAAU,IAAM"}

package/dist/{server-C-LzaXzh.js → server-BBSm2bHY.js}

@@ -1,10 +1,14 @@
-import { HTTPError, PATHS, cacheModels, copilotBaseUrl, copilotHeaders, forwardError, generateRequestIdFromPayload, getConfig, getCopilotUsage, getExtraPromptForModel, getProviderConfig, getReasoningEffortForModel, getRootSessionId, getSmallModel, getUUID, isMessagesApiEnabled, isNullish, isResponsesApiContextManagementModel, prepareInteractionHeaders, shouldCompactUseSmallModel, sleep, state } from "./config-DqFPDXKy.js";
+import { PATHS } from "./paths-Cla6y5eD.js";
+import { HTTPError, cacheModels, copilotBaseUrl, copilotHeaders, forwardError, generateRequestIdFromPayload, getRootSessionId, getUUID, isNullish, prepareForCompact, prepareInteractionHeaders, sleep, state } from "./utils-DKqD66k9.js";
+import { getCopilotUsage } from "./get-copilot-usage-CuVET98U.js";
+import { getConfig, getExtraPromptForModel, getProviderConfig, getReasoningEffortForModel, getSmallModel, isMessagesApiEnabled, isResponsesApiContextManagementModel } from "./config-DYOE_-p1.js";
 import consola from "consola";
 import path from "node:path";
-import fs, { readFileSync } from "node:fs";
 import { Hono } from "hono";
 import { cors } from "hono/cors";
 import { logger } from "hono/logger";
+import fs, { readFileSync } from "node:fs";
+import { AsyncLocalStorage } from "node:async_hooks";
 import { streamSSE } from "hono/streaming";
 import util from "node:util";
 import { events } from "fetch-event-stream";
@@ -54,6 +58,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/approval.ts
 const awaitApproval = async () => {
@@ -162,12 +200,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;
@@ -430,6 +470,7 @@ const createChatCompletions = async (payload, options) => {
 		"x-initiator": isAgentCall ? "agent" : "user"
 	};
 	prepareInteractionHeaders(options.sessionId, Boolean(options.subagentMarker), headers);
+	prepareForCompact(headers, options.isCompact);
 	const response = await fetch(`${copilotBaseUrl(state)}/chat/completions`, {
 		method: "POST",
 		headers,
@@ -836,13 +877,14 @@ async function handleCountTokens(c) {
 
 //#endregion
 //#region src/services/copilot/create-responses.ts
-const createResponses = async (payload, { vision, initiator, subagentMarker, requestId, sessionId }) => {
+const createResponses = async (payload, { vision, initiator, subagentMarker, requestId, sessionId, isCompact }) => {
 	if (!state.copilotToken) throw new Error("Copilot token not found");
 	const headers = {
 		...copilotHeaders(state, requestId, vision),
 		"x-initiator": initiator
 	};
 	prepareInteractionHeaders(sessionId, Boolean(subagentMarker), headers);
+	prepareForCompact(headers, isCompact);
 	payload.service_tier = null;
 	const response = await fetch(`${copilotBaseUrl(state)}/responses`, {
 		method: "POST",
@@ -1813,6 +1855,7 @@ const createMessages = async (payload, anthropicBetaHeader, options) => {
 		"x-initiator": isInitiateRequest ? "user" : "agent"
 	};
 	prepareInteractionHeaders(options.sessionId, Boolean(options.subagentMarker), headers);
+	prepareForCompact(headers, options.isCompact);
 	const anthropicBeta = buildAnthropicBetaHeader(anthropicBetaHeader, payload.thinking);
 	if (anthropicBeta) headers["anthropic-beta"] = anthropicBeta;
 	const response = await fetch(`${copilotBaseUrl(state)}/v1/messages`, {
@@ -2140,10 +2183,8 @@ async function handleCompletion(c) {
 	logger$5.debug("Anthropic Beta header:", anthropicBeta);
 	const noTools = !anthropicPayload.tools || anthropicPayload.tools.length === 0;
 	if (anthropicBeta && noTools && !isCompact) anthropicPayload.model = getSmallModel();
-	if (isCompact) {
-		logger$5.debug("Is compact request:", isCompact);
-		if (shouldCompactUseSmallModel()) anthropicPayload.model = getSmallModel();
-	} else mergeToolResultForClaude(anthropicPayload);
+	if (isCompact) logger$5.debug("Is compact request:", isCompact);
+	else mergeToolResultForClaude(anthropicPayload);
 	const requestId = generateRequestIdFromPayload(anthropicPayload, sessionId);
 	logger$5.debug("Generated request ID:", requestId);
 	if (state.manualApprove) await awaitApproval();
@@ -2154,30 +2195,34 @@ async function handleCompletion(c) {
 		subagentMarker,
 		selectedModel,
 		requestId,
-		sessionId
+		sessionId,
+		isCompact
 	});
 	if (shouldUseResponsesApi(selectedModel)) return await handleWithResponsesApi(c, anthropicPayload, {
 		subagentMarker,
 		selectedModel,
 		requestId,
-		sessionId
+		sessionId,
+		isCompact
 	});
 	return await handleWithChatCompletions(c, anthropicPayload, {
 		subagentMarker,
 		requestId,
-		sessionId
+		sessionId,
+		isCompact
 	});
 }
 const RESPONSES_ENDPOINT$1 = "/responses";
 const MESSAGES_ENDPOINT = "/v1/messages";
 const handleWithChatCompletions = async (c, anthropicPayload, options) => {
-	const { subagentMarker, requestId, sessionId } = options;
+	const { subagentMarker, requestId, sessionId, isCompact } = options;
 	const openAIPayload = translateToOpenAI(anthropicPayload);
 	logger$5.debug("Translated OpenAI request payload:", JSON.stringify(openAIPayload));
 	const response = await createChatCompletions(openAIPayload, {
 		subagentMarker,
 		requestId,
-		sessionId
+		sessionId,
+		isCompact
 	});
 	if (isNonStreaming(response)) {
 		logger$5.debug("Non-streaming response from Copilot:", JSON.stringify(response));
@@ -2211,7 +2256,7 @@ const handleWithChatCompletions = async (c, anthropicPayload, options) => {
 	});
 };
 const handleWithResponsesApi = async (c, anthropicPayload, options) => {
-	const { subagentMarker, selectedModel, requestId, sessionId } = options;
+	const { subagentMarker, selectedModel, requestId, sessionId, isCompact } = options;
 	const responsesPayload = translateAnthropicMessagesToResponsesPayload(anthropicPayload);
 	applyResponsesApiContextManagement(responsesPayload, selectedModel?.capabilities.limits.max_prompt_tokens);
 	compactInputByLatestCompaction(responsesPayload);
@@ -2222,7 +2267,8 @@ const handleWithResponsesApi = async (c, anthropicPayload, options) => {
 		initiator,
 		subagentMarker,
 		requestId,
-		sessionId
+		sessionId,
+		isCompact
 	});
 	if (responsesPayload.stream && isAsyncIterable$1(response)) {
 		logger$5.debug("Streaming response from Copilot (Responses API)");
@@ -2269,7 +2315,7 @@ const handleWithResponsesApi = async (c, anthropicPayload, options) => {
 	return c.json(anthropicResponse);
 };
 const handleWithMessagesApi = async (c, anthropicPayload, options) => {
-	const { anthropicBetaHeader, subagentMarker, selectedModel, requestId, sessionId } = options;
+	const { anthropicBetaHeader, subagentMarker, selectedModel, requestId, sessionId, isCompact } = options;
 	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("@");
@@ -2284,7 +2330,8 @@ const handleWithMessagesApi = async (c, anthropicPayload, options) => {
 	const response = await createMessages(anthropicPayload, anthropicBetaHeader, {
 		subagentMarker,
 		requestId,
-		sessionId
+		sessionId,
+		isCompact
 	});
 	if (isAsyncIterable$1(response)) {
 		logger$5.debug("Streaming response from Copilot (Messages API)");
@@ -2541,14 +2588,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
@@ -2556,7 +2626,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,
@@ -2565,6 +2638,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
@@ -2772,6 +2850,7 @@ usageRoute.get("/", async (c) => {
 //#endregion
 //#region src/server.ts
 const server = new Hono();
+server.use(traceIdMiddleware);
 server.use(logger());
 server.use(cors());
 server.use("*", createAuthMiddleware({ allowUnauthenticatedPaths: [
@@ -2801,4 +2880,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 
 //#endregion
 export { server };
-//# sourceMappingURL=server-C-LzaXzh.js.map
+//# sourceMappingURL=server-BBSm2bHY.js.map