feat(core): Modernize Dependency Management with Auto-UVX

.gitignore

@@ -81,3 +81,4 @@ local/
 
 # node
 node_modules/
+.pre-commit-config.yaml

mcp-registry/servers/firecrawl.json

@@ -4,11 +4,11 @@
   "description": "Advanced web scraping with JavaScript rendering, PDF support, and smart rate limiting",
   "repository": {
     "type": "git",
-    "url": "https://github.com/mendableai/firecrawl-mcp-server"
+    "url": "https://github.com/firecrawl/firecrawl-mcp-server"
   },
-  "homepage": "https://github.com/mendableai/firecrawl-mcp-server",
+  "homepage": "https://github.com/firecrawl/firecrawl-mcp-server",
   "author": {
-    "name": "mendableai"
+    "name": "firecrawl"
   },
   "license": "MIT",
   "categories": [

src/mcpm/cli.py

@@ -3,6 +3,8 @@
 """
 
 # Import rich-click configuration before anything else
+import os
+from pathlib import Path
 from typing import Any, Dict
 
 from rich.console import Console
@@ -30,10 +32,8 @@
 from mcpm.commands.share import share
 from mcpm.utils.logging_config import setup_logging
 from mcpm.utils.rich_click_config import click, get_header_text
-import os
-from pathlib import Path
 
-console = Console()          # stdout for regular CLI output
+console = Console()  # stdout for regular CLI output
 err_console = Console(stderr=True)  # stderr for errors/tracebacks
 client_config_manager = ClientConfigManager()
 
@@ -97,8 +97,7 @@ def main(ctx, version, help_flag):
         # like some Electron apps that don't set a valid cwd.
         home_dir = str(Path.home())
         err_console.print(
-            f"Current working directory is invalid. Changing to home directory: {home_dir}",
-            style="bold yellow"
+            f"Current working directory is invalid. Changing to home directory: {home_dir}", style="bold yellow"
         )
         os.chdir(home_dir)
 

src/mcpm/clients/client_config.py

@@ -22,6 +22,19 @@ def _refresh_config(self):
         """Refresh the local config cache from the config manager"""
         self._config = self.config_manager.get_config()
 
+    def get_client_path(self, client_name: str) -> str | None:
+        """Get the stored configuration path for a client"""
+        self._refresh_config()
+        client_paths = self._config.get("client_paths", {})
+        return client_paths.get(client_name)
+
+    def set_client_path(self, client_name: str, path: str) -> bool:
+        """Set and persist a custom configuration path for a client"""
+        self._refresh_config()
+        client_paths = self._config.get("client_paths", {})
+        client_paths[client_name] = path
+        return self.config_manager.set_config("client_paths", client_paths)
+
     def get_supported_clients(self) -> List[str]:
         """Get a list of supported client names"""
         # Import here to avoid circular imports

src/mcpm/clients/client_registry.py

@@ -68,6 +68,12 @@ def get_client_manager(
         Returns:
             BaseClientManager: Client manager instance or None if not found
         """
+        # Check if there's a stored custom path if no override provided
+        if not config_path_override:
+            stored_path = cls._client_config_manager.get_client_path(client_name)
+            if stored_path:
+                config_path_override = stored_path
+
         manager_class = cls._CLIENT_MANAGERS.get(client_name)
         if manager_class:
             return manager_class(config_path_override=config_path_override)

src/mcpm/commands/client.py

@@ -39,6 +39,7 @@ def client():
 
     \b
         mcpm client ls                    # List all supported MCP clients and their status
+        mcpm client config cursor --set-path /path/to/settings.json  # Set custom config path
         mcpm client edit cursor           # Interactive server selection for Cursor
         mcpm client edit claude-desktop   # Interactive server selection for Claude Desktop
         mcpm client edit cursor -e        # Open Cursor config in external editor
@@ -47,6 +48,43 @@ def client():
     pass
 
 
+@client.command(name="config", context_settings=dict(help_option_names=["-h", "--help"]))
+@click.argument("client_name")
+@click.option("--set-path", help="Set a custom configuration file path for the client")
+@click.option("--get-path", is_flag=True, help="Get the currently stored configuration path")
+@click.option("--clear-path", is_flag=True, help="Clear the stored custom configuration path")
+def config_client(client_name, set_path, get_path, clear_path):
+    """Configure client settings (e.g., custom config paths)."""
+    if not any([set_path, get_path, clear_path]):
+        console.print("[yellow]No action specified. Use --set-path, --get-path, or --clear-path.[/]")
+        return
+
+    # Check if client is supported
+    supported_clients = ClientRegistry.get_supported_clients()
+    if client_name not in supported_clients:
+        console.print(f"[red]Error: Client '{client_name}' is not supported.[/]")
+        return
+
+    if set_path:
+        if client_config_manager.set_client_path(client_name, set_path):
+            console.print(f"[green]Successfully set custom config path for {client_name}:[/] {set_path}")
+        else:
+            console.print(f"[red]Failed to set config path for {client_name}[/]")
+
+    if clear_path:
+        if client_config_manager.set_client_path(client_name, None):
+            console.print(f"[green]Successfully cleared custom config path for {client_name}[/]")
+        else:
+            console.print(f"[red]Failed to clear config path for {client_name}[/]")
+
+    if get_path or set_path or clear_path:  # Always show current path after modification or if requested
+        current_path = client_config_manager.get_client_path(client_name)
+        if current_path:
+            console.print(f"[bold]Current stored path for {client_name}:[/] {current_path}")
+        else:
+            console.print(f"[dim]No custom path stored for {client_name} (using default)[/]")
+
+
 @client.command(name="ls", context_settings=dict(help_option_names=["-h", "--help"]))
 @click.option("--verbose", "-v", is_flag=True, help="Show detailed server information")
 def list_clients(verbose):
@@ -226,7 +264,18 @@ def list_clients(verbose):
 @click.option("--remove-profile", help="Comma-separated list of profile names to remove")
 @click.option("--set-profiles", help="Comma-separated list of profile names to set (replaces all)")
 @click.option("--force", is_flag=True, help="Skip confirmation prompts")
-def edit_client(client_name, external, config_path_override, add_server, remove_server, set_servers, add_profile, remove_profile, set_profiles, force):
+def edit_client(
+    client_name,
+    external,
+    config_path_override,
+    add_server,
+    remove_server,
+    set_servers,
+    add_profile,
+    remove_profile,
+    set_profiles,
+    force,
+):
     """Enable/disable MCPM-managed servers in the specified client configuration.
 
     Interactive by default, or use CLI parameters for automation.
@@ -1178,6 +1227,7 @@ def _edit_client_non_interactive(
             return 1
 
         from mcpm.profile.profile_config import ProfileConfigManager
+
         profile_manager = ProfileConfigManager()
         available_profiles = profile_manager.list_profiles()
 
@@ -1261,7 +1311,9 @@ def _edit_client_non_interactive(
 
         # Show profile changes
         if final_profiles != set(current_profiles):
-            console.print(f"Profiles: [dim]{len(current_profiles)} profiles[/] → [cyan]{len(final_profiles)} profiles[/]")
+            console.print(
+                f"Profiles: [dim]{len(current_profiles)} profiles[/] → [cyan]{len(final_profiles)} profiles[/]"
+            )
 
             added_profiles = final_profiles - set(current_profiles)
             if added_profiles:
@@ -1275,7 +1327,9 @@ def _edit_client_non_interactive(
 
         # Show server changes
         if final_servers != set(current_individual_servers):
-            console.print(f"Servers: [dim]{len(current_individual_servers)} servers[/] → [cyan]{len(final_servers)} servers[/]")
+            console.print(
+                f"Servers: [dim]{len(current_individual_servers)} servers[/] → [cyan]{len(final_servers)} servers[/]"
+            )
 
             added_servers = final_servers - set(current_individual_servers)
             if added_servers:
@@ -1310,9 +1364,7 @@ def _edit_client_non_interactive(
             try:
                 profile_server_name = f"mcpm_profile_{profile_name}"
                 server_config = STDIOServerConfig(
-                    name=profile_server_name,
-                    command="mcpm",
-                    args=["profile", "run", profile_name]
+                    name=profile_server_name, command="mcpm", args=["profile", "run", profile_name]
                 )
                 client_manager.add_server(server_config)
             except Exception as e:
@@ -1331,11 +1383,7 @@ def _edit_client_non_interactive(
         for server_name in final_servers - set(current_individual_servers):
             try:
                 prefixed_name = f"mcpm_{server_name}"
-                server_config = STDIOServerConfig(
-                    name=prefixed_name,
-                    command="mcpm",
-                    args=["run", server_name]
-                )
+                server_config = STDIOServerConfig(name=prefixed_name, command="mcpm", args=["run", server_name])
                 client_manager.add_server(server_config)
             except Exception as e:
                 console.print(f"[red]Error adding server {server_name}: {e}[/]")

src/mcpm/commands/doctor.py

@@ -170,7 +170,27 @@ def doctor():
         console.print(f"  ❌ Profile check error: {e}")
         issues_found += 1
 
-    # 8. Summary
+    # 8. Check Daemon Status
+    console.print("[bold cyan]🤖 Daemon Status[/]")
+    try:
+        import urllib.request
+
+        try:
+            with urllib.request.urlopen("http://localhost:6276/health", timeout=2) as response:
+                if response.status == 200:
+                    console.print("  ✅ MCPM Daemon is running (port 6276)")
+                else:
+                    console.print(f"  ⚠️  MCPM Daemon responded with status {response.status}")
+                    issues_found += 1
+        except Exception as e:
+            console.print(f"  ❌ MCPM Daemon not reachable: {e}")
+            console.print("     (Run 'mcpm-daemon' or 'docker compose up' to start it)")
+            issues_found += 1
+    except Exception as e:
+        console.print(f"  ❌ Error checking daemon: {e}")
+        issues_found += 1
+
+    # 9. Summary
     console.print()
     if issues_found == 0:
         console.print("[bold green]✅ All systems healthy! No issues found.[/]")

src/mcpm/commands/install.py

@@ -5,6 +5,7 @@
 import json
 import os
 import re
+import shutil
 from enum import Enum
 
 from prompt_toolkit import PromptSession
@@ -20,6 +21,7 @@
 from mcpm.profile.profile_config import ProfileConfigManager
 from mcpm.schemas.full_server_config import FullServerConfig
 from mcpm.utils.config import NODE_EXECUTABLES, ConfigManager
+from mcpm.utils.non_interactive import should_force_operation
 from mcpm.utils.repository import RepositoryManager
 from mcpm.utils.rich_click_config import click
 
@@ -72,18 +74,31 @@ def global_add_server(server_config: ServerConfig, force: bool = False) -> bool:
     return global_config_manager.add_server(server_config, force)
 
 
-def prompt_with_default(prompt_text, default="", hide_input=False, required=False):
+def prompt_with_default(prompt_text, default="", hide_input=False, required=False, force=False):
     """Prompt the user with a default value that can be edited directly.
 
     Args:
         prompt_text: The prompt text to display
         default: The default value to show in the prompt
         hide_input: Whether to hide the input (for passwords)
         required: Whether this is a required field
+        force: Whether to force non-interactive mode
 
     Returns:
         The user's input or the default value if empty
     """
+    # Check for explicit non-interactive mode (Env Var)
+    # We do NOT check is_non_interactive() here because it includes isatty(),
+    # which returns True in tests (CliRunner), causing us to skip mocked prompts.
+    # Users desiring non-interactive behavior must set MCPM_NON_INTERACTIVE=true.
+    if os.getenv("MCPM_NON_INTERACTIVE", "").lower() == "true" or should_force_operation(force):
+        if default:
+            return default
+        if required:
+            # Cannot fulfill required argument without default in non-interactive mode
+            raise click.UsageError("A required value has no default and cannot be prompted in non-interactive mode.")
+        return ""
+
     # if default:
     #     console.print(f"Default: [yellow]{default}[/]")
 
@@ -137,7 +152,8 @@ def install(server_name, force=False, alias=None):
     config_name = alias or server_name
 
     # All servers are installed to global configuration
-    console.print("[yellow]Installing server to global configuration...[/]")
+    console_stderr = Console(stderr=True)
+    console_stderr.print("[yellow]Installing server to global configuration...[/]")
 
     # Get server metadata from repository
     server_metadata = repo_manager.get_server_metadata(server_name)
@@ -161,7 +177,9 @@ def install(server_name, force=False, alias=None):
 
     # Confirm addition
     alias_text = f" as '{alias}'" if alias else ""
-    if not force and not Confirm.ask(f"Install this server to global configuration{alias_text}?"):
+    if not should_force_operation(force) and not Confirm.ask(
+        f"Install this server to global configuration{alias_text}?"
+    ):
         console.print("[yellow]Operation cancelled.[/]")
         return
 
@@ -206,7 +224,7 @@ def install(server_name, force=False, alias=None):
             selected_method = installations[method_id]
 
         # If multiple methods are available and not forced, offer selection
-        if len(installations) > 1 and not force:
+        if len(installations) > 1 and not should_force_operation(force):
             console.print("\n[bold]Available installation methods:[/]")
             methods_list = []
 
@@ -411,6 +429,40 @@ def install(server_name, force=False, alias=None):
         mcp_command = install_command
         mcp_args = processed_args
 
+    # --- Auto-UVX Injection Logic ---
+    # If 'uv' is available and we are using python/pip, try to upgrade to 'uv run' for isolation.
+    # This solves the "Pydantic Versioning" dependency hell by isolating servers.
+    if mcp_command in ["python", "python3", "pip"] and shutil.which("uv"):
+        # We need to determine the package name to run 'uv run --with <package>'
+        # If package_name was defined in the installation method, use it.
+        # If not, check if we are running 'python -m <module>' and guess package name from module?
+        # Or default to the server name if reasonable?
+        target_package = package_name
+
+        # If args start with '-m', the next arg is the module.
+        # Often module == package (e.g. mcp_server_time -> mcp-server-time? No, dashes vs underscores).
+        # But 'uv run --with <module> python -m <module>' usually works if PyPI name matches.
+
+        if not target_package and mcp_args and mcp_args[0] == "-m" and len(mcp_args) > 1:
+            # Heuristic: Assume package name matches module name (with _ -> - maybe?)
+            # Ideally, the registry should provide 'package'.
+            # For now, we only auto-upgrade if we have a package name OR if we are brave.
+            # Let's rely on package_name variable extracted earlier from selected_method.get("package")
+            pass
+
+        if target_package:
+            console.print(f"[bold blue]🚀 Auto-upgrading to 'uv run' for isolation (package: {target_package})[/]")
+            # Old: python -m module ...
+            # New: uv run --with package python -m module ...
+
+            # We prepend 'run --with package' to the command execution
+            # mcp_command becomes 'uv'
+            # mcp_args becomes ['run', '--with', target_package, original_command] + mcp_args
+
+            new_args = ["run", "--with", target_package, mcp_command] + mcp_args
+            mcp_command = "uv"
+            mcp_args = new_args
+
     # Create server configuration using FullServerConfig
     full_server_config = FullServerConfig(
         name=config_name,
@@ -426,7 +478,7 @@ def install(server_name, force=False, alias=None):
     )
 
     # Add server to global configuration
-    success = global_add_server(full_server_config.to_server_config(), force)
+    success = global_add_server(full_server_config.to_server_config(), should_force_operation(force))
 
     if success:
         # Server has been successfully added to the global configuration