@jeffreycao/copilot-api 2.1.1 → 2.1.3

package/dist/main.js

@@ -25,7 +25,7 @@ bindElectronFetch();
 const { auth } = await import("./auth-DH-ThnhJ.js");
 const { debug } = await import("./debug-D2giR-Kj.js");
 const { mcp } = await import("./mcp-BG6fpi6q.js");
-const { start } = await import("./start-ObdI9ph2.js");
+const { start } = await import("./start-CfqpNRSH.js");
 await runMain(defineCommand({
 	meta: {
 		name: "copilot-api",

package/dist/{server---R3M8xj.js → server-CF6ryUB1.js}

@@ -2999,7 +2999,8 @@ async function handleCompletion$1(c) {
 		});
 	}
 	debugJson(logger$13, "Request payload:", payload);
-	const selectedModel = state.models?.data.find((model) => model.id === payload.model);
+	const selectedModel = findEndpointModel(payload.model);
+	payload.model = selectedModel?.id ?? payload.model;
 	if (isNullish(payload.max_tokens) && isNullish(payload.max_completion_tokens)) {
 		payload = {
 			...payload,
@@ -7338,9 +7339,9 @@ async function handleCompletionPayload(c, anthropicPayload, dispatchOptions = {}
 	debugJson(logger$9, "Anthropic request payload:", anthropicPayload);
 	normalizeSystemMessages(anthropicPayload);
 	sanitizeIdeTools(anthropicPayload);
-	const subagentMarker = parseSubagentMarkerFromFirstUser(anthropicPayload);
+	const subagentMarker = dispatchOptions.subagentMarker ?? parseSubagentMarkerFromFirstUser(anthropicPayload);
 	if (subagentMarker) debugJson(logger$9, "Detected Subagent marker:", subagentMarker);
-	let sessionId = getRootSessionId(anthropicPayload, c);
+	let sessionId = dispatchOptions.sessionId ?? getRootSessionId(anthropicPayload, c);
 	const compactType = dispatchOptions.compactType ?? getCompactType(anthropicPayload);
 	const anthropicBeta = c.req.header("anthropic-beta");
 	logger$9.debug("Anthropic Beta header:", anthropicBeta);
@@ -7356,7 +7357,7 @@ async function handleCompletionPayload(c, anthropicPayload, dispatchOptions = {}
 		mergeToolResultForClaude(anthropicPayload, { skipLastMessage: compactType === 1 });
 		applyLastMessageCacheControl(anthropicPayload, lastMessageCacheControl);
 	}
-	const requestId = generateRequestIdFromPayload(anthropicPayload, sessionId);
+	const requestId = dispatchOptions.requestId ?? generateRequestIdFromPayload(anthropicPayload, sessionId);
 	logger$9.debug("Generated request ID:", requestId);
 	if (!sessionId) sessionId = getUUID(requestId);
 	logger$9.debug("Extracted session ID:", sessionId);
@@ -7449,6 +7450,10 @@ const DEFAULT_REASONING_EFFORTS = [
 	"max",
 	"ultra"
 ];
+const CODEX_ALIAS_PRIORITY_BASE = 1e3;
+const COPILOT_PRIORITY_BASE = 2e3;
+const OPENCODE_GO_PRIORITY_BASE = 3e3;
+const PROVIDER_PRIORITY_BASE = 4e3;
 const DEFAULT_CODEX_TEMPLATE = {
 	slug: "gpt-5.6-sol",
 	display_name: "GPT-5.6-Sol",
@@ -7702,25 +7707,33 @@ async function handleMergedCodexModels(c, candidatesRequest, options = {}) {
 	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) => {
+	const codexProviderAliases = options.includeCodexProviderAliases ? upstreamModels.flatMap((model, index) => {
 		const slug = `codex/${model.slug}`;
 		if (seenSlugs.has(slug)) return [];
 		seenSlugs.add(slug);
-		return [createCatalogAlias(model, slug, options.codexProviderName)];
+		return [{
+			...createCatalogAlias(model, slug, options.codexProviderName),
+			priority: CODEX_ALIAS_PRIORITY_BASE + index
+		}];
 	}) : [];
 	const syntheticModels = candidates.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 [createCatalogAlias(catalogModel, candidate.slug, candidate.providerName)];
+		if (catalogModel) return [{
+			...createCatalogAlias(catalogModel, candidate.slug, candidate.providerName),
+			priority: priorityBase + index
+		}];
 		if (candidate.catalogMatchRequired) return [];
-		return [createSyntheticCodexModel(candidate, template, upstreamModels.length + index)];
+		return [createSyntheticCodexModel(candidate, template, priorityBase + index)];
 	});
+	const models = [
+		...upstreamModels,
+		...codexProviderAliases,
+		...syntheticModels
+	].sort((a, b) => getModelPriority(a) - getModelPriority(b));
 	const response = {
 		...upstreamCatalog ?? {},
-		models: [
-			...upstreamModels,
-			...codexProviderAliases,
-			...syntheticModels
-		]
+		models
 	};
 	debugJson(logger$8, "models.codex.merged_response", {
 		upstreamCount: upstreamModels.length,
@@ -7823,6 +7836,14 @@ async function tryGetCodexCatalog(c) {
 function selectTemplate(models) {
 	return models.find((model) => model.visibility === "list" && model.supported_in_api !== false) ?? models[0] ?? DEFAULT_CODEX_TEMPLATE;
 }
+function getModelPriority(model) {
+	return typeof model.priority === "number" && Number.isFinite(model.priority) ? model.priority : 0;
+}
+function getCandidatePriorityBase(candidate) {
+	if (!candidate.providerName) return COPILOT_PRIORITY_BASE;
+	if (candidate.providerName === "opencode-go") return OPENCODE_GO_PRIORITY_BASE;
+	return PROVIDER_PRIORITY_BASE;
+}
 function isCodexModelsResponse(value) {
 	if (!isRecord$2(value) || !Array.isArray(value.models)) return false;
 	return value.models.every((model) => isRecord$2(model) && typeof model.slug === "string");
@@ -7960,7 +7981,7 @@ async function getSyntheticCodexModels(requestHeaders, providers) {
 function getCopilotCodexCandidates() {
 	const candidates = [];
 	for (const model of state.models?.data ?? []) try {
-		if (isCopilotMessagesFallbackModel(model)) candidates.push(createCopilotCodexCandidate(model));
+		if (isCopilotCodexCandidate(model)) candidates.push(createCopilotCodexCandidate(model));
 	} catch (error) {
 		logger$7.warn("models.codex.copilot_skip_error", {
 			modelId: model.id,
@@ -7969,17 +7990,17 @@ function getCopilotCodexCandidates() {
 	}
 	return candidates;
 }
-function isCopilotMessagesFallbackModel(model) {
-	const endpoints = model.supported_endpoints ?? [];
-	return endpoints.some((endpoint) => endpoint === MESSAGES_ENDPOINT || endpoint === CHAT_COMPLETIONS_ENDPOINT) && !endpoints.some((endpoint) => RESPONSES_ENDPOINTS.has(endpoint)) && model.capabilities.supports.tool_calls !== false;
+function isCopilotCodexCandidate(model) {
+	return (model.supported_endpoints ?? []).some((endpoint) => endpoint === MESSAGES_ENDPOINT || endpoint === CHAT_COMPLETIONS_ENDPOINT || RESPONSES_ENDPOINTS.has(endpoint)) && model.capabilities.supports.tool_calls !== false;
 }
 function createCopilotCodexCandidate(model) {
 	const reasoningEfforts = normalizeReasoningEfforts(model.capabilities.supports.reasoning_effort);
+	const usesNativeResponses = model.supported_endpoints?.some((endpoint) => RESPONSES_ENDPOINTS.has(endpoint));
 	const usesNativeMessages = model.supported_endpoints?.includes(MESSAGES_ENDPOINT);
 	return {
 		slug: toClientModelId(model.id),
 		displayName: model.name,
-		description: usesNativeMessages ? `${model.name} through the Copilot Messages adapter.` : `${model.name} through the Copilot Messages-to-Chat adapter.`,
+		description: usesNativeResponses ? `${model.name} through the Copilot Responses API.` : usesNativeMessages ? `${model.name} through the Copilot Messages adapter.` : `${model.name} through the Copilot Messages-to-Chat adapter.`,
 		contextWindow: positiveNumber(model.capabilities.limits.max_context_window_tokens, 256e3),
 		maxOutputTokens: positiveNumber(model.capabilities.limits.max_output_tokens, 32e3),
 		inputModalities: model.capabilities.supports.vision ? ["text", "image"] : ["text"],
@@ -9743,7 +9764,10 @@ async function handleResponsesViaMessages(c, options) {
 			skipClaudeAutoModel: true,
 			skipModelMapping: true,
 			skipWebSearch: true,
-			usageEndpoint: "responses"
+			usageEndpoint: "responses",
+			subagentMarker: options.subagentMarker,
+			requestId: options.requestId,
+			sessionId: options.sessionId
 		});
 		if (!messagesResponse.ok) return messagesResponse;
 		if ((messagesResponse.headers.get("content-type") ?? "").includes("text/event-stream")) {
@@ -10007,24 +10031,25 @@ const handleResponses = async (c) => {
 	const selectedModel = responsesHandlerDependencies.findEndpointModel(payload.model);
 	payload.model = selectedModel?.id ?? payload.model;
 	const responsesTransport = getResponsesTransportForModel(selectedModel);
-	if (!responsesTransport) {
-		const supportedEndpoints = selectedModel?.supported_endpoints ?? [];
-		if (supportedEndpoints.includes("/v1/messages") || supportedEndpoints.includes("/chat/completions")) return await handleResponsesViaMessages(c, {
-			payload,
-			publicModel: requestedModel,
-			targetModel: payload.model
-		});
-		return c.json({ error: {
-			message: "This model does not support the responses endpoint. Please choose a different model.",
-			type: "invalid_request_error"
-		} }, 400);
-	}
+	if (shouldFallbackToMessages(c, payload.model, selectedModel, responsesTransport)) return await handleResponsesViaMessages(c, {
+		payload,
+		publicModel: requestedModel,
+		targetModel: payload.model,
+		subagentMarker,
+		requestId,
+		sessionId: fallbackSessionId
+	});
+	if (!responsesTransport) return c.json({ error: {
+		message: "This model does not support the responses endpoint. Please choose a different model.",
+		type: "invalid_request_error"
+	} }, 400);
 	const recordUsage = createCopilotTokenUsageRecorder({
 		endpoint: "responses",
 		fallbackSessionId,
 		model: payload.model
 	});
 	removeUnsupportedTools(payload);
+	fillEmptyNamespaceToolDescriptions(payload);
 	if (!responsesHandlerDependencies.isResponsesApiWebSearchEnabled()) removeWebSearchTool(payload);
 	const sanitizedImageCount = sanitizeOversizedInputImages(payload, selectedModel?.capabilities.limits.vision?.max_prompt_image_size);
 	if (sanitizedImageCount > 0) logger$1.warn(`Omitted ${sanitizedImageCount} oversized input image(s) before forwarding to Copilot Responses`);
@@ -10078,6 +10103,12 @@ const handleResponses = async (c) => {
 	return c.json(result);
 };
 const isStreamingRequested = (payload) => Boolean(payload.stream);
+const shouldFallbackToMessages = (c, modelId, selectedModel, responsesTransport) => {
+	if (isCodexUserAgent(c.req.header("user-agent"))) return !modelId.startsWith("gpt");
+	if (responsesTransport) return false;
+	const supportedEndpoints = selectedModel?.supported_endpoints ?? [];
+	return supportedEndpoints.includes("/v1/messages") || supportedEndpoints.includes("/chat/completions");
+};
 const parseResponsesStreamEvent = (chunk) => {
 	const data = chunk.data;
 	if (!data || data === "[DONE]") return null;
@@ -10110,6 +10141,22 @@ const removeUnsupportedTools = (payload) => {
 	});
 	if (dropped.length > 0) logger$1.debug("Removed unsupported tools:", dropped);
 };
+const fillEmptyNamespaceToolDescriptions = (payload) => {
+	fillEmptyNamespaceDescriptions(payload.tools);
+	if (!Array.isArray(payload.input)) return;
+	for (const item of payload.input) {
+		if (!item || typeof item !== "object") continue;
+		fillEmptyNamespaceDescriptions(item.tools);
+	}
+};
+const fillEmptyNamespaceDescriptions = (tools) => {
+	if (!Array.isArray(tools)) return;
+	for (const tool of tools) {
+		if (!tool || typeof tool !== "object") continue;
+		const namespaceTool = tool;
+		if (namespaceTool.type === "namespace" && namespaceTool.description === "" && typeof namespaceTool.name === "string") namespaceTool.description = namespaceTool.name;
+	}
+};
 const getIncomingResponsesSessionId = (c) => getTrimmedHeader(c, "session-id") ?? getTrimmedHeader(c, "x-session-id");
 const codexSubagentHeaderValues = new Set([
 	"collab_spawn",
@@ -10258,4 +10305,4 @@ server.route("/:provider/images", providerImageRoutes);
 //#endregion
 export { server };
 
-//# sourceMappingURL=server---R3M8xj.js.map
+//# sourceMappingURL=server-CF6ryUB1.js.map