claude-code-openai 0.1.12 → 0.1.14

package/dist/cli.js

@@ -186131,6 +186131,32 @@ async function getOpenAIAccessToken() {
   }
   return tokens.access_token;
 }
+async function obtainApiKey(idToken) {
+  const controller = new AbortController;
+  const timer = setTimeout(() => controller.abort(), 15000);
+  try {
+    const body = new URLSearchParams({
+      grant_type: "urn:ietf:params:oauth:grant-type:token-exchange",
+      client_id: OPENAI_OAUTH_CONFIG.CLIENT_ID,
+      requested_token: "openai-api-key",
+      subject_token: idToken,
+      subject_token_type: "urn:ietf:params:oauth:token-type:id_token"
+    });
+    const resp = await fetch(OPENAI_OAUTH_CONFIG.TOKEN_URL, {
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      body: body.toString(),
+      signal: controller.signal
+    });
+    if (!resp.ok) {
+      throw new Error(`API key exchange failed: ${resp.status}`);
+    }
+    const data = await resp.json();
+    return data.access_token;
+  } finally {
+    clearTimeout(timer);
+  }
+}
 async function startOpenAIOAuthFlow(options) {
   const codeVerifier = generateCodeVerifier();
   const codeChallenge = generateCodeChallenge(codeVerifier);
@@ -186139,14 +186165,15 @@ async function startOpenAIOAuthFlow(options) {
   const port = await listener.start(OPENAI_OAUTH_CONFIG.CALLBACK_PORT);
   const redirectUri = `http://localhost:${port}/auth/callback`;
   const authUrl = new URL(OPENAI_OAUTH_CONFIG.AUTHORIZE_URL);
-  authUrl.searchParams.append("client_id", OPENAI_OAUTH_CONFIG.CLIENT_ID);
   authUrl.searchParams.append("response_type", "code");
+  authUrl.searchParams.append("client_id", OPENAI_OAUTH_CONFIG.CLIENT_ID);
   authUrl.searchParams.append("redirect_uri", redirectUri);
   authUrl.searchParams.append("scope", OPENAI_OAUTH_CONFIG.SCOPES.join(" "));
   authUrl.searchParams.append("code_challenge", codeChallenge);
   authUrl.searchParams.append("code_challenge_method", "S256");
+  authUrl.searchParams.append("id_token_add_organizations", "true");
+  authUrl.searchParams.append("codex_cli_simplified_flow", "true");
   authUrl.searchParams.append("state", state3);
-  authUrl.searchParams.append("audience", OPENAI_OAUTH_CONFIG.AUDIENCE);
   const urlStr = authUrl.toString();
   logForDebugging(`[OpenAI OAuth] Authorization URL: ${urlStr}`);
   if (options?.onUrl) {
@@ -186175,27 +186202,39 @@ async function startOpenAIOAuthFlow(options) {
     const tokenTimer = setTimeout(() => tokenController.abort(), 15000);
     let tokenResponse;
     try {
+      const tokenBody = new URLSearchParams({
+        grant_type: "authorization_code",
+        code: authorizationCode,
+        redirect_uri: redirectUri,
+        client_id: OPENAI_OAUTH_CONFIG.CLIENT_ID,
+        code_verifier: codeVerifier
+      });
       tokenResponse = await fetch(OPENAI_OAUTH_CONFIG.TOKEN_URL, {
         method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          grant_type: "authorization_code",
-          code: authorizationCode,
-          redirect_uri: redirectUri,
-          client_id: OPENAI_OAUTH_CONFIG.CLIENT_ID,
-          code_verifier: codeVerifier
-        }),
+        headers: { "Content-Type": "application/x-www-form-urlencoded" },
+        body: tokenBody.toString(),
         signal: tokenController.signal
       });
     } finally {
       clearTimeout(tokenTimer);
     }
     if (!tokenResponse.ok) {
-      throw new Error(`Token exchange failed: ${tokenResponse.status} ${tokenResponse.statusText}`);
+      const errBody = await tokenResponse.text().catch(() => "");
+      throw new Error(`Token exchange failed: ${tokenResponse.status} ${tokenResponse.statusText} ${errBody}`);
     }
     const data = await tokenResponse.json();
+    logForDebugging("[OpenAI OAuth] Token exchange succeeded, obtaining API key...");
+    let apiKey = null;
+    if (data.id_token) {
+      try {
+        apiKey = await obtainApiKey(data.id_token);
+        logForDebugging("[OpenAI OAuth] API key obtained successfully");
+      } catch (err) {
+        logForDebugging(`[OpenAI OAuth] API key exchange failed (will use access_token): ${err instanceof Error ? err.message : String(err)}`);
+      }
+    }
     const tokens = {
-      access_token: data.access_token,
+      access_token: apiKey || data.access_token,
       refresh_token: data.refresh_token || null,
       expires_at: data.expires_in ? Date.now() + data.expires_in * 1000 : null,
       id_token: data.id_token
@@ -186215,10 +186254,10 @@ var init_openai_oauth = __esm(() => {
   init_auth_code_listener();
   OPENAI_OAUTH_CONFIG = {
     CLIENT_ID: "app_EMoamEEZ73f0CkXaXp7hrann",
-    AUTHORIZE_URL: "https://auth.openai.com/authorize",
+    ISSUER: "https://auth.openai.com",
+    AUTHORIZE_URL: "https://auth.openai.com/oauth/authorize",
     TOKEN_URL: "https://auth.openai.com/oauth/token",
-    AUDIENCE: "https://api.openai.com/v1",
-    SCOPES: ["openid", "profile", "email", "offline_access"],
+    SCOPES: ["openid", "profile", "email", "offline_access", "api.connectors.read", "api.connectors.invoke"],
     CALLBACK_PORT: 1455,
     REDIRECT_URI: "http://localhost:1455/auth/callback"
   };
@@ -186396,13 +186435,27 @@ async function getOpenAIClient({
   apiKey
 }) {
   let resolvedKey = apiKey || process.env.OPENAI_API_KEY || "";
+  let isOAuthChatgpt = false;
+  let chatgptAccountId;
   if (!resolvedKey) {
     try {
-      const { getOpenAIAccessToken: getOpenAIAccessToken2 } = await Promise.resolve().then(() => (init_openai_oauth(), exports_openai_oauth));
+      const { getOpenAIAccessToken: getOpenAIAccessToken2, loadOpenAITokens: loadOpenAITokens2 } = await Promise.resolve().then(() => (init_openai_oauth(), exports_openai_oauth));
       resolvedKey = await getOpenAIAccessToken2() || "";
+      if (resolvedKey) {
+        isOAuthChatgpt = true;
+        try {
+          const tokens = loadOpenAITokens2();
+          const token = tokens?.access_token || resolvedKey;
+          const parts = token.split(".");
+          if (parts.length === 3) {
+            const payload = JSON.parse(Buffer.from(parts[1].replace(/-/g, "+").replace(/_/g, "/"), "base64").toString());
+            chatgptAccountId = payload?.["https://api.openai.com/auth"]?.chatgpt_account_id;
+          }
+        } catch {}
+      }
     } catch {}
   }
-  const baseURL = process.env.OPENAI_BASE_URL || "https://api.openai.com/v1";
+  const baseURL = process.env.OPENAI_BASE_URL || (isOAuthChatgpt ? "https://chatgpt.com/backend-api/codex" : "https://api.openai.com/v1");
   const timeout = parseInt(process.env.API_TIMEOUT_MS || String(600000), 10);
   if (_cachedOpenAIClient && _cachedOpenAIClient.apiKey === resolvedKey) {
     return _cachedOpenAIClient;
@@ -186411,9 +186464,11 @@ async function getOpenAIClient({
     apiKey: resolvedKey,
     baseURL,
     timeout,
+    isOAuthChatgpt,
+    chatgptAccountId,
     fetch: globalThis.fetch
   };
-  logForDebugging(`[API:openai] Client created, baseURL=${baseURL}, auth=${resolvedKey ? process.env.OPENAI_API_KEY ? "api-key" : "oauth" : "none"}`);
+  logForDebugging(`[API:openai] Client created, baseURL=${baseURL}, auth=${resolvedKey ? isOAuthChatgpt ? "oauth-chatgpt" : "api-key" : "none"}${chatgptAccountId ? ", account=" + chatgptAccountId : ""}`);
   return _cachedOpenAIClient;
 }
 function buildFetch(fetchOverride, source) {
@@ -204606,7 +204661,7 @@ var init_metadata = __esm(() => {
       isClaudeAiAuth: isClaudeAISubscriber(),
       version: "2.1.88-rebuild",
       versionBase: getVersionBase(),
-      buildTime: "2026-04-01T10:24:01.092Z",
+      buildTime: "2026-04-01T19:52:43.844Z",
       deploymentEnvironment: env4.detectDeploymentEnvironment(),
       ...isEnvTruthy(process.env.GITHUB_ACTIONS) && {
         githubEventName: process.env.GITHUB_EVENT_NAME,
@@ -592892,7 +592947,7 @@ function getAnthropicEnvMetadata() {
 function getBuildAgeMinutes() {
   if (false)
     ;
-  const buildTime = new Date("2026-04-01T10:24:01.092Z").getTime();
+  const buildTime = new Date("2026-04-01T19:52:43.844Z").getTime();
   if (isNaN(buildTime))
     return;
   return Math.floor((Date.now() - buildTime) / 60000);
@@ -595237,12 +595292,16 @@ async function* queryModelOpenAI(messages, systemPrompt, thinkingConfig, tools,
     for (let attempt = 0;attempt <= MAX_RETRIES4; attempt++) {
       if (signal.aborted)
         return;
+      const headers = {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${client3.apiKey}`
+      };
+      if (client3.isOAuthChatgpt && client3.chatgptAccountId) {
+        headers["chatgpt-account-id"] = client3.chatgptAccountId;
+      }
       response = await client3.fetch(`${client3.baseURL}/responses`, {
         method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${client3.apiKey}`
-        },
+        headers,
         body: JSON.stringify(params),
         signal
       });
@@ -679463,7 +679522,7 @@ var init_bridge_kick = __esm(() => {
 var call56 = async () => {
   return {
     type: "text",
-    value: `${"2.1.88-rebuild"} (built ${"2026-04-01T10:24:01.092Z"})`
+    value: `${"2.1.88-rebuild"} (built ${"2026-04-01T19:52:43.844Z"})`
   };
 }, version6, version_default;
 var init_version = __esm(() => {
@@ -699243,12 +699302,16 @@ async function verifyApiKey(apiKey, isNonInteractiveSession) {
       const client3 = await getOpenAIClient({ apiKey: apiKey || undefined, maxRetries: 0 });
       if (!client3.apiKey)
         return false;
+      const verifyHeaders = {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${client3.apiKey}`
+      };
+      if (client3.isOAuthChatgpt && client3.chatgptAccountId) {
+        verifyHeaders["chatgpt-account-id"] = client3.chatgptAccountId;
+      }
       const resp = await client3.fetch(`${client3.baseURL}/responses`, {
         method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${client3.apiKey}`
-        },
+        headers: verifyHeaders,
         body: JSON.stringify({
           model: resolveOpenAIModel2(getSmallFastModel()),
           input: "test",
@@ -777469,4 +777532,4 @@ async function main2() {
 }
 main2();
 
-//# debugId=699B3904C01ABC6A64756E2164756E21
+//# debugId=AD792C044104FF2164756E2164756E21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-openai",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "Claude Code CLI with OpenAI GPT-5.4 backend support",
   "type": "module",
   "bin": {