chore: Fixed ToolUse UX for MCP Tools

Author: kennvene-aws

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

@@ -3471,15 +3471,6 @@ impl ChatSession {
                 parent_message_id: None,
             };
             self.stdout.send(Event::ToolCallStart(tool_call_start))?;
-        } else if let Tool::Custom(ref tool) = tool_use.tool {
-            queue!(
-                self.stdout,
-                StyledText::reset(),
-                style::Print(" from mcp server "),
-                StyledText::emphasis_fg(),
-                style::Print(&tool.server_name),
-                StyledText::reset(),
-            )?;
         }
 
         tool_use

crates/chat-cli/src/cli/chat/tools/custom_tool.rs

@@ -150,7 +150,7 @@ impl CustomTool {
         queue!(
             output,
             style::Print("Running "),
-            StyledText::success_fg(),
+            StyledText::brand_fg(),
             style::Print(&self.name),
             StyledText::reset(),
         )?;

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

@@ -214,14 +214,27 @@ impl Tool {
                 queue,
                 style,
             };
-            queue!(
-                output,
-                StyledText::secondary_fg(),
-                style::Print(" (using tool: "),
-                style::Print(self.display_name()),
-                style::Print(")"),
-                StyledText::reset(),
-            )?;
+            if let Tool::Custom(tool) = self {
+                queue!(
+                    output,
+                    StyledText::secondary_fg(),
+                    style::Print(" (from mcp server: "),
+                    style::Print(&tool.server_name),
+                    style::Print(", using tool: "),
+                    style::Print(self.display_name()),
+                    style::Print(")"),
+                    StyledText::reset(),
+                )?;
+            } else {
+                queue!(
+                    output,
+                    StyledText::secondary_fg(),
+                    style::Print(" (using tool: "),
+                    style::Print(self.display_name()),
+                    style::Print(")"),
+                    StyledText::reset(),
+                )?;
+            }
         };
 
         Ok(())