Add support for custom MCP server URLs

Co-authored-by: pontemonti <7850950+pontemonti@users.noreply.github.com>

Author: Copilot

libraries/microsoft-agents-a365-tooling-extensions-agentframework/microsoft_agents_a365/tooling/extensions/agentframework/services/mcp_tool_registration_service.py

@@ -97,9 +97,8 @@ async def add_tool_servers_to_agent(
             # Add servers as MCPStreamableHTTPTool instances
             for config in server_configs:
                 try:
-                    server_url = getattr(config, "server_url", None) or getattr(
-                        config, "mcp_server_unique_name", None
-                    )
+                    # Use custom URL if provided, otherwise use the unique name
+                    server_url = config.url if config.url else config.mcp_server_unique_name
                     if not server_url:
                         self._logger.warning(f"MCP server config missing server_url: {config}")
                         continue
@@ -115,7 +114,7 @@ async def add_tool_servers_to_agent(
                         self._orchestrator_name
                     )
 
-                    server_name = getattr(config, "mcp_server_name", "Unknown")
+                    server_name = config.mcp_server_name
 
                     # Create and configure MCPStreamableHTTPTool
                     mcp_tools = MCPStreamableHTTPTool(
@@ -134,7 +133,7 @@ async def add_tool_servers_to_agent(
                     self._logger.info(f"Added MCP plugin '{server_name}' to agent tools")
 
                 except Exception as tool_ex:
-                    server_name = getattr(config, "mcp_server_name", "Unknown")
+                    server_name = config.mcp_server_name if hasattr(config, "mcp_server_name") else "Unknown"
                     self._logger.warning(
                         f"Failed to create MCP plugin for {server_name}: {tool_ex}"
                     )

libraries/microsoft-agents-a365-tooling-extensions-azureaifoundry/microsoft_agents_a365/tooling/extensions/azureaifoundry/services/mcp_tool_registration_service.py

@@ -178,8 +178,11 @@ async def _get_mcp_tool_definitions_and_resources(
                 else server.mcp_server_name
             )
 
+            # Use custom URL if provided, otherwise use the unique name
+            server_url = server.url if server.url else server.mcp_server_unique_name
+
             # Create MCP tool using Azure Foundry SDK
-            mcp_tool = McpTool(server_label=server_label, server_url=server.mcp_server_unique_name)
+            mcp_tool = McpTool(server_label=server_label, server_url=server_url)
 
             # Configure the tool
             mcp_tool.set_approval_mode("never")

libraries/microsoft-agents-a365-tooling-extensions-openai/microsoft_agents_a365/tooling/extensions/openai/mcp_tool_registration_service.py

@@ -101,9 +101,13 @@ async def add_tool_servers_to_agent(
         # Convert MCP server configs to MCPServerInfo objects
         mcp_servers_info = []
         for server_config in mcp_server_configs:
+            # Use custom URL if provided, otherwise use the unique name
+            server_url = (
+                server_config.url if server_config.url else server_config.mcp_server_unique_name
+            )
             server_info = MCPServerInfo(
                 name=server_config.mcp_server_name,
-                url=server_config.mcp_server_unique_name,
+                url=server_url,
             )
             mcp_servers_info.append(server_info)
 

libraries/microsoft-agents-a365-tooling-extensions-semantickernel/microsoft_agents_a365/tooling/extensions/semantickernel/services/mcp_tool_registration_service.py

@@ -125,9 +125,12 @@ async def add_tool_servers_to_agent(
                     self._orchestrator_name
                 )
 
+                # Use custom URL if provided, otherwise use the unique name
+                server_url = server.url if server.url else server.mcp_server_unique_name
+
                 plugin = MCPStreamableHttpPlugin(
                     name=server.mcp_server_name,
-                    url=server.mcp_server_unique_name,
+                    url=server_url,
                     headers=headers,
                 )
 

libraries/microsoft-agents-a365-tooling/microsoft_agents_a365/tooling/models/mcp_server_config.py

@@ -5,6 +5,7 @@
 """
 
 from dataclasses import dataclass
+from typing import Optional
 
 
 @dataclass
@@ -19,6 +20,10 @@ class MCPServerConfig:
     #: Gets or sets the unique name of the MCP server.
     mcp_server_unique_name: str
 
+    #: Gets or sets the custom URL for the MCP server. If provided, this URL will be used
+    #: instead of constructing the URL from the base URL and unique name.
+    url: Optional[str] = None
+
     def __post_init__(self):
         """Validate the configuration after initialization."""
         if not self.mcp_server_name:

libraries/microsoft-agents-a365-tooling/microsoft_agents_a365/tooling/services/mcp_tool_server_configuration_service.py

@@ -398,10 +398,18 @@ def _parse_manifest_server_config(
             if not self._validate_server_strings(name, server_name):
                 return None
 
-            # Construct full URL using environment utilities
-            full_url = build_mcp_server_url(server_name)
-
-            return MCPServerConfig(mcp_server_name=name, mcp_server_unique_name=full_url)
+            # Check if a custom URL is provided
+            custom_url = self._extract_server_url(server_element)
+
+            # If custom URL is provided, use it directly; otherwise construct from base URL
+            if custom_url and custom_url.strip():
+                return MCPServerConfig(
+                    mcp_server_name=name, mcp_server_unique_name=server_name, url=custom_url
+                )
+            else:
+                # Construct full URL using environment utilities
+                full_url = build_mcp_server_url(server_name)
+                return MCPServerConfig(mcp_server_name=name, mcp_server_unique_name=full_url)
 
         except Exception:
             return None
@@ -425,7 +433,16 @@ def _parse_gateway_server_config(
             if not self._validate_server_strings(name, endpoint):
                 return None
 
-            return MCPServerConfig(mcp_server_name=name, mcp_server_unique_name=endpoint)
+            # Check if a custom URL is provided by the gateway
+            custom_url = self._extract_server_url(server_element)
+
+            # If custom URL is provided, use it; otherwise use the endpoint as-is
+            if custom_url and custom_url.strip():
+                return MCPServerConfig(
+                    mcp_server_name=name, mcp_server_unique_name=endpoint, url=custom_url
+                )
+            else:
+                return MCPServerConfig(mcp_server_name=name, mcp_server_unique_name=endpoint)
 
         except Exception:
             return None
@@ -480,6 +497,23 @@ def _extract_server_unique_name(self, server_element: Dict[str, Any]) -> Optiona
             return server_element["mcpServerUniqueName"]
         return None
 
+    def _extract_server_url(self, server_element: Dict[str, Any]) -> Optional[str]:
+        """
+        Extracts custom server URL from configuration element.
+
+        Args:
+            server_element: Configuration dictionary.
+
+        Returns:
+            Server URL string or None.
+        """
+        # Check for 'mcpServerUrl' (manifest) or 'url' (gateway)
+        if "mcpServerUrl" in server_element and isinstance(server_element["mcpServerUrl"], str):
+            return server_element["mcpServerUrl"]
+        if "url" in server_element and isinstance(server_element["url"], str):
+            return server_element["url"]
+        return None
+
     def _validate_server_strings(self, name: Optional[str], unique_name: Optional[str]) -> bool:
         """
         Validates that server name and unique name are valid strings.