Merge branch 'navigation_v2'

Author: igorcosta

src-tauri/src/commands/settings_commands.rs

@@ -26,6 +26,7 @@ pub async fn save_app_settings(
 
     // Also persist user-facing option into ~/.commander/settings.json
     let _ = set_show_recent_projects_welcome_screen(settings.show_welcome_recent_projects);
+    let _ = set_code_auto_collapse_sidebar(settings.code_settings.auto_collapse_sidebar);
 
     Ok(())
 }
@@ -59,14 +60,19 @@ pub async fn load_app_settings(app: tauri::AppHandle) -> Result<AppSettings, Str
             let show = get_show_recent_projects_welcome_screen().unwrap_or(true);
             let mut merged = settings.clone();
             merged.show_welcome_recent_projects = show;
+            if let Some(auto) = get_code_auto_collapse_sidebar()? {
+                merged.code_settings.auto_collapse_sidebar = auto;
+            }
             Ok(merged)
         }
         None => {
             // Return default settings
             let mut d = AppSettings::default();
             d.normalize();
-            let show = get_show_recent_projects_welcome_screen().unwrap_or(true);
-            d.show_welcome_recent_projects = show;
+            d.show_welcome_recent_projects = get_show_recent_projects_welcome_screen().unwrap_or(true);
+            if let Some(auto) = get_code_auto_collapse_sidebar()? {
+                d.code_settings.auto_collapse_sidebar = auto;
+            }
             Ok(d)
         }
     }
@@ -205,6 +211,23 @@ fn set_show_recent_projects_welcome_screen(enabled: bool) -> Result<(), String>
     save_user_settings_json(root)
 }
 
+fn get_code_auto_collapse_sidebar() -> Result<Option<bool>, String> {
+    let root = load_user_settings_json()?;
+    Ok(root
+        .get("code")
+        .and_then(|code| code.get("auto_collapse_sidebar"))
+        .and_then(|value| value.as_bool()))
+}
+
+fn set_code_auto_collapse_sidebar(enabled: bool) -> Result<(), String> {
+    let mut root = load_user_settings_json()?;
+    if !root.get("code").map(|c| c.is_object()).unwrap_or(false) {
+        root["code"] = serde_json::json!({});
+    }
+    root["code"]["auto_collapse_sidebar"] = serde_json::json!(enabled);
+    save_user_settings_json(root)
+}
+
 #[tauri::command]
 pub async fn load_agent_settings(app: tauri::AppHandle) -> Result<HashMap<String, bool>, String> {
     let store = app

src-tauri/src/tests/integration/mod.rs

@@ -1,3 +1,4 @@
 // Integration tests
 pub mod new_project_persistence;
+pub mod settings_code_auto_collapse;
 pub mod store_persistence;

src-tauri/src/tests/integration/settings_code_auto_collapse.rs

@@ -0,0 +1,80 @@
+// Skip on macOS to match other integration tests that require non-main-thread access.
+#[cfg(all(test, not(target_os = "macos")))]
+mod tests {
+    use serial_test::serial;
+    use tempfile::TempDir;
+    use std::fs;
+    use std::path::PathBuf;
+
+    use crate::commands::settings_commands::{load_app_settings, save_app_settings};
+    use crate::models::AppSettings;
+
+    fn build_test_app() -> (tauri::App, TempDir) {
+        let td = TempDir::new().expect("tempdir");
+        std::env::set_var("HOME", td.path());
+        let app = tauri::Builder::default()
+            .plugin(tauri_plugin_store::Builder::new().build())
+            .build(tauri::generate_context!())
+            .expect("failed to build test app");
+        (app, td)
+    }
+
+    fn settings_file_path(home: &TempDir) -> PathBuf {
+        home.path().join(".commander").join("settings.json")
+    }
+
+    #[test]
+    #[serial]
+    fn test_code_auto_collapse_default_and_persistence() {
+        let (app, _home_td) = build_test_app();
+        let handle = app.handle();
+
+        let defaults = tauri::async_runtime::block_on(load_app_settings(handle.clone()))
+            .expect("load_app_settings should succeed");
+        assert!(!defaults.code_settings.auto_collapse_sidebar);
+
+        let mut updated = defaults.clone();
+        updated.code_settings.auto_collapse_sidebar = true;
+        tauri::async_runtime::block_on(save_app_settings(handle.clone(), updated))
+            .expect("save_app_settings should succeed");
+
+        let reloaded = tauri::async_runtime::block_on(load_app_settings(handle.clone()))
+            .expect("load_app_settings should succeed after save");
+        assert!(reloaded.code_settings.auto_collapse_sidebar);
+    }
+
+    #[test]
+    #[serial]
+    fn test_code_auto_collapse_persists_to_user_file_and_is_respected() {
+        let (app, home_td) = build_test_app();
+        let handle = app.handle();
+
+        let mut s = AppSettings::default();
+        s.code_settings.auto_collapse_sidebar = true;
+        tauri::async_runtime::block_on(save_app_settings(handle.clone(), s))
+            .expect("save_app_settings should succeed");
+
+        let sf = settings_file_path(&home_td);
+        assert!(sf.exists(), "user settings file should be created");
+
+        let mut json: serde_json::Value = serde_json::from_str(
+            &fs::read_to_string(&sf).expect("read user settings"),
+        )
+        .expect("parse user settings json");
+        assert_eq!(
+            json.get("code")
+                .and_then(|c| c.get("auto_collapse_sidebar"))
+                .and_then(|b| b.as_bool()),
+            Some(true)
+        );
+
+        // Flip the value manually to ensure load respects user edits.
+        json["code"]["auto_collapse_sidebar"] = serde_json::json!(false);
+        fs::write(&sf, serde_json::to_string_pretty(&json).expect("serialize json"))
+            .expect("write user settings");
+
+        let loaded = tauri::async_runtime::block_on(load_app_settings(handle.clone()))
+            .expect("load_app_settings should succeed after manual edit");
+        assert!(!loaded.code_settings.auto_collapse_sidebar);
+    }
+}