From 3923af4834cab1930c62fba0c1fac8037ba8c2f7 Mon Sep 17 00:00:00 2001
From: claude-code-best <claude-code-best@proton.me>
Date: Mon, 6 Apr 2026 11:23:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20login=20=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E7=9A=84=E5=B7=A6=E5=8F=B3=E5=88=87=E6=8D=A2=E8=83=BD?=
 =?UTF-8?q?=E5=8A=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ConsoleOAuthFlow.tsx | 18 +++++++++---------
 src/keybindings/defaultBindings.ts  | 10 ++++++++++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/components/ConsoleOAuthFlow.tsx b/src/components/ConsoleOAuthFlow.tsx
index 44c69025f..90a2e2b36 100644
--- a/src/components/ConsoleOAuthFlow.tsx
+++ b/src/components/ConsoleOAuthFlow.tsx
@@ -709,7 +709,7 @@ function OAuthStatusMessage({
               setInputCursorOffset((displayValues[FIELDS[idx + 1]!] ?? '').length)
             }
           },
-          { context: 'Tabs' },
+          { context: 'FormField' },
         )
         useKeybinding(
           'tabs:previous',
@@ -721,7 +721,7 @@ function OAuthStatusMessage({
               setInputCursorOffset((displayValues[FIELDS[idx - 1]!] ?? '').length)
             }
           },
-          { context: 'Tabs' },
+          { context: 'FormField' },
         )
         useKeybinding(
           'confirm:no',
@@ -782,7 +782,7 @@ function OAuthStatusMessage({
               {renderRow('opus_model', 'Opus     ')}
             </Box>
             <Text dimColor>
-              Tab to switch · Enter on last field to save · Esc to go back
+              ↑↓/Tab to switch · Enter on last field to save · Esc to go back
             </Text>
           </Box>
         )
@@ -916,7 +916,7 @@ function OAuthStatusMessage({
               )
             }
           },
-          { context: 'Tabs' },
+          { context: 'FormField' },
         )
         useKeybinding(
           'tabs:previous',
@@ -932,7 +932,7 @@ function OAuthStatusMessage({
               )
             }
           },
-          { context: 'Tabs' },
+          { context: 'FormField' },
         )
         useKeybinding(
           'confirm:no',
@@ -997,7 +997,7 @@ function OAuthStatusMessage({
               {renderOpenAIRow('opus_model', 'Opus     ')}
             </Box>
             <Text dimColor>
-              Tab to switch · Enter on last field to save · Esc to go back
+              ↑↓/Tab to switch · Enter on last field to save · Esc to go back
             </Text>
           </Box>
         )
@@ -1148,7 +1148,7 @@ function OAuthStatusMessage({
               )
             }
           },
-          { context: 'Tabs' },
+          { context: 'FormField' },
         )
         useKeybinding(
           'tabs:previous',
@@ -1164,7 +1164,7 @@ function OAuthStatusMessage({
               )
             }
           },
-          { context: 'Tabs' },
+          { context: 'FormField' },
         )
         useKeybinding(
           'confirm:no',
@@ -1229,7 +1229,7 @@ function OAuthStatusMessage({
               {renderGeminiRow('opus_model', 'Opus     ')}
             </Box>
             <Text dimColor>
-              Tab to switch · Enter on last field to save · Esc to go back
+              ↑↓/Tab to switch · Enter on last field to save · Esc to go back
             </Text>
           </Box>
         )
diff --git a/src/keybindings/defaultBindings.ts b/src/keybindings/defaultBindings.ts
index 8629809d9..f33e764ac 100644
--- a/src/keybindings/defaultBindings.ts
+++ b/src/keybindings/defaultBindings.ts
@@ -147,6 +147,16 @@ export const DEFAULT_BINDINGS: KeybindingBlock[] = [
       'ctrl+d': 'permission:toggleDebug',
     },
   },
+  {
+    context: 'FormField',
+    bindings: {
+      // Form field vertical navigation (login/setup panels)
+      tab: 'tabs:next',
+      'shift+tab': 'tabs:previous',
+      up: 'tabs:previous',
+      down: 'tabs:next',
+    },
+  },
   {
     context: 'Tabs',
     bindings: {