@jeffreycao/copilot-api 2.7.1 → 2.7.3

package/dist/{server-BYG25POu.js → server-MhaCql-j.js}

@@ -1,10 +1,10 @@
-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-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 state, A as compactAutoContinuePromptStarts, B as CODEX_API_BASE_URL, C as copilotHeaders, D as prepareInteractionHeaders, E as prepareForCompact, F as createAuthMiddleware, G as resolveTraceId$1, H as forwardCodexResponses, I as getConfiguredAdminApiKeys, J as createResponsesSafeStream, K as fetchUpstreamWithLifecycle, N as compactSystemPromptStarts, O as prepareMessageProxyHeaders, P as compactTextOnlyGuard, Q as createWebSocketUrl, S as copilotBaseUrl, T as copilotWebSocketHeaders, U as generateTraceId, V as buildCodexRequestHeaders, W as requestContext, X as getResponsesStreamTerminalDisposition, Y as encodePoolKeyPart, Z as createPooledWebSocketStream, _ as parseUserIdMetadata, b as readGitHubToken, d as generateRequestIdFromPayload, f as getRootSessionId, g as isResponsesStream, h as isNullish, j as compactMessageSections, m as isAsyncIterable, n as invalidateCodexRuntime, p as getUUID, q as createResponsesHttpEventStream, s as setupCodexToken, tt as stripInternalRequestHeaders, u as stopCopilotRefreshLoop, v as getCopilotUsage, x as readGitHubTokenFromEnv } from "./token-Cx07G8-R.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 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-D53u0RgN.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-z3m7cUkp.js";
-import { a as normalizeSdkModelId, n as stopModelsRefreshLoop, o as toClientModelId, r as findEndpointModel, t as setupCopilotRuntime } from "./copilot-runtime-B7T_EuGD.js";
+import { n as isProviderAgentModelVisible, t as getProviderAgentModels } from "./provider-management-DiQ92JMT.js";
+import { n as stopModelsRefreshLoop, t as setupCopilotRuntime } from "./copilot-runtime-eo27cGBr.js";
 import consola from "consola";
 import { createHash } from "node:crypto";
 import fs, { createWriteStream, readFileSync, rmSync } from "node:fs";
@@ -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("/");
@@ -351,6 +413,13 @@ async function resolveProviderConfig(providerName, getAzureAccessToken = getDefa
 		};
 	}
 	const providerConfig = getProviderConfig(normalizedProviderName);
+	if (providerConfig?.name === "xai" && providerConfig.authType === "oauth2") {
+		const accessToken = await getXaiAccessToken();
+		return accessToken ? {
+			...providerConfig,
+			apiKey: accessToken
+		} : null;
+	}
 	if (providerConfig?.authType !== "azure-entra") return providerConfig;
 	try {
 		return {
@@ -442,6 +511,28 @@ const CODEX_LUNA_PRICING = { tiers: [{
 }] };
 const builtinProviderModelRegistry = new class BuiltinProviderModelRegistry {
 	static catalog = {
+		xai: { "grok-4.7": {
+			contextWindow: 5e5,
+			maxOutputTokens: 5e5,
+			inputModalities: ["text", "image"],
+			reasoningEfforts: [
+				"low",
+				"medium",
+				"high",
+				"xhigh"
+			],
+			defaultReasoningEffort: "high",
+			pricing: { tiers: [{
+				cachedInput: .5,
+				input: 2,
+				output: 6,
+				maxInputTokens: 2e5
+			}, {
+				cachedInput: 1,
+				input: 4,
+				output: 12
+			}] }
+		} },
 		codex: {
 			"codex-auto-review": { pricing: CODEX_LUNA_PRICING },
 			"gpt-reserve": { pricing: CODEX_LUNA_PRICING },
@@ -759,6 +850,20 @@ const builtinProviderModelRegistry = new class BuiltinProviderModelRegistry {
 		return value.trim().toLowerCase();
 	}
 }();
+function getBuiltinProviderModelRecords(provider) {
+	return builtinProviderModelRegistry.getModelIds(provider).map((id) => {
+		const config = builtinProviderModelRegistry.getModelConfig(provider, id);
+		return {
+			id,
+			name: id,
+			object: "model",
+			context_window: config?.contextWindow,
+			max_output_tokens: config?.maxOutputTokens,
+			input_modalities: config?.inputModalities,
+			reasoning_efforts: config?.reasoningEfforts
+		};
+	});
+}
 //#endregion
 //#region src/lib/sqlite.ts
 const MINIMUM_NODE_SQLITE_VERSION = "22.13.0";
@@ -3900,6 +4005,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"),
@@ -4141,6 +4273,7 @@ function translateToOpenAI(payload, options = {}) {
 		toolContentSupportType: options.toolContentSupportType ?? []
 	};
 	const tools = translateAnthropicToolsToOpenAI(payload.tools);
+	const parallelToolCalls = translateParallelToolCalls(payload.tool_choice);
 	return {
 		model: modelId,
 		messages: translateAnthropicMessagesToOpenAI(payload, modelId, capabilities),
@@ -4154,7 +4287,8 @@ function translateToOpenAI(payload, options = {}) {
 		tool_choice: tools && tools.length > 0 ? translateAnthropicToolChoiceToOpenAI(payload.tool_choice) : void 0,
 		thinking_budget: thinkingBudget,
 		...reasoningEffort ? { reasoning_effort: reasoningEffort } : {},
-		...promptCacheKey ? { prompt_cache_key: promptCacheKey } : {}
+		...promptCacheKey ? { prompt_cache_key: promptCacheKey } : {},
+		...parallelToolCalls === void 0 ? {} : { parallel_tool_calls: parallelToolCalls }
 	};
 }
 function getReasoningEffort(payload, options) {
@@ -4394,6 +4528,10 @@ function translateAnthropicToolChoiceToOpenAI(anthropicToolChoice) {
 		default: return;
 	}
 }
+function translateParallelToolCalls(toolChoice) {
+	if (typeof toolChoice?.disable_parallel_tool_use !== "boolean") return;
+	return !toolChoice.disable_parallel_tool_use;
+}
 function translateToAnthropic(response) {
 	const assistantContentBlocks = [];
 	let stopReason = response.choices[0]?.finish_reason ?? null;
@@ -4914,8 +5052,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
 	});
 }
@@ -4995,7 +5135,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) {
@@ -5427,17 +5567,24 @@ const translateAnthropicMessagesToResponsesPayload = (payload, subagentAgentId)
 		metadata: payload.metadata ? { ...payload.metadata } : null,
 		stream: payload.stream ?? null,
 		store: false,
-		parallel_tool_calls: true,
+		parallel_tool_calls: !payload.tool_choice?.disable_parallel_tool_use,
 		reasoning: {
 			effort: resolveReasoningEffort(payload),
-			summary: "auto",
+			summary: payload.model.includes("grok") ? "concise" : "auto",
 			context: isSupportAllTurns(payload) ? "all_turns" : "auto"
 		},
 		include: ["reasoning.encrypted_content"]
 	};
 	if (translatedTools && translatedTools.length > 0) responsesPayload.tool_choice = toolChoice;
 	if (hasOriginalTools) responsesPayload.prompt_cache_key = promptCacheKey;
-	if (responsesPayload.model.includes("grok")) delete responsesPayload.metadata;
+	if (responsesPayload.model.includes("grok")) {
+		delete responsesPayload.metadata;
+		delete responsesPayload.temperature;
+		delete responsesPayload.top_p;
+		delete responsesPayload.max_output_tokens;
+		if (responsesPayload.instructions) input.unshift(createMessage("system", responsesPayload.instructions));
+		delete responsesPayload.instructions;
+	}
 	return responsesPayload;
 };
 const encodeCompactionCarrierSignature = (compaction) => {
@@ -6552,6 +6699,7 @@ const MESSAGES_TOOL_CALL_TIPS = [
 	"- For long-running commands, keep the returned `session_id` and poll it with `tools.write_stdin` until the command finishes; do not redirect output to a temp file and read it back in a second call.",
 	"- If `functions__exec` returns `aborted`, retry at most 3 times. After 3 failures, terminate immediately and inform the user that `functions__exec` is unavailable."
 ].join("\n");
+const MESSAGES_BATCH_TOOL_CALL_TIPS = ["- Parallel tool calls are disabled for this request. Batch independent commands in one functions__exec call; keep dependent operations sequential.", "const results = await Promise.allSettled([tools.exec_command({cmd: \"git status --short\"})]); for (const result of results) text(JSON.stringify(result.status === \"fulfilled\" ? result.value : {error: String(result.reason)}))"].join("\n");
 const JSON_OUTPUT_CONSTRAINT = "Do not wrap the JSON in markdown code fences and do not add any text outside the JSON object.";
 const buildOutputFormatInstruction = (format) => {
 	if (!format) return null;
@@ -6588,6 +6736,7 @@ function translateResponsesToMessages(payload, options) {
 	const normalized = normalizeResponsesInput(payload.input);
 	const outputFormatInstruction = buildOutputFormatInstruction(payload.text?.format);
 	const { messages, system } = translateInputToAnthropic(normalized.input, registry, payload.instructions, payload.input, options.toolCallTips ?? false);
+	if (options.toolCallTips && payload.parallel_tool_calls === false) appendToolCallTips(system, MESSAGES_BATCH_TOOL_CALL_TIPS);
 	if (normalized.compaction) messages.push({
 		role: "user",
 		content: MESSAGES_COMPACTION_PROMPT
@@ -6603,7 +6752,7 @@ function translateResponsesToMessages(payload, options) {
 	const messagesPayload = {
 		model: options.model,
 		messages,
-		max_tokens: Math.max(1, payload.max_output_tokens ?? 32e3),
+		max_tokens: Math.max(1, payload.max_output_tokens ?? resolveDefaultMaxOutputTokens(options.model)),
 		stream: payload.stream ?? false,
 		temperature: payload.temperature ?? void 0,
 		top_p: payload.top_p ?? void 0,
@@ -6614,6 +6763,10 @@ function translateResponsesToMessages(payload, options) {
 		...payload.service_tier === "auto" || payload.service_tier === "standard_only" ? { service_tier: payload.service_tier } : {},
 		...metadataUserId ? { metadata: { user_id: metadataUserId } } : {}
 	};
+	if (payload.parallel_tool_calls != null && registry.tools.length > 0 && messagesPayload.tool_choice?.type !== "none") messagesPayload.tool_choice = {
+		...messagesPayload.tool_choice ?? { type: "auto" },
+		disable_parallel_tool_use: !payload.parallel_tool_calls
+	};
 	return {
 		compaction: normalized.compaction,
 		messagesPayload,
@@ -6622,6 +6775,17 @@ function translateResponsesToMessages(payload, options) {
 		registry
 	};
 }
+function resolveDefaultMaxOutputTokens(model) {
+	const alias = parseProviderModelAlias(model);
+	const providerConfig = alias ? getRawProviderConfig(alias.provider) : null;
+	const catalogMaxOutputTokens = alias ? getModelsDevModelMaxOutputTokens(providerConfig?.modelsDevProviderId || alias.provider, alias.model) : void 0;
+	const builtinModelConfig = alias ? builtinProviderModelRegistry.getModelConfig(alias.provider, alias.model) : void 0;
+	return (alias && (providerConfig || builtinModelConfig || catalogMaxOutputTokens) ? [
+		providerConfig?.models?.[alias.model]?.maxOutputTokens,
+		catalogMaxOutputTokens,
+		builtinModelConfig?.maxOutputTokens
+	] : [findEndpointModel(model)?.capabilities.limits.max_output_tokens]).find((limit) => typeof limit === "number" && Number.isInteger(limit) && limit > 0) ?? 32e3;
+}
 function translateAnthropicToResponses(response, context) {
 	const finish = translateStopReason(response.stop_reason);
 	const output = context.compaction ? translateCompactionOutput(response) : translateAssistantOutput(response, context.registry);
@@ -6826,16 +6990,16 @@ function translateInputToAnthropic(input, registry, instructions, originalInput,
 		system
 	};
 }
-function appendToolCallTips(system) {
+function appendToolCallTips(system, tips = MESSAGES_TOOL_CALL_TIPS) {
 	const lastSystemBlock = system.at(-1);
 	if (!lastSystemBlock) {
 		system.push({
 			type: "text",
-			text: MESSAGES_TOOL_CALL_TIPS
+			text: tips
 		});
 		return;
 	}
-	lastSystemBlock.text = `${lastSystemBlock.text}\n\n${MESSAGES_TOOL_CALL_TIPS}`;
+	lastSystemBlock.text = `${lastSystemBlock.text}\n\n${tips}`;
 }
 function translateInputItems(input, messages, system, registry) {
 	let userMessageSeen = false;
@@ -7951,6 +8115,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}`);
@@ -9003,7 +9168,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;
@@ -9119,6 +9286,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",
@@ -10764,8 +10947,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) => {
@@ -10778,9 +10961,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}`);
@@ -10789,9 +10972,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;
 	});
@@ -10965,31 +11148,22 @@ 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) {
 	const value = model[field];
 	return typeof value === "string" && value.trim() ? value : void 0;
 }
-function getBuiltinProviderModelRecords(provider) {
-	return builtinProviderModelRegistry.getModelIds(provider).map((id) => ({
-		id,
-		name: id,
-		object: "model"
-	}));
-}
 function getFallbackProviderModelRecords(provider, reason, details = {}) {
 	const fallbackModels = getBuiltinProviderModelRecords(provider);
 	logger$7.warn(`models.provider.fallback_${reason}`, {
@@ -11004,17 +11178,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) {
@@ -11022,6 +11194,7 @@ function normalizeProviderModels(provider, models) {
 }
 async function getProviderModelRecords(providerConfig, requestHeaders) {
 	if (providerConfig.name === "opencode-go") return getOpencodeGoModelRecords();
+	if (providerConfig.name === "xai" && providerConfig.authType === "oauth2") return getBuiltinProviderModelRecords("xai");
 	try {
 		const response = await forwardProviderModels(providerConfig, requestHeaders);
 		if (!response.ok) return getFallbackProviderModelRecords(providerConfig.name, "non_ok", { statusCode: response.status });
@@ -11032,13 +11205,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", {
@@ -11047,12 +11219,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) => {
@@ -11128,7 +11312,7 @@ async function getProviderCodexCandidates(provider, requestHeaders) {
 			const id = getStringField(model, "id");
 			return id ? [[id, model]] : [];
 		}));
-		const modelIds = /* @__PURE__ */ new Set([...remoteById.keys(), ...Object.keys(providerConfig.models ?? {})]);
+		const modelIds = /* @__PURE__ */ new Set([...remoteById.keys(), ...providerConfig.name === "xai" && providerConfig.authType === "oauth2" ? [] : Object.keys(providerConfig.models ?? {})]);
 		const candidates = [];
 		for (const modelId of modelIds) {
 			const effectiveType = resolveEffectiveProviderType(providerConfig, modelId);
@@ -11178,7 +11362,7 @@ function createProviderCodexCandidate(providerConfig, modelId, remoteModel, mode
 			"max_context_length",
 			"max_model_len"
 		]) ?? builtinModelConfig?.contextWindow, 256e3),
-		maxOutputTokens: positiveNumber(modelConfig?.maxOutputTokens ?? getFirstPositiveNumber(remoteModel, ["max_output_tokens"]) ?? builtinModelConfig?.maxOutputTokens, 32e3),
+		maxOutputTokens: positiveNumber(modelConfig?.maxOutputTokens ?? getFirstPositiveNumber(remoteModel, ["max_output_tokens"]) ?? getModelsDevModelMaxOutputTokens(providerConfig.modelsDevProviderId || providerConfig.name, modelId) ?? builtinModelConfig?.maxOutputTokens, 32e3),
 		inputModalities: resolveInputModalities(providerConfig.name, configuredModalities, remoteModalities, builtinModalities),
 		reasoningEfforts,
 		defaultReasoningEffort: selectDefaultReasoningEffort(reasoningEfforts, modelConfig?.defaultReasoningEffort ?? builtinModelConfig?.defaultReasoningEffort)
@@ -11237,10 +11421,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) {
@@ -11346,7 +11536,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
 			});
 		}
@@ -11358,15 +11548,37 @@ 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").map((model) => withModelDisplayName(model, providerConfig.name)),
+			has_more: false
+		});
 		const upstreamResponse = await forwardProviderModels(providerConfig, c.req.raw.headers);
 		logger$4.debug("provider.models.response", {
 			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", {
@@ -12878,4 +13090,4 @@ createServer();
 //#endregion
 export { createServer };
 
-//# sourceMappingURL=server-BYG25POu.js.map
+//# sourceMappingURL=server-MhaCql-j.js.map