3 Commits

Include renames

Author	SHA1	Message	Date
gt-oai	1d8e2b4da8	(MacOS) Load config requirements from MDM (#8743) ... Load managed requirements from MDM key `requirements_toml_base64`. Tested on my Mac (using `defaults` to set the preference, though this would be set by MDM in production): ``` ➜ codex git:(gt/mdm-requirements) defaults read com.openai.codex requirements_toml_base64 | base64 -d allowed_approval_policies = ["on-request"] ➜ codex git:(gt/mdm-requirements) just c --yolo cargo run --bin codex -- "$@" Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.26s Running `target/debug/codex --yolo` Error loading configuration: value `Never` is not in the allowed set [OnRequest] error: Recipe `codex` failed on line 11 with exit code 1 ➜ codex git:(gt/mdm-requirements) defaults delete com.openai.codex requirements_toml_base64 ➜ codex git:(gt/mdm-requirements) just c --yolo cargo run --bin codex -- "$@" Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.24s Running `target/debug/codex --yolo` ╭──────────────────────────────────────────────────────────╮ │ >_ OpenAI Codex (v0.0.0) │ │ │ │ model: codex-auto-balanced medium /model to change │ │ directory: ~/code/codex/codex-rs │ ╰──────────────────────────────────────────────────────────╯ Tip: Start a fresh idea with /new; the previous session stays in history. ```	2026-01-05 17:41:27 +00:00
Michael Bolin	9bf41e9262	chore: simplify loading of Mac-specific logic in config_loader (#8248) ... Over in `config_loader/macos.rs`, we were doing this complicated `mod` thing to expose one version of `load_managed_admin_config_layer()` for Mac: https://github.com/openai/codex/blob/580c59aa9af61cb4bffb5b204bd16a5dcc4bc911/codex-rs/core/src/config_loader/macos.rs#L4-L5 While exposing a trivial implementation for non-Mac: https://github.com/openai/codex/blob/580c59aa9af61cb4bffb5b204bd16a5dcc4bc911/codex-rs/core/src/config_loader/macos.rs#L110-L117 That was being used like this: https://github.com/openai/codex/blob/580c59aa9af61cb4bffb5b204bd16a5dcc4bc911/codex-rs/core/src/config_loader/layer_io.rs#L47-L48 This PR simplifies that callsite in `layer_io.rs` to just be: ```rust #[cfg(not(target_os = "macos"))] let managed_preferences = None; ``` And updates `config_loader/mod.rs` so we only pull in `macos.rs` on Mac: ```rust #[cfg(target_os = "macos")] mod macos; ``` This simplifies `macos.rs` considerably, though it looks like a big change because everything gets unindented and reformatted because we can drop the whole `mod native` thing now. --- [//]: # (BEGIN SAPLING FOOTER) Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/openai/codex/pull/8248). * #8251 * #8249 * __->__ #8248	2025-12-18 07:35:16 -08:00
Fouad Matin	a5b7675e42	add(core): managed config (#3868) ... ## Summary - Factor `load_config_as_toml` into `core::config_loader` so config loading is reusable across callers. - Layer `~/.codex/config.toml`, optional `~/.codex/managed_config.toml`, and macOS managed preferences (base64) with recursive table merging and scoped threads per source. ## Config Flow ``` Managed prefs (macOS profile: com.openai.codex/config_toml_base64) ▲ │ ~/.codex/managed_config.toml │ (optional file-based override) ▲ │ ~/.codex/config.toml (user-defined settings) ``` - The loader searches under the resolved `CODEX_HOME` directory (defaults to `~/.codex`). - Managed configs let administrators ship fleet-wide overrides via device profiles which is useful for enforcing certain settings like sandbox or approval defaults. - For nested hash tables: overlays merge recursively. Child tables are merged key-by-key, while scalar or array values replace the prior layer entirely. This lets admins add or tweak individual fields without clobbering unrelated user settings.	2025-10-03 13:02:26 -07:00