Merge branch 'main' into nornagon/per-profile-mcps

codex-rs/config.md

@@ -3,4 +3,4 @@
 This file has moved. Please see the latest configuration documentation here:
 
 - Full config docs: [docs/config.md](../docs/config.md)
-- MCP servers section: [docs/config.md#mcp_servers](../docs/config.md#mcp_servers) 
+- MCP servers section: [docs/config.md#mcp_servers](../docs/config.md#mcp_servers) 

codex-rs/core/src/config.rs

@@ -794,7 +794,23 @@ impl Config {
             notify: cfg.notify,
             user_instructions,
             base_instructions,
-            mcp_servers: cfg.mcp_servers,
+            // Merge top-level and per-profile MCP servers.
+            // Defaults: inherit globals unless explicitly disabled; on key
+            // conflicts, profile entries take precedence.
+            mcp_servers: {
+                let inherit = config_profile.inherit_global_mcp_servers.unwrap_or(true);
+                let mut merged = if inherit {
+                    cfg.mcp_servers
+                } else {
+                    Default::default()
+                };
+                if let Some(profile_servers) = config_profile.mcp_servers {
+                    for (k, v) in profile_servers {
+                        merged.insert(k, v);
+                    }
+                }
+                merged
+            },
             model_providers,
             project_doc_max_bytes: cfg.project_doc_max_bytes.unwrap_or(PROJECT_DOC_MAX_BYTES),
             codex_home,

codex-rs/core/src/config_profile.rs

@@ -1,6 +1,8 @@
 use serde::Deserialize;
+use std::collections::HashMap;
 use std::path::PathBuf;
 
+use crate::config_types::McpServerConfig;
 use crate::protocol::AskForApproval;
 use codex_protocol::config_types::ReasoningEffort;
 use codex_protocol::config_types::ReasoningSummary;
@@ -20,6 +22,16 @@ pub struct ConfigProfile {
     pub model_verbosity: Option<Verbosity>,
     pub chatgpt_base_url: Option<String>,
     pub experimental_instructions_file: Option<PathBuf>,
+
+    /// Per-profile MCP server definitions. When present, these entries are
+    /// merged with the top-level `mcp_servers` map. On key conflicts, the
+    /// profile entries take precedence. To opt out of inheriting global
+    /// servers, set `inherit_global_mcp_servers` to `false`.
+    pub mcp_servers: Option<HashMap<String, McpServerConfig>>,
+
+    /// Whether this profile should inherit the top-level `mcp_servers`.
+    /// Defaults to `true` when not specified.
+    pub inherit_global_mcp_servers: Option<bool>,
 }
 
 impl From<ConfigProfile> for codex_protocol::mcp_protocol::Profile {

docs/config.md

@@ -360,10 +360,37 @@ Should be represented as follows in `~/.codex/config.toml`:
 command = "npx"
 args = ["-y", "mcp-server"]
 env = { "API_KEY" = "value" }
+```
+
+### Per-profile MCP servers
+
+You can scope MCP servers to a specific profile and optionally inherit the global set. Profile entries override globals on key conflicts.
+
+```toml
+# Global servers (available to all profiles unless opted out)
+[mcp_servers.some_server]
+command = "some_server"
+
+# Profile-specific MCP server
+[profiles.ops.mcp_servers.analysis]
+command = "ops_mcp"
+
+# You can disable inheriting the global MCP servers in a specific profile
+[profiles.minimal]
+inherit_global_mcp_servers = false  # only profile servers (none defined => none)
+
 # Optional: override the default 10s startup timeout
 startup_timeout_ms = 20_000
 ```
 
+## disable_response_storage
+
+Currently, customers whose accounts are set to use Zero Data Retention (ZDR) must set `disable_response_storage` to `true` so that Codex uses an alternative to the Responses API that works with ZDR:
+
+```toml
+disable_response_storage = true
+```
+
 ## shell_environment_policy
 
 Codex spawns subprocesses (e.g. when executing a `local_shell` tool-call suggested by the assistant). By default it now passes **your full environment** to those subprocesses. You can tune this behavior via the **`shell_environment_policy`** block in `config.toml`: