fix(oauth): send the Claude Code CLI identity upstream and confirm official login risk (#1526)

* feat(desktop): confirm account ban risk before official OAuth login

Claude, ChatGPT and Grok sign-in now open a confirmation dialog first. It states the account-ban risk of using OAuth through a third-party app, graded per provider (Claude high, Grok medium, ChatGPT relatively low). Cancelling starts nothing; confirming runs the existing flow.

* fix(oauth): send the Claude Code CLI identity on official OAuth requests

Upstream requests made with the Claude subscription token are now the CLI's own, not the desktop host's:

- wire entrypoint is always cli (User-Agent, cc_entrypoint, MCP User-Agent); CLAUDE_CODE_ENTRYPOINT=claude-desktop stays an internal switch
- compatibility version 2.1.281 -> 2.1.288, shared by User-Agent, cc_version, fingerprint and claude-code/<version>
- authorization-code exchange reuses the CLI axios call (axios pinned to 1.15.2); profile, roles and create_api_key send claude-code/<version>
- metadata.user_id.account_uuid is injected by the desktop server as CLAUDE_CODE_ACCOUNT_UUID (cached, bounded wait, backoff, skipped without user:profile)
- @anthropic-ai/sdk 0.80.0 -> 0.128.0, no source change required
- auto-answer no longer posts to api.anthropic.com with the subscription token from the server; the question stays with the user

Author: NanmiCoder

bun.lock

@@ -95,6 +95,9 @@ describe('ChatGPTOfficialLogin', () => {
     await act(async () => {
       fireEvent.click(screen.getByRole('button', { name: 'Sign in with ChatGPT' }))
     })
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: 'I understand, continue' }))
+    })
 
     expect(hostOpen).toHaveBeenCalledWith(authorizeUrl)
     expect(shellOpenMock).not.toHaveBeenCalled()
@@ -139,6 +142,9 @@ describe('ChatGPTOfficialLogin', () => {
     await act(async () => {
       fireEvent.click(screen.getByRole('button', { name: 'Sign in with ChatGPT' }))
     })
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: 'I understand, continue' }))
+    })
 
     await act(async () => {
       fireEvent.click(screen.getByRole('button', { name: 'Copy authorization link' }))
@@ -149,4 +155,38 @@ describe('ChatGPTOfficialLogin', () => {
     expect(screen.getByText(/Unable to copy authorization link/)).toBeInTheDocument()
     expect(screen.getByRole('button', { name: 'Copy authorization link' })).toBeInTheDocument()
   })
+
+  it('asks for risk confirmation before starting login and skips it on cancel', async () => {
+    const hostOpen = vi.fn().mockResolvedValue(undefined)
+    window.desktopHost = {
+      ...browserHost,
+      kind: 'electron',
+      isDesktop: true,
+      capabilities: { ...browserHost.capabilities, shell: true },
+      shell: { ...browserHost.shell, open: hostOpen },
+    }
+    statusMock.mockResolvedValue({ loggedIn: false })
+    startMock.mockResolvedValue({
+      authorizeUrl: 'https://chatgpt.com/oauth/authorize?state=openai-state',
+      state: 'openai-state',
+    })
+
+    render(<ChatGPTOfficialLogin />)
+    await screen.findByRole('button', { name: 'Sign in with ChatGPT' })
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: 'Sign in with ChatGPT' }))
+    })
+
+    expect(screen.getByRole('dialog')).toBeInTheDocument()
+    expect(screen.getByText('Relatively low')).toBeInTheDocument()
+    expect(startMock).not.toHaveBeenCalled()
+
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: 'Cancel' }))
+    })
+
+    expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
+    expect(startMock).not.toHaveBeenCalled()
+    expect(hostOpen).not.toHaveBeenCalled()
+  })
 })

desktop/src/components/settings/ChatGPTOfficialLogin.test.tsx

@@ -7,10 +7,12 @@ import { useHahaOpenAIOAuthStore } from '../../stores/hahaOpenAIOAuthStore'
 import { useTranslation } from '../../i18n'
 import { copyTextToClipboard } from '@/lib/clipboard'
 import { getDesktopHost } from '../../lib/desktopHost'
+import { OfficialLoginRiskDialog } from './OfficialLoginRiskDialog'
 
 export function ChatGPTOfficialLogin() {
   const t = useTranslation()
   const [manualAuthorizeUrl, setManualAuthorizeUrl] = useState<string | null>(null)
+  const [riskDialogOpen, setRiskDialogOpen] = useState(false)
   const {
     status,
     isLoading,
@@ -127,7 +129,7 @@ export function ChatGPTOfficialLogin() {
       </div>
       <Button
         size="base"
-        onClick={handleLogin}
+        onClick={() => setRiskDialogOpen(true)}
         disabled={isLoading}
         icon={<LogIn size={14} strokeWidth={1.75} aria-hidden="true" />}
         className="self-start"
@@ -142,6 +144,15 @@ export function ChatGPTOfficialLogin() {
         </div>
       )}
       {manualAuthorizeButton}
+      <OfficialLoginRiskDialog
+        open={riskDialogOpen}
+        provider="chatgpt"
+        onClose={() => setRiskDialogOpen(false)}
+        onConfirm={() => {
+          setRiskDialogOpen(false)
+          void handleLogin()
+        }}
+      />
     </div>
   )
 }

desktop/src/components/settings/ChatGPTOfficialLogin.tsx

@@ -0,0 +1,109 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import '@testing-library/jest-dom'
+
+const { logoutMock, startMock, statusMock } = vi.hoisted(() => ({
+  logoutMock: vi.fn(),
+  startMock: vi.fn(),
+  statusMock: vi.fn(),
+}))
+
+vi.mock('../../api/hahaOAuth', () => ({
+  hahaOAuthApi: {
+    start: startMock,
+    status: statusMock,
+    logout: logoutMock,
+  },
+}))
+
+import { ClaudeOfficialLogin } from './ClaudeOfficialLogin'
+import { useHahaOAuthStore } from '../../stores/hahaOAuthStore'
+import { useSettingsStore } from '../../stores/settingsStore'
+import { browserHost } from '../../lib/desktopHost/browserHost'
+
+const initialOAuthState = useHahaOAuthStore.getState()
+const authorizeUrl = 'https://claude.ai/oauth/authorize?state=claude-state'
+
+describe('ClaudeOfficialLogin', () => {
+  beforeEach(() => {
+    statusMock.mockReset()
+    startMock.mockReset()
+    logoutMock.mockReset()
+    statusMock.mockResolvedValue({ loggedIn: false })
+    startMock.mockResolvedValue({ authorizeUrl, state: 'claude-state' })
+    useSettingsStore.setState({ locale: 'en' })
+    useHahaOAuthStore.setState({
+      ...initialOAuthState,
+      status: null,
+      isPolling: false,
+      isLoading: false,
+      error: null,
+    })
+  })
+
+  afterEach(() => {
+    act(() => {
+      useHahaOAuthStore.getState().stopPolling()
+      useHahaOAuthStore.setState(initialOAuthState)
+    })
+    Reflect.deleteProperty(window, 'desktopHost')
+    cleanup()
+    vi.restoreAllMocks()
+  })
+
+  function installHost(open: ReturnType<typeof vi.fn>) {
+    window.desktopHost = {
+      ...browserHost,
+      kind: 'electron',
+      isDesktop: true,
+      capabilities: { ...browserHost.capabilities, shell: true },
+      shell: { ...browserHost.shell, open },
+    }
+  }
+
+  it('asks for risk confirmation before starting the OAuth flow', async () => {
+    const open = vi.fn().mockResolvedValue(undefined)
+    installHost(open)
+
+    render(<ClaudeOfficialLogin />)
+    await screen.findByRole('button', { name: 'Sign in to Claude' })
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: 'Sign in to Claude' }))
+    })
+
+    // Clicking login only opens the dialog; nothing may reach the server or browser yet.
+    expect(screen.getByRole('dialog')).toBeInTheDocument()
+    expect(screen.getByText('High')).toBeInTheDocument()
+    expect(startMock).not.toHaveBeenCalled()
+    expect(open).not.toHaveBeenCalled()
+
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: 'I understand, continue' }))
+    })
+
+    expect(startMock).toHaveBeenCalledTimes(1)
+    expect(open).toHaveBeenCalledWith(authorizeUrl)
+    expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
+    expect(useHahaOAuthStore.getState().isPolling).toBe(true)
+  })
+
+  it('does not start the OAuth flow when the risk dialog is cancelled', async () => {
+    const open = vi.fn().mockResolvedValue(undefined)
+    installHost(open)
+
+    render(<ClaudeOfficialLogin />)
+    await screen.findByRole('button', { name: 'Sign in to Claude' })
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: 'Sign in to Claude' }))
+    })
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: 'Cancel' }))
+    })
+
+    expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
+    expect(startMock).not.toHaveBeenCalled()
+    expect(open).not.toHaveBeenCalled()
+    expect(useHahaOAuthStore.getState().isPolling).toBe(false)
+    expect(screen.getByRole('button', { name: 'Sign in to Claude' })).toBeInTheDocument()
+  })
+})

desktop/src/components/settings/ClaudeOfficialLogin.test.tsx

@@ -4,15 +4,17 @@
 // 点击 Login 调 desktop host shell.open 打开浏览器走 OAuth flow;浏览器回 callback
 // 到 haha server 后,store 的 polling 自动刷新 UI 展示"已登录"。
 
-import { useEffect } from 'react'
+import { useEffect, useState } from 'react'
 import { CircleCheck } from 'lucide-react'
 import { Button } from '@/components/ui/Button'
 import { useHahaOAuthStore } from '../../stores/hahaOAuthStore'
 import { useTranslation } from '../../i18n'
 import { getDesktopHost } from '../../lib/desktopHost'
+import { OfficialLoginRiskDialog } from './OfficialLoginRiskDialog'
 
 export function ClaudeOfficialLogin() {
   const t = useTranslation()
+  const [riskDialogOpen, setRiskDialogOpen] = useState(false)
   const {
     status,
     isLoading,
@@ -85,7 +87,12 @@ export function ClaudeOfficialLogin() {
       <div className="text-[13px] leading-5 text-[var(--color-text-secondary)]">
         {t('settings.claudeOfficialLogin.intro')}
       </div>
-      <Button size="base" onClick={handleLogin} disabled={isLoading} className="self-start">
+      <Button
+        size="base"
+        onClick={() => setRiskDialogOpen(true)}
+        disabled={isLoading}
+        className="self-start"
+      >
         {isLoading
           ? t('settings.claudeOfficialLogin.loginStarting')
           : t('settings.claudeOfficialLogin.loginButton')}
@@ -95,6 +102,15 @@ export function ClaudeOfficialLogin() {
           {t('settings.claudeOfficialLogin.errorPrefix')}{error}
         </div>
       )}
+      <OfficialLoginRiskDialog
+        open={riskDialogOpen}
+        provider="claude"
+        onClose={() => setRiskDialogOpen(false)}
+        onConfirm={() => {
+          setRiskDialogOpen(false)
+          void handleLogin()
+        }}
+      />
     </div>
   )
 }