Skip to content

fix(agents-login): detect the ANSI-fused Claude login chooser/REPL #741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ExtraToast merged 1 commit into from
Jun 26, 2026
Merged

fix(agents-login): detect the ANSI-fused Claude login chooser/REPL #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions services/agents-login/src/worker/parse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,17 @@ export function detectClaudeCodePrompt(buffer: string): boolean {
return /paste\s*code\s*here\s*if\s*prompted\s*>/i.test(stripAnsi(buffer))
}

// The TUI draws these prompts with ANSI cursor-column moves (e.g. ESC[10G)
// instead of spaces; stripAnsi() removes those, FUSING the words with no
// whitespace ("Selectloginmethod", "Claudeaccountwithsubscription",
// "Run/login"). Match with \s* (zero-or-more), never \s+, so detection works
// against both the spaced and the fused forms.
export function detectClaudeLoggedOutRepl(buffer: string): boolean {
return /(?:run\s+\/login|\?\s*for\s*shortcuts|welcome\s+back)/i.test(stripAnsi(buffer))
return /(?:run\s*\/login|\?\s*for\s*shortcuts|welcome\s*back)/i.test(stripAnsi(buffer))
}

export function detectClaudeLoginChooser(buffer: string): boolean {
return /(?:select\s+login\s+method|claude\s+account\s+with\s+subscription)/i.test(stripAnsi(buffer))
return /(?:select\s*login\s*method|claude\s*account\s*with\s*subscription)/i.test(stripAnsi(buffer))
}

export interface ClaudeRedirectCode {
Expand Down
8 changes: 8 additions & 0 deletions services/agents-login/test/parse.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,20 @@ describe('PTY output parsing', () => {
expect(detectClaudeLoggedOutRepl('Not logged in · Run /login')).toBe(true)
expect(detectClaudeLoggedOutRepl('\x1b[2GWelcome back\r\n? for shortcuts')).toBe(true)
expect(detectClaudeLoggedOutRepl('Paste code here if prompted >')).toBe(false)
// The real REPL uses ANSI cursor-column moves, not spaces: after stripAnsi
// the words fuse ("Run/login", "?forshortcuts"). Must still detect.
expect(detectClaudeLoggedOutRepl('Not\x1b[377Glogged\x1b[384Gin\x1b[387G·\x1b[389GRun\x1b[393G/login')).toBe(true)
})

it('detects the Claude login-method chooser', () => {
expect(detectClaudeLoginChooser('Select login method')).toBe(true)
expect(detectClaudeLoginChooser('\x1b[36mClaude account with subscription\x1b[0m')).toBe(true)
expect(detectClaudeLoginChooser('Not logged in · Run /login')).toBe(false)
// Real chooser output: ANSI cursor-column moves fuse the words to
// "Selectloginmethod"/"Claudeaccountwithsubscription" after stripAnsi.
// This regressed login (no Enter sent) until the detectors used \s* not \s+.
expect(detectClaudeLoginChooser('\x1b[3GSelect\x1b[10Glogin\x1b[16Gmethod:')).toBe(true)
expect(detectClaudeLoginChooser('\x1b[8G\x1b[97mClaude\x1b[15Gaccount\x1b[23Gwith\x1b[28Gsubscription')).toBe(true)
})

it('extracts the Claude authorization code from a callback URL and preserves bare codes', () => {
Expand Down