@jeffreycao/copilot-api 2.4.0 → 2.4.1

package/dist/{server-d83RMV1W.js → server-HBeQNO83.js}

@@ -1,7 +1,7 @@
-import { A as isResponsesApiWebSocketEnabled, C as getClaudeTokenMultiplier, D as isAlphaSearchCodexPriorityEnabled, E as getResponsesTransportConfig, N as PATHS, O as isMessagesApiEnabled, S as getClaudeAutoModel, T as getMessageApiWebSearchModel, _ as resolveMappedModel, b as getAlphaSearchModel, d as getModelResponsesApiCompactThreshold$1, f as getReasoningEffortForModel, g as isGpt56OrAbove, h as isContextManagementEnabledForResponses, i as listEnabledProviders, k as isResponsesApiWebSearchEnabled, l as getExtraPromptForModel, m as isContextManagementEnabledForMessages, n as getRawProviderConfig, o as resolveEffectiveProviderType, p as getSmallModel, s as resolveProviderAuthType, t as getProviderConfig, u as getModelMappings, v as setModelMappings, x as getAnthropicApiKey } from "./config-ByEK-9s6.js";
-import { B as fetchResponsesWithLifecycle, C as compactAutoContinuePromptStarts, D as compactTextOnlyGuard, E as compactSystemPromptStarts, F as forwardCodexResponses, G as createWebSocketUrl, H as encodePoolKeyPart, I as generateTraceId, J as forwardError, K as state, L as requestContext, N as CODEX_API_BASE_URL, O as createAuthMiddleware, P as buildCodexRequestHeaders, R as resolveTraceId$1, U as isTerminalResponsesStreamChunk, V as createResponsesSafeStream, W as createPooledWebSocketStream, b as prepareInteractionHeaders, c as getUUID, d as isResponsesStream, f as parseUserIdMetadata, g as copilotHeaders, h as copilotBaseUrl, k as getConfiguredAdminApiKeys, l as isAsyncIterable, o as generateRequestIdFromPayload, p as getCopilotUsage, q as HTTPError, r as setupCodexToken, s as getRootSessionId, u as isNullish, v as copilotWebSocketHeaders, w as compactMessageSections, x as prepareMessageProxyHeaders, y as prepareForCompact, z as createResponsesHttpEventStream } from "./token-BYTz7z9X.js";
+import { A as isResponsesApiWebSocketEnabled, C as getClaudeTokenMultiplier, D as isAlphaSearchCodexPriorityEnabled, E as getResponsesTransportConfig, N as PATHS, O as isMessagesApiEnabled, S as getClaudeAutoModel, T as getMessageApiWebSearchModel, _ as resolveMappedModel, b as getAlphaSearchModel, d as getModelResponsesApiCompactThreshold$1, f as getReasoningEffortForModel, g as isGpt56OrAbove, h as isContextManagementEnabledForResponses, i as listEnabledProviders, k as isResponsesApiWebSearchEnabled, l as getExtraPromptForModel, m as isContextManagementEnabledForMessages, n as getRawProviderConfig, o as resolveEffectiveProviderType, p as getSmallModel, s as resolveProviderAuthType, t as getProviderConfig, u as getModelMappings, v as setModelMappings, x as getAnthropicApiKey } from "./config-DVWu2hKk.js";
+import { B as fetchResponsesWithLifecycle, C as compactAutoContinuePromptStarts, D as compactTextOnlyGuard, E as compactSystemPromptStarts, F as forwardCodexResponses, G as createWebSocketUrl, H as encodePoolKeyPart, I as generateTraceId, J as forwardError, K as state, L as requestContext, N as CODEX_API_BASE_URL, O as createAuthMiddleware, P as buildCodexRequestHeaders, R as resolveTraceId$1, U as isTerminalResponsesStreamChunk, V as createResponsesSafeStream, W as createPooledWebSocketStream, b as prepareInteractionHeaders, c as getUUID, d as isResponsesStream, f as parseUserIdMetadata, g as copilotHeaders, h as copilotBaseUrl, k as getConfiguredAdminApiKeys, l as isAsyncIterable, o as generateRequestIdFromPayload, p as getCopilotUsage, q as HTTPError, r as setupCodexToken, s as getRootSessionId, u as isNullish, v as copilotWebSocketHeaders, w as compactMessageSections, x as prepareMessageProxyHeaders, y as prepareForCompact, z as createResponsesHttpEventStream } from "./token-D0GGk3E8.js";
 import { a as isDeferredToolName, c as parseMcpToolSearchSentinel, d as shouldEnableResponsesToolSearch, i as isBridgeToolSearchName, l as resolveBridgeToolSearchName, o as listDeferredToolNames, r as formatToolSearchBridgeArguments, s as normalizeToolSearchBridgeArguments, t as BRIDGE_TOOL_SEARCH_NAME, u as selectDeferredToolsByNames } from "./tool-search-Ds1vbmGG.js";
-import { i as toClientModelId, r as normalizeSdkModelId, t as findEndpointModel } from "./models-BWI-BuVr.js";
+import { i as toClientModelId, r as normalizeSdkModelId, t as findEndpointModel } from "./models-DKNAPa_j.js";
 import consola from "consola";
 import { createHash } from "node:crypto";
 import fs, { readFileSync } from "node:fs";
@@ -351,10 +351,33 @@ const createFallbackModel = (modelId) => ({
 });
 //#endregion
 //#region src/lib/provider-resolver.ts
+const AZURE_OPENAI_SCOPE = "https://cognitiveservices.azure.com/.default";
+let cachedAzureAccessTokenProvider = null;
+/**
+* Lazily creates the Entra token provider on first use and reuses it
+* afterwards. Importing @azure/identity eagerly adds ~0.5s to every process
+* startup, and constructing a new DefaultAzureCredential per call would drop
+* the token cache, so both the import and the credential are singletons.
+*/
+async function getAzureAccessTokenProvider() {
+	cachedAzureAccessTokenProvider ??= (async () => {
+		try {
+			const { DefaultAzureCredential, getBearerTokenProvider } = await import("@azure/identity");
+			return getBearerTokenProvider(new DefaultAzureCredential(), AZURE_OPENAI_SCOPE);
+		} catch (error) {
+			cachedAzureAccessTokenProvider = null;
+			throw error;
+		}
+	})();
+	return cachedAzureAccessTokenProvider;
+}
+async function getDefaultAzureAccessToken() {
+	return (await getAzureAccessTokenProvider())();
+}
 function isMissingCodexCredentialsError(error) {
 	return error instanceof Error && error.message === "Codex credentials not found. Run `copilot-api auth login --provider codex` first.";
 }
-async function resolveProviderConfig(providerName) {
+async function resolveProviderConfig(providerName, getAzureAccessToken = getDefaultAzureAccessToken) {
 	const normalizedProviderName = providerName.trim();
 	if (!normalizedProviderName) return null;
 	if (normalizedProviderName === "codex") {
@@ -372,7 +395,16 @@ async function resolveProviderConfig(providerName) {
 			apiKey: state.codexAccessToken ?? providerConfig.apiKey
 		};
 	}
-	return getProviderConfig(normalizedProviderName);
+	const providerConfig = getProviderConfig(normalizedProviderName);
+	if (providerConfig?.authType !== "azure-entra") return providerConfig;
+	try {
+		return {
+			...providerConfig,
+			apiKey: await getAzureAccessToken()
+		};
+	} catch (error) {
+		throw new Error(`Failed to acquire Azure Entra token for provider '${normalizedProviderName}': ${error instanceof Error ? error.message : String(error)}`, { cause: error });
+	}
 }
 /**
 * Returns the parsed "provider/model" alias only when that provider is
@@ -1186,53 +1218,68 @@ async function flushTokenUsageEvents() {
 	}
 }
 function getPeriodRange(period, now = /* @__PURE__ */ new Date()) {
+	const nowMs = now.getTime();
+	if (period === "lifetime") return {
+		endMs: nowMs + 1,
+		startMs: nowMs + 1
+	};
 	const start = new Date(now);
 	start.setHours(0, 0, 0, 0);
 	switch (period) {
-		case "day": break;
-		case "week":
-			start.setDate(start.getDate() - 6);
-			break;
-		case "month":
-			start.setDate(start.getDate() - 29);
+		case "today": break;
+		case "this_week": {
+			const daysSinceMonday = (start.getDay() + 6) % 7;
+			start.setDate(start.getDate() - daysSinceMonday);
 			break;
-		default: break;
-	}
-	const end = new Date(start);
-	switch (period) {
-		case "day":
-			end.setDate(end.getDate() + 1);
+		}
+		case "last_7_days":
+			start.setDate(start.getDate() - 6);
 			break;
-		case "week":
-			end.setDate(end.getDate() + 7);
+		case "this_month":
+			start.setDate(1);
 			break;
-		case "month":
-			end.setDate(end.getDate() + 30);
+		case "last_30_days":
+			start.setDate(start.getDate() - 29);
 			break;
 		default: break;
 	}
 	return {
-		endMs: end.getTime(),
+		endMs: nowMs + 1,
 		startMs: start.getTime()
 	};
 }
+function getPeriodRangeFromDb(db, period, now = /* @__PURE__ */ new Date()) {
+	if (period !== "lifetime") return getPeriodRange(period, now);
+	const nowMs = now.getTime();
+	const earliestEventMs = db.prepare(`
+    SELECT MIN(created_at_ms) AS start_ms
+    FROM token_usage_events
+    WHERE created_at_ms <= ?
+  `).get(nowMs)?.start_ms;
+	const startMs = typeof earliestEventMs === "number" && Number.isFinite(earliestEventMs) ? earliestEventMs : nowMs + 1;
+	return {
+		endMs: nowMs + 1,
+		startMs
+	};
+}
 function formatLocalDate(date) {
 	return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(date.getDate()).padStart(2, "0")}`;
 }
 function createDailyIntervals(range) {
 	const intervals = [];
 	const cursor = new Date(range.startMs);
+	cursor.setHours(0, 0, 0, 0);
 	while (cursor.getTime() < range.endMs) {
-		const startMs = cursor.getTime();
+		const startMs = Math.max(cursor.getTime(), range.startMs);
 		const next = new Date(cursor);
 		next.setDate(next.getDate() + 1);
 		const endMs = Math.min(next.getTime(), range.endMs);
-		intervals.push({
+		if (startMs < endMs) intervals.push({
 			date: formatLocalDate(cursor),
 			endMs,
 			startMs
 		});
-		cursor.setTime(endMs);
+		cursor.setTime(next.getTime());
 	}
 	return intervals;
 }
@@ -1487,6 +1534,58 @@ function getModelSummaries(db, range) {
 		return modelSummaryFromRow(row, costMap.get(model) ?? []);
 	});
 }
+function getDailyModelSummaries(db, range) {
+	const usageDate = "strftime('%Y-%m-%d', created_at_ms / 1000.0, 'unixepoch', 'localtime')";
+	const rows = db.prepare(`
+    SELECT
+      ${usageDate} AS usage_date,
+      model,
+      COUNT(*) AS request_count,
+      COALESCE(SUM(input_tokens), 0) AS input_tokens,
+      COALESCE(SUM(output_tokens), 0) AS output_tokens,
+      COALESCE(SUM(cache_read_input_tokens), 0) AS cache_read_input_tokens,
+      COALESCE(SUM(cache_creation_input_tokens), 0) AS cache_creation_input_tokens,
+      SUM(total_nano_aiu) AS total_nano_aiu,
+      COALESCE(SUM(total_tokens), 0) AS total_tokens
+    FROM token_usage_events
+    WHERE created_at_ms >= ? AND created_at_ms < ?
+    GROUP BY usage_date, model
+    ORDER BY usage_date ASC, total_tokens DESC, model ASC
+  `).all(range.startMs, range.endMs);
+	const costRows = db.prepare(`
+    SELECT
+      ${usageDate} AS usage_date,
+      model,
+      cost_currency,
+      COALESCE(SUM(total_cost_nanos), 0) AS total_cost_nanos
+    FROM token_usage_events
+    WHERE created_at_ms >= ?
+      AND created_at_ms < ?
+      AND cost_currency IS NOT NULL
+      AND total_cost_nanos IS NOT NULL
+    GROUP BY usage_date, model, cost_currency
+    ORDER BY usage_date ASC, model ASC, cost_currency ASC
+  `).all(range.startMs, range.endMs);
+	const costsByDateAndModel = /* @__PURE__ */ new Map();
+	for (const row of costRows) {
+		const date = stringFromRow(row, "usage_date");
+		const model = stringFromRow(row, "model") || "unknown";
+		const cost = costFromRow(row);
+		if (!date || !cost) continue;
+		const key = `${date}\u0000${model}`;
+		costsByDateAndModel.set(key, [...costsByDateAndModel.get(key) ?? [], cost]);
+	}
+	const summariesByDate = /* @__PURE__ */ new Map();
+	for (const row of rows) {
+		const date = stringFromRow(row, "usage_date");
+		if (!date) continue;
+		const model = stringFromRow(row, "model") || "unknown";
+		const summaries = summariesByDate.get(date) ?? [];
+		summaries.push(modelSummaryFromRow(row, costsByDateAndModel.get(`${date}\u0000${model}`) ?? []));
+		summariesByDate.set(date, summaries);
+	}
+	return summariesByDate;
+}
 function createDailyBucket(interval, byModel) {
 	const totals = createEmptyTotals();
 	for (const model of byModel) addTotals(totals, model);
@@ -1501,8 +1600,8 @@ function createDailyBucket(interval, byModel) {
 async function getTokenUsageSummary(period) {
 	if (!isTokenUsageStorageEnabled()) return createEmptySummary(period);
 	await flushTokenUsageEvents();
-	const range = getPeriodRange(period);
 	const db = await getDb();
+	const range = getPeriodRangeFromDb(db, period);
 	const totalsRow = getTotalsRow(db, range);
 	return {
 		byModel: getModelSummaries(db, range),
@@ -1514,12 +1613,13 @@ async function getTokenUsageSummary(period) {
 async function getTokenUsageDailySummary(period) {
 	if (!isTokenUsageStorageEnabled()) return createEmptyDailySummary(period);
 	await flushTokenUsageEvents();
-	const range = getPeriodRange(period);
 	const db = await getDb();
+	const range = getPeriodRangeFromDb(db, period);
 	const intervals = createDailyIntervals(range);
+	const dailySummaries = getDailyModelSummaries(db, range);
 	return {
 		byModel: getModelSummaries(db, range),
-		days: intervals.map((interval) => createDailyBucket(interval, getModelSummaries(db, interval))),
+		days: intervals.map((interval) => createDailyBucket(interval, dailySummaries.get(interval.date) ?? [])),
 		period,
 		range: rangePayload(range),
 		totals: totalsFromRow(getTotalsRow(db, range), getCostRows(db, range))
@@ -1528,11 +1628,11 @@ async function getTokenUsageDailySummary(period) {
 async function getTokenUsageEventsPage(input) {
 	if (!isTokenUsageStorageEnabled()) return createEmptyEventsPage(input);
 	await flushTokenUsageEvents();
-	const range = getPeriodRange(input.period);
 	const page = Math.max(1, Math.floor(input.page));
 	const pageSize = Math.min(100, Math.max(1, Math.floor(input.pageSize)));
 	const offset = (page - 1) * pageSize;
 	const db = await getDb();
+	const range = getPeriodRangeFromDb(db, input.period);
 	const totalRow = db.prepare(`
     SELECT COUNT(*) AS total
     FROM token_usage_events
@@ -2270,6 +2370,20 @@ function buildProviderUpstreamHeaders(providerConfig, requestHeaders) {
 	}
 	return headers;
 }
+const OPENCODE_GO_PROVIDER_NAME = "opencode-go";
+const OPENCODE_SESSION_HEADER = "x-opencode-session";
+const resolveOpencodeMessagesSession = (payload) => {
+	const sessionAffinity = requestContext.getStore()?.sessionAffinity?.trim();
+	if (sessionAffinity) return sessionAffinity;
+	const userId = payload.metadata?.user_id;
+	if (!userId?.trim()) return;
+	const { sessionId } = parseUserIdMetadata(userId);
+	return sessionId ?? userId;
+};
+const applyOpencodeSessionHeader = (providerConfig, headers, session) => {
+	if (providerConfig.name !== OPENCODE_GO_PROVIDER_NAME || !session) return;
+	headers[OPENCODE_SESSION_HEADER] = session;
+};
 function createProviderProxyResponse(upstreamResponse, body) {
 	const headers = new Headers(upstreamResponse.headers);
 	for (const headerName of STRIPPED_RESPONSE_HEADERS) headers.delete(headerName);
@@ -2281,26 +2395,32 @@ function createProviderProxyResponse(upstreamResponse, body) {
 }
 async function forwardProviderMessages(providerConfig, payload, requestHeaders) {
 	consola.log(`<-- model: ${payload.model}`);
+	const headers = buildProviderUpstreamHeaders(providerConfig, requestHeaders);
+	applyOpencodeSessionHeader(providerConfig, headers, resolveOpencodeMessagesSession(payload));
 	return await fetch(`${providerConfig.baseUrl}/v1/messages`, {
 		method: "POST",
-		headers: buildProviderUpstreamHeaders(providerConfig, requestHeaders),
+		headers,
 		body: JSON.stringify(payload)
 	});
 }
 async function forwardProviderChatCompletions(providerConfig, payload, requestHeaders) {
 	consola.log(`<-- model: ${payload.model}`);
+	const headers = buildProviderUpstreamHeaders(providerConfig, requestHeaders);
+	applyOpencodeSessionHeader(providerConfig, headers, payload.prompt_cache_key?.trim() || void 0);
 	return await fetch(`${providerConfig.baseUrl}/v1/chat/completions`, {
 		method: "POST",
-		headers: buildProviderUpstreamHeaders(providerConfig, requestHeaders),
+		headers,
 		body: JSON.stringify(payload)
 	});
 }
 async function forwardProviderResponses(providerConfig, payload, requestHeaders, options = {}) {
 	consola.log(`<-- model: ${payload.model}`);
 	const transportConfig = getResponsesTransportConfig();
+	const headers = buildProviderUpstreamHeaders(providerConfig, requestHeaders);
+	applyOpencodeSessionHeader(providerConfig, headers, payload.prompt_cache_key?.trim() || void 0);
 	return await fetchResponsesWithLifecycle(`${providerConfig.baseUrl}/v1/responses`, {
 		method: "POST",
-		headers: buildProviderUpstreamHeaders(providerConfig, requestHeaders),
+		headers,
 		body: JSON.stringify(payload)
 	}, {
 		headersTimeoutMs: transportConfig.headersTimeoutMs,
@@ -7444,6 +7564,10 @@ function getModels() {
 //#region src/routes/provider/messages/handler.ts
 const logger$10 = createHandlerLogger("provider-messages-handler");
 const providerMessagesHandlerDependencies = { resolveProviderConfig };
+const resolveOverrideProviderAuthType = (providerConfig, effectiveType) => {
+	if (providerConfig.authType === "azure-entra" || providerConfig.authType === "oauth2") return providerConfig.authType;
+	return resolveProviderAuthType(providerConfig.name, void 0, effectiveType);
+};
 async function handleProviderMessages(c) {
 	const provider = c.req.param("provider");
 	const payload = await c.req.json();
@@ -7510,7 +7634,7 @@ async function handleProviderMessagesForProvider(c, options) {
 		const upstreamResponse = await forwardProviderMessages(effectiveType === providerConfig.type ? providerConfig : {
 			...providerConfig,
 			type: effectiveType,
-			authType: resolveProviderAuthType(providerConfig.name, void 0, effectiveType)
+			authType: resolveOverrideProviderAuthType(providerConfig, effectiveType)
 		}, payload, c.req.raw.headers);
 		if (!upstreamResponse.ok) {
 			logger$10.error("Failed to create responses", upstreamResponse);
@@ -11813,13 +11937,22 @@ responsesRoutes.post("/", async (c) => {
 //#region src/routes/token-usage/route.ts
 const tokenUsageRoute = new Hono();
 const periods = new Set([
-	"day",
-	"week",
-	"month"
+	"today",
+	"this_week",
+	"last_7_days",
+	"this_month",
+	"last_30_days",
+	"lifetime"
 ]);
 const DEFAULT_EVENTS_PAGE_SIZE = 20;
+const legacyPeriods = {
+	day: "today",
+	week: "last_7_days",
+	month: "last_30_days"
+};
 function parsePeriod(value) {
-	return periods.has(value) ? value : "day";
+	if (periods.has(value)) return value;
+	return (value ? legacyPeriods[value] : void 0) ?? "today";
 }
 function parsePositiveInt(value, fallback) {
 	const parsed = Number.parseInt(value ?? "", 10);
@@ -11908,4 +12041,4 @@ server.route("/:provider/images", providerImageRoutes);
 //#endregion
 export { server };
 
-//# sourceMappingURL=server-d83RMV1W.js.map
+//# sourceMappingURL=server-HBeQNO83.js.map