fix(mcp): reset client session stack state after cleanup

Author: OiPunk

src/agents/mcp/server.py

@@ -709,7 +709,12 @@ async def cleanup(self):
                 else:
                     logger.error(f"Error cleaning up server: {e}")
             finally:
+                # Always reset the exit stack so we don't retain callbacks/references from the
+                # previous connection. This keeps teardown deterministic and allows reconnecting
+                # with a fresh stack even if cleanup encountered recoverable errors.
+                self.exit_stack = AsyncExitStack()
                 self.session = None
+                self.server_initialize_result = None
 
 
 class MCPServerStdioParams(TypedDict):

tests/mcp/test_connect_disconnect.py

@@ -8,6 +8,18 @@
 from .helpers import DummyStreamsContextManager, tee
 
 
+class CountingStreamsContextManager:
+    def __init__(self, counter: dict[str, int]):
+        self.counter = counter
+
+    async def __aenter__(self):
+        self.counter["enter"] += 1
+        return (object(), object())
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        self.counter["exit"] += 1
+
+
 @pytest.mark.asyncio
 @patch("mcp.client.stdio.stdio_client", return_value=DummyStreamsContextManager())
 @patch("mcp.client.session.ClientSession.initialize", new_callable=AsyncMock, return_value=None)
@@ -67,3 +79,33 @@ async def test_manual_connect_disconnect_works(
 
     await server.cleanup()
     assert server.session is None, "Server should be disconnected"
+
+
+@pytest.mark.asyncio
+@patch("agents.mcp.server.ClientSession.initialize", new_callable=AsyncMock, return_value=None)
+@patch("agents.mcp.server.stdio_client")
+async def test_cleanup_resets_exit_stack_and_reconnects(
+    mock_stdio_client: AsyncMock, mock_initialize: AsyncMock
+):
+    counter = {"enter": 0, "exit": 0}
+    mock_stdio_client.side_effect = lambda params: CountingStreamsContextManager(counter)
+
+    server = MCPServerStdio(
+        params={
+            "command": tee,
+        },
+        cache_tools_list=True,
+    )
+
+    await server.connect()
+    original_exit_stack = server.exit_stack
+
+    await server.cleanup()
+    assert server.session is None
+    assert server.exit_stack is not original_exit_stack
+    assert server.server_initialize_result is None
+    assert counter == {"enter": 1, "exit": 1}
+
+    await server.connect()
+    await server.cleanup()
+    assert counter == {"enter": 2, "exit": 2}