Merge pull request #1272 from BudEcosystem/fix/tool_name_prefix

fix(budprompt): resolve RenamedToolset error in response formatters

Author: vsraccubits

services/budprompt/budprompt/executors/v4/openai_response_formatter.py

@@ -579,7 +579,7 @@ def _format_tools(self, tools: Optional[List[MCPToolConfig]]) -> List[Tool]:
                     formatted_tools.append(
                         Mcp(
                             type="mcp",
-                            server_label=tool_config.server_label,
+                            server_label=tool_config.server_label or "unknown",
                             server_url=tool_config.server_url,
                             allowed_tools=list(tool_config.allowed_tools) if tool_config.allowed_tools else None,
                             headers=None,
@@ -607,15 +607,12 @@ async def _fetch_mcp_tool_lists(self, tools: Optional[List[MCPToolConfig]]) -> L
 
         for tool_config in tools:
             if tool_config.type == "mcp":
-                # Load the MCP server
-                mcp_server = await loader.load_tools(tool_config)
-                if not mcp_server:
+                # Fetch tool list directly from server (get_tool_list is self-contained)
+                tool_list_data = await loader.get_tool_list(tool_config)
+                if not tool_list_data:
                     continue
 
-                # Fetch tool list from server
-                tool_list_data = await loader.get_tool_list(mcp_server, tool_config.server_label or "unknown")
-
-                if tool_list_data:
+                if tool_list_data.get("tools"):
                     # Parse tools from MCP response
                     tools_list: List[McpListToolsTool] = []
                     for tool_info in tool_list_data.get("tools", []):

services/budprompt/budprompt/executors/v4/openai_streaming_formatter.py

@@ -289,14 +289,8 @@ async def emit_mcp_tool_list_events(self) -> List[ResponseStreamEvent]:
                 continue
 
             try:
-                # Load MCP server
-                mcp_server = await loader.load_tools(tool_config)
-                if not mcp_server:
-                    logger.warning(f"Failed to load MCP server: {tool_config.server_label}")
-                    continue
-
-                # Fetch tool list
-                tool_list_data = await loader.get_tool_list(mcp_server, tool_config.server_label or "unknown")
+                # Fetch tool list directly (get_tool_list is self-contained)
+                tool_list_data = await loader.get_tool_list(tool_config)
                 if not tool_list_data:
                     logger.warning(f"No tool list data from MCP server: {tool_config.server_label}")
                     continue

services/budprompt/budprompt/executors/v4/tool_loaders.py

@@ -89,10 +89,11 @@ async def load_tools(self, tool_config: MCPToolConfig) -> Optional[Any]:
             gateway_slugs = self._get_gateway_slugs(tool_config)
 
             if gateway_slugs:
-                # Fetch tool list to get original names
-                tool_list = await self.get_tool_list(mcp_server, tool_config.server_label or "unknown")
-                if tool_list and tool_list.get("tools"):
-                    original_names = [tool.name for tool in tool_list["tools"]]
+                # Fetch tool list to get original names directly from mcp_server
+                # (not via get_tool_list() which strips prefixes)
+                tools_list = await mcp_server.list_tools()
+                if tools_list:
+                    original_names = [tool.name for tool in tools_list]
 
                     # Generate mapping: short_name -> original_name
                     # Try each slug to find matching prefix
@@ -109,7 +110,7 @@ async def load_tools(self, tool_config: MCPToolConfig) -> Optional[Any]:
                     # Update allowed_tool_names with SHORT names
                     tool_config.allowed_tool_names = list(name_map.keys())
 
-                    logger.info(
+                    logger.debug(
                         f"Stripped gateway prefixes from {len(name_map)} tools "
                         f"for server '{tool_config.server_label}' using {len(gateway_slugs)} slug(s)"
                     )
@@ -145,23 +146,60 @@ def _get_gateway_slugs(self, tool_config: MCPToolConfig) -> List[str]:
             return list(tool_config.gateway_slugs.values())
         return []
 
-    async def get_tool_list(self, mcp_server: MCPServerStreamableHTTP, server_label: str) -> Optional[Dict]:
+    async def get_tool_list(self, tool_config: MCPToolConfig) -> Optional[Dict]:
         """Fetch the list of available tools from an MCP server.
 
+        Creates its own MCP connection and strips gateway slugs from tool names.
+        This is a self-contained method that can be called independently of load_tools().
+
         Args:
-            mcp_server: The MCP server instance
-            server_label: Label for the server (for logging)
+            tool_config: MCP tool configuration
 
         Returns:
-            Dictionary with tools list or None on error
+            Dictionary with tools list (renamed if gateway_slugs present) or None on error
         """
+        server_label = tool_config.server_label or "unknown"
+
+        if not tool_config.server_url:
+            logger.warning(f"Skipping MCP tool list '{server_label}': server_url is missing")
+            return {"server_label": server_label, "tools": [], "error": "server_url is missing"}
+
         try:
-            # Use the MCP server's list_tools method
-            # This is provided by pydantic-ai's MCPServerStreamableHTTP
+            # Create fresh MCP server connection
+            mcp_url = f"{self.base_url}servers/{tool_config.server_url}/mcp"
+            headers = {}
+            if self.api_key:
+                headers["Authorization"] = f"Bearer {self.api_key}"
+
+            mcp_server = MCPServerStreamableHTTP(url=mcp_url, headers=headers if headers else None)
+
+            # Fetch tool list
             tools_list = await mcp_server.list_tools()
 
             logger.debug(f"Retrieved {len(tools_list)} tools from MCP server '{server_label}'")
 
+            # Get gateway slugs for name stripping
+            gateway_slugs = self._get_gateway_slugs(tool_config)
+
+            if gateway_slugs:
+                # Strip gateway slugs from tool names
+                # Create new Tool objects with renamed names
+                renamed_tools = []
+                for tool in tools_list:
+                    short_name = tool.name
+                    for slug in gateway_slugs:
+                        prefix = f"{slug}-"
+                        if tool.name.startswith(prefix):
+                            short_name = tool.name[len(prefix) :]
+                            break
+
+                    # Create a modified copy with the short name
+                    renamed_tool = tool.model_copy(update={"name": short_name})
+                    renamed_tools.append(renamed_tool)
+
+                logger.debug(f"Stripped gateway prefixes from {len(renamed_tools)} tools for '{server_label}'")
+                return {"server_label": server_label, "tools": renamed_tools, "error": None}
+
             return {"server_label": server_label, "tools": tools_list, "error": None}
 
         except Exception as e: