From 097be1d05eff9ad2ee321ba52422a3f67e439128 Mon Sep 17 00:00:00 2001
From: Ahmed Ibrahim <aibrahim@openai.com>
Date: Mon, 27 Apr 2026 01:22:48 +0300
Subject: [PATCH] Rename MCP runtime module

Rename mcp_connection.rs to runtime.rs now that the module only contains runtime and sandbox shared types plus the shared duration metric helper.

Update imports and exports to use the new runtime module name.

Co-authored-by: Codex <noreply@openai.com>
---
 codex-rs/codex-mcp/src/apps.rs                           | 2 +-
 codex-rs/codex-mcp/src/client.rs                         | 4 ++--
 codex-rs/codex-mcp/src/lib.rs                            | 6 +++---
 codex-rs/codex-mcp/src/manager.rs                        | 4 ++--
 codex-rs/codex-mcp/src/mcp/mod.rs                        | 2 +-
 codex-rs/codex-mcp/src/{mcp_connection.rs => runtime.rs} | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename codex-rs/codex-mcp/src/{mcp_connection.rs => runtime.rs} (96%)

diff --git a/codex-rs/codex-mcp/src/apps.rs b/codex-rs/codex-mcp/src/apps.rs
index 982602d506..4185d20f2c 100644
--- a/codex-rs/codex-mcp/src/apps.rs
+++ b/codex-rs/codex-mcp/src/apps.rs
@@ -3,7 +3,7 @@ use std::path::PathBuf;
 use std::time::Instant;
 
 use crate::mcp::CODEX_APPS_MCP_SERVER_NAME;
-use crate::mcp_connection::emit_duration;
+use crate::runtime::emit_duration;
 use crate::tools::MCP_TOOLS_CACHE_WRITE_DURATION_METRIC;
 use crate::tools::ToolInfo;
 use codex_login::CodexAuth;
diff --git a/codex-rs/codex-mcp/src/client.rs b/codex-rs/codex-mcp/src/client.rs
index 3ea1d7ad5b..536f899e11 100644
--- a/codex-rs/codex-mcp/src/client.rs
+++ b/codex-rs/codex-mcp/src/client.rs
@@ -20,8 +20,8 @@ use crate::apps::write_cached_codex_apps_tools_if_needed;
 use crate::elicitation::ElicitationRequestManager;
 use crate::mcp::CODEX_APPS_MCP_SERVER_NAME;
 use crate::mcp::ToolPluginProvenance;
-use crate::mcp_connection::McpRuntimeEnvironment;
-use crate::mcp_connection::emit_duration;
+use crate::runtime::McpRuntimeEnvironment;
+use crate::runtime::emit_duration;
 use crate::tools::ToolFilter;
 use crate::tools::ToolInfo;
 use crate::tools::filter_tools;
diff --git a/codex-rs/codex-mcp/src/lib.rs b/codex-rs/codex-mcp/src/lib.rs
index 08d2ce2784..59f81d697e 100644
--- a/codex-rs/codex-mcp/src/lib.rs
+++ b/codex-rs/codex-mcp/src/lib.rs
@@ -1,7 +1,7 @@
 pub use client::MCP_SANDBOX_STATE_META_CAPABILITY;
 pub use manager::McpConnectionManager;
-pub use mcp_connection::McpRuntimeEnvironment;
-pub use mcp_connection::SandboxState;
+pub use runtime::McpRuntimeEnvironment;
+pub use runtime::SandboxState;
 pub use tools::ToolInfo;
 
 pub use mcp::CODEX_APPS_MCP_SERVER_NAME;
@@ -43,5 +43,5 @@ pub(crate) mod client;
 pub(crate) mod elicitation;
 pub(crate) mod manager;
 pub(crate) mod mcp;
-pub(crate) mod mcp_connection;
+pub(crate) mod runtime;
 pub(crate) mod tools;
diff --git a/codex-rs/codex-mcp/src/manager.rs b/codex-rs/codex-mcp/src/manager.rs
index d678ee3e31..e0f8b69e3b 100644
--- a/codex-rs/codex-mcp/src/manager.rs
+++ b/codex-rs/codex-mcp/src/manager.rs
@@ -18,8 +18,8 @@ use crate::client::list_tools_for_client_uncached;
 use crate::elicitation::ElicitationRequestManager;
 use crate::mcp::CODEX_APPS_MCP_SERVER_NAME;
 use crate::mcp::ToolPluginProvenance;
-use crate::mcp_connection::McpRuntimeEnvironment;
-use crate::mcp_connection::emit_duration;
+use crate::runtime::McpRuntimeEnvironment;
+use crate::runtime::emit_duration;
 use crate::tools::ToolInfo;
 use crate::tools::filter_tools;
 use crate::tools::qualify_tools;
diff --git a/codex-rs/codex-mcp/src/mcp/mod.rs b/codex-rs/codex-mcp/src/mcp/mod.rs
index d5af89387c..738a0d896e 100644
--- a/codex-rs/codex-mcp/src/mcp/mod.rs
+++ b/codex-rs/codex-mcp/src/mcp/mod.rs
@@ -36,7 +36,7 @@ use serde_json::Value;
 
 use crate::apps::codex_apps_tools_cache_key;
 use crate::manager::McpConnectionManager;
-use crate::mcp_connection::McpRuntimeEnvironment;
+use crate::runtime::McpRuntimeEnvironment;
 
 pub const CODEX_APPS_MCP_SERVER_NAME: &str = "codex_apps";
 const MCP_TOOL_NAME_PREFIX: &str = "mcp";
diff --git a/codex-rs/codex-mcp/src/mcp_connection.rs b/codex-rs/codex-mcp/src/runtime.rs
similarity index 96%
rename from codex-rs/codex-mcp/src/mcp_connection.rs
rename to codex-rs/codex-mcp/src/runtime.rs
index 663f2e076c..6baa79cc9f 100644
--- a/codex-rs/codex-mcp/src/mcp_connection.rs
+++ b/codex-rs/codex-mcp/src/runtime.rs
@@ -1,4 +1,4 @@
-//! Connection support for Model Context Protocol (MCP) servers.
+//! Runtime support for Model Context Protocol (MCP) servers.
 //!
 //! This module contains shared types and helpers used by [`McpConnectionManager`].