Skip to content

Framework for orchestrating role-playing, autonomous AI agents. By fostering collaborative intelligence, CrewAI empowers agents to work together seamlessly, tackling complex tasks.

fix(mcp): name tools from IP-addressed MCP servers so providers accept them (#8117)

Matt Aitchison6115839576d6
diff --git a/lib/crewai/src/crewai/mcp/tool_resolver.py b/lib/crewai/src/crewai/mcp/tool_resolver.py
index 29c2b031c..e4fb7dc2e 100644
--- a/lib/crewai/src/crewai/mcp/tool_resolver.py
+++ b/lib/crewai/src/crewai/mcp/tool_resolver.py
@@ -312,7 +312,9 @@ class MCPToolResolver:
args=mcp_config.args,
env=mcp_config.env,
)
- server_name = f"{mcp_config.command}_{'_'.join(mcp_config.args)}"
+ server_name = MCPToolResolver._ensure_letter_prefix(
+ f"{mcp_config.command}_{'_'.join(mcp_config.args)}"
+ )
elif isinstance(mcp_config, MCPServerHTTP):
transport = HTTPTransport(
url=mcp_config.url,
@@ -527,9 +529,22 @@ class MCPToolResolver:
def _extract_server_name(server_url: str) -> str:
"""Extract clean server name from URL for tool prefixing."""
parsed = urlparse(server_url)
- domain = parsed.netloc.replace(".", "_")
+ # Drop "user:pass@" so URL credentials stay out of tool names.
+ domain = parsed.netloc.rpartition("@")[2].replace(".", "_")
path = parsed.path.replace("/", "_").strip("_")
- return f"{domain}_{path}" if path else domain
+ name = f"{domain}_{path}" if path else domain
+ return MCPToolResolver._ensure_letter_prefix(name)
+
+ @staticmethod
+ def _ensure_letter_prefix(server_name: str) -> str:
+ """Prefix ``mcp_`` when the sanitized server name doesn't start with a letter.
+
+ Provider function names must start with a letter, so a server name such
+ as an IP address would make every tool from that server invalid.
+ """
+ if sanitize_tool_name(server_name)[:1].isalpha():
+ return server_name
+ return f"mcp_{server_name}"
def _get_mcp_tool_schemas(
self, server_params: dict[str, Any]
diff --git a/lib/crewai/tests/mcp/test_tool_resolver_native.py b/lib/crewai/tests/mcp/test_tool_resolver_native.py
index 32e157f63..b65a3a289 100644
--- a/lib/crewai/tests/mcp/test_tool_resolver_native.py
+++ b/lib/crewai/tests/mcp/test_tool_resolver_native.py
@@ -4,7 +4,8 @@ from unittest.mock import AsyncMock, MagicMock, patch
import pytest
from crewai.agent.core import Agent
-from crewai.mcp.config import MCPServerHTTP
+from crewai.llms.providers.utils.common import safe_tool_conversion
+from crewai.mcp.config import MCPServerHTTP, MCPServerStdio
from crewai.mcp.tool_resolver import MCPToolResolver
@@ -96,4 +97,76 @@ class TestResolveNativeRuntimeError:
mock_asyncio_run.side_effect = RuntimeError("some other failure")
with pytest.raises(ConnectionError, match="Failed to get native MCP tools"):
- resolver._resolve_native(http_config)
\ No newline at end of file
+ resolver._resolve_native(http_config)
+
+
+class TestResolveNativeToolNames:
+ @staticmethod
+ def _resolve_tool_names(mock_client_class, resolver, config):
+ mock_client = AsyncMock()
+ mock_client.list_tools = AsyncMock(
+ return_value=[{"name": "add", "description": "Add numbers"}]
+ )
+ mock_client.connected = False
+ mock_client.connect = AsyncMock()
+ mock_client.disconnect = AsyncMock()
+ mock_client_class.return_value = mock_client
+
+ if isinstance(config, str):
+ config = MCPServerHTTP(url=config)
+ tools, _ = resolver._resolve_native(config)
+ return [tool.name for tool in tools]
+
+ @patch("crewai.mcp.tool_resolver.MCPClient")
+ def test_ip_addressed_server_tool_name_passes_provider_validation(
+ self, mock_client_class, resolver
+ ):
+ names = self._resolve_tool_names(
+ mock_client_class, resolver, "http://127.0.0.1:8800/mcp"
+ )
+
+ name, _, _ = safe_tool_conversion(
+ {"name": names[0], "description": "Add numbers"}, "OpenAI"
+ )
+ assert name == "mcp_127_0_0_1_8800_mcp_add"
+
+ @patch("crewai.mcp.tool_resolver.MCPClient")
+ def test_hostname_server_tool_name_is_unchanged(
+ self, mock_client_class, resolver
+ ):
+ names = self._resolve_tool_names(
+ mock_client_class, resolver, "http://localhost:8800/mcp"
+ )
+
+ assert names == ["localhost:8800_mcp_add"]
+
+ @patch("crewai.mcp.tool_resolver.MCPClient")
+ def test_url_credentials_are_not_in_tool_name(self, mock_client_class, resolver):
+ names = self._resolve_tool_names(
+ mock_client_class, resolver, "http://user:[email protected]:8800/mcp"
+ )
+
+ assert names == ["mcp_10_0_0_5:8800_mcp_add"]
+
+ @patch("crewai.mcp.tool_resolver.MCPClient")
+ def test_digit_leading_stdio_server_tool_name_passes_provider_validation(
+ self, mock_client_class, resolver
+ ):
+ names = self._resolve_tool_names(
+ mock_client_class, resolver, MCPServerStdio(command="3d-server")
+ )
+
+ name, _, _ = safe_tool_conversion(
+ {"name": names[0], "description": "Add numbers"}, "OpenAI"
+ )
+ assert name == "mcp_3d_server_add"
+
+ @patch("crewai.mcp.tool_resolver.MCPClient")
+ def test_non_ascii_host_that_sanitizes_to_a_letter_is_not_prefixed(
+ self, mock_client_class, resolver
+ ):
+ names = self._resolve_tool_names(
+ mock_client_class, resolver, "http://\u00f1andu.example/mcp"
+ )
+
+ assert names == ["\u00f1andu_example_mcp_add"]