From feaae514a67b9fb26513e84732768469885d1d17 Mon Sep 17 00:00:00 2001
From: Hunter Bown <hmbown@gmail.com>
Date: Tue, 5 May 2026 22:41:50 -0500
Subject: [PATCH] fix(tui): recognize legacy ctrl-v paste input (#786)

---
 crates/tui/src/tui/ui.rs       | 17 ++++++++++++-----
 crates/tui/src/tui/ui/tests.rs |  4 ++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/crates/tui/src/tui/ui.rs b/crates/tui/src/tui/ui.rs
index 14f4d8e5..752f636e 100644
--- a/crates/tui/src/tui/ui.rs
+++ b/crates/tui/src/tui/ui.rs
@@ -1747,9 +1747,7 @@ async fn run_event_loop(
                         app.delete_api_key_char();
                         sync_api_key_validation_status(app, false);
                     }
-                    KeyCode::Char('v') | KeyCode::Char('V')
-                        if is_paste_shortcut(&key) && app.onboarding == OnboardingState::ApiKey =>
-                    {
+                    _ if is_paste_shortcut(&key) && app.onboarding == OnboardingState::ApiKey => {
                         // Cmd+V / Ctrl+V paste (bracketed paste handled above)
                         app.paste_api_key_from_clipboard();
                         sync_api_key_validation_status(app, false);
@@ -2671,7 +2669,7 @@ async fn run_event_loop(
                     };
                     app.set_mode(new_mode);
                 }
-                KeyCode::Char('v') if is_paste_shortcut(&key) => {
+                _ if is_paste_shortcut(&key) => {
                     app.paste_from_clipboard();
                 }
                 KeyCode::Char('a') if key.modifiers.contains(KeyModifiers::ALT) => {
@@ -7535,10 +7533,15 @@ fn details_shortcut_modifiers(modifiers: KeyModifiers) -> bool {
 
 fn is_paste_shortcut(key: &KeyEvent) -> bool {
     let is_v = matches!(key.code, KeyCode::Char('v') | KeyCode::Char('V'));
-    if !is_v {
+    let is_legacy_ctrl_v = matches!(key.code, KeyCode::Char('\u{16}'));
+    if !is_v && !is_legacy_ctrl_v {
         return false;
     }
 
+    if is_legacy_ctrl_v {
+        return true;
+    }
+
     // Cmd+V on macOS
     if key.modifiers.contains(KeyModifiers::SUPER) {
         return true;
@@ -7549,6 +7552,10 @@ fn is_paste_shortcut(key: &KeyEvent) -> bool {
 }
 
 fn is_text_input_key(key: &KeyEvent) -> bool {
+    if matches!(key.code, KeyCode::Char(c) if c.is_control()) {
+        return false;
+    }
+
     !key.modifiers.contains(KeyModifiers::CONTROL)
         && !key.modifiers.contains(KeyModifiers::ALT)
         && !key.modifiers.contains(KeyModifiers::SUPER)
diff --git a/crates/tui/src/tui/ui/tests.rs b/crates/tui/src/tui/ui/tests.rs
index 9792d4c7..7bf188e7 100644
--- a/crates/tui/src/tui/ui/tests.rs
+++ b/crates/tui/src/tui/ui/tests.rs
@@ -1555,6 +1555,10 @@ fn api_key_paste_shortcut_is_not_plain_text_input() {
     assert!(is_paste_shortcut(&ctrl_v));
     assert!(!is_text_input_key(&ctrl_v));
 
+    let legacy_ctrl_v = KeyEvent::new(KeyCode::Char('\u{16}'), KeyModifiers::NONE);
+    assert!(is_paste_shortcut(&legacy_ctrl_v));
+    assert!(!is_text_input_key(&legacy_ctrl_v));
+
     let shifted = KeyEvent::new(KeyCode::Char('A'), KeyModifiers::SHIFT);
     assert!(is_text_input_key(&shifted));
 }