@jeffreycao/copilot-api 2.6.24 → 2.6.26

package/dist/{server-D-oBVjPR.js → server-JC3AQpcl.js}

@@ -1,7 +1,10 @@
-import { B as PATHS, C as resolveMappedModel, D as getAnthropicApiKey, E as getAlphaSearchModel, F as isResponsesApiWebSearchEnabled, I as isResponsesApiWebSocketEnabled, M as getUpstreamTransportConfig, N as isAlphaSearchCodexPriorityEnabled, O as getClaudeAutoModel, P as isMessagesApiEnabled, S as isGpt56OrAbove, _ as getReasoningEffortForModel, b as isContextManagementEnabledForMessages, d as getOpencodeGoModelRecords, g as getModelResponsesApiCompactThreshold$1, h as getModelMappings, i as listEnabledProviders, j as getMessageApiWebSearchModel, k as getClaudeTokenMultiplier, l as getOpencodeGoModelConfig, m as getExtraPromptForModel, n as getRawProviderConfig, o as resolveEffectiveProviderType, s as resolveProviderConfigForModel, t as getProviderConfig, u as getOpencodeGoModelIds, v as getSmallModel, w as setModelMappings, x as isContextManagementEnabledForResponses, y as getSmallModelForProvider } from "./config-B_pC8QXv.js";
-import { $ as forwardError, B as forwardCodexResponses, C as copilotWebSocketHeaders, E as prepareMessageProxyHeaders, G as createResponsesHttpEventStream, H as requestContext, J as getResponsesStreamTerminalDisposition, K as createResponsesSafeStream, M as compactTextOnlyGuard, N as createAuthMiddleware, O as compactAutoContinuePromptStarts, P as getConfiguredAdminApiKeys, Q as HTTPError, R as CODEX_API_BASE_URL, T as prepareInteractionHeaders, U as resolveTraceId$1, V as generateTraceId, W as fetchUpstreamWithLifecycle, X as createWebSocketUrl, Y as createPooledWebSocketStream, Z as state, b as copilotBaseUrl, d as getUUID, f as isAsyncIterable, g as getCopilotUsage, h as parseUserIdMetadata, j as compactSystemPromptStarts, k as compactMessageSections, l as generateRequestIdFromPayload, m as isResponsesStream, o as setupCodexToken, p as isNullish, q as encodePoolKeyPart, u as getRootSessionId, w as prepareForCompact, x as copilotHeaders, z as buildCodexRequestHeaders } from "./token-6Ld3Ff3c.js";
+import { a as getAnthropicApiKey, f as isAlphaSearchCodexPriorityEnabled, h as isResponsesApiWebSocketEnabled, i as getAlphaSearchModel, l as getMessageApiWebSearchModel, m as isResponsesApiWebSearchEnabled, o as getClaudeAutoModel, p as isMessagesApiEnabled, s as getClaudeTokenMultiplier, u as getUpstreamTransportConfig, x as PATHS } from "./config-store-CARrUljo.js";
+import { C as resolveMappedModel, S as isGpt56OrAbove, _ as getReasoningEffortForModel, b as isContextManagementEnabledForMessages, d as getOpencodeGoModelRecords, g as getModelResponsesApiCompactThreshold$1, h as getModelMappings, i as listEnabledProviders, l as getOpencodeGoModelConfig, m as getExtraPromptForModel, n as getRawProviderConfig, o as resolveEffectiveProviderType, s as resolveProviderConfigForModel, t as getProviderConfig, u as getOpencodeGoModelIds, v as getSmallModel, w as setModelMappings, x as isContextManagementEnabledForResponses, y as getSmallModelForProvider } from "./config-B2OaAnpL.js";
+import { i as HTTPError, r as isGitHubCopilotEnabled, s as forwardError } from "./github-copilot-provider-DlQZgaCT.js";
+import { $ as stripInternalRequestHeaders, B as forwardCodexResponses, C as copilotWebSocketHeaders, E as prepareMessageProxyHeaders, G as createResponsesHttpEventStream, H as requestContext, J as getResponsesStreamTerminalDisposition, K as createResponsesSafeStream, M as compactTextOnlyGuard, N as createAuthMiddleware, O as compactAutoContinuePromptStarts, P as getConfiguredAdminApiKeys, R as CODEX_API_BASE_URL, T as prepareInteractionHeaders, U as resolveTraceId$1, V as generateTraceId, W as fetchUpstreamWithLifecycle, X as createWebSocketUrl, Y as createPooledWebSocketStream, Z as state, b as copilotBaseUrl, d as getUUID, f as isAsyncIterable, g as getCopilotUsage, h as parseUserIdMetadata, j as compactSystemPromptStarts, k as compactMessageSections, l as generateRequestIdFromPayload, m as isResponsesStream, o as setupCodexToken, p as isNullish, q as encodePoolKeyPart, u as getRootSessionId, w as prepareForCompact, x as copilotHeaders, z as buildCodexRequestHeaders } from "./token-DgVri1k7.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-BgFcDbNQ.js";
-import { i as toClientModelId, r as normalizeSdkModelId, t as findEndpointModel } from "./models-DG6m2Cfd.js";
+import { n as isProviderCodexModelVisible, t as getProviderCodexModels } from "./provider-management-z3m7cUkp.js";
+import { i as toClientModelId, r as normalizeSdkModelId, t as findEndpointModel } from "./models-CHdnmX1S.js";
 import consola from "consola";
 import { createHash } from "node:crypto";
 import fs, { createWriteStream, readFileSync, rmSync } from "node:fs";
@@ -423,34 +426,25 @@ const dashscopePeakWindows = [{
 	endMinuteUtc: 840,
 	startMinuteUtc: 0
 }];
+//#endregion
+//#region src/lib/builtin-provider-models.ts
+const CODEX_LUNA_PRICING = { tiers: [{
+	cacheCreationInput: .125,
+	cachedInput: .01,
+	input: .1,
+	maxInputTokens: 272e3,
+	output: .5
+}, {
+	cacheCreationInput: .25,
+	cachedInput: .02,
+	input: .2,
+	output: .75
+}] };
 const builtinProviderModelRegistry = new class BuiltinProviderModelRegistry {
 	static catalog = {
 		codex: {
-			"gpt-5.3-codex": { pricing: {
-				cachedInput: .175,
-				input: 1.75,
-				output: 14
-			} },
-			"gpt-5.4": { pricing: { tiers: [{
-				cachedInput: .25,
-				input: 2.5,
-				maxInputTokens: 272e3,
-				output: 15
-			}, {
-				cachedInput: .5,
-				input: 5,
-				output: 22.5
-			}] } },
-			"gpt-5.4-mini": { pricing: { tiers: [{
-				cachedInput: .075,
-				input: .75,
-				maxInputTokens: 272e3,
-				output: 4.5
-			}, {
-				cachedInput: .15,
-				input: 1.5,
-				output: 6.75
-			}] } },
+			"codex-auto-review": { pricing: CODEX_LUNA_PRICING },
+			"gpt-reserve": { pricing: CODEX_LUNA_PRICING },
 			"gpt-5.5": { pricing: { tiers: [{
 				cachedInput: .5,
 				input: 5,
@@ -509,18 +503,7 @@ const builtinProviderModelRegistry = new class BuiltinProviderModelRegistry {
 				input: 20,
 				output: 75
 			}] } },
-			"gpt-6-luna": { pricing: { tiers: [{
-				cacheCreationInput: .125,
-				cachedInput: .01,
-				input: .1,
-				maxInputTokens: 272e3,
-				output: .5
-			}, {
-				cacheCreationInput: .25,
-				cachedInput: .02,
-				input: .2,
-				output: .75
-			}] } },
+			"gpt-6-luna": { pricing: CODEX_LUNA_PRICING },
 			"gpt-6-sol": { pricing: { tiers: [{
 				cacheCreationInput: 2.5,
 				cachedInput: .2,
@@ -1488,7 +1471,8 @@ function resolveTokenUsageCost(input) {
 	const outputPrice = normalizePrice(pricing.output);
 	const cacheReadPrice = resolveCacheReadPrice(pricing, input);
 	const cacheCreationPrice = resolveCacheCreationPrice(pricing);
-	const totalCostNanos = costNanosForTokens(input.input_tokens, inputPrice) + costNanosForTokens(input.output_tokens, outputPrice) + costNanosForTokens(input.cache_read_input_tokens, cacheReadPrice) + costNanosForTokens(input.cache_creation_input_tokens, cacheCreationPrice);
+	const baseCostNanos = costNanosForTokens(input.input_tokens, inputPrice) + costNanosForTokens(input.output_tokens, outputPrice) + costNanosForTokens(input.cache_read_input_tokens, cacheReadPrice) + costNanosForTokens(input.cache_creation_input_tokens, cacheCreationPrice);
+	const totalCostNanos = Math.round(baseCostNanos * resolveCodexServiceTierMultiplier(input, providerName));
 	if (totalCostNanos <= 0) return null;
 	return {
 		currency,
@@ -1496,6 +1480,15 @@ function resolveTokenUsageCost(input) {
 		total_cost_nanos: totalCostNanos
 	};
 }
+function resolveCodexServiceTierMultiplier(input, providerName) {
+	if (providerName.toLowerCase() !== "codex") return 1;
+	switch (input.serviceTier?.trim().toLowerCase()) {
+		case "priority":
+		case "fast": return 2;
+		case "ultrafast": return 6;
+		default: return 1;
+	}
+}
 function resolveReportedProviderCost(input) {
 	const cost = normalizePrice(input.cost);
 	if (cost === null) return null;
@@ -1523,7 +1516,8 @@ function resolveProviderPricing(providerName, model, configuredPricing) {
 		pricing: configuredPricing,
 		source: "config"
 	};
-	const builtinPricing = builtinProviderModelRegistry.getModelConfig(providerName, model)?.pricing;
+	const pricingModel = providerName.toLowerCase() === "codex" && model.trim().toLowerCase() === "gpt-5.6" ? "gpt-5.6-sol" : model;
+	const builtinPricing = builtinProviderModelRegistry.getModelConfig(providerName, pricingModel)?.pricing;
 	if (!builtinPricing) return null;
 	return {
 		pricing: builtinPricing,
@@ -7788,7 +7782,22 @@ const CODEX_MODELS = [
 			"xhigh",
 			"max"
 		]
-	}
+	},
+	...["codex-auto-review", "gpt-reserve"].map((id) => ({
+		contextWindow: 872e3,
+		id,
+		input: ["text", "image"],
+		maxTokens: 128e3,
+		name: id,
+		reasoningEfforts: [
+			"none",
+			"low",
+			"medium",
+			"high",
+			"xhigh",
+			"max"
+		]
+	}))
 ];
 const CODEX_MODELS_URL = `${CODEX_API_BASE_URL}/codex/models`;
 const CODEX_MODELS_TIMEOUT_MS = 15e3;
@@ -9019,6 +9028,71 @@ messageRoutes.post("/count_tokens", async (c) => {
 		return await forwardError(c, error);
 	}
 });
+const DEFAULT_EXCLUSION_THRESHOLD = 20;
+const DEFAULT_EXCLUDED_MODELS = /* @__PURE__ */ new Set([
+	"gpt-5.6-sol",
+	"gpt-5.6-terra",
+	"gpt-5.6-luna",
+	"gpt-5.5",
+	"claude-sonnet-5",
+	"gemini-3.5-flash",
+	"gemini-3.6-flash",
+	"gemini-3.7-flash",
+	"gpt-5.3-codex",
+	"gpt-5.4-mini",
+	"gpt-5.4",
+	"grok-4.5",
+	"gpt-5-mini",
+	"mai-code-1.1-flash"
+]);
+function isModernCodexClient(url, headers) {
+	const versions = [
+		new URL(url).searchParams.get("client_version"),
+		headers.get("version"),
+		headers.get("user-agent")?.match(/\bcodex[^/\s]*\/(\d+\.\d+\.\d+)/iu)?.[1]
+	];
+	for (const version of versions) {
+		const match = version?.match(/^(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$/u);
+		if (!match) continue;
+		return Number(match[1]) > 0 || Number(match[2]) >= 160;
+	}
+	return false;
+}
+function normalizeCodexInstructions(model, modern, fallback) {
+	if (!modern) return model;
+	const { base_instructions: legacy, ...normalized } = model;
+	const messages = model.model_messages;
+	if (typeof messages?.instructions_template !== "string") normalized.model_messages = {
+		...messages ?? fallback,
+		instructions_template: typeof legacy === "string" ? legacy : fallback.instructions_template
+	};
+	return normalized;
+}
+function serializeCodexModelCatalog(response, options) {
+	const models = response.models.map((model) => normalizeCodexInstructions(model, options.modern, options.fallback));
+	if (options.headers.get("x-full-model-catalog")?.trim().toLowerCase() === "true") return JSON.stringify({
+		...response,
+		models
+	});
+	const envelope = JSON.stringify({
+		...response,
+		models: []
+	});
+	let bytes = Buffer.byteLength(envelope, "utf8");
+	if (bytes > 1048576) return null;
+	const selected = /* @__PURE__ */ new Set();
+	const ordered = [...models.length > DEFAULT_EXCLUSION_THRESHOLD ? models.filter((model) => options.explicitSlugs.has(model.slug) || !DEFAULT_EXCLUDED_MODELS.has(model.slug.split("/").at(-1) ?? model.slug)) : models].sort((a, b) => Number(options.explicitSlugs.has(b.slug)) - Number(options.explicitSlugs.has(a.slug)));
+	for (const model of ordered) {
+		const additionalBytes = Buffer.byteLength(JSON.stringify(model), "utf8") + (selected.size > 0 ? 1 : 0);
+		if (bytes + additionalBytes > 1048576) continue;
+		selected.add(model);
+		bytes += additionalBytes;
+	}
+	return JSON.stringify({
+		...response,
+		models: models.filter((model) => selected.has(model))
+	});
+}
 //#endregion
 //#region src/routes/models/models.json
 var models = [
@@ -10568,7 +10642,7 @@ const COPILOT_PRIORITY_BASE = 2e3;
 const OPENCODE_GO_PRIORITY_BASE = 3e3;
 const PROVIDER_PRIORITY_BASE = 4e3;
 const FALLBACK_CODEX_MODELS = models;
-const FALLBACK_BASE_INSTRUCTIONS = FALLBACK_CODEX_MODELS.find((model) => model.base_instructions?.trim())?.base_instructions ?? "";
+const FALLBACK_BASE_INSTRUCTIONS = FALLBACK_CODEX_MODELS.find((model) => model.base_instructions?.trim())?.base_instructions ?? FALLBACK_CODEX_MODELS.find((model) => model.model_messages?.instructions_template?.trim())?.model_messages.instructions_template ?? "";
 function isCodexUserAgent(userAgent) {
 	return CODEX_USER_AGENT_PATTERN.test(userAgent?.trim() ?? "");
 }
@@ -10589,7 +10663,18 @@ async function handleCodexModelsProxy(c, resolvedProviderConfig) {
 		message: "Provider 'codex' not found or disabled",
 		type: "invalid_request_error"
 	} }, 404);
-	return createProviderProxyResponse(await forwardCodexModels(c.req.url, c.req.raw.headers));
+	const upstreamResponse = await forwardCodexModels(c.req.url, c.req.raw.headers);
+	if (!upstreamResponse.ok) return createProviderProxyResponse(upstreamResponse);
+	const catalog = await upstreamResponse.json().catch(() => null);
+	if (!isCodexModelsResponse(catalog)) return c.json({ error: {
+		message: "Invalid Codex model catalog",
+		type: "api_error"
+	} }, 502);
+	const providerConfig = getRawProviderConfig("codex");
+	return createCodexCatalogResponse(c, {
+		...catalog,
+		models: catalog.models.filter((model) => isProviderCodexModelVisible(providerConfig, model.slug))
+	}, new Set(getProviderCodexModels(providerConfig)), FALLBACK_CODEX_MODELS[0].model_messages);
 }
 async function handleMergedCodexModels(c, candidatesRequest, options = {}) {
 	const [upstreamCatalogResult, candidates] = await Promise.all([tryGetCodexCatalog(c), Promise.resolve(candidatesRequest).catch((error) => {
@@ -10600,8 +10685,25 @@ async function handleMergedCodexModels(c, candidatesRequest, options = {}) {
 	const upstreamModels = upstreamCatalog?.models ?? FALLBACK_CODEX_MODELS;
 	const template = selectTemplate(upstreamModels);
 	const catalogModelsBySlug = new Map(upstreamModels.map((model) => [model.slug, model]));
-	const seenSlugs = new Set(upstreamModels.map((model) => model.slug));
-	const codexProviderAliases = options.includeCodexProviderAliases ? upstreamModels.flatMap((model, index) => {
+	const codexConfig = getRawProviderConfig("codex");
+	const copilotConfig = getRawProviderConfig("github-copilot");
+	const visibleUpstreamModels = upstreamModels.filter((model) => isProviderCodexModelVisible(codexConfig, model.slug) && (upstreamCatalog !== void 0 || codexConfig !== null || isProviderCodexModelVisible(copilotConfig, model.slug)));
+	const explicitSlugs = /* @__PURE__ */ new Set();
+	const codexSelection = getProviderCodexModels(codexConfig);
+	for (const model of visibleUpstreamModels) if (codexSelection?.includes(model.slug)) {
+		explicitSlugs.add(model.slug);
+		explicitSlugs.add(`codex/${model.slug}`);
+	}
+	const visibleCandidates = candidates.filter((candidate) => {
+		const providerName = candidate.providerName ?? "github-copilot";
+		const modelId = candidate.catalogSlug ?? (candidate.providerName ? candidate.slug.slice(providerName.length + 1) : candidate.slug);
+		const config = getRawProviderConfig(providerName);
+		if (!isProviderCodexModelVisible(config, modelId)) return false;
+		if (getProviderCodexModels(config)?.includes(modelId)) explicitSlugs.add(candidate.slug);
+		return true;
+	});
+	const seenSlugs = new Set(visibleUpstreamModels.map((model) => model.slug));
+	const codexProviderAliases = options.includeCodexProviderAliases ? visibleUpstreamModels.flatMap((model, index) => {
 		const slug = `codex/${model.slug}`;
 		if (seenSlugs.has(slug)) return [];
 		seenSlugs.add(slug);
@@ -10610,7 +10712,7 @@ async function handleMergedCodexModels(c, candidatesRequest, options = {}) {
 			priority: CODEX_ALIAS_PRIORITY_BASE + index
 		}];
 	}) : [];
-	const syntheticModels = candidates.filter((candidate) => !seenSlugs.has(candidate.slug)).flatMap((candidate, index) => {
+	const syntheticModels = visibleCandidates.filter((candidate) => !seenSlugs.has(candidate.slug)).flatMap((candidate, index) => {
 		const priorityBase = getCandidatePriorityBase(candidate);
 		const catalogModel = candidate.catalogSlug ? catalogModelsBySlug.get(candidate.catalogSlug) : void 0;
 		if (catalogModel) return [{
@@ -10621,20 +10723,30 @@ async function handleMergedCodexModels(c, candidatesRequest, options = {}) {
 		return [createSyntheticCodexModel(candidate, template, priorityBase + index)];
 	});
 	const models = [
-		...upstreamModels,
+		...visibleUpstreamModels,
 		...codexProviderAliases,
 		...syntheticModels
 	].sort((a, b) => getModelPriority(a) - getModelPriority(b));
-	const response = {
+	return createCodexCatalogResponse(c, {
 		...upstreamCatalog ?? {},
 		models
-	};
-	const result = c.json(response);
-	if (upstreamCatalogResult?.etag) {
-		result.headers.set("ETag", upstreamCatalogResult.etag);
-		result.headers.set("Cache-Control", "private, no-store");
-	}
-	return result;
+	}, explicitSlugs, template.model_messages ?? FALLBACK_CODEX_MODELS[0].model_messages);
+}
+function createCodexCatalogResponse(c, response, explicitSlugs, fallback) {
+	const body = serializeCodexModelCatalog(response, {
+		headers: c.req.raw.headers,
+		modern: isModernCodexClient(c.req.url, c.req.raw.headers),
+		explicitSlugs,
+		fallback
+	});
+	if (body === null) return c.json({ error: {
+		message: "Codex model catalog metadata exceeds 1 MiB",
+		type: "api_error"
+	} }, 502);
+	return c.body(body, 200, {
+		"Content-Type": "application/json",
+		"Cache-Control": "private, no-store"
+	});
 }
 function createCatalogAlias(model, slug, providerName) {
 	const alias = {
@@ -10722,10 +10834,7 @@ async function tryGetCodexCatalog(c) {
 			logger$8.warn("models.codex.catalog_invalid");
 			return null;
 		}
-		return {
-			catalog: body,
-			etag: response.headers.get("ETag")
-		};
+		return { catalog: body };
 	} catch (error) {
 		logger$8.warn("models.codex.catalog_error", { error });
 		return null;
@@ -10848,7 +10957,7 @@ async function getProviderModels(provider, requestHeaders) {
 	}
 }
 async function getAggregatedModels(requestHeaders) {
-	const copilotModels = state.models?.data.map(normalizeCopilotModel) ?? [];
+	const copilotModels = isGitHubCopilotEnabled() ? state.models?.data.map(normalizeCopilotModel) ?? [] : [];
 	const providerModelsByProvider = await Promise.all(listEnabledProviders().map((provider) => getProviderModels(provider, requestHeaders)));
 	const models = [...copilotModels, ...providerModelsByProvider.flat()];
 	const seenModelIds = /* @__PURE__ */ new Set();
@@ -10880,6 +10989,7 @@ async function getSyntheticCodexModels(requestHeaders, providers) {
 }
 function getCopilotCodexCandidates() {
 	const candidates = [];
+	if (!isGitHubCopilotEnabled()) return candidates;
 	for (const model of state.models?.data ?? []) try {
 		if (isCopilotCodexCandidate(model)) candidates.push(createCopilotCodexCandidate(model));
 	} catch (error) {
@@ -10904,6 +11014,7 @@ function createCopilotCodexCandidate(model) {
 	const reasoningEfforts = normalizeReasoningEfforts(model.capabilities.supports.reasoning_effort);
 	return {
 		slug: toClientModelId(model.id),
+		catalogSlug: model.id,
 		displayName: model.name,
 		description: describeCopilotAdapter(model),
 		contextWindow: positiveNumber(model.capabilities.limits.max_prompt_tokens, 256e3),
@@ -11027,12 +11138,12 @@ modelRoutes.get("/", async (c) => {
 		if (isCodexUserAgent(c.req.header("user-agent"))) {
 			const enabledProviders = listEnabledProviders();
 			const codexProviderName = enabledProviders.find((provider) => provider === "codex");
-			return await handleMergedCodexModels(c, getSyntheticCodexModels(c.req.raw.headers, enabledProviders), {
+			return await handleMergedCodexModels(c, getSyntheticCodexModels(stripInternalRequestHeaders(c.req.raw.headers), enabledProviders), {
 				includeCodexProviderAliases: codexProviderName !== void 0,
 				codexProviderName
 			});
 		}
-		const models = await getAggregatedModels(c.req.raw.headers);
+		const models = await getAggregatedModels(stripInternalRequestHeaders(c.req.raw.headers));
 		return c.json({
 			object: "list",
 			data: models,
@@ -12203,6 +12314,7 @@ const createProviderResponsesUsageRecorder = (payload, provider, modelConfig, pr
 		pricing: modelConfig?.pricing,
 		pricingCurrency,
 		providerName: provider,
+		serviceTier: payload.service_tier,
 		sessionId: sessionAffinity ?? ""
 	});
 };
@@ -12672,4 +12784,4 @@ createServer();
 //#endregion
 export { createServer };
 
-//# sourceMappingURL=server-D-oBVjPR.js.map
+//# sourceMappingURL=server-JC3AQpcl.js.map