Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/mcp/server/lowlevel/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,11 @@ def get_capabilities(
handshake-era derivation applies unchanged.
"""
notification_options = notification_options or NotificationOptions()
# Normalized here rather than only at the create_initialization_options()
# call site, so server/discover (which calls this directly with no
# experimental_capabilities argument) reports {} instead of None for the
# same unconfigured server.
experimental_capabilities = experimental_capabilities or {}
prompts_capability = None
resources_capability = None
tools_capability = None
Expand Down
21 changes: 21 additions & 0 deletions tests/server/lowlevel/test_server_discover.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,27 @@ async def list_prompts(
assert after.capabilities.prompts is not None


@pytest.mark.anyio
async def test_experimental_capability_is_empty_dict_not_none_when_unset() -> None:
"""SDK-defined: an unconfigured server's `experimental` capability is `{}`
on both discovery paths, matching `create_initialization_options()`.

`get_capabilities()` used to leave `experimental` at its own parameter
default (`None`) unless the caller normalized it first;
`create_initialization_options()` did that normalization, but
`server/discover` calls `get_capabilities()` directly and did not - so the
same unconfigured server reported `{}` via `initialize` and `None` via
`server/discover`. See https://github.com/modelcontextprotocol/python-sdk/issues/3254
"""
server = Server("cap-server")

legacy_capabilities = server.create_initialization_options().capabilities
discovered = await _discover(server)

assert legacy_capabilities.experimental == {}
assert discovered.capabilities.experimental == {}


@pytest.mark.anyio
async def test_discover_result_defaults_to_immediately_stale_private_cache() -> None:
"""SDK-defined: `DiscoverResult` is cacheable; the auto-derived handler
Expand Down
Loading