mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
Keep same-named MCP servers separate across environments (#60905)
## Why MCP servers discovered on different executors can share a name. Resolving them by name alone exposes only one server and prevents tools and resources from being addressed independently. ## What changed - Add the disabled-by-default `multi_environment_mcp` feature to expose environment-scoped servers, including multiple installations of the same plugin. - Carry exact `McpServerKey` identities through catalogs, connections, tool calls, resources, and approval tracking. Give environment-scoped tools stable namespaces derived from their environment. - Include `environment_id` in scoped resource listings and accept it in resource requests. Require it for environment-owned servers when multiple environments are selected. - Preserve server ownership through hooks and use the owning environment's permissions for scoped elicitation review. ## Testing Add coverage for same-named servers across environments, independent calls and approvals, resource selection, plugin discovery, and rejection of hook changes to the tool environment. GitOrigin-RevId: 5593372b06a15c16aa3220faa3b19f5d3b20e67e
This commit is contained in:
@@ -81,14 +81,15 @@ impl AppsRequestProcessor {
|
||||
}
|
||||
let mcp_config = mcp_manager.runtime_config(&config).await;
|
||||
let mut mcp_servers = effective_mcp_servers(&mcp_config, auth.as_ref());
|
||||
mcp_servers.retain(|name, _| name == CODEX_APPS_MCP_SERVER_NAME);
|
||||
let codex_apps_server = codex_mcp::McpServerKey::unscoped(CODEX_APPS_MCP_SERVER_NAME);
|
||||
mcp_servers.retain(|key, _| key == &codex_apps_server);
|
||||
let mcp_config = Arc::new(mcp_config.for_threadless_operations(&mcp_servers));
|
||||
anyhow::ensure!(
|
||||
!mcp_servers.is_empty(),
|
||||
"host-owned MCP server '{CODEX_APPS_MCP_SERVER_NAME}' is not enabled"
|
||||
);
|
||||
let startup_timeout = mcp_servers
|
||||
.get(CODEX_APPS_MCP_SERVER_NAME)
|
||||
.get(&codex_apps_server)
|
||||
.and_then(|server| server.config().startup_timeout_sec)
|
||||
.unwrap_or(CONNECTOR_RUNTIME_REFRESH_TIMEOUT);
|
||||
let runtime_context = McpRuntimeContext::new(
|
||||
|
||||
Reference in New Issue
Block a user