Skip to content

Your lightweight open-source personal agent.

fix(mcp): load all pages of server tools before registration

Kail Tianf62e0da9f6ac
diff --git a/nanobot/agent/tools/mcp.py b/nanobot/agent/tools/mcp.py
index 4409cbdda..35ab9aa90 100644
--- a/nanobot/agent/tools/mcp.py
+++ b/nanobot/agent/tools/mcp.py
@@ -1011,7 +1011,7 @@ async def connect_mcp_servers(
entered the MCP SDK contexts alive so reconnect and shutdown can close
AnyIO cancel scopes from their owning task.
"""
- from mcp import ClientSession, StdioServerParameters
+ from mcp import ClientSession, StdioServerParameters, types
from mcp.client.sse import sse_client
from mcp.client.stdio import stdio_client
from mcp.client.streamable_http import streamable_http_client
@@ -1139,14 +1139,25 @@ async def connect_mcp_servers(
session = await server_stack.enter_async_context(ClientSession(read, write))
await session.initialize()
- tools = await session.list_tools()
+ # Finish discovery before registering tools so a failed page leaves no partial set.
+ page = await session.list_tools()
+ tool_defs = list(page.tools)
+ seen_cursors: set[str] = set()
+ while page.nextCursor is not None:
+ cursor = page.nextCursor
+ if cursor in seen_cursors:
+ raise ValueError("MCP tools/list returned a repeated pagination cursor")
+ seen_cursors.add(cursor)
+ page = await session.list_tools(params=types.PaginatedRequestParams(cursor=cursor))
+ tool_defs.extend(page.tools)
+
enabled_tools = set(cfg.enabled_tools)
allow_all_tools = "*" in enabled_tools
registered_count = 0
matched_enabled_tools: set[str] = set()
- available_raw_names = [tool_def.name for tool_def in tools.tools]
- available_wrapped_names = [_sanitize_mcp_tool_name(f"mcp_{name}_{tool_def.name}") for tool_def in tools.tools]
- for tool_def in tools.tools:
+ available_raw_names = [tool_def.name for tool_def in tool_defs]
+ available_wrapped_names = [_sanitize_mcp_tool_name(f"mcp_{name}_{tool_def.name}") for tool_def in tool_defs]
+ for tool_def in tool_defs:
wrapped_name = _sanitize_mcp_tool_name(f"mcp_{name}_{tool_def.name}")
if (
not allow_all_tools
diff --git a/tests/tools/test_mcp_tool.py b/tests/tools/test_mcp_tool.py
index 12feb2d63..636a12132 100644
--- a/tests/tools/test_mcp_tool.py
+++ b/tests/tools/test_mcp_tool.py
@@ -82,6 +82,7 @@ def _fake_mcp_module(
TextResourceContents=_FakeTextResourceContents,
BlobResourceContents=_FakeBlobResourceContents,
ImageContent=_FakeImageContent,
+ PaginatedRequestParams=SimpleNamespace,
)
class _FakeStdioServerParameters:
@@ -756,11 +757,99 @@ def _make_fake_session(tool_names: list[str]) -> SimpleNamespace:
return None
async def list_tools() -> SimpleNamespace:
- return SimpleNamespace(tools=[_make_tool_def(name) for name in tool_names])
+ return SimpleNamespace(tools=[_make_tool_def(name) for name in tool_names], nextCursor=None)
return SimpleNamespace(initialize=initialize, list_tools=list_tools)
+ ("enabled_tools", "expected_names"),
+ [
+ pytest.param(["*"], ["first", "second"], id="wildcard"),
+ pytest.param(["second"], ["second"], id="raw-allowlist"),
+ pytest.param(["mcp_test_second"], ["second"], id="wrapped-allowlist"),
+ pytest.param([], [], id="deny-all"),
+ ],
+)
+async def test_connect_mcp_servers_loads_all_tool_pages(
+ fake_mcp_runtime: dict[str, object | None],
+ enabled_tools: list[str],
+ expected_names: list[str],
+) -> None:
+ cursors: list[str | None] = []
+ pages = {
+ None: SimpleNamespace(tools=[_make_tool_def("first")], nextCursor=""),
+ "": SimpleNamespace(tools=[], nextCursor="opaque:+/="),
+ "opaque:+/=": SimpleNamespace(tools=[_make_tool_def("second")], nextCursor=None),
+ }
+
+ async def list_tools(*, params: SimpleNamespace | None = None) -> SimpleNamespace:
+ cursor = params.cursor if params is not None else None
+ cursors.append(cursor)
+ return pages[cursor]
+
+ session = _make_fake_session([])
+ session.list_tools = list_tools
+ session.call_tool = AsyncMock(
+ return_value=SimpleNamespace(content=[_FakeTextContent("second page result")])
+ )
+ fake_mcp_runtime["session"] = session
+ registry = ToolRegistry()
+ stacks = await connect_mcp_servers(
+ {"test": MCPServerConfig(command="fake", enabled_tools=enabled_tools)}, registry,
+ )
+ try:
+ assert set(stacks) == {"test"}
+ assert cursors == [None, "", "opaque:+/="]
+ expected = [f"mcp_test_{name}" for name in expected_names]
+ assert registry.tool_names == expected
+ assert [tool["function"]["name"] for tool in registry.get_definitions()] == expected
+ if expected_names:
+ assert await registry.execute("mcp_test_second", {}) == "second page result"
+ session.call_tool.assert_awaited_once_with("second", arguments={})
+ else:
+ session.call_tool.assert_not_awaited()
+ finally:
+ for stack in stacks.values():
+ await stack.aclose()
+
+
[email protected]("failure", ["request-error", "repeated-cursor"])
+async def test_connect_mcp_servers_pagination_failure_registers_no_tools(
+ fake_mcp_runtime: dict[str, object | None], failure: str,
+) -> None:
+ cursors: list[str | None] = []
+
+ async def list_tools(*, params: SimpleNamespace | None = None) -> SimpleNamespace:
+ cursor = params.cursor if params is not None else None
+ cursors.append(cursor)
+ if cursor is None:
+ return SimpleNamespace(tools=[_make_tool_def("first")], nextCursor="next")
+ if failure == "request-error":
+ raise RuntimeError("second page failed")
+ if len(cursors) > 2:
+ raise AssertionError("A repeated cursor must not be requested again")
+ return SimpleNamespace(tools=[_make_tool_def("second")], nextCursor="next")
+
+ session = _make_fake_session([])
+ session.list_tools = list_tools
+ fake_mcp_runtime["session"] = session
+ registry = ToolRegistry()
+ stacks = await connect_mcp_servers(
+ {"test": MCPServerConfig(command="fake")}, registry,
+ )
+ try:
+ assert cursors == [None, "next"]
+ assert stacks == {}
+ assert registry.tool_names == []
+ assert registry.get_definitions() == []
+ finally:
+ for stack in stacks.values():
+ await stack.aclose()
+
+
@pytest.mark.asyncio
@pytest.mark.parametrize(
"enabled_tool",
@@ -1790,7 +1879,7 @@ def _make_fake_session_with_capabilities(
return None
async def list_tools() -> SimpleNamespace:
- return SimpleNamespace(tools=[_make_tool_def(name) for name in tool_names])
+ return SimpleNamespace(tools=[_make_tool_def(name) for name in tool_names], nextCursor=None)
async def list_resources() -> SimpleNamespace:
resources = []