codex-copilot-dx 0.4.22 → 0.4.25

package/README.md

@@ -38,6 +38,8 @@ Claude Code picks up the new `ANTHROPIC_BASE_URL` on its next launch.
 
 If an existing `codex-copilot-dx` adapter is already running on the configured host and port, a second launch reuses it instead of starting another proxy. The second launch still refreshes Codex and Claude Code config, then exits.
 
+The running adapter reports its package and protocol versions. After upgrading `codex-copilot-dx`, stop the old process before starting the new version; the new CLI refuses to silently reuse an incompatible adapter.
+
 Do not set Claude Code by manually exporting `ANTHROPIC_BASE_URL` or `ANTHROPIC_AUTH_TOKEN` in your shell. Let `codex-copilot-dx` write the local config files instead. If you previously exported those variables, remove them from shell startup files and restart the terminal before launching Claude Code.
 
 ### Diagnostics
@@ -50,7 +52,15 @@ codex-copilot-dx doctor
 
 The doctor checks the GitHub token, Codex config, Claude Code settings, Claude App gateway profile, and whether the local adapter port is listening.
 
-When the saved token is missing, `codex-copilot-dx` first looks for compatible local Copilot GitHub tokens, validates them with GitHub and Copilot, and imports a valid one before starting device login. It checks explicit token sources (`CCDX_GITHUB_TOKEN`, `CCDX_GITHUB_TOKEN_PATH`, `CCDX_GITHUB_TOKEN_PATHS`) plus common local `auth.json` layouts under application config directories. It does not rely on a specific app name. If a saved token later fails with `401` or `403`, the adapter repeats that discovery and retries once before asking you to reauthenticate.
+For a read-only live check of the saved GitHub token, Copilot entitlement, and models endpoint, run:
+
+```bash
+codex-copilot-dx doctor --online
+```
+
+The online doctor never starts device flow, scans for replacement tokens, or changes the saved token.
+
+When the saved token is missing, `codex-copilot-dx` first looks for compatible local Copilot GitHub tokens, validates them with GitHub and Copilot, and imports a valid one before starting device login. It checks explicit token sources (`CCDX_GITHUB_TOKEN`, `CCDX_GITHUB_TOKEN_PATH`, `CCDX_GITHUB_TOKEN_PATHS`) plus common local `auth.json` layouts under application config directories. It does not rely on a specific app name. Generic discovery refuses to choose silently when valid tokens for multiple GitHub accounts are found. After an account is selected, automatic `401`/`403` recovery accepts only the same GitHub account. Explicit token variables remain the intentional way to switch accounts.
 
 If Copilot token refresh still fails with `401` or `403`, the saved GitHub token may be expired, revoked, or missing Copilot access. Delete the saved token and start the tool again to trigger GitHub device login:
 
@@ -104,10 +114,14 @@ Environment variables:
 | `CCDX_GITHUB_TOKEN` | unset | Explicit GitHub Copilot OAuth token to validate and import before device login |
 | `CCDX_GITHUB_TOKEN_PATH` | unset | Explicit file containing a GitHub Copilot OAuth token to validate and import before device login |
 | `CCDX_GITHUB_TOKEN_PATHS` | unset | Multiple token files separated by the platform path delimiter (`:` on macOS/Linux, `;` on Windows) |
+| `CCDX_GITHUB_LOGIN` | saved account | Require automatic discovery and recovery to use this GitHub login |
 | `CCDX_DISABLE_TOKEN_DISCOVERY` | unset | Set to `1` to skip local token discovery and go straight to the saved token or device flow |
 | `CCDX_TOKEN_LOCK_TIMEOUT_MS` | `600000` | Maximum time to wait for another local process to finish GitHub token login/import |
 | `CCDX_TOKEN_LOCK_STALE_MS` | `900000` | Age after which a stale GitHub token lock file can be removed |
 | `CCDX_EXISTING_ADAPTER_TIMEOUT_MS` | `500` | Timeout for detecting an already-running local adapter during startup |
+| `CCDX_MODEL_REFRESH_INTERVAL_MS` | `1800000` | Interval for refreshing Copilot model metadata; successful lists are cached locally as last-known-good data |
+| `CCDX_RESPONSE_HISTORY_MAX_BYTES` | `67108864` | Total in-memory byte budget for locally expanded Responses history |
+| `CCDX_RESPONSE_HISTORY_MAX_ENTRIES` | `4096` | Maximum stored incremental Responses history nodes |
 | `CCDX_USAGE_PATH` | `~/.local/share/codex-copilot-dx/usage.jsonl` | Local JSONL token usage log |
 | `CCDX_DISABLE_USAGE` | unset | Set to `1` to disable usage logging |
 
@@ -129,6 +143,8 @@ Long computer-use sessions can accumulate screenshots inside the conversation hi
 
 The adapter automatically downsamples embedded screenshots to long-edge <= 2048 px and re-encodes them as WebP before forwarding `/v1/responses`.
 
+Newer ChatGPT/Codex clients can advertise an `image_gen` namespace that already exists upstream. The adapter removes that exact conflicting client tool before forwarding and retries once only when Copilot explicitly reports an image namespace collision. Image inputs and screenshot optimization remain enabled.
+
 ## License
 
 MIT

package/bin/cli.mjs

@@ -5,7 +5,7 @@ import { ensureCodexConfig } from "../src/config.mjs";
 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 { cacheModelEndpoints, listModels, refreshVSCodeVersion } from "../src/copilot.mjs";
 import { claudeDesktopModelDefsFromCopilotModels, claudeDesktopModelIds, gptModelIdsFromCopilotModels, parseModelAliasEnv } from "../src/models.mjs";
 import { status } from "../src/status.mjs";
 import { configureLogging } from "../src/log.mjs";
@@ -14,6 +14,7 @@ import { checkForUpdate, localPackageVersion } from "../src/version.mjs";
 import { runDoctor } from "../src/doctor.mjs";
 import { checkRunningAdapter } from "../src/running-adapter.mjs";
 import { assertSafeAdapterHost, isLoopbackHost } from "../src/security.mjs";
+import { loadModelCache, saveModelCache } from "../src/model-cache.mjs";
 
 const ADAPTER_PORT = parseInt(process.env.ADAPTER_PORT || "2026");
 const ADAPTER_HOST = process.env.ADAPTER_HOST || "127.0.0.1";
@@ -23,17 +24,38 @@ const LOCAL_VERSION = localPackageVersion();
 const command = process.argv[2];
 const CONFIGURE_CLAUDE_DESKTOP = command === "--configure-claude-desktop" || process.env.CCDX_CONFIGURE_CLAUDE_DESKTOP === "1";
 const LOGGING = configureLogging();
+const MODEL_REGISTRY = { modelDefs: undefined, source: "built-in" };
 
 if (LOGGING.filePath) {
   console.log(status("info", `Debug log: ${LOGGING.filePath}`));
   if (LOGGING.level === "debug") console.log(status("debug", "Debug logging enabled"));
 }
 
-async function refreshClaudeDesktopModelDefs() {
-  if (parseModelAliasEnv(process.env.CCDX_CLAUDE_MODEL_ALIASES).length) {
-    console.log(status("info", "Using CCDX_CLAUDE_MODEL_ALIASES for Claude models"));
-    return undefined;
+function applyModelsToRegistry(models, source, { updateClaudeModels = true } = {}) {
+  const modelDefs = updateClaudeModels
+    ? claudeDesktopModelDefsFromCopilotModels(models)
+    : MODEL_REGISTRY.modelDefs;
+  if (updateClaudeModels && !modelDefs.length) throw new Error("Copilot models response contained no Claude models");
+  cacheModelEndpoints(models);
+  if (updateClaudeModels) MODEL_REGISTRY.modelDefs = modelDefs;
+  MODEL_REGISTRY.source = source;
+  return modelDefs;
+}
+
+function loadCachedModelRegistry() {
+  const cached = loadModelCache();
+  if (!cached) return false;
+  try {
+    const customAliases = parseModelAliasEnv(process.env.CCDX_CLAUDE_MODEL_ALIASES).length > 0;
+    applyModelsToRegistry(cached, "cache", { updateClaudeModels: !customAliases });
+    return true;
+  } catch {
+    return false;
   }
+}
+
+async function refreshClaudeDesktopModelDefs() {
+  const customAliases = parseModelAliasEnv(process.env.CCDX_CLAUDE_MODEL_ALIASES).length > 0;
 
   const ctrl = new AbortController();
   const timer = setTimeout(() => ctrl.abort(), MODEL_REFRESH_TIMEOUT_MS);
@@ -50,13 +72,22 @@ async function refreshClaudeDesktopModelDefs() {
       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(", ")}`));
+    const modelDefs = applyModelsToRegistry(models, "live", { updateClaudeModels: !customAliases });
+    try {
+      saveModelCache(models);
+    } catch (e) {
+      console.log(status("warn", `Could not persist the Copilot model cache (${e.message})`));
+    }
+    if (customAliases) {
+      console.log(status("info", "Using CCDX_CLAUDE_MODEL_ALIASES for Claude models"));
+    } else {
+      console.log(status("ok", `Refreshed Claude models from GitHub Copilot: ${modelDefs.map((model) => model.id).join(", ")}`));
+    }
     return modelDefs;
   } catch (e) {
-    console.log(status("warn", `Could not refresh Claude models; using built-in model list (${e.message})`));
-    return undefined;
+    const fallback = MODEL_REGISTRY.modelDefs?.length ? `${MODEL_REGISTRY.source} model list` : "built-in model list";
+    console.log(status("warn", `Could not refresh Claude models; using ${fallback} (${e.message})`));
+    return MODEL_REGISTRY.modelDefs;
   } finally {
     clearTimeout(timer);
   }
@@ -72,6 +103,10 @@ async function reuseRunningAdapterIfAvailable() {
     host: ADAPTER_HOST,
     timeoutMs: EXISTING_ADAPTER_TIMEOUT_MS,
   });
+  if (running.incompatible) {
+    const found = running.data?.version || "unknown";
+    throw new Error(`Adapter ${found} is already running at ${running.baseUrl}, but this CLI is ${LOCAL_VERSION}. Stop the existing process and run codex-copilot-dx again.`);
+  }
   if (!running.ok) return false;
 
   console.log(status("ok", `Using existing adapter at ${running.baseUrl}`));
@@ -96,7 +131,7 @@ async function reuseRunningAdapterIfAvailable() {
     console.log(status("ok", "Claude App support available with --configure-claude-desktop"));
   }
 
-  openCodex();
+  await openCodex();
   console.log(`
   ${status("ok", "Ready, using the existing codex-copilot-dx adapter")}
 
@@ -116,7 +151,11 @@ if (command === "usage") {
 }
 
 if (command === "doctor" || command === "--doctor") {
-  await runDoctor({ port: ADAPTER_PORT, host: ADAPTER_HOST });
+  await runDoctor({
+    port: ADAPTER_PORT,
+    host: ADAPTER_HOST,
+    online: process.argv.slice(3).includes("--online"),
+  });
   process.exit(0);
 }
 
@@ -149,6 +188,7 @@ try {
 
   // Refresh the VS Code version in the background; fallback is non-blocking.
   refreshVSCodeVersion();
+  loadCachedModelRegistry();
   const claudeDesktopModelDefs = await refreshClaudeDesktopModelDefs();
 
   if (!isLoopbackHost(ADAPTER_HOST)) {
@@ -160,7 +200,7 @@ try {
     : currentClaudeDesktopApiKey();
 
   // Start the in-process adapter.
-  await startAdapter(ADAPTER_PORT, ADAPTER_HOST, { claudeDesktopApiKey, claudeDesktopModelDefs });
+  await startAdapter(ADAPTER_PORT, ADAPTER_HOST, { claudeDesktopApiKey, claudeDesktopModelDefs, modelRegistry: MODEL_REGISTRY });
 
   // Point Codex and Claude Code at the adapter.
   ensureCodexConfig(ADAPTER_PORT);
@@ -179,7 +219,7 @@ try {
   }
 
   // Launch Codex when available.
-  openCodex();
+  await openCodex();
 
   // Periodically refresh the model list + endpoint cache so a long-running
   // adapter picks up newly released models without a restart.

package/package.json

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