mirror of
https://github.com/openai/codex.git
synced 2026-11-22 07:13:50 +00:00
Preserve multi-agent settings across config representations (#35656)
## Why `features.multi_agent_v2` can be represented as either a legacy boolean toggle or a table with an `enabled` field and nested settings. Layering or editing configs that mix these forms could replace one form with the other and discard the enabled state or nested settings. ## What changed - Normalize boolean toggles to the table's `enabled` field when merging config layers, applying CLI overrides, and editing user or profile config. - Preserve nested multi-agent settings when toggling the feature, while keeping ordinary replacement semantics for unrelated paths. - Attribute normalized `enabled` values to the layer that supplied the boolean toggle so config write results report overrides correctly. ## Testing Added coverage for layered config, CLI overrides, config edits, app-server writes, and origin metadata using both root and profile feature paths. GitOrigin-RevId: 38b248c949b9ea5d6340a73d754f91c1834ac486
This commit is contained in:
1 parent
6b23635a7e
commit
2f19a57704
9 files changed
+560
-8
No files matched your search
@@ -39,6 +39,45 @@ no_memories_if_mcp_or_web_search = true
|
||||
);
|
||||
}
|
||||
|
||||
/// Legacy feature toggles own the semantic enabled leaf after layered merging.
|
||||
#[test]
|
||||
fn origins_attribute_multi_agent_v2_enabled_to_overriding_boolean_layer() {
|
||||
let temp_dir = TempDir::new().expect("tempdir");
|
||||
let user_layer = ConfigLayerEntry::new(
|
||||
ConfigLayerSource::User {
|
||||
file: test_user_config_path(&temp_dir, "config.toml"),
|
||||
profile: None,
|
||||
},
|
||||
toml::from_str(
|
||||
"[features.multi_agent_v2]\nenabled = true\nsubagent_usage_hint_text = \"keep\"\n",
|
||||
)
|
||||
.expect("user config"),
|
||||
);
|
||||
let user_metadata = user_layer.metadata();
|
||||
let session_layer = ConfigLayerEntry::new(
|
||||
ConfigLayerSource::SessionFlags,
|
||||
toml::from_str("[features]\nmulti_agent_v2 = false\n").expect("session config"),
|
||||
);
|
||||
let session_metadata = session_layer.metadata();
|
||||
let stack = ConfigLayerStack::new(
|
||||
vec![user_layer, session_layer],
|
||||
ConfigRequirements::default(),
|
||||
ConfigRequirementsToml::default(),
|
||||
)
|
||||
.expect("layer stack should be valid");
|
||||
|
||||
let origins = stack.origins();
|
||||
|
||||
assert_eq!(
|
||||
origins.get("features.multi_agent_v2.enabled"),
|
||||
Some(&session_metadata)
|
||||
);
|
||||
assert_eq!(
|
||||
origins.get("features.multi_agent_v2.subagent_usage_hint_text"),
|
||||
Some(&user_metadata)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn enabled_layers_validate_shell_environment_policy() {
|
||||
let layer = ConfigLayerEntry::new(
|
||||
|
||||
Reference in new issue
Block a user