[pull] main from gi-dellav:main

src/config/load.rs

@@ -141,7 +141,7 @@ fn rich_default_config() -> Config {
         provider: Some(CompactString::new("openrouter")),
         model: Some(CompactString::new("deepseek/deepseek-v4-pro")),
         max_tokens: Some(16384),
-        compact_enabled: Some(true),
+        compact_enabled: Some(false),
         max_text_file_size: Some(1_048_576),
         edit_system: Some(EditSystem::Similarity),
         default_permission_mode: Some("standard".to_string()),

src/config/mod.rs

@@ -322,7 +322,7 @@ impl Config {
     }
 
     pub fn resolve_compact_enabled(&self) -> bool {
-        self.compact_enabled.unwrap_or(true)
+        self.compact_enabled.unwrap_or(false)
     }
 
     /// Mid-turn compaction pressure threshold as a fraction of the context

src/context/prompts.rs

@@ -3,7 +3,7 @@ use std::path::PathBuf;
 
 use include_dir::{Dir, include_dir};
 
-static EMBEDDED: Dir = include_dir!("$CARGO_MANIFEST_DIR/prompts");
+static EMBEDDED: Dir = include_dir!("$CARGO_MANIFEST_DIR/data/prompts");
 
 pub fn global_dir() -> PathBuf {
     crate::session::storage::data_dir().join("prompts")
@@ -22,7 +22,7 @@ pub fn load() -> HashMap<String, String> {
     for (name, content) in crate::context::load_dir_files(&global_dir(), "md") {
         prompts.insert(name, content);
     }
-    for (name, content) in crate::context::load_dir_files(&PathBuf::from("prompts"), "md") {
+    for (name, content) in crate::context::load_dir_files(&PathBuf::from("data/prompts"), "md") {
         prompts.insert(name, content);
     }
     for (name, content) in crate::context::load_dir_files(&zerostack_dir(), "md") {
@@ -104,7 +104,7 @@ mod tests {
     #[test]
     fn test_zerostack_overrides_prompts_dir() {
         let _td = TestDir::new();
-        let prompts_dir = PathBuf::from("prompts");
+        let prompts_dir = PathBuf::from("data/prompts");
         let zs_dir = zerostack_dir();
         write_prompt(&prompts_dir, "code", "from prompts/");
         write_prompt(&zs_dir, "code", "from .zerostack/prompts/");
@@ -139,7 +139,7 @@ mod tests {
     fn test_prompts_dir_overrides_global() {
         let _td = TestDir::new();
         let global = global_dir();
-        let prompts_dir = PathBuf::from("prompts");
+        let prompts_dir = PathBuf::from("data/prompts");
         write_prompt(&global, "custom", "from global/");
         write_prompt(&prompts_dir, "custom", "from prompts/");
 
@@ -151,7 +151,7 @@ mod tests {
     fn test_full_priority_chain() {
         let _td = TestDir::new();
         let global = global_dir();
-        let prompts_dir = PathBuf::from("prompts");
+        let prompts_dir = PathBuf::from("data/prompts");
         let zs_dir = zerostack_dir();
 
         write_prompt(&global, "code", "from global/");

src/context/themes.rs

@@ -7,7 +7,7 @@ use crate::config::ColorsConfig;
 use crate::ui::renderer::Renderer;
 use crate::ui::utils::parse_color;
 
-static EMBEDDED: Dir = include_dir!("$CARGO_MANIFEST_DIR/themes");
+static EMBEDDED: Dir = include_dir!("$CARGO_MANIFEST_DIR/data/themes");
 
 pub fn global_dir() -> PathBuf {
     crate::session::storage::data_dir().join("themes")
@@ -22,7 +22,7 @@ pub fn load() -> HashMap<String, String> {
     for (name, content) in crate::context::load_dir_files(&global_dir(), "json") {
         themes.insert(name, content);
     }
-    for (name, content) in crate::context::load_dir_files(&PathBuf::from("themes"), "json") {
+    for (name, content) in crate::context::load_dir_files(&PathBuf::from("data/themes"), "json") {
         themes.insert(name, content);
     }
 

src/tests/config_tests.rs

@@ -87,9 +87,8 @@ fn mid_turn_threshold_out_of_range_treated_as_unset() {
 }
 
 #[test]
-fn compact_enabled_default_true() {
-    // Master switch defaults on; mid-turn compaction layers on top of it.
-    assert!(Config::default().resolve_compact_enabled());
+fn compact_enabled_default_false() {
+    assert!(!Config::default().resolve_compact_enabled());
 }
 
 #[test]