@jeffreycao/copilot-api 1.16.3 → 1.16.6

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-D8ijZ2gu.js");
+const { start } = await import("./start-BwdJvu4z.js");
 await runMain(defineCommand({
 	meta: {
 		name: "copilot-api",

package/dist/{server-39Y0II3a.js → server-BdY9JFbK.js}

@@ -3990,7 +3990,7 @@ const stripToolEagerInputStreaming = (payload) => {
 const filterAssistantThinkingBlocks = (payload) => {
 	for (const msg of payload.messages) if (msg.role === "assistant" && Array.isArray(msg.content)) msg.content = msg.content.filter((block) => {
 		if (block.type !== "thinking") return true;
-		return block.thinking && block.thinking !== "Thinking..." && block.signature && !block.signature.includes("@");
+		return block.thinking !== "Thinking..." && block.signature && !block.signature.includes("@");
 	});
 };
 const prepareMessagesApiPayload = (payload, selectedModel) => {
@@ -7302,7 +7302,8 @@ const FALLBACK_AVAILABLE_IN_PLANS = [
 const DEFAULT_REASONING_EFFORTS = [
 	"high",
 	"xhigh",
-	"max"
+	"max",
+	"ultra"
 ];
 function isCodexUserAgent(userAgent) {
 	return CODEX_USER_AGENT_PATTERN.test(userAgent?.trim() ?? "");
@@ -7333,21 +7334,44 @@ async function handleCodexModelsProxy(c, resolvedProviderConfig) {
 	await logCodexModelsResponse(upstreamResponse);
 	return createProviderProxyResponse(upstreamResponse);
 }
-async function handleMergedCodexModels(c, candidatesRequest) {
+async function handleMergedCodexModels(c, candidatesRequest, options = {}) {
 	const [upstreamCatalog, candidates] = await Promise.all([tryGetCodexCatalog(c), Promise.resolve(candidatesRequest).catch((error) => {
 		logger$8.warn("models.codex.candidates_error", { error });
 		return [];
 	})]);
 	const upstreamModels = upstreamCatalog?.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 syntheticModels = candidates.filter((candidate) => !seenSlugs.has(candidate.slug)).map((candidate, index) => createSyntheticCodexModel(candidate, template, upstreamModels.length + index));
+	const codexProviderAliases = options.includeCodexProviderAliases ? upstreamModels.flatMap((model) => {
+		const slug = `codex/${model.slug}`;
+		if (seenSlugs.has(slug)) return [];
+		seenSlugs.add(slug);
+		return [{
+			...model,
+			slug
+		}];
+	}) : [];
+	const syntheticModels = candidates.filter((candidate) => !seenSlugs.has(candidate.slug)).flatMap((candidate, index) => {
+		const catalogModel = candidate.catalogSlug ? catalogModelsBySlug.get(candidate.catalogSlug) : void 0;
+		if (catalogModel) return [{
+			...catalogModel,
+			slug: candidate.slug
+		}];
+		if (candidate.catalogMatchRequired) return [];
+		return [createSyntheticCodexModel(candidate, template, upstreamModels.length + index)];
+	});
 	const response = {
 		...upstreamCatalog ?? {},
-		models: [...upstreamModels, ...syntheticModels]
+		models: [
+			...upstreamModels,
+			...codexProviderAliases,
+			...syntheticModels
+		]
 	};
 	debugJson(logger$8, "models.codex.merged_response", {
 		upstreamCount: upstreamModels.length,
+		codexProviderAliasCount: codexProviderAliases.length,
 		syntheticCount: syntheticModels.length,
 		models: response
 	});
@@ -7375,7 +7399,7 @@ function createSyntheticCodexModel(candidate, template, priority) {
 		supports_search_tool: false,
 		use_responses_lite: true,
 		tool_mode: "code_mode_only",
-		multi_agent_version: "v1",
+		multi_agent_version: "v2",
 		shell_type: "shell_command",
 		experimental_supported_tools: [],
 		input_modalities: inputModalities,
@@ -7543,9 +7567,9 @@ const CODEX_REASONING_EFFORTS = new Set([
 	"max",
 	"ultra"
 ]);
-async function getSyntheticCodexModels(requestHeaders) {
+async function getSyntheticCodexModels(requestHeaders, providers) {
 	const copilotModels = getCopilotCodexCandidates();
-	const providerModels = (await Promise.allSettled(listEnabledProviders().map((provider) => getProviderCodexCandidates(provider, requestHeaders)))).flatMap((result) => result.status === "fulfilled" ? result.value : []);
+	const providerModels = (await Promise.allSettled(providers.map((provider) => getProviderCodexCandidates(provider, requestHeaders)))).flatMap((result) => result.status === "fulfilled" ? result.value : []);
 	const seen = /* @__PURE__ */ new Set();
 	return [...copilotModels, ...providerModels.flat()].filter((candidate) => {
 		if (seen.has(candidate.slug)) return false;
@@ -7598,7 +7622,7 @@ async function getProviderCodexCandidates(provider, requestHeaders) {
 		const candidates = [];
 		for (const modelId of modelIds) {
 			const effectiveType = resolveEffectiveProviderType(providerConfig, modelId);
-			if (!isMessagesFallbackProviderType(effectiveType)) continue;
+			if (!isMessagesFallbackProviderType(effectiveType) && effectiveType !== "openai-responses") continue;
 			const modelConfig = providerConfig.models?.[modelId];
 			if (modelConfig?.codex?.enabled === false) continue;
 			candidates.push(createProviderCodexCandidate(providerConfig, modelId, remoteById.get(modelId), modelConfig, effectiveType));
@@ -7646,6 +7670,8 @@ function createProviderCodexCandidate(providerConfig, modelId, remoteModel, mode
 	const adapterName = effectiveType === "anthropic" ? "Messages" : "Messages-to-Chat";
 	return {
 		slug: `${providerConfig.name}/${modelId}`,
+		catalogSlug: modelId,
+		catalogMatchRequired: effectiveType === "openai-responses",
 		displayName: `${displayName} (${providerConfig.name})`,
 		description: `${displayName} through the ${providerConfig.name} ${adapterName} adapter.`,
 		contextWindow: positiveNumber(codexConfig?.contextWindow ?? getFirstPositiveNumber(remoteModel, [
@@ -7704,7 +7730,10 @@ function getBooleanField(model, field) {
 }
 modelRoutes.get("/", async (c) => {
 	try {
-		if (isCodexUserAgent(c.req.header("user-agent"))) return await handleMergedCodexModels(c, getSyntheticCodexModels(c.req.raw.headers));
+		if (isCodexUserAgent(c.req.header("user-agent"))) {
+			const enabledProviders = listEnabledProviders();
+			return await handleMergedCodexModels(c, getSyntheticCodexModels(c.req.raw.headers, enabledProviders), { includeCodexProviderAliases: enabledProviders.includes("codex") });
+		}
 		const models = await getAggregatedModels(c.req.raw.headers);
 		return c.json({
 			object: "list",
@@ -8265,6 +8294,10 @@ function translateUserContentPart(part, path) {
 		type: "text",
 		text: requireStringField(part, "text", path)
 	};
+	if (type === "encrypted_content") return {
+		type: "text",
+		text: requireStringField(part, "encrypted_content", path)
+	};
 	if (type === "input_image") return translateImagePart(part, path);
 	if (type === "input_file") return translateFilePart(part, path);
 	throw new ResponsesMessagesTranslationError(`${path} has unsupported content type '${type ?? "unknown"}'`);
@@ -9810,4 +9843,4 @@ server.route("/:provider/images", providerImageRoutes);
 //#endregion
 export { server };
 
-//# sourceMappingURL=server-39Y0II3a.js.map
+//# sourceMappingURL=server-BdY9JFbK.js.map