feat: remove default profile server name and use profile name directly

Author: JoJoJoJoJoJoJo

src/mcpm/clients/base.py

@@ -14,7 +14,6 @@
 from ruamel.yaml import YAML
 
 from mcpm.core.schema import ServerConfig, STDIOServerConfig
-from mcpm.utils.config import ROUTER_SERVER_NAME
 from mcpm.utils.router_server import format_server_url
 
 logger = logging.getLogger(__name__)
@@ -151,43 +150,42 @@ def activate_profile(self, profile_name: str, router_config: Dict[str, Any], ali
         pass
 
     @abc.abstractmethod
-    def deactivate_profile(self) -> bool:
+    def deactivate_profile(self, profile_name: str) -> bool:
         """
         Deactivate a profile in the client config
 
+        Args:
+            profile_name: Name of the profile
+
         Returns:
             bool: Success or failure
         """
         pass
 
-    def get_associated_profile(self) -> Optional[str]:
+    def get_associated_profiles(self) -> List[str]:
         """
         Get the associated profile for this client
 
         Returns:
-            Optional[str]: Name of the associated profile, or None if no profile is associated
+            List[str]: List of associated profile names
         """
-        router_service = self.get_server(ROUTER_SERVER_NAME)
-        if not router_service:
-            # No associated profile
-            return None
-
-        # Extract profile name from router service
-        if isinstance(router_service, STDIOServerConfig):
-            if hasattr(router_service, "args") and "--headers" in router_service.args:
-                try:
-                    idx = router_service.args.index("profile")
-                    if idx < len(router_service.args) - 1:
-                        return router_service.args[idx + 1]
-                except ValueError:
-                    pass
-        else:
-            if hasattr(router_service, "url") and "profile=" in router_service.url:
-                matched = re.search(r"profile=([^&]+)", router_service.url)
-                if matched:
-                    return matched.group(1)
+        profiles = []
+        for server_name, server_config in self.get_servers().items():
+            if isinstance(server_config, STDIOServerConfig):
+                if hasattr(server_config, "args") and "--headers" in server_config.args:
+                    try:
+                        idx = server_config.args.index("profile")
+                        if idx < len(server_config.args) - 1:
+                            profiles.append(server_config.args[idx + 1])
+                    except ValueError:
+                        pass
+            else:
+                if hasattr(server_config, "url") and "profile=" in server_config.url:
+                    matched = re.search(r"profile=([^&]+)", server_config.url)
+                    if matched:
+                        profiles.append(matched.group(1))
 
-        return None
+        return profiles
 
 
 class JSONClientManager(BaseClientManager):
@@ -428,13 +426,16 @@ def activate_profile(self, profile_name: str, router_config: Dict[str, Any], ali
     def _format_router_server(self, profile_name, base_url, alias_name: str | None = None) -> ServerConfig:
         return format_server_url(self.client_key, profile_name, base_url, alias_name)
 
-    def deactivate_profile(self) -> bool:
+    def deactivate_profile(self, profile_name: str) -> bool:
         """Deactivate a profile in the client config
 
+        Args:
+            profile_name: Name of the profile
+
         Returns:
             bool: Success or failure
         """
-        return self.remove_server(ROUTER_SERVER_NAME)
+        return self.remove_server(profile_name)
 
 
 class YAMLClientManager(BaseClientManager):
@@ -695,10 +696,13 @@ def activate_profile(self, profile_name: str, router_config: Dict[str, Any], ali
     def _format_router_server(self, profile_name, base_url, server_name: str | None = None) -> ServerConfig:
         return format_server_url(self.client_key, profile_name, base_url, server_name)
 
-    def deactivate_profile(self) -> bool:
+    def deactivate_profile(self, profile_name: str) -> bool:
         """Deactivate a profile in the client config
 
+        Args:
+            profile_name: Name of the profile
+
         Returns:
             bool: Success or failure
         """
-        return self.remove_server(ROUTER_SERVER_NAME)
+        return self.remove_server(profile_name)

src/mcpm/commands/client.py

@@ -45,7 +45,6 @@ def list_clients():
     table.add_column("Client Name", style="cyan")
     table.add_column("Installation", style="yellow")
     table.add_column("Status", style="green")
-    table.add_column("Profile", style="magenta")
 
     active_client = ClientRegistry.get_active_client()
     installed_clients = ClientRegistry.detect_installed_clients()
@@ -61,12 +60,8 @@ def list_clients():
         # Get client info for more details
         client_info = ClientRegistry.get_client_info(client)
         display_name = client_info.get("name", client)
-        # Get Profile activated
-        client_manager = ClientRegistry.get_client_manager(client)
-        profile = client_manager.get_associated_profile() if client_manager else None
-        active_profile = f"[bold magenta]{profile}[/]" if profile else ""
 
-        table.add_row(f"{display_name} ({client})", install_status, active_status, active_profile)
+        table.add_row(f"{display_name} ({client})", install_status, active_status)
 
     console.print(table)
 

src/mcpm/commands/profile.py

@@ -81,10 +81,10 @@ def remove(profile_name):
     for client in clients:
         client_manager = ClientRegistry.get_client_manager(client)
         if client_manager:
-            profile_this_client_associated = client_manager.get_associated_profile()
-            if profile_this_client_associated == profile_name:
+            profile_server = client_manager.get_server(profile_name)
+            if profile_server:
                 # Deactivate the profile in this client
-                client_manager.deactivate_profile()
+                client_manager.deactivate_profile(profile_name)
                 console.print(f"\n[green]Profile '{profile_name}' removed successfully from client '{client}'.[/]\n")
 
     # fresh the active_profile
@@ -113,10 +113,10 @@ def rename(profile_name):
     for client in clients:
         client_manager = ClientRegistry.get_client_manager(client)
         if client_manager:
-            profile_this_client_associated = client_manager.get_associated_profile()
-            if profile_this_client_associated == profile_name:
+            profile_server = client_manager.get_server(profile_name)
+            if profile_server:
                 # fresh the config
-                client_manager.deactivate_profile()
+                client_manager.deactivate_profile(profile_name)
                 client_manager.activate_profile(new_profile_name, config_manager.get_router_config())
                 console.print(f"\n[green]Profile '{profile_name}' replaced successfully in client '{client}'.[/]\n")
 

src/mcpm/commands/router.py

@@ -17,7 +17,7 @@
 
 from mcpm.clients.client_registry import ClientRegistry
 from mcpm.router.share import Tunnel
-from mcpm.utils.config import ROUTER_SERVER_NAME, ConfigManager
+from mcpm.utils.config import ConfigManager
 from mcpm.utils.platform import get_log_directory, get_pid_directory
 
 logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
@@ -292,9 +292,9 @@ def set_router_config(host, port, address, auth, secret: str | None = None):
             if client_manager is None:
                 console.print(f"[yellow]Client '{client}' not found.[/] Skipping...")
                 continue
-            if client_manager.get_server(ROUTER_SERVER_NAME):
+            if client_manager.get_server(active_profile):
                 console.print(f"[cyan]Updating profile router for {client}...[/]")
-                client_manager.deactivate_profile()
+                client_manager.deactivate_profile(active_profile)
                 client_manager.activate_profile(active_profile, config_manager.get_router_config())
                 console.print(f"[green]Profile router updated for {client}[/]")
         console.print("[bold green]Success: Profile router updated for all clients[/]")

src/mcpm/commands/target_operations/add.py

@@ -144,7 +144,7 @@ def add(server_name, force=False, alias=None, target: str | None = None):
     else:
         client = scope
         if is_adding_profile:
-            add_profile_to_client(server_name, client, alias, force)
+            add_profile_to_client(server_name.lstrip(PROFILE_PREFIX), client, alias, force)
             return
         # Get client
         console.print(f"[yellow]Adding server to client: {client}[/]")

src/mcpm/utils/config.py

@@ -15,7 +15,6 @@
 # default router config
 DEFAULT_HOST = "localhost"
 DEFAULT_PORT = 6276  # 6276 represents MCPM on a T9 keypad (6=M, 2=C, 7=P, 6=M)
-ROUTER_SERVER_NAME = "mcpm_router"
 # default splitor pattern
 TOOL_SPLITOR = "_t_"
 RESOURCE_SPLITOR = ":"

src/mcpm/utils/router_server.py

@@ -1,10 +1,9 @@
-from mcpm.clients.base import ROUTER_SERVER_NAME
 from mcpm.core.schema import ServerConfig, SSEServerConfig, STDIOServerConfig
 
 
 def format_server_url(client: str, profile: str, router_url: str, server_name: str | None = None) -> ServerConfig:
     return SSEServerConfig(
-        name=server_name if server_name else ROUTER_SERVER_NAME,
+        name=server_name if server_name else profile,
         url=f"{router_url}?/client={client}&profile={profile}",
     )
 
@@ -13,7 +12,7 @@ def format_server_url_with_proxy_param(
     client: str, profile: str, router_url: str, server_name: str | None = None
 ) -> ServerConfig:
     result = STDIOServerConfig(
-        name=server_name if server_name else ROUTER_SERVER_NAME,
+        name=server_name if server_name else profile,
         command="uvx",
         args=["mcp-proxy", f"{router_url}?/client={client}&profile={profile}"],
     )
@@ -24,7 +23,7 @@ def format_server_url_with_proxy_headers(
     client: str, profile: str, router_url: str, server_name: str | None = None
 ) -> ServerConfig:
     result = STDIOServerConfig(
-        name=server_name if server_name else ROUTER_SERVER_NAME,
+        name=server_name if server_name else profile,
         command="uvx",
         args=["mcp-proxy", router_url, "--headers", "profile", profile],
     )

tests/test_add.py

@@ -222,4 +222,7 @@ def test_add_profile_to_client(windsurf_manager, monkeypatch):
     runner = CliRunner()
     result = runner.invoke(add, ["%" + profile_name, "--force", "--alias", "work"])
     assert result.exit_code == 0
-    assert "Successfully added profile %work to windsurf!" in result.output
+    assert "Successfully added profile work to windsurf!" in result.output
+
+    profile_server = windsurf_manager.get_server("work")
+    assert profile_server is not None