claude-code-openai 0.1.8 → 0.1.10

package/dist/cli.js

@@ -186389,6 +186389,9 @@ function getCustomHeaders() {
   }
   return customHeaders;
 }
+function clearOpenAIClientCache() {
+  _cachedOpenAIClient = null;
+}
 async function getOpenAIClient({
   apiKey
 }) {
@@ -204603,7 +204606,7 @@ var init_metadata = __esm(() => {
       isClaudeAiAuth: isClaudeAISubscriber(),
       version: "2.1.88-rebuild",
       versionBase: getVersionBase(),
-      buildTime: "2026-04-01T09:41:25.751Z",
+      buildTime: "2026-04-01T09:59:26.964Z",
       deploymentEnvironment: env4.detectDeploymentEnvironment(),
       ...isEnvTruthy(process.env.GITHUB_ACTIONS) && {
         githubEventName: process.env.GITHUB_EVENT_NAME,
@@ -592889,7 +592892,7 @@ function getAnthropicEnvMetadata() {
 function getBuildAgeMinutes() {
   if (false)
     ;
-  const buildTime = new Date("2026-04-01T09:41:25.751Z").getTime();
+  const buildTime = new Date("2026-04-01T09:59:26.964Z").getTime();
   if (isNaN(buildTime))
     return;
   return Math.floor((Date.now() - buildTime) / 60000);
@@ -595165,6 +595168,15 @@ async function* queryModelOpenAI(messages, systemPrompt, thinkingConfig, tools,
   const MAX_RETRIES4 = 3;
   const BASE_DELAY_MS4 = 500;
   try {
+    let resetWatchdog = function() {
+      if (watchdogTimer)
+        clearTimeout(watchdogTimer);
+      watchdogTimer = setTimeout(() => {
+        logForDebugging(`[OpenAI] Stream watchdog triggered — no data for ${STREAM_WATCHDOG_MS / 1000}s, aborting`);
+        watchdogController.abort();
+        reader.cancel().catch(() => {});
+      }, STREAM_WATCHDOG_MS);
+    };
     let response;
     let lastErrorMessage = "";
     let lastStatus = 0;
@@ -595222,8 +595234,30 @@ async function* queryModelOpenAI(messages, systemPrompt, thinkingConfig, tools,
           error: "rate_limit"
         });
       } else if (status === 401 || status === 403) {
+        clearOpenAIClientCache();
+        if (!_auth401RetryInProgress) {
+          try {
+            const { loadOpenAITokens: loadOpenAITokens2, refreshOpenAIToken: refreshOpenAIToken2 } = await Promise.resolve().then(() => (init_openai_oauth(), exports_openai_oauth));
+            const tokens = loadOpenAITokens2();
+            if (tokens?.refresh_token) {
+              logForDebugging("[OpenAI] 401 received — attempting OAuth token refresh...");
+              _auth401RetryInProgress = true;
+              try {
+                await refreshOpenAIToken2(tokens.refresh_token);
+                logForDebugging("[OpenAI] Token refreshed, retrying request...");
+                yield* queryModelOpenAI(messages, systemPrompt, thinkingConfig, tools, signal, options);
+                return;
+              } finally {
+                _auth401RetryInProgress = false;
+              }
+            }
+          } catch (refreshErr) {
+            _auth401RetryInProgress = false;
+            logForDebugging(`[OpenAI] OAuth token refresh failed: ${refreshErr instanceof Error ? refreshErr.message : String(refreshErr)}`);
+          }
+        }
         yield createAssistantAPIErrorMessage({
-          content: `Authentication error: ${lastErrorMessage}. Check your OPENAI_API_KEY.`,
+          content: `Authentication error: ${lastErrorMessage}. Run /login to re-authenticate or check your OPENAI_API_KEY.`,
           error: "authentication_failed"
         });
       } else if (status === 400 && lastErrorMessage.includes("context_length_exceeded")) {
@@ -595281,11 +595315,16 @@ async function* queryModelOpenAI(messages, systemPrompt, thinkingConfig, tools,
     const reader = response.body.getReader();
     const decoder = new TextDecoder;
     let buffer = "";
+    const STREAM_WATCHDOG_MS = 90000;
+    let watchdogTimer = null;
+    const watchdogController = new AbortController;
+    resetWatchdog();
     try {
       while (true) {
         const { done, value } = await reader.read();
         if (done)
           break;
+        resetWatchdog();
         buffer += decoder.decode(value, { stream: true });
         const lines2 = buffer.split(`
 `);
@@ -595525,8 +595564,17 @@ async function* queryModelOpenAI(messages, systemPrompt, thinkingConfig, tools,
         }
       }
     } finally {
+      if (watchdogTimer)
+        clearTimeout(watchdogTimer);
       reader.releaseLock();
     }
+    if (watchdogController.signal.aborted) {
+      yield createAssistantAPIErrorMessage({
+        content: `Stream timed out — no data received for ${STREAM_WATCHDOG_MS / 1000} seconds. The server may be overloaded. Please try again.`,
+        error: "unknown"
+      });
+      return;
+    }
     if (pendingAnnotations.size > 0) {
       for (const [outputIdx, annotations] of pendingAnnotations) {
         const blockIdx = findBlockIndex(contentBlocks, outputIdx, "text", textState, functionCallState, reasoningState);
@@ -595636,7 +595684,7 @@ async function queryModelOpenAINonStreaming(messages, systemPrompt, thinkingConf
   }
   return result;
 }
-var OPENAI_MODEL_MAP, MAX_OUTPUT_TOKENS, _lastResponseId = null;
+var OPENAI_MODEL_MAP, MAX_OUTPUT_TOKENS, _lastResponseId = null, _auth401RetryInProgress = false;
 var init_openai_query = __esm(() => {
   init_messages7();
   init_debug();
@@ -679360,7 +679408,7 @@ var init_bridge_kick = __esm(() => {
 var call56 = async () => {
   return {
     type: "text",
-    value: `${"2.1.88-rebuild"} (built ${"2026-04-01T09:41:25.751Z"})`
+    value: `${"2.1.88-rebuild"} (built ${"2026-04-01T09:59:26.964Z"})`
   };
 }, version6, version_default;
 var init_version = __esm(() => {
@@ -741119,10 +741167,25 @@ var init_useDeferredHookMessages = __esm(() => {
 });
 
 // src/hooks/useApiKeyVerification.ts
+import { existsSync as existsSync12, readFileSync as readFileSync20 } from "fs";
+import { join as join147 } from "path";
+function hasOpenAIAuth() {
+  if (process.env.OPENAI_API_KEY)
+    return true;
+  try {
+    const tokenPath = join147(getClaudeConfigHomeDir(), ".openai-oauth.json");
+    if (!existsSync12(tokenPath))
+      return false;
+    const data = JSON.parse(readFileSync20(tokenPath, "utf-8"));
+    return !!data.access_token;
+  } catch {
+    return false;
+  }
+}
 function useApiKeyVerification() {
   const [status2, setStatus] = import_react383.useState(() => {
     if (getAPIProvider() === "openai") {
-      return process.env.OPENAI_API_KEY ? "valid" : "missing";
+      return hasOpenAIAuth() ? "loading" : "missing";
     }
     if (!isAnthropicAuthEnabled() || isClaudeAISubscriber()) {
       return "valid";
@@ -741138,7 +741201,16 @@ function useApiKeyVerification() {
   const [error42, setError] = import_react383.useState(null);
   const verify = import_react383.useCallback(async () => {
     if (getAPIProvider() === "openai") {
-      setStatus(process.env.OPENAI_API_KEY ? "valid" : "missing");
+      if (!hasOpenAIAuth()) {
+        setStatus("missing");
+        return;
+      }
+      try {
+        const isValid2 = await verifyApiKey("", false);
+        setStatus(isValid2 ? "valid" : "invalid");
+      } catch {
+        setStatus("error");
+      }
       return;
     }
     if (!isAnthropicAuthEnabled() || isClaudeAISubscriber()) {
@@ -741180,6 +741252,7 @@ var init_useApiKeyVerification = __esm(() => {
   init_state();
   init_claude();
   init_auth2();
+  init_envUtils();
   init_providers();
   import_react383 = __toESM(require_react(), 1);
 });
@@ -744129,7 +744202,7 @@ __export(exports_asciicast, {
   _resetRecordingStateForTesting: () => _resetRecordingStateForTesting
 });
 import { appendFile as appendFile7, rename as rename10 } from "fs/promises";
-import { basename as basename57, dirname as dirname59, join as join148 } from "path";
+import { basename as basename57, dirname as dirname59, join as join149 } from "path";
 function getRecordFilePath() {
   if (recordingState.filePath !== null) {
     return recordingState.filePath;
@@ -744140,10 +744213,10 @@ function getRecordFilePath() {
   if (!isEnvTruthy(process.env.CLAUDE_CODE_TERMINAL_RECORDING)) {
     return null;
   }
-  const projectsDir = join148(getClaudeConfigHomeDir(), "projects");
-  const projectDir = join148(projectsDir, sanitizePath2(getOriginalCwd()));
+  const projectsDir = join149(getClaudeConfigHomeDir(), "projects");
+  const projectDir = join149(projectsDir, sanitizePath2(getOriginalCwd()));
   recordingState.timestamp = Date.now();
-  recordingState.filePath = join148(projectDir, `${getSessionId()}-${recordingState.timestamp}.cast`);
+  recordingState.filePath = join149(projectDir, `${getSessionId()}-${recordingState.timestamp}.cast`);
   return recordingState.filePath;
 }
 function _resetRecordingStateForTesting() {
@@ -744152,13 +744225,13 @@ function _resetRecordingStateForTesting() {
 }
 function getSessionRecordingPaths() {
   const sessionId = getSessionId();
-  const projectsDir = join148(getClaudeConfigHomeDir(), "projects");
-  const projectDir = join148(projectsDir, sanitizePath2(getOriginalCwd()));
+  const projectsDir = join149(getClaudeConfigHomeDir(), "projects");
+  const projectDir = join149(projectsDir, sanitizePath2(getOriginalCwd()));
   try {
     const entries = getFsImplementation().readdirSync(projectDir);
     const names = typeof entries[0] === "string" ? entries : entries.map((e2) => e2.name);
     const files3 = names.filter((f2) => f2.startsWith(sessionId) && f2.endsWith(".cast")).sort();
-    return files3.map((f2) => join148(projectDir, f2));
+    return files3.map((f2) => join149(projectDir, f2));
   } catch {
     return [];
   }
@@ -744168,9 +744241,9 @@ async function renameRecordingForSession() {
   if (!oldPath || recordingState.timestamp === 0) {
     return;
   }
-  const projectsDir = join148(getClaudeConfigHomeDir(), "projects");
-  const projectDir = join148(projectsDir, sanitizePath2(getOriginalCwd()));
-  const newPath = join148(projectDir, `${getSessionId()}-${recordingState.timestamp}.cast`);
+  const projectsDir = join149(getClaudeConfigHomeDir(), "projects");
+  const projectDir = join149(projectsDir, sanitizePath2(getOriginalCwd()));
+  const newPath = join149(projectDir, `${getSessionId()}-${recordingState.timestamp}.cast`);
   if (oldPath === newPath) {
     return;
   }
@@ -746933,7 +747006,7 @@ var init_useChromeExtensionNotification = __esm(() => {
 });
 
 // src/utils/plugins/officialMarketplaceStartupCheck.ts
-import { join as join149 } from "path";
+import { join as join150 } from "path";
 function isOfficialMarketplaceAutoInstallDisabled() {
   return isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_OFFICIAL_MARKETPLACE_AUTOINSTALL);
 }
@@ -747016,7 +747089,7 @@ async function checkAndInstallOfficialMarketplace() {
       return { installed: false, skipped: true, reason: "policy_blocked" };
     }
     const cacheDir = getMarketplacesCacheDir();
-    const installLocation = join149(cacheDir, OFFICIAL_MARKETPLACE_NAME);
+    const installLocation = join150(cacheDir, OFFICIAL_MARKETPLACE_NAME);
     const gcsSha = await fetchOfficialMarketplaceFromGcs(installLocation, cacheDir);
     if (gcsSha !== null) {
       const known = await loadKnownMarketplacesConfig();
@@ -749888,7 +749961,7 @@ var init_usePluginRecommendationBase = __esm(() => {
 });
 
 // src/hooks/useLspPluginRecommendation.tsx
-import { extname as extname15, join as join150 } from "path";
+import { extname as extname15, join as join151 } from "path";
 function useLspPluginRecommendation() {
   const $4 = import_react_compiler_runtime356.c(12);
   const trackedFiles = useAppState(_temp224);
@@ -749973,7 +750046,7 @@ function useLspPluginRecommendation() {
           case "yes": {
             installPluginAndNotify(pluginId, pluginName, "lsp-plugin", addNotification, async (pluginData) => {
               logForDebugging(`[useLspPluginRecommendation] Installing plugin: ${pluginId}`);
-              const localSourcePath = typeof pluginData.entry.source === "string" ? join150(pluginData.marketplaceInstallLocation, pluginData.entry.source) : undefined;
+              const localSourcePath = typeof pluginData.entry.source === "string" ? join151(pluginData.marketplaceInstallLocation, pluginData.entry.source) : undefined;
               await cacheAndRegisterPlugin(pluginId, pluginData.entry, "user", undefined, localSourcePath);
               const settings = getSettingsForSource("userSettings");
               updateSettingsForSource("userSettings", {
@@ -752628,7 +752701,7 @@ var exports_REPL = {};
 __export(exports_REPL, {
   REPL: () => REPL
 });
-import { dirname as dirname61, join as join151 } from "path";
+import { dirname as dirname61, join as join152 } from "path";
 import { tmpdir as tmpdir14 } from "os";
 import { writeFile as writeFile46 } from "fs/promises";
 import { randomUUID as randomUUID50 } from "crypto";
@@ -755111,7 +755184,7 @@ Note: ctrl + z now suspends Claude Code, ctrl + _ undoes input.
           const w3 = Math.max(80, (process.stdout.columns ?? 80) - 6);
           const raw = await renderMessagesToPlainText(deferredMessages, tools, w3);
           const text2 = raw.replace(/[ \t]+$/gm, "");
-          const path27 = join151(tmpdir14(), `cc-transcript-${Date.now()}.txt`);
+          const path27 = join152(tmpdir14(), `cc-transcript-${Date.now()}.txt`);
           await writeFile46(path27, text2);
           const opened = openFileInExternalEditor(path27);
           setStatus(opened ? `opening ${path27}` : `wrote ${path27} · no $VISUAL/$EDITOR set`);
@@ -762792,12 +762865,12 @@ var init_createDirectConnectSession = __esm(() => {
 });
 
 // src/utils/errorLogSink.ts
-import { dirname as dirname63, join as join152 } from "path";
+import { dirname as dirname63, join as join153 } from "path";
 function getErrorsPath() {
-  return join152(CACHE_PATHS.errors(), DATE + ".jsonl");
+  return join153(CACHE_PATHS.errors(), DATE + ".jsonl");
 }
 function getMCPLogsPath(serverName) {
-  return join152(CACHE_PATHS.mcpLogs(serverName), DATE + ".jsonl");
+  return join153(CACHE_PATHS.mcpLogs(serverName), DATE + ".jsonl");
 }
 function createJsonlWriter(options) {
   const writer = createBufferedWriter(options);
@@ -763140,7 +763213,7 @@ var init_sessionMemory = __esm(() => {
 // src/utils/iTermBackup.ts
 import { copyFile as copyFile12, stat as stat49 } from "fs/promises";
 import { homedir as homedir39 } from "os";
-import { join as join153 } from "path";
+import { join as join154 } from "path";
 function markITerm2SetupComplete() {
   saveGlobalConfig((current) => ({
     ...current,
@@ -763155,7 +763228,7 @@ function getIterm2RecoveryInfo() {
   };
 }
 function getITerm2PlistPath() {
-  return join153(homedir39(), "Library", "Preferences", "com.googlecode.iterm2.plist");
+  return join154(homedir39(), "Library", "Preferences", "com.googlecode.iterm2.plist");
 }
 async function checkAndRestoreITerm2Backup() {
   const { inProgress, backupPath } = getIterm2RecoveryInfo();
@@ -766520,7 +766593,7 @@ var init_idleTimeout = __esm(() => {
 // src/bridge/inboundAttachments.ts
 import { randomUUID as randomUUID53 } from "crypto";
 import { mkdir as mkdir43, writeFile as writeFile48 } from "fs/promises";
-import { basename as basename58, join as join154 } from "path";
+import { basename as basename58, join as join155 } from "path";
 function debug4(msg) {
   logForDebugging(`[bridge:inbound-attach] ${msg}`);
 }
@@ -766536,7 +766609,7 @@ function sanitizeFileName(name3) {
   return base2 || "attachment";
 }
 function uploadsDir() {
-  return join154(getClaudeConfigHomeDir(), "uploads", getSessionId());
+  return join155(getClaudeConfigHomeDir(), "uploads", getSessionId());
 }
 async function resolveOne(att) {
   const token = getBridgeAccessToken();
@@ -766565,7 +766638,7 @@ async function resolveOne(att) {
   const safeName = sanitizeFileName(att.file_name);
   const prefix = (att.file_uuid.slice(0, 8) || randomUUID53().slice(0, 8)).replace(/[^a-zA-Z0-9_-]/g, "_");
   const dir = uploadsDir();
-  const outPath = join154(dir, `${prefix}-${safeName}`);
+  const outPath = join155(dir, `${prefix}-${safeName}`);
   try {
     await mkdir43(dir, { recursive: true });
     await writeFile48(outPath, data);
@@ -766665,7 +766738,7 @@ var init_sessionUrl = __esm(() => {
 
 // src/utils/plugins/zipCacheAdapters.ts
 import { readFile as readFile55 } from "fs/promises";
-import { join as join155 } from "path";
+import { join as join156 } from "path";
 async function readZipCacheKnownMarketplaces() {
   try {
     const content = await readFile55(getZipCacheKnownMarketplacesPath(), "utf-8");
@@ -766690,13 +766763,13 @@ async function saveMarketplaceJsonToZipCache(marketplaceName, installLocation) {
   const content = await readMarketplaceJsonContent(installLocation);
   if (content !== null) {
     const relPath = getMarketplaceJsonRelativePath(marketplaceName);
-    await atomicWriteToZipCache(join155(zipCachePath, relPath), content);
+    await atomicWriteToZipCache(join156(zipCachePath, relPath), content);
   }
 }
 async function readMarketplaceJsonContent(dir) {
   const candidates = [
-    join155(dir, ".claude-plugin", "marketplace.json"),
-    join155(dir, "marketplace.json"),
+    join156(dir, ".claude-plugin", "marketplace.json"),
+    join156(dir, "marketplace.json"),
     dir
   ];
   for (const candidate of candidates) {
@@ -767155,9 +767228,9 @@ __export(exports_bridgePointer, {
   BRIDGE_POINTER_TTL_MS: () => BRIDGE_POINTER_TTL_MS
 });
 import { mkdir as mkdir44, readFile as readFile56, stat as stat50, unlink as unlink25, writeFile as writeFile49 } from "fs/promises";
-import { dirname as dirname64, join as join156 } from "path";
+import { dirname as dirname64, join as join157 } from "path";
 function getBridgePointerPath(dir) {
-  return join156(getProjectsDir(), sanitizePath2(dir), "bridge-pointer.json");
+  return join157(getProjectsDir(), sanitizePath2(dir), "bridge-pointer.json");
 }
 async function writeBridgePointer(dir, pointer) {
   const path27 = getBridgePointerPath(dir);
@@ -773055,14 +773128,14 @@ __export(exports_claudeDesktop, {
 });
 import { readdir as readdir31, readFile as readFile58, stat as stat52 } from "fs/promises";
 import { homedir as homedir40 } from "os";
-import { join as join157 } from "path";
+import { join as join158 } from "path";
 async function getClaudeDesktopConfigPath() {
   const platform7 = getPlatform();
   if (!SUPPORTED_PLATFORMS.includes(platform7)) {
     throw new Error(`Unsupported platform: ${platform7} - Claude Desktop integration only works on macOS and WSL.`);
   }
   if (platform7 === "macos") {
-    return join157(homedir40(), "Library", "Application Support", "Claude", "claude_desktop_config.json");
+    return join158(homedir40(), "Library", "Application Support", "Claude", "claude_desktop_config.json");
   }
   const windowsHome = process.env.USERPROFILE ? process.env.USERPROFILE.replace(/\\/g, "/") : null;
   if (windowsHome) {
@@ -773081,7 +773154,7 @@ async function getClaudeDesktopConfigPath() {
         if (user.name === "Public" || user.name === "Default" || user.name === "Default User" || user.name === "All Users") {
           continue;
         }
-        const potentialConfigPath = join157(usersDir, user.name, "AppData", "Roaming", "Claude", "claude_desktop_config.json");
+        const potentialConfigPath = join158(usersDir, user.name, "AppData", "Roaming", "Claude", "claude_desktop_config.json");
         try {
           await stat52(potentialConfigPath);
           return potentialConfigPath;
@@ -773986,12 +774059,12 @@ __export(exports_install, {
   install: () => install
 });
 import { homedir as homedir41 } from "node:os";
-import { join as join158 } from "node:path";
+import { join as join159 } from "node:path";
 function getInstallationPath2() {
   const isWindows3 = env4.platform === "win32";
   const homeDir = homedir41();
   if (isWindows3) {
-    const windowsPath = join158(homeDir, ".local", "bin", "claude.exe");
+    const windowsPath = join159(homeDir, ".local", "bin", "claude.exe");
     return windowsPath.replace(/\//g, "\\");
   }
   return "~/.local/bin/claude";
@@ -774778,7 +774851,7 @@ __export(exports_main, {
   startDeferredPrefetches: () => startDeferredPrefetches,
   main: () => main
 });
-import { readFileSync as readFileSync20 } from "fs";
+import { readFileSync as readFileSync21 } from "fs";
 import { resolve as resolve46 } from "path";
 function logManagedSettings() {
   try {
@@ -774934,7 +775007,7 @@ function loadSettingsFromFlag(settingsFile) {
         resolvedPath: resolvedSettingsPath
       } = safeResolvePath(getFsImplementation(), settingsFile);
       try {
-        readFileSync20(resolvedSettingsPath, "utf8");
+        readFileSync21(resolvedSettingsPath, "utf8");
       } catch (e2) {
         if (isENOENT(e2)) {
           process.stderr.write(source_default.red(`Error: Settings file not found: ${resolvedSettingsPath}
@@ -775339,7 +775412,7 @@ ${getTmuxInstallInstructions2()}
       }
       try {
         const filePath = resolve46(options.systemPromptFile);
-        systemPrompt = readFileSync20(filePath, "utf8");
+        systemPrompt = readFileSync21(filePath, "utf8");
       } catch (error42) {
         const code = getErrnoCode(error42);
         if (code === "ENOENT") {
@@ -775361,7 +775434,7 @@ ${getTmuxInstallInstructions2()}
       }
       try {
         const filePath = resolve46(options.appendSystemPromptFile);
-        appendSystemPrompt = readFileSync20(filePath, "utf8");
+        appendSystemPrompt = readFileSync21(filePath, "utf8");
       } catch (error42) {
         const code = getErrnoCode(error42);
         if (code === "ENOENT") {
@@ -777340,4 +777413,4 @@ async function main2() {
 }
 main2();
 
-//# debugId=277F4AA9D69C767064756E2164756E21
+//# debugId=F1DED8B8A2869D0864756E2164756E21

package/package.json

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