fix(mcp): eliminate duplicate config loading during startup (#69)

* fix(mcp): eliminate duplicate config loading during startup

load_mcp_config() was called twice on every startup — once in
_mcp_config_signature() to compute the cache key, and again inside
load_mcp_tools(). This caused warnings to appear twice.

Merge the two calls into _load_mcp_config_once() which returns both the
signature and the parsed config, then pass the config through to
load_mcp_tools() via a new optional parameter.

* test(mcp): fix existing cache tests and add coverage for single-load guarantee

- Update fake_load_mcp_tools to accept optional config kwarg
- Add test_load_mcp_config_called_once_per_cache_miss: verifies
  load_mcp_config is called exactly once per cache miss (the bug)
- Add test_cached_config_passed_to_load_mcp_tools: verifies the
  pre-loaded config dict is forwarded to load_mcp_tools

---------

Co-authored-by: Xi Zhang <106144707+X-iZhang@users.noreply.github.com>
This commit is contained in:
dinos
2026-03-19 13:47:47 +01:00
committed by GitHub
parent 7ebaa2cec0
commit ac5ea37d14
3 changed files with 62 additions and 14 deletions
+38 -2
View File
@@ -23,7 +23,7 @@ class TestMcpToolCaching:
lambda: {"srv": {"transport": "stdio", "command": "demo"}},
)
def fake_load_mcp_tools():
def fake_load_mcp_tools(config=None):
calls["load"] += 1
return {"main": [tool]}
@@ -44,7 +44,7 @@ class TestMcpToolCaching:
def fake_load_config():
return state["cfg"]
def fake_load_mcp_tools():
def fake_load_mcp_tools(config=None):
calls["load"] += 1
return {"main": [f"tool-v{calls['load']}"]}
@@ -57,3 +57,39 @@ class TestMcpToolCaching:
assert calls["load"] == 2
assert first != second
def test_load_mcp_config_called_once_per_cache_miss(self, monkeypatch):
"""load_mcp_config should be called exactly once per cache miss,
not twice (once for the signature and once inside load_mcp_tools)."""
calls = {"config": 0}
def counting_load_config():
calls["config"] += 1
return {"srv": {"transport": "stdio", "command": "demo"}}
monkeypatch.setattr(
"EvoScientist.mcp.client.load_mcp_config", counting_load_config
)
monkeypatch.setattr(
"EvoScientist.mcp.load_mcp_tools", lambda config=None: {"main": []}
)
agent_module._load_mcp_tools_cached()
assert calls["config"] == 1
def test_cached_config_passed_to_load_mcp_tools(self, monkeypatch):
"""load_mcp_tools should receive the pre-loaded config dict."""
received = {}
def fake_load_config():
return {"srv": {"transport": "stdio", "command": "demo"}}
def fake_load_mcp_tools(config=None):
received["config"] = config
return {"main": []}
monkeypatch.setattr("EvoScientist.mcp.client.load_mcp_config", fake_load_config)
monkeypatch.setattr("EvoScientist.mcp.load_mcp_tools", fake_load_mcp_tools)
agent_module._load_mcp_tools_cached()
assert received["config"] == {"srv": {"transport": "stdio", "command": "demo"}}