@jeffreycao/copilot-api 2.7.2 → 2.7.4

package/dist/{server-DbkseGH6.js → server-BmGSx45N.js}

@@ -1,12 +1,12 @@
-import { a as getAnthropicApiKey, c as getConfig, 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, v as reloadConfig, x as PATHS } from "./config-store-CMgB1mCV.js";
-import { C as isGpt56OrAbove, S as isContextManagementEnabledForResponses, T as setModelMappings, _ as getModelResponsesApiCompactThreshold$1, b as getSmallModelForProvider, d as getOpencodeGoModelIds, f as getOpencodeGoModelRecords, g as getModelMappings, h as getExtraPromptForModel, i as listEnabledProviders, l as getModelsDevModelMaxOutputTokens, n as getRawProviderConfig, o as resolveEffectiveProviderType, s as resolveProviderConfigForModel, t as getProviderConfig, u as getOpencodeGoModelConfig, v as getReasoningEffortForModel, w as resolveMappedModel, x as isContextManagementEnabledForMessages, y as getSmallModel } from "./config-DIDLVXMU.js";
-import { i as HTTPError, r as isGitHubCopilotEnabled, s as forwardError } from "./github-copilot-provider-CLEAHyT-.js";
-import { $ as createResponsesHttpEventStream, A as compactSystemPromptStarts, C as prepareForCompact, D as compactAutoContinuePromptStarts, H as readGitHubToken, I as getXaiAccessToken, J as forwardCodexResponses, K as CODEX_API_BASE_URL, M as createAuthMiddleware, N as getConfiguredAdminApiKeys, O as compactMessageSections, Q as fetchUpstreamWithLifecycle, S as copilotWebSocketHeaders, T as prepareMessageProxyHeaders, U as readGitHubTokenFromEnv, X as requestContext, Y as generateTraceId, Z as resolveTraceId$1, _ as parseUserIdMetadata, at as state, b as copilotHeaders, d as generateRequestIdFromPayload, et as createResponsesSafeStream, f as getRootSessionId, g as isResponsesStream, h as isNullish, it as createWebSocketUrl, j as compactTextOnlyGuard, m as isAsyncIterable, n as invalidateCodexRuntime, nt as getResponsesStreamTerminalDisposition, p as getUUID, q as buildCodexRequestHeaders, rt as createPooledWebSocketStream, s as setupCodexToken, st as stripInternalRequestHeaders, tt as encodePoolKeyPart, u as stopCopilotRefreshLoop, v as getCopilotUsage, w as prepareInteractionHeaders, y as copilotBaseUrl } from "./token-BjzzuPSb.js";
+import { a as getAnthropicApiKey, c as getConfig, 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, v as reloadConfig, x as PATHS } from "./config-store-Bgmf82i_.js";
+import { C as isGpt56OrAbove, S as isContextManagementEnabledForResponses, T as setModelMappings, _ as getModelResponsesApiCompactThreshold$1, b as getSmallModelForProvider, d as getOpencodeGoModelIds, f as getOpencodeGoModelRecords, g as getModelMappings, h as getExtraPromptForModel, i as listEnabledProviders, l as getModelsDevModelMaxOutputTokens, n as getRawProviderConfig, o as resolveEffectiveProviderType, s as resolveProviderConfigForModel, t as getProviderConfig, u as getOpencodeGoModelConfig, v as getReasoningEffortForModel, w as resolveMappedModel, x as isContextManagementEnabledForMessages, y as getSmallModel } from "./config-D1F-TyTn.js";
+import { i as HTTPError, r as isGitHubCopilotEnabled, s as forwardError, t as GITHUB_COPILOT_PROVIDER } from "./github-copilot-provider-Cx4Afaco.js";
+import { $ as fetchUpstreamWithLifecycle, A as compactSystemPromptStarts, C as prepareForCompact, D as compactAutoContinuePromptStarts, H as readGitHubToken, I as getXaiAccessToken, J as buildCodexRequestHeaders, M as createAuthMiddleware, N as getConfiguredAdminApiKeys, O as compactMessageSections, Q as resolveTraceId$1, S as copilotWebSocketHeaders, T as prepareMessageProxyHeaders, U as readGitHubTokenFromEnv, W as XAI_API_BASE_URL, X as generateTraceId, Y as forwardCodexResponses, Z as requestContext, _ as parseUserIdMetadata, at as createWebSocketUrl, b as copilotHeaders, ct as stripInternalRequestHeaders, d as generateRequestIdFromPayload, et as createResponsesHttpEventStream, f as getRootSessionId, g as isResponsesStream, h as isNullish, it as createPooledWebSocketStream, j as compactTextOnlyGuard, m as isAsyncIterable, n as invalidateCodexRuntime, nt as encodePoolKeyPart, ot as state, p as getUUID, q as CODEX_API_BASE_URL, rt as getResponsesStreamTerminalDisposition, s as setupCodexToken, tt as createResponsesSafeStream, u as stopCopilotRefreshLoop, v as getCopilotUsage, w as prepareInteractionHeaders, y as copilotBaseUrl } from "./token-CBDlQufZ.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 { n as isProviderCodexModelVisible, t as getProviderCodexModels } from "./provider-management-BjU3aJnC.js";
-import { a as normalizeSdkModelId, n as stopModelsRefreshLoop, o as toClientModelId, r as findEndpointModel, t as setupCopilotRuntime } from "./copilot-runtime-CRTYwDWy.js";
+import { n as isProviderAgentModelVisible, t as getProviderAgentModels } from "./provider-management-DiQ92JMT.js";
+import { n as stopModelsRefreshLoop, t as setupCopilotRuntime } from "./copilot-runtime-BCf245Y5.js";
 import consola from "consola";
-import { createHash } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import fs, { createWriteStream, readFileSync, rmSync } from "node:fs";
 import path, { join } from "node:path";
 import fs$1, { mkdtemp, rm } from "node:fs/promises";
@@ -275,6 +275,68 @@ const createHandlerLogger = (name) => {
 	return instance;
 };
 //#endregion
+//#region src/lib/models.ts
+/**
+* Converts a Copilot upstream model ID to a client-friendly ID that Claude Code
+* and Claude Desktop recognize (dots in version replaced with hyphens).
+* e.g. "claude-sonnet-4.6" -> "claude-sonnet-4-6"
+* Non-Claude models are returned unchanged.
+*/
+const toClientModelId = (modelId) => {
+	const normalized = normalizeSdkModelId(modelId);
+	if (!normalized) return modelId;
+	const versionHyphenated = normalized.version.replaceAll(".", "-");
+	return `claude-${normalized.family}-${versionHyphenated}`;
+};
+const findEndpointModel = (sdkModelId) => {
+	const models = state.models?.data ?? [];
+	const exactMatch = models.find((m) => m.id === sdkModelId);
+	if (exactMatch) return exactMatch;
+	const normalized = normalizeSdkModelId(sdkModelId);
+	if (!normalized) return;
+	const modelName = `claude-${normalized.family}-${normalized.version}`;
+	const model = models.find((m) => m.id === modelName);
+	if (model) return model;
+};
+/**
+* Normalizes an SDK model ID to extract the model family and version.
+* this method from github copilot extension
+* Examples:
+* - "claude-opus-4-5-20251101" -> { family: "opus", version: "4.5" }
+* - "claude-3-5-sonnet-20241022" -> { family: "sonnet", version: "3.5" }
+* - "claude-sonnet-4-20250514" -> { family: "sonnet", version: "4" }
+* - "claude-haiku-3-5-20250514" -> { family: "haiku", version: "3.5" }
+* - "claude-haiku-4.5" -> { family: "haiku", version: "4.5" }
+*/
+const normalizeSdkModelId = (sdkModelId) => {
+	const withoutDate = sdkModelId.toLowerCase().replace(/-\d{8}$/, "");
+	const pattern1 = withoutDate.match(/^claude-(\w+)-(\d+)\.(\d+)$/);
+	if (pattern1) return {
+		family: pattern1[1],
+		version: `${pattern1[2]}.${pattern1[3]}`
+	};
+	const pattern2 = withoutDate.match(/^claude-(\w+)-(\d+)-(\d+)$/);
+	if (pattern2) return {
+		family: pattern2[1],
+		version: `${pattern2[2]}.${pattern2[3]}`
+	};
+	const pattern3 = withoutDate.match(/^claude-(\d+)-(\d+)-(\w+)$/);
+	if (pattern3) return {
+		family: pattern3[3],
+		version: `${pattern3[1]}.${pattern3[2]}`
+	};
+	const pattern4 = withoutDate.match(/^claude-(\w+)-(\d+)$/);
+	if (pattern4) return {
+		family: pattern4[1],
+		version: pattern4[2]
+	};
+	const pattern5 = withoutDate.match(/^claude-(\d+)-(\w+)$/);
+	if (pattern5) return {
+		family: pattern5[2],
+		version: pattern5[1]
+	};
+};
+//#endregion
 //#region src/lib/provider-model.ts
 const parseProviderModelAlias = (model) => {
 	const separatorIndex = model.indexOf("/");
@@ -355,6 +417,7 @@ async function resolveProviderConfig(providerName, getAzureAccessToken = getDefa
 		const accessToken = await getXaiAccessToken();
 		return accessToken ? {
 			...providerConfig,
+			baseUrl: providerConfig.baseUrl === "https://api.x.ai" ? XAI_API_BASE_URL : providerConfig.baseUrl,
 			apiKey: accessToken
 		} : null;
 	}
@@ -2173,6 +2236,36 @@ const createResponsesWebSocketStreamChunk = (data) => {
 	}
 };
 //#endregion
+//#region src/lib/grok-build.ts
+const VERSION_URL = "https://x.ai/cli/stable";
+const VERSION_CACHE_MS = 864e5;
+const VERSION_RETRY_MS = 3e5;
+let cachedVersion = "1.0.46";
+let nextVersionCheck = 0;
+let versionInFlight;
+async function refreshGrokBuildVersion() {
+	nextVersionCheck = Date.now() + VERSION_RETRY_MS;
+	try {
+		const response = await fetch(VERSION_URL, { signal: AbortSignal.timeout(3e3) });
+		if (response.ok) {
+			const version = (await response.text()).trim();
+			if (/^\d+\.\d+\.\d+$/u.test(version)) {
+				cachedVersion = version;
+				nextVersionCheck = Date.now() + VERSION_CACHE_MS;
+			}
+		}
+	} catch {}
+	return cachedVersion;
+}
+async function getGrokBuildVersion() {
+	if (versionInFlight) return await versionInFlight;
+	if (Date.now() < nextVersionCheck) return cachedVersion;
+	versionInFlight = refreshGrokBuildVersion().finally(() => {
+		versionInFlight = void 0;
+	});
+	return await versionInFlight;
+}
+//#endregion
 //#region src/lib/timeout-dispatcher.ts
 /**
 * Node's global fetch keeps Undici's shorter default headers/body timeouts.
@@ -2240,6 +2333,21 @@ const applyOpencodeSessionHeader = (providerConfig, headers, session) => {
 	if (providerConfig.name !== OPENCODE_GO_PROVIDER_NAME || !session) return;
 	headers[OPENCODE_SESSION_HEADER] = session;
 };
+async function applyXaiGrokBuildHeaders(providerConfig, headers, payload) {
+	if (providerConfig.name !== "xai" || providerConfig.authType !== "oauth2" || new URL(providerConfig.baseUrl).origin !== "https://cli-chat-proxy.grok.com") return;
+	const cacheKey = payload.prompt_cache_key;
+	const sessionId = cacheKey?.trim() ? cacheKey : requestContext.getStore()?.sessionAffinity?.trim();
+	if (!sessionId) throw new Error("xAI OAuth Responses requests require prompt_cache_key or session affinity");
+	headers["x-xai-token-auth"] = "xai-grok-cli";
+	headers["x-authenticateresponse"] = "authenticate-response";
+	headers["x-grok-client-version"] = await getGrokBuildVersion();
+	headers["x-grok-client-identifier"] = "grok-shell";
+	headers["x-grok-client-mode"] = "headless";
+	headers["x-grok-model-override"] = payload.model;
+	headers["x-grok-conv-id"] = sessionId;
+	headers["x-grok-session-id"] = sessionId;
+	headers["x-grok-req-id"] = randomUUID();
+}
 function createProviderProxyResponse(upstreamResponse, body) {
 	return new Response(body ?? upstreamResponse.body, {
 		headers: createProviderProxyResponseHeaders(upstreamResponse.headers),
@@ -2287,6 +2395,7 @@ async function forwardProviderResponses(providerConfig, payload, requestHeaders,
 	const transportConfig = getUpstreamTransportConfig();
 	const headers = buildProviderUpstreamHeaders(providerConfig, requestHeaders);
 	applyOpencodeSessionHeader(providerConfig, headers, payload.prompt_cache_key?.trim() || void 0);
+	await applyXaiGrokBuildHeaders(providerConfig, headers, payload);
 	return await fetchUpstreamWithLifecycle(resolveProviderEndpointUrl(providerConfig, "responses"), {
 		method: "POST",
 		headers,
@@ -3943,6 +4052,33 @@ const imageRoutes = new Hono();
 imageRoutes.post("/generations", handleImagesGenerations);
 imageRoutes.post("/edits", handleImagesEdits);
 //#endregion
+//#region src/lib/claude-models.ts
+const DISCOVERY_MODEL_PREFIX = "my-claude-";
+const DISCOVERY_MODEL_SUFFIX = "[1m]";
+function isClaudeUserAgent(userAgent) {
+	return userAgent?.toLowerCase().includes("claude") ?? false;
+}
+/** Advertise every discovery ID with [1m], keeping its provider namespace. */
+function toClaudeDiscoveryModelId(modelId) {
+	const discoveryId = `${stripDiscoveryModelSuffix(modelId)}${DISCOVERY_MODEL_SUFFIX}`;
+	if (discoveryId.toLowerCase().includes("claude")) return discoveryId;
+	const modelStart = discoveryId.indexOf("/") + 1;
+	const model = discoveryId.slice(modelStart);
+	return `${discoveryId.slice(0, modelStart)}${DISCOVERY_MODEL_PREFIX}${model}`;
+}
+/** Restore the upstream ID before model mappings and provider resolution. */
+function fromClaudeDiscoveryModelId(modelId) {
+	const upstreamId = stripDiscoveryModelSuffix(modelId);
+	if (upstreamId.startsWith(DISCOVERY_MODEL_PREFIX)) return upstreamId.slice(10);
+	const modelStart = upstreamId.indexOf("/") + 1;
+	const model = upstreamId.slice(modelStart);
+	if (!model.startsWith(DISCOVERY_MODEL_PREFIX)) return upstreamId;
+	return `${upstreamId.slice(0, modelStart)}${model.slice(10)}`;
+}
+function stripDiscoveryModelSuffix(modelId) {
+	return modelId.endsWith(DISCOVERY_MODEL_SUFFIX) ? modelId.slice(0, -4) : modelId;
+}
+//#endregion
 //#region src/lib/tokenizer.ts
 const ENCODING_MAP = {
 	o200k_base: () => import("gpt-tokenizer/encoding/o200k_base"),
@@ -4963,8 +5099,10 @@ const prepareMessagesApiPayload = (payload, selectedModel) => {
 const logger$11 = createHandlerLogger("provider-count-tokens-handler");
 async function handleProviderCountTokens(c) {
 	const provider = c.req.param("provider");
+	const payload = await c.req.json();
+	payload.model = fromClaudeDiscoveryModelId(payload.model);
 	return await handleProviderCountTokensForProvider(c, {
-		payload: await c.req.json(),
+		payload,
 		provider
 	});
 }
@@ -5044,7 +5182,7 @@ async function countTokensViaAnthropic(c, payload) {
 */
 async function handleCountTokens(c) {
 	const anthropicPayload = await c.req.json();
-	anthropicPayload.model = resolveMappedModel(anthropicPayload.model);
+	anthropicPayload.model = resolveMappedModel(fromClaudeDiscoveryModelId(anthropicPayload.model));
 	normalizeSystemMessages(anthropicPayload);
 	const providerModelAlias = await resolveConfiguredProviderModelAlias(anthropicPayload.model);
 	if (providerModelAlias) {
@@ -8024,6 +8162,7 @@ const providerMessagesHandlerDependencies = { resolveProviderConfig };
 async function handleProviderMessages(c) {
 	const provider = c.req.param("provider");
 	const payload = await c.req.json();
+	payload.model = fromClaudeDiscoveryModelId(payload.model);
 	const claudeAutoModel = getClaudeAutoModel();
 	if (claudeAutoModel && isClaudeAutoModelRequest(payload)) {
 		consola.debug(`Claude auto model override (${provider}): ${payload.model} -> ${claudeAutoModel}`);
@@ -9076,7 +9215,9 @@ const messagesFlowHandlers = {
 	handleWithResponsesApi
 };
 async function handleCompletion(c) {
-	return await handleCompletionPayload(c, await c.req.json());
+	const anthropicPayload = await c.req.json();
+	anthropicPayload.model = fromClaudeDiscoveryModelId(anthropicPayload.model);
+	return await handleCompletionPayload(c, anthropicPayload);
 }
 async function handleCompletionPayload(c, anthropicPayload, dispatchOptions = {}) {
 	const requestedModel = anthropicPayload.model;
@@ -9192,6 +9333,22 @@ messageRoutes.post("/count_tokens", async (c) => {
 		return await forwardError(c, error);
 	}
 });
+//#endregion
+//#region src/lib/model-display-name.ts
+/** Keep upstream labels as the base and identify their gateway provider. */
+function withModelDisplayName(model, provider) {
+	if (typeof model !== "object" || model === null || Array.isArray(model)) return model;
+	const fields = model;
+	const hasDisplayName = Object.hasOwn(model, "display_name");
+	let displayName = hasDisplayName ? fields.display_name : typeof fields.name === "string" && fields.name.trim() ? fields.name : fields.id;
+	const providerName = provider?.trim();
+	if (providerName && typeof displayName === "string" && displayName.trim() && !displayName.startsWith(`${providerName} `) && !displayName.endsWith(` (${providerName})`)) displayName = `${displayName} (${providerName})`;
+	if (hasDisplayName && displayName === fields.display_name) return model;
+	return {
+		...model,
+		display_name: displayName
+	};
+}
 const DEFAULT_EXCLUSION_THRESHOLD = 20;
 const DEFAULT_EXCLUDED_MODELS = /* @__PURE__ */ new Set([
 	"gpt-5.6-sol",
@@ -10837,8 +10994,8 @@ async function handleCodexModelsProxy(c, resolvedProviderConfig) {
 	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);
+		models: catalog.models.filter((model) => isProviderAgentModelVisible(providerConfig, model.slug))
+	}, new Set(getProviderAgentModels(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) => {
@@ -10851,9 +11008,9 @@ async function handleMergedCodexModels(c, candidatesRequest, options = {}) {
 	const catalogModelsBySlug = new Map(upstreamModels.map((model) => [model.slug, model]));
 	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 visibleUpstreamModels = upstreamModels.filter((model) => isProviderAgentModelVisible(codexConfig, model.slug) && (upstreamCatalog !== void 0 || codexConfig !== null || isProviderAgentModelVisible(copilotConfig, model.slug)));
 	const explicitSlugs = /* @__PURE__ */ new Set();
-	const codexSelection = getProviderCodexModels(codexConfig);
+	const codexSelection = getProviderAgentModels(codexConfig);
 	for (const model of visibleUpstreamModels) if (codexSelection?.includes(model.slug)) {
 		explicitSlugs.add(model.slug);
 		explicitSlugs.add(`codex/${model.slug}`);
@@ -10862,9 +11019,9 @@ async function handleMergedCodexModels(c, candidatesRequest, options = {}) {
 		const providerName = candidate.providerName ?? "github-copilot";
 		const modelId = candidate.catalogSlug ?? (candidate.providerName ? candidate.slug.slice(providerName.length + 1) : candidate.slug);
 		const config = getRawProviderConfig(providerName);
-		const selectedModels = getProviderCodexModels(config);
+		const selectedModels = getProviderAgentModels(config);
 		const selectionId = providerName === "github-copilot" && selectedModels?.includes(candidate.slug) ? candidate.slug : modelId;
-		if (!isProviderCodexModelVisible(config, selectionId)) return false;
+		if (!isProviderAgentModelVisible(config, selectionId)) return false;
 		if (selectedModels?.includes(selectionId)) explicitSlugs.add(candidate.slug);
 		return true;
 	});
@@ -11038,18 +11195,16 @@ function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function normalizeCopilotModel(model) {
-	const contextWindow = model.capabilities?.limits?.max_context_window_tokens ?? 0;
 	const clientId = toClientModelId(model.id);
 	return {
-		claude_model_id: contextWindow >= 1e6 ? `${clientId}[1m]` : clientId,
-		...model,
+		claude_model_id: `${clientId}[1m]`,
+		...withModelDisplayName(model, GITHUB_COPILOT_PROVIDER),
 		id: clientId,
 		object: "model",
 		type: "model",
 		created: 0,
 		created_at: EPOCH_ISO,
-		owned_by: model.vendor,
-		display_name: model.name
+		owned_by: model.vendor
 	};
 }
 function getStringField(model, field) {
@@ -11070,17 +11225,15 @@ function normalizeProviderModel(provider, model) {
 	const rawId = getStringField(model, "id");
 	if (!rawId) return null;
 	const id = `${provider}/${rawId}`;
-	const name = getStringField(model, "display_name") ?? getStringField(model, "name") ?? rawId;
 	const ownedBy = getStringField(model, "owned_by") ?? getStringField(model, "vendor") ?? provider;
 	return {
-		...model,
+		...withModelDisplayName(model, provider),
 		id,
 		object: getStringField(model, "object") ?? "model",
 		type: getStringField(model, "type") ?? "model",
 		created: typeof model.created === "number" ? model.created : 0,
 		created_at: getStringField(model, "created_at") ?? EPOCH_ISO,
-		owned_by: ownedBy,
-		display_name: name
+		owned_by: ownedBy
 	};
 }
 function normalizeProviderModels(provider, models) {
@@ -11099,13 +11252,12 @@ async function getProviderModelRecords(providerConfig, requestHeaders) {
 		return getFallbackProviderModelRecords(providerConfig.name, "error", { error });
 	}
 }
-async function getProviderModels(provider, requestHeaders) {
+async function getProviderModels(provider, requestHeaders, claudeClient) {
 	try {
 		const providerConfig = await resolveProviderConfig(provider);
 		if (!providerConfig) return [];
-		if (providerConfig.name === "codex") return normalizeProviderModels(providerConfig.name, getModels().data);
-		const models = await getProviderModelRecords(providerConfig, requestHeaders);
-		return normalizeProviderModels(providerConfig.name, models);
+		const models = providerConfig.name === "codex" ? getModels().data : await getProviderModelRecords(providerConfig, requestHeaders);
+		return normalizeProviderModels(providerConfig.name, claudeClient ? selectClaudeProviderModels(providerConfig, models) : models);
 	} catch (error) {
 		if (provider === "codex") {
 			logger$7.warn("models.provider.skip_error", {
@@ -11114,12 +11266,24 @@ async function getProviderModels(provider, requestHeaders) {
 			});
 			return [];
 		}
-		return normalizeProviderModels(provider, getFallbackProviderModelRecords(provider, "error", { error }));
+		const fallbackModels = getFallbackProviderModelRecords(provider, "error", { error });
+		return normalizeProviderModels(provider, claudeClient ? selectClaudeProviderModels(getRawProviderConfig(provider), fallbackModels) : fallbackModels);
 	}
 }
-async function getAggregatedModels(requestHeaders) {
-	const copilotModels = isGitHubCopilotEnabled() ? state.models?.data.map(normalizeCopilotModel) ?? [] : [];
-	const providerModelsByProvider = await Promise.all(listEnabledProviders().map((provider) => getProviderModels(provider, requestHeaders)));
+function selectClaudeProviderModels(providerConfig, models) {
+	const selection = getProviderAgentModels(providerConfig);
+	if (selection === void 0) return models;
+	const modelsById = new Map(models.flatMap((model) => {
+		if (!isRecord(model)) return [];
+		const id = getStringField(model, "id");
+		return id ? [[id, model]] : [];
+	}));
+	return selection.map((id) => modelsById.get(id) ?? { id });
+}
+async function getAggregatedModels(requestHeaders, claudeClient) {
+	const copilotSelection = claudeClient ? getProviderAgentModels(getRawProviderConfig("github-copilot")) : void 0;
+	const copilotModels = isGitHubCopilotEnabled() ? state.models?.data.filter((model) => copilotSelection === void 0 || copilotSelection.includes(model.id) || copilotSelection.includes(toClientModelId(model.id))).map(normalizeCopilotModel) ?? [] : [];
+	const providerModelsByProvider = await Promise.all(listEnabledProviders().map((provider) => getProviderModels(provider, requestHeaders, claudeClient)));
 	const models = [...copilotModels, ...providerModelsByProvider.flat()];
 	const seenModelIds = /* @__PURE__ */ new Set();
 	return models.filter((model) => {
@@ -11304,10 +11468,16 @@ modelRoutes.get("/", async (c) => {
 				codexProviderName
 			});
 		}
-		const models = await getAggregatedModels(stripInternalRequestHeaders(c.req.raw.headers));
+		const claudeClient = isClaudeUserAgent(c.req.header("user-agent"));
+		const models = await getAggregatedModels(stripInternalRequestHeaders(c.req.raw.headers), claudeClient);
+		const clientModels = claudeClient ? models.map((model) => ({
+			...model,
+			id: toClaudeDiscoveryModelId(model.id),
+			...typeof model.claude_model_id === "string" ? { claude_model_id: toClaudeDiscoveryModelId(model.claude_model_id) } : {}
+		})) : models;
 		return c.json({
 			object: "list",
-			data: models,
+			data: clientModels,
 			has_more: false
 		});
 	} catch (error) {
@@ -11413,7 +11583,7 @@ providerModelRoutes.get("/", async (c) => {
 			const models = getModels();
 			return c.json({
 				object: "list",
-				data: models.data,
+				data: models.data.map((model) => withModelDisplayName(model, providerConfig.name)),
 				has_more: false
 			});
 		}
@@ -11425,13 +11595,13 @@ providerModelRoutes.get("/", async (c) => {
 			} }, 503);
 			return c.json({
 				object: "list",
-				data: models,
+				data: models.map((model) => withModelDisplayName(model, providerConfig.name)),
 				has_more: false
 			});
 		}
 		if (providerConfig.name === "xai" && providerConfig.authType === "oauth2") return c.json({
 			object: "list",
-			data: getBuiltinProviderModelRecords("xai"),
+			data: getBuiltinProviderModelRecords("xai").map((model) => withModelDisplayName(model, providerConfig.name)),
 			has_more: false
 		});
 		const upstreamResponse = await forwardProviderModels(providerConfig, c.req.raw.headers);
@@ -11439,6 +11609,23 @@ providerModelRoutes.get("/", async (c) => {
 			provider,
 			statusCode: upstreamResponse.status
 		});
+		if (upstreamResponse.ok) {
+			const body = await upstreamResponse.clone().json().catch(() => null);
+			if (typeof body === "object" && body !== null && "data" in body && Array.isArray(body.data)) {
+				const upstreamModels = body.data;
+				const data = upstreamModels.map((model) => withModelDisplayName(model, providerConfig.name));
+				if (data.every((model, index) => model === upstreamModels[index])) return createProviderProxyResponse(upstreamResponse);
+				const headers = createProviderProxyResponseHeaders(upstreamResponse.headers);
+				headers.delete("etag");
+				return Response.json({
+					...body,
+					data
+				}, {
+					status: upstreamResponse.status,
+					headers
+				});
+			}
+		}
 		return createProviderProxyResponse(upstreamResponse);
 	} catch (error) {
 		logger$4.error("provider.models.error", {
@@ -12950,4 +13137,4 @@ createServer();
 //#endregion
 export { createServer };
 
-//# sourceMappingURL=server-DbkseGH6.js.map
+//# sourceMappingURL=server-BmGSx45N.js.map