Reset slash command popup selection on filter change

cauldron26 · cauldron26 · commit d271558bd509 · 2026-05-30T10:41:14.000-05:00
diff --git a/codex-rs/tui/src/bottom_pane/command_popup.rs b/codex-rs/tui/src/bottom_pane/command_popup.rs
@@ -98,6 +98,7 @@ impl CommandPopup {
     /// to narrow down the list of available commands.
     pub(crate) fn on_composer_text_change(&mut self, text: String) {
         let first_line = text.lines().next().unwrap_or("");
+        let previous_filter = self.command_filter.clone();
 
         if let Some(stripped) = first_line.strip_prefix('/') {
             // Extract the *first* token (sequence of non-whitespace
@@ -118,6 +119,9 @@ impl CommandPopup {
 
         // Reset or clamp selected index based on new filtered list.
         let matches_len = self.filtered_items().len();
+        if self.command_filter != previous_filter {
+            self.state.reset();
+        }
         self.state.clamp_selection(matches_len);
         self.state
             .ensure_visible(matches_len, MAX_POPUP_ROWS.min(matches_len));
@@ -407,6 +411,26 @@ mod tests {
         );
     }
 
+    #[test]
+    fn changing_filter_resets_selection_after_scrolling() {
+        let mut popup = CommandPopup::new(CommandPopupFlags::default(), Vec::new());
+        popup.on_composer_text_change("/".to_string());
+        for _ in 0..20 {
+            popup.move_down();
+        }
+
+        popup.on_composer_text_change("/st".to_string());
+
+        match popup.selected_item() {
+            Some(CommandItem::Builtin(cmd)) => assert_eq!(cmd.command(), "status"),
+            Some(CommandItem::ServiceTier(command)) => {
+                panic!("expected status command, got service tier {command:?}")
+            }
+            None => panic!("expected a selected command for '/st'"),
+        }
+        assert_eq!(popup.state.scroll_top, 0);
+    }
+
     #[test]
     fn quit_hidden_in_empty_filter_but_shown_for_prefix() {
         let mut popup = CommandPopup::new(CommandPopupFlags::default(), Vec::new());
