mirror of
https://github.com/openai/codex.git
synced 2026-11-20 23:08:21 +00:00
Add cloud-managed config layer support (#24620)
## Summary PR 3 of 5 in the cloud-managed config client stack. Adds enterprise-managed cloud config as a first-class config layer source. The layer metadata is preserved through config loading, diagnostics, debug output, hook attribution, and app-server protocol surfaces. ## Details - Enterprise-managed config becomes a normal config layer source with backend-supplied `id` and display `name` attached for provenance. - These layers are designed to behave like non-file managed config: they can surface syntax/type diagnostics by layer name even though there is no physical config file. - Relative path settings are resolved from a stored config base so cloud-delivered config remains consistent with existing MDM-delivered config semantics. - Hook attribution distinguishes config-delivered hooks from requirements-delivered hooks via `HookSource::CloudManagedConfig`. - This remains pull-based and snapshot-oriented; the PR adds layer identity/diagnostics, not dynamic reload behavior. ## Validation Validated through the targeted stack checks after rebasing onto current `main`: - Rust crate tests for config/hooks/cloud-config/backend-client/app-server-protocol - Filtered `codex-core` and `codex-app-server` `cloud_config_bundle` tests - Python generated-file contract test - `cargo shear --deny-warnings` - Targeted `argument-comment-lint` for config/hooks
This commit is contained in:
1 parent
20debf746b
commit
8a556296f0
27 files changed
+644
-48
No files matched your search
@@ -366,13 +366,18 @@ pub async fn load_config_layers_state(
|
||||
// paths, starting with `./`, but a path starting with `~/` _is_ a
|
||||
// supported use case. Because resolve_relative_paths_in_config_toml()
|
||||
// relies on AbsolutePathBufGuard to resolve `~/`, we must supply a
|
||||
// value for base_dir, so codex_home is as good a value as any.
|
||||
let managed_config =
|
||||
resolve_relative_paths_in_config_toml(config.managed_config, codex_home)?;
|
||||
// value for base_dir. Preserve that same base on the layer so later
|
||||
// raw-TOML diagnostics parse with the same path semantics.
|
||||
let raw_toml_base_dir = AbsolutePathBuf::from_absolute_path(codex_home)?;
|
||||
let managed_config = resolve_relative_paths_in_config_toml(
|
||||
config.managed_config,
|
||||
raw_toml_base_dir.as_path(),
|
||||
)?;
|
||||
layers.push(ConfigLayerEntry::new_with_raw_toml(
|
||||
ConfigLayerSource::LegacyManagedConfigTomlFromMdm,
|
||||
managed_config,
|
||||
config.raw_toml,
|
||||
raw_toml_base_dir,
|
||||
));
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user