diff --git a/.nvimlog b/.nvimlog new file mode 100644 index 00000000..37fc1df7 --- /dev/null +++ b/.nvimlog @@ -0,0 +1 @@ +WRN 2026-04-29T11:21:24.001 ?.14533 server_start:199: Failed to start server: operation not permitted: /var/folders/1g/3yj40ngn5b33fs9gg0wzvms00000gn/T/nvim.apple/gwHDxl/nvim.14533.0 diff --git a/src/cli/handlers/auth.ts b/src/cli/handlers/auth.ts index c4cba5d0..96c98b81 100644 --- a/src/cli/handlers/auth.ts +++ b/src/cli/handlers/auth.ts @@ -20,13 +20,19 @@ import { import { getOauthProfileFromOauthToken } from '../../services/oauth/getOauthProfile.js' import { OAuthService } from '../../services/oauth/index.js' import type { OAuthTokens } from '../../services/oauth/types.js' +import { OpenAIOAuthService } from '../../services/openaiAuth/index.js' +import { getOpenAIOAuthTokens } from '../../services/openaiAuth/storage.js' +import type { OpenAIOAuthTokens } from '../../services/openaiAuth/types.js' import { + clearStoredClaudeAIOAuthTokens, clearOAuthTokenCache, getAnthropicApiKeyWithSource, getAuthTokenSource, + getOpenAIAuthOverrideWarning, getOauthAccountInfo, getSubscriptionType, isUsing3PServices, + removeApiKey, saveOAuthTokensIfNeeded, validateForceLoginOrg, } from '../../utils/auth.js' @@ -109,17 +115,75 @@ export async function installOAuthTokens(tokens: OAuthTokens): Promise { await clearAuthRelatedCaches() } +export async function installOpenAIOAuthTokens( + tokens: OpenAIOAuthTokens, +): Promise { + await removeApiKey() + const clearClaudeOauth = clearStoredClaudeAIOAuthTokens() + if (!clearClaudeOauth.success) { + throw new Error( + clearClaudeOauth.warning ?? 'Failed to disable existing Claude auth state', + ) + } + + saveGlobalConfig(current => ({ + ...current, + oauthAccount: undefined, + })) + + if (!tokens.refreshToken) { + throw new Error('OpenAI OAuth tokens are incomplete.') + } + + await clearAuthRelatedCaches() + return getOpenAIAuthOverrideWarning() +} + export async function authLogin({ email, sso, console: useConsole, claudeai, + openai, }: { email?: string sso?: boolean console?: boolean claudeai?: boolean + openai?: boolean }): Promise { + if (openai) { + if (email || sso || useConsole || claudeai) { + process.stderr.write( + 'Error: --openai cannot be combined with --email, --sso, --console, or --claudeai.\n', + ) + process.exit(1) + } + + const openaiOAuthService = new OpenAIOAuthService() + + try { + const tokens = await openaiOAuthService.startOAuthFlow(async url => { + process.stdout.write('Opening browser to sign in to OpenAI…\n') + process.stdout.write(`If the browser did not open, visit: ${url}\n`) + }) + + const warning = await installOpenAIOAuthTokens(tokens) + + process.stdout.write('OpenAI login successful.\n') + if (warning) { + process.stdout.write(`${warning}\n`) + } + process.exit(0) + } catch (err) { + logError(err) + process.stderr.write(`OpenAI login failed: ${errorMessage(err)}\n`) + process.exit(1) + } finally { + openaiOAuthService.cleanup() + } + } + if (useConsole && claudeai) { process.stderr.write( 'Error: --console and --claudeai cannot be used together.\n', @@ -232,7 +296,52 @@ export async function authLogin({ export async function authStatus(opts: { json?: boolean text?: boolean + openai?: boolean }): Promise { + if (opts.openai) { + const openaiTokens = getOpenAIOAuthTokens() + const loggedIn = + !!openaiTokens && + openaiTokens.refreshToken.length > 0 && + openaiTokens.expiresAt > 0 + + if (opts.text) { + if (!loggedIn) { + process.stdout.write( + 'Not logged in to OpenAI. Run claude auth login --openai to authenticate.\n', + ) + } else { + process.stdout.write('Provider: openai\n') + if (openaiTokens.email) { + process.stdout.write(`Email: ${openaiTokens.email}\n`) + } + if (openaiTokens.accountId) { + process.stdout.write(`Account ID: ${openaiTokens.accountId}\n`) + } + process.stdout.write( + `Expires At: ${new Date(openaiTokens.expiresAt).toISOString()}\n`, + ) + } + } else { + process.stdout.write( + jsonStringify( + { + loggedIn, + authMethod: loggedIn ? 'openai_oauth' : 'none', + provider: 'openai', + email: openaiTokens?.email ?? null, + accountId: openaiTokens?.accountId ?? null, + expiresAt: openaiTokens?.expiresAt ?? null, + }, + null, + 2, + ) + '\n', + ) + } + + process.exit(loggedIn ? 0 : 1) + } + const { source: authTokenSource, hasToken } = getAuthTokenSource() const { source: apiKeySource } = getAnthropicApiKeyWithSource() const hasApiKeyEnvVar = @@ -240,12 +349,25 @@ export async function authStatus(opts: { const oauthAccount = getOauthAccountInfo() const subscriptionType = getSubscriptionType() const using3P = isUsing3PServices() + const openaiTokens = getOpenAIOAuthTokens() + const usingOpenAI = + !!openaiTokens?.refreshToken && + !hasToken && + apiKeySource === 'none' && + !hasApiKeyEnvVar && + !using3P const loggedIn = - hasToken || apiKeySource !== 'none' || hasApiKeyEnvVar || using3P + hasToken || + apiKeySource !== 'none' || + hasApiKeyEnvVar || + using3P || + usingOpenAI // Determine auth method let authMethod: string = 'none' - if (using3P) { + if (usingOpenAI) { + authMethod = 'openai_oauth' + } else if (using3P) { authMethod = 'third_party' } else if (authTokenSource === 'claude.ai') { authMethod = 'claude.ai' @@ -311,6 +433,11 @@ export async function authStatus(opts: { output.orgId = oauthAccount?.organizationUuid ?? null output.orgName = oauthAccount?.organizationName ?? null output.subscriptionType = subscriptionType ?? null + } else if (authMethod === 'openai_oauth') { + output.provider = 'openai' + output.email = openaiTokens?.email ?? null + output.accountId = openaiTokens?.accountId ?? null + output.subscriptionType = 'ChatGPT Pro/Plus' } process.stdout.write(jsonStringify(output, null, 2) + '\n') @@ -318,7 +445,18 @@ export async function authStatus(opts: { process.exit(loggedIn ? 0 : 1) } -export async function authLogout(): Promise { +export async function authLogout(opts?: { openai?: boolean }): Promise { + if (opts?.openai) { + const openaiOAuthService = new OpenAIOAuthService() + const success = openaiOAuthService.logout() + if (!success) { + process.stderr.write('Failed to log out from OpenAI.\n') + process.exit(1) + } + process.stdout.write('Successfully logged out from your OpenAI account.\n') + process.exit(0) + } + try { await performLogout({ clearOnboarding: false }) } catch { diff --git a/src/commands/login/login.tsx b/src/commands/login/login.tsx index b532534d..9247b440 100644 --- a/src/commands/login/login.tsx +++ b/src/commands/login/login.tsx @@ -5,8 +5,8 @@ import { resetCostState } from '../../bootstrap/state.js'; import { clearTrustedDeviceToken, enrollTrustedDevice } from '../../bridge/trustedDevice.js'; import type { LocalJSXCommandContext } from '../../commands.js'; import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js'; -import { ConsoleOAuthFlow } from '../../components/ConsoleOAuthFlow.js'; import { Dialog } from '../../components/design-system/Dialog.js'; +import { SlashLoginFlow } from '../../components/SlashLoginFlow.js'; import { useMainLoopModel } from '../../hooks/useMainLoopModel.js'; import { Text } from '../../ink.js'; import { refreshGrowthBookAfterAuthChange } from '../../services/analytics/growthbook.js'; @@ -80,7 +80,7 @@ export function Login(props) { } let t2; if ($[6] !== props.startingMessage || $[7] !== t1) { - t2 = ; + t2 = ; $[6] = props.startingMessage; $[7] = t1; $[8] = t2; @@ -101,4 +101,4 @@ export function Login(props) { function _temp(exitState) { return exitState.pending ? Press {exitState.keyName} again to exit : ; } -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["feature","React","resetCostState","clearTrustedDeviceToken","enrollTrustedDevice","LocalJSXCommandContext","ConfigurableShortcutHint","ConsoleOAuthFlow","Dialog","useMainLoopModel","Text","refreshGrowthBookAfterAuthChange","refreshPolicyLimits","refreshRemoteManagedSettings","LocalJSXCommandOnDone","stripSignatureBlocks","checkAndDisableAutoModeIfNeeded","checkAndDisableBypassPermissionsIfNeeded","resetAutoModeGateCheck","resetBypassPermissionsCheck","resetUserCache","call","onDone","context","Promise","ReactNode","success","onChangeAPIKey","setMessages","appState","getAppState","toolPermissionContext","setAppState","fastMode","prev","authVersion","Login","props","$","_c","mainLoopModel","t0","t1","t2","startingMessage","t3","_temp","exitState","pending","keyName"],"sources":["login.tsx"],"sourcesContent":["import { feature } from 'bun:bundle'\nimport * as React from 'react'\nimport { resetCostState } from '../../bootstrap/state.js'\nimport {\n  clearTrustedDeviceToken,\n  enrollTrustedDevice,\n} from '../../bridge/trustedDevice.js'\nimport type { LocalJSXCommandContext } from '../../commands.js'\nimport { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js'\nimport { ConsoleOAuthFlow } from '../../components/ConsoleOAuthFlow.js'\nimport { Dialog } from '../../components/design-system/Dialog.js'\nimport { useMainLoopModel } from '../../hooks/useMainLoopModel.js'\nimport { Text } from '../../ink.js'\nimport { refreshGrowthBookAfterAuthChange } from '../../services/analytics/growthbook.js'\nimport { refreshPolicyLimits } from '../../services/policyLimits/index.js'\nimport { refreshRemoteManagedSettings } from '../../services/remoteManagedSettings/index.js'\nimport type { LocalJSXCommandOnDone } from '../../types/command.js'\nimport { stripSignatureBlocks } from '../../utils/messages.js'\nimport {\n  checkAndDisableAutoModeIfNeeded,\n  checkAndDisableBypassPermissionsIfNeeded,\n  resetAutoModeGateCheck,\n  resetBypassPermissionsCheck,\n} from '../../utils/permissions/bypassPermissionsKillswitch.js'\nimport { resetUserCache } from '../../utils/user.js'\n\nexport async function call(\n  onDone: LocalJSXCommandOnDone,\n  context: LocalJSXCommandContext,\n): Promise<React.ReactNode> {\n  return (\n    <Login\n      onDone={async success => {\n        context.onChangeAPIKey()\n        // Signature-bearing blocks (thinking, connector_text) are bound to the API key —\n        // strip them so the new key doesn't reject stale signatures.\n        context.setMessages(stripSignatureBlocks)\n        if (success) {\n          // Post-login refresh logic. Keep in sync with onboarding in src/interactiveHelpers.tsx\n          // Reset cost state when switching accounts\n          resetCostState()\n          // Refresh remotely managed settings after login (non-blocking)\n          void refreshRemoteManagedSettings()\n          // Refresh policy limits after login (non-blocking)\n          void refreshPolicyLimits()\n          // Clear user data cache BEFORE GrowthBook refresh so it picks up fresh credentials\n          resetUserCache()\n          // Refresh GrowthBook after login to get updated feature flags (e.g., for claude.ai MCPs)\n          refreshGrowthBookAfterAuthChange()\n          // Clear any stale trusted device token from a previous account before\n          // re-enrolling — prevents sending the old token on bridge calls while\n          // the async enrollTrustedDevice() is in-flight.\n          clearTrustedDeviceToken()\n          // Enroll as a trusted device for Remote Control (10-min fresh-session window)\n          void enrollTrustedDevice()\n          // Reset killswitch gate checks and re-run with new org\n          resetBypassPermissionsCheck()\n          const appState = context.getAppState()\n          void checkAndDisableBypassPermissionsIfNeeded(\n            appState.toolPermissionContext,\n            context.setAppState,\n          )\n          if (feature('TRANSCRIPT_CLASSIFIER')) {\n            resetAutoModeGateCheck()\n            void checkAndDisableAutoModeIfNeeded(\n              appState.toolPermissionContext,\n              context.setAppState,\n              appState.fastMode,\n            )\n          }\n          // Increment authVersion to trigger re-fetching of auth-dependent data in hooks (e.g., MCP servers)\n          context.setAppState(prev => ({\n            ...prev,\n            authVersion: prev.authVersion + 1,\n          }))\n        }\n        onDone(success ? 'Login successful' : 'Login interrupted')\n      }}\n    />\n  )\n}\n\nexport function Login(props: {\n  onDone: (success: boolean, mainLoopModel: string) => void\n  startingMessage?: string\n}): React.ReactNode {\n  const mainLoopModel = useMainLoopModel()\n\n  return (\n    <Dialog\n      title=\"Login\"\n      onCancel={() => props.onDone(false, mainLoopModel)}\n      color=\"permission\"\n      inputGuide={exitState =>\n        exitState.pending ? (\n          <Text>Press {exitState.keyName} again to exit</Text>\n        ) : (\n          <ConfigurableShortcutHint\n            action=\"confirm:no\"\n            context=\"Confirmation\"\n            fallback=\"Esc\"\n            description=\"cancel\"\n          />\n        )\n      }\n    >\n      <ConsoleOAuthFlow\n        onDone={() => props.onDone(true, mainLoopModel)}\n        startingMessage={props.startingMessage}\n      />\n    </Dialog>\n  )\n}\n"],"mappings":"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","ignoreList":[]} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["feature","React","resetCostState","clearTrustedDeviceToken","enrollTrustedDevice","LocalJSXCommandContext","ConfigurableShortcutHint","ConsoleOAuthFlow","Dialog","useMainLoopModel","Text","refreshGrowthBookAfterAuthChange","refreshPolicyLimits","refreshRemoteManagedSettings","LocalJSXCommandOnDone","stripSignatureBlocks","checkAndDisableAutoModeIfNeeded","checkAndDisableBypassPermissionsIfNeeded","resetAutoModeGateCheck","resetBypassPermissionsCheck","resetUserCache","call","onDone","context","Promise","ReactNode","success","onChangeAPIKey","setMessages","appState","getAppState","toolPermissionContext","setAppState","fastMode","prev","authVersion","Login","props","$","_c","mainLoopModel","t0","t1","t2","startingMessage","t3","_temp","exitState","pending","keyName"],"sources":["login.tsx"],"sourcesContent":["import { feature } from 'bun:bundle'\nimport * as React from 'react'\nimport { resetCostState } from '../../bootstrap/state.js'\nimport {\n  clearTrustedDeviceToken,\n  enrollTrustedDevice,\n} from '../../bridge/trustedDevice.js'\nimport type { LocalJSXCommandContext } from '../../commands.js'\nimport { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js'\nimport { ConsoleOAuthFlow } from '../../components/ConsoleOAuthFlow.js'\nimport { Dialog } from '../../components/design-system/Dialog.js'\nimport { useMainLoopModel } from '../../hooks/useMainLoopModel.js'\nimport { Text } from '../../ink.js'\nimport { refreshGrowthBookAfterAuthChange } from '../../services/analytics/growthbook.js'\nimport { refreshPolicyLimits } from '../../services/policyLimits/index.js'\nimport { refreshRemoteManagedSettings } from '../../services/remoteManagedSettings/index.js'\nimport type { LocalJSXCommandOnDone } from '../../types/command.js'\nimport { stripSignatureBlocks } from '../../utils/messages.js'\nimport {\n  checkAndDisableAutoModeIfNeeded,\n  checkAndDisableBypassPermissionsIfNeeded,\n  resetAutoModeGateCheck,\n  resetBypassPermissionsCheck,\n} from '../../utils/permissions/bypassPermissionsKillswitch.js'\nimport { resetUserCache } from '../../utils/user.js'\n\nexport async function call(\n  onDone: LocalJSXCommandOnDone,\n  context: LocalJSXCommandContext,\n): Promise<React.ReactNode> {\n  return (\n    <Login\n      onDone={async success => {\n        context.onChangeAPIKey()\n        // Signature-bearing blocks (thinking, connector_text) are bound to the API key —\n        // strip them so the new key doesn't reject stale signatures.\n        context.setMessages(stripSignatureBlocks)\n        if (success) {\n          // Post-login refresh logic. Keep in sync with onboarding in src/interactiveHelpers.tsx\n          // Reset cost state when switching accounts\n          resetCostState()\n          // Refresh remotely managed settings after login (non-blocking)\n          void refreshRemoteManagedSettings()\n          // Refresh policy limits after login (non-blocking)\n          void refreshPolicyLimits()\n          // Clear user data cache BEFORE GrowthBook refresh so it picks up fresh credentials\n          resetUserCache()\n          // Refresh GrowthBook after login to get updated feature flags (e.g., for claude.ai MCPs)\n          refreshGrowthBookAfterAuthChange()\n          // Clear any stale trusted device token from a previous account before\n          // re-enrolling — prevents sending the old token on bridge calls while\n          // the async enrollTrustedDevice() is in-flight.\n          clearTrustedDeviceToken()\n          // Enroll as a trusted device for Remote Control (10-min fresh-session window)\n          void enrollTrustedDevice()\n          // Reset killswitch gate checks and re-run with new org\n          resetBypassPermissionsCheck()\n          const appState = context.getAppState()\n          void checkAndDisableBypassPermissionsIfNeeded(\n            appState.toolPermissionContext,\n            context.setAppState,\n          )\n          if (feature('TRANSCRIPT_CLASSIFIER')) {\n            resetAutoModeGateCheck()\n            void checkAndDisableAutoModeIfNeeded(\n              appState.toolPermissionContext,\n              context.setAppState,\n              appState.fastMode,\n            )\n          }\n          // Increment authVersion to trigger re-fetching of auth-dependent data in hooks (e.g., MCP servers)\n          context.setAppState(prev => ({\n            ...prev,\n            authVersion: prev.authVersion + 1,\n          }))\n        }\n        onDone(success ? 'Login successful' : 'Login interrupted')\n      }}\n    />\n  )\n}\n\nexport function Login(props: {\n  onDone: (success: boolean, mainLoopModel: string) => void\n  startingMessage?: string\n}): React.ReactNode {\n  const mainLoopModel = useMainLoopModel()\n\n  return (\n    <Dialog\n      title=\"Login\"\n      onCancel={() => props.onDone(false, mainLoopModel)}\n      color=\"permission\"\n      inputGuide={exitState =>\n        exitState.pending ? (\n          <Text>Press {exitState.keyName} again to exit</Text>\n        ) : (\n          <ConfigurableShortcutHint\n            action=\"confirm:no\"\n            context=\"Confirmation\"\n            fallback=\"Esc\"\n            description=\"cancel\"\n          />\n        )\n      }\n    >\n      <ConsoleOAuthFlow\n        onDone={() => props.onDone(true, mainLoopModel)}\n        startingMessage={props.startingMessage}\n      />\n    </Dialog>\n  )\n}\n"],"mappings":";AAAA,SAASA,OAAO,QAAQ,YAAY;AACpC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,cAAc,QAAQ,0BAA0B;AACzD,SACEC,uBAAuB,EACvBC,mBAAmB,QACd,+BAA+B;AACtC,cAAcC,sBAAsB,QAAQ,mBAAmB;AAC/D,SAASC,wBAAwB,QAAQ,8CAA8C;AACvF,SAASC,gBAAgB,QAAQ,sCAAsC;AACvE,SAASC,MAAM,QAAQ,0CAA0C;AACjE,SAASC,gBAAgB,QAAQ,iCAAiC;AAClE,SAASC,IAAI,QAAQ,cAAc;AACnC,SAASC,gCAAgC,QAAQ,wCAAwC;AACzF,SAASC,mBAAmB,QAAQ,sCAAsC;AAC1E,SAASC,4BAA4B,QAAQ,+CAA+C;AAC5F,cAAcC,qBAAqB,QAAQ,wBAAwB;AACnE,SAASC,oBAAoB,QAAQ,yBAAyB;AAC9D,SACEC,+BAA+B,EAC/BC,wCAAwC,EACxCC,sBAAsB,EACtBC,2BAA2B,QACtB,wDAAwD;AAC/D,SAASC,cAAc,QAAQ,qBAAqB;AAEpD,OAAO,eAAeC,IAAIA,CACxBC,MAAM,EAAER,qBAAqB,EAC7BS,OAAO,EAAElB,sBAAsB,CAChC,EAAEmB,OAAO,CAACvB,KAAK,CAACwB,SAAS,CAAC,CAAC;EAC1B,OACE,CAAC,KAAK,CACJ,MAAM,CAAC,CAAC,MAAMC,OAAO,IAAI;IACvBH,OAAO,CAACI,cAAc,CAAC,CAAC;IACxB;IACA;IACAJ,OAAO,CAACK,WAAW,CAACb,oBAAoB,CAAC;IACzC,IAAIW,OAAO,EAAE;MACX;MACA;MACAxB,cAAc,CAAC,CAAC;MAChB;MACA,KAAKW,4BAA4B,CAAC,CAAC;MACnC;MACA,KAAKD,mBAAmB,CAAC,CAAC;MAC1B;MACAQ,cAAc,CAAC,CAAC;MAChB;MACAT,gCAAgC,CAAC,CAAC;MAClC;MACA;MACA;MACAR,uBAAuB,CAAC,CAAC;MACzB;MACA,KAAKC,mBAAmB,CAAC,CAAC;MAC1B;MACAe,2BAA2B,CAAC,CAAC;MAC7B,MAAMU,QAAQ,GAAGN,OAAO,CAACO,WAAW,CAAC,CAAC;MACtC,KAAKb,wCAAwC,CAC3CY,QAAQ,CAACE,qBAAqB,EAC9BR,OAAO,CAACS,WACV,CAAC;MACD,IAAIhC,OAAO,CAAC,uBAAuB,CAAC,EAAE;QACpCkB,sBAAsB,CAAC,CAAC;QACxB,KAAKF,+BAA+B,CAClCa,QAAQ,CAACE,qBAAqB,EAC9BR,OAAO,CAACS,WAAW,EACnBH,QAAQ,CAACI,QACX,CAAC;MACH;MACA;MACAV,OAAO,CAACS,WAAW,CAACE,IAAI,KAAK;QAC3B,GAAGA,IAAI;QACPC,WAAW,EAAED,IAAI,CAACC,WAAW,GAAG;MAClC,CAAC,CAAC,CAAC;IACL;IACAb,MAAM,CAACI,OAAO,GAAG,kBAAkB,GAAG,mBAAmB,CAAC;EAC5D,CAAC,CAAC,GACF;AAEN;AAEA,OAAO,SAAAU,MAAAC,KAAA;EAAA,MAAAC,CAAA,GAAAC,EAAA;EAIL,MAAAC,aAAA,GAAsB/B,gBAAgB,CAAC,CAAC;EAAA,IAAAgC,EAAA;EAAA,IAAAH,CAAA,QAAAE,aAAA,IAAAF,CAAA,QAAAD,KAAA;IAK1BI,EAAA,GAAAA,CAAA,KAAMJ,KAAK,CAAAf,MAAO,CAAC,KAAK,EAAEkB,aAAa,CAAC;IAAAF,CAAA,MAAAE,aAAA;IAAAF,CAAA,MAAAD,KAAA;IAAAC,CAAA,MAAAG,EAAA;EAAA;IAAAA,EAAA,GAAAH,CAAA;EAAA;EAAA,IAAAI,EAAA;EAAA,IAAAJ,CAAA,QAAAE,aAAA,IAAAF,CAAA,QAAAD,KAAA;IAgBxCK,EAAA,GAAAA,CAAA,KAAML,KAAK,CAAAf,MAAO,CAAC,IAAI,EAAEkB,aAAa,CAAC;IAAAF,CAAA,MAAAE,aAAA;IAAAF,CAAA,MAAAD,KAAA;IAAAC,CAAA,MAAAI,EAAA;EAAA;IAAAA,EAAA,GAAAJ,CAAA;EAAA;EAAA,IAAAK,EAAA;EAAA,IAAAL,CAAA,QAAAD,KAAA,CAAAO,eAAA,IAAAN,CAAA,QAAAI,EAAA;IADjDC,EAAA,IAAC,gBAAgB,CACP,MAAuC,CAAvC,CAAAD,EAAsC,CAAC,CAC9B,eAAqB,CAArB,CAAAL,KAAK,CAAAO,eAAe,CAAC,GACtC;IAAAN,CAAA,MAAAD,KAAA,CAAAO,eAAA;IAAAN,CAAA,MAAAI,EAAA;IAAAJ,CAAA,MAAAK,EAAA;EAAA;IAAAA,EAAA,GAAAL,CAAA;EAAA;EAAA,IAAAO,EAAA;EAAA,IAAAP,CAAA,QAAAG,EAAA,IAAAH,CAAA,SAAAK,EAAA;IApBJE,EAAA,IAAC,MAAM,CACC,KAAO,CAAP,OAAO,CACH,QAAwC,CAAxC,CAAAJ,EAAuC,CAAC,CAC5C,KAAY,CAAZ,YAAY,CACN,UAUT,CAVS,CAAAK,KAUV,CAAC,CAGH,CAAAH,EAGC,CACH,EArBC,MAAM,CAqBE;IAAAL,CAAA,MAAAG,EAAA;IAAAH,CAAA,OAAAK,EAAA;IAAAL,CAAA,OAAAO,EAAA;EAAA;IAAAA,EAAA,GAAAP,CAAA;EAAA;EAAA,OArBTO,EAqBS;AAAA;AA5BN,SAAAC,MAAAC,SAAA;EAAA,OAYCA,SAAS,CAAAC,OASR,GARC,CAAC,IAAI,CAAC,MAAO,CAAAD,SAAS,CAAAE,OAAO,CAAE,cAAc,EAA5C,IAAI,CAQN,GANC,CAAC,wBAAwB,CAChB,MAAY,CAAZ,YAAY,CACX,OAAc,CAAd,cAAc,CACb,QAAK,CAAL,KAAK,CACF,WAAQ,CAAR,QAAQ,GAEvB;AAAA","ignoreList":[]} diff --git a/src/components/OpenAILoginFlow.tsx b/src/components/OpenAILoginFlow.tsx new file mode 100644 index 00000000..1ba11121 --- /dev/null +++ b/src/components/OpenAILoginFlow.tsx @@ -0,0 +1,124 @@ +import React, { useCallback, useEffect, useState } from 'react' +import { + type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS, + logEvent, +} from 'src/services/analytics/index.js' +import { installOpenAIOAuthTokens } from '../cli/handlers/auth.js' +import { Box, Link, Text } from '../ink.js' +import { useKeybinding } from '../keybindings/useKeybinding.js' +import { OpenAIOAuthService } from '../services/openaiAuth/index.js' +import { getOpenAIOAuthTokens } from '../services/openaiAuth/storage.js' +import { logError } from '../utils/log.js' +import { Spinner } from './Spinner.js' + +type Props = { + onDone(): void + startingMessage?: string +} + +type OpenAILoginStatus = + | { state: 'ready_to_start' } + | { state: 'waiting_for_login'; url: string } + | { state: 'success'; warning?: string | null } + | { state: 'error'; message: string } + +export function OpenAILoginFlow({ + onDone, + startingMessage, +}: Props): React.ReactNode { + const [oauthService] = useState(() => new OpenAIOAuthService()) + const [status, setStatus] = useState({ + state: 'ready_to_start', + }) + + useKeybinding( + 'confirm:yes', + () => { + logEvent('tengu_openai_oauth_success', {}) + onDone() + }, + { + context: 'Confirmation', + isActive: status.state === 'success', + }, + ) + + const startOAuth = useCallback(async () => { + try { + logEvent('tengu_openai_oauth_flow_start', {}) + const tokens = await oauthService.startOAuthFlow(async url => { + setStatus({ state: 'waiting_for_login', url }) + }) + const warning = await installOpenAIOAuthTokens(tokens) + setStatus({ state: 'success', warning }) + } catch (error) { + logError(error) + setStatus({ + state: 'error', + message: (error as Error).message, + }) + logEvent('tengu_openai_oauth_error', { + error: (error as Error) + .message as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS, + }) + } + }, [oauthService]) + + useEffect(() => { + if (status.state !== 'ready_to_start') { + return + } + + void startOAuth() + }, [startOAuth, status.state]) + + useEffect(() => { + return () => { + oauthService.cleanup() + } + }, [oauthService]) + + const account = getOpenAIOAuthTokens() + + return ( + + + {startingMessage ?? + 'Claude Code can also run through your ChatGPT subscription via OpenAI auth.'} + + + {status.state === 'waiting_for_login' && ( + + + + Opening browser to sign in to OpenAI… + + Use the URL below if your browser did not open: + + {status.url} + + + )} + + {status.state === 'success' && ( + + {account?.email ? ( + + Logged in as {account.email} + + ) : null} + {status.warning ? ( + {status.warning} + ) : null} + + Login successful. Press Enter to continue… + + + )} + + {status.state === 'error' && ( + OpenAI OAuth error: {status.message} + )} + + ) +} diff --git a/src/components/SlashLoginFlow.tsx b/src/components/SlashLoginFlow.tsx new file mode 100644 index 00000000..e14e4cb7 --- /dev/null +++ b/src/components/SlashLoginFlow.tsx @@ -0,0 +1,157 @@ +import React, { useMemo, useState } from 'react' +import { Box, Link, Text } from '../ink.js' +import { useKeybinding } from '../keybindings/useKeybinding.js' +import { getSettings_DEPRECATED } from '../utils/settings/settings.js' +import { ConsoleOAuthFlow } from './ConsoleOAuthFlow.js' +import { Select } from './CustomSelect/select.js' +import { OpenAILoginFlow } from './OpenAILoginFlow.js' + +type Props = { + onDone(): void + startingMessage?: string +} + +type LoginSelection = 'claudeai' | 'console' | 'openai' | 'platform' | 'idle' + +function PlatformSetupFlow({ + onBack, +}: { + onBack(): void +}): React.ReactNode { + useKeybinding( + 'confirm:yes', + () => { + onBack() + }, + { + context: 'Confirmation', + isActive: true, + }, + ) + + return ( + + Using 3rd-party platforms + + Claude Code supports Amazon Bedrock, Microsoft Foundry, and Vertex AI. + Set the required environment variables, then restart Claude Code. + + + If you are part of an enterprise organization, contact your + administrator for setup instructions. + + + Documentation: + + · Amazon Bedrock:{' '} + + + + · Microsoft Foundry:{' '} + + + + · Vertex AI:{' '} + + + + + Press Enter to go back to login options. + + + ) +} + +export function SlashLoginFlow({ + onDone, + startingMessage, +}: Props): React.ReactNode { + const settings = getSettings_DEPRECATED() || {} + const forceLoginMethod = settings.forceLoginMethod + + const [selection, setSelection] = useState(() => { + if (forceLoginMethod === 'claudeai' || forceLoginMethod === 'console') { + return forceLoginMethod + } + return 'idle' + }) + + const options = useMemo( + () => [ + { + label: ( + + Claude account with subscription ·{' '} + Pro, Max, Team, or Enterprise + {'\n'} + + ), + value: 'claudeai' as const, + }, + { + label: ( + + Anthropic Console account ·{' '} + API usage billing + {'\n'} + + ), + value: 'console' as const, + }, + { + label: ( + + OpenAI account · ChatGPT Pro/Plus + {'\n'} + + ), + value: 'openai' as const, + }, + { + label: ( + + 3rd-party platform ·{' '} + Amazon Bedrock, Microsoft Foundry, or Vertex AI + {'\n'} + + ), + value: 'platform' as const, + }, + ], + [], + ) + + if (selection === 'claudeai' || selection === 'console') { + return ( + + ) + } + + if (selection === 'openai') { + return + } + + if (selection === 'platform') { + return setSelection('idle')} /> + } + + return ( + + + {startingMessage ?? + 'Claude Code can be used with your Claude subscription, Anthropic Console billing, or your ChatGPT subscription.'} + + Select login method: + +