From 7d7f2c326bb039f81d207514dcec7a5a1bf32308 Mon Sep 17 00:00:00 2001
From: xb <361487867@qq.com>
Date: Sun, 30 Aug 2026 19:07:01 +0000
Subject: [PATCH] Fix KeyError and exit stack leak on empty servers in
 ClientSessionGroup (#3384)

- Avoid attempting to delete session from _session_exit_stacks in _aggregate_components when a server exposes no tools, resources, or prompts
- Fixes KeyError on connect_with_session with empty servers
- Preserves exit stack tracking on connect_to_server so disconnect_from_server can cleanly aclose the stack
- Add comprehensive unit tests for both connection modes with empty servers
---
 src/mcp/client/session_group.py    |  5 ---
 tests/client/test_session_group.py | 50 ++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/mcp/client/session_group.py b/src/mcp/client/session_group.py
index a544cecbe8..03f6786c24 100644
--- a/src/mcp/client/session_group.py
+++ b/src/mcp/client/session_group.py
@@ -414,11 +414,6 @@ async def _aggregate_components(self, server_info: types.Implementation, session
         except MCPError as err:  # pragma: no cover
             logging.warning(f"Could not fetch tools: {err}")
 
-        # Clean up exit stack for session if we couldn't retrieve anything
-        # from the server.
-        if not any((prompts_temp, resources_temp, tools_temp)):
-            del self._session_exit_stacks[session]  # pragma: no cover
-
         # Check for duplicates.
         matching_prompts = prompts_temp.keys() & self._prompts.keys()
         if matching_prompts:
diff --git a/tests/client/test_session_group.py b/tests/client/test_session_group.py
index b75d22b7a0..5ca01c2a19 100644
--- a/tests/client/test_session_group.py
+++ b/tests/client/test_session_group.py
@@ -402,3 +402,53 @@ async def test_client_session_group_establish_session_parameterized(
             # 3. Assert returned values
             assert returned_server_info is mock_initialize_result.server_info
             assert returned_session is mock_entered_session
+
+
+@pytest.mark.anyio
+async def test_client_session_group_connect_empty_server_with_session():
+    mock_session = mock.AsyncMock()
+    mock_session.list_prompts.return_value = types.ListPromptsResult(prompts=[])
+    mock_session.list_resources.return_value = types.ListResourcesResult(resources=[])
+    mock_session.list_tools.return_value = types.ListToolsResult(tools=[])
+
+    group = ClientSessionGroup()
+    server_info = types.Implementation(name="empty-server", version="1.0")
+
+    # Connecting an empty server via connect_with_session should succeed without KeyError
+    await group.connect_with_session(server_info, mock_session)
+    assert mock_session in group._sessions
+    assert group.tools == {}
+    assert group.resources == {}
+    assert group.prompts == {}
+
+    # Disconnecting should also work cleanly
+    await group.disconnect_from_server(mock_session)
+    assert mock_session not in group._sessions
+
+
+@pytest.mark.anyio
+async def test_client_session_group_connect_empty_server_via_connect_to_server():
+    mock_server_params = mock.Mock(spec=StdioServerParameters)
+    mock_session = mock.AsyncMock()
+    mock_session.list_prompts.return_value = types.ListPromptsResult(prompts=[])
+    mock_session.list_resources.return_value = types.ListResourcesResult(resources=[])
+    mock_session.list_tools.return_value = types.ListToolsResult(tools=[])
+
+    mock_stack = mock.AsyncMock(spec=contextlib.AsyncExitStack)
+    server_info = types.Implementation(name="empty-server", version="1.0")
+
+    group = ClientSessionGroup()
+    with mock.patch.object(group, "_establish_session", return_value=(server_info, mock_session)):
+        # Simulate exit stack registered during establish_session
+        group._session_exit_stacks[mock_session] = mock_stack
+        session = await group.connect_to_server(mock_server_params)
+
+        assert session is mock_session
+        assert mock_session in group._sessions
+        assert mock_session in group._session_exit_stacks
+
+        # When disconnecting, the exit stack must be cleanly closed
+        await group.disconnect_from_server(mock_session)
+        assert mock_session not in group._sessions
+        assert mock_session not in group._session_exit_stacks
+        mock_stack.aclose.assert_awaited_once()