diff --git a/tycode-core/src/chat/commands.rs b/tycode-core/src/chat/commands.rs
index 3d51770..2a021df 100644
--- a/tycode-core/src/chat/commands.rs
+++ b/tycode-core/src/chat/commands.rs
@@ -302,8 +302,8 @@ pub fn get_available_commands() -> Vec<CommandInfo> {
         },
         CommandInfo {
             name: "agent".to_string(),
-            description: "Switch the current agent".to_string(),
-            usage: "/agent <name>".to_string(),
+            description: "Show or switch the current agent".to_string(),
+            usage: "/agent [name]".to_string(),
             hidden: false,
         },
         CommandInfo {
@@ -786,10 +786,13 @@ fn create_message(content: String, sender: MessageSender) -> ChatMessage {
 
 async fn handle_agent_command(state: &mut ActorState, parts: &[&str]) -> Vec<ChatMessage> {
     if parts.len() < 2 {
+        let current = current_agent(state).agent.name();
+        let available = state.agent_catalog.get_agent_names().join(", ");
         return vec![create_message(
             format!(
-                "Usage: /agent <name>. Valid agents: {}",
-                state.agent_catalog.get_agent_names().join(", ")
+                "Current agent: {}\nAvailable agents: {}\n\nUsage: /agent <name>",
+                current,
+                available
             ),
             MessageSender::System,
         )];
diff --git a/tycode-core/src/settings/config.rs b/tycode-core/src/settings/config.rs
index c543ef8..23e73b1 100644
--- a/tycode-core/src/settings/config.rs
+++ b/tycode-core/src/settings/config.rs
@@ -314,7 +314,7 @@ fn default_claude_command() -> String {
 }
 
 fn default_agent_name() -> String {
-    "one_shot".to_string()
+    "coordinator".to_string()
 }
 
 fn default_auto_context_bytes() -> usize {