fix: resolve bugs in bugbash for slash command refactor (#324)

evanliu048 · web-flow · commit a3f93f39117e · 2025-06-26T17:13:44.000-07:00
diff --git a/crates/chat-cli/src/cli/chat/cli/context.rs b/crates/chat-cli/src/cli/chat/cli/context.rs
@@ -10,6 +10,11 @@ use crossterm::{
     style,
 };
 
+use crate::cli::chat::cli::hooks::{
+    HookTrigger,
+    map_chat_error,
+    print_hook_section,
+};
 use crate::cli::chat::consts::CONTEXT_FILES_MAX_SIZE;
 use crate::cli::chat::token_counter::TokenCounter;
 use crate::cli::chat::util::drop_matched_context_files;
@@ -125,6 +130,28 @@ impl ContextSubcommand {
                     }
                 }
 
+                if expand {
+                    execute!(
+                        session.stderr,
+                        style::SetAttribute(Attribute::Bold),
+                        style::SetForegroundColor(Color::DarkYellow),
+                        style::Print("\n    🔧 Hooks:\n")
+                    )?;
+                    print_hook_section(
+                        &mut session.stderr,
+                        &context_manager.global_config.hooks,
+                        HookTrigger::ConversationStart,
+                    )
+                    .map_err(map_chat_error)?;
+
+                    print_hook_section(
+                        &mut session.stderr,
+                        &context_manager.global_config.hooks,
+                        HookTrigger::PerPrompt,
+                    )
+                    .map_err(map_chat_error)?;
+                }
+
                 // Display profile context
                 execute!(
                     session.stderr,
@@ -162,6 +189,28 @@ impl ContextSubcommand {
                     execute!(session.stderr, style::Print("\n"))?;
                 }
 
+                if expand {
+                    execute!(
+                        session.stderr,
+                        style::SetAttribute(Attribute::Bold),
+                        style::SetForegroundColor(Color::DarkYellow),
+                        style::Print("    🔧 Hooks:\n")
+                    )?;
+                    print_hook_section(
+                        &mut session.stderr,
+                        &context_manager.profile_config.hooks,
+                        HookTrigger::ConversationStart,
+                    )
+                    .map_err(map_chat_error)?;
+                    print_hook_section(
+                        &mut session.stderr,
+                        &context_manager.profile_config.hooks,
+                        HookTrigger::PerPrompt,
+                    )
+                    .map_err(map_chat_error)?;
+                    execute!(session.stderr, style::Print("\n"))?;
+                }
+
                 if global_context_files.is_empty() && profile_context_files.is_empty() {
                     execute!(
                         session.stderr,
diff --git a/crates/chat-cli/src/cli/chat/cli/hooks.rs b/crates/chat-cli/src/cli/chat/cli/hooks.rs
@@ -716,7 +716,7 @@ impl HooksSubcommand {
 }
 
 /// Prints hook configuration grouped by trigger: conversation session start or per user message
-fn print_hook_section(output: &mut impl Write, hooks: &HashMap<String, Hook>, trigger: HookTrigger) -> Result<()> {
+pub fn print_hook_section(output: &mut impl Write, hooks: &HashMap<String, Hook>, trigger: HookTrigger) -> Result<()> {
     let section = match trigger {
         HookTrigger::ConversationStart => "On Session Start",
         HookTrigger::PerPrompt => "Per User Message",
@@ -754,7 +754,7 @@ fn print_hook_section(output: &mut impl Write, hooks: &HashMap<String, Hook>, tr
     Ok(())
 }
 
-fn map_chat_error(e: ErrReport) -> ChatError {
+pub fn map_chat_error(e: ErrReport) -> ChatError {
     ChatError::Custom(e.to_string().into())
 }
 
diff --git a/crates/chat-cli/src/cli/chat/cli/mod.rs b/crates/chat-cli/src/cli/chat/cli/mod.rs
@@ -40,7 +40,7 @@ use crate::os::Os;
 
 /// q (Amazon Q Chat)
 #[derive(Debug, PartialEq, Parser)]
-#[command(color = clap::ColorChoice::Always, after_long_help = EXTRA_HELP)]
+#[command(color = clap::ColorChoice::Always, term_width = 0, after_long_help = EXTRA_HELP)]
 pub enum SlashCommand {
     /// Quit the application
     #[command(aliases = ["q", "exit"])]
diff --git a/crates/chat-cli/src/cli/chat/cli/prompts.rs b/crates/chat-cli/src/cli/chat/cli/prompts.rs
@@ -48,15 +48,15 @@ pub enum GetPromptError {
 
 #[deny(missing_docs)]
 #[derive(Debug, PartialEq, Args)]
-#[command(
-    before_long_help = "Prompts are reusable templates that help you quickly access common workflows and tasks. 
+#[command(color = clap::ColorChoice::Always,
+    before_long_help = color_print::cstr!{"Prompts are reusable templates that help you quickly access common workflows and tasks. 
 These templates are provided by the mcp servers you have installed and configured.
 
 To actually retrieve a prompt, directly start with the following command (without prepending /prompt get):
-  <em>@<<prompt name>> [arg]</em>                                   <black!>Retrieve prompt specified</black!>
+  <em>@<<prompt name>> [arg]</em>                             <black!>Retrieve prompt specified</black!>
 Or if you prefer the long way:
-  <em>/prompts get <<prompt name>> [arg]</em>                       <black!>Retrieve prompt specified</black!>"
-)]
+  <em>/prompts get <<prompt name>> [arg]</em>                 <black!>Retrieve prompt specified</black!>"
+})]
 pub struct PromptsArgs {
     #[command(subcommand)]
     subcommand: Option<PromptsSubcommand>,
diff --git a/crates/chat-cli/src/cli/chat/mod.rs b/crates/chat-cli/src/cli/chat/mod.rs
@@ -170,7 +170,7 @@ pub struct ChatArgs {
     #[arg(long, value_delimiter = ',', value_name = "TOOL_NAMES")]
     pub trust_tools: Option<Vec<String>>,
     /// Whether the command should run without expecting user input
-    #[arg(long)]
+    #[arg(long, alias = "no-interactive")]
     pub non_interactive: bool,
     /// The first question to ask
     pub input: Option<String>,
@@ -179,7 +179,7 @@ pub struct ChatArgs {
 impl ChatArgs {
     pub async fn execute(self, os: &mut Os) -> Result<ExitCode> {
         if self.non_interactive && self.input.is_none() {
-            bail!("Input must be supplied when --non-interactive is set");
+            bail!("Input must be supplied when running in non-interactive mode");
         }
 
         let stdout = std::io::stdout();
@@ -353,11 +353,9 @@ const ROTATING_TIPS: [&str; 16] = [
 
 const GREETING_BREAK_POINT: usize = 80;
 
-const POPULAR_SHORTCUTS: &str = color_print::cstr! {"<black!><green!>/help</green!> all commands  <em>•</em>
-<green!>ctrl + j</green!> new lines  <em>•</em>  
-<green!>ctrl + s</green!> fuzzy search  <em>•</em>  
-<green!>ctrl + f</green!> accept completion
-</black!>"};
+const POPULAR_SHORTCUTS: &str = color_print::cstr! {
+"<black!><green!>/help</green!> all commands                      <em>•</em>  <green!>ctrl + j</green!> new lines
+<green!>ctrl + s</green!> fuzzy search                   <em>•</em>  <green!>ctrl + f</green!> accept completion</black!>"};
 const SMALL_SCREEN_POPULAR_SHORTCUTS: &str = color_print::cstr! {"<black!><green!>/help</green!> all commands
 <green!>ctrl + j</green!> new lines
 <green!>ctrl + s</green!> fuzzy search
@@ -650,7 +648,7 @@ impl ChatSession {
             )?;
         }
 
-        let (context, report) = match err {
+        let (context, report, display_err_message) = match err {
             ChatError::Interrupted { tool_uses: ref inter } => {
                 execute!(self.stderr, style::Print("\n\n"))?;
 
@@ -675,7 +673,7 @@ impl ChatSession {
                     _ => (),
                 }
 
-                ("Tool use was interrupted", Report::from(err))
+                ("Tool use was interrupted", Report::from(err), false)
             },
             ChatError::Client(err) => match *err {
                 // Errors from attempting to send too large of a conversation history. In
@@ -709,9 +707,10 @@ impl ChatSession {
                     (
                         "The context window has overflowed, summarizing the history...",
                         Report::from(err),
+                        true,
                     )
                 },
-                ApiClientError::QuotaBreach { message, .. } => (message, Report::from(err)),
+                ApiClientError::QuotaBreach { message, .. } => (message, Report::from(err), true),
                 ApiClientError::ModelOverloadedError { request_id, .. } => {
                     let err = format!(
                         "The model you've selected is temporarily unavailable. Please use '/model' to select a different model and try again.{}\n\n",
@@ -721,7 +720,7 @@ impl ChatSession {
                         }
                     );
                     self.conversation.append_transcript(err.clone());
-                    ("Amazon Q is having trouble responding right now", eyre!(err))
+                    ("Amazon Q is having trouble responding right now", eyre!(err), true)
                 },
                 ApiClientError::MonthlyLimitReached { .. } => {
                     let subscription_status = get_subscription_status(os).await;
@@ -778,33 +777,44 @@ impl ChatSession {
 
                     return Ok(());
                 },
-                _ => ("Amazon Q is having trouble responding right now", Report::from(err)),
+                _ => (
+                    "Amazon Q is having trouble responding right now",
+                    Report::from(err),
+                    true,
+                ),
             },
-            _ => ("Amazon Q is having trouble responding right now", Report::from(err)),
+            _ => (
+                "Amazon Q is having trouble responding right now",
+                Report::from(err),
+                true,
+            ),
         };
 
-        // Remove non-ASCII and ANSI characters.
-        let re = Regex::new(r"((\x9B|\x1B\[)[0-?]*[ -\/]*[@-~])|([^\x00-\x7F]+)").unwrap();
+        if display_err_message {
+            // Remove non-ASCII and ANSI characters.
+            let re = Regex::new(r"((\x9B|\x1B\[)[0-?]*[ -\/]*[@-~])|([^\x00-\x7F]+)").unwrap();
 
-        queue!(
-            self.stderr,
-            style::SetAttribute(Attribute::Bold),
-            style::SetForegroundColor(Color::Red),
-        )?;
+            queue!(
+                self.stderr,
+                style::SetAttribute(Attribute::Bold),
+                style::SetForegroundColor(Color::Red),
+            )?;
 
-        let text = re.replace_all(&format!("{}: {:?}\n", context, report), "").into_owned();
+            let text = re.replace_all(&format!("{}: {:?}\n", context, report), "").into_owned();
 
-        queue!(self.stderr, style::Print(&text),)?;
-        self.conversation.append_transcript(text);
+            queue!(self.stderr, style::Print(&text),)?;
+            self.conversation.append_transcript(text);
 
-        execute!(
-            self.stderr,
-            style::SetAttribute(Attribute::Reset),
-            style::SetForegroundColor(Color::Reset),
-        )?;
+            execute!(
+                self.stderr,
+                style::SetAttribute(Attribute::Reset),
+                style::SetForegroundColor(Color::Reset),
+            )?;
+        }
 
         self.conversation.enforce_conversation_invariants();
         self.conversation.reset_next_user_message();
+        self.pending_tool_index = None;
 
         self.inner = Some(ChatState::PromptUser {
             skip_printing_tools: false,
diff --git a/crates/chat-cli/src/cli/chat/prompt.rs b/crates/chat-cli/src/cli/chat/prompt.rs
@@ -61,6 +61,8 @@ pub const COMMANDS: &[&str] = &[
     "/profile delete",
     "/profile rename",
     "/profile set",
+    "/prompts",
+    "/context",
     "/context help",
     "/context show",
     "/context show --expand",
@@ -70,13 +72,14 @@ pub const COMMANDS: &[&str] = &[
     "/context rm --global",
     "/context clear",
     "/context clear --global",
-    "/context hooks help",
-    "/context hooks add",
-    "/context hooks rm",
-    "/context hooks enable",
-    "/context hooks disable",
-    "/context hooks enable-all",
-    "/context hooks disable-all",
+    "/hooks",
+    "/hooks help",
+    "/hooks add",
+    "/hooks rm",
+    "/hooks enable",
+    "/hooks disable",
+    "/hooks enable-all",
+    "/hooks disable-all",
     "/compact",
     "/compact help",
     "/usage",
diff --git a/crates/chat-cli/src/cli/mod.rs b/crates/chat-cli/src/cli/mod.rs
@@ -434,7 +434,7 @@ mod test {
     #[test]
     fn test_chat_with_no_interactive_and_resume() {
         assert_parse!(
-            ["chat", "--non-interactive", "--resume"],
+            ["chat", "--no-interactive", "--resume"],
             RootSubcommand::Chat(ChatArgs {
                 resume: true,
                 input: None,

Original file line number	Diff line number	Diff line change
`@@ -716,7 +716,7 @@ impl HooksSubcommand {`
`716`	`716`	`}`
`717`	`717`
`718`	`718`	`/// Prints hook configuration grouped by trigger: conversation session start or per user message`
`719`		`-fn print_hook_section(output: &mut impl Write, hooks: &HashMap<String, Hook>, trigger: HookTrigger) -> Result<()> {`
	`719`	`+pub fn print_hook_section(output: &mut impl Write, hooks: &HashMap<String, Hook>, trigger: HookTrigger) -> Result<()> {`
`720`	`720`	`let section = match trigger {`
`721`	`721`	`HookTrigger::ConversationStart => "On Session Start",`
`722`	`722`	`HookTrigger::PerPrompt => "Per User Message",`
`@@ -754,7 +754,7 @@ fn print_hook_section(output: &mut impl Write, hooks: &HashMap<String, Hook>, tr`
`754`	`754`	`Ok(())`
`755`	`755`	`}`
`756`	`756`
`757`		`-fn map_chat_error(e: ErrReport) -> ChatError {`
	`757`	`+pub fn map_chat_error(e: ErrReport) -> ChatError {`
`758`	`758`	`ChatError::Custom(e.to_string().into())`
`759`	`759`	`}`
`760`	`760`