Skip to content

Commit 85fafa3

Browse files
committed
feat(client): store full InitializeResult as server_params
ClientSession now stores the complete InitializeResult via a server_params property, mirroring ServerSession.client_params. This provides access to server_info, capabilities, instructions, and the negotiated protocol_version through a single, future-proof property. Previously, only capabilities were stored (via _server_capabilities) and users had no access to server_info, instructions, or protocol_version after initialize() returned — they had to manually capture the return value. get_server_capabilities() and Client.server_capabilities have been removed. Github-Issue: #1018
1 parent abfb482 commit 85fafa3

File tree

6 files changed

+55
-26
lines changed

6 files changed

+55
-26
lines changed

docs/migration.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,30 @@ result = await session.list_resources(params=PaginatedRequestParams(cursor="next
169169
result = await session.list_tools(params=PaginatedRequestParams(cursor="next_page_token"))
170170
```
171171

172+
### `ClientSession.get_server_capabilities()` replaced by `server_params` property
173+
174+
`ClientSession` now stores the full `InitializeResult` via a `server_params` property, mirroring `ServerSession.client_params`. This is the new way to access server metadata after initialization — `server_info`, `capabilities`, `instructions`, and the negotiated `protocol_version` are all available through this single property. The `get_server_capabilities()` method has been removed.
175+
176+
**Before (v1):**
177+
178+
```python
179+
capabilities = session.get_server_capabilities()
180+
# server_info, instructions, protocol_version were not stored — had to capture initialize() return value
181+
```
182+
183+
**After (v2):**
184+
185+
```python
186+
params = session.server_params
187+
if params is not None:
188+
capabilities = params.capabilities
189+
server_info = params.server_info
190+
instructions = params.instructions
191+
version = params.protocol_version
192+
```
193+
194+
The high-level `Client.server_capabilities` property has similarly been replaced by `Client.server_params`.
195+
172196
### `McpError` renamed to `MCPError`
173197

174198
The `McpError` exception class has been renamed to `MCPError` for consistent naming with the MCP acronym style used throughout the SDK.

src/mcp/client/client.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
EmptyResult,
2020
GetPromptResult,
2121
Implementation,
22+
InitializeResult,
2223
ListPromptsResult,
2324
ListResourcesResult,
2425
ListResourceTemplatesResult,
@@ -29,7 +30,6 @@
2930
ReadResourceResult,
3031
RequestParamsMeta,
3132
ResourceTemplateReference,
32-
ServerCapabilities,
3333
)
3434

3535

@@ -155,9 +155,12 @@ def session(self) -> ClientSession:
155155
return self._session
156156

157157
@property
158-
def server_capabilities(self) -> ServerCapabilities | None:
159-
"""The server capabilities received during initialization, or None if not yet initialized."""
160-
return self.session.get_server_capabilities()
158+
def server_params(self) -> InitializeResult | None:
159+
"""The server's initialization response. None if not yet initialized.
160+
161+
Contains server_info, capabilities, instructions, and the negotiated protocol_version.
162+
"""
163+
return self.session.server_params
161164

162165
async def send_ping(self, *, meta: RequestParamsMeta | None = None) -> EmptyResult:
163166
"""Send a ping request to the server."""

src/mcp/client/session.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def __init__(
131131
self._logging_callback = logging_callback or _default_logging_callback
132132
self._message_handler = message_handler or _default_message_handler
133133
self._tool_output_schemas: dict[str, dict[str, Any] | None] = {}
134-
self._server_capabilities: types.ServerCapabilities | None = None
134+
self._server_params: types.InitializeResult | None = None
135135
self._experimental_features: ExperimentalClientFeatures | None = None
136136

137137
# Experimental: Task handlers (use defaults if not provided)
@@ -185,18 +185,20 @@ async def initialize(self) -> types.InitializeResult:
185185
if result.protocol_version not in SUPPORTED_PROTOCOL_VERSIONS:
186186
raise RuntimeError(f"Unsupported protocol version from the server: {result.protocol_version}")
187187

188-
self._server_capabilities = result.capabilities
188+
self._server_params = result
189189

190190
await self.send_notification(types.InitializedNotification())
191191

192192
return result
193193

194-
def get_server_capabilities(self) -> types.ServerCapabilities | None:
195-
"""Return the server capabilities received during initialization.
194+
@property
195+
def server_params(self) -> types.InitializeResult | None:
196+
"""The server's initialization response. None if not yet initialized.
196197
197-
Returns None if the session has not been initialized yet.
198+
Mirrors ServerSession.client_params. Contains server_info, capabilities,
199+
instructions, and the negotiated protocol_version.
198200
"""
199-
return self._server_capabilities
201+
return self._server_params
200202

201203
@property
202204
def experimental(self) -> ExperimentalClientFeatures:

tests/client/test_client.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ def greeting_prompt(name: str) -> str:
9999
async def test_client_is_initialized(app: MCPServer):
100100
"""Test that the client is initialized after entering context."""
101101
async with Client(app) as client:
102-
assert client.server_capabilities == snapshot(
102+
assert client.server_params is not None
103+
assert client.server_params.capabilities == snapshot(
103104
ServerCapabilities(
104105
experimental={},
105106
prompts=PromptsCapability(list_changed=False),

tests/client/test_session.py

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -540,8 +540,8 @@ async def mock_server():
540540

541541

542542
@pytest.mark.anyio
543-
async def test_get_server_capabilities():
544-
"""Test that get_server_capabilities returns None before init and capabilities after"""
543+
async def test_server_params():
544+
"""Test that server_params is None before init and contains the full result after."""
545545
client_to_server_send, client_to_server_receive = anyio.create_memory_object_stream[SessionMessage](1)
546546
server_to_client_send, server_to_client_receive = anyio.create_memory_object_stream[SessionMessage](1)
547547

@@ -551,6 +551,8 @@ async def test_get_server_capabilities():
551551
resources=types.ResourcesCapability(subscribe=True, list_changed=True),
552552
tools=types.ToolsCapability(list_changed=False),
553553
)
554+
expected_server_info = Implementation(name="mock-server", version="0.1.0")
555+
expected_instructions = "Use the tools wisely."
554556

555557
async def mock_server():
556558
session_message = await client_to_server_receive.receive()
@@ -564,7 +566,8 @@ async def mock_server():
564566
result = InitializeResult(
565567
protocol_version=LATEST_PROTOCOL_VERSION,
566568
capabilities=expected_capabilities,
567-
server_info=Implementation(name="mock-server", version="0.1.0"),
569+
server_info=expected_server_info,
570+
instructions=expected_instructions,
568571
)
569572

570573
async with server_to_client_send:
@@ -590,21 +593,17 @@ async def mock_server():
590593
server_to_client_send,
591594
server_to_client_receive,
592595
):
593-
assert session.get_server_capabilities() is None
596+
assert session.server_params is None
594597

595598
tg.start_soon(mock_server)
596599
await session.initialize()
597600

598-
capabilities = session.get_server_capabilities()
599-
assert capabilities is not None
600-
assert capabilities == expected_capabilities
601-
assert capabilities.logging is not None
602-
assert capabilities.prompts is not None
603-
assert capabilities.prompts.list_changed is True
604-
assert capabilities.resources is not None
605-
assert capabilities.resources.subscribe is True
606-
assert capabilities.tools is not None
607-
assert capabilities.tools.list_changed is False
601+
params = session.server_params
602+
assert params is not None
603+
assert params.server_info == expected_server_info
604+
assert params.capabilities == expected_capabilities
605+
assert params.instructions == expected_instructions
606+
assert params.protocol_version == LATEST_PROTOCOL_VERSION
608607

609608

610609
@pytest.mark.anyio

tests/client/transports/test_memory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ async def test_with_mcpserver(mcpserver_server: MCPServer):
6969
async def test_server_is_running(mcpserver_server: MCPServer):
7070
"""Test that the server is running and responding to requests."""
7171
async with Client(mcpserver_server) as client:
72-
assert client.server_capabilities is not None
72+
assert client.server_params is not None
7373

7474

7575
async def test_list_tools(mcpserver_server: MCPServer):

0 commit comments

Comments
 (0)