feat: add remove_resource and remove_prompt to MCPServer, address PR review concerns

Add remove_resource() and remove_prompt() methods to MCPServer to match
the existing remove_tool() API, enabling dynamic deprovisioning of all
resource types for multi-tenant servers.

PR review fixes:
- Fix heading grammar: "Simple Registration of..." (concern #1)
- Add private API warning for _lowlevel_server usage in example (concern #3)
- Clarify example server needs TokenVerifier for production (concern #4)
- Guard offboard_tenant against KeyError for unprovisioned tools (concern #5)
- Add remove_resource/remove_prompt to MCPServer and docs (concern #6)

Tests added for both single-tenant and multi-tenant remove operations,
including cross-tenant isolation verification.

Author: andylim-duo

docs/migration.md

@@ -888,6 +888,7 @@ Key additions:
 - `AccessToken.tenant_id` — carries tenant identity in OAuth tokens
 - `Context.tenant_id` — available in tool, resource, and prompt handlers
 - `server.add_tool(fn, tenant_id="...")`, `server.add_resource(r, tenant_id="...")`, `server.add_prompt(p, tenant_id="...")` — register tenant-scoped tools, resources, and prompts
+- `server.remove_tool(name, tenant_id="...")`, `server.remove_resource(uri, tenant_id="...")`, `server.remove_prompt(name, tenant_id="...")` — remove tenant-scoped tools, resources, and prompts
 - `StreamableHTTPSessionManager` — validates tenant identity on every request and prevents cross-tenant session access
 
 All APIs default to `tenant_id=None`, preserving backward compatibility for single-tenant servers.

docs/multi-tenancy.md

@@ -47,7 +47,7 @@ flowchart TD
 
 ## Usage
 
-### Simple Registering Tenant-Scoped Tools, Resources, and Prompts
+### Simple Registration of Tenant-Scoped Tools, Resources, and Prompts
 
 Use the `tenant_id` parameter when adding tools, resources, or prompts:
 
@@ -115,11 +115,24 @@ def onboard_tenant(server: MCPServer, tenant_id: str, plan: str) -> None:
 
 
 def offboard_tenant(server: MCPServer, tenant_id: str) -> None:
-    """Remove all tools when a tenant is deprovisioned."""
-    server.remove_tool("search_docs", tenant_id=tenant_id)
-    server.remove_tool("get_status", tenant_id=tenant_id)
-    server.remove_tool("run_analytics", tenant_id=tenant_id)
-    server.remove_tool("export_data", tenant_id=tenant_id)
+    """Remove all capabilities when a tenant is deprovisioned."""
+    for tool_name in ["search_docs", "get_status", "run_analytics", "export_data"]:
+        try:
+            server.remove_tool(tool_name, tenant_id=tenant_id)
+        except KeyError:
+            pass  # Tool was never provisioned (e.g. free-plan tenant)
+
+    for uri in ["data://docs", "data://status"]:
+        try:
+            server.remove_resource(uri, tenant_id=tenant_id)
+        except ValueError:
+            pass
+
+    for prompt_name in ["assistant"]:
+        try:
+            server.remove_prompt(prompt_name, tenant_id=tenant_id)
+        except ValueError:
+            pass
 ```
 
 #### Plugin Systems
@@ -141,7 +154,7 @@ def uninstall_plugin(server: MCPServer, tenant_id: str, plugin: str) -> None:
         server.remove_tool(name, tenant_id=tenant_id)
 ```
 
-All dynamic changes take effect immediately — the next `list_tools` request from that tenant will reflect the updated set. Other tenants are unaffected.
+All dynamic changes take effect immediately — the next `list_tools`, `list_resources`, or `list_prompts` request from that tenant will reflect the updated set. Other tenants are unaffected.
 
 ### Accessing Tenant ID in Handlers
 

examples/servers/simple-multi-tenant/README.md

@@ -51,6 +51,8 @@ from mcp_simple_multi_tenant.server import create_server
 
 async def main():
     server = create_server()
+    # NOTE: _lowlevel_server is a private API used here for in-memory testing only.
+    # In production, use HTTP transport with server.run() and a TokenVerifier instead.
     actual = server._lowlevel_server
 
     async with create_client_server_memory_streams() as (client_streams, server_streams):

examples/servers/simple-multi-tenant/mcp_simple_multi_tenant/server.py

@@ -32,6 +32,13 @@ def create_server() -> MCPServer:
     Acme is an analytics company; Globex is a content company.
     """
 
+    # NOTE: This example demonstrates tenant-scoped registration only.
+    # Without AuthSettings and a TokenVerifier, an HTTP client connecting to
+    # this server will have no tenant context set (tenant_id=None) and will
+    # see no tools/resources/prompts. In production, configure a TokenVerifier
+    # and AuthSettings so that tenant_id is extracted from bearer tokens
+    # automatically. See test_multi_tenancy_oauth_e2e.py for the full
+    # auth-enabled pattern.
     server = MCPServer("multi-tenant-demo")
 
     # -- Tenant "acme" (analytics company) ---------------------------------

src/mcp/server/mcpserver/server.py

@@ -632,6 +632,18 @@ def add_resource(self, resource: Resource, *, tenant_id: str | None = None) -> N
         """
         self._resource_manager.add_resource(resource, tenant_id=tenant_id)
 
+    def remove_resource(self, uri: AnyUrl | str, *, tenant_id: str | None = None) -> None:
+        """Remove a resource from the server by URI.
+
+        Args:
+            uri: The URI of the resource to remove
+            tenant_id: Optional tenant scope for the resource
+
+        Raises:
+            ValueError: If the resource does not exist
+        """
+        self._resource_manager.remove_resource(uri, tenant_id=tenant_id)
+
     def resource(
         self,
         uri: str,
@@ -753,6 +765,18 @@ def add_prompt(self, prompt: Prompt, *, tenant_id: str | None = None) -> None:
         """
         self._prompt_manager.add_prompt(prompt, tenant_id=tenant_id)
 
+    def remove_prompt(self, name: str, *, tenant_id: str | None = None) -> None:
+        """Remove a prompt from the server by name.
+
+        Args:
+            name: The name of the prompt to remove
+            tenant_id: Optional tenant scope for the prompt
+
+        Raises:
+            ValueError: If the prompt does not exist
+        """
+        self._prompt_manager.remove_prompt(name, tenant_id=tenant_id)
+
     def prompt(
         self,
         name: str | None = None,

tests/server/mcpserver/test_multi_tenancy_server.py

@@ -252,6 +252,85 @@ def my_tool() -> str:  # pragma: no cover
     assert len(tools_b) == 1
 
 
+async def test_remove_resource_with_tenant_id():
+    """remove_resource respects tenant scope and does not affect other tenants."""
+    server = MCPServer("test")
+
+    resource_a = FunctionResource(uri="file:///data", name="data-a", fn=lambda: "a")
+    resource_b = FunctionResource(uri="file:///data", name="data-b", fn=lambda: "b")
+
+    server.add_resource(resource_a, tenant_id="tenant-a")
+    server.add_resource(resource_b, tenant_id="tenant-b")
+
+    server.remove_resource("file:///data", tenant_id="tenant-a")
+
+    resources_a = await server.list_resources(tenant_id="tenant-a")
+    resources_b = await server.list_resources(tenant_id="tenant-b")
+
+    assert len(resources_a) == 0
+    assert len(resources_b) == 1
+    assert resources_b[0].name == "data-b"
+
+    # Tenant B can still read their resource
+    results = await server.read_resource("file:///data", tenant_id="tenant-b")
+    contents = list(results)
+    assert len(contents) == 1
+    assert contents[0].content == "b"
+
+    # Tenant A's resource is gone
+    from mcp.server.mcpserver.exceptions import ResourceError
+
+    with pytest.raises(ResourceError, match="Unknown resource"):
+        await server.read_resource("file:///data", tenant_id="tenant-a")
+
+
+async def test_remove_resource_nonexistent_raises():
+    """Removing a non-existent resource raises ValueError."""
+    server = MCPServer("test")
+
+    with pytest.raises(ValueError, match="Unknown resource"):
+        server.remove_resource("file:///nope", tenant_id="tenant-a")
+
+
+async def test_remove_prompt_with_tenant_id():
+    """remove_prompt respects tenant scope and does not affect other tenants."""
+    server = MCPServer("test")
+
+    async def prompt_a() -> str:
+        return "Hello from A"
+
+    async def prompt_b() -> str:
+        return "Hello from B"
+
+    server.add_prompt(Prompt.from_function(prompt_a, name="greet"), tenant_id="tenant-a")
+    server.add_prompt(Prompt.from_function(prompt_b, name="greet"), tenant_id="tenant-b")
+
+    server.remove_prompt("greet", tenant_id="tenant-a")
+
+    prompts_a = await server.list_prompts(tenant_id="tenant-a")
+    prompts_b = await server.list_prompts(tenant_id="tenant-b")
+
+    assert len(prompts_a) == 0
+    assert len(prompts_b) == 1
+
+    # Tenant B can still render their prompt
+    result = await server.get_prompt("greet", tenant_id="tenant-b")
+    assert result.messages is not None
+    assert len(result.messages) > 0
+
+    # Tenant A's prompt is gone
+    with pytest.raises(ValueError, match="Unknown prompt"):
+        await server.get_prompt("greet", tenant_id="tenant-a")
+
+
+async def test_remove_prompt_nonexistent_raises():
+    """Removing a non-existent prompt raises ValueError."""
+    server = MCPServer("test")
+
+    with pytest.raises(ValueError, match="Unknown prompt"):
+        server.remove_prompt("nope", tenant_id="tenant-a")
+
+
 # --- Backward compatibility ---
 
 

tests/server/mcpserver/test_server.py

@@ -1481,3 +1481,128 @@ async def test_report_progress_passes_related_request_id():
         message="halfway",
         related_request_id="req-abc-123",
     )
+
+
+# --- remove_resource / remove_prompt on MCPServer ---
+
+
+async def test_remove_resource():
+    """Test removing a resource from the server."""
+    mcp = MCPServer()
+    resource = FunctionResource(uri="resource://test", name="test", fn=lambda: "data")
+    mcp.add_resource(resource)
+
+    assert len(mcp._resource_manager.list_resources()) == 1
+
+    mcp.remove_resource("resource://test")
+
+    assert len(mcp._resource_manager.list_resources()) == 0
+
+
+async def test_remove_nonexistent_resource():
+    """Test that removing a non-existent resource raises ValueError."""
+    mcp = MCPServer()
+
+    with pytest.raises(ValueError, match="Unknown resource"):
+        mcp.remove_resource("resource://nope")
+
+
+async def test_remove_resource_and_list():
+    """Test that a removed resource doesn't appear in list_resources."""
+    mcp = MCPServer()
+    mcp.add_resource(FunctionResource(uri="resource://a", name="a", fn=lambda: "a"))
+    mcp.add_resource(FunctionResource(uri="resource://b", name="b", fn=lambda: "b"))
+
+    async with Client(mcp) as client:
+        resources = await client.list_resources()
+        assert len(resources.resources) == 2
+
+    mcp.remove_resource("resource://a")
+
+    async with Client(mcp) as client:
+        resources = await client.list_resources()
+        assert len(resources.resources) == 1
+        assert resources.resources[0].name == "b"
+
+
+async def test_remove_resource_and_read():
+    """Test that reading a removed resource fails."""
+    mcp = MCPServer()
+    mcp.add_resource(FunctionResource(uri="resource://test", name="test", fn=lambda: "data"))
+
+    async with Client(mcp) as client:
+        result = await client.read_resource("resource://test")
+        assert isinstance(result.contents[0], TextResourceContents)
+        assert result.contents[0].text == "data"
+
+    mcp.remove_resource("resource://test")
+
+    async with Client(mcp) as client:
+        with pytest.raises(MCPError, match="Unknown resource"):
+            await client.read_resource("resource://test")
+
+
+async def test_remove_prompt():
+    """Test removing a prompt from the server."""
+    mcp = MCPServer()
+
+    @mcp.prompt()
+    def greet() -> str:  # pragma: no cover
+        return "Hello"
+
+    assert len(mcp._prompt_manager.list_prompts()) == 1
+
+    mcp.remove_prompt("greet")
+
+    assert len(mcp._prompt_manager.list_prompts()) == 0
+
+
+async def test_remove_nonexistent_prompt():
+    """Test that removing a non-existent prompt raises ValueError."""
+    mcp = MCPServer()
+
+    with pytest.raises(ValueError, match="Unknown prompt"):
+        mcp.remove_prompt("nope")
+
+
+async def test_remove_prompt_and_list():
+    """Test that a removed prompt doesn't appear in list_prompts."""
+    mcp = MCPServer()
+
+    @mcp.prompt()
+    def greet() -> str:  # pragma: no cover
+        return "Hello"
+
+    @mcp.prompt()
+    def farewell() -> str:  # pragma: no cover
+        return "Goodbye"
+
+    async with Client(mcp) as client:
+        prompts = await client.list_prompts()
+        assert len(prompts.prompts) == 2
+
+    mcp.remove_prompt("greet")
+
+    async with Client(mcp) as client:
+        prompts = await client.list_prompts()
+        assert len(prompts.prompts) == 1
+        assert prompts.prompts[0].name == "farewell"
+
+
+async def test_remove_prompt_and_get():
+    """Test that getting a removed prompt fails."""
+    mcp = MCPServer()
+
+    @mcp.prompt()
+    def greet() -> str:
+        return "Hello"
+
+    async with Client(mcp) as client:
+        result = await client.get_prompt("greet")
+        assert result.messages is not None
+
+    mcp.remove_prompt("greet")
+
+    async with Client(mcp) as client:
+        with pytest.raises(MCPError, match="Unknown prompt"):
+            await client.get_prompt("greet")