Rename FastMCP to MCPServer (#1951)

src/mcp/cli/__init__.py

@@ -1,4 +1,4 @@
-"""FastMCP CLI package."""
+"""MCP CLI package."""
 
 from .cli import app
 

src/mcp/cli/claude.py

@@ -7,7 +7,7 @@ import sys
 from pathlib import Path
 from typing import Any
 
-from mcp.server.fastmcp.utilities.logging import get_logger
+from mcp.server.mcpserver.utilities.logging import get_logger
 
 logger = get_logger(__name__)
 
@@ -49,7 +49,7 @@ def update_claude_config(
     with_packages: list[str] | None = None,
     env_vars: dict[str, str] | None = None,
 ) -> bool:
-    """Add or update a FastMCP server in Claude's configuration.
+    """Add or update an MCP server in Claude's configuration.
 
     Args:
         file_spec: Path to the server file, optionally with :object suffix
@@ -121,7 +121,7 @@ def update_claude_config(
         else:  # pragma: no cover
             file_spec = str(Path(file_spec).resolve())
 
-        # Add fastmcp run command
+        # Add mcp run command
         args.extend(["mcp", "run", file_spec])
 
         server_config: dict[str, Any] = {"command": uv_path, "args": args}

src/mcp/cli/cli.py

@@ -8,7 +8,7 @@ import sys
 from pathlib import Path
 from typing import Annotated, Any
 
-from mcp.server import FastMCP
+from mcp.server import MCPServer
 from mcp.server import Server as LowLevelServer
 
 try:
@@ -19,9 +19,9 @@ except ImportError:  # pragma: no cover
 
 try:
     from mcp.cli import claude
-    from mcp.server.fastmcp.utilities.logging import get_logger
+    from mcp.server.mcpserver.utilities.logging import get_logger
 except ImportError:  # pragma: no cover
-    print("Error: mcp.server.fastmcp is not installed or not in PYTHONPATH")
+    print("Error: mcp.server is not installed or not in PYTHONPATH")
     sys.exit(1)
 
 try:
@@ -149,12 +149,10 @@ def _import_server(file: Path, server_object: str | None = None):  # pragma: no
         Returns:
             True if it's supported.
         """
-        if not isinstance(server_object, FastMCP):
-            logger.error(f"The server object {object_name} is of type {type(server_object)} (expecting {FastMCP}).")
+        if not isinstance(server_object, MCPServer):
+            logger.error(f"The server object {object_name} is of type {type(server_object)} (expecting {MCPServer}).")
             if isinstance(server_object, LowLevelServer):
-                logger.warning(
-                    "Note that only FastMCP server is supported. Low level Server class is not yet supported."
-                )
+                logger.warning("Note that only MCPServer is supported. Low level Server class is not yet supported.")
             return False
         return True
 
@@ -172,8 +170,8 @@ def _import_server(file: Path, server_object: str | None = None):  # pragma: no
             f"No server object found in {file}. Please either:\n"
             "1. Use a standard variable name (mcp, server, or app)\n"
             "2. Specify the object name with file:object syntax"
-            "3. If the server creates the FastMCP object within main() "
-            "   or another function, refactor the FastMCP object to be a "
+            "3. If the server creates the MCPServer object within main() "
+            "   or another function, refactor the MCPServer object to be a "
             "   global variable named mcp, server, or app.",
             extra={"file": str(file)},
         )