Improve client command

Author: niechen

src/mcpm/cli.py

@@ -36,6 +36,22 @@ def main(ctx, help_flag):
     
     A tool for managing MCP servers across various clients.
     """
+    # Check if a command is being executed (and it's not help, no command, or the client command)
+    if ctx.invoked_subcommand and ctx.invoked_subcommand != 'client' and not help_flag:
+        # Check if active client is set
+        active_client = config_manager.get_active_client()
+        if not active_client:
+            console.print("[bold red]Error:[/] No active client set.")
+            console.print("Please run 'mcpm client <client-name>' to set an active client.")
+            console.print("Available clients:")
+            
+            # Show available clients
+            from mcpm.utils.client_registry import ClientRegistry
+            for client in ClientRegistry.get_supported_clients():
+                console.print(f"  - {client}")
+            
+            # Exit with error
+            ctx.exit(1)
     # If no command was invoked or help is requested, show our custom help
     if ctx.invoked_subcommand is None or help_flag:
 
@@ -77,15 +93,11 @@ def main(ctx, help_flag):
         installed_clients = ClientRegistry.detect_installed_clients()
 
         # Display active client information and main help
-        client_status = "[green]✓[/]" if installed_clients.get(active_client, False) else "[yellow]⚠[/]"
-        console.print(f"[bold magenta]Active client:[/] [yellow]{active_client}[/] {client_status}")
-        
-        # Display all supported clients with their installation status
-        console.print("[bold]Supported clients:[/]")
-        for client, installed in installed_clients.items():
-            status = "[green]Installed[/]" if installed else "[gray]Not installed[/]"
-            active_marker = "[bold cyan]➤[/] " if client == active_client else "  "
-            console.print(f"{active_marker}{client}: {status}")
+        if active_client:
+            client_status = "[green]✓[/]" if installed_clients.get(active_client, False) else "[yellow]⚠[/]"
+            console.print(f"[bold magenta]Active client:[/] [yellow]{active_client}[/] {client_status}")
+        else:
+            console.print("[bold red]No active client set![/] Please run 'mcpm client <client-name>' to set one.")
         console.print("")
 
         # Display usage info

src/mcpm/commands/client.py

@@ -34,15 +34,37 @@ def client(client_name, list):
     if list:
         table = Table(title="Supported MCP Clients")
         table.add_column("Client Name", style="cyan")
+        table.add_column("Installation", style="yellow")
         table.add_column("Status", style="green")
 
         active_client = ClientRegistry.get_active_client()
+        installed_clients = ClientRegistry.detect_installed_clients()
 
         for client in sorted(supported_clients):
-            status = "[bold green]ACTIVE[/]" if client == active_client else ""
-            table.add_row(client, status)
+            # Determine installation status
+            installed = installed_clients.get(client, False)
+            install_status = "[green]Installed[/]" if installed else "[gray]Not installed[/]"
+            
+            # Determine active status
+            active_status = "[bold green]ACTIVE[/]" if client == active_client else ""
+            
+            # Get client info for more details
+            client_info = ClientRegistry.get_client_info(client)
+            display_name = client_info.get("name", client)
+            
+            table.add_row(f"{display_name} ({client})", install_status, active_status)
 
         console.print(table)
+        
+        # Add helpful instructions for non-installed clients
+        non_installed = [c for c, installed in installed_clients.items() if not installed]
+        if non_installed:
+            console.print("\n[italic]To use a non-installed client, you need to install it first.[/]")
+            for client in non_installed:
+                info = ClientRegistry.get_client_info(client)
+                if "download_url" in info:
+                    console.print(f"[yellow]{info.get('name', client)}[/]: {info['download_url']}")
+        
         return
 
     # If no client name specified, show the current active client

src/mcpm/utils/client_registry.py

@@ -129,6 +129,9 @@ def get_active_client_manager(cls) -> Optional[BaseClientManager]:
             BaseClientManager: Client manager instance for the active client, or None if not found
         """
         active_client = cls.get_active_client()
+        if not active_client:
+            return None
+            
         return cls.get_client_manager(active_client)
 
     @classmethod
@@ -146,8 +149,8 @@ def get_recommended_client(cls) -> str:
             if installed:
                 return client
 
-        # Default to claude-desktop if nothing is installed
-        return "claude-desktop"
+        # Return None if no clients are installed
+        return None
 
     @classmethod
     def get_supported_clients(cls) -> List[str]:

src/mcpm/utils/config.py

@@ -5,14 +5,14 @@
 import os
 import json
 import logging
-from typing import Dict, List, Any
+from typing import Dict, List, Any, Optional
 
 # Client detection will be handled by ClientRegistry
 
 logger = logging.getLogger(__name__)
 
 # Default configuration paths
-DEFAULT_CONFIG_DIR = os.path.expanduser("~/.config/mcp")
+DEFAULT_CONFIG_DIR = os.path.expanduser("~/.config/mcpm")
 DEFAULT_CONFIG_FILE = os.path.join(DEFAULT_CONFIG_DIR, "config.json")
 
 class ConfigManager:
@@ -48,28 +48,9 @@ def _load_config(self) -> None:
 
     def _default_config(self) -> Dict[str, Any]:
         """Create default configuration"""
-        # We'll import here to avoid circular imports
-        from mcpm.utils.client_registry import ClientRegistry
-        
-        # Get recommended client from registry
-        recommended_client = ClientRegistry.get_recommended_client()
-        installed_clients = ClientRegistry.detect_installed_clients()
-        
-        return {
-            "version": "0.2.0",
-            "active_client": recommended_client,
-            "clients": {
-                "claude-desktop": {
-                    "installed": installed_clients.get("claude-desktop", False)
-                },
-                "cursor": {
-                    "installed": installed_clients.get("cursor", False)
-                },
-                "windsurf": {
-                    "installed": installed_clients.get("windsurf", False)
-                }
-            }
-        }
+        # Return empty config - don't set any defaults
+        # User will be prompted to set a client when needed
+        return {}
 
     def _save_config(self) -> None:
         """Save current configuration to file"""
@@ -98,12 +79,23 @@ def _get_client_manager(self, client_name: str):
 
 
     def get_active_client(self) -> str:
-        """Get the name of the currently active client"""
-        return self._config.get("active_client", "claude-desktop")
+        """Get the name of the currently active client or None if not set"""
+        return self._config.get("active_client")
 
-    def set_active_client(self, client_name: str) -> bool:
+    def set_active_client(self, client_name: Optional[str]) -> bool:
         """Set the active client"""
-        if client_name not in self._config.get("clients", {}):
+        # Allow setting to None to clear the active client
+        if client_name is None:
+            if "active_client" in self._config:
+                del self._config["active_client"]
+                self._save_config()
+            return True
+            
+        # Get supported clients
+        from mcpm.utils.client_registry import ClientRegistry
+        supported_clients = ClientRegistry.get_supported_clients()
+        
+        if client_name not in supported_clients:
             logger.error(f"Unknown client: {client_name}")
             return False