From b7e089e537d39006980d29c0bfaa56d8edeebe37 Mon Sep 17 00:00:00 2001
From: Ahmed Ibrahim <aibrahim@openai.com>
Date: Sun, 18 Jan 2026 23:43:47 -0800
Subject: [PATCH] clear on submit

---
 codex-rs/tui/src/bottom_pane/chat_composer.rs | 40 ++++++++++++++----
 .../tui2/src/bottom_pane/chat_composer.rs     | 42 +++++++++++++++----
 2 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/codex-rs/tui/src/bottom_pane/chat_composer.rs b/codex-rs/tui/src/bottom_pane/chat_composer.rs
index a6065c283b..7228750390 100644
--- a/codex-rs/tui/src/bottom_pane/chat_composer.rs
+++ b/codex-rs/tui/src/bottom_pane/chat_composer.rs
@@ -214,11 +214,15 @@ impl ChatComposer {
         if ctx.cursor <= 1 && ctx.first_line().starts_with("/ ") {
             return None;
         }
-        if ctx.popup_prefix() == "/"
-            || Self::parse_slash_command_prefix(ctx.popup_prefix())
-                .is_some_and(|(name, rest)| self.looks_like_slash_prefix(name, rest))
+        let prefix = ctx.popup_prefix();
+        if prefix == "/" {
+            return Some(prefix);
+        }
+        if let Some((name, rest)) = Self::parse_slash_command_prefix(prefix)
+            && rest.is_empty()
+            && self.looks_like_slash_prefix(name, rest)
         {
-            return Some(ctx.popup_prefix());
+            return Some(prefix);
         }
 
         None
@@ -4580,7 +4584,7 @@ mod tests {
     }
 
     #[test]
-    fn slash_popup_activated_for_prefix_with_args() {
+    fn slash_popup_hidden_for_prefix_with_args() {
         let (tx, _rx) = unbounded_channel::<AppEvent>();
         let sender = AppEventSender::new(tx);
         let mut composer = ChatComposer::new(
@@ -4596,8 +4600,30 @@ mod tests {
         composer.sync_popups();
 
         assert!(
-            matches!(composer.active_popup, ActivePopup::Command(_)),
-            "slash popup should stay open when args follow the command name"
+            matches!(composer.active_popup, ActivePopup::None),
+            "slash popup should hide after a command is selected and args are being typed"
+        );
+    }
+
+    #[test]
+    fn slash_popup_hidden_for_completed_command_with_trailing_space() {
+        let (tx, _rx) = unbounded_channel::<AppEvent>();
+        let sender = AppEventSender::new(tx);
+        let mut composer = ChatComposer::new(
+            true,
+            sender,
+            false,
+            "Ask Codex to do anything".to_string(),
+            false,
+        );
+
+        composer.set_text_content("/review ".to_string());
+        composer.textarea.set_cursor(composer.textarea.text().len());
+        composer.sync_popups();
+
+        assert!(
+            matches!(composer.active_popup, ActivePopup::None),
+            "slash popup should hide after a command is completed with a trailing space"
         );
     }
 
diff --git a/codex-rs/tui2/src/bottom_pane/chat_composer.rs b/codex-rs/tui2/src/bottom_pane/chat_composer.rs
index 43a37e704d..6e2e1db51b 100644
--- a/codex-rs/tui2/src/bottom_pane/chat_composer.rs
+++ b/codex-rs/tui2/src/bottom_pane/chat_composer.rs
@@ -222,11 +222,15 @@ impl ChatComposer {
         if ctx.cursor <= 1 && ctx.first_line().starts_with("/ ") {
             return None;
         }
-        if ctx.popup_prefix() == "/"
-            || Self::parse_slash_command_prefix(ctx.popup_prefix())
-                .is_some_and(|(name, rest)| self.looks_like_slash_prefix(name, rest))
+        let prefix = ctx.popup_prefix();
+        if prefix == "/" {
+            return Some(prefix);
+        }
+        if let Some((name, rest)) = Self::parse_slash_command_prefix(prefix)
+            && rest.is_empty()
+            && self.looks_like_slash_prefix(name, rest)
         {
-            return Some(ctx.popup_prefix());
+            return Some(prefix);
         }
 
         None
@@ -4438,7 +4442,7 @@ mod tests {
     }
 
     #[test]
-    fn slash_popup_activated_for_prefix_with_args() {
+    fn slash_popup_hidden_for_prefix_with_args() {
         use tokio::sync::mpsc::unbounded_channel;
 
         let (tx, _rx) = unbounded_channel::<AppEvent>();
@@ -4456,8 +4460,32 @@ mod tests {
         composer.sync_popups();
 
         assert!(
-            matches!(composer.active_popup, ActivePopup::Command(_)),
-            "slash popup should stay open when args follow the command name"
+            matches!(composer.active_popup, ActivePopup::None),
+            "slash popup should hide after a command is selected and args are being typed"
+        );
+    }
+
+    #[test]
+    fn slash_popup_hidden_for_completed_command_with_trailing_space() {
+        use tokio::sync::mpsc::unbounded_channel;
+
+        let (tx, _rx) = unbounded_channel::<AppEvent>();
+        let sender = AppEventSender::new(tx);
+        let mut composer = ChatComposer::new(
+            true,
+            sender,
+            false,
+            "Ask Codex to do anything".to_string(),
+            false,
+        );
+
+        composer.set_text_content("/review ".to_string());
+        composer.textarea.set_cursor(composer.textarea.text().len());
+        composer.sync_popups();
+
+        assert!(
+            matches!(composer.active_popup, ActivePopup::None),
+            "slash popup should hide after a command is completed with a trailing space"
         );
     }