fix: improve slash command interactions

Author: wangtsiao

crates/tui/src/bottom_pane/chat_composer.rs

@@ -1430,6 +1430,8 @@ impl ChatComposer {
                 modifiers: KeyModifiers::NONE,
                 ..
             } => {
+                let first_line = self.textarea.text().lines().next().unwrap_or("");
+                popup.on_composer_text_change(first_line.to_string());
                 if let Some(sel) = popup.selected_item() {
                     let CommandItem::Builtin(cmd) = sel;
                     // If the command supports inline args and there's already
@@ -4029,4 +4031,23 @@ mod reference_popup_tests {
         assert_eq!(result, (InputResult::None, true));
         assert!(matches!(composer.active_popup, ActivePopup::None));
     }
+
+    /// Trace: L2-DES-TUI-003
+    /// Verifies: Enter confirms the focused slash-command popup row.
+    #[test]
+    fn enter_accepts_focused_slash_command() {
+        let (mut composer, _rx) = test_composer();
+        set_text_at_end(&mut composer, "/");
+
+        assert_eq!(
+            composer.handle_key_event(press(KeyCode::Down)),
+            (InputResult::None, true)
+        );
+
+        assert_eq!(
+            composer.handle_key_event(press(KeyCode::Enter)),
+            (InputResult::Command(SlashCommand::Model), true)
+        );
+        assert_eq!(composer.current_text(), "");
+    }
 }

crates/tui/src/history_cell.rs

@@ -344,28 +344,24 @@ impl HistoryCell for UserHistoryCell {
             user_message_style()
         };
         let element_style = style.fg(accent);
+        let slash_command_style = style.fg(accent);
         let prefix_style = Style::default().fg(mode_color);
         let blank_prefixed_line = || Line::from(Span::styled("  ", style)).style(style);
 
         let wrapped_message = if self.message.is_empty() && self.text_elements.is_empty() {
             None
-        } else if self.text_elements.is_empty() {
-            let message_without_trailing_newlines = self.message.trim_end_matches(['\r', '\n']);
-            let wrapped = adaptive_wrap_lines(
-                message_without_trailing_newlines
-                    .split('\n')
-                    .map(|line| Line::from(line).style(style)),
-                RtOptions::new(usize::from(wrap_width))
-                    .wrap_algorithm(textwrap::WrapAlgorithm::FirstFit),
-            );
-            let wrapped = trim_trailing_blank_lines(wrapped);
-            (!wrapped.is_empty()).then_some(wrapped)
         } else {
+            let message = if self.text_elements.is_empty() {
+                self.message.trim_end_matches(['\r', '\n'])
+            } else {
+                &self.message
+            };
             let raw_lines = build_user_message_lines_with_elements(
-                &self.message,
+                message,
                 &self.text_elements,
                 style,
                 element_style,
+                slash_command_style,
             );
             let wrapped = adaptive_wrap_lines(
                 raw_lines,
@@ -1725,9 +1721,40 @@ fn pluralize(count: u64, singular: &'static str, plural: &'static str) -> &'stat
 
 #[cfg(test)]
 mod tests {
+    use ratatui::style::Color;
+
+    use crate::bottom_pane::InputMode;
+
+    use super::HistoryCell;
     use pretty_assertions::assert_eq;
 
     use super::format_duration_hms;
+    use super::new_user_prompt;
+
+    fn content_spans_for_message(message: &str) -> Vec<(String, Option<Color>)> {
+        let cell = new_user_prompt(
+            message.to_string(),
+            Vec::new(),
+            Vec::new(),
+            Vec::new(),
+            Color::Yellow,
+            InputMode::Build,
+        );
+        cell.display_lines(80)
+            .into_iter()
+            .find(|line| {
+                line.spans
+                    .iter()
+                    .map(|span| span.content.as_ref())
+                    .collect::<String>()
+                    .contains(message)
+            })
+            .unwrap_or_else(|| panic!("missing rendered message line for {message:?}"))
+            .spans
+            .into_iter()
+            .map(|span| (span.content.to_string(), span.style.fg))
+            .collect()
+    }
 
     #[test]
     fn turn_summary_duration_uses_hour_minute_second_units() {
@@ -1738,4 +1765,27 @@ mod tests {
         assert_eq!(format_duration_hms(3_601), "1h0m1s");
         assert_eq!(format_duration_hms(3_723), "1h2m3s");
     }
+
+    #[test]
+    fn user_prompt_highlights_leading_slash_command_without_text_element() {
+        assert_eq!(
+            content_spans_for_message("/btw check this"),
+            vec![
+                ("▌ ".to_string(), Some(Color::Cyan)),
+                ("/btw".to_string(), Some(Color::Yellow)),
+                (" check this".to_string(), None),
+            ]
+        );
+    }
+
+    #[test]
+    fn user_prompt_does_not_highlight_unknown_slash_command() {
+        assert_eq!(
+            content_spans_for_message("/unknown check this"),
+            vec![
+                ("▌ ".to_string(), Some(Color::Cyan)),
+                ("/unknown check this".to_string(), None),
+            ]
+        );
+    }
 }

specs/L2/tui/L2-DES-TUI-003-composer-and-input-modes.md

@@ -297,6 +297,7 @@ Slash-command inline rendering:
 - Parameters or placeholder text following the matched slash command use muted foreground color.
 - If the typed slash command does not match an existing command, the composer should not apply matched-command coloring.
 - Inline command coloring is presentational only. Command parsing and validation still happen when the user confirms or submits the command.
+- Submitted user history cells apply the same matched-command coloring to a leading recognized `/name` token, including rows restored or constructed without composer text-element metadata.
 - For `/goal`, free-form text after the command is the objective. Pressing Enter submits that objective directly to the goal command instead of opening a budget prompt or create wizard.
 
 Example matched slash command with parameter hint:
@@ -388,3 +389,4 @@ Rules:
 | 3 | 2026-05-26 | Human | Refinement | Updated navigable slash-command lists so `>` marks the focused row and `●` is reserved for enabled options in choice lists. |
 | 4 | 2026-05-27 | Human | Refinement | Removed `/onboard` from slash-command discovery because onboarding is entered through startup CLI arguments. |
 | 4 | 2026-06-08 | Assistant | Refinement | Defined `Shift+Tab` Build/Plan toggling, leftmost uppercase mode labels, Shell-only `!` entry behavior, one-shot PTY-backed Shell execution including sessionless startup commands, prompt-only Plan Mode v1 behavior, active-mode composer marker color, direct user-shell output, and `▣ Shell` process summaries. |
+| 5 | 2026-06-18 | Assistant | Refinement | Clarified that submitted user history cells also highlight a leading recognized slash-command token, even when no composer text-element metadata is available. |