feat(cortex-tui): centralize MCP management in interactive /mcp panel

- Deprecate /mcp-auth, /mcp-logs, /mcp-tools, /mcp-reload commands (now hidden)
- All MCP commands now redirect to the interactive /mcp panel
- Enhanced MCP selector with global actions: Add Server, View Tools, Reload All
- Selecting a server shows contextual actions (start/stop/restart/auth/logs/remove)
- Removed command usage notifications that instructed users to type commands
- Updated help documentation to reflect the new interactive workflow
- Updated tests to match new behavior

Author: factorydroid

cortex-tui/src/commands/executor.rs

@@ -155,11 +155,12 @@ impl CommandExecutor {
             "tokens" | "max-tokens" => self.cmd_tokens(cmd),
 
             // ============ MCP ============
+            // All MCP commands redirect to the interactive panel
             "mcp" => self.cmd_mcp(cmd),
-            "mcp-tools" | "tools" | "lt" => CommandResult::Async("mcp-tools".to_string()),
-            "mcp-auth" | "auth" => self.cmd_mcp_auth(cmd),
-            "mcp-reload" | "reload" => CommandResult::Async("mcp-reload".to_string()),
-            "mcp-logs" => self.cmd_mcp_logs(cmd),
+            "mcp-tools" | "tools" | "lt" => CommandResult::OpenModal(ModalType::McpManager),
+            "mcp-auth" | "auth" => CommandResult::OpenModal(ModalType::McpManager),
+            "mcp-reload" | "reload" => CommandResult::OpenModal(ModalType::McpManager),
+            "mcp-logs" => CommandResult::OpenModal(ModalType::McpManager),
 
             // ============ DEBUG ============
             "debug" | "dbg" => self.cmd_debug(cmd),
@@ -565,40 +566,19 @@ impl CommandExecutor {
 
     // ========== MCP ==========
 
-    fn cmd_mcp(&self, cmd: &ParsedCommand) -> CommandResult {
-        match cmd.first_arg() {
-            None | Some("list") => CommandResult::OpenModal(ModalType::McpManager),
-            Some("add") => {
-                if let Some(server) = cmd.arg(1) {
-                    CommandResult::Async(format!("mcp:add:{}", server))
-                } else {
-                    CommandResult::OpenModal(ModalType::Form("mcp-add".to_string()))
-                }
-            }
-            Some("remove") => {
-                if let Some(server) = cmd.arg(1) {
-                    CommandResult::Async(format!("mcp:remove:{}", server))
-                } else {
-                    CommandResult::OpenModal(ModalType::Form("mcp-remove".to_string()))
-                }
-            }
-            Some("status") => CommandResult::Async("mcp:status".to_string()),
-            _ => {
-                CommandResult::Message("Usage: /mcp [list|add|remove|status] [server]".to_string())
-            }
-        }
+    fn cmd_mcp(&self, _cmd: &ParsedCommand) -> CommandResult {
+        // Always open the interactive MCP panel - all management is centralized there
+        CommandResult::OpenModal(ModalType::McpManager)
     }
 
-    fn cmd_mcp_auth(&self, cmd: &ParsedCommand) -> CommandResult {
-        match cmd.first_arg() {
-            Some(server) => CommandResult::Async(format!("mcp:auth:{}", server)),
-            None => CommandResult::OpenModal(ModalType::Form("mcp-auth".to_string())),
-        }
+    fn cmd_mcp_auth(&self, _cmd: &ParsedCommand) -> CommandResult {
+        // Deprecated: redirect to interactive MCP panel
+        CommandResult::OpenModal(ModalType::McpManager)
     }
 
-    fn cmd_mcp_logs(&self, cmd: &ParsedCommand) -> CommandResult {
-        let server = cmd.first_arg().unwrap_or("all");
-        CommandResult::Async(format!("mcp:logs:{}", server))
+    fn cmd_mcp_logs(&self, _cmd: &ParsedCommand) -> CommandResult {
+        // Deprecated: redirect to interactive MCP panel
+        CommandResult::OpenModal(ModalType::McpManager)
     }
 
     // ========== DEBUG ==========
@@ -980,22 +960,23 @@ mod tests {
             CommandResult::OpenModal(ModalType::McpManager)
         ));
 
+        // All mcp subcommands now redirect to the interactive panel
         let result = executor.execute_str("/mcp status");
         assert!(matches!(
             result,
-            CommandResult::Async(ref s) if s == "mcp:status"
+            CommandResult::OpenModal(ModalType::McpManager)
         ));
 
         let result = executor.execute_str("/mcp add myserver");
         assert!(matches!(
             result,
-            CommandResult::Async(ref s) if s == "mcp:add:myserver"
+            CommandResult::OpenModal(ModalType::McpManager)
         ));
 
         let result = executor.execute_str("/mcp add");
         assert!(matches!(
             result,
-            CommandResult::OpenModal(ModalType::Form(_))
+            CommandResult::OpenModal(ModalType::McpManager)
         ));
     }
 

cortex-tui/src/commands/registry.rs

@@ -698,43 +698,46 @@ pub fn register_builtin_commands(registry: &mut CommandRegistry) {
     registry.register(CommandDef::new(
         "mcp",
         &[],
-        "MCP server management",
-        "/mcp <list|add|remove|status>",
+        "MCP server management (interactive)",
+        "/mcp",
         CommandCategory::Mcp,
-        true,
+        false,
     ));
 
-    registry.register(CommandDef::new(
+    // NOTE: /mcp-tools, /mcp-auth, /mcp-reload, /mcp-logs are deprecated.
+    // All MCP management is now centralized in the interactive /mcp panel.
+    // These commands are hidden but still work for backwards compatibility.
+    registry.register(CommandDef::hidden(
         "mcp-tools",
         &["tools", "lt"],
-        "List MCP tools",
+        "[Deprecated] Use /mcp instead - List MCP tools",
         "/mcp-tools [server]",
         CommandCategory::Mcp,
         true,
     ));
 
-    registry.register(CommandDef::new(
+    registry.register(CommandDef::hidden(
         "mcp-auth",
         &["auth"],
-        "Authenticate MCP server",
+        "[Deprecated] Use /mcp instead - Authenticate MCP server",
         "/mcp-auth <server>",
         CommandCategory::Mcp,
         true,
     ));
 
-    registry.register(CommandDef::new(
+    registry.register(CommandDef::hidden(
         "mcp-reload",
         &["reload"],
-        "Reload MCP servers",
+        "[Deprecated] Use /mcp instead - Reload MCP servers",
         "/mcp-reload [server]",
         CommandCategory::Mcp,
         true,
     ));
 
-    registry.register(CommandDef::new(
+    registry.register(CommandDef::hidden(
         "mcp-logs",
         &[],
-        "View MCP server logs",
+        "[Deprecated] Use /mcp instead - View MCP server logs",
         "/mcp-logs [server]",
         CommandCategory::Mcp,
         true,

cortex-tui/src/interactive/builders/mcp.rs

@@ -5,47 +5,59 @@ use crate::modal::mcp_manager::{McpServerInfo, McpStatus};
 
 /// Build an interactive state for MCP server management.
 pub fn build_mcp_selector(servers: &[McpServerInfo]) -> InteractiveState {
-    let mut items: Vec<InteractiveItem> = servers
-        .iter()
-        .map(|server| {
-            let (icon, status_text) = match server.status {
-                McpStatus::Running => ('🟢', "running"),
-                McpStatus::Starting => ('🟡', "starting"),
-                McpStatus::Stopped => ('⚫', "stopped"),
-                McpStatus::Error => ('🔴', "error"),
-            };
-
-            let description = format!("{} - {} tools", status_text, server.tool_count);
-
-            let shortcut = server.name.chars().next().and_then(|c| {
-                let c = c.to_ascii_lowercase();
-                Some(c)
-            });
-
-            let mut item = InteractiveItem::new(&server.name, &server.name)
-                .with_icon(icon)
-                .with_description(description);
-
-            if let Some(s) = shortcut {
-                item = item.with_shortcut(s);
-            }
-
-            if server.requires_auth {
-                item = item.with_metadata("requires_auth".to_string());
-            }
-
-            item
-        })
-        .collect();
-
-    // Add "Add new server" option
+    let mut items: Vec<InteractiveItem> = Vec::new();
+
+    // Add global actions first (separated from servers)
     items.push(
-        InteractiveItem::new("__add__", "+ Add MCP Server")
+        InteractiveItem::new("__add__", "Add MCP Server")
             .with_icon('➕')
-            .with_description("Configure a new MCP server")
-            .with_shortcut('+'),
+            .with_description("Configure a new server (stdio, HTTP, or from registry)")
+            .with_shortcut('a'),
+    );
+
+    items.push(
+        InteractiveItem::new("__tools__", "View All Tools")
+            .with_icon('🔧')
+            .with_description("List tools from all running servers")
+            .with_shortcut('t'),
+    );
+
+    items.push(
+        InteractiveItem::new("__reload__", "Reload All Servers")
+            .with_icon('🔄')
+            .with_description("Restart all MCP servers")
+            .with_shortcut('r'),
     );
 
+    // Add separator if there are servers
+    if !servers.is_empty() {
+        items.push(
+            InteractiveItem::new("__sep_servers__", "─── Configured Servers ───").as_separator(),
+        );
+    }
+
+    // Add server entries
+    for server in servers {
+        let (icon, status_text) = match server.status {
+            McpStatus::Running => ('🟢', "running"),
+            McpStatus::Starting => ('🟡', "starting"),
+            McpStatus::Stopped => ('⚫', "stopped"),
+            McpStatus::Error => ('🔴', "error"),
+        };
+
+        let description = format!("{} - {} tools", status_text, server.tool_count);
+
+        let mut item = InteractiveItem::new(&server.name, &server.name)
+            .with_icon(icon)
+            .with_description(description);
+
+        if server.requires_auth {
+            item = item.with_metadata("requires_auth".to_string());
+        }
+
+        items.push(item);
+    }
+
     let title = if servers.is_empty() {
         "MCP Servers".to_string()
     } else {
@@ -57,6 +69,13 @@ pub fn build_mcp_selector(servers: &[McpServerInfo]) -> InteractiveState {
     };
 
     InteractiveState::new(title, items, InteractiveAction::McpServerAction)
+        .with_search()
+        .with_hints(vec![
+            ("↑↓".to_string(), "navigate".to_string()),
+            ("Enter".to_string(), "select".to_string()),
+            ("/".to_string(), "search".to_string()),
+            ("Esc".to_string(), "close".to_string()),
+        ])
 }
 
 /// Build an interactive state for MCP server actions (for a specific server).
@@ -130,9 +149,11 @@ mod tests {
     #[test]
     fn test_build_mcp_selector_empty() {
         let state = build_mcp_selector(&[]);
-        // Should have "Add new server" option
-        assert_eq!(state.items.len(), 1);
+        // Should have global actions: Add, Tools, Reload (no separator when empty)
+        assert_eq!(state.items.len(), 3);
         assert_eq!(state.items[0].id, "__add__");
+        assert_eq!(state.items[1].id, "__tools__");
+        assert_eq!(state.items[2].id, "__reload__");
     }
 
     #[test]
@@ -142,8 +163,8 @@ mod tests {
             create_test_server("test2", McpStatus::Stopped),
         ];
         let state = build_mcp_selector(&servers);
-        // 2 servers + 1 add option
-        assert_eq!(state.items.len(), 3);
+        // 3 global actions + 1 separator + 2 servers = 6 items
+        assert_eq!(state.items.len(), 6);
     }
 
     #[test]