fastmcp 2.11.3__py3-none-any.whl → 2.12.0rc1__py3-none-any.whl

fastmcp/cli/install/claude_code.py

@@ -10,6 +10,7 @@ import cyclopts
 from rich import print
 
 from fastmcp.utilities.logging import get_logger
+from fastmcp.utilities.mcp_server_config.v1.environments.uv import UVEnvironment
 
 from .shared import process_common_args
 
@@ -74,7 +75,7 @@ def install_claude_code(
     server_object: str | None,
     name: str,
     *,
-    with_editable: Path | None = None,
+    with_editable: list[Path] | None = None,
     with_packages: list[str] | None = None,
     env_vars: dict[str, str] | None = None,
     python_version: str | None = None,
@@ -87,7 +88,7 @@ def install_claude_code(
         file: Path to the server file
         server_object: Optional server object name (for :object suffix)
         name: Name for the server in Claude Code
-        with_editable: Optional directory to install in editable mode
+        with_editable: Optional list of directories to install in editable mode
         with_packages: Optional list of additional packages to install
         env_vars: Optional dictionary of environment variables
         python_version: Optional Python version to use
@@ -106,31 +107,22 @@ def install_claude_code(
         )
         return False
 
-    # Build uv run command
-    args = ["run"]
-
-    # Add Python version if specified
-    if python_version:
-        args.extend(["--python", python_version])
-
-    # Add project if specified
-    if project:
-        args.extend(["--project", str(project)])
-
-    # Collect all packages in a set to deduplicate
-    packages = {"fastmcp"}
+    # Deduplicate packages and exclude 'fastmcp' since Environment adds it automatically
+    deduplicated_packages = None
     if with_packages:
-        packages.update(pkg for pkg in with_packages if pkg)
-
-    # Add all packages with --with
-    for pkg in sorted(packages):
-        args.extend(["--with", pkg])
-
-    if with_editable:
-        args.extend(["--with-editable", str(with_editable)])
-
-    if with_requirements:
-        args.extend(["--with-requirements", str(with_requirements)])
+        deduplicated = list(dict.fromkeys(with_packages))
+        deduplicated_packages = [pkg for pkg in deduplicated if pkg != "fastmcp"]
+        if not deduplicated_packages:
+            deduplicated_packages = None
+
+    # Build uv run command using Environment.build_uv_run_command()
+    env_config = UVEnvironment(
+        python=python_version,
+        dependencies=deduplicated_packages,
+        requirements=str(with_requirements) if with_requirements else None,
+        project=str(project) if project else None,
+        editable=[str(p) for p in with_editable] if with_editable else None,
+    )
 
     # Build server spec from parsed components
     if server_object:
@@ -138,8 +130,8 @@ def install_claude_code(
     else:
         server_spec = str(file.resolve())
 
-    # Add fastmcp run command
-    args.extend(["fastmcp", "run", server_spec])
+    # Build the full command
+    full_command = env_config.build_command(["fastmcp", "run", server_spec])
 
     # Build claude mcp add command
     cmd_parts = [claude_cmd, "mcp", "add"]
@@ -151,7 +143,7 @@ def install_claude_code(
 
     # Add server name and command
     cmd_parts.extend([name, "--"])
-    cmd_parts.extend(["uv"] + args)
+    cmd_parts.extend(full_command)
 
     try:
         # Run the claude mcp add command
@@ -178,28 +170,29 @@ async def claude_code_command(
         ),
     ] = None,
     with_editable: Annotated[
-        Path | None,
+        list[Path] | None,
         cyclopts.Parameter(
-            name=["--with-editable", "-e"],
-            help="Directory with pyproject.toml to install in editable mode",
+            "--with-editable",
+            help="Directory with pyproject.toml to install in editable mode (can be used multiple times)",
+            negative="",
         ),
     ] = None,
     with_packages: Annotated[
-        list[str],
+        list[str] | None,
         cyclopts.Parameter(
             "--with",
-            help="Additional packages to install",
-            negative=False,
+            help="Additional packages to install (can be used multiple times)",
+            negative="",
         ),
-    ] = [],
+    ] = None,
     env_vars: Annotated[
-        list[str],
+        list[str] | None,
         cyclopts.Parameter(
             "--env",
-            help="Environment variables in KEY=VALUE format",
-            negative=False,
+            help="Environment variables in KEY=VALUE format (can be used multiple times)",
+            negative="",
         ),
-    ] = [],
+    ] = None,
     env_file: Annotated[
         Path | None,
         cyclopts.Parameter(
@@ -234,6 +227,10 @@ async def claude_code_command(
     Args:
         server_spec: Python file to install, optionally with :object suffix
     """
+    # Convert None to empty lists for list parameters
+    with_editable = with_editable or []
+    with_packages = with_packages or []
+    env_vars = env_vars or []
     file, server_object, name, packages, env_dict = await process_common_args(
         server_spec, server_name, with_packages, env_vars, env_file
     )

fastmcp/cli/install/claude_desktop.py

@@ -10,6 +10,7 @@ from rich import print
 
 from fastmcp.mcp_config import StdioMCPServer, update_config_file
 from fastmcp.utilities.logging import get_logger
+from fastmcp.utilities.mcp_server_config.v1.environments.uv import UVEnvironment
 
 from .shared import process_common_args
 
@@ -39,7 +40,7 @@ def install_claude_desktop(
     server_object: str | None,
     name: str,
     *,
-    with_editable: Path | None = None,
+    with_editable: list[Path] | None = None,
     with_packages: list[str] | None = None,
     env_vars: dict[str, str] | None = None,
     python_version: str | None = None,
@@ -52,7 +53,7 @@ def install_claude_desktop(
         file: Path to the server file
         server_object: Optional server object name (for :object suffix)
         name: Name for the server in Claude's config
-        with_editable: Optional directory to install in editable mode
+        with_editable: Optional list of directories to install in editable mode
         with_packages: Optional list of additional packages to install
         env_vars: Optional dictionary of environment variables
         python_version: Optional Python version to use
@@ -72,45 +73,34 @@ def install_claude_desktop(
 
     config_file = config_dir / "claude_desktop_config.json"
 
-    # Build uv run command
-    args = ["run"]
-
-    # Add Python version if specified
-    if python_version:
-        args.extend(["--python", python_version])
-
-    # Add project if specified
-    if project:
-        args.extend(["--project", str(project)])
-
-    # Collect all packages in a set to deduplicate
-    packages = {"fastmcp"}
+    # Deduplicate packages and exclude 'fastmcp' since Environment adds it automatically
+    deduplicated_packages = None
     if with_packages:
-        packages.update(pkg for pkg in with_packages if pkg)
-
-    # Add all packages with --with
-    for pkg in sorted(packages):
-        args.extend(["--with", pkg])
-
-    if with_editable:
-        args.extend(["--with-editable", str(with_editable)])
-
-    if with_requirements:
-        args.extend(["--with-requirements", str(with_requirements)])
-
+        deduplicated = list(dict.fromkeys(with_packages))
+        deduplicated_packages = [pkg for pkg in deduplicated if pkg != "fastmcp"]
+        if not deduplicated_packages:
+            deduplicated_packages = None
+
+    env_config = UVEnvironment(
+        python=python_version,
+        dependencies=deduplicated_packages,
+        requirements=str(with_requirements) if with_requirements else None,
+        project=str(project) if project else None,
+        editable=[str(p) for p in with_editable] if with_editable else None,
+    )
     # Build server spec from parsed components
     if server_object:
         server_spec = f"{file.resolve()}:{server_object}"
     else:
         server_spec = str(file.resolve())
 
-    # Add fastmcp run command
-    args.extend(["fastmcp", "run", server_spec])
+    # Build the full command
+    full_command = env_config.build_command(["fastmcp", "run", server_spec])
 
     # Create server configuration
     server_config = StdioMCPServer(
-        command="uv",
-        args=args,
+        command=full_command[0],
+        args=full_command[1:],
         env=env_vars or {},
     )
 
@@ -151,28 +141,29 @@ async def claude_desktop_command(
         ),
     ] = None,
     with_editable: Annotated[
-        Path | None,
+        list[Path] | None,
         cyclopts.Parameter(
-            name=["--with-editable", "-e"],
-            help="Directory with pyproject.toml to install in editable mode",
+            "--with-editable",
+            help="Directory with pyproject.toml to install in editable mode (can be used multiple times)",
+            negative="",
         ),
     ] = None,
     with_packages: Annotated[
-        list[str],
+        list[str] | None,
         cyclopts.Parameter(
             "--with",
-            help="Additional packages to install",
-            negative=False,
+            help="Additional packages to install (can be used multiple times)",
+            negative="",
         ),
-    ] = [],
+    ] = None,
     env_vars: Annotated[
-        list[str],
+        list[str] | None,
         cyclopts.Parameter(
             "--env",
-            help="Environment variables in KEY=VALUE format",
-            negative=False,
+            help="Environment variables in KEY=VALUE format (can be used multiple times)",
+            negative="",
         ),
-    ] = [],
+    ] = None,
     env_file: Annotated[
         Path | None,
         cyclopts.Parameter(
@@ -207,6 +198,10 @@ async def claude_desktop_command(
     Args:
         server_spec: Python file to install, optionally with :object suffix
     """
+    # Convert None to empty lists for list parameters
+    with_editable = with_editable or []
+    with_packages = with_packages or []
+    env_vars = env_vars or []
     file, server_object, name, with_packages, env_dict = await process_common_args(
         server_spec, server_name, with_packages, env_vars, env_file
     )

fastmcp/cli/install/cursor.py

@@ -9,8 +9,9 @@ from typing import Annotated
 import cyclopts
 from rich import print
 
-from fastmcp.mcp_config import StdioMCPServer
+from fastmcp.mcp_config import StdioMCPServer, update_config_file
 from fastmcp.utilities.logging import get_logger
+from fastmcp.utilities.mcp_server_config.v1.environments.uv import UVEnvironment
 
 from .shared import process_common_args
 
@@ -64,25 +65,27 @@ def open_deeplink(deeplink: str) -> bool:
         return False
 
 
-def install_cursor(
+def install_cursor_workspace(
     file: Path,
     server_object: str | None,
     name: str,
+    workspace_path: Path,
     *,
-    with_editable: Path | None = None,
+    with_editable: list[Path] | None = None,
     with_packages: list[str] | None = None,
     env_vars: dict[str, str] | None = None,
     python_version: str | None = None,
     with_requirements: Path | None = None,
     project: Path | None = None,
 ) -> bool:
-    """Install FastMCP server in Cursor.
+    """Install FastMCP server to workspace-specific Cursor configuration.
 
     Args:
         file: Path to the server file
         server_object: Optional server object name (for :object suffix)
         name: Name for the server in Cursor
-        with_editable: Optional directory to install in editable mode
+        workspace_path: Path to the workspace directory
+        with_editable: Optional list of directories to install in editable mode
         with_packages: Optional list of additional packages to install
         env_vars: Optional dictionary of environment variables
         python_version: Optional Python version to use
@@ -92,45 +95,139 @@ def install_cursor(
     Returns:
         True if installation was successful, False otherwise
     """
-    # Build uv run command
-    args = ["run"]
+    # Ensure workspace path is absolute and exists
+    workspace_path = workspace_path.resolve()
+    if not workspace_path.exists():
+        print(f"[red]Workspace directory does not exist: {workspace_path}[/red]")
+        return False
 
-    # Add Python version if specified
-    if python_version:
-        args.extend(["--python", python_version])
+    # Create .cursor directory in workspace
+    cursor_dir = workspace_path / ".cursor"
+    cursor_dir.mkdir(exist_ok=True)
 
-    # Add project if specified
-    if project:
-        args.extend(["--project", str(project)])
+    config_file = cursor_dir / "mcp.json"
 
-    # Collect all packages in a set to deduplicate
-    packages = {"fastmcp"}
+    # Deduplicate packages and exclude 'fastmcp' since Environment adds it automatically
+    deduplicated_packages = None
     if with_packages:
-        packages.update(pkg for pkg in with_packages if pkg)
+        deduplicated = list(dict.fromkeys(with_packages))
+        deduplicated_packages = [pkg for pkg in deduplicated if pkg != "fastmcp"]
+        if not deduplicated_packages:
+            deduplicated_packages = None
+
+    env_config = UVEnvironment(
+        python=python_version,
+        dependencies=deduplicated_packages,
+        requirements=str(with_requirements.resolve()) if with_requirements else None,
+        project=str(project.resolve()) if project else None,
+        editable=[str(p.resolve()) for p in with_editable] if with_editable else None,
+    )
+    # Build server spec from parsed components
+    if server_object:
+        server_spec = f"{file.resolve()}:{server_object}"
+    else:
+        server_spec = str(file.resolve())
 
-    # Add all packages with --with
-    for pkg in sorted(packages):
-        args.extend(["--with", pkg])
+    # Build the full command
+    full_command = env_config.build_command(["fastmcp", "run", server_spec])
 
-    if with_editable:
-        args.extend(["--with-editable", str(with_editable)])
+    # Create server configuration
+    server_config = StdioMCPServer(
+        command=full_command[0],
+        args=full_command[1:],
+        env=env_vars or {},
+    )
 
-    if with_requirements:
-        args.extend(["--with-requirements", str(with_requirements)])
+    try:
+        # Create the config file if it doesn't exist
+        if not config_file.exists():
+            config_file.write_text('{"mcpServers": {}}')
 
+        # Update configuration with the new server
+        update_config_file(config_file, name, server_config)
+        print(
+            f"[green]Successfully installed '{name}' to workspace at {workspace_path}[/green]"
+        )
+        return True
+    except Exception as e:
+        print(f"[red]Failed to install server to workspace: {e}[/red]")
+        return False
+
+
+def install_cursor(
+    file: Path,
+    server_object: str | None,
+    name: str,
+    *,
+    with_editable: list[Path] | None = None,
+    with_packages: list[str] | None = None,
+    env_vars: dict[str, str] | None = None,
+    python_version: str | None = None,
+    with_requirements: Path | None = None,
+    project: Path | None = None,
+    workspace: Path | None = None,
+) -> bool:
+    """Install FastMCP server in Cursor.
+
+    Args:
+        file: Path to the server file
+        server_object: Optional server object name (for :object suffix)
+        name: Name for the server in Cursor
+        with_editable: Optional list of directories to install in editable mode
+        with_packages: Optional list of additional packages to install
+        env_vars: Optional dictionary of environment variables
+        python_version: Optional Python version to use
+        with_requirements: Optional requirements file to install from
+        project: Optional project directory to run within
+        workspace: Optional workspace directory for project-specific installation
+
+    Returns:
+        True if installation was successful, False otherwise
+    """
+
+    # Deduplicate packages and exclude 'fastmcp' since Environment adds it automatically
+    deduplicated_packages = None
+    if with_packages:
+        deduplicated = list(dict.fromkeys(with_packages))
+        deduplicated_packages = [pkg for pkg in deduplicated if pkg != "fastmcp"]
+        if not deduplicated_packages:
+            deduplicated_packages = None
+
+    env_config = UVEnvironment(
+        python=python_version,
+        dependencies=deduplicated_packages,
+        requirements=str(with_requirements.resolve()) if with_requirements else None,
+        project=str(project.resolve()) if project else None,
+        editable=[str(p.resolve()) for p in with_editable] if with_editable else None,
+    )
     # Build server spec from parsed components
     if server_object:
         server_spec = f"{file.resolve()}:{server_object}"
     else:
         server_spec = str(file.resolve())
 
-    # Add fastmcp run command
-    args.extend(["fastmcp", "run", server_spec])
+    # Build the full command
+    full_command = env_config.build_command(["fastmcp", "run", server_spec])
+
+    # If workspace is specified, install to workspace-specific config
+    if workspace:
+        return install_cursor_workspace(
+            file=file,
+            server_object=server_object,
+            name=name,
+            workspace_path=workspace,
+            with_editable=with_editable,
+            with_packages=with_packages,
+            env_vars=env_vars,
+            python_version=python_version,
+            with_requirements=with_requirements,
+            project=project,
+        )
 
     # Create server configuration
     server_config = StdioMCPServer(
-        command="uv",
-        args=args,
+        command=full_command[0],
+        args=full_command[1:],
         env=env_vars or {},
     )
 
@@ -161,28 +258,29 @@ async def cursor_command(
         ),
     ] = None,
     with_editable: Annotated[
-        Path | None,
+        list[Path] | None,
         cyclopts.Parameter(
-            name=["--with-editable", "-e"],
-            help="Directory with pyproject.toml to install in editable mode",
+            "--with-editable",
+            help="Directory with pyproject.toml to install in editable mode (can be used multiple times)",
+            negative="",
         ),
     ] = None,
     with_packages: Annotated[
-        list[str],
+        list[str] | None,
         cyclopts.Parameter(
             "--with",
-            help="Additional packages to install",
-            negative=False,
+            help="Additional packages to install (can be used multiple times)",
+            negative="",
         ),
-    ] = [],
+    ] = None,
     env_vars: Annotated[
-        list[str],
+        list[str] | None,
         cyclopts.Parameter(
             "--env",
-            help="Environment variables in KEY=VALUE format",
-            negative=False,
+            help="Environment variables in KEY=VALUE format (can be used multiple times)",
+            negative="",
         ),
-    ] = [],
+    ] = None,
     env_file: Annotated[
         Path | None,
         cyclopts.Parameter(
@@ -211,12 +309,23 @@ async def cursor_command(
             help="Run the command within the given project directory",
         ),
     ] = None,
+    workspace: Annotated[
+        Path | None,
+        cyclopts.Parameter(
+            "--workspace",
+            help="Install to workspace directory (will create .cursor/ inside it) instead of using deeplink",
+        ),
+    ] = None,
 ) -> None:
     """Install an MCP server in Cursor.
 
     Args:
         server_spec: Python file to install, optionally with :object suffix
     """
+    # Convert None to empty lists for list parameters
+    with_editable = with_editable or []
+    with_packages = with_packages or []
+    env_vars = env_vars or []
     file, server_object, name, with_packages, env_dict = await process_common_args(
         server_spec, server_name, with_packages, env_vars, env_file
     )
@@ -231,6 +340,7 @@ async def cursor_command(
         python_version=python,
         with_requirements=with_requirements,
         project=project,
+        workspace=workspace,
     )
 
     if not success: