Skip to content
Merged
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
2 changes: 1 addition & 1 deletion src/agents/mcp/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ def __init__(
suppress_cancelled_error: bool = True,
connect_in_parallel: bool = False,
) -> None:
self._all_servers = list(servers)
self._all_servers = self._unique_servers(servers)
self._active_servers = list(self._all_servers)
self.connect_timeout_seconds = connect_timeout_seconds
self.cleanup_timeout_seconds = cleanup_timeout_seconds
Expand Down
16 changes: 16 additions & 0 deletions tests/mcp/test_mcp_server_manager_cleanup_state.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,22 @@ async def test_cleanup_all_removes_cleaned_servers_from_active_servers() -> None
assert server.connect.await_count == 2


@pytest.mark.asyncio
async def test_manager_owns_repeated_server_instance_once() -> None:
server = cast(MCPServer, Mock(spec=MCPServer))
server.connect = AsyncMock()
server.cleanup = AsyncMock()

manager = MCPServerManager([server, server])

assert manager.all_servers == [server]
assert await manager.connect_all() == [server]
await manager.cleanup_all()

server.connect.assert_awaited_once()
server.cleanup.assert_awaited_once()


@pytest.mark.asyncio
async def test_cleanup_all_refreshes_active_servers_when_cancellation_propagates() -> None:
server = cast(MCPServer, Mock(spec=MCPServer))
Expand Down
Loading