codex-copilot-dx 0.4.37 → 0.4.39

package/bin/cli.mjs

@@ -132,7 +132,10 @@ async function refreshClaudeDesktopModelDefs() {
     return modelDefs;
   } catch (e) {
     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})`));
+    const message = ctrl.signal.aborted
+      ? `Model refresh timed out after ${MODEL_REFRESH_TIMEOUT_MS}ms; using ${fallback}`
+      : `Could not refresh model list; using ${fallback} (${e.message})`;
+    console.log(status("warn", message));
     return MODEL_REGISTRY.modelDefs;
   } finally {
     clearTimeout(timer);

package/package.json

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

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/startup.mjs

@@ -2,16 +2,12 @@ export async function initializeModelRegistry({
   loadCached,
   currentModelDefs,
   refresh,
-  onBackgroundError = () => {},
 }) {
-  if (!loadCached()) {
-    return { modelDefs: await refresh(), source: "live", backgroundRefresh: null };
+  if (loadCached()) {
+    return { modelDefs: currentModelDefs(), source: "cache", backgroundRefresh: null };
   }
 
-  const backgroundRefresh = Promise.resolve()
-    .then(refresh)
-    .catch(onBackgroundError);
-  return { modelDefs: currentModelDefs(), source: "cache", backgroundRefresh };
+  return { modelDefs: await refresh(), source: "live", backgroundRefresh: null };
 }
 
 export function runInBackground(task, onError = () => {}) {