Drop the add_prompt(fn) overload; keep only the Message re-exports

add_tool takes a function while add_resource and add_prompt take built objects;
letting add_prompt accept both would be a third shape rather than consistency, and
changing the imperative registration API deserves its own design pass across all
three primitives. mcp.add_prompt(Prompt.from_function(fn, ...)) remains the spelling
for runtime registration.

Author: maxisbey

src/mcp/server/mcpserver/server.py

@@ -890,47 +890,12 @@ def decorator(fn: _CallableT) -> _CallableT:
 
         return decorator
 
-    @overload
-    def add_prompt(self, prompt: Prompt) -> None: ...
-
-    @overload
-    def add_prompt(
-        self,
-        fn: Callable[..., Any],
-        /,
-        *,
-        name: str | None = None,
-        title: str | None = None,
-        description: str | None = None,
-        icons: list[Icon] | None = None,
-    ) -> None: ...
-
-    def add_prompt(
-        self,
-        prompt: Prompt | Callable[..., Any],
-        *,
-        name: str | None = None,
-        title: str | None = None,
-        description: str | None = None,
-        icons: list[Icon] | None = None,
-    ) -> None:
+    def add_prompt(self, prompt: Prompt) -> None:
         """Add a prompt to the server.
 
-        Pass the function that renders the prompt: its name, docstring and parameters become
-        the prompt's name, description and arguments, exactly as with `@prompt()`. A ready-made
-        `Prompt` instance is registered as-is.
-
         Args:
-            prompt: The function to register as a prompt, or a `Prompt` instance
-            name: Optional name for the prompt (defaults to the function name)
-            title: Optional human-readable title for the prompt
-            description: Optional description (defaults to the function's docstring)
-            icons: Optional list of icons for the prompt
+            prompt: A Prompt instance to add
         """
-        if not isinstance(prompt, Prompt):
-            prompt = Prompt.from_function(prompt, name=name, title=title, description=description, icons=icons)
-        elif any(arg is not None for arg in (name, title, description, icons)):
-            raise TypeError("name, title, description and icons can only be set when registering a function")
         self._prompt_manager.add_prompt(prompt)
 
     def remove_prompt(self, name: str) -> None:

tests/server/mcpserver/test_server.py

@@ -50,7 +50,6 @@
 from mcp.server.mcpserver import Context, MCPServer, ResourceSecurity
 from mcp.server.mcpserver.exceptions import ResourceNotFoundError, ToolError
 from mcp.server.mcpserver.prompts.base import Message, UserMessage
-from mcp.server.mcpserver.prompts.base import Prompt as PromptTemplate  # `Prompt` here is the mcp_types wire model
 from mcp.server.mcpserver.resources import FileResource, FunctionResource
 from mcp.server.mcpserver.utilities.types import Audio, Image
 from mcp.server.subscriptions import (
@@ -2321,46 +2320,6 @@ def test_context_exposes_its_mcp_server() -> None:
     assert Context(mcp_server=mcp).mcp_server is mcp
 
 
-def _greet(who: str) -> str:
-    """Say hi."""
-    return f"hi {who}"
-
-
-async def test_add_prompt_registers_a_function_like_the_decorator() -> None:
-    """SDK-defined: `add_prompt(fn, ...)` derives name, description and arguments as `@prompt()` does."""
-    mcp = MCPServer()
-    mcp.add_prompt(_greet, title="Greeter")
-
-    async with Client(mcp) as client:
-        [listed] = (await client.list_prompts()).prompts
-        result = await client.get_prompt("_greet", {"who": "max"})
-
-    assert (listed.name, listed.title, listed.description) == ("_greet", "Greeter", "Say hi.")
-    assert [arg.name for arg in listed.arguments or []] == ["who"]
-    assert result.messages[0].content == TextContent(type="text", text="hi max")
-
-
-async def test_add_prompt_registers_a_prompt_instance_as_is() -> None:
-    """SDK-defined: a ready-made prompt handed to `add_prompt` (the 2.0 form) is registered exactly as built."""
-    mcp = MCPServer()
-    mcp.add_prompt(prompt=PromptTemplate.from_function(_greet, name="custom"))
-    [listed] = await mcp.list_prompts()
-    assert listed.name == "custom"
-
-
-async def test_add_prompt_rejects_overrides_alongside_a_prompt_instance() -> None:
-    """SDK-defined: the keyword overrides only apply to the function form; passing them alongside a
-    ready-made prompt is rejected rather than silently ignored."""
-    mcp = MCPServer()
-    prompt: Any = PromptTemplate.from_function(_greet)  # Any: the overloads already reject this call statically
-    with pytest.raises(TypeError) as exc_info:
-        mcp.add_prompt(prompt, name="renamed")
-    assert str(exc_info.value) == snapshot(
-        "name, title, description and icons can only be set when registering a function"
-    )
-    assert await mcp.list_prompts() == []
-
-
 def test_remove_prompt_removes_and_unknown_name_raises() -> None:
     mcp = MCPServer()