Skip to content

A self-improving RLM agent for coding workflows and long-running autonomous tasks.

Rust

fix: preserve settings during preference and mcp saves (#3543)

kt7b89c111da0f
diff --git a/.changes/fix-settings-save-preservation.md b/.changes/fix-settings-save-preservation.md
new file mode 100644
index 0000000000..47dfcaab39
--- /dev/null
+++ b/.changes/fix-settings-save-preservation.md
@@ -0,0 +1 @@
+- Settings changes preserve unrelated and concurrently updated fields, and no longer overwrite a settings file that failed to parse. Adding the first MCP server also recovers from the null server map written by older settings saves.
diff --git a/crates/pa-cli/src/mcp_command.rs b/crates/pa-cli/src/mcp_command.rs
index ef38cef107..a0b3af15d1 100644
--- a/crates/pa-cli/src/mcp_command.rs
+++ b/crates/pa-cli/src/mcp_command.rs
@@ -100,14 +100,16 @@ fn mutate_global_settings(
let mut failure: Option<anyhow::Error> = None;
storage
.with_lock(pa_core::settings::SettingsScope::Global, &mut |current| {
- let mut settings = current
- .and_then(|content| serde_json::from_str::<serde_json::Value>(&content).ok())
- .unwrap_or_else(|| serde_json::json!({}));
- match mutate(&mut settings).and_then(|changed| {
+ let result = (|| -> Result<Option<String>> {
+ let mut settings =
+ serde_json::from_str::<serde_json::Value>(current.as_deref().unwrap_or("{}"))
+ .context("parsing settings.json; settings not saved")?;
+ let changed = mutate(&mut settings)?;
changed
.then(|| serde_json::to_string_pretty(&settings).map_err(Into::into))
.transpose()
- }) {
+ })();
+ match result {
Ok(next) => next,
Err(error) => {
failure = Some(error);
@@ -138,6 +140,10 @@ fn set_global_mcp_server(name: &str, config: &McpServerConfig) -> Result<()> {
.ok_or_else(|| anyhow!("settings.json must contain a JSON object"))?
.entry("mcpServers".to_string())
.or_insert_with(|| serde_json::json!({}));
+ // Older settings saves emitted null for an absent optional map.
+ if servers.is_null() {
+ *servers = serde_json::json!({});
+ }
if !servers.is_object() {
bail!("the mcpServers setting must be a JSON object");
}
diff --git a/crates/pa-cli/tests/settings_mcp_save.rs b/crates/pa-cli/tests/settings_mcp_save.rs
new file mode 100644
index 0000000000..fa701d469b
--- /dev/null
+++ b/crates/pa-cli/tests/settings_mcp_save.rs
@@ -0,0 +1,59 @@
+use std::process::Command;
+
+use pa_core::settings::SettingsManager;
+use serde_json::{json, Value};
+
+#[test]
+fn first_mcp_server_can_be_added_after_chat_detail_save_or_legacy_null() {
+ for legacy_null in [false, true] {
+ let dir = tempfile::tempdir().unwrap();
+ let agent = dir.path().join("agent");
+ std::fs::create_dir_all(&agent).unwrap();
+ let path = agent.join("settings.json");
+ let mut initial = json!({"theme":"light","editorPaddingX":2});
+ if legacy_null {
+ initial["mcpServers"] = Value::Null;
+ }
+ std::fs::write(&path, initial.to_string()).unwrap();
+ let mut manager = SettingsManager::create(dir.path(), &agent);
+ manager.set_chat_detail("details").unwrap();
+ let mut expected: Value = serde_json::from_slice(&std::fs::read(&path).unwrap()).unwrap();
+ let output = Command::new(env!("CARGO_BIN_EXE_prime-agent"))
+ .args(["mcp", "add", "fixture", "--", "fixture-command"])
+ .env("PRIME_AGENT_CODING_AGENT_DIR", &agent)
+ .env("DO_NOT_TRACK", "1")
+ .env("HOME", dir.path())
+ .current_dir(dir.path())
+ .output()
+ .unwrap();
+ assert!(
+ output.status.success(),
+ "{}",
+ String::from_utf8_lossy(&output.stderr)
+ );
+ expected["mcpServers"] = json!({"fixture":{"type":"stdio","command":"fixture-command"}});
+ assert_eq!(
+ serde_json::from_slice::<Value>(&std::fs::read(path).unwrap()).unwrap(),
+ expected
+ );
+ }
+}
+
+#[test]
+fn mcp_registration_preserves_invalid_documents_and_non_null_maps() {
+ for content in ["{bad", "[]", r#"{"mcpServers":[],"theme":"light"}"#] {
+ let dir = tempfile::tempdir().unwrap();
+ let path = dir.path().join("settings.json");
+ std::fs::write(&path, content).unwrap();
+ let output = Command::new(env!("CARGO_BIN_EXE_prime-agent"))
+ .args(["mcp", "add", "fixture", "--", "fixture-command"])
+ .env("PRIME_AGENT_CODING_AGENT_DIR", dir.path())
+ .env("DO_NOT_TRACK", "1")
+ .env("HOME", dir.path())
+ .current_dir(dir.path())
+ .output()
+ .unwrap();
+ assert!(!output.status.success());
+ assert_eq!(std::fs::read_to_string(path).unwrap(), content);
+ }
+}
diff --git a/crates/pa-core/src/settings/interactive_settings.rs b/crates/pa-core/src/settings/interactive_settings.rs
index 974e6cecdd..e793e72e10 100644
--- a/crates/pa-core/src/settings/interactive_settings.rs
+++ b/crates/pa-core/src/settings/interactive_settings.rs
@@ -15,7 +15,7 @@ impl SettingsManager {
.terminal
.get_or_insert_with(Default::default)
.show_images = Some(show);
- self.save_global_scope()
+ self.save_global_scope(&["terminal.showImages"])
}
/// `terminal.clearOnShrink` (TS default: the `PI_CLEAR_ON_SHRINK`
@@ -37,7 +37,7 @@ impl SettingsManager {
.terminal
.get_or_insert_with(Default::default)
.clear_on_shrink = Some(enabled);
- self.save_global_scope()
+ self.save_global_scope(&["terminal.clearOnShrink"])
}
#[must_use]
@@ -57,7 +57,7 @@ impl SettingsManager {
.terminal
.get_or_insert_with(Default::default)
.show_terminal_progress = Some(enabled);
- self.save_global_scope()
+ self.save_global_scope(&["terminal.showTerminalProgress"])
}
/// # Errors
@@ -68,7 +68,7 @@ impl SettingsManager {
.terminal
.get_or_insert_with(Default::default)
.fullscreen_mouse = Some(enabled);
- self.save_global_scope()
+ self.save_global_scope(&["terminal.fullscreenMouse"])
}
#[must_use]
@@ -88,7 +88,7 @@ impl SettingsManager {
.images
.get_or_insert_with(Default::default)
.auto_resize = Some(enabled);
- self.save_global_scope()
+ self.save_global_scope(&["images.autoResize"])
}
#[must_use]
@@ -108,7 +108,7 @@ impl SettingsManager {
.images
.get_or_insert_with(Default::default)
.block_images = Some(blocked);
- self.save_global_scope()
+ self.save_global_scope(&["images.blockImages"])
}
#[must_use]
@@ -121,7 +121,7 @@ impl SettingsManager {
/// Returns an error when the global settings scope cannot be saved.
pub fn set_enable_skill_commands(&mut self, enabled: bool) -> Result<()> {
self.global_mut().enable_skill_commands = Some(enabled);
- self.save_global_scope()
+ self.save_global_scope(&["enableSkillCommands"])
}
#[must_use]
@@ -134,7 +134,7 @@ impl SettingsManager {
/// Returns an error when the global settings scope cannot be saved.
pub fn set_enable_builtin_skills(&mut self, enabled: bool) -> Result<()> {
self.global_mut().enable_builtin_skills = Some(enabled);
- self.save_global_scope()
+ self.save_global_scope(&["enableBuiltinSkills"])
}
/// `showHardwareCursor` (TS default false; the `PI_HARDWARE_CURSOR`
@@ -149,7 +149,7 @@ impl SettingsManager {
/// Returns an error when the global settings scope cannot be saved.
pub fn set_show_hardware_cursor(&mut self, enabled: bool) -> Result<()> {
self.global_mut().show_hardware_cursor = Some(enabled);
- self.save_global_scope()
+ self.save_global_scope(&["showHardwareCursor"])
}
#[must_use]
@@ -162,7 +162,7 @@ impl SettingsManager {
/// Returns an error when the global settings scope cannot be saved.
pub fn set_editor_padding_x(&mut self, padding: u64) -> Result<()> {
self.global_mut().editor_padding_x = Some(padding.min(3));
- self.save_global_scope()
+ self.save_global_scope(&["editorPaddingX"])
}
#[must_use]
@@ -175,7 +175,7 @@ impl SettingsManager {
/// Returns an error when the global settings scope cannot be saved.
pub fn set_autocomplete_max_visible(&mut self, max_visible: u64) -> Result<()> {
self.global_mut().autocomplete_max_visible = Some(max_visible.clamp(3, 20));
- self.save_global_scope()
+ self.save_global_scope(&["autocompleteMaxVisible"])
}
#[must_use]
@@ -188,7 +188,7 @@ impl SettingsManager {
/// Returns an error when the global settings scope cannot be saved.
pub fn set_quiet_startup(&mut self, quiet: bool) -> Result<()> {
self.global_mut().quiet_startup = Some(quiet);
- self.save_global_scope()
+ self.save_global_scope(&["quietStartup"])
}
/// `idleEvictionMinutes` (TS `number | "off"`; a `none` value or an
@@ -221,7 +221,7 @@ impl SettingsManager {
pub fn set_idle_eviction_minutes(&mut self, value: &str) -> Result<()> {
if value == "off" {
self.global_mut().idle_eviction_minutes = Some(serde_json::json!("off"));
- return self.save_global_scope();
+ return self.save_global_scope(&["idleEvictionMinutes"]);
}
let number: f64 = value
.parse()
@@ -232,7 +232,7 @@ impl SettingsManager {
));
}
self.global_mut().idle_eviction_minutes = Some(serde_json::json!(number));
- self.save_global_scope()
+ self.save_global_scope(&["idleEvictionMinutes"])
}
/// `markdown.mermaid` (TS default `streaming`; only `off` and `final` are recognized).
@@ -267,7 +267,7 @@ impl SettingsManager {
.markdown
.get_or_insert_with(Default::default)
.mermaid = Some(parsed);
- self.save_global_scope()
+ self.save_global_scope(&["markdown.mermaid"])
}
#[must_use]
@@ -287,7 +287,7 @@ impl SettingsManager {
.warnings
.get_or_insert_with(Default::default)
.anthropic_extra_usage = Some(enabled);
- self.save_global_scope()
+ self.save_global_scope(&["warnings.anthropicExtraUsage"])
}
/// # Errors
@@ -295,7 +295,7 @@ impl SettingsManager {
/// Returns an error when the global settings scope cannot be saved.
pub fn set_tree_filter_mode(&mut self, mode: &str) -> Result<()> {
self.global_mut().tree_filter_mode = Some(mode.to_string());
- self.save_global_scope()
+ self.save_global_scope(&["treeFilterMode"])
}
/// # Errors
@@ -303,7 +303,7 @@ impl SettingsManager {
/// Returns an error when the global settings scope cannot be saved.
pub fn set_chat_detail(&mut self, detail: &str) -> Result<()> {
self.global_mut().chat_detail = Some(detail.to_string());
- self.save_global_scope()
+ self.save_global_scope(&["chatDetail"])
}
/// `factory.enabled` (the agent factory's opt-in gate): unset reads
@@ -335,7 +335,7 @@ impl SettingsManager {
.factory
.get_or_insert_with(Default::default)
.enabled = Some(enabled);
- self.save_global_scope()
+ self.save_global_scope(&["factory.enabled"])
}
/// `enabledModels` (TS `getEnabledModels`/`setEnabledModels`): the
@@ -350,6 +350,6 @@ impl SettingsManager {
/// Returns an error when the global settings scope cannot be saved.
pub fn set_enabled_models(&mut self, models: Option<Vec<String>>) -> Result<()> {
self.global_mut().enabled_models = models;
- self.save_global_scope()
+ self.save_global_scope(&["enabledModels"])
}
}
diff --git a/crates/pa-core/src/settings/manager.rs b/crates/pa-core/src/settings/manager.rs
index 49a7c6ecea..9b2048e734 100644
--- a/crates/pa-core/src/settings/manager.rs
+++ b/crates/pa-core/src/settings/manager.rs
@@ -1,9 +1,10 @@
//! `SettingsManager`: loads global + project settings, merges them, tracks
//! modified fields, and writes back only what this session changed.
+use std::collections::BTreeSet;
use std::sync::Arc;
-use anyhow::Result;
+use anyhow::{anyhow, Context, Result};
use super::load::from_value_lenient;
use super::merge::{deep_merge, migrate};
@@ -26,6 +27,7 @@ pub struct SettingsError {
pub struct SettingsManager {
storage: Arc<dyn SettingsStorage>,
global: Settings,
+ pending_global_fields: BTreeSet<&'static str>,
project: Settings,
merged: Settings,
runtime_overrides: Settings,
@@ -50,6 +52,7 @@ impl SettingsManager {
Self {
storage,
global,
+ pending_global_fields: BTreeSet::new(),
project,
merged,
runtime_overrides: Settings::default(),
@@ -140,6 +143,7 @@ impl SettingsManager {
let (project, _, project_load_error) =
load_scope(self.storage.as_ref(), SettingsScope::Project, &mut errors);
self.global = global;
+ self.pending_global_fields.clear();
self.project = project;
self.global_raw = global_raw;
self.global_load_error = global_load_error;
@@ -163,8 +167,8 @@ impl SettingsManager {
/// # Errors
///
/// Returns an error when the global settings file cannot be written.
- pub(crate) fn save_global_scope(&mut self) -> Result<()> {
- self.save_global()
+ pub(crate) fn save_global_scope(&mut self, fields: &[&'static str]) -> Result<()> {
+ self.save_global(fields)
}
// -- persisted setters --------------------------------------------------
@@ -174,7 +178,7 @@ impl SettingsManager {
/// Returns an error when the global settings file cannot be written.
pub fn set_default_provider(&mut self, provider: String) -> Result<()> {
self.global.default_provider = Some(provider);
- self.save_global()
+ self.save_global(&["defaultProvider"])
}
/// # Errors
@@ -182,7 +186,7 @@ impl SettingsManager {
/// Returns an error when the global settings file cannot be written.
pub fn set_default_model(&mut self, model: String) -> Result<()> {
self.global.default_model = Some(model);
- self.save_global()
+ self.save_global(&["defaultModel"])
}
/// # Errors
@@ -192,7 +196,7 @@ impl SettingsManager {
self.global.default_provider = Some(provider.to_string());
self.global.default_model = Some(model.to_string());
self.record_model_use(provider, model);
- self.save_global()
+ self.save_global(&["defaultProvider", "defaultModel", "recentModels"])
}
/// `markdown.codeBlockIndent`: the string the chat markdown renderer
@@ -272,6 +276,7 @@ impl SettingsManager {
}
recent.truncate(RECENT_MODELS_LIMIT);
self.global.recent_models = Some(recent);
+ self.pending_global_fields.insert("recentModels");
}
/// # Errors
@@ -279,7 +284,7 @@ impl SettingsManager {
/// Returns an error when the global settings file cannot be written.
pub fn set_steering_mode(&mut self, mode: QueueModeSetting) -> Result<()> {
self.global.steering_mode = Some(mode);
- self.save_global()
+ self.save_global(&["steeringMode"])
}
/// # Errors
@@ -287,7 +292,7 @@ impl SettingsManager {
/// Returns an error when the global settings file cannot be written.
pub fn set_follow_up_mode(&mut self, mode: QueueModeSetting) -> Result<()> {
self.global.follow_up_mode = Some(mode);
- self.save_global()
+ self.save_global(&["followUpMode"])
}
/// # Errors
@@ -295,7 +300,7 @@ impl SettingsManager {
/// Returns an error when the global settings file cannot be written.
pub fn set_theme(&mut self, theme: String) -> Result<()> {
self.global.theme = Some(theme);
- self.save_global()
+ self.save_global(&["theme"])
}
/// # Errors
@@ -303,7 +308,7 @@ impl SettingsManager {
/// Returns an error when the global settings file cannot be written.
pub fn set_update_channel(&mut self, channel: UpdateChannel) -> Result<()> {
self.global.update_channel = Some(channel);
- self.save_global()
+ self.save_global(&["updateChannel"])
}
/// # Errors
@@ -311,7 +316,7 @@ impl SettingsManager {
/// Returns an error when the global settings file cannot be written.
pub fn set_default_thinking_level(&mut self, level: ThinkingLevelSetting) -> Result<()> {
self.global.default_thinking_level = Some(level);
- self.save_global()
+ self.save_global(&["defaultThinkingLevel"])
}
/// The auto-retry toggle (`retry.enabled`).
@@ -324,7 +329,7 @@ impl SettingsManager {
.retry
.get_or_insert_with(Default::default)
.enabled = Some(enabled);
- self.save_global()
+ self.save_global(&["retry.enabled"])
}
/// The auto-compaction toggle (`compaction.enabled`): a daemon restart re-seeds
@@ -338,7 +343,7 @@ impl SettingsManager {
.compaction
.get_or_insert_with(Default::default)
.enabled = Some(enabled);
- self.save_global()
+ self.save_global(&["compaction.enabled"])
}
/// # Errors
@@ -346,7 +351,7 @@ impl SettingsManager {
/// Returns an error when the global settings file cannot be written.
pub fn set_transport(&mut self, transport: TransportSetting) -> Result<()> {
self.global.transport = Some(transport);
- self.save_global()
+ self.save_global(&["transport"])
}
/// # Errors
@@ -354,7 +359,7 @@ impl SettingsManager {
/// Returns an error when the global settings file cannot be written.
pub fn set_rlm_max_depth(&mut self, depth: u64) -> Result<()> {
self.global.rlm_max_depth = Some(depth);
- self.save_global()
+ self.save_global(&["rlmMaxDepth"])
}
/// # Errors
@@ -363,7 +368,7 @@ impl SettingsManager {
pub fn set_telemetry_enabled(&mut self, enabled: bool) -> Result<()> {
let telemetry = self.global.telemetry.get_or_insert_with(Default::default);
telemetry.enabled = Some(enabled);
- self.save_global()
+ self.save_global(&["telemetry.enabled"])
}
/// # Errors
@@ -372,7 +377,7 @@ impl SettingsManager {
pub fn set_telemetry_notice_shown(&mut self, shown: bool) -> Result<()> {
let telemetry = self.global.telemetry.get_or_insert_with(Default::default);
telemetry.notice_shown = Some(shown);
- self.save_global()
+ self.save_global(&["telemetry.noticeShown"])
}
/// # Errors
@@ -380,7 +385,7 @@ impl SettingsManager {
/// Returns an error when the global settings file cannot be written.
pub fn set_onboarding_shown(&mut self, shown: bool) -> Result<()> {
self.global.onboarding_shown = Some(shown);
- self.save_global()
+ self.save_global(&["onboardingShown"])
}
/// # Errors
@@ -388,7 +393,7 @@ impl SettingsManager {
/// Returns an error when the global settings file cannot be written.
pub fn set_onboarding_completed(&mut self, completed: bool) -> Result<()> {
self.global.onboarding_completed = Some(completed);
- self.save_global()
+ self.save_global(&["onboardingCompleted"])
}
/// The shown flag with the legacy completed flag as fallback.
@@ -440,7 +445,7 @@ impl SettingsManager {
.agent_traces
.get_or_insert_with(Default::default);
traces.enabled = Some(enabled);
- self.save_global()
+ self.save_global(&["agentTraces.enabled"])
}
pub fn set_packages(&mut self, packages: Vec<serde_json::Value>) {
@@ -524,20 +529,23 @@ impl SettingsManager {
});
return;
}
- let result = self.storage.with_lock(scope, &mut |current| {
- let mut map: serde_json::Map<String, serde_json::Value> = current
- .and_then(|content| serde_json::from_str::<serde_json::Value>(&content).ok())
- .and_then(|value| match value {
- serde_json::Value::Object(mut map) => {
- super::merge::migrate(&mut map);
- Some(map)
+ let mut failure = None;
+ let result =
+ self.storage.with_lock(
+ scope,
+ &mut |current| match settings_document(current.as_deref()).and_then(|mut map| {
+ map.insert(field.to_string(), value.clone());
+ serde_json::to_string_pretty(&serde_json::Value::Object(map))
+ .map_err(Into::into)
+ }) {
+ Ok(content) => Some(content),
+ Err(error) => {
+ failure = Some(error);
+ None
}
- _ => None,
- })
- .unwrap_or_default();
- map.insert(field.to_string(), value.clone());
- serde_json::to_string_pretty(&serde_json::Value::Object(map)).ok()
- });
+ },
+ );
+ let result = result.and_then(|()| failure.map_or(Ok(()), Err));
if let Err(error) = result {
self.errors.push(SettingsError {
scope,
@@ -615,7 +623,7 @@ impl SettingsManager {
ServiceTier::Priority => "priority",
};
self.global.default_service_tier = Some(name.to_string());
- self.save_global()
+ self.save_global(&["defaultServiceTier"])
}
/// Service tier a fresh session records as its preference.
@@ -892,18 +900,84 @@ impl SettingsManager {
/// Write the global scope back (project scope is host-written, not
/// user-set), then re-derive the effective settings.
- fn save_global(&mut self) -> Result<()> {
- let content = serde_json::to_string_pretty(&self.global)?;
+ fn save_global(&mut self, fields: &[&'static str]) -> Result<()> {
+ self.merged = deep_merge(&self.global, &self.project);
+ self.pending_global_fields.extend(fields.iter().copied());
+ if let Some(message) = &self.global_load_error {
+ self.errors.push(SettingsError {
+ scope: SettingsScope::Global,
+ message: format!(
+ "Global settings not saved: settings file failed to parse: {message}"
+ ),
+ });
+ return Ok(());
+ }
+ let snapshot = serde_json::to_value(&self.global)?;
+ let mut failure = None;
+ let mut saved = None;
self.storage
.with_lock(SettingsScope::Global, &mut |current| {
- let _ = current;
- Some(content.clone())
+ let result = (|| -> Result<String> {
+ let mut document = settings_document(current.as_deref())?;
+ for field in &self.pending_global_fields {
+ let (map, key, value) = if let Some((parent, child)) = field.split_once('.')
+ {
+ let nested = document
+ .entry(parent.to_string())
+ .or_insert_with(|| serde_json::json!({}));
+ if !nested.is_object() {
+ *nested = serde_json::json!({});
+ }
+ (
+ nested.as_object_mut().unwrap(),
+ child,
+ &snapshot[parent][child],
+ )
+ } else {
+ (&mut document, *field, &snapshot[*field])
+ };
+ if value.is_null() {
+ map.remove(key);
+ } else {
+ map.insert(key.to_string(), value.clone());
+ }
+ }
+ let value = serde_json::Value::Object(document);
+ let content = serde_json::to_string_pretty(&value)?;
+ saved = Some(value);
+ Ok(content)
+ })();
+ match result {
+ Ok(content) => Some(content),
+ Err(error) => {
+ failure = Some(error);
+ None
+ }
+ }
})?;
- self.merged = deep_merge(&self.global, &self.project);
+ if let Some(error) = failure {
+ return Err(error);
+ }
+ self.global_raw = saved;
+ self.pending_global_fields.clear();
Ok(())
}
}
+/// Parse inside the storage lock; malformed or non-object documents must never
+/// be replaced with defaults, including when another writer changed them after load.
+fn settings_document(current: Option<&str>) -> Result<serde_json::Map<String, serde_json::Value>> {
+ let value: serde_json::Value = serde_json::from_str(current.unwrap_or("{}"))
+ .context("parsing settings.json; settings not saved")?;
+ let serde_json::Value::Object(mut map) = value else {
+ return Err(anyhow!(
+ "settings.json must contain a JSON object; settings not saved"
+ ));
+ };
+ migrate(&mut map);
+ Ok(map)
+}
+
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum IdleEviction {
Minutes(u64),
diff --git a/crates/pa-core/src/settings/mod.rs b/crates/pa-core/src/settings/mod.rs
index cfb92bdade..f9f2c5a81d 100644
--- a/crates/pa-core/src/settings/mod.rs
+++ b/crates/pa-core/src/settings/mod.rs
@@ -8,6 +8,9 @@ pub(crate) mod merge;
pub(crate) mod storage;
pub(crate) mod types;
+#[cfg(test)]
+mod persistence_tests;
+
pub use manager::{
IdleEviction, SessionArchivePolicy, SettingsError, SettingsManager,
DEFAULT_IDLE_EVICTION_MINUTES, DEFAULT_SESSION_ARCHIVE_MAX_AGE_DAYS,
diff --git a/crates/pa-core/src/settings/persistence_tests.rs b/crates/pa-core/src/settings/persistence_tests.rs
new file mode 100644
index 0000000000..0bc72807fb
--- /dev/null
+++ b/crates/pa-core/src/settings/persistence_tests.rs
@@ -0,0 +1,132 @@
+use std::sync::Arc;
+
+use serde_json::{json, Value};
+
+use super::{InMemorySettingsStorage, SettingsManager, SettingsScope, SettingsStorage};
+
+fn fixture(content: &str) -> (Arc<InMemorySettingsStorage>, SettingsManager) {
+ let storage = Arc::new(InMemorySettingsStorage::default());
+ storage
+ .with_lock(SettingsScope::Global, &mut |_| Some(content.to_string()))
+ .unwrap();
+ let manager = SettingsManager::from_storage(storage.clone());
+ (storage, manager)
+}
+
+fn document(storage: &dyn SettingsStorage) -> Value {
+ serde_json::from_str(&storage.read(SettingsScope::Global).unwrap().unwrap()).unwrap()
+}
+
+#[test]
+fn model_switch_preserves_a_document_that_failed_to_load() {
+ for content in ["{\"theme\":\"light\",}", "\u{feff}{\"theme\":\"light\"}"] {
+ let (storage, mut manager) = fixture(content);
+ manager
+ .set_default_model_and_provider("openai", "model")
+ .unwrap();
+ assert_eq!(
+ storage.read(SettingsScope::Global).unwrap().as_deref(),
+ Some(content)
+ );
+ assert!(manager
+ .errors()
+ .iter()
+ .any(|error| error.message.contains("not saved")));
+ assert_eq!(manager.get_default_model(), Some("model"));
+ }
+}
+
+#[test]
+fn chat_detail_save_changes_only_the_requested_setting() {
+ let (storage, mut manager) = fixture(r#"{"theme":"light","pluginSetting":{"keep":true}}"#);
+ manager.set_chat_detail("details").unwrap();
+ assert_eq!(
+ document(storage.as_ref()),
+ json!({
+ "theme":"light", "pluginSetting":{"keep":true}, "chatDetail":"details"
+ })
+ );
+}
+
+#[test]
+fn stale_managers_preserve_other_writers_and_explicit_same_value_choices() {
+ let (storage, mut first) =
+ fixture(r#"{"theme":"light","telemetry":{"enabled":false,"futureSetting":"keep"}}"#);
+ let mut second = SettingsManager::from_storage(storage.clone());
+ second.set_theme("dark".into()).unwrap();
+ second.set_telemetry_notice_shown(true).unwrap();
+ first.set_theme("light".into()).unwrap();
+ first.set_telemetry_enabled(true).unwrap();
+ second.set_quiet_startup(true).unwrap();
+ assert_eq!(
+ document(storage.as_ref()),
+ json!({
+ "theme":"light", "quietStartup":true,
+ "telemetry":{"enabled":true,"noticeShown":true,"futureSetting":"keep"}
+ })
+ );
+}
+
+#[test]
+fn saves_preserve_a_document_corrupted_after_load() {
+ let (storage, mut manager) = fixture(r#"{"theme":"light"}"#);
+ for content in ["{bad", "[]", "null"] {
+ storage
+ .with_lock(SettingsScope::Global, &mut |_| Some(content.into()))
+ .unwrap();
+ assert!(manager.set_theme("dark".into()).is_err());
+ assert_eq!(
+ storage.read(SettingsScope::Global).unwrap().as_deref(),
+ Some(content)
+ );
+ }
+ storage
+ .with_lock(SettingsScope::Global, &mut |_| {
+ Some(r#"{"external":"keep"}"#.into())
+ })
+ .unwrap();
+ manager.set_quiet_startup(true).unwrap();
+ assert_eq!(
+ document(storage.as_ref()),
+ json!({
+ "external":"keep", "theme":"dark", "quietStartup":true
+ })
+ );
+}
+
+#[test]
+fn resource_save_preserves_a_document_corrupted_after_load() {
+ let (storage, mut manager) = fixture("{}");
+ storage
+ .with_lock(SettingsScope::Global, &mut |_| Some("{bad".into()))
+ .unwrap();
+ manager.set_global_resource_array("skills", vec!["new".into()]);
+ assert_eq!(
+ storage.read(SettingsScope::Global).unwrap().as_deref(),
+ Some("{bad")
+ );
+ assert!(manager
+ .errors()
+ .iter()
+ .any(|error| error.message.contains("not saved")));
+}
+
+#[test]
+fn clearing_a_setting_removes_only_that_key() {
+ let (storage, mut manager) = fixture(r#"{"enabledModels":["old"],"theme":"light"}"#);
+ manager.set_enabled_models(None).unwrap();
+ assert_eq!(document(storage.as_ref()), json!({"theme":"light"}));
+}
+
+#[test]
+fn resource_save_survives_an_unrelated_later_save() {
+ let (storage, mut manager) = fixture("{}");
+ manager.set_packages(vec![json!("first")]);
+ let mut other = SettingsManager::from_storage(storage.clone());
+ other.set_packages(vec![json!("second")]);
+ manager.set_theme("dark".into()).unwrap();
+ assert_eq!(
+ document(storage.as_ref()),
+ json!({"packages":["second"],"theme":"dark"})
+ );
+}