codex-copilot-dx 0.4.13 → 0.4.15

package/README.md

@@ -48,6 +48,13 @@ 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.
 
+If Copilot token refresh 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:
+
+```bash
+rm ~/.local/share/copilot-api/github_token
+codex-copilot-dx
+```
+
 ### Claude App opt-in
 
 Claude App support is opt-in so the default Codex Desktop and Claude Code setup stays unchanged:

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.13",
+  "version": "0.4.15",
   "description": "Use Codex Desktop, Claude Code, and Claude App with GitHub Copilot",
   "type": "module",
   "bin": {

package/src/auth.mjs

@@ -11,6 +11,14 @@ export function githubTokenPath(home = os.homedir()) {
   return path.join(home, ".local", "share", "copilot-api", "github_token");
 }
 
+export function githubReauthMessage(reason, home = os.homedir()) {
+  const tokenPath = githubTokenPath(home);
+  return `${reason}
+Delete the saved GitHub token, then run codex-copilot-dx again to log in:
+  rm '${tokenPath}'
+  codex-copilot-dx`;
+}
+
 // Map GitHub polling responses to a small local state machine.
 export function interpretPoll(data) {
   if (typeof data.access_token === "string" && data.access_token) return { state: "done", token: data.access_token };

package/src/copilot.mjs

@@ -1,10 +1,8 @@
 import fs from "node:fs";
-import path from "node:path";
-import os from "node:os";
 import { randomUUID } from "node:crypto";
 import { status } from "./status.mjs";
+import { githubReauthMessage, githubTokenPath } from "./auth.mjs";
 
-const GITHUB_TOKEN_PATH = path.join(os.homedir(), ".local", "share", "copilot-api", "github_token");
 export const DEFAULT_API_BASE = "https://api.githubcopilot.com";
 let apiBase = DEFAULT_API_BASE;
 const IMG_MAX_DIM = parseInt(process.env.CCDX_IMG_MAX_DIM || "2048", 10);
@@ -249,10 +247,13 @@ let copilotToken = null;
 let copilotTokenExpiry = 0;
 
 function getGithubToken() {
+  const GITHUB_TOKEN_PATH = githubTokenPath();
   if (!fs.existsSync(GITHUB_TOKEN_PATH)) {
-    throw new Error("GitHub token not found. Run the tool once to log in.");
+    throw new Error("GitHub token not found. Run codex-copilot-dx again to log in.");
   }
-  return fs.readFileSync(GITHUB_TOKEN_PATH, "utf-8").trim();
+  const token = fs.readFileSync(GITHUB_TOKEN_PATH, "utf-8").trim();
+  if (!token) throw new Error(githubReauthMessage("GitHub token file is empty."));
+  return token;
 }
 
 export async function getCopilotToken({ signal } = {}) {
@@ -262,7 +263,12 @@ export async function getCopilotToken({ signal } = {}) {
     headers: { Authorization: `token ${ghToken}`, Accept: "application/json" },
     signal,
   });
-  if (!resp.ok) throw new Error(`Failed to get Copilot token: ${resp.status}`);
+  if (!resp.ok) {
+    if (resp.status === 401 || resp.status === 403) {
+      throw new Error(githubReauthMessage(`Failed to get Copilot token: ${resp.status}. The saved GitHub token may be expired, revoked, or missing Copilot access.`));
+    }
+    throw new Error(`Failed to get Copilot token: ${resp.status}`);
+  }
   const data = await resp.json();
   if (!data.token) throw new Error("Copilot token response missing token field");
   copilotToken = data.token;

package/src/models.mjs

@@ -97,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();
@@ -106,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();