fix(tui): don't arm quit when modal handles Ctrl+C

Author: joshka-oai

codex-rs/tui/src/chatwidget.rs

@@ -3848,8 +3848,15 @@ impl ChatWidget {
     /// quit.
     fn on_ctrl_c(&mut self) {
         let key = key_hint::ctrl(KeyCode::Char('c'));
+        let modal_or_popup_active = !self.bottom_pane.no_modal_or_popup_active();
         if self.bottom_pane.on_ctrl_c() == CancellationEvent::Handled {
-            self.arm_quit_shortcut(key);
+            if modal_or_popup_active {
+                self.quit_shortcut_expires_at = None;
+                self.quit_shortcut_key = None;
+                self.bottom_pane.clear_quit_shortcut_hint();
+            } else {
+                self.arm_quit_shortcut(key);
+            }
             return;
         }
 

codex-rs/tui2/src/chatwidget.rs

@@ -3551,8 +3551,15 @@ impl ChatWidget {
     /// quit.
     fn on_ctrl_c(&mut self) {
         let key = key_hint::ctrl(KeyCode::Char('c'));
+        let modal_or_popup_active = !self.bottom_pane.no_modal_or_popup_active();
         if self.bottom_pane.on_ctrl_c() == CancellationEvent::Handled {
-            self.arm_quit_shortcut(key);
+            if modal_or_popup_active {
+                self.quit_shortcut_expires_at = None;
+                self.quit_shortcut_key = None;
+                self.bottom_pane.clear_quit_shortcut_hint();
+            } else {
+                self.arm_quit_shortcut(key);
+            }
             return;
         }
 

docs/exit-confirmation-prompt-design.md

@@ -35,6 +35,8 @@ Priority order in the UI layer:
 
 1. Active modal/view gets the first chance to consume (`BottomPane::on_ctrl_c`).
    - If the modal handles it, the quit flow stops.
+   - When a modal/popup handles Ctrl+C, the quit shortcut is cleared so dismissing a modal cannot
+     accidentally prime a subsequent Ctrl+C to quit.
 2. If the user has already armed Ctrl+C and the 1 second window has not expired, the second Ctrl+C
    triggers shutdown-first quit immediately.
 3. Otherwise, `ChatWidget` arms Ctrl+C and shows the quit hint (`ctrl + c again to quit`) for