@jeffreycao/copilot-api 1.10.0 → 1.10.2

package/dist/{server-BnKth1Jp.js → server-csGHkK-m.js}

@@ -1,6 +1,6 @@
 import { t as PATHS } from "./paths-DC-mqCY3.js";
-import { D as generateTraceId, E as prepareMessageProxyHeaders, I as state, M as compactMessageSections, O as requestContext, P as compactSystemPromptStarts, T as prepareInteractionHeaders, _ as copilotWebSocketHeaders, c as getUUID, d as sleep, f as getCopilotUsage, g as copilotHeaders, h as copilotBaseUrl, j as compactAutoContinuePromptStarts, k as resolveTraceId$1, l as isNullish, m as forwardError, n as cacheModels, o as generateRequestIdFromPayload, p as HTTPError, s as getRootSessionId, u as parseUserIdMetadata, w as prepareForCompact } from "./utils-C5ej0z8n.js";
-import { a as getConfig, c as getReasoningEffortForModel, d as isResponsesApiContextManagementModel, f as isResponsesApiWebSearchEnabled, i as getClaudeTokenMultiplier, l as getSmallModel, o as getExtraPromptForModel, p as isResponsesApiWebSocketEnabled, r as getAnthropicApiKey, s as getProviderConfig, t as getProxyEnvDispatcher, u as isMessagesApiEnabled } from "./proxy-De0Po8kG.js";
+import { D as generateTraceId, E as prepareMessageProxyHeaders, I as state, M as compactMessageSections, O as requestContext, P as compactSystemPromptStarts, T as prepareInteractionHeaders, _ as copilotWebSocketHeaders, c as getUUID, d as sleep, f as getCopilotUsage, g as copilotHeaders, h as copilotBaseUrl, j as compactAutoContinuePromptStarts, k as resolveTraceId$1, l as isNullish, m as forwardError, n as cacheModels, o as generateRequestIdFromPayload, p as HTTPError, s as getRootSessionId, u as parseUserIdMetadata, w as prepareForCompact } from "./utils-jHLgqAq2.js";
+import { _ as setModelMappings, a as getConfig, c as getProviderConfig, d as isMessagesApiEnabled, f as isResponsesApiContextManagementModel, g as resolveMappedModel, i as getClaudeTokenMultiplier, l as getReasoningEffortForModel, m as isResponsesApiWebSocketEnabled, o as getExtraPromptForModel, p as isResponsesApiWebSearchEnabled, r as getAnthropicApiKey, s as getModelMappings, t as getProxyEnvDispatcher, u as getSmallModel } from "./proxy-DQLzdeq3.js";
 import consola from "consola";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -12,6 +12,7 @@ import fs$1, { readFileSync } from "node:fs";
 import { streamSSE } from "hono/streaming";
 import util from "node:util";
 import { events } from "fetch-event-stream";
+import { z } from "zod";
 import { WebSocket } from "undici";
 //#region src/lib/request-auth.ts
 function normalizeApiKeys(apiKeys) {
@@ -26,6 +27,14 @@ function normalizeApiKeys(apiKeys) {
 function getConfiguredApiKeys() {
 	return normalizeApiKeys(getConfig().auth?.apiKeys);
 }
+function normalizeApiKey(apiKey) {
+	if (typeof apiKey !== "string") return null;
+	return apiKey.trim() || null;
+}
+function getConfiguredAdminApiKeys() {
+	const adminApiKey = normalizeApiKey(getConfig().auth?.adminApiKey);
+	return adminApiKey ? [adminApiKey] : [];
+}
 function extractRequestApiKey(c) {
 	const xApiKey = c.req.header("x-api-key")?.trim();
 	if (xApiKey) return xApiKey;
@@ -46,11 +55,14 @@ function createAuthMiddleware(options = {}) {
 	const getApiKeys = options.getApiKeys ?? getConfiguredApiKeys;
 	const allowUnauthenticatedPaths = options.allowUnauthenticatedPaths ?? ["/"];
 	const allowOptionsBypass = options.allowOptionsBypass ?? true;
+	const allowWhenNoApiKeys = options.allowWhenNoApiKeys ?? true;
+	const shouldSkipPath = options.shouldSkipPath ?? (() => false);
 	return async (c, next) => {
 		if (allowOptionsBypass && c.req.method === "OPTIONS") return next();
+		if (shouldSkipPath(c.req.path)) return next();
 		if (allowUnauthenticatedPaths.includes(c.req.path)) return next();
 		const apiKeys = getApiKeys();
-		if (apiKeys.length === 0) return next();
+		if (apiKeys.length === 0) return allowWhenNoApiKeys ? next() : createUnauthorizedResponse(c);
 		const requestApiKey = extractRequestApiKey(c);
 		if (!requestApiKey || !apiKeys.includes(requestApiKey)) return createUnauthorizedResponse(c);
 		return next();
@@ -504,19 +516,14 @@ async function flushTokenUsageEvents() {
 }
 function getPeriodRange(period, now = /* @__PURE__ */ new Date()) {
 	const start = new Date(now);
+	start.setHours(0, 0, 0, 0);
 	switch (period) {
-		case "day":
-			start.setHours(0, 0, 0, 0);
-			break;
-		case "week": {
-			const daysSinceMonday = (start.getDay() + 6) % 7;
-			start.setDate(start.getDate() - daysSinceMonday);
-			start.setHours(0, 0, 0, 0);
+		case "day": break;
+		case "week":
+			start.setDate(start.getDate() - 6);
 			break;
-		}
 		case "month":
-			start.setDate(1);
-			start.setHours(0, 0, 0, 0);
+			start.setDate(start.getDate() - 29);
 			break;
 		default: break;
 	}
@@ -529,7 +536,7 @@ function getPeriodRange(period, now = /* @__PURE__ */ new Date()) {
 			end.setDate(end.getDate() + 7);
 			break;
 		case "month":
-			end.setMonth(end.getMonth() + 1);
+			end.setDate(end.getDate() + 30);
 			break;
 		default: break;
 	}
@@ -538,6 +545,26 @@ function getPeriodRange(period, now = /* @__PURE__ */ new Date()) {
 		startMs: start.getTime()
 	};
 }
+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);
+	while (cursor.getTime() < range.endMs) {
+		const startMs = cursor.getTime();
+		const next = new Date(cursor);
+		next.setDate(next.getDate() + 1);
+		const endMs = Math.min(next.getTime(), range.endMs);
+		intervals.push({
+			date: formatLocalDate(cursor),
+			endMs,
+			startMs
+		});
+		cursor.setTime(endMs);
+	}
+	return intervals;
+}
 function createEmptyTotals() {
 	return {
 		cache_creation_input_tokens: 0,
@@ -548,6 +575,14 @@ function createEmptyTotals() {
 		total_tokens: 0
 	};
 }
+function addTotals(target, next) {
+	target.cache_creation_input_tokens += next.cache_creation_input_tokens;
+	target.cache_read_input_tokens += next.cache_read_input_tokens;
+	target.input_tokens += next.input_tokens;
+	target.output_tokens += next.output_tokens;
+	target.request_count += next.request_count;
+	target.total_tokens += next.total_tokens;
+}
 function createEmptySummary(period) {
 	const range = getPeriodRange(period);
 	return {
@@ -562,6 +597,27 @@ function createEmptySummary(period) {
 		totals: createEmptyTotals()
 	};
 }
+function createEmptyDailySummary(period) {
+	const range = getPeriodRange(period);
+	return {
+		byModel: [],
+		days: createDailyIntervals(range).map((interval) => ({
+			byModel: [],
+			date: interval.date,
+			end_ms: interval.endMs,
+			start_ms: interval.startMs,
+			totals: createEmptyTotals()
+		})),
+		period,
+		range: {
+			end_ms: range.endMs,
+			end_utc: new Date(range.endMs).toISOString(),
+			start_ms: range.startMs,
+			start_utc: new Date(range.startMs).toISOString()
+		},
+		totals: createEmptyTotals()
+	};
+}
 function createEmptyEventsPage(input) {
 	const range = getPeriodRange(input.period);
 	return {
@@ -579,6 +635,14 @@ function createEmptyEventsPage(input) {
 		total_pages: 1
 	};
 }
+function rangePayload(range) {
+	return {
+		end_ms: range.endMs,
+		end_utc: new Date(range.endMs).toISOString(),
+		start_ms: range.startMs,
+		start_utc: new Date(range.startMs).toISOString()
+	};
+}
 function numberFromRow(row, key) {
 	const value = row?.[key];
 	return typeof value === "number" && Number.isFinite(value) ? value : 0;
@@ -593,6 +657,12 @@ function totalsFromRow(row) {
 		total_tokens: numberFromRow(row, "total_tokens")
 	};
 }
+function modelSummaryFromRow(row) {
+	return {
+		...totalsFromRow(row),
+		model: typeof row.model === "string" ? row.model : "unknown"
+	};
+}
 function stringFromRow(row, key) {
 	const value = row[key];
 	return typeof value === "string" ? value : "";
@@ -620,12 +690,8 @@ function usageEventFromRow(row) {
 		user_id: stringFromRow(row, "user_id")
 	};
 }
-async function getTokenUsageSummary(period) {
-	if (!isTokenUsageStorageEnabled()) return createEmptySummary(period);
-	await flushTokenUsageEvents();
-	const range = getPeriodRange(period);
-	const db = await getDb();
-	const totalsRow = db.prepare(`
+function getTotalsRow(db, range) {
+	return db.prepare(`
     SELECT
       COUNT(*) AS request_count,
       COALESCE(SUM(input_tokens), 0) AS input_tokens,
@@ -636,8 +702,9 @@ async function getTokenUsageSummary(period) {
     FROM token_usage_events
     WHERE created_at_ms >= ? AND created_at_ms < ?
   `).get(range.startMs, range.endMs);
-	return {
-		byModel: db.prepare(`
+}
+function getModelRows(db, range) {
+	return db.prepare(`
     SELECT
       model,
       COUNT(*) AS request_count,
@@ -652,20 +719,47 @@ async function getTokenUsageSummary(period) {
     ORDER BY
       total_tokens DESC,
       model ASC
-  `).all(range.startMs, range.endMs).map((row) => ({
-			...totalsFromRow(row),
-			model: typeof row.model === "string" ? row.model : "unknown"
-		})),
+  `).all(range.startMs, range.endMs);
+}
+function createDailyBucket(interval, rows) {
+	const byModel = rows.map((row) => modelSummaryFromRow(row));
+	const totals = createEmptyTotals();
+	for (const model of byModel) addTotals(totals, model);
+	return {
+		byModel,
+		date: interval.date,
+		end_ms: interval.endMs,
+		start_ms: interval.startMs,
+		totals
+	};
+}
+async function getTokenUsageSummary(period) {
+	if (!isTokenUsageStorageEnabled()) return createEmptySummary(period);
+	await flushTokenUsageEvents();
+	const range = getPeriodRange(period);
+	const db = await getDb();
+	const totalsRow = getTotalsRow(db, range);
+	return {
+		byModel: getModelRows(db, range).map((row) => modelSummaryFromRow(row)),
 		period,
-		range: {
-			end_ms: range.endMs,
-			end_utc: new Date(range.endMs).toISOString(),
-			start_ms: range.startMs,
-			start_utc: new Date(range.startMs).toISOString()
-		},
+		range: rangePayload(range),
 		totals: totalsFromRow(totalsRow)
 	};
 }
+async function getTokenUsageDailySummary(period) {
+	if (!isTokenUsageStorageEnabled()) return createEmptyDailySummary(period);
+	await flushTokenUsageEvents();
+	const range = getPeriodRange(period);
+	const db = await getDb();
+	const intervals = createDailyIntervals(range);
+	return {
+		byModel: getModelRows(db, range).map((row) => modelSummaryFromRow(row)),
+		days: intervals.map((interval) => createDailyBucket(interval, getModelRows(db, interval))),
+		period,
+		range: rangePayload(range),
+		totals: totalsFromRow(getTotalsRow(db, range))
+	};
+}
 async function getTokenUsageEventsPage(input) {
 	if (!isTokenUsageStorageEnabled()) return createEmptyEventsPage(input);
 	await flushTokenUsageEvents();
@@ -1003,6 +1097,32 @@ completionRoutes.post("/", async (c) => {
 	}
 });
 //#endregion
+//#region src/routes/admin/config/route.ts
+const configRoutes = new Hono();
+const modelMappingsRequestSchema = z.object({ modelMappings: z.record(z.string(), z.string()) });
+configRoutes.get("/model-mappings", (c) => {
+	return c.json({
+		configPath: PATHS.CONFIG_PATH,
+		modelMappings: getModelMappings()
+	});
+});
+configRoutes.post("/model-mappings", async (c) => {
+	try {
+		const parseResult = modelMappingsRequestSchema.safeParse(await c.req.json());
+		if (!parseResult.success) return c.json({ error: {
+			message: parseResult.error.issues[0]?.message ?? "Invalid request body.",
+			type: "invalid_request_error"
+		} }, 400);
+		const updatedModelMappings = setModelMappings(parseResult.data.modelMappings);
+		return c.json({
+			configPath: PATHS.CONFIG_PATH,
+			modelMappings: updatedModelMappings
+		});
+	} catch (error) {
+		return await forwardError(c, error);
+	}
+});
+//#endregion
 //#region src/services/copilot/create-embeddings.ts
 const createEmbeddings = async (payload) => {
 	if (!state.copilotToken) throw new Error("Copilot token not found");
@@ -1737,6 +1857,7 @@ async function countTokensViaAnthropic(c, payload) {
 */
 async function handleCountTokens(c) {
 	const anthropicPayload = await c.req.json();
+	anthropicPayload.model = resolveMappedModel(anthropicPayload.model);
 	const providerModelAlias = parseProviderModelAlias(anthropicPayload.model);
 	if (providerModelAlias) {
 		anthropicPayload.model = providerModelAlias.model;
@@ -2823,14 +2944,23 @@ const MESSAGE_TYPE = "message";
 const COMPACTION_SIGNATURE_PREFIX = "cm1#";
 const COMPACTION_SIGNATURE_SEPARATOR = "@";
 const THINKING_TEXT = "Thinking...";
-const translateAnthropicMessagesToResponsesPayload = (payload) => {
+const buildPromptCacheKey = (basePromptCacheKey, subagentAgentId) => {
+	if (!basePromptCacheKey) return null;
+	const normalizedSubagentAgentId = subagentAgentId?.trim() || null;
+	if (!normalizedSubagentAgentId) return basePromptCacheKey;
+	return `${basePromptCacheKey}:agent:${normalizedSubagentAgentId}`;
+};
+const translateAnthropicMessagesToResponsesPayload = (payload, subagentAgentId) => {
 	const input = [];
 	const applyPhase = shouldApplyPhase(payload.model);
 	for (const message of payload.messages) input.push(...translateMessage(message, payload.model, applyPhase));
+	const hasOriginalTools = Array.isArray(payload.tools) && payload.tools.length > 0;
 	const translatedTools = convertAnthropicTools(payload.tools);
 	const toolChoice = convertAnthropicToolChoice(payload.tool_choice);
-	const { sessionId: promptCacheKey } = parseUserIdMetadata(payload.metadata?.user_id);
-	return {
+	const { sessionId: metadataPromptCacheKey } = parseUserIdMetadata(payload.metadata?.user_id);
+	const sessionAffinity = requestContext.getStore()?.sessionAffinity?.trim() || null;
+	const promptCacheKey = buildPromptCacheKey(metadataPromptCacheKey ?? sessionAffinity, subagentAgentId);
+	const responsesPayload = {
 		model: payload.model,
 		input,
 		instructions: translateSystemPrompt(payload.system, payload.model),
@@ -2840,7 +2970,6 @@ const translateAnthropicMessagesToResponsesPayload = (payload) => {
 		tools: translatedTools,
 		tool_choice: toolChoice,
 		metadata: payload.metadata ? { ...payload.metadata } : null,
-		prompt_cache_key: promptCacheKey,
 		stream: payload.stream ?? null,
 		store: false,
 		parallel_tool_calls: true,
@@ -2850,6 +2979,8 @@ const translateAnthropicMessagesToResponsesPayload = (payload) => {
 		},
 		include: ["reasoning.encrypted_content"]
 	};
+	if (hasOriginalTools) responsesPayload.prompt_cache_key = promptCacheKey;
+	return responsesPayload;
 };
 const encodeCompactionCarrierSignature = (compaction) => {
 	return `${COMPACTION_SIGNATURE_PREFIX}${compaction.encrypted_content}${COMPACTION_SIGNATURE_SEPARATOR}${compaction.id}`;
@@ -2965,8 +3096,8 @@ const resolveAssistantPhase = (_model, content, applyPhase) => {
 	if (!content.some((block) => block.type === "text")) return;
 	return content.some((block) => block.type === "tool_use") ? "commentary" : "final_answer";
 };
-const shouldApplyPhase = (model) => {
-	return getExtraPromptForModel(model).includes("## Intermediary updates");
+const shouldApplyPhase = (_model) => {
+	return true;
 };
 const createTextContent = (text) => ({
 	type: "input_text",
@@ -4034,7 +4165,7 @@ const handleWithChatCompletions = async (c, anthropicPayload, options) => {
 };
 const handleWithResponsesApi = async (c, anthropicPayload, options) => {
 	const { logger, selectedModel, ...requestOptions } = options;
-	const responsesPayload = translateAnthropicMessagesToResponsesPayload(anthropicPayload);
+	const responsesPayload = translateAnthropicMessagesToResponsesPayload(anthropicPayload, requestOptions.subagentMarker?.agent_id);
 	const recordUsage = createCopilotUsageRecorder({
 		endpoint: "responses",
 		fallbackSessionId: requestOptions.sessionId,
@@ -4240,6 +4371,9 @@ const messagesFlowHandlers = {
 };
 async function handleCompletion(c) {
 	const anthropicPayload = await c.req.json();
+	const requestedModel = anthropicPayload.model;
+	anthropicPayload.model = resolveMappedModel(anthropicPayload.model);
+	if (anthropicPayload.model !== requestedModel) logger$3.debug(`Resolved model mapping: ${requestedModel} -> ${anthropicPayload.model}`);
 	const providerModelAlias = parseProviderModelAlias(anthropicPayload.model);
 	if (providerModelAlias) {
 		anthropicPayload.model = providerModelAlias.model;
@@ -4580,6 +4714,10 @@ tokenUsageRoute.get("/", async (c) => {
 	const summary = await getTokenUsageSummary(parsePeriod(c.req.query("period")));
 	return c.json(summary);
 });
+tokenUsageRoute.get("/daily", async (c) => {
+	const summary = await getTokenUsageDailySummary(parsePeriod(c.req.query("period")));
+	return c.json(summary);
+});
 tokenUsageRoute.get("/events", async (c) => {
 	const period = parsePeriod(c.req.query("period"));
 	const eventsPage = await getTokenUsageEventsPage({
@@ -4621,11 +4759,19 @@ const server = new Hono();
 server.use(traceIdMiddleware);
 server.use(logger());
 server.use(cors());
-server.use("*", createAuthMiddleware({ allowUnauthenticatedPaths: [
-	"/",
-	"/usage-viewer",
-	"/usage-viewer/"
-] }));
+server.use("*", createAuthMiddleware({
+	allowUnauthenticatedPaths: [
+		"/",
+		"/usage-viewer",
+		"/usage-viewer/"
+	],
+	shouldSkipPath: (path) => path.startsWith("/admin/")
+}));
+server.use("/admin/*", createAuthMiddleware({
+	getApiKeys: getConfiguredAdminApiKeys,
+	allowUnauthenticatedPaths: [],
+	allowWhenNoApiKeys: false
+}));
 server.get("/", (c) => c.text("Server running"));
 server.get("/usage-viewer", (c) => {
 	const usageViewerFileUrl = new URL("../pages/index.html", import.meta.url);
@@ -4633,6 +4779,7 @@ server.get("/usage-viewer", (c) => {
 });
 server.get("/usage-viewer/", (c) => c.redirect("/usage-viewer", 301));
 server.route("/chat/completions", completionRoutes);
+server.route("/admin/config", configRoutes);
 server.route("/models", modelRoutes);
 server.route("/embeddings", embeddingRoutes);
 server.route("/usage", usageRoute);
@@ -4649,4 +4796,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 //#endregion
 export { server };
 
-//# sourceMappingURL=server-BnKth1Jp.js.map
+//# sourceMappingURL=server-csGHkK-m.js.map