Revert "Remove environment id usage"

This reverts commit c6473e7.

Author: joratz

libraries/microsoft-agents-a365-tooling-extensions-azureaifoundry/README.md

@@ -64,6 +64,7 @@ registration_service = McpToolRegistrationService()
 await registration_service.add_tool_servers_to_agent(
     project_client=project_client,
     agent_id="your-agent-id",
+    environment_id="prod",
     auth_token="your-auth-token"
 )
 ```

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

@@ -44,7 +44,7 @@ class McpToolRegistrationService:
 
     Example:
         >>> service = McpToolRegistrationService()
-        >>> service.add_tool_servers_to_agent(project_client, agent_id, token)
+        >>> service.add_tool_servers_to_agent(project_client, agent_id, env_id, token)
     """
 
     def __init__(
@@ -73,6 +73,7 @@ async def add_tool_servers_to_agent(
         self,
         project_client: "AIProjectClient",
         agent_user_id: str,
+        environment_id: str,
         auth: Authorization,
         context: TurnContext,
         auth_token: Optional[str] = None,
@@ -83,6 +84,7 @@ async def add_tool_servers_to_agent(
         Args:
             project_client: The Azure Foundry AIProjectClient instance.
             agent_user_id: Agent User ID for the agent.
+            environment_id: Environment ID for the environment.
             auth_token: Authentication token to access the MCP servers.
 
         Raises:
@@ -100,7 +102,7 @@ async def add_tool_servers_to_agent(
         try:
             # Get the tool definitions and resources using the async implementation
             tool_definitions, tool_resources = await self._get_mcp_tool_definitions_and_resources(
-                agent_user_id, auth_token or ""
+                agent_user_id, environment_id, auth_token or ""
             )
 
             # Update the agent with the tools
@@ -119,7 +121,7 @@ async def add_tool_servers_to_agent(
             raise
 
     async def _get_mcp_tool_definitions_and_resources(
-        self, agent_user_id: str, auth_token: str
+        self, agent_user_id: str, environment_id: str, auth_token: str
     ) -> Tuple[List[McpTool], Optional[ToolResources]]:
         """
         Internal method to get MCP tool definitions and resources.
@@ -128,6 +130,7 @@ async def _get_mcp_tool_definitions_and_resources(
 
         Args:
             agent_user_id: Agent User ID for the agent.
+            environment_id: Environment ID for the environment.
             auth_token: Authentication token to access the MCP servers.
 
         Returns:
@@ -140,7 +143,7 @@ async def _get_mcp_tool_definitions_and_resources(
         # Get MCP server configurations
         try:
             servers = await self._mcp_server_configuration_service.list_tool_servers(
-                agent_user_id, auth_token
+                agent_user_id, environment_id, auth_token
             )
         except Exception as ex:
             self._logger.error(
@@ -150,7 +153,7 @@ async def _get_mcp_tool_definitions_and_resources(
 
         if len(servers) == 0:
             self._logger.info(
-                f"No MCP servers configured for AgentUserId={agent_user_id}"
+                f"No MCP servers configured for AgentUserId={agent_user_id}, EnvironmentId={environment_id}"
             )
             return ([], None)
 
@@ -190,6 +193,9 @@ async def _get_mcp_tool_definitions_and_resources(
                 )
                 mcp_tool.update_headers(Constants.Headers.AUTHORIZATION, header_value)
 
+            # Set environment ID header
+            mcp_tool.update_headers(Constants.Headers.ENVIRONMENT_ID, environment_id)
+
             # Add to collections
             tool_definitions.extend(mcp_tool.definitions)
             if mcp_tool.resources and mcp_tool.resources.mcp:

libraries/microsoft-agents-a365-tooling-extensions-openai/README.md

@@ -54,6 +54,7 @@ registration_service = McpToolRegistrationService()
 await registration_service.add_tool_servers_to_agent(
     agent=your_openai_agent,
     agent_user_id="user-123",
+    environment_id="prod",
     auth=authorization_context,
     context=turn_context,
     auth_token="your-auth-token"

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

@@ -39,6 +39,7 @@ async def add_tool_servers_to_agent(
         self,
         agent: Agent,
         agent_user_id: str,
+        environment_id: str,
         auth: Authorization,
         context: TurnContext,
         auth_token: Optional[str] = None,
@@ -53,6 +54,7 @@ async def add_tool_servers_to_agent(
         Args:
             agent: The existing agent to add servers to
             agent_user_id: Agent User ID for the agent
+            environment_id: Environment ID for the environment
             auth_token: Authentication token to access the MCP servers
 
         Returns:
@@ -68,7 +70,7 @@ async def add_tool_servers_to_agent(
         # mcp_server_configs = []
         # TODO: radevika: Update once the common project is merged.
         mcp_server_configs = await self.config_service.list_tool_servers(
-            agent_user_id=agent_user_id, auth_token=auth_token
+            agent_user_id=agent_user_id, environment_id=environment_id, auth_token=auth_token
         )
 
         # Convert MCP server configs to MCPServerInfo objects
@@ -112,6 +114,8 @@ async def add_tool_servers_to_agent(
                     headers = si.headers or {}
                     if auth_token:
                         headers["Authorization"] = f"Bearer {auth_token}"
+                    if environment_id:
+                        headers["x-ms-environment-id"] = environment_id
 
                     # Create MCPServerStreamableHttpParams with proper configuration
                     params = MCPServerStreamableHttpParams(url=si.url, headers=headers)

libraries/microsoft-agents-a365-tooling-extensions-semantickernel/README.md

@@ -56,6 +56,7 @@ registration_service = McpToolRegistrationService()
 await registration_service.add_tool_servers_to_kernel(
     kernel=kernel,
     agent_user_id="user-123",
+    environment_id="prod",
     auth_token="your-auth-token"
 )
 ```

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

@@ -84,6 +84,7 @@ async def add_tool_servers_to_agent(
         self,
         kernel: sk.Kernel,
         agent_user_id: str,
+        environment_id: str,
         auth: Authorization,
         context: TurnContext,
         auth_token: Optional[str] = None,
@@ -94,6 +95,7 @@ async def add_tool_servers_to_agent(
         Args:
             kernel: The Semantic Kernel instance to which the tools will be added.
             agent_user_id: Agent User ID for the agent.
+            environment_id: Environment ID for the environment.
             auth_token: Authentication token to access the MCP servers.
 
         Raises:
@@ -106,7 +108,7 @@ async def add_tool_servers_to_agent(
             authToken = await auth.exchange_token(context, scopes, "AGENTIC")
             auth_token = authToken.token
 
-        self._validate_inputs(kernel, agent_user_id, auth_token)
+        self._validate_inputs(kernel, agent_user_id, environment_id, auth_token)
 
         if self._mcp_server_configuration_service is None:
             raise ValueError(
@@ -115,7 +117,7 @@ async def add_tool_servers_to_agent(
 
         # Get and process servers
         servers = await self._mcp_server_configuration_service.list_tool_servers(
-            agent_user_id, auth_token
+            agent_user_id, environment_id, auth_token
         )
         self._logger.info(f"🔧 Adding MCP tools from {len(servers)} servers")
 
@@ -132,12 +134,16 @@ async def add_tool_servers_to_agent(
                 headers = {}
 
                 if tools_mode == "MockMCPServer":
-                    # Use mock authorization header if provided
+                    # Mock server does not require bearer auth, but still forward environment id if available.
+                    if environment_id:
+                        headers[Constants.Headers.ENVIRONMENT_ID] = environment_id
+
                     if mock_auth_header := os.getenv("MOCK_MCP_AUTHORIZATION"):
                         headers[Constants.Headers.AUTHORIZATION] = mock_auth_header
                 else:
                     headers = {
                         Constants.Headers.AUTHORIZATION: f"{Constants.Headers.BEARER_PREFIX} {auth_token}",
+                        Constants.Headers.ENVIRONMENT_ID: environment_id,
                     }
 
                 plugin = MCPStreamableHttpPlugin(
@@ -172,13 +178,15 @@ async def add_tool_servers_to_agent(
     # ============================================================================
 
     def _validate_inputs(
-        self, kernel: Any, agent_user_id: str, auth_token: str
+        self, kernel: Any, agent_user_id: str, environment_id: str, auth_token: str
     ) -> None:
         """Validate all required inputs."""
         if kernel is None:
             raise ValueError("kernel cannot be None")
         if not agent_user_id or not agent_user_id.strip():
             raise ValueError("agent_user_id cannot be null or empty")
+        if not environment_id or not environment_id.strip():
+            raise ValueError("environment_id cannot be null or empty")
         if not auth_token or not auth_token.strip():
             raise ValueError("auth_token cannot be null or empty")
 

libraries/microsoft-agents-a365-tooling/README.md

@@ -59,6 +59,7 @@ mcp_config = MCPServerConfig(
 config_service = McpToolServerConfigurationService()
 mcp_servers = await config_service.list_tool_servers(
     agent_user_id="agent-123",
+    environment_id="prod",
     auth_token="your-auth-token"
 )
 ```