Skip to content

Personal AI, On Personal Devices

Python

fix(mcp): close MCPClient on failed initialize() to prevent leaks (#800)

havolline16a776cf0c7ec
diff --git a/src/openjarvis/mcp/loader.py b/src/openjarvis/mcp/loader.py
index 59dfa64f..5382f144 100644
--- a/src/openjarvis/mcp/loader.py
+++ b/src/openjarvis/mcp/loader.py
@@ -101,7 +101,26 @@ def load_mcp_tools_from_config(
continue
client = MCPClient(transport)
- client.initialize()
+ try:
+ client.initialize()
+ except Exception:
+ # Not yet in `clients`, so nothing else will ever close it
+ # (and the underlying subprocess/connection pool) if we
+ # don't do it here (#753).
+ try:
+ client.close()
+ except Exception as cleanup_exc:
+ # Cleanup is best-effort here. Preserve the initialize()
+ # exception as the discovery failure while still making a
+ # failed cleanup visible to operators.
+ logger.warning(
+ "Failed to close MCP client for '%s' after "
+ "initialization failed: %s",
+ name,
+ cleanup_exc,
+ exc_info=True,
+ )
+ raise
clients.append(client)
provider = MCPToolProvider(client)
diff --git a/src/openjarvis/system/builder.py b/src/openjarvis/system/builder.py
index c0467c91..7fc9804a 100644
--- a/src/openjarvis/system/builder.py
+++ b/src/openjarvis/system/builder.py
@@ -675,7 +675,26 @@ class SystemBuilder:
return []
client = MCPClient(transport)
- client.initialize()
+ try:
+ client.initialize()
+ except Exception:
+ # Not yet in self._mcp_clients, so nothing else will ever
+ # close it (and the underlying subprocess/connection pool) if
+ # we don't do it here (#753).
+ try:
+ client.close()
+ except Exception as cleanup_exc:
+ # Do not let a cleanup failure mask the original handshake
+ # error; callers need the initialize() failure to diagnose
+ # the server while operators still need the cleanup signal.
+ logger.warning(
+ "Failed to close MCP client for '%s' after "
+ "initialization failed: %s",
+ name,
+ cleanup_exc,
+ exc_info=True,
+ )
+ raise
self._mcp_clients.append(client)
diff --git a/tests/mcp/test_loader.py b/tests/mcp/test_loader.py
index 627f1d7c..4b6ba371 100644
--- a/tests/mcp/test_loader.py
+++ b/tests/mcp/test_loader.py
@@ -226,3 +226,57 @@ class TestLoaderFailureIsolation:
assert [t.spec.name for t in tools] == ["survivor"]
assert len(clients) == 1
assert any("broken" in r.message for r in caplog.records)
+
+ def test_failed_initialize_closes_the_client(self, _mock_mcp_stack, caplog):
+ """Regression for #753: a client whose initialize() fails must
+ still be closed.
+
+ ``client.initialize()`` was called before ``clients.append(client)``,
+ so a failed handshake left the client out of the returned list --
+ nothing the caller holds ever calls ``close()`` on it, leaking the
+ underlying StdioTransport subprocess or StreamableHTTPTransport
+ connection pool.
+ """
+ from openjarvis.mcp.loader import load_mcp_tools_from_config
+
+ bad_client = MagicMock()
+ bad_client.initialize.side_effect = RuntimeError("handshake failed")
+ _mock_mcp_stack["client"].return_value = bad_client
+
+ cfg = _make_mcp_cfg(
+ enabled=True,
+ servers=[{"name": "broken", "url": "http://broken"}],
+ )
+ with caplog.at_level("WARNING"):
+ tools, clients = load_mcp_tools_from_config(cfg)
+
+ assert clients == []
+ bad_client.close.assert_called_once()
+
+ def test_cleanup_failure_does_not_mask_initialize_error(
+ self, _mock_mcp_stack, caplog
+ ):
+ """The handshake remains the reported discovery failure if close fails."""
+ from openjarvis.mcp.loader import load_mcp_tools_from_config
+
+ bad_client = MagicMock()
+ bad_client.initialize.side_effect = RuntimeError("handshake failed")
+ bad_client.close.side_effect = RuntimeError("cleanup failed")
+ _mock_mcp_stack["client"].return_value = bad_client
+ cfg = _make_mcp_cfg(
+ enabled=True,
+ servers=[{"name": "broken", "url": "http://broken"}],
+ )
+
+ with caplog.at_level("WARNING"):
+ tools, clients = load_mcp_tools_from_config(cfg)
+
+ assert tools == []
+ assert clients == []
+ bad_client.close.assert_called_once()
+ messages = [record.getMessage() for record in caplog.records]
+ assert any("cleanup failed" in message for message in messages)
+ assert any(
+ "Failed to discover MCP tools" in message and "handshake failed" in message
+ for message in messages
+ )
diff --git a/tests/sdk/test_builder_mcp_cleanup.py b/tests/sdk/test_builder_mcp_cleanup.py
new file mode 100644
index 00000000..7378709a
--- /dev/null
+++ b/tests/sdk/test_builder_mcp_cleanup.py
@@ -0,0 +1,58 @@
+"""Regression test for #753: a failed MCP handshake in
+``SystemBuilder._discover_external_mcp`` must not leak the spawned
+subprocess / HTTP client.
+
+``client.initialize()`` used to be called before the client was appended
+to ``self._mcp_clients``. When ``initialize()`` raised (malformed JSON
+output, auth errors, protocol issues), the client was never appended --
+and since nothing else holds a reference to it, ``close()`` never ran,
+leaving the underlying ``StdioTransport`` subprocess or
+``StreamableHTTPTransport`` connection pool running indefinitely.
+"""
+
+from __future__ import annotations
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from openjarvis.core.config import JarvisConfig
+from openjarvis.system.builder import SystemBuilder
+
+
+def _mock_mcp_stack():
+ """Patch MCPClient / transports / MCPToolProvider so no real I/O happens."""
+ with (
+ patch("openjarvis.mcp.client.MCPClient") as MockClient,
+ patch("openjarvis.mcp.transport.StreamableHTTPTransport") as MockHttp,
+ patch("openjarvis.mcp.transport.StdioTransport") as MockStdio,
+ patch("openjarvis.tools.mcp_adapter.MCPToolProvider") as MockProvider,
+ ):
+ MockProvider.return_value.discover.return_value = []
+ MockClient.return_value.initialize.return_value = None
+ yield {
+ "client": MockClient,
+ "http": MockHttp,
+ "stdio": MockStdio,
+ "provider": MockProvider,
+ }
+
+
+def test_failed_initialize_closes_the_client(_mock_mcp_stack, caplog):
+ builder = SystemBuilder(config=JarvisConfig())
+
+ bad_client = MagicMock()
+ bad_client.initialize.side_effect = RuntimeError("handshake failed")
+ bad_client.close.side_effect = RuntimeError("cleanup failed")
+ _mock_mcp_stack["client"].return_value = bad_client
+
+ with (
+ caplog.at_level("WARNING"),
+ pytest.raises(RuntimeError, match="handshake failed"),
+ ):
+ builder._discover_external_mcp({"name": "broken", "url": "http://broken"})
+
+ assert bad_client not in builder._mcp_clients
+ bad_client.close.assert_called_once()
+ assert any("cleanup failed" in record.getMessage() for record in caplog.records)