Fix command refactor bugs and improve user experience (#310)

* add extra help

* fix /mcp & hooks

* revise help

* Update crates/chat-cli/src/cli/chat/cli/hooks.rs

Co-authored-by: Chay Nabors <[email protected]>

* handle img

* delete /help check

---------

Co-authored-by: Chay Nabors <[email protected]>

Author: evanliu048

crates/chat-cli/src/cli/chat/cli/hooks.rs

@@ -461,7 +461,7 @@ impl HooksArgs {
             session.stderr,
             style::Print(format!(
                 "\nUse {} to manage hooks.\n\n",
-                "/context hooks help".to_string().dark_green()
+                "/hooks help".to_string().dark_green()
             )),
         )?;
 
@@ -671,19 +671,12 @@ impl HooksSubcommand {
                     style::SetAttribute(Attribute::Reset),
                 )?;
 
-                queue!(
-                    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,
@@ -700,12 +693,6 @@ impl HooksSubcommand {
                     style::SetAttribute(Attribute::Reset),
                 )?;
 
-                queue!(
-                    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,

crates/chat-cli/src/cli/chat/cli/mod.rs

@@ -33,13 +33,14 @@ use crate::cli::chat::{
     ChatError,
     ChatSession,
     ChatState,
+    EXTRA_HELP,
 };
 use crate::cli::issue;
 use crate::os::Os;
 
 /// q (Amazon Q Chat)
 #[derive(Debug, PartialEq, Parser)]
-#[command(color = clap::ColorChoice::Always)]
+#[command(color = clap::ColorChoice::Always, after_long_help = EXTRA_HELP)]
 pub enum SlashCommand {
     /// Quit the application
     #[command(aliases = ["q", "exit"])]
@@ -49,7 +50,7 @@ pub enum SlashCommand {
     /// Manage profiles
     #[command(subcommand)]
     Profile(ProfileSubcommand),
-    /// Manage context files and hooks for the chat session
+    /// Manage context files for the chat session
     #[command(subcommand)]
     Context(ContextSubcommand),
     /// Manage knowledge base for persistent context storage
@@ -62,7 +63,7 @@ pub enum SlashCommand {
     Compact(CompactArgs),
     /// View and manage tools and permissions
     Tools(ToolsArgs),
-    /// Create a new Github issue
+    /// Create a new Github issue or make a feature request
     Issue(issue::IssueArgs),
     /// View and retrieve prompts
     Prompts(PromptsArgs),

crates/chat-cli/src/cli/chat/mod.rs

@@ -6,6 +6,7 @@ mod error_formatter;
 mod input_source;
 mod message;
 mod parse;
+use std::path::MAIN_SEPARATOR;
 mod parser;
 mod prompt;
 mod prompt_parser;
@@ -137,6 +138,18 @@ const LIMIT_REACHED_TEXT: &str = color_print::cstr! { "You've used all your free
 1. Upgrade to a paid subscription for increased limits. See our Pricing page for what's included> <blue!>https://aws.amazon.com/q/developer/pricing/</blue!>
 2. Wait until next month when your limit automatically resets." };
 
+pub const EXTRA_HELP: &str = color_print::cstr! {"
+<cyan,em>MCP:</cyan,em>
+<black!>You can now configure the Amazon Q CLI to use MCP servers. \nLearn how: https://docs.aws.amazon.com/en_us/amazonq/latest/qdeveloper-ug/command-line-mcp.html</black!>
+
+<cyan,em>Tips:</cyan,em>
+<em>!{command}</em>            <black!>Quickly execute a command in your current session</black!>
+<em>Ctrl(^) + j</em>           <black!>Insert new-line to provide multi-line prompt. Alternatively, [Alt(⌥) + Enter(⏎)]</black!>
+<em>Ctrl(^) + s</em>           <black!>Fuzzy search commands and context files. Use Tab to select multiple items.</black!>
+                      <black!>Change the keybind to ctrl+x with: q settings chat.skimCommandKey x (where x is any key)</black!>
+<em>chat.editMode</em>         <black!>Set editing mode (vim or emacs) using: q settings chat.editMode vi/emacs</black!>
+"};
+
 #[derive(Debug, Clone, PartialEq, Eq, Default, Args)]
 pub struct ChatArgs {
     /// Resumes the previous conversation from this directory.
@@ -1210,6 +1223,22 @@ impl ChatSession {
         queue!(self.stderr, style::Print('\n'))?;
 
         let input = user_input.trim();
+
+        // handle image path
+        if input.starts_with('/') {
+            if let Some(after_slash) = input.strip_prefix('/') {
+                let looks_like_path = after_slash.contains(MAIN_SEPARATOR)
+                    || after_slash.contains('/')
+                    || after_slash.contains('\\')
+                    || after_slash.contains('.');
+
+                if looks_like_path {
+                    return Ok(ChatState::HandleInput {
+                        input: after_slash.to_string(),
+                    });
+                }
+            }
+        }
         if let Some(mut args) = input.strip_prefix("/").and_then(shlex::split) {
             args.insert(0, "q".to_owned());
             match SlashCommand::try_parse_from(args) {
@@ -1230,7 +1259,7 @@ impl ChatSession {
                     writeln!(self.stderr)?;
                 },
                 Err(err) => {
-                    writeln!(self.stderr, "{}", err)?;
+                    writeln!(self.stderr, "{}", err.render().ansi())?;
                 },
             }
 

crates/chat-cli/src/cli/chat/prompt.rs

@@ -52,6 +52,7 @@ pub const COMMANDS: &[&str] = &[
     "/tools untrust",
     "/tools trustall",
     "/tools reset",
+    "/mcp",
     "/model",
     "/profile",
     "/profile help",