Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
[MCP] Follow nextCursor when listing tools in MCPClient (#4960)
* [MCP] Follow nextCursor when listing tools in MCPClient

add_mcp_server called list_tools() once, so tools past a server's first
tools/list page were never registered, and allowed_tools could filter
down to nothing. Page through with the cursor until nextCursor is empty.

* [MCP] Keep the first list_tools() call cursor-free and require mcp>=1.9.4

mcp 1.8.x's list_tools() takes no cursor at all, and before 1.9.4 the cursor
is sent outside params, so a paginating server returns page one forever.
Call list_tools() plainly first so non-paginated servers behave as before,
and raise the extra's floor to the first release that paginates correctly.
  • Loading branch information
Kayvan-Zahiri authored Sep 22, 2026
commit 7025391af643a9ea220f0ba2c4570250af2c1a3e
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def get_version() -> str:

extras["hf_xet"] = [HF_XET_VERSION]

extras["mcp"] = ["mcp>=1.8.0, <2.0.0"]
extras["mcp"] = ["mcp>=1.9.4, <2.0.0"] # list_tools(cursor=...) only paginates correctly from 1.9.4

extras["testing"] = (
extras["oauth"]
Expand Down
14 changes: 9 additions & 5 deletions src/huggingface_hub/inference/_mcp/mcp_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,17 +210,21 @@ async def add_mcp_server(self, type: ServerType, **params: Any):
logger.debug("Initializing session...")
await session.initialize()

# List available tools
# List available tools, following `nextCursor` since servers may paginate tools/list
response = await session.list_tools()
logger.debug("Connected to server with tools:", [tool.name for tool in response.tools])
tools: list[mcp_types.Tool] = list(response.tools)
while response.nextCursor:
response = await session.list_tools(cursor=response.nextCursor)
tools.extend(response.tools)
logger.debug("Connected to server with tools:", [tool.name for tool in tools])

# Filter tools based on allowed_tools configuration
filtered_tools = response.tools
filtered_tools = tools

if allowed_tools is not None:
filtered_tools = [tool for tool in response.tools if tool.name in allowed_tools]
filtered_tools = [tool for tool in tools if tool.name in allowed_tools]
logger.debug(
f"Tool filtering applied. Using {len(filtered_tools)} of {len(response.tools)} available tools: {[tool.name for tool in filtered_tools]}"
f"Tool filtering applied. Using {len(filtered_tools)} of {len(tools)} available tools: {[tool.name for tool in filtered_tools]}"
)

for tool in filtered_tools:
Expand Down
Loading