mirror of
https://github.com/openai/codex.git
synced 2026-11-16 22:00:36 +00:00
## 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
159 lines
4.8 KiB
Rust
159 lines
4.8 KiB
Rust
use crate::McpServerKey;
|
|
use std::collections::HashMap;
|
|
|
|
use pretty_assertions::assert_eq;
|
|
use serde_json::json;
|
|
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn selects_only_supported_mcp_extensions() {
|
|
let app_ui = json!({
|
|
"mimeTypes": [
|
|
"text/html;profile=mcp-app",
|
|
"text/x-dil;profile=mcp-app",
|
|
],
|
|
"futureField": {"preserved": true},
|
|
});
|
|
let form = json!({"futureField": {"preserved": true}});
|
|
let extensions = HashMap::from([
|
|
(
|
|
OPENAI_ELICITATION_EXTENSION_ID.to_string(),
|
|
json!({"form": form, "userVerification": {}, "unsupported": {}}),
|
|
),
|
|
(MCP_APP_UI_EXTENSION_ID.to_string(), app_ui.clone()),
|
|
(OPENAI_FORM_EXTENSION_ID.to_string(), json!({})),
|
|
(
|
|
OPENAI_STANDARD_FORM_INPUT_EXTENSION_ID.to_string(),
|
|
json!({}),
|
|
),
|
|
("example/other".to_string(), json!({"enabled": true})),
|
|
]);
|
|
|
|
assert_eq!(
|
|
client_mcp_extensions(
|
|
Some(&extensions),
|
|
/*legacy_openai_form_elicitation*/ false,
|
|
),
|
|
ClientMcpExtensions::new(HashMap::from([
|
|
(
|
|
OPENAI_ELICITATION_EXTENSION_ID.to_string(),
|
|
json!({"form": form}),
|
|
),
|
|
(MCP_APP_UI_EXTENSION_ID.to_string(), app_ui),
|
|
(OPENAI_FORM_EXTENSION_ID.to_string(), json!({})),
|
|
(
|
|
OPENAI_STANDARD_FORM_INPUT_EXTENSION_ID.to_string(),
|
|
json!({}),
|
|
),
|
|
]))
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn normalizes_legacy_form_capability_into_extensions() {
|
|
assert_eq!(
|
|
client_mcp_extensions(
|
|
/*extensions*/ None, /*legacy_openai_form_elicitation*/ true,
|
|
),
|
|
ClientMcpExtensions::new(HashMap::from([(
|
|
OPENAI_FORM_EXTENSION_ID.to_string(),
|
|
json!({}),
|
|
)]))
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn user_verification_is_projected_only_to_the_host_owned_plugin_service() {
|
|
use crate::catalog::McpServerRegistration;
|
|
use crate::catalog::ResolvedMcpCatalog;
|
|
use crate::mcp::CODEX_APPS_MCP_SERVER_NAME;
|
|
use crate::mcp::codex_apps_mcp_server_config;
|
|
use codex_rmcp_client::McpProtocolMode;
|
|
|
|
let config = codex_apps_mcp_server_config(
|
|
"https://example.com",
|
|
/*apps_mcp_product_sku*/ None,
|
|
/*originator*/ None,
|
|
);
|
|
let extensions = ClientMcpExtensions::new([
|
|
(
|
|
OPENAI_ELICITATION_EXTENSION_ID.to_string(),
|
|
json!({"form": {}, "userVerification": {}}),
|
|
),
|
|
(
|
|
crate::MCP_NETWORK_POLICY_META_CAPABILITY.to_string(),
|
|
json!({}),
|
|
),
|
|
]);
|
|
assert_eq!(
|
|
server_mcp_extensions(
|
|
&extensions,
|
|
CODEX_APPS_MCP_SERVER_NAME,
|
|
/*server*/ None,
|
|
/*advertise_network_policy*/ true,
|
|
"https://chatgpt.com",
|
|
),
|
|
ClientMcpExtensions::new([(
|
|
OPENAI_ELICITATION_EXTENSION_ID.to_string(),
|
|
json!({"form": {}}),
|
|
)]),
|
|
);
|
|
for (name, registration, settings) in [
|
|
(
|
|
CODEX_APPS_MCP_SERVER_NAME,
|
|
McpServerRegistration::from_hosted_apps(
|
|
"host",
|
|
/*contribution_order*/ 0,
|
|
config.clone(),
|
|
),
|
|
json!({"form": {}, "userVerification": {}}),
|
|
),
|
|
(
|
|
CODEX_APPS_MCP_SERVER_NAME,
|
|
McpServerRegistration::from_hosted_apps(
|
|
"host",
|
|
/*contribution_order*/ 0,
|
|
config.clone(),
|
|
)
|
|
.with_protocol_mode(McpProtocolMode::V20260728),
|
|
json!({"form": {}, "userVerification": {}}),
|
|
),
|
|
(
|
|
CODEX_APPS_MCP_SERVER_NAME,
|
|
McpServerRegistration::from_extension(
|
|
CODEX_APPS_MCP_SERVER_NAME.into(),
|
|
"ordinary",
|
|
/*contribution_order*/ 0,
|
|
config.clone(),
|
|
)
|
|
.with_protocol_mode(McpProtocolMode::V20260728),
|
|
json!({"form": {}}),
|
|
),
|
|
(
|
|
CODEX_APPS_MCP_SERVER_NAME,
|
|
McpServerRegistration::from_config(CODEX_APPS_MCP_SERVER_NAME.into(), config.clone()),
|
|
json!({"form": {}}),
|
|
),
|
|
(
|
|
"attached",
|
|
McpServerRegistration::from_config("attached".into(), config),
|
|
json!({"form": {}}),
|
|
),
|
|
] {
|
|
let mut catalog = ResolvedMcpCatalog::builder();
|
|
catalog.register(registration);
|
|
let catalog = catalog.build();
|
|
assert_eq!(
|
|
server_mcp_extensions(
|
|
&extensions,
|
|
name,
|
|
catalog.server(&McpServerKey::unscoped(name)),
|
|
/*advertise_network_policy*/ false,
|
|
"https://chatgpt.com",
|
|
),
|
|
ClientMcpExtensions::new([(OPENAI_ELICITATION_EXTENSION_ID.to_string(), settings)]),
|
|
);
|
|
}
|
|
}
|