mirror of
https://github.com/openai/codex.git
synced 2026-05-24 04:54:52 +00:00
## Why `--profile-v2 <name>` gives launchers and runtime entry points a named profile config without making each profile duplicate the base user config. The base `$CODEX_HOME/config.toml` still loads first, then `$CODEX_HOME/<name>.config.toml` layers above it and becomes the active writable user config for that session. That keeps shared defaults, plugin/MCP setup, and managed/user constraints in one place while letting a named profile override only the pieces that need to differ. ## What Changed - Added the shared `--profile-v2 <name>` runtime option with validated plain names, now represented by `ProfileV2Name`. - Extended config layer state so the base user config and selected profile config are both `User` layers; APIs expose the active user layer and merged effective user config. - Threaded profile selection through runtime entry points: `codex`, `codex exec`, `codex review`, `codex resume`, `codex fork`, and `codex debug prompt-input`. - Made user-facing config writes go to the selected profile file when active, including TUI/settings persistence, app-server config writes, and MCP/app tool approval persistence. - Made plugin, marketplace, MCP, hooks, and config reload paths read from the merged user config so base and profile layers both participate. - Updated app-server config layer schemas to mark profile-backed user layers. ## Limits `--profile-v2` is still rejected for config-management subcommands such as feature, MCP, and marketplace edits. Those paths remain tied to the base `config.toml` until they have explicit profile-selection semantics. Some adjacent background writes may still update base or global state rather than the selected profile: - marketplace auto-upgrade metadata - automatic MCP dependency installs from skills - remote plugin sync or uninstall config edits - personality migration marker/default writes ## Verification Added targeted coverage for profile name validation, layer ordering/merging, selected-profile writes, app-server config writes, session hot reload, plugin config merging, hooks/config fixture updates, and MCP/app approval persistence. --------- Co-authored-by: Codex <noreply@openai.com>
177 lines
5.5 KiB
Rust
177 lines
5.5 KiB
Rust
use std::io;
|
|
|
|
use codex_config::ConfigLayerEntry;
|
|
use codex_config::ConfigLayerSource;
|
|
use codex_config::config_toml::ConfigLockfileToml;
|
|
use codex_config::config_toml::ConfigToml;
|
|
use codex_utils_absolute_path::AbsolutePathBuf;
|
|
use serde::Serialize;
|
|
use serde::de::DeserializeOwned;
|
|
use similar::TextDiff;
|
|
|
|
pub(crate) const CONFIG_LOCK_VERSION: u32 = 1;
|
|
|
|
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
|
|
pub(crate) struct ConfigLockReplayOptions {
|
|
pub allow_codex_version_mismatch: bool,
|
|
}
|
|
|
|
pub(crate) async fn read_config_lock_from_path(
|
|
path: &AbsolutePathBuf,
|
|
) -> io::Result<ConfigLockfileToml> {
|
|
let contents = tokio::fs::read_to_string(path).await.map_err(|err| {
|
|
config_lock_error(format!(
|
|
"failed to read config lock file {}: {err}",
|
|
path.display()
|
|
))
|
|
})?;
|
|
let lockfile: ConfigLockfileToml = toml::from_str(&contents).map_err(|err| {
|
|
config_lock_error(format!(
|
|
"failed to parse config lock file {}: {err}",
|
|
path.display()
|
|
))
|
|
})?;
|
|
validate_config_lock_metadata_shape(&lockfile)?;
|
|
Ok(lockfile)
|
|
}
|
|
|
|
pub(crate) fn config_lockfile(config: ConfigToml) -> ConfigLockfileToml {
|
|
ConfigLockfileToml {
|
|
version: CONFIG_LOCK_VERSION,
|
|
codex_version: env!("CARGO_PKG_VERSION").to_string(),
|
|
config,
|
|
}
|
|
}
|
|
|
|
pub(crate) fn validate_config_lock_replay(
|
|
expected_lock: &ConfigLockfileToml,
|
|
actual_lock: &ConfigLockfileToml,
|
|
options: ConfigLockReplayOptions,
|
|
) -> io::Result<()> {
|
|
validate_config_lock_metadata_shape(expected_lock)?;
|
|
validate_config_lock_metadata_shape(actual_lock)?;
|
|
|
|
if !options.allow_codex_version_mismatch
|
|
&& expected_lock.codex_version != actual_lock.codex_version
|
|
{
|
|
return Err(config_lock_error(format!(
|
|
"config lock Codex version mismatch: lock was generated by {}, current version is {}; set debug.config_lockfile.allow_codex_version_mismatch=true to ignore this",
|
|
expected_lock.codex_version, actual_lock.codex_version
|
|
)));
|
|
}
|
|
|
|
let expected_lock = config_lock_for_comparison(expected_lock, options);
|
|
let actual_lock = config_lock_for_comparison(actual_lock, options);
|
|
if expected_lock != actual_lock {
|
|
let diff = compact_diff("config", &expected_lock, &actual_lock)
|
|
.unwrap_or_else(|err| format!("failed to build config lock diff: {err}"));
|
|
return Err(config_lock_error(format!(
|
|
"replayed effective config does not match config lock: {diff}"
|
|
)));
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
pub(crate) fn lock_layer_from_config(
|
|
lock_path: &AbsolutePathBuf,
|
|
lockfile: &ConfigLockfileToml,
|
|
) -> io::Result<ConfigLayerEntry> {
|
|
let value = toml_value(
|
|
&config_without_lock_controls(&lockfile.config),
|
|
"config lock",
|
|
)?;
|
|
Ok(ConfigLayerEntry::new(
|
|
ConfigLayerSource::User {
|
|
file: lock_path.clone(),
|
|
profile: None,
|
|
},
|
|
value,
|
|
))
|
|
}
|
|
|
|
pub(crate) fn config_without_lock_controls(config: &ConfigToml) -> ConfigToml {
|
|
let mut config = config.clone();
|
|
clear_config_lock_debug_controls(&mut config);
|
|
config
|
|
}
|
|
|
|
pub(crate) fn clear_config_lock_debug_controls(config: &mut ConfigToml) {
|
|
if let Some(debug) = config.debug.as_mut() {
|
|
debug.config_lockfile = None;
|
|
}
|
|
if config
|
|
.debug
|
|
.as_ref()
|
|
.is_some_and(|debug| debug.config_lockfile.is_none())
|
|
{
|
|
config.debug = None;
|
|
}
|
|
}
|
|
|
|
fn validate_config_lock_metadata_shape(lock: &ConfigLockfileToml) -> io::Result<()> {
|
|
if lock.version != CONFIG_LOCK_VERSION {
|
|
return Err(config_lock_error(format!(
|
|
"unsupported config lock version {}; expected {CONFIG_LOCK_VERSION}",
|
|
lock.version
|
|
)));
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
fn config_lock_for_comparison(
|
|
lockfile: &ConfigLockfileToml,
|
|
options: ConfigLockReplayOptions,
|
|
) -> ConfigLockfileToml {
|
|
let mut lockfile = lockfile.clone();
|
|
clear_config_lock_debug_controls(&mut lockfile.config);
|
|
if options.allow_codex_version_mismatch {
|
|
lockfile.codex_version.clear();
|
|
}
|
|
lockfile
|
|
}
|
|
|
|
fn config_lock_error(message: impl Into<String>) -> io::Error {
|
|
io::Error::other(message.into())
|
|
}
|
|
|
|
fn compact_diff<T: Serialize>(root: &str, expected: &T, actual: &T) -> io::Result<String> {
|
|
let expected = toml::to_string_pretty(expected).map_err(|err| {
|
|
config_lock_error(format!(
|
|
"failed to serialize expected {root} lock TOML: {err}"
|
|
))
|
|
})?;
|
|
let actual = toml::to_string_pretty(actual).map_err(|err| {
|
|
config_lock_error(format!(
|
|
"failed to serialize actual {root} lock TOML: {err}"
|
|
))
|
|
})?;
|
|
Ok(TextDiff::from_lines(&expected, &actual)
|
|
.unified_diff()
|
|
.context_radius(2)
|
|
.header("expected", "actual")
|
|
.to_string())
|
|
}
|
|
|
|
fn toml_value<T: Serialize>(value: &T, label: &str) -> io::Result<toml::Value> {
|
|
toml::Value::try_from(value)
|
|
.map_err(|err| config_lock_error(format!("failed to serialize {label}: {err}")))
|
|
}
|
|
|
|
pub(crate) fn toml_round_trip<T>(value: &impl Serialize, label: &'static str) -> io::Result<T>
|
|
where
|
|
T: DeserializeOwned + Serialize,
|
|
{
|
|
let value = toml_value(value, label)?;
|
|
let toml = value.clone().try_into().map_err(|err| {
|
|
config_lock_error(format!("failed to convert {label} to TOML shape: {err}"))
|
|
})?;
|
|
let represented_value = toml_value(&toml, label)?;
|
|
if represented_value != value {
|
|
return Err(config_lock_error(format!(
|
|
"resolved {label} cannot be fully represented as TOML"
|
|
)));
|
|
}
|
|
Ok(toml)
|
|
}
|