refactor(config): split compaction settings and share XDG app directories

crates/oxide-code/src/agent.rs

@@ -12,7 +12,7 @@ use tokio::sync::mpsc;
 use tracing::warn;
 
 use crate::client::{Response, ResponseEvent, StopDetails, StopReason, TokenUsage, Wire};
-use crate::config::AutoCompactionConfig;
+use crate::config::compaction::AutoCompactionConfig;
 use crate::file_tracker::{self, FileTracker};
 use crate::message::{ContentBlock, Message, Role};
 use crate::permission::SessionGrant;
@@ -887,8 +887,8 @@ mod tests {
 
     use super::*;
     use crate::client::anthropic::testing::test_client;
+    use crate::config::Effort;
     use crate::config::auth::{Auth, AuthSource};
-    use crate::config::{AutoCompactionConfig, Effort};
     use crate::file_tracker::FileTracker;
     use crate::message::Role;
     use crate::model::ResolvedModelId;

crates/oxide-code/src/client/anthropic.rs

@@ -28,7 +28,8 @@ use uuid::Uuid;
 
 use crate::client::{ResponseEvent, Wire};
 use crate::config::auth::{Auth, AuthKind, AuthSource};
-use crate::config::{CompactionConfig, Config, Effort, is_first_party_base_url};
+use crate::config::compaction::CompactionConfig;
+use crate::config::{Config, Effort, is_first_party_base_url};
 use crate::message::{ContentBlock, Message, Role};
 use crate::model::ModelSpec;
 use crate::prompt::SYSTEM_PROMPT_DYNAMIC_BOUNDARY;
@@ -492,9 +493,8 @@ mod tests {
     use super::*;
     use crate::client::{Response, StopReason, TokenUsage};
     use crate::config::auth::{Auth, AuthSource};
-    use crate::config::{
-        AutoCompactionConfig, CompactionConfig, Effort, PromptCacheTtl, test_thresholds,
-    };
+    use crate::config::compaction::{CompactionConfig, test_thresholds};
+    use crate::config::{Effort, PromptCacheTtl};
 
     // ── Fixtures ──
 
@@ -591,10 +591,7 @@ mod tests {
             TEST_MODEL,
         );
         config.prompt_cache_ttl = PromptCacheTtl::FiveMin;
-        config.compaction = CompactionConfig::resolved_for_test(AutoCompactionConfig {
-            enabled: true,
-            threshold_tokens: Some(123_456),
-        });
+        config.compaction = CompactionConfig::with_threshold_for_test(123_456);
         let client = Client::new(config, None).unwrap();
 
         assert_eq!(client.prompt_cache_ttl(), PromptCacheTtl::FiveMin);
@@ -804,10 +801,7 @@ mod tests {
     fn set_model_clamps_threshold_above_new_context_window() {
         let mut config = test_config(OFFLINE_URL, api_key(), "custom-model");
         config.max_tokens = None;
-        config.compaction = CompactionConfig::resolved_for_test(AutoCompactionConfig {
-            enabled: true,
-            threshold_tokens: Some(1_500_000),
-        });
+        config.compaction = CompactionConfig::with_threshold_for_test(1_500_000);
         let mut client = Client::new(config, Some("sid".to_owned())).unwrap();
 
         client.set_model("claude-sonnet-5-5".to_owned());

crates/oxide-code/src/client/anthropic/betas.rs

@@ -1,8 +1,8 @@
 //! Per-request `anthropic-beta` header computation.
 
+use crate::config::PromptCacheTtl;
 use crate::config::auth::AuthKind;
-use crate::config::{PromptCacheTtl, ThinkingConfig, ThinkingDisplay};
-use crate::model::{Family, ModelSpec};
+use crate::model::{Family, ModelSpec, ThinkingConfig, ThinkingDisplay};
 
 use super::wire::CacheControl;
 

crates/oxide-code/src/client/anthropic/identity.rs

@@ -12,7 +12,7 @@ use tracing::warn;
 use uuid::Uuid;
 
 use crate::util::fs::{atomic_write_private, create_private_dir_all};
-use crate::util::path::data_dir;
+use crate::util::path::{XdgBase, app_dir};
 
 const FILE_NAME: &str = "user-id";
 const ID_LEN: usize = 64;
@@ -49,7 +49,7 @@ fn try_load_or_create_at(path: &Path) -> Result<String> {
 }
 
 fn device_id_path() -> Option<PathBuf> {
-    data_dir().map(|dir| dir.join(FILE_NAME))
+    app_dir(XdgBase::Data).map(|dir| dir.join(FILE_NAME))
 }
 
 fn read_existing(path: &Path) -> Result<Option<String>> {

crates/oxide-code/src/client/anthropic/testing.rs

@@ -10,10 +10,9 @@ use wiremock::ResponseTemplate;
 use super::Client;
 use super::transport::MessagesRequest;
 use crate::config::auth::{Auth, AuthSource};
+use crate::config::compaction::CompactionConfig;
 use crate::config::gateway::GatewayCompat;
-use crate::config::{
-    CompactionConfig, Config, DEFAULT_THEME, PromptCacheTtl, StatusLineSegment, ThemeConfig,
-};
+use crate::config::{Config, DEFAULT_THEME, PromptCacheTtl, StatusLineSegment, ThemeConfig};
 use crate::model::ModelSpec;
 
 /// Minimal [`Config`] for unit / wiremock tests.

crates/oxide-code/src/client/anthropic/wire.rs

@@ -5,8 +5,9 @@ use serde::ser::SerializeSeq;
 use serde::{Deserialize, Serialize, Serializer};
 
 use crate::client::{StopDetails, StopReason};
-use crate::config::{Effort, ThinkingConfig};
+use crate::config::Effort;
 use crate::message::{ContentBlock, Message, Role};
+use crate::model::ThinkingConfig;
 use crate::tool::ToolDefinition;
 
 // ── Request types ──