[codex] minor renaming

This commit is contained in:
fbauer
2026-07-06 16:37:18 -07:00
parent c93bd54c7f
commit 4b9f1c68e6
3 changed files with 31 additions and 30 deletions
+15 -14
View File
@@ -10,26 +10,26 @@ use codex_mcp::hosted_plugin_runtime_mcp_server_config;
mod executor_plugin;
const CODEX_APPS_MCP_BASE_URL_ENV_VAR: &str = "CODEX_APPS_MCP_BASE_URL";
const CODEX_PLUGINS_MCP_BASE_URL_ENV_VAR: &str = "CODEX_PLUGINS_MCP_BASE_URL";
#[derive(Debug, Eq, PartialEq)]
enum AppsMcpServerTarget<'a> {
enum PluginsMcpServerTarget<'a> {
HostedPluginRuntime(&'a str),
CodexApps(&'a str),
PluginsMcp(&'a str),
}
fn apps_mcp_server_target<'a>(
fn plugins_mcp_server_target<'a>(
chatgpt_base_url: &'a str,
apps_mcp_base_url_override: Option<&'a str>,
) -> AppsMcpServerTarget<'a> {
if let Some(apps_mcp_base_url) = apps_mcp_base_url_override
plugins_mcp_base_url_override: Option<&'a str>,
) -> PluginsMcpServerTarget<'a> {
if let Some(plugins_mcp_base_url) = plugins_mcp_base_url_override
.map(str::trim)
.filter(|url| !url.is_empty())
{
return AppsMcpServerTarget::CodexApps(apps_mcp_base_url);
return PluginsMcpServerTarget::PluginsMcp(plugins_mcp_base_url);
}
AppsMcpServerTarget::HostedPluginRuntime(chatgpt_base_url)
PluginsMcpServerTarget::HostedPluginRuntime(chatgpt_base_url)
}
struct HostedPluginRuntimeExtension;
@@ -50,16 +50,17 @@ impl McpServerContributor<Config> for HostedPluginRuntimeExtension {
return vec![McpServerContribution::Remove { name }];
}
let apps_mcp_base_url_override = std::env::var(CODEX_APPS_MCP_BASE_URL_ENV_VAR).ok();
let plugins_mcp_base_url_override =
std::env::var(CODEX_PLUGINS_MCP_BASE_URL_ENV_VAR).ok();
let apps_mcp_product_sku = config.apps_mcp_product_sku.as_deref();
let server_config = match apps_mcp_server_target(
let server_config = match plugins_mcp_server_target(
&config.chatgpt_base_url,
apps_mcp_base_url_override.as_deref(),
plugins_mcp_base_url_override.as_deref(),
) {
AppsMcpServerTarget::HostedPluginRuntime(base_url) => {
PluginsMcpServerTarget::HostedPluginRuntime(base_url) => {
hosted_plugin_runtime_mcp_server_config(base_url, apps_mcp_product_sku)
}
AppsMcpServerTarget::CodexApps(base_url) => {
PluginsMcpServerTarget::PluginsMcp(base_url) => {
codex_apps_mcp_server_config(base_url, apps_mcp_product_sku)
}
};
+10 -10
View File
@@ -1,31 +1,31 @@
use pretty_assertions::assert_eq;
use super::AppsMcpServerTarget;
use super::apps_mcp_server_target;
use super::PluginsMcpServerTarget;
use super::plugins_mcp_server_target;
#[test]
fn default_uses_hosted_plugin_runtime() {
assert_eq!(
apps_mcp_server_target(
plugins_mcp_server_target(
"https://chatgpt.com",
/*apps_mcp_base_url_override*/ None,
/*plugins_mcp_base_url_override*/ None,
),
AppsMcpServerTarget::HostedPluginRuntime("https://chatgpt.com"),
PluginsMcpServerTarget::HostedPluginRuntime("https://chatgpt.com"),
);
}
#[test]
fn empty_override_uses_hosted_plugin_runtime() {
assert_eq!(
apps_mcp_server_target("https://chatgpt.com", Some(" ")),
AppsMcpServerTarget::HostedPluginRuntime("https://chatgpt.com"),
plugins_mcp_server_target("https://chatgpt.com", Some(" ")),
PluginsMcpServerTarget::HostedPluginRuntime("https://chatgpt.com"),
);
}
#[test]
fn explicit_override_uses_local_codex_apps_endpoint() {
fn explicit_override_uses_plugins_mcp_endpoint() {
assert_eq!(
apps_mcp_server_target("https://chatgpt.com", Some("http://127.0.0.1:8061"),),
AppsMcpServerTarget::CodexApps("http://127.0.0.1:8061"),
plugins_mcp_server_target("https://chatgpt.com", Some("http://127.0.0.1:8061"),),
PluginsMcpServerTarget::PluginsMcp("http://127.0.0.1:8061"),
);
}
+6 -6
View File
@@ -18,7 +18,7 @@ use pretty_assertions::assert_eq;
type TestResult = Result<(), Box<dyn std::error::Error>>;
#[tokio::test]
async fn contributes_configured_apps_mcp_without_an_executor() -> TestResult {
async fn contributes_hosted_plugin_runtime_without_an_executor() -> TestResult {
let codex_home = tempfile::tempdir()?;
let config = ConfigBuilder::default()
.codex_home(codex_home.path().to_path_buf())
@@ -36,12 +36,12 @@ async fn contributes_configured_apps_mcp_without_an_executor() -> TestResult {
let server = servers
.get(CODEX_APPS_MCP_SERVER_NAME)
.and_then(|server| server.configured_config())
.ok_or("Apps MCP should be contributed as a configured server")?;
.ok_or("hosted plugin runtime should be contributed as a configured server")?;
let McpServerTransportConfig::StreamableHttp { url, .. } = &server.transport else {
panic!("Apps MCP should use streamable HTTP");
panic!("hosted plugin runtime should use streamable HTTP");
};
let apps_mcp_base_url_override = std::env::var("CODEX_APPS_MCP_BASE_URL").ok();
let expected_config = match apps_mcp_base_url_override
let plugins_mcp_base_url_override = std::env::var("CODEX_PLUGINS_MCP_BASE_URL").ok();
let expected_config = match plugins_mcp_base_url_override
.as_deref()
.map(str::trim)
.filter(|url| !url.is_empty())
@@ -58,7 +58,7 @@ async fn contributes_configured_apps_mcp_without_an_executor() -> TestResult {
url: expected_url, ..
} = expected_config.transport
else {
panic!("expected Apps MCP config should use streamable HTTP");
panic!("expected hosted plugin runtime config should use streamable HTTP");
};
assert_eq!(url, &expected_url);