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

+106
View File
@@ -115,6 +115,112 @@ impl ExecutorFileSystem for TestFileSystem {
}
}
#[tokio::test]
async fn packaged_defaults_have_lower_precedence_than_existing_config_layers() {
let tmp = tempdir().expect("tempdir");
let packaged_defaults_path =
AbsolutePathBuf::resolve_path_against_base("packaged-defaults.toml", tmp.path());
let system_config_path = tmp.path().join("system.toml");
let user_config_path = tmp.path().join(CONFIG_TOML_FILE);
std::fs::write(
packaged_defaults_path.as_path(),
r#"
model = "packaged-model"
model_provider = "packaged-provider"
model_context_window = 120000
"#,
)
.expect("write packaged defaults");
std::fs::write(
&system_config_path,
r#"
model = "system-model"
model_provider = "system-provider"
"#,
)
.expect("write system config");
std::fs::write(&user_config_path, r#"model = "user-model""#).expect("write user config");
let mut overrides = LoaderOverrides::without_managed_config_for_tests();
overrides.packaged_defaults_path = Some(packaged_defaults_path.clone());
overrides.system_config_path = Some(system_config_path.clone());
let stack = load_config_layers_state(
&TestFileSystem,
tmp.path(),
/*cwd*/ None,
&[(
"model".to_string(),
TomlValue::String("session-model".to_string()),
)],
overrides,
&crate::NoopThreadConfigLoader,
)
.await
.expect("load config layers");
assert_eq!(
stack
.all_layers_low_to_high()
.map(|layer| layer.name.clone())
.collect::<Vec<_>>(),
vec![
ConfigLayerSource::PackagedDefaults {
file: packaged_defaults_path,
},
ConfigLayerSource::System {
file: AbsolutePathBuf::from_absolute_path(system_config_path)
.expect("absolute system config path"),
},
ConfigLayerSource::User {
file: AbsolutePathBuf::from_absolute_path(user_config_path)
.expect("absolute user config path"),
profile: None,
},
ConfigLayerSource::SessionFlags,
]
);
assert_eq!(
stack.effective_config(),
toml::toml! {
model = "session-model"
model_provider = "system-provider"
model_context_window = 120000
}
.into()
);
}
#[tokio::test]
async fn missing_packaged_defaults_file_returns_an_error() {
let tmp = tempdir().expect("tempdir");
let packaged_defaults_path =
AbsolutePathBuf::resolve_path_against_base("packaged-defaults.toml", tmp.path());
let mut overrides = LoaderOverrides::without_managed_config_for_tests();
overrides.packaged_defaults_path = Some(packaged_defaults_path.clone());
let err = load_config_layers_state(
&TestFileSystem,
tmp.path(),
/*cwd*/ None,
&[],
overrides,
&crate::NoopThreadConfigLoader,
)
.await
.expect_err("an explicitly configured packaged defaults file must exist");
assert_eq!(err.kind(), io::ErrorKind::NotFound);
assert_eq!(
err.to_string(),
format!(
"packaged defaults config file {} not found",
packaged_defaults_path.display()
)
);
}
#[tokio::test]
async fn profile_v2_rejects_matching_legacy_profile_in_base_user_config() {
let tmp = tempdir().expect("tempdir");