Support packaged defaults in config layering (#37810)

## What changed

- Load an optional package-supplied config file as the lowest-precedence
  configuration layer, so every existing layer can override its values.
- Report the layer as `packagedDefaults`, including its source path, through
  config diagnostics and the app-server protocol.
- Return an error when a configured packaged defaults file is missing.

## Testing

- Cover precedence across packaged, system, user, and session layers.
- Cover the missing-file error path.

GitOrigin-RevId: 52406890f4d580eedabc90bf2a9ee3affa36fee1
This commit is contained in:
jif authored and copyberry committed 2026-08-10 11:22:55 +00:00
1 parent 09f47c8785
commit 34ecac1f2b
19 files changed
+283 -6

No files matched your search

+32
View File
@@ -101,6 +101,7 @@ async fn first_layer_config_error_from_entries(layers: &[ConfigLayerEntry]) -> O
///
/// Configuration is built up from multiple layers in the following order:
///
/// - package: optional default configuration supplied with the Codex package
/// - admin: managed preferences (*)
/// - system `/etc/codex/config.toml` (Unix) or
/// `%ProgramData%\OpenAI\Codex\config.toml` (Windows)
@@ -134,6 +135,36 @@ pub async fn load_config_layers_state(
strict_config,
cloud_config_bundle,
} = options.into();
let packaged_defaults_layer = if let Some(file) = &overrides.packaged_defaults_path {
let config = layer_io::read_config_from_path(
fs,
file,
/*log_missing_as_info*/ false,
strict_config,
)
.await?
.ok_or_else(|| {
io::Error::new(
io::ErrorKind::NotFound,
format!("packaged defaults config file {} not found", file.display()),
)
})?;
let base_dir = file.as_path().parent().ok_or_else(|| {
io::Error::new(
io::ErrorKind::InvalidData,
format!(
"packaged defaults config file {} has no parent directory",
file.display()
),
)
})?;
Some(ConfigLayerEntry::new(
ConfigLayerSource::PackagedDefaults { file: file.clone() },
resolve_relative_paths_in_config_toml(config, base_dir)?,
))
} else {
None
};
let active_user_profile = overrides.user_config_profile.clone();
let ignore_managed_requirements = overrides.ignore_managed_requirements;
let ignore_user_config = overrides.ignore_user_config;
@@ -218,6 +249,7 @@ pub async fn load_config_layers_state(
.map_err(io::Error::other)?;
let mut layers = Vec::<ConfigLayerEntry>::new();
layers.extend(packaged_defaults_layer);
let cli_overrides_layer = if cli_overrides.is_empty() {
None