zelari-code 1.37.0 → 1.38.0

package/dist/cli/chatgptOAuth.js

@@ -1,10 +1,13 @@
 /**
  * chatgptOAuth — ChatGPT subscription login (Codex public OAuth client).
  *
- * Magic-link / device flow (preferred, matches Grok UX):
- *   POST /api/accounts/deviceauth/usercode → user_code + verification_uri
- *   poll /api/accounts/deviceauth/token → authorization_code
- *   POST /oauth/token (authorization_code) → access + refresh
+ * Device flow (preferred, matches official Codex CLI — NOT RFC 8628):
+ *   POST JSON /api/accounts/deviceauth/usercode { client_id }
+ *     → device_auth_id + user_code + interval
+ *   User opens https://auth.openai.com/codex/device and enters user_code
+ *   poll JSON /api/accounts/deviceauth/token { device_auth_id, user_code }
+ *     → authorization_code + server-issued PKCE (code_verifier)
+ *   POST form /oauth/token (authorization_code) → access + refresh
  *
  * Optional browser PKCE (localhost:1455) via CHATGPT_OAUTH_FLOW=browser.
  */
@@ -16,6 +19,8 @@ export const CHATGPT_TOKEN_URL = 'https://auth.openai.com/oauth/token';
 export const CHATGPT_DEVICE_CODE_URL = 'https://auth.openai.com/api/accounts/deviceauth/usercode';
 export const CHATGPT_DEVICE_TOKEN_URL = 'https://auth.openai.com/api/accounts/deviceauth/token';
 export const CHATGPT_DEVICE_REDIRECT_URI = 'https://auth.openai.com/deviceauth/callback';
+/** Codex constructs this; the usercode response does not include verification_uri. */
+export const CHATGPT_DEVICE_VERIFY_URL = 'https://auth.openai.com/codex/device';
 export const CHATGPT_SCOPE = 'openid profile email offline_access';
 export const CHATGPT_AUTH_CLAIMS = 'https://api.openai.com/auth';
 export class ChatgptOAuthError extends Error {
@@ -72,6 +77,35 @@ function parseTokenPayload(obj, fallbackRefresh) {
     }
     return result;
 }
+function errorSnippet(body) {
+    const err = body.error;
+    if (typeof err === 'string' && err.trim())
+        return err.trim().slice(0, 160);
+    if (err && typeof err === 'object') {
+        const msg = err.message;
+        if (typeof msg === 'string' && msg.trim())
+            return msg.trim().slice(0, 160);
+    }
+    const msg = body.message;
+    if (typeof msg === 'string' && msg.trim())
+        return msg.trim().slice(0, 160);
+    return '';
+}
+function formatHttpError(prefix, status, body) {
+    const detail = errorSnippet(body);
+    return detail ? `${prefix} HTTP ${status}: ${detail}` : `${prefix} HTTP ${status}`;
+}
+async function readJsonBody(response) {
+    try {
+        const parsed = await response.json();
+        if (parsed && typeof parsed === 'object')
+            return parsed;
+    }
+    catch {
+        /* empty */
+    }
+    return {};
+}
 async function postForm(url, data, fetchImpl) {
     let response;
     try {
@@ -87,16 +121,35 @@ async function postForm(url, data, fetchImpl) {
     catch (err) {
         throw new ChatgptOAuthError(`ChatGPT OAuth network error: ${err instanceof Error ? err.message : String(err)}`, 'network_error');
     }
-    let body = {};
+    return { status: response.status, body: await readJsonBody(response) };
+}
+/** Codex device-auth endpoints expect JSON, not RFC 8628 form bodies. */
+async function postJson(url, data, fetchImpl) {
+    let response;
     try {
-        const parsed = await response.json();
-        if (parsed && typeof parsed === 'object')
-            body = parsed;
+        response = await fetchImpl(url, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                Accept: 'application/json',
+            },
+            body: JSON.stringify(data),
+        });
     }
-    catch {
-        /* empty */
+    catch (err) {
+        throw new ChatgptOAuthError(`ChatGPT OAuth network error: ${err instanceof Error ? err.message : String(err)}`, 'network_error');
     }
-    return { status: response.status, body };
+    return { status: response.status, body: await readJsonBody(response) };
+}
+function parsePollInterval(raw, fallback = 5) {
+    if (typeof raw === 'number' && Number.isFinite(raw) && raw > 0)
+        return raw;
+    if (typeof raw === 'string') {
+        const n = Number.parseInt(raw, 10);
+        if (Number.isFinite(n) && n > 0)
+            return n;
+    }
+    return fallback;
 }
 export async function refreshChatgptToken(options) {
     if (!options.refreshToken.trim()) {
@@ -111,80 +164,90 @@ export async function refreshChatgptToken(options) {
     }, fetchImpl);
     if (status >= 400) {
         const code = status === 400 || status === 401 ? 'invalid_grant' : `http_${status}`;
-        throw new ChatgptOAuthError(`ChatGPT token refresh HTTP ${status}: ${String(body.error ?? '').slice(0, 160)}`, code);
+        throw new ChatgptOAuthError(formatHttpError('ChatGPT token refresh', status, body), code);
     }
     return parseTokenPayload(body, options.refreshToken);
 }
-export async function runChatgptDeviceFlow(options) {
+export async function startChatgptDeviceAuth(options = {}) {
     const clientId = options.clientId || process.env.CHATGPT_OAUTH_CLIENT_ID || DEFAULT_CHATGPT_CLIENT_ID;
     const fetchImpl = options.fetchImpl ?? fetch;
-    const sleep = options.sleepImpl ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
-    const { verifier, challenge } = generatePkcePair();
-    const start = await postForm(CHATGPT_DEVICE_CODE_URL, {
-        client_id: clientId,
-        scope: CHATGPT_SCOPE,
-        code_challenge: challenge,
-        code_challenge_method: 'S256',
-    }, fetchImpl);
+    // Official Codex: JSON { client_id } only. Extra RFC 8628 / PKCE fields → HTTP 400.
+    const start = await postJson(CHATGPT_DEVICE_CODE_URL, { client_id: clientId }, fetchImpl);
     if (start.status >= 400) {
-        throw new ChatgptOAuthError(`ChatGPT device-code HTTP ${start.status}`, `device_http_${start.status}`);
+        throw new ChatgptOAuthError(formatHttpError('ChatGPT device-code', start.status, start.body), `device_http_${start.status}`);
     }
-    const deviceCode = start.body.device_code;
-    const userCode = start.body.user_code;
+    const deviceAuthId = (typeof start.body.device_auth_id === 'string' && start.body.device_auth_id) ||
+        (typeof start.body.device_code === 'string' && start.body.device_code) ||
+        '';
+    const userCode = (typeof start.body.user_code === 'string' && start.body.user_code) ||
+        (typeof start.body.usercode === 'string' && start.body.usercode) ||
+        '';
     const verificationUri = (typeof start.body.verification_uri === 'string' && start.body.verification_uri) ||
-        (typeof start.body.verification_uri_complete === 'string' &&
-            start.body.verification_uri_complete);
-    if (typeof deviceCode !== 'string' ||
-        typeof userCode !== 'string' ||
-        typeof verificationUri !== 'string') {
+        (typeof start.body.verification_url === 'string' && start.body.verification_url) ||
+        `${CHATGPT_DEVICE_VERIFY_URL}?user_code=${encodeURIComponent(userCode)}`;
+    if (!deviceAuthId || !userCode) {
         throw new ChatgptOAuthError('Device-code response missing fields', 'no_device_code');
     }
-    const info = {
+    return {
+        deviceAuthId,
         userCode,
         verificationUri,
+        interval: parsePollInterval(start.body.interval, 5),
         ...(typeof start.body.verification_uri_complete === 'string'
             ? { verificationUriComplete: start.body.verification_uri_complete }
             : {}),
     };
-    if (options.onUserCode)
-        await options.onUserCode(info);
-    try {
-        await (options.openBrowserImpl ?? openBrowser)(info.verificationUriComplete ?? info.verificationUri);
-    }
-    catch {
-        /* user can open the URL manually */
-    }
+}
+export async function pollChatgptDeviceAuth(options) {
+    const clientId = options.clientId || process.env.CHATGPT_OAUTH_CLIENT_ID || DEFAULT_CHATGPT_CLIENT_ID;
+    const fetchImpl = options.fetchImpl ?? fetch;
+    const sleep = options.sleepImpl ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
     const timeoutMs = options.timeoutMs ?? 300_000;
     const deadline = Date.now() + timeoutMs;
-    let interval = 5;
+    let interval = options.interval ?? 5;
     let authorizationCode;
+    let codeVerifier;
     while (Date.now() < deadline) {
-        const poll = await postForm(CHATGPT_DEVICE_TOKEN_URL, { client_id: clientId, device_code: deviceCode }, fetchImpl);
+        const poll = await postJson(CHATGPT_DEVICE_TOKEN_URL, { device_auth_id: options.deviceAuthId, user_code: options.userCode }, fetchImpl);
         const authCode = poll.body.authorization_code;
         if (typeof authCode === 'string' && authCode.length > 0) {
             authorizationCode = authCode;
+            if (typeof poll.body.code_verifier === 'string' && poll.body.code_verifier) {
+                codeVerifier = poll.body.code_verifier;
+            }
             break;
         }
+        // Codex treats 403/404 as "not authorized yet".
+        if (poll.status === 403 || poll.status === 404) {
+            await sleep(interval * 1000);
+            continue;
+        }
         const err = typeof poll.body.error === 'string' ? poll.body.error : '';
         if (err === 'slow_down')
             interval += 5;
         else if (err && err !== 'authorization_pending') {
             throw new ChatgptOAuthError(`Device authorization failed: ${err}`, err);
         }
+        else if (poll.status >= 400) {
+            throw new ChatgptOAuthError(formatHttpError('ChatGPT device poll', poll.status, poll.body), `poll_http_${poll.status}`);
+        }
         await sleep(interval * 1000);
     }
     if (!authorizationCode) {
         throw new ChatgptOAuthError('Timed out waiting for ChatGPT device authorization', 'timeout');
     }
+    if (!codeVerifier) {
+        throw new ChatgptOAuthError('Device token response missing code_verifier (server-issued PKCE)', 'no_code_verifier');
+    }
     const token = await postForm(CHATGPT_TOKEN_URL, {
         grant_type: 'authorization_code',
         code: authorizationCode,
         redirect_uri: CHATGPT_DEVICE_REDIRECT_URI,
         client_id: clientId,
-        code_verifier: verifier,
+        code_verifier: codeVerifier,
     }, fetchImpl);
     if (token.status >= 400) {
-        throw new ChatgptOAuthError(`ChatGPT token exchange HTTP ${token.status}`, `token_http_${token.status}`);
+        throw new ChatgptOAuthError(formatHttpError('ChatGPT token exchange', token.status, token.body), `token_http_${token.status}`);
     }
     return parseTokenPayload(token.body);
 }
@@ -231,10 +294,46 @@ export async function runChatgptBrowserFlow(options) {
         code_verifier: verifier,
     }, fetchImpl);
     if (token.status >= 400) {
-        throw new ChatgptOAuthError(`ChatGPT token exchange HTTP ${token.status}`, `token_http_${token.status}`);
+        throw new ChatgptOAuthError(formatHttpError('ChatGPT token exchange', token.status, token.body), `token_http_${token.status}`);
     }
     return parseTokenPayload(token.body);
 }
+export async function runChatgptDeviceFlow(options = {}) {
+    const session = await startChatgptDeviceAuth({
+        clientId: options.clientId,
+        fetchImpl: options.fetchImpl,
+    });
+    const info = {
+        userCode: session.userCode,
+        verificationUri: session.verificationUri,
+        ...(session.verificationUriComplete
+            ? { verificationUriComplete: session.verificationUriComplete }
+            : {}),
+    };
+    if (options.onUserCode) {
+        await options.onUserCode(info);
+    }
+    else {
+        // Desktop / --login-oauth has no TUI callback: print the Codex device page + code.
+        // stderr: Desktop --login-oauth parses stdout as JSON.
+        process.stderr.write(`[chatgpt oauth] Open ${info.verificationUri} and enter:\n  ${info.userCode}\n`);
+    }
+    try {
+        await (options.openBrowserImpl ?? openBrowser)(info.verificationUriComplete ?? info.verificationUri);
+    }
+    catch {
+        /* user can open the URL manually */
+    }
+    return pollChatgptDeviceAuth({
+        deviceAuthId: session.deviceAuthId,
+        userCode: session.userCode,
+        clientId: options.clientId,
+        interval: session.interval,
+        fetchImpl: options.fetchImpl,
+        sleepImpl: options.sleepImpl,
+        timeoutMs: options.timeoutMs,
+    });
+}
 export async function runChatgptOAuthFlow(options = {}) {
     const flow = (process.env.CHATGPT_OAUTH_FLOW ?? 'device').toLowerCase();
     if (flow === 'browser') {

package/dist/cli/chatgptOAuth.js.map

@@ -1 +1 @@
-{"version":3,"file":"chatgptOAuth.js","sourceRoot":"","sources":["../../src/cli/chatgptOAuth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chatgptOAuth.js","sourceRoot":"","sources":["../../src/cli/chatgptOAuth.ts"],"names":[],"mappings":"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"}

package/dist/cli/main.bundled.js

@@ -794,16 +794,19 @@ __export(chatgptOAuth_exports, {
   CHATGPT_DEVICE_CODE_URL: () => CHATGPT_DEVICE_CODE_URL,
   CHATGPT_DEVICE_REDIRECT_URI: () => CHATGPT_DEVICE_REDIRECT_URI,
   CHATGPT_DEVICE_TOKEN_URL: () => CHATGPT_DEVICE_TOKEN_URL,
+  CHATGPT_DEVICE_VERIFY_URL: () => CHATGPT_DEVICE_VERIFY_URL,
   CHATGPT_SCOPE: () => CHATGPT_SCOPE,
   CHATGPT_TOKEN_URL: () => CHATGPT_TOKEN_URL,
   ChatgptOAuthError: () => ChatgptOAuthError,
   DEFAULT_CHATGPT_CLIENT_ID: () => DEFAULT_CHATGPT_CLIENT_ID,
   decodeJwtClaims: () => decodeJwtClaims,
   extractChatgptAccountId: () => extractChatgptAccountId,
+  pollChatgptDeviceAuth: () => pollChatgptDeviceAuth,
   refreshChatgptToken: () => refreshChatgptToken,
   runChatgptBrowserFlow: () => runChatgptBrowserFlow,
   runChatgptDeviceFlow: () => runChatgptDeviceFlow,
-  runChatgptOAuthFlow: () => runChatgptOAuthFlow
+  runChatgptOAuthFlow: () => runChatgptOAuthFlow,
+  startChatgptDeviceAuth: () => startChatgptDeviceAuth
 });
 function decodeJwtClaims(token) {
   const parts = token.split(".");
@@ -845,6 +848,29 @@ function parseTokenPayload(obj, fallbackRefresh) {
   }
   return result;
 }
+function errorSnippet(body) {
+  const err = body.error;
+  if (typeof err === "string" && err.trim()) return err.trim().slice(0, 160);
+  if (err && typeof err === "object") {
+    const msg2 = err.message;
+    if (typeof msg2 === "string" && msg2.trim()) return msg2.trim().slice(0, 160);
+  }
+  const msg = body.message;
+  if (typeof msg === "string" && msg.trim()) return msg.trim().slice(0, 160);
+  return "";
+}
+function formatHttpError(prefix, status, body) {
+  const detail = errorSnippet(body);
+  return detail ? `${prefix} HTTP ${status}: ${detail}` : `${prefix} HTTP ${status}`;
+}
+async function readJsonBody(response) {
+  try {
+    const parsed = await response.json();
+    if (parsed && typeof parsed === "object") return parsed;
+  } catch {
+  }
+  return {};
+}
 async function postForm(url2, data, fetchImpl) {
   let response;
   try {
@@ -862,13 +888,34 @@ async function postForm(url2, data, fetchImpl) {
       "network_error"
     );
   }
-  let body = {};
+  return { status: response.status, body: await readJsonBody(response) };
+}
+async function postJson(url2, data, fetchImpl) {
+  let response;
   try {
-    const parsed = await response.json();
-    if (parsed && typeof parsed === "object") body = parsed;
-  } catch {
+    response = await fetchImpl(url2, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json"
+      },
+      body: JSON.stringify(data)
+    });
+  } catch (err) {
+    throw new ChatgptOAuthError(
+      `ChatGPT OAuth network error: ${err instanceof Error ? err.message : String(err)}`,
+      "network_error"
+    );
   }
-  return { status: response.status, body };
+  return { status: response.status, body: await readJsonBody(response) };
+}
+function parsePollInterval(raw, fallback = 5) {
+  if (typeof raw === "number" && Number.isFinite(raw) && raw > 0) return raw;
+  if (typeof raw === "string") {
+    const n = Number.parseInt(raw, 10);
+    if (Number.isFinite(n) && n > 0) return n;
+  }
+  return fallback;
 }
 async function refreshChatgptToken(options) {
   if (!options.refreshToken.trim()) {
@@ -887,77 +934,82 @@ async function refreshChatgptToken(options) {
   );
   if (status >= 400) {
     const code = status === 400 || status === 401 ? "invalid_grant" : `http_${status}`;
-    throw new ChatgptOAuthError(
-      `ChatGPT token refresh HTTP ${status}: ${String(body.error ?? "").slice(0, 160)}`,
-      code
-    );
+    throw new ChatgptOAuthError(formatHttpError("ChatGPT token refresh", status, body), code);
   }
   return parseTokenPayload(body, options.refreshToken);
 }
-async function runChatgptDeviceFlow(options) {
+async function startChatgptDeviceAuth(options = {}) {
   const clientId2 = options.clientId || process.env.CHATGPT_OAUTH_CLIENT_ID || DEFAULT_CHATGPT_CLIENT_ID;
   const fetchImpl = options.fetchImpl ?? fetch;
-  const sleep = options.sleepImpl ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
-  const { verifier, challenge } = generatePkcePair();
-  const start = await postForm(
-    CHATGPT_DEVICE_CODE_URL,
-    {
-      client_id: clientId2,
-      scope: CHATGPT_SCOPE,
-      code_challenge: challenge,
-      code_challenge_method: "S256"
-    },
-    fetchImpl
-  );
+  const start = await postJson(CHATGPT_DEVICE_CODE_URL, { client_id: clientId2 }, fetchImpl);
   if (start.status >= 400) {
     throw new ChatgptOAuthError(
-      `ChatGPT device-code HTTP ${start.status}`,
+      formatHttpError("ChatGPT device-code", start.status, start.body),
       `device_http_${start.status}`
     );
   }
-  const deviceCode = start.body.device_code;
-  const userCode = start.body.user_code;
-  const verificationUri = typeof start.body.verification_uri === "string" && start.body.verification_uri || typeof start.body.verification_uri_complete === "string" && start.body.verification_uri_complete;
-  if (typeof deviceCode !== "string" || typeof userCode !== "string" || typeof verificationUri !== "string") {
+  const deviceAuthId = typeof start.body.device_auth_id === "string" && start.body.device_auth_id || typeof start.body.device_code === "string" && start.body.device_code || "";
+  const userCode = typeof start.body.user_code === "string" && start.body.user_code || typeof start.body.usercode === "string" && start.body.usercode || "";
+  const verificationUri = typeof start.body.verification_uri === "string" && start.body.verification_uri || typeof start.body.verification_url === "string" && start.body.verification_url || `${CHATGPT_DEVICE_VERIFY_URL}?user_code=${encodeURIComponent(userCode)}`;
+  if (!deviceAuthId || !userCode) {
     throw new ChatgptOAuthError("Device-code response missing fields", "no_device_code");
   }
-  const info = {
+  return {
+    deviceAuthId,
     userCode,
     verificationUri,
+    interval: parsePollInterval(start.body.interval, 5),
     ...typeof start.body.verification_uri_complete === "string" ? { verificationUriComplete: start.body.verification_uri_complete } : {}
   };
-  if (options.onUserCode) await options.onUserCode(info);
-  try {
-    await (options.openBrowserImpl ?? openBrowser)(
-      info.verificationUriComplete ?? info.verificationUri
-    );
-  } catch {
-  }
+}
+async function pollChatgptDeviceAuth(options) {
+  const clientId2 = options.clientId || process.env.CHATGPT_OAUTH_CLIENT_ID || DEFAULT_CHATGPT_CLIENT_ID;
+  const fetchImpl = options.fetchImpl ?? fetch;
+  const sleep = options.sleepImpl ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
   const timeoutMs = options.timeoutMs ?? 3e5;
   const deadline = Date.now() + timeoutMs;
-  let interval = 5;
+  let interval = options.interval ?? 5;
   let authorizationCode;
+  let codeVerifier;
   while (Date.now() < deadline) {
-    const poll = await postForm(
+    const poll = await postJson(
       CHATGPT_DEVICE_TOKEN_URL,
-      { client_id: clientId2, device_code: deviceCode },
+      { device_auth_id: options.deviceAuthId, user_code: options.userCode },
       fetchImpl
     );
     const authCode = poll.body.authorization_code;
     if (typeof authCode === "string" && authCode.length > 0) {
       authorizationCode = authCode;
+      if (typeof poll.body.code_verifier === "string" && poll.body.code_verifier) {
+        codeVerifier = poll.body.code_verifier;
+      }
       break;
     }
+    if (poll.status === 403 || poll.status === 404) {
+      await sleep(interval * 1e3);
+      continue;
+    }
     const err = typeof poll.body.error === "string" ? poll.body.error : "";
     if (err === "slow_down") interval += 5;
     else if (err && err !== "authorization_pending") {
       throw new ChatgptOAuthError(`Device authorization failed: ${err}`, err);
+    } else if (poll.status >= 400) {
+      throw new ChatgptOAuthError(
+        formatHttpError("ChatGPT device poll", poll.status, poll.body),
+        `poll_http_${poll.status}`
+      );
     }
     await sleep(interval * 1e3);
   }
   if (!authorizationCode) {
     throw new ChatgptOAuthError("Timed out waiting for ChatGPT device authorization", "timeout");
   }
+  if (!codeVerifier) {
+    throw new ChatgptOAuthError(
+      "Device token response missing code_verifier (server-issued PKCE)",
+      "no_code_verifier"
+    );
+  }
   const token = await postForm(
     CHATGPT_TOKEN_URL,
     {
@@ -965,13 +1017,13 @@ async function runChatgptDeviceFlow(options) {
       code: authorizationCode,
       redirect_uri: CHATGPT_DEVICE_REDIRECT_URI,
       client_id: clientId2,
-      code_verifier: verifier
+      code_verifier: codeVerifier
     },
     fetchImpl
   );
   if (token.status >= 400) {
     throw new ChatgptOAuthError(
-      `ChatGPT token exchange HTTP ${token.status}`,
+      formatHttpError("ChatGPT token exchange", token.status, token.body),
       `token_http_${token.status}`
     );
   }
@@ -1024,12 +1076,47 @@ async function runChatgptBrowserFlow(options) {
   );
   if (token.status >= 400) {
     throw new ChatgptOAuthError(
-      `ChatGPT token exchange HTTP ${token.status}`,
+      formatHttpError("ChatGPT token exchange", token.status, token.body),
       `token_http_${token.status}`
     );
   }
   return parseTokenPayload(token.body);
 }
+async function runChatgptDeviceFlow(options = {}) {
+  const session = await startChatgptDeviceAuth({
+    clientId: options.clientId,
+    fetchImpl: options.fetchImpl
+  });
+  const info = {
+    userCode: session.userCode,
+    verificationUri: session.verificationUri,
+    ...session.verificationUriComplete ? { verificationUriComplete: session.verificationUriComplete } : {}
+  };
+  if (options.onUserCode) {
+    await options.onUserCode(info);
+  } else {
+    process.stderr.write(
+      `[chatgpt oauth] Open ${info.verificationUri} and enter:
+  ${info.userCode}
+`
+    );
+  }
+  try {
+    await (options.openBrowserImpl ?? openBrowser)(
+      info.verificationUriComplete ?? info.verificationUri
+    );
+  } catch {
+  }
+  return pollChatgptDeviceAuth({
+    deviceAuthId: session.deviceAuthId,
+    userCode: session.userCode,
+    clientId: options.clientId,
+    interval: session.interval,
+    fetchImpl: options.fetchImpl,
+    sleepImpl: options.sleepImpl,
+    timeoutMs: options.timeoutMs
+  });
+}
 async function runChatgptOAuthFlow(options = {}) {
   const flow = (process.env.CHATGPT_OAUTH_FLOW ?? "device").toLowerCase();
   if (flow === "browser") {
@@ -1037,7 +1124,7 @@ async function runChatgptOAuthFlow(options = {}) {
   }
   return runChatgptDeviceFlow(options);
 }
-var DEFAULT_CHATGPT_CLIENT_ID, CHATGPT_AUTHORIZE_URL, CHATGPT_TOKEN_URL, CHATGPT_DEVICE_CODE_URL, CHATGPT_DEVICE_TOKEN_URL, CHATGPT_DEVICE_REDIRECT_URI, CHATGPT_SCOPE, CHATGPT_AUTH_CLAIMS, ChatgptOAuthError;
+var DEFAULT_CHATGPT_CLIENT_ID, CHATGPT_AUTHORIZE_URL, CHATGPT_TOKEN_URL, CHATGPT_DEVICE_CODE_URL, CHATGPT_DEVICE_TOKEN_URL, CHATGPT_DEVICE_REDIRECT_URI, CHATGPT_DEVICE_VERIFY_URL, CHATGPT_SCOPE, CHATGPT_AUTH_CLAIMS, ChatgptOAuthError;
 var init_chatgptOAuth = __esm({
   "src/cli/chatgptOAuth.ts"() {
     "use strict";
@@ -1049,6 +1136,7 @@ var init_chatgptOAuth = __esm({
     CHATGPT_DEVICE_CODE_URL = "https://auth.openai.com/api/accounts/deviceauth/usercode";
     CHATGPT_DEVICE_TOKEN_URL = "https://auth.openai.com/api/accounts/deviceauth/token";
     CHATGPT_DEVICE_REDIRECT_URI = "https://auth.openai.com/deviceauth/callback";
+    CHATGPT_DEVICE_VERIFY_URL = "https://auth.openai.com/codex/device";
     CHATGPT_SCOPE = "openid profile email offline_access";
     CHATGPT_AUTH_CLAIMS = "https://api.openai.com/auth";
     ChatgptOAuthError = class extends Error {
@@ -1152,7 +1240,7 @@ async function startAnthropicOAuth(options = {}) {
   }
   return { authorizeUrl, state: state3 };
 }
-async function postJson(url2, payload, fetchImpl) {
+async function postJson2(url2, payload, fetchImpl) {
   let response;
   try {
     response = await fetchImpl(url2, {
@@ -1212,7 +1300,7 @@ async function completeAnthropicOAuth(options) {
     redirect_uri: ANTHROPIC_REDIRECT_URI,
     state: parsed.state ?? pending.state
   };
-  const { status, body } = await postJson(ANTHROPIC_TOKEN_URL, payload, fetchImpl);
+  const { status, body } = await postJson2(ANTHROPIC_TOKEN_URL, payload, fetchImpl);
   if (status >= 400) {
     const code = status === 400 || status === 401 ? "invalid_grant" : `http_${status}`;
     throw new AnthropicOAuthError(
@@ -1227,7 +1315,7 @@ async function refreshAnthropicToken(options) {
     throw new AnthropicOAuthError("Missing refreshToken", "no_refresh_token");
   }
   const fetchImpl = options.fetchImpl ?? fetch;
-  const { status, body } = await postJson(
+  const { status, body } = await postJson2(
     ANTHROPIC_TOKEN_URL,
     {
       grant_type: "refresh_token",