UX Fix for hard to distinguish between user and assistant responses (#130)

Author: akashanand98

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

@@ -1369,10 +1369,9 @@ impl ChatContext {
                 self.send_tool_use_telemetry(telemetry).await;
 
                 if self.interactive {
-                    queue!(self.output, style::SetForegroundColor(Color::Magenta))?;
-                    queue!(self.output, style::SetForegroundColor(Color::Reset))?;
+                    // Print newlines before starting the assistant response
+                    execute!(self.output, style::Print("\n\n"))?;
                     queue!(self.output, cursor::Hide)?;
-                    execute!(self.output, style::Print("\n"))?;
                     self.spinner = Some(Spinner::new(Spinners::Dots, "Thinking...".to_owned()));
                 }
 
@@ -3207,6 +3206,18 @@ impl ChatContext {
             )?;
         }
 
+        // Add assistant indicator at the beginning of the response
+        if self.interactive {
+            queue!(
+                self.output,
+                style::SetForegroundColor(Color::Yellow),
+                style::SetAttribute(Attribute::Bold),
+                style::Print("Amazon Q > "),
+                style::SetAttribute(Attribute::Reset),
+                style::SetForegroundColor(Color::Reset),
+            )?;
+        }
+
         loop {
             match parser.recv().await {
                 Ok(msg_event) => {

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

@@ -87,7 +87,7 @@ pub fn generate_prompt(current_profile: Option<&str>, warning: bool) -> String {
         .map(|p| format!("[{p}] ").cyan().to_string())
         .unwrap_or_default();
 
-    format!("{profile_part}{warning_symbol}{}", "> ".magenta())
+    format!("{profile_part}{warning_symbol}{}", "> ".cyan().bold())
 }
 
 /// Complete commands that start with a slash
@@ -310,20 +310,23 @@ mod tests {
     #[test]
     fn test_generate_prompt() {
         // Test default prompt (no profile)
-        assert_eq!(generate_prompt(None, false), "> ".magenta().to_string());
+        assert_eq!(generate_prompt(None, false), "> ".cyan().bold().to_string());
         // Test default prompt with warning
-        assert_eq!(generate_prompt(None, true), format!("{}{}", "!".red(), "> ".magenta()));
+        assert_eq!(
+            generate_prompt(None, true),
+            format!("{}{}", "!".red(), "> ".cyan().bold())
+        );
         // Test default profile (should be same as no profile)
-        assert_eq!(generate_prompt(Some("default"), false), "> ".magenta().to_string());
+        assert_eq!(generate_prompt(Some("default"), false), "> ".cyan().bold().to_string());
         // Test custom profile
         assert_eq!(
             generate_prompt(Some("test-profile"), false),
-            format!("{}{}", "[test-profile] ".cyan(), "> ".magenta())
+            format!("{}{}", "[test-profile] ".cyan(), "> ".cyan().bold())
         );
         // Test another custom profile with warning
         assert_eq!(
             generate_prompt(Some("dev"), true),
-            format!("{}{}{}", "[dev] ".cyan(), "!".red(), "> ".magenta())
+            format!("{}{}{}", "[dev] ".cyan(), "!".red(), "> ".cyan().bold())
         );
     }