codex-copilot-dx 0.4.36 → 0.4.38

package/README.md

@@ -78,7 +78,11 @@ For live runtime diagnostics, query the running adapter from the same machine:
 curl -s http://127.0.0.1:2026/_ccdx/status | jq
 ```
 
-The status endpoint is restricted to the socket's real loopback address, even when LAN binding is explicitly enabled. It reports fixed-size request counters, latency totals, admission pressure, memory use, response-history size, image queue state, model cache counts, and token expiry state. It never includes prompts, completions, tool arguments, image content, account names, or token values. API responses and related log lines include the same safe `X-Request-Id`/`request_id` for correlation.
+The status endpoint is restricted to the socket's real loopback address, even when LAN binding is explicitly enabled. It reports fixed-size request counters, latency totals, admission pressure, memory use, response-history size, image queue state, model cache counts, and token expiry state. It never includes prompts, completions, tool arguments, image content, account names, or token values. API responses always include a safe `X-Request-Id` for correlation. To include the same ID as `request_id` in related terminal and file log lines, start the adapter with:
+
+```bash
+codex-copilot-dx --show-request-id
+```
 
 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 and in-process token rotation accept only the same GitHub account. Concurrent callers share token refresh work without sharing cancellation, and a still-valid Copilot token may be used briefly after a transient refresh failure. Explicit token variables remain the intentional way to switch accounts.
 

package/bin/cli.mjs

@@ -250,6 +250,7 @@ try {
     claudeDesktopApiKey,
     claudeDesktopModelDefs,
     modelRegistry: MODEL_REGISTRY,
+    showRequestId: CLI.showRequestId,
     upstreamTimeoutMs: RUNTIME.upstreamTimeoutMs,
     streamHandshakeTimeoutMs: RUNTIME.streamHandshakeTimeoutMs,
     streamIdleTimeoutMs: RUNTIME.streamIdleTimeoutMs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-copilot-dx",
-  "version": "0.4.36",
+  "version": "0.4.38",
   "description": "Use Codex Desktop, Claude Code, and Claude App with GitHub Copilot",
   "author": "Dale Xiao",
   "type": "module",

package/src/adapter.mjs

@@ -235,7 +235,11 @@ export function createAdapterHandler(options = {}) {
     }
 
     try {
-      const result = runWithRequestContext({ requestId, pathname }, () => dispatch(req, res, pathname));
+      const result = runWithRequestContext({
+        requestId,
+        pathname,
+        showRequestId: options.showRequestId === true,
+      }, () => dispatch(req, res, pathname));
       if (result && typeof result.then === "function") {
         return result.catch((error) => {
           complete({ statusCode: res.statusCode >= 400 ? res.statusCode : 500 });

package/src/cli-options.mjs

@@ -1,5 +1,6 @@
 const HELP_COMMANDS = new Set(["help", "--help", "-h"]);
 const VERSION_COMMANDS = new Set(["version", "--version", "-v"]);
+const START_OPTIONS = new Set(["--configure-claude-desktop", "--show-request-id"]);
 
 function unexpectedArgs(args) {
   throw new Error(`Unexpected argument${args.length === 1 ? "" : "s"}: ${args.join(" ")}`);
@@ -7,18 +8,18 @@ function unexpectedArgs(args) {
 
 export function parseCliArgs(args = []) {
   const [command, ...rest] = args;
-  if (!command) return { command: "start", configureClaudeDesktop: false, online: false, compat: false };
+  if (!command) return { command: "start", configureClaudeDesktop: false, showRequestId: false, online: false, compat: false };
   if (HELP_COMMANDS.has(command)) {
     if (rest.length) unexpectedArgs(rest);
-    return { command: "help", configureClaudeDesktop: false, online: false, compat: false };
+    return { command: "help", configureClaudeDesktop: false, showRequestId: false, online: false, compat: false };
   }
   if (VERSION_COMMANDS.has(command)) {
     if (rest.length) unexpectedArgs(rest);
-    return { command: "version", configureClaudeDesktop: false, online: false, compat: false };
+    return { command: "version", configureClaudeDesktop: false, showRequestId: false, online: false, compat: false };
   }
   if (command === "usage") {
     if (rest.length) unexpectedArgs(rest);
-    return { command: "usage", configureClaudeDesktop: false, online: false, compat: false };
+    return { command: "usage", configureClaudeDesktop: false, showRequestId: false, online: false, compat: false };
   }
   if (command === "doctor" || command === "--doctor") {
     const supported = new Set(["--online", "--compat"]);
@@ -30,13 +31,25 @@ export function parseCliArgs(args = []) {
     return {
       command: "doctor",
       configureClaudeDesktop: false,
+      showRequestId: false,
       online: rest.includes("--online"),
       compat: rest.includes("--compat"),
     };
   }
-  if (command === "--configure-claude-desktop") {
-    if (rest.length) unexpectedArgs(rest);
-    return { command: "start", configureClaudeDesktop: true, online: false, compat: false };
+  if (START_OPTIONS.has(command)) {
+    const options = [command, ...rest];
+    const invalid = options.filter((arg) => !START_OPTIONS.has(arg));
+    if (invalid.length) unexpectedArgs(invalid);
+    for (const option of START_OPTIONS) {
+      if (options.filter((arg) => arg === option).length > 1) unexpectedArgs([option]);
+    }
+    return {
+      command: "start",
+      configureClaudeDesktop: options.includes("--configure-claude-desktop"),
+      showRequestId: options.includes("--show-request-id"),
+      online: false,
+      compat: false,
+    };
   }
   throw new Error(`Unknown command or option: ${command}`);
 }
@@ -69,7 +82,7 @@ export function parseRuntimeOptions(env = process.env) {
 
 export function cliHelp() {
   return `Usage:
-  codex-copilot-dx [--configure-claude-desktop]
+  codex-copilot-dx [--configure-claude-desktop] [--show-request-id]
   codex-copilot-dx doctor [--online] [--compat]
   codex-copilot-dx usage
   codex-copilot-dx --version

package/src/copilot.mjs

@@ -323,11 +323,11 @@ function getGithubToken({ home = os.homedir() } = {}) {
   return token;
 }
 
-function requestCopilotToken(ghToken, { fetchImpl = fetch, signal } = {}) {
-  return fetchImpl(`${GITHUB_API}/copilot_internal/v2/token`, {
+function requestCopilotToken(ghToken, { fetchImpl = fetch, signal, retryOptions } = {}) {
+  return fetchCopilotUpstream(`${GITHUB_API}/copilot_internal/v2/token`, {
     headers: { Authorization: `token ${ghToken}`, Accept: "application/json" },
     signal,
-  });
+  }, { fetchImpl, ...retryOptions });
 }
 
 function cacheCopilotTokenData(data, {
@@ -381,12 +381,17 @@ async function refreshCopilotToken({
   home = os.homedir(),
   env = process.env,
   fetchImpl = fetch,
+  tokenRetryOptions,
 } = {}) {
   const ghToken = getGithubToken({ home });
   const sourceKey = githubTokenPath(home);
   let resp;
   try {
-    resp = await requestCopilotToken(ghToken, { fetchImpl, signal });
+    resp = await requestCopilotToken(ghToken, {
+      fetchImpl,
+      signal,
+      retryOptions: tokenRetryOptions,
+    });
   } catch (e) {
     if (!isAbortError(e, signal)) e.transient = true;
     throw e;
@@ -454,8 +459,15 @@ export function getCopilotToken(options = {}) {
 
   if (!flight) {
     const controller = new AbortController();
+    const tokenRetryOptions = options.tokenRetryOptions
+      ?? (canUseCachedToken(sourceKey, now, allowCurrentProcessToken) ? { retries: 0 } : undefined);
     flight = { key: sourceKey, controller, waiters: 0, settled: false, promise: null };
-    flight.promise = refreshCopilotToken({ ...options, home, signal: controller.signal })
+    flight.promise = refreshCopilotToken({
+      ...options,
+      home,
+      signal: controller.signal,
+      tokenRetryOptions,
+    })
       .catch((error) => {
         const fallbackNow = Date.now();
         if (error?.transient && canUseCachedToken(sourceKey, fallbackNow)) {

package/src/status.mjs

@@ -10,7 +10,8 @@ const LABELS = {
 };
 
 export function status(kind, message) {
-  const requestId = currentRequestContext()?.requestId;
+  const requestContext = currentRequestContext();
+  const requestId = requestContext?.showRequestId ? requestContext.requestId : "";
   const context = requestId ? ` request_id=${requestId}` : "";
   return `${LABELS[kind] || LABELS.info}${context} ${message}`;
 }