ClientSessionGroup raises KeyError when a server exposes no tools, resources or prompts

Initial Checks

• I confirm that I'm using the newest release of my line (the latest 2.x, or the latest 1.x if I'm still on v1)
• I confirm that I searched for my issue in https://github.com/modelcontextprotocol/python-sdk/issues before opening this issue

Release line

2.x (current stable), and it reproduces on the latest 1.x too.

Description

Connecting a ClientSessionGroup to a server that registers nothing fails with a raw KeyError. A server that registers even one tool, resource or prompt is fine.

_aggregate_components ends with this cleanup step, which only runs when all three list calls came back empty (session_group.py:420 on 2.1.0):

# 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

Two different things go wrong depending on how you got there.

Via connect_with_session(), the key was never inserted, so the del raises KeyError. That is the traceback below.

Via connect_to_server(), the key does exist, so the del succeeds. It removes the bookkeeping entry without closing the stack. The next lines then register the session in self._sessions anyway, so the group reports the session as connected while holding no way to close it. Calling disconnect_from_server() afterwards takes the session_known_for_stack is False branch and returns without closing anything, so the transport stays open until the whole group is torn down. I confirmed this by pre-registering a stack with a close callback and watching the callback never fire.

What I expected: connecting to a server that exposes nothing should either succeed with an empty component set, or fail with a clear error. If the group decides to drop the session, the exit stack should be closed rather than forgotten.

Two smaller things in the same condition, for whoever picks this up. The comment says "clean up exit stack" but the code only forgets it. And not any(...) treats "the server legitimately exposes nothing" and "all three list calls raised" as the same case, which may deserve separating.

Example Code

import anyio
import mcp_types as types
from mcp.client.client import Client
from mcp.client.session_group import ClientSessionGroup
from mcp.server.mcpserver import MCPServer

INFO = types.Implementation(name="empty", version="1.0")


async def main() -> None:
    # A server that registers no tools, no resources and no prompts.
    async with Client(MCPServer("empty")) as client:
        group = ClientSessionGroup()
        await group.connect_with_session(INFO, client.session)


anyio.run(main)

Output:

  File ".../mcp/client/session_group.py", line 420, in _aggregate_components
    del self._session_exit_stacks[session]  # pragma: no cover
        ~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^
KeyError: <mcp.client.session.ClientSession object at 0x77e8450e16a0>

Python & MCP Python SDK

Python 3.13.11, Linux.

mcp 2.1.0  (latest 2.x): fails at session_group.py:420
mcp 1.29.1 (latest 1.x): fails at session_group.py:409
Also reproduces on main at d8b63830.

Reported with AI assistance; I ran the reproduction above and read the output.

Beginne in mcp/client/session_group.py bei _aggregate_components ungefähr in Zeile 420 und führe dann das Empty-Server-Beispiel aus dem Issue durch connect_with_session() und connect_to_server() aus. Prüfe die vorhandenen Pfade zur Sitzungsbereinigung und disconnect_from_server(); fertig ist die Änderung, wenn leere Server keine KeyError mehr auslösen und jeder verworfene Session-Stack ordnungsgemäß geschlossen wird, mit Abdeckung für beide Verbindungspfade.