Support multiple --with-editable flags in CLI commands (#1634)

Author: jlowin

src/fastmcp/cli/claude.py

@@ -34,7 +34,7 @@ def update_claude_config(
     file_spec: str,
     server_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,
 ) -> bool:
@@ -43,7 +43,7 @@ def update_claude_config(
     Args:
         file_spec: Path to the server file, optionally with :object suffix
         server_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. These are merged with
             any existing variables, with new values taking precedence.
@@ -101,7 +101,7 @@ def update_claude_config(
         # Build uv run command using Environment.build_uv_args()
         env_config = Environment(
             dependencies=deduplicated_packages,
-            editable=[str(with_editable)] if with_editable else None,
+            editable=[str(p) for p in with_editable] if with_editable else None,
         )
         args = env_config.build_uv_args()
 

src/fastmcp/cli/cli.py

@@ -126,20 +126,21 @@ async def dev(
     server_spec: str | None = None,
     *,
     with_editable: Annotated[
-        Path | None,
+        list[Path] | None,
         cyclopts.Parameter(
-            name=["--with-editable", "-e"],
-            help="Directory containing pyproject.toml to install in editable mode",
+            "--with-editable",
+            help="Directory containing 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",
+            help="Additional packages to install (can be used multiple times)",
             negative="",
         ),
-    ] = [],
+    ] = None,
     inspector_version: Annotated[
         str | None,
         cyclopts.Parameter(
@@ -188,6 +189,9 @@ async def dev(
     Args:
         server_spec: Python file to run, optionally with :object suffix, or None to auto-detect fastmcp.json
     """
+    # Convert None to empty lists for list parameters
+    with_editable = with_editable or []
+    with_packages = with_packages or []
     from pathlib import Path
 
     from fastmcp.utilities.fastmcp_config import FastMCPConfig
@@ -229,13 +233,9 @@ async def dev(
                 if config.environment.requirements
                 else None
             )
-            # Note: config.environment.editable is a list, but CLI only supports single path
-            # Take the first editable path if available
-            with_editable = with_editable or (
-                Path(config.environment.editable[0])
-                if config.environment.editable and config.environment.editable[0]
-                else None
-            )
+            # Merge editable paths from config with CLI args
+            if config.environment.editable and not with_editable:
+                with_editable = [Path(p) for p in config.environment.editable]
 
             # Merge packages from both sources
             if config.environment.dependencies:
@@ -256,7 +256,7 @@ async def dev(
         "Starting dev server",
         extra={
             "server_spec": server_spec,
-            "with_editable": str(with_editable) if with_editable else None,
+            "with_editable": [str(p) for p in with_editable] if with_editable else None,
             "with_packages": with_packages,
             "ui_port": ui_port,
             "server_port": server_port,
@@ -305,7 +305,7 @@ async def dev(
             dependencies=with_packages if with_packages else None,
             requirements=str(with_requirements) if with_requirements else None,
             project=str(project) if project else None,
-            editable=[str(with_editable)] if with_editable else None,
+            editable=[str(p) for p in with_editable] if with_editable else None,
         )
         uv_cmd = ["uv"] + env_config.build_uv_args(["fastmcp", "run", server_spec])
 
@@ -396,13 +396,13 @@ async def run(
         ),
     ] = None,
     with_packages: Annotated[
-        list[str],
+        list[str] | None,
         cyclopts.Parameter(
             "--with",
             help="Additional packages to install (can be used multiple times)",
             negative="",
         ),
-    ] = [],
+    ] = None,
     project: Annotated[
         Path | None,
         cyclopts.Parameter(
@@ -450,6 +450,8 @@ async def run(
     Args:
         server_spec: Python file, object specification (file:obj), config file, URL, or None to auto-detect
     """
+    # Convert None to empty lists for list parameters
+    with_packages = with_packages or []
     # Load configuration if needed
     from pathlib import Path
 
@@ -631,13 +633,13 @@ async def inspect(
         ),
     ] = None,
     with_packages: Annotated[
-        list[str],
+        list[str] | None,
         cyclopts.Parameter(
             "--with",
             help="Additional packages to install (can be used multiple times)",
             negative="",
         ),
-    ] = [],
+    ] = None,
     project: Annotated[
         Path | None,
         cyclopts.Parameter(
@@ -670,6 +672,8 @@ async def inspect(
     Args:
         server_spec: Python file to inspect, optionally with :object suffix, or fastmcp.json
     """
+    # Convert None to empty lists for list parameters
+    with_packages = with_packages or []
     from pathlib import Path
 
     from fastmcp.utilities.fastmcp_config import FastMCPConfig

src/fastmcp/cli/install/claude_code.py

@@ -75,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,
@@ -88,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
@@ -121,7 +121,7 @@ def install_claude_code(
         dependencies=deduplicated_packages,
         requirements=str(with_requirements) if with_requirements else None,
         project=str(project) if project else None,
-        editable=[str(with_editable)] if with_editable else None,
+        editable=[str(p) for p in with_editable] if with_editable else None,
     )
     args = env_config.build_uv_args()
 
@@ -171,28 +171,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",
+            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",
+            help="Environment variables in KEY=VALUE format (can be used multiple times)",
             negative="",
         ),
-    ] = [],
+    ] = None,
     env_file: Annotated[
         Path | None,
         cyclopts.Parameter(
@@ -227,6 +228,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
     )

src/fastmcp/cli/install/claude_desktop.py

@@ -40,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,
@@ -53,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
@@ -86,7 +86,7 @@ def install_claude_desktop(
         dependencies=deduplicated_packages,
         requirements=str(with_requirements) if with_requirements else None,
         project=str(project) if project else None,
-        editable=[str(with_editable)] if with_editable else None,
+        editable=[str(p) for p in with_editable] if with_editable else None,
     )
     args = env_config.build_uv_args()
 
@@ -143,28 +143,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",
+            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",
+            help="Environment variables in KEY=VALUE format (can be used multiple times)",
             negative="",
         ),
-    ] = [],
+    ] = None,
     env_file: Annotated[
         Path | None,
         cyclopts.Parameter(
@@ -199,6 +200,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
     )