codex-copilot-dx 0.4.12 → 0.4.14

package/bin/cli.mjs

@@ -6,7 +6,7 @@ import { ensureClaudeConfig } from "../src/claude-config.mjs";
 import { applyClaudeDesktopConfig, formatClaudeDesktopApplyResult, generatedClaudeDesktopApiKey } from "../src/claude-desktop-config.mjs";
 import { startAdapter } from "../src/adapter.mjs";
 import { listModels, refreshVSCodeVersion } from "../src/copilot.mjs";
-import { claudeDesktopModelDefsFromCopilotModels, claudeDesktopModelIds, parseModelAliasEnv } from "../src/models.mjs";
+import { claudeDesktopModelDefsFromCopilotModels, claudeDesktopModelIds, gptModelIdsFromCopilotModels, parseModelAliasEnv } from "../src/models.mjs";
 import { status } from "../src/status.mjs";
 import { printUsageSummary } from "../src/usage.mjs";
 import { checkForUpdate, localPackageVersion } from "../src/version.mjs";
@@ -36,7 +36,15 @@ async function refreshClaudeDesktopModelDefs() {
     if (httpStatus < 200 || httpStatus >= 300) {
       throw new Error(`Copilot models returned HTTP ${httpStatus}`);
     }
-    const modelDefs = claudeDesktopModelDefsFromCopilotModels(JSON.parse(body));
+    const models = JSON.parse(body);
+    const gptModelIds = gptModelIdsFromCopilotModels(models);
+    if (gptModelIds.length) {
+      console.log(status("ok", `Refreshed GPT models from GitHub Copilot: ${gptModelIds.join(", ")}`));
+    } else {
+      console.log(status("warn", "Copilot models response contained no GPT models"));
+    }
+
+    const modelDefs = claudeDesktopModelDefsFromCopilotModels(models);
     if (!modelDefs.length) throw new Error("Copilot models response contained no Claude models");
     console.log(status("ok", `Refreshed Claude models from GitHub Copilot: ${modelDefs.map((model) => model.id).join(", ")}`));
     return modelDefs;
@@ -113,9 +121,7 @@ try {
   openCodex();
 
   console.log(`
-  ${status("ok", CONFIGURE_CLAUDE_DESKTOP
-    ? "Ready. Codex, Claude Code, and Claude App are using your GitHub Copilot subscription."
-    : "Ready. Codex and Claude Code are using your GitHub Copilot subscription. Claude App support is available with --configure-claude-desktop.")}
+  ${status("ok", "Ready, Claude Code, Claude App and Codex App are now ready to use")}
 
   Adapter: http://${ADAPTER_HOST}:${ADAPTER_PORT}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-copilot-dx",
-  "version": "0.4.12",
+  "version": "0.4.14",
   "description": "Use Codex Desktop, Claude Code, and Claude App with GitHub Copilot",
   "type": "module",
   "bin": {

package/src/adapter.mjs

@@ -750,8 +750,18 @@ export function startAdapter(port = 2026, host = "127.0.0.1", options = {}) {
     socket.destroy();
   });
 
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
+    const onListenError = (e) => {
+      if (e?.code === "EADDRINUSE") {
+        reject(new Error(`Adapter address http://${host}:${port} is already in use. Stop the existing codex-copilot-dx process or set ADAPTER_PORT to another port.`));
+        return;
+      }
+      reject(e);
+    };
+
+    server.once("error", onListenError);
     server.listen(port, host, () => {
+      server.off("error", onListenError);
       const actualPort = server.address()?.port || port;
       console.log(status("ok", `Adapter listening on http://${host}:${actualPort}`));
       resolve(server);

package/src/models.mjs

@@ -31,6 +31,9 @@ const DEFAULT_CLAUDE_DESKTOP_MODEL_DEFS = [
     maxInputTokens: 200000,
     maxOutputTokens: 8192,
   },
+];
+
+const DEFAULT_CLAUDE_MODEL_ALIAS_DEFS = [
   {
     id: "claude-sonnet-4-6",
     upstream: "claude-sonnet-4.6",
@@ -94,6 +97,29 @@ function hasMessagesEndpoint(model) {
   return endpoints.includes("/v1/messages") || endpoints.includes("/chat/completions");
 }
 
+function hasOpenAIEndpoint(model) {
+  const endpoints = Array.isArray(model?.supported_endpoints) ? model.supported_endpoints : [];
+  return endpoints.includes("/responses") || endpoints.includes("/v1/responses") || endpoints.includes("/chat/completions");
+}
+
+function copilotModelData(models) {
+  const data = Array.isArray(models) ? models : models?.data;
+  return Array.isArray(data) ? data : [];
+}
+
+function uniqueIds(models, predicate) {
+  const ids = [];
+  const seen = new Set();
+  for (const model of models) {
+    if (!predicate(model)) continue;
+    const id = String(model.id || "").trim();
+    if (!id || seen.has(id)) continue;
+    ids.push(id);
+    seen.add(id);
+  }
+  return ids;
+}
+
 function isClaudeCopilotModel(model) {
   const id = String(model?.id || "").trim();
   const vendor = String(model?.vendor || "").toLowerCase();
@@ -103,9 +129,17 @@ function isClaudeCopilotModel(model) {
     && hasMessagesEndpoint(model);
 }
 
+export function gptModelIdsFromCopilotModels(models) {
+  return uniqueIds(copilotModelData(models), (model) => {
+    const id = String(model?.id || "").trim();
+    return id.startsWith("gpt-")
+      && model?.model_picker_enabled !== false
+      && hasOpenAIEndpoint(model);
+  });
+}
+
 export function claudeDesktopModelDefsFromCopilotModels(models) {
-  const data = Array.isArray(models) ? models : models?.data;
-  if (!Array.isArray(data)) return [];
+  const data = copilotModelData(models);
 
   const defs = [];
   const seen = new Set();
@@ -126,19 +160,6 @@ export function claudeDesktopModelDefsFromCopilotModels(models) {
     });
   }
 
-  const upstreamIds = new Set(defs.map((model) => model.upstream));
-  for (const alias of DEFAULT_CLAUDE_DESKTOP_MODEL_DEFS) {
-    if (alias.id === alias.upstream || seen.has(alias.id) || !upstreamIds.has(alias.upstream)) continue;
-    const upstream = defs.find((model) => model.upstream === alias.upstream);
-    defs.push({
-      ...alias,
-      displayName: upstream?.displayName || alias.displayName,
-      maxInputTokens: upstream?.maxInputTokens || alias.maxInputTokens,
-      maxOutputTokens: upstream?.maxOutputTokens || alias.maxOutputTokens,
-    });
-    seen.add(alias.id);
-  }
-
   return defs;
 }
 
@@ -153,9 +174,18 @@ export function claudeDesktopModelIds(env = process.env, options = {}) {
   return claudeDesktopModelDefs(env, options).map((model) => model.id);
 }
 
+function claudeModelResolutionDefs(env = process.env, options = {}) {
+  const defs = claudeDesktopModelDefs(env, options);
+  if (parseModelAliasEnv(env.CCDX_CLAUDE_MODEL_ALIASES).length) return defs;
+
+  const upstreamIds = new Set(defs.map((model) => model.upstream));
+  const aliases = DEFAULT_CLAUDE_MODEL_ALIAS_DEFS.filter((alias) => upstreamIds.has(alias.upstream));
+  return [...defs, ...aliases];
+}
+
 export function resolveAnthropicModel(model, env = process.env, options = {}) {
   const requestedModel = String(model || "");
-  const match = claudeDesktopModelDefs(env, options).find((entry) => entry.id === requestedModel);
+  const match = claudeModelResolutionDefs(env, options).find((entry) => entry.id === requestedModel);
   return {
     requestedModel,
     upstreamModel: match?.upstream || requestedModel,