Disable claude oauth

Author: jahooma

cli/src/chat.tsx

@@ -53,6 +53,7 @@ import { useReviewStore } from './state/review-store'
 import { useFeedbackStore } from './state/feedback-store'
 import { useMessageBlockStore } from './state/message-block-store'
 import { usePublishStore } from './state/publish-store'
+import { CLAUDE_OAUTH_ENABLED } from '@codebuff/common/constants/claude-oauth'
 import { reportActivity } from './utils/activity-tracker'
 import { trackEvent } from './utils/analytics'
 import { getClaudeOAuthStatus } from './utils/claude-oauth'
@@ -1292,7 +1293,7 @@ export const Chat = ({
   })
   const hasStatusIndicatorContent = statusIndicatorState.kind !== 'idle'
 
-  const isClaudeOAuthActive = getClaudeOAuthStatus().connected
+  const isClaudeOAuthActive = CLAUDE_OAUTH_ENABLED && getClaudeOAuthStatus().connected
 
   // Fetch Claude quota when OAuth is active
   const { data: claudeQuota } = useClaudeQuotaQuery({

cli/src/commands/command-registry.ts

@@ -1,3 +1,4 @@
+import { CLAUDE_OAUTH_ENABLED } from '@codebuff/common/constants/claude-oauth'
 import open from 'open'
 
 import { handleAdsEnable, handleAdsDisable } from './ads'
@@ -474,6 +475,17 @@ export const COMMAND_REGISTRY: CommandDefinition[] = [
     name: 'connect:claude',
     aliases: ['claude'],
     handler: (params) => {
+      if (!CLAUDE_OAUTH_ENABLED) {
+        params.setMessages((prev) => [
+          ...prev,
+          getUserMessage(params.inputValue.trim()),
+          getSystemMessage(
+            'Claude OAuth connection has been disabled. Use /subscribe for usage across all models.',
+          ),
+        ])
+        clearInput(params)
+        return
+      }
       // Enter connect:claude mode to show the OAuth banner
       useChatStore.getState().setInputMode('connect:claude')
       params.saveToHistory(params.inputValue.trim())

cli/src/commands/router.ts

@@ -1,4 +1,5 @@
 import { AnalyticsEvent } from '@codebuff/common/constants/analytics-events'
+import { CLAUDE_OAUTH_ENABLED } from '@codebuff/common/constants/claude-oauth'
 import { runTerminalCommand } from '@codebuff/sdk'
 
 
@@ -341,6 +342,10 @@ export async function routeUserPrompt(
 
   // Handle connect:claude mode input (authorization code)
   if (inputMode === 'connect:claude') {
+    if (!CLAUDE_OAUTH_ENABLED) {
+      setInputMode('default')
+      return
+    }
     const code = trimmed
     if (code) {
       const result = await handleClaudeAuthCode(code)

cli/src/components/input-mode-banner.tsx

@@ -1,3 +1,4 @@
+import { CLAUDE_OAUTH_ENABLED } from '@codebuff/common/constants/claude-oauth'
 import React from 'react'
 
 import { ClaudeConnectBanner } from './claude-connect-banner'
@@ -26,7 +27,10 @@ const BANNER_REGISTRY: Record<
   usage: ({ showTime }) => <UsageBanner showTime={showTime} />,
   referral: () => <ReferralBanner />,
   help: () => <HelpBanner />,
-  'connect:claude': () => <ClaudeConnectBanner />,
+  ...(CLAUDE_OAUTH_ENABLED
+    ? { 'connect:claude': () => <ClaudeConnectBanner /> }
+    : {}),
+
   subscriptionLimit: () => <SubscriptionLimitBanner />,
 }
 

cli/src/components/usage-banner.tsx

@@ -1,3 +1,4 @@
+import { CLAUDE_OAUTH_ENABLED } from '@codebuff/common/constants/claude-oauth'
 import { isClaudeOAuthValid } from '@codebuff/sdk'
 import { TextAttributes } from '@opentui/core'
 import open from 'open'
@@ -47,8 +48,8 @@ export const UsageBanner = ({ showTime }: { showTime: number }) => {
   const sessionCreditsUsed = useChatStore((state) => state.sessionCreditsUsed)
   const setInputMode = useChatStore((state) => state.setInputMode)
 
-  // Check if Claude OAuth is connected
-  const isClaudeConnected = isClaudeOAuthValid()
+  // Check if Claude OAuth is connected (only when feature is enabled)
+  const isClaudeConnected = CLAUDE_OAUTH_ENABLED && isClaudeOAuthValid()
 
   // Fetch Claude quota data if connected
   const { data: claudeQuota, isLoading: isClaudeLoading } = useClaudeQuotaQuery({

cli/src/data/slash-commands.ts

@@ -1,3 +1,4 @@
+import { CLAUDE_OAUTH_ENABLED } from '@codebuff/common/constants/claude-oauth'
 import { AGENT_MODES } from '../utils/constants'
 import { CREDITS_REFERRAL_BONUS } from '@codebuff/common/old-constants'
 
@@ -36,12 +37,17 @@ export const SLASH_COMMANDS: SlashCommand[] = [
     aliases: ['h', '?'],
     implicitCommand: true,
   },
-  {
-    id: 'connect:claude',
-    label: 'connect:claude (deprecated)',
-    description: 'Claude subscription will be removed March 1st',
-    aliases: ['claude'],
-  },
+  ...(CLAUDE_OAUTH_ENABLED
+    ? [
+        {
+          id: 'connect:claude',
+          label: 'connect:claude (deprecated)',
+          description: 'Claude subscription will be removed March 1st',
+          aliases: ['claude'],
+        },
+      ]
+    : []),
+
   {
     id: 'ads:enable',
     label: 'ads:enable',

cli/src/init/init-app.ts

@@ -1,3 +1,4 @@
+import { CLAUDE_OAUTH_ENABLED } from '@codebuff/common/constants/claude-oauth'
 import {
   getClaudeOAuthCredentials,
   getValidClaudeOAuthCredentials,
@@ -27,11 +28,13 @@ export async function initializeApp(params: { cwd?: string }): Promise<void> {
 
   // Refresh Claude OAuth credentials in the background if they exist
   // This ensures the subscription status is up-to-date on startup
-  const claudeCredentials = getClaudeOAuthCredentials()
-  if (claudeCredentials) {
-    getValidClaudeOAuthCredentials().catch((error) => {
-      // Log refresh errors at debug level - will be retried on next API call
-      console.debug('Failed to refresh Claude OAuth credentials:', error)
-    })
+  if (CLAUDE_OAUTH_ENABLED) {
+    const claudeCredentials = getClaudeOAuthCredentials()
+    if (claudeCredentials) {
+      getValidClaudeOAuthCredentials().catch((error) => {
+        // Log refresh errors at debug level - will be retried on next API call
+        console.debug('Failed to refresh Claude OAuth credentials:', error)
+      })
+    }
   }
 }

common/src/constants/claude-oauth.ts

@@ -3,6 +3,15 @@
  * These are used by the CLI for the OAuth PKCE flow and by the SDK for direct Anthropic API calls.
  */
 
+/**
+ * Feature flag for Claude OAuth (connect:claude) functionality.
+ * Set to true to re-enable Claude OAuth across:
+ * - CLI: /connect:claude command, OAuth banner, usage display
+ * - SDK: Direct Anthropic API routing via OAuth token
+ * - Init: Background credential refresh on startup
+ */
+export const CLAUDE_OAUTH_ENABLED = false
+
 // OAuth client ID used by Claude Code and third-party apps like opencode
 export const CLAUDE_OAUTH_CLIENT_ID = '9d1c250a-e61b-44d9-88ed-5944d1962f5e'
 

sdk/src/impl/model-provider.ts

@@ -13,6 +13,7 @@ import { BYOK_OPENROUTER_HEADER } from '@codebuff/common/constants/byok'
 import {
   CLAUDE_CODE_SYSTEM_PROMPT_PREFIX,
   CLAUDE_OAUTH_BETA_HEADERS,
+  CLAUDE_OAUTH_ENABLED,
   isClaudeModel,
   toAnthropicModelId,
 } from '@codebuff/common/constants/claude-oauth'
@@ -171,8 +172,8 @@ export async function getModelForRequest(params: ModelRequestParams): Promise<Mo
   const { apiKey, model, skipClaudeOAuth } = params
 
   // Check if we should use Claude OAuth direct
-  // Skip if explicitly requested, if rate-limited, or if not a Claude model
-  if (!skipClaudeOAuth && !isClaudeOAuthRateLimited() && isClaudeModel(model)) {
+  // Skip if feature disabled, explicitly requested, if rate-limited, or if not a Claude model
+  if (CLAUDE_OAUTH_ENABLED && !skipClaudeOAuth && !isClaudeOAuthRateLimited() && isClaudeModel(model)) {
     // Get valid credentials (will refresh if needed)
     const claudeOAuthCredentials = await getValidClaudeOAuthCredentials()
     if (claudeOAuthCredentials) {