refactor(theme): derive iris-specific styles locally

Author: hyperb1iss

src/studio/theme.rs

@@ -11,8 +11,8 @@ use crate::theme;
 use crate::theme::names::{gradients, styles, tokens};
 use crate::theme::{
     STYLE_AUTHOR, STYLE_COMMIT_HASH, STYLE_DIFF_ADDED, STYLE_DIFF_CONTEXT, STYLE_DIFF_HUNK,
-    STYLE_DIFF_REMOVED, STYLE_FILE_PATH, STYLE_GIT_DELETED, STYLE_GIT_MODIFIED,
-    STYLE_GIT_STAGED, STYLE_GIT_UNTRACKED, STYLE_MODE_INACTIVE, STYLE_TIMESTAMP,
+    STYLE_DIFF_REMOVED, STYLE_FILE_PATH, STYLE_GIT_DELETED, STYLE_GIT_MODIFIED, STYLE_GIT_STAGED,
+    STYLE_GIT_UNTRACKED, STYLE_MODE_INACTIVE, STYLE_TIMESTAMP,
 };
 
 // ═══════════════════════════════════════════════════════════════════════════════

src/theme.rs

@@ -53,11 +53,26 @@ fn derive_iris_theme(theme: &mut Theme) {
     theme.register_default_token(TOKEN_CODE_HASH, theme.color(tokens::ACCENT_TERTIARY));
     theme.register_default_token(TOKEN_CODE_PATH, theme.color(tokens::ACCENT_SECONDARY));
 
-    theme.register_default_style(STYLE_COMMIT_HASH, OpalineStyle::fg(theme.color(TOKEN_CODE_HASH)));
-    theme.register_default_style(STYLE_FILE_PATH, OpalineStyle::fg(theme.color(TOKEN_CODE_PATH)));
-    theme.register_default_style(STYLE_TIMESTAMP, OpalineStyle::fg(theme.color(tokens::WARNING)));
-    theme.register_default_style(STYLE_AUTHOR, OpalineStyle::fg(theme.color(tokens::TEXT_PRIMARY)));
-    theme.register_default_style(STYLE_GIT_STAGED, OpalineStyle::fg(theme.color(TOKEN_GIT_STAGED)));
+    theme.register_default_style(
+        STYLE_COMMIT_HASH,
+        OpalineStyle::fg(theme.color(TOKEN_CODE_HASH)),
+    );
+    theme.register_default_style(
+        STYLE_FILE_PATH,
+        OpalineStyle::fg(theme.color(TOKEN_CODE_PATH)),
+    );
+    theme.register_default_style(
+        STYLE_TIMESTAMP,
+        OpalineStyle::fg(theme.color(tokens::WARNING)),
+    );
+    theme.register_default_style(
+        STYLE_AUTHOR,
+        OpalineStyle::fg(theme.color(tokens::TEXT_PRIMARY)),
+    );
+    theme.register_default_style(
+        STYLE_GIT_STAGED,
+        OpalineStyle::fg(theme.color(TOKEN_GIT_STAGED)),
+    );
     theme.register_default_style(
         STYLE_GIT_MODIFIED,
         OpalineStyle::fg(theme.color(TOKEN_GIT_MODIFIED)),
@@ -70,12 +85,18 @@ fn derive_iris_theme(theme: &mut Theme) {
         STYLE_GIT_DELETED,
         OpalineStyle::fg(theme.color(TOKEN_GIT_DELETED)),
     );
-    theme.register_default_style(STYLE_DIFF_ADDED, OpalineStyle::fg(theme.color(TOKEN_DIFF_ADDED)));
+    theme.register_default_style(
+        STYLE_DIFF_ADDED,
+        OpalineStyle::fg(theme.color(TOKEN_DIFF_ADDED)),
+    );
     theme.register_default_style(
         STYLE_DIFF_REMOVED,
         OpalineStyle::fg(theme.color(TOKEN_DIFF_REMOVED)),
     );
-    theme.register_default_style(STYLE_DIFF_HUNK, OpalineStyle::fg(theme.color(TOKEN_DIFF_HUNK)));
+    theme.register_default_style(
+        STYLE_DIFF_HUNK,
+        OpalineStyle::fg(theme.color(TOKEN_DIFF_HUNK)),
+    );
     theme.register_default_style(
         STYLE_DIFF_CONTEXT,
         OpalineStyle::fg(theme.color(TOKEN_DIFF_CONTEXT)),

tests/agent_tests.rs

@@ -12,8 +12,14 @@ use git_iris::{
     git::GitRepo,
 };
 use std::env;
+use std::sync::{Mutex, MutexGuard, OnceLock};
 use tempfile::TempDir;
 
+fn cwd_lock() -> MutexGuard<'static, ()> {
+    static LOCK: OnceLock<Mutex<()>> = OnceLock::new();
+    LOCK.get_or_init(|| Mutex::new(())).lock().expect("lock")
+}
+
 fn create_test_context() -> (AgentContext, TempDir) {
     let temp_dir = TempDir::new().expect("Failed to create temporary directory");
     let repo_path = temp_dir.path().to_path_buf();
@@ -141,6 +147,7 @@ async fn test_agent_setup_service_creation() {
 
 #[tokio::test]
 async fn test_agent_setup_service_from_temp_dir() {
+    let _guard = cwd_lock();
     let temp_dir = TempDir::new().expect("Failed to create temporary directory");
     let repo_path = temp_dir.path().to_path_buf();
 
@@ -199,6 +206,7 @@ async fn test_complete_agent_setup_workflow() {
         return;
     }
 
+    let _guard = cwd_lock();
     let temp_dir = TempDir::new().expect("Failed to create temporary directory");
     let repo_path = temp_dir.path().to_path_buf();
 

tests/config_tests.rs

@@ -6,12 +6,18 @@ use std::env;
 use std::fs;
 use std::path::Path;
 use std::process::Command;
+use std::sync::{Mutex, MutexGuard, OnceLock};
 
 // Use our centralized test infrastructure
 #[path = "test_utils.rs"]
 mod test_utils;
 use test_utils::{MockDataBuilder, setup_git_repo};
 
+fn cwd_lock() -> MutexGuard<'static, ()> {
+    static LOCK: OnceLock<Mutex<()>> = OnceLock::new();
+    LOCK.get_or_init(|| Mutex::new(())).lock().expect("lock")
+}
+
 // Helper to verify git repo status
 fn is_git_repo(dir: &Path) -> bool {
     let status = Command::new("git")
@@ -25,6 +31,7 @@ fn is_git_repo(dir: &Path) -> bool {
 
 #[test]
 fn test_project_config_security() {
+    let _guard = cwd_lock();
     // Set up a git repository using our centralized infrastructure
     let (temp_dir, _git_repo) = setup_git_repo();
 

tests/theme_tests.rs

@@ -0,0 +1,53 @@
+use std::sync::{Mutex, MutexGuard, OnceLock};
+
+use git_iris::theme;
+use opaline::{OpalineColor, Theme};
+
+fn theme_lock() -> MutexGuard<'static, ()> {
+    static LOCK: OnceLock<Mutex<()>> = OnceLock::new();
+    LOCK.get_or_init(|| Mutex::new(())).lock().expect("lock")
+}
+
+fn base_theme() -> Theme {
+    Theme::builder("Derived Test")
+        .token("text.primary", OpalineColor::new(240, 240, 240))
+        .token("text.muted", OpalineColor::new(120, 120, 120))
+        .token("text.dim", OpalineColor::new(90, 90, 90))
+        .token("accent.primary", OpalineColor::new(225, 53, 255))
+        .token("accent.secondary", OpalineColor::new(128, 255, 234))
+        .token("accent.tertiary", OpalineColor::new(255, 106, 193))
+        .token("success", OpalineColor::new(80, 250, 123))
+        .token("warning", OpalineColor::new(241, 250, 140))
+        .token("error", OpalineColor::new(255, 99, 99))
+        .token("info", OpalineColor::new(100, 200, 255))
+        .build()
+}
+
+#[test]
+fn theme_wrapper_derives_iris_specific_tokens_and_styles() {
+    let _guard = theme_lock();
+    let previous = theme::current();
+
+    theme::set_theme(base_theme());
+    let current = theme::current();
+
+    assert_eq!(
+        current.color("git.staged"),
+        current.color(theme::names::tokens::SUCCESS)
+    );
+    assert_eq!(
+        current.color("code.hash"),
+        current.color(theme::names::tokens::ACCENT_TERTIARY)
+    );
+    assert_eq!(
+        current.color("mode.inactive"),
+        current.color(theme::names::tokens::TEXT_MUTED)
+    );
+    assert!(current.has_style("git_staged"));
+    assert!(current.has_style("diff_removed"));
+    assert!(current.has_style("commit_hash"));
+    assert!(current.has_style("file_path"));
+    assert!(current.has_style("mode_inactive"));
+
+    theme::set_theme((*previous).clone());
+}