fix: 'q' and '?' keys now work correctly during FilterInput mode

- Extract key handling from main.rs into App::handle_key() method

- FilterInput mode routes all chars to input buffer before global handlers

- Previously 'q' quit the app and '?' toggled help even while typing tags

- Import AppMode in ui.rs to replace 8 full crate path references

- main.rs reduced from 151 to 97 lines

Author: damacus

src/main.rs

@@ -70,61 +70,7 @@ async fn main() -> Result<()> {
 
         if let Some(event) = event_handler.next().await {
             match event {
-                Event::Key(key) => {
-                    match key.code {
-                        crossterm::event::KeyCode::Char('?') => {
-                            if app.mode != tui::app::AppMode::Help {
-                                app.mode = tui::app::AppMode::Help;
-                            } else {
-                                app.mode = tui::app::AppMode::CommandSelection; // Or back to previous?
-                            }
-                        }
-                        crossterm::event::KeyCode::Char('q') => app.should_quit = true,
-                        crossterm::event::KeyCode::Up | crossterm::event::KeyCode::Char('k') => {
-                            match app.mode {
-                                tui::app::AppMode::CommandSelection => app.previous_command(),
-                                tui::app::AppMode::ResultsView => app.previous_result(),
-                                _ => {}
-                            }
-                        }
-                        crossterm::event::KeyCode::Down | crossterm::event::KeyCode::Char('j') => {
-                            match app.mode {
-                                tui::app::AppMode::CommandSelection => app.next_command(),
-                                tui::app::AppMode::ResultsView => app.next_result(),
-                                _ => {}
-                            }
-                        }
-                        crossterm::event::KeyCode::Enter => match app.mode {
-                            tui::app::AppMode::CommandSelection => app.select_command(),
-                            tui::app::AppMode::FilterInput => app.execute_search().await,
-                            _ => {}
-                        },
-                        crossterm::event::KeyCode::Esc => match app.mode {
-                            tui::app::AppMode::CommandSelection => app.should_quit = true,
-                            tui::app::AppMode::FilterInput => {
-                                app.error_message = None;
-                                app.mode = tui::app::AppMode::CommandSelection;
-                            }
-                            tui::app::AppMode::ResultsView => {
-                                app.error_message = None;
-                                app.mode = tui::app::AppMode::CommandSelection;
-                            }
-                            _ => app.mode = tui::app::AppMode::CommandSelection,
-                        },
-                        // FilterInput text entry
-                        crossterm::event::KeyCode::Char(c)
-                            if app.mode == tui::app::AppMode::FilterInput =>
-                        {
-                            app.input_buffer.push(c);
-                        }
-                        crossterm::event::KeyCode::Backspace
-                            if app.mode == tui::app::AppMode::FilterInput =>
-                        {
-                            app.input_buffer.pop();
-                        }
-                        _ => {}
-                    }
-                }
+                Event::Key(key) => app.handle_key(key).await,
                 Event::Tick => app.tick(),
             }
         }

src/tui/app.rs

@@ -1,6 +1,7 @@
 use crate::conductor::Conductor;
 use crate::models::manager::RunnerManager;
 use crate::models::runner::Runner;
+use crossterm::event::{KeyCode, KeyEvent};
 use ratatui::widgets::TableState;
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy, Default)]
@@ -258,6 +259,67 @@ impl App {
             self.advance_spinner();
         }
     }
+
+    pub async fn handle_key(&mut self, key: KeyEvent) {
+        // FilterInput mode: route all chars/backspace to input buffer first
+        if self.mode == AppMode::FilterInput {
+            match key.code {
+                KeyCode::Enter => self.execute_search().await,
+                KeyCode::Esc => {
+                    self.error_message = None;
+                    self.mode = AppMode::CommandSelection;
+                }
+                KeyCode::Backspace => {
+                    self.input_buffer.pop();
+                }
+                KeyCode::Char(c) => {
+                    self.input_buffer.push(c);
+                }
+                _ => {}
+            }
+            return;
+        }
+
+        // Help mode: any key closes help
+        if self.mode == AppMode::Help {
+            self.mode = AppMode::CommandSelection;
+            return;
+        }
+
+        // CommandSelection and ResultsView modes
+        match key.code {
+            KeyCode::Char('?') => {
+                self.mode = AppMode::Help;
+            }
+            KeyCode::Char('q') => {
+                self.should_quit = true;
+            }
+            KeyCode::Up | KeyCode::Char('k') => match self.mode {
+                AppMode::CommandSelection => self.previous_command(),
+                AppMode::ResultsView => self.previous_result(),
+                _ => {}
+            },
+            KeyCode::Down | KeyCode::Char('j') => match self.mode {
+                AppMode::CommandSelection => self.next_command(),
+                AppMode::ResultsView => self.next_result(),
+                _ => {}
+            },
+            KeyCode::Enter => {
+                if self.mode == AppMode::CommandSelection {
+                    self.select_command();
+                }
+            }
+            KeyCode::Esc => match self.mode {
+                AppMode::CommandSelection => self.should_quit = true,
+                AppMode::ResultsView => {
+                    self.error_message = None;
+                    self.mode = AppMode::CommandSelection;
+                }
+                _ => self.mode = AppMode::CommandSelection,
+            },
+            _ => {}
+        }
+    }
 }
 
 #[cfg(test)]

src/tui/ui.rs

@@ -1,4 +1,4 @@
-use crate::tui::app::{App, ResultsViewType};
+use crate::tui::app::{App, AppMode, ResultsViewType};
 use ratatui::{
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},
@@ -40,27 +40,21 @@ pub fn render(app: &mut App, frame: &mut Frame) {
 
     // Content based on mode
     match app.mode {
-        crate::tui::app::AppMode::CommandSelection => {
-            render_command_selection(app, frame, chunks[1])
-        }
-        crate::tui::app::AppMode::FilterInput => render_filter_input(app, frame, chunks[1]),
-        crate::tui::app::AppMode::ResultsView => render_results(app, frame, chunks[1]),
-        crate::tui::app::AppMode::Help => render_help_view(app, frame, chunks[1]),
+        AppMode::CommandSelection => render_command_selection(app, frame, chunks[1]),
+        AppMode::FilterInput => render_filter_input(app, frame, chunks[1]),
+        AppMode::ResultsView => render_results(app, frame, chunks[1]),
+        AppMode::Help => render_help_view(app, frame, chunks[1]),
     };
 
     // Status bar with context-sensitive help
     let status_text = if app.error_message.is_some() {
         "Press Esc to dismiss error and go back"
     } else {
         match app.mode {
-            crate::tui::app::AppMode::CommandSelection => {
-                "↑/↓: Navigate | Enter: Select | ?: Help | q: Quit"
-            }
-            crate::tui::app::AppMode::FilterInput => {
-                "Enter: Search | Esc: Back | Type to filter by tags"
-            }
-            crate::tui::app::AppMode::ResultsView => "↑/↓: Scroll | Esc: Back | q: Quit",
-            crate::tui::app::AppMode::Help => "Press any key to close help",
+            AppMode::CommandSelection => "↑/↓: Navigate | Enter: Select | ?: Help | q: Quit",
+            AppMode::FilterInput => "Enter: Search | Esc: Back | Type to filter by tags",
+            AppMode::ResultsView => "↑/↓: Scroll | Esc: Back | q: Quit",
+            AppMode::Help => "Press any key to close help",
         }
     };
     let status = Paragraph::new(status_text).block(Block::default().borders(Borders::ALL));