mirror of
https://github.com/openai/codex.git
synced 2026-09-05 15:18:41 +00:00
7c194ff24b
## What changed - Load configuration for `codex features list` through the shared cloud-aware loader so managed feature requirements are reflected in the reported state. - Reuse that loader for MCP commands. ## Testing - Add an integration test showing that a cloud-managed requirement can disable `fast_mode` in `codex features list` without rewriting the user's `config.toml`. GitOrigin-RevId: 2bdbc76dfa40ceb29e8293556f4b56cabbd2c43f
53 lines
2.0 KiB
Rust
53 lines
2.0 KiB
Rust
use anyhow::Context;
|
|
use anyhow::Result;
|
|
use codex_cloud_config::cloud_config_bundle_loader_for_storage;
|
|
use codex_config::CloudConfigBundleLoader;
|
|
use codex_config::ConfigLoadOptions;
|
|
use codex_core::config::Config;
|
|
use codex_core::config::ConfigBuilder;
|
|
use codex_core::config::LoaderOverrides;
|
|
use codex_core::config::bootstrap_auth_config;
|
|
use codex_core::config::find_codex_home;
|
|
use codex_core::config::load_config_toml_with_layer_stack;
|
|
use codex_utils_absolute_path::AbsolutePathBuf;
|
|
use codex_utils_cli::CliConfigOverrides;
|
|
|
|
pub(crate) async fn load_config(
|
|
config_overrides: &CliConfigOverrides,
|
|
loader_overrides: LoaderOverrides,
|
|
) -> Result<Config> {
|
|
let cli_overrides = config_overrides
|
|
.parse_overrides()
|
|
.map_err(anyhow::Error::msg)?;
|
|
let codex_home = find_codex_home().context("failed to resolve CODEX_HOME")?;
|
|
let cwd = AbsolutePathBuf::current_dir().context("failed to resolve current directory")?;
|
|
let bootstrap_config = load_config_toml_with_layer_stack(
|
|
codex_home.as_path(),
|
|
Some(&cwd),
|
|
cli_overrides.clone(),
|
|
ConfigLoadOptions {
|
|
loader_overrides: loader_overrides.clone(),
|
|
strict_config: false,
|
|
cloud_config_bundle: CloudConfigBundleLoader::default(),
|
|
},
|
|
)
|
|
.await
|
|
.context("failed to load bootstrap configuration")?;
|
|
let cloud_config_bundle = cloud_config_bundle_loader_for_storage(
|
|
bootstrap_auth_config(codex_home.as_path(), &bootstrap_config)
|
|
.context("failed to resolve cloud configuration authentication")?,
|
|
/*enable_codex_api_key_env*/ false,
|
|
)
|
|
.await
|
|
.context("failed to initialize cloud configuration authentication")?;
|
|
|
|
ConfigBuilder::default()
|
|
.codex_home(codex_home.to_path_buf())
|
|
.cli_overrides(cli_overrides)
|
|
.loader_overrides(loader_overrides)
|
|
.cloud_config_bundle(cloud_config_bundle)
|
|
.build()
|
|
.await
|
|
.context("failed to load configuration")
|
|
}
|