mirror of
https://github.com/openai/codex.git
synced 2026-11-17 22:10:37 +00:00
- Split MCP runtime/server code out of `codex-core` into the new `codex-mcp` crate. New/moved public structs/types include `McpConfig`, `McpConnectionManager`, `ToolInfo`, `ToolPluginProvenance`, `CodexAppsToolsCacheKey`, and the `McpManager` API (`codex_mcp::mcp::McpManager` plus the `codex_core::mcp::McpManager` wrapper/shim). New/moved functions include `with_codex_apps_mcp`, `configured_mcp_servers`, `effective_mcp_servers`, `collect_mcp_snapshot`, `collect_mcp_snapshot_from_manager`, `qualified_mcp_tool_name_prefix`, and the MCP auth/skill-dependency helpers. Why: this creates a focused MCP crate boundary and shrinks `codex-core` without forcing every consumer to migrate in the same PR. - Move MCP server config schema and persistence into `codex-config`. New/moved structs/enums include `AppToolApproval`, `McpServerToolConfig`, `McpServerConfig`, `RawMcpServerConfig`, `McpServerTransportConfig`, `McpServerDisabledReason`, and `codex_config::ConfigEditsBuilder`. New/moved functions include `load_global_mcp_servers` and `ConfigEditsBuilder::replace_mcp_servers`/`apply`. Why: MCP TOML parsing/editing is config ownership, and this keeps config validation/round-tripping (including per-tool approval overrides and inline bearer-token rejection) in the config crate instead of `codex-core`. - Rewire `codex-core`, app-server, and plugin call sites onto the new crates. Updated `Config::to_mcp_config(&self, plugins_manager)`, `codex-rs/core/src/mcp.rs`, `codex-rs/core/src/connectors.rs`, `codex-rs/core/src/codex.rs`, `CodexMessageProcessor::list_mcp_server_status_task`, and `utils/plugins/src/mcp_connector.rs` to build/pass the new MCP config/runtime types. Why: plugin-provided MCP servers still merge with user-configured servers, and runtime auth (`CodexAuth`) is threaded into `with_codex_apps_mcp` / `collect_mcp_snapshot` explicitly so `McpConfig` stays config-only.
109 lines
3.2 KiB
Rust
109 lines
3.2 KiB
Rust
use super::*;
|
|
use codex_protocol::protocol::SkillDependencies;
|
|
use codex_protocol::protocol::SkillMetadata;
|
|
use codex_protocol::protocol::SkillScope;
|
|
use pretty_assertions::assert_eq;
|
|
use std::path::PathBuf;
|
|
|
|
fn skill_with_tools(tools: Vec<SkillToolDependency>) -> SkillMetadata {
|
|
SkillMetadata {
|
|
name: "skill".to_string(),
|
|
description: "skill".to_string(),
|
|
short_description: None,
|
|
interface: None,
|
|
dependencies: Some(SkillDependencies { tools }),
|
|
path: PathBuf::from("skill"),
|
|
scope: SkillScope::User,
|
|
enabled: true,
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn collect_missing_respects_canonical_installed_key() {
|
|
let url = "https://example.com/mcp".to_string();
|
|
let skills = vec![skill_with_tools(vec![SkillToolDependency {
|
|
r#type: "mcp".to_string(),
|
|
value: "github".to_string(),
|
|
description: None,
|
|
transport: Some("streamable_http".to_string()),
|
|
command: None,
|
|
url: Some(url.clone()),
|
|
}])];
|
|
let installed = HashMap::from([(
|
|
"alias".to_string(),
|
|
McpServerConfig {
|
|
transport: McpServerTransportConfig::StreamableHttp {
|
|
url,
|
|
bearer_token_env_var: None,
|
|
http_headers: None,
|
|
env_http_headers: None,
|
|
},
|
|
enabled: true,
|
|
required: false,
|
|
disabled_reason: None,
|
|
startup_timeout_sec: None,
|
|
tool_timeout_sec: None,
|
|
enabled_tools: None,
|
|
disabled_tools: None,
|
|
scopes: None,
|
|
oauth_resource: None,
|
|
tools: HashMap::new(),
|
|
},
|
|
)]);
|
|
|
|
assert_eq!(
|
|
collect_missing_mcp_dependencies(&skills, &installed),
|
|
HashMap::new()
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn collect_missing_dedupes_by_canonical_key_but_preserves_original_name() {
|
|
let url = "https://example.com/one".to_string();
|
|
let skills = vec![skill_with_tools(vec![
|
|
SkillToolDependency {
|
|
r#type: "mcp".to_string(),
|
|
value: "alias-one".to_string(),
|
|
description: None,
|
|
transport: Some("streamable_http".to_string()),
|
|
command: None,
|
|
url: Some(url.clone()),
|
|
},
|
|
SkillToolDependency {
|
|
r#type: "mcp".to_string(),
|
|
value: "alias-two".to_string(),
|
|
description: None,
|
|
transport: Some("streamable_http".to_string()),
|
|
command: None,
|
|
url: Some(url.clone()),
|
|
},
|
|
])];
|
|
|
|
let expected = HashMap::from([(
|
|
"alias-one".to_string(),
|
|
McpServerConfig {
|
|
transport: McpServerTransportConfig::StreamableHttp {
|
|
url,
|
|
bearer_token_env_var: None,
|
|
http_headers: None,
|
|
env_http_headers: None,
|
|
},
|
|
enabled: true,
|
|
required: false,
|
|
disabled_reason: None,
|
|
startup_timeout_sec: None,
|
|
tool_timeout_sec: None,
|
|
enabled_tools: None,
|
|
disabled_tools: None,
|
|
scopes: None,
|
|
oauth_resource: None,
|
|
tools: HashMap::new(),
|
|
},
|
|
)]);
|
|
|
|
assert_eq!(
|
|
collect_missing_mcp_dependencies(&skills, &HashMap::new()),
|
|
expected
|
|
);
|
|
}
|