Improve variable naming consistency and add server_name fallback in Semantic Kernel service

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

Author: Copilot

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

@@ -128,8 +128,11 @@ async def add_tool_servers_to_agent(
                 # Use the URL from server (always populated by the configuration service)
                 server_url = server.url
 
+                # Use mcp_server_name if available (not None or empty), otherwise fall back to mcp_server_unique_name
+                server_name = server.mcp_server_name or server.mcp_server_unique_name
+
                 plugin = MCPStreamableHttpPlugin(
-                    name=server.mcp_server_name,
+                    name=server_name,
                     url=server_url,
                     headers=headers,
                 )

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

@@ -392,20 +392,20 @@ def _parse_manifest_server_config(
             MCPServerConfig object or None if parsing fails.
         """
         try:
-            name = self._extract_server_name(server_element)
-            server_name = self._extract_server_unique_name(server_element)
+            mcp_server_name = self._extract_server_name(server_element)
+            mcp_server_unique_name = self._extract_server_unique_name(server_element)
 
-            if not self._validate_server_strings(name, server_name):
+            if not self._validate_server_strings(mcp_server_name, mcp_server_unique_name):
                 return None
 
-            # Check if a custom URL is provided
+            # Check if a URL is provided
             endpoint = self._extract_server_url(server_element)
 
             # Determine the final URL: use custom URL if provided, otherwise construct it
-            final_url = endpoint if endpoint else build_mcp_server_url(server_name)
+            final_url = endpoint if endpoint else build_mcp_server_url(mcp_server_unique_name)
 
             return MCPServerConfig(
-                mcp_server_name=name, mcp_server_unique_name=server_name, url=final_url
+                mcp_server_name=mcp_server_name, mcp_server_unique_name=mcp_server_unique_name, url=final_url
             )
 
         except Exception:
@@ -424,19 +424,19 @@ def _parse_gateway_server_config(
             MCPServerConfig object or None if parsing fails.
         """
         try:
-            name = self._extract_server_name(server_element)
+            mcp_server_name = self._extract_server_name(server_element)
             mcp_server_unique_name = self._extract_server_unique_name(server_element)
 
-            if not self._validate_server_strings(name, mcp_server_unique_name):
+            if not self._validate_server_strings(mcp_server_name, mcp_server_unique_name):
                 return None
 
-            # Check if a custom URL is provided by the gateway
+            # Check if a URL is provided by the gateway
             endpoint = self._extract_server_url(server_element)
 
             # Determine the final URL: use custom URL if provided, otherwise construct it
             final_url = endpoint if endpoint else build_mcp_server_url(mcp_server_unique_name)
 
-            return MCPServerConfig(mcp_server_name=name, mcp_server_unique_name=mcp_server_unique_name, url=final_url)
+            return MCPServerConfig(mcp_server_name=mcp_server_name, mcp_server_unique_name=mcp_server_unique_name, url=final_url)
 
         except Exception:
             return None