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:
Adam Perry @ OpenAI authored and copyberry committed 2026-07-27 18:41:09 +00:00
1 parent 6b23635a7e
commit 2f19a57704
9 files changed
+560 -8

No files matched your search

+43 -4
View File
@@ -322,7 +322,20 @@ impl ConfigDocument {
ConfigEdit::SetSkillConfigByName { name, enabled } => {
Ok(self.set_skill_config(SkillConfigSelector::Name(name.clone()), *enabled))
}
ConfigEdit::SetPath { segments, value } => Ok(self.insert(segments, value.clone())),
ConfigEdit::SetPath { segments, value } => {
if is_multi_agent_v2_feature_path(segments) && value.as_bool().is_some() {
let mut existing = Some(self.doc.as_item());
for segment in segments {
existing = existing.and_then(|item| item.as_table_like()?.get(segment));
}
if existing.and_then(TomlItem::as_table_like).is_some() {
let mut enabled_segments = segments.clone();
enabled_segments.push("enabled".to_string());
return Ok(self.insert(&enabled_segments, value.clone()));
}
}
Ok(self.insert(segments, value.clone()))
}
ConfigEdit::ClearPath { segments } => Ok(self.clear_owned(segments)),
ConfigEdit::SetProjectTrustLevel { path, level } => {
// Delegate to the existing, tested logic in config.rs to
@@ -594,7 +607,7 @@ impl ConfigDocument {
fn descend(&mut self, segments: &[String], mode: TraversalMode) -> Option<&mut TomlTable> {
let mut current = self.doc.as_table_mut();
for segment in segments {
for (index, segment) in segments.iter().enumerate() {
match mode {
TraversalMode::Create => {
if !current.contains_key(segment.as_str()) {
@@ -605,6 +618,13 @@ impl ConfigDocument {
}
let item = current.get_mut(segment.as_str())?;
if is_multi_agent_v2_feature_path(&segments[..=index])
&& let Some(enabled) = item.as_bool()
{
let mut feature = document_helpers::new_implicit_table();
feature.insert("enabled", value(enabled));
*item = TomlItem::Table(feature);
}
current = document_helpers::ensure_table_for_write(item)?;
}
TraversalMode::Existing => {
@@ -649,6 +669,16 @@ impl ConfigDocument {
}
}
fn is_multi_agent_v2_feature_path(segments: &[String]) -> bool {
match segments {
[features, feature] => features == "features" && feature == "multi_agent_v2",
[profiles, _, features, feature] => {
profiles == "profiles" && features == "features" && feature == "multi_agent_v2"
}
_ => false,
}
}
fn normalize_skill_config_path(path: &Path) -> String {
dunce::canonicalize(path)
.unwrap_or_else(|_| path.to_path_buf())
@@ -834,9 +864,18 @@ impl ConfigEditsBuilder {
///
/// Disabling a default-false feature clears the key instead of
/// persisting `false`, so the config does not pin the feature once it
/// graduates to globally enabled.
/// graduates to globally enabled. Structured multi-agent v2 settings are
/// an exception: its explicit `enabled = false` preserves nested options.
pub fn set_feature_enabled(mut self, key: &str, enabled: bool) -> Self {
let segments = vec!["features".to_string(), key.to_string()];
let mut segments = vec!["features".to_string(), key.to_string()];
if key == "multi_agent_v2" && !enabled {
segments.push("enabled".to_string());
self.edits.push(ConfigEdit::SetPath {
segments,
value: value(false),
});
return self;
}
let is_default_false_feature = FEATURES
.iter()
.find(|spec| spec.key == key)