From 469c0c0411acc2f60a4024e8c9a0f9d4d260490e Mon Sep 17 00:00:00 2001
From: Gert Burger <gertburger@gmail.com>
Date: Fri, 6 Mar 2026 09:43:56 +0000
Subject: [PATCH 1/2] Add support for CLAUDE_CONFIG_DIR

---
 INSTALL.md               |  2 +
 README.md                |  2 +
 src/config.rs            | 32 ++++++++++++++-
 src/discover/provider.rs |  3 +-
 src/hook_check.rs        |  6 ++-
 src/init.rs              | 87 +++++++++++++++++++++++++---------------
 src/integrity.rs         | 20 ++++-----
 src/main.rs              |  2 +-
 8 files changed, 104 insertions(+), 50 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 98457d09..31b6395c 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -89,6 +89,8 @@ rtk gain  # MUST show token savings, not "command not found"
 
 ### Recommended: Global Hook-First Setup
 
+> **Custom config directory**: If you've set `CLAUDE_CONFIG_DIR`, RTK respects it — all paths below use that directory instead of `~/.claude`.
+
 **Best for: All projects, automatic RTK usage**
 
 ```bash
diff --git a/README.md b/README.md
index 8158e1ce..13627352 100644
--- a/README.md
+++ b/README.md
@@ -544,6 +544,8 @@ The hook runs as a Claude Code [PreToolUse hook](https://docs.anthropic.com/en/d
 
 ### Quick Install (Automated)
 
+> **Custom config directory**: If you've set `CLAUDE_CONFIG_DIR`, RTK respects it — all paths below use that directory instead of `~/.claude`.
+
 ```bash
 rtk init -g
 # → Installs hook to ~/.claude/hooks/rtk-rewrite.sh (with executable permissions)
diff --git a/src/config.rs b/src/config.rs
index 94917a5e..398faa82 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,7 +1,21 @@
-use anyhow::Result;
+use anyhow::{Context, Result};
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 
+/// Resolve the Claude Code config directory.
+///
+/// Mirrors Claude Code's own logic:
+///   1. `CLAUDE_CONFIG_DIR` env var (if set)
+///   2. Fallback: `~/.claude`
+pub fn claude_config_dir() -> Result<PathBuf> {
+    if let Ok(dir) = std::env::var("CLAUDE_CONFIG_DIR") {
+        return Ok(PathBuf::from(dir));
+    }
+    dirs::home_dir()
+        .map(|h| h.join(".claude"))
+        .context("Cannot determine home directory. Is $HOME set?")
+}
+
 #[derive(Debug, Serialize, Deserialize, Default)]
 pub struct Config {
     #[serde(default)]
@@ -184,4 +198,20 @@ history_days = 90
         let config: Config = toml::from_str(toml).expect("valid toml");
         assert!(config.hooks.exclude_commands.is_empty());
     }
+
+    #[test]
+    fn test_claude_config_dir_env_override() {
+        std::env::set_var("CLAUDE_CONFIG_DIR", "/tmp/custom-claude");
+        let dir = claude_config_dir().unwrap();
+        std::env::remove_var("CLAUDE_CONFIG_DIR");
+        assert_eq!(dir, PathBuf::from("/tmp/custom-claude"));
+    }
+
+    #[test]
+    fn test_claude_config_dir_default() {
+        std::env::remove_var("CLAUDE_CONFIG_DIR");
+        let dir = claude_config_dir().unwrap();
+        let home = dirs::home_dir().unwrap();
+        assert_eq!(dir, home.join(".claude"));
+    }
 }
diff --git a/src/discover/provider.rs b/src/discover/provider.rs
index e9218b2d..850507b7 100644
--- a/src/discover/provider.rs
+++ b/src/discover/provider.rs
@@ -36,8 +36,7 @@ pub struct ClaudeProvider;
 impl ClaudeProvider {
     /// Get the base directory for Claude Code projects.
     fn projects_dir() -> Result<PathBuf> {
-        let home = dirs::home_dir().context("could not determine home directory")?;
-        let dir = home.join(".claude").join("projects");
+        let dir = crate::config::claude_config_dir()?.join("projects");
         if !dir.exists() {
             anyhow::bail!(
                 "Claude Code projects directory not found: {}\nMake sure Claude Code has been used at least once.",
diff --git a/src/hook_check.rs b/src/hook_check.rs
index 969128d3..45da94fa 100644
--- a/src/hook_check.rs
+++ b/src/hook_check.rs
@@ -50,8 +50,10 @@ pub fn parse_hook_version(content: &str) -> u8 {
 }
 
 fn hook_installed_path() -> Option<PathBuf> {
-    let home = dirs::home_dir()?;
-    let path = home.join(".claude").join("hooks").join("rtk-rewrite.sh");
+    let path = crate::config::claude_config_dir()
+        .ok()?
+        .join("hooks")
+        .join("rtk-rewrite.sh");
     if path.exists() {
         Some(path)
     } else {
diff --git a/src/init.rs b/src/init.rs
index 3ff2622b..d0c48b75 100644
--- a/src/init.rs
+++ b/src/init.rs
@@ -145,7 +145,7 @@ rtk gain --history      # View command history with savings
 rtk discover            # Analyze Claude Code sessions for missed RTK usage
 rtk proxy <cmd>         # Run command without filtering (for debugging)
 rtk init                # Add RTK instructions to CLAUDE.md
-rtk init --global       # Add RTK to ~/.claude/CLAUDE.md
+rtk init --global       # Add RTK to global CLAUDE.md
 ```
 
 ## Token Savings Overview
@@ -183,7 +183,7 @@ pub fn run(
 
 /// Prepare hook directory and return paths (hook_dir, hook_path)
 fn prepare_hook_paths() -> Result<(PathBuf, PathBuf)> {
-    let claude_dir = resolve_claude_dir()?;
+    let claude_dir = crate::config::claude_config_dir()?;
     let hook_dir = claude_dir.join("hooks");
     fs::create_dir_all(&hook_dir)
         .with_context(|| format!("Failed to create hook directory: {}", hook_dir.display()))?;
@@ -322,8 +322,8 @@ fn prompt_user_consent(settings_path: &Path) -> Result<bool> {
 }
 
 /// Print manual instructions for settings.json patching
-fn print_manual_instructions(hook_path: &Path) {
-    println!("\n  MANUAL STEP: Add this to ~/.claude/settings.json:");
+fn print_manual_instructions(hook_path: &Path, settings_path: &Path) {
+    println!("\n  MANUAL STEP: Add this to {}:", settings_path.display());
     println!("  {{");
     println!("    \"hooks\": {{ \"PreToolUse\": [{{");
     println!("      \"matcher\": \"Bash\",");
@@ -369,7 +369,7 @@ fn remove_hook_from_json(root: &mut serde_json::Value) -> bool {
 /// Remove RTK hook from settings.json file
 /// Backs up before modification, returns true if hook was found and removed
 fn remove_hook_from_settings(verbose: u8) -> Result<bool> {
-    let claude_dir = resolve_claude_dir()?;
+    let claude_dir = crate::config::claude_config_dir()?;
     let settings_path = claude_dir.join("settings.json");
 
     if !settings_path.exists() {
@@ -416,7 +416,7 @@ pub fn uninstall(global: bool, verbose: u8) -> Result<()> {
         anyhow::bail!("Uninstall only works with --global flag. For local projects, manually remove RTK from CLAUDE.md");
     }
 
-    let claude_dir = resolve_claude_dir()?;
+    let claude_dir = crate::config::claude_config_dir()?;
     let mut removed = Vec::new();
 
     // 1. Remove hook file
@@ -485,7 +485,7 @@ pub fn uninstall(global: bool, verbose: u8) -> Result<()> {
 /// Orchestrator: patch settings.json with RTK hook
 /// Handles reading, checking, prompting, merging, backing up, and atomic writing
 fn patch_settings_json(hook_path: &Path, mode: PatchMode, verbose: u8) -> Result<PatchResult> {
-    let claude_dir = resolve_claude_dir()?;
+    let claude_dir = crate::config::claude_config_dir()?;
     let settings_path = claude_dir.join("settings.json");
     let hook_command = hook_path
         .to_str()
@@ -517,12 +517,12 @@ fn patch_settings_json(hook_path: &Path, mode: PatchMode, verbose: u8) -> Result
     // Handle mode
     match mode {
         PatchMode::Skip => {
-            print_manual_instructions(hook_path);
+            print_manual_instructions(hook_path, &settings_path);
             return Ok(PatchResult::Skipped);
         }
         PatchMode::Ask => {
             if !prompt_user_consent(&settings_path)? {
-                print_manual_instructions(hook_path);
+                print_manual_instructions(hook_path, &settings_path);
                 return Ok(PatchResult::Declined);
             }
         }
@@ -670,7 +670,7 @@ fn run_default_mode(global: bool, patch_mode: PatchMode, verbose: u8) -> Result<
         return run_claude_md_mode(false, verbose);
     }
 
-    let claude_dir = resolve_claude_dir()?;
+    let claude_dir = crate::config::claude_config_dir()?;
     let rtk_md_path = claude_dir.join("RTK.md");
     let claude_md_path = claude_dir.join("CLAUDE.md");
 
@@ -776,7 +776,7 @@ fn run_hook_only_mode(global: bool, patch_mode: PatchMode, verbose: u8) -> Resul
 /// Legacy mode: full 137-line injection into CLAUDE.md
 fn run_claude_md_mode(global: bool, verbose: u8) -> Result<()> {
     let path = if global {
-        resolve_claude_dir()?.join("CLAUDE.md")
+        crate::config::claude_config_dir()?.join("CLAUDE.md")
     } else {
         PathBuf::from("CLAUDE.md")
     };
@@ -999,16 +999,9 @@ fn remove_rtk_block(content: &str) -> (String, bool) {
     }
 }
 
-/// Resolve ~/.claude directory with proper home expansion
-fn resolve_claude_dir() -> Result<PathBuf> {
-    dirs::home_dir()
-        .map(|h| h.join(".claude"))
-        .context("Cannot determine home directory. Is $HOME set?")
-}
-
 /// Show current rtk configuration
 pub fn show_config() -> Result<()> {
-    let claude_dir = resolve_claude_dir()?;
+    let claude_dir = crate::config::claude_config_dir()?;
     let hook_path = claude_dir.join("hooks").join("rtk-rewrite.sh");
     let rtk_md_path = claude_dir.join("RTK.md");
     let global_claude_md = claude_dir.join("CLAUDE.md");
@@ -1016,6 +1009,17 @@ pub fn show_config() -> Result<()> {
 
     println!("📋 rtk Configuration:\n");
 
+    if !claude_dir.exists() {
+        println!(
+            "⚠️  Config directory does not exist: {}",
+            claude_dir.display()
+        );
+        if std::env::var("CLAUDE_CONFIG_DIR").is_ok() {
+            println!("    (set via CLAUDE_CONFIG_DIR)");
+        }
+        println!();
+    }
+
     // Check hook
     if hook_path.exists() {
         #[cfg(unix)]
@@ -1060,14 +1064,14 @@ pub fn show_config() -> Result<()> {
             println!("✅ Hook: {} (exists)", hook_path.display());
         }
     } else {
-        println!("⚪ Hook: not found");
+        println!("⚪ Hook ({}): not found", hook_path.display());
     }
 
     // Check RTK.md
     if rtk_md_path.exists() {
         println!("✅ RTK.md: {} (slim mode)", rtk_md_path.display());
     } else {
-        println!("⚪ RTK.md: not found");
+        println!("⚪ RTK.md ({}): not found", rtk_md_path.display());
     }
 
     // Check hook integrity
@@ -1094,16 +1098,23 @@ pub fn show_config() -> Result<()> {
     if global_claude_md.exists() {
         let content = fs::read_to_string(&global_claude_md)?;
         if content.contains("@RTK.md") {
-            println!("✅ Global (~/.claude/CLAUDE.md): @RTK.md reference");
+            println!(
+                "✅ Global ({}): @RTK.md reference",
+                global_claude_md.display()
+            );
         } else if content.contains("<!-- rtk-instructions") {
             println!(
-                "⚠️  Global (~/.claude/CLAUDE.md): old RTK block (run: rtk init -g to migrate)"
+                "⚠️  Global ({}): old RTK block (run: rtk init -g to migrate)",
+                global_claude_md.display()
             );
         } else {
-            println!("⚪ Global (~/.claude/CLAUDE.md): exists but rtk not configured");
+            println!(
+                "⚪ Global ({}): exists but rtk not configured",
+                global_claude_md.display()
+            );
         }
     } else {
-        println!("⚪ Global (~/.claude/CLAUDE.md): not found");
+        println!("⚪ Global ({}): not found", global_claude_md.display());
     }
 
     // Check local CLAUDE.md
@@ -1115,7 +1126,7 @@ pub fn show_config() -> Result<()> {
             println!("⚪ Local (./CLAUDE.md): exists but rtk not configured");
         }
     } else {
-        println!("⚪ Local (./CLAUDE.md): not found");
+        println!("⚪ Local ({}): not found", local_claude_md.display());
     }
 
     // Check settings.json
@@ -1126,19 +1137,28 @@ pub fn show_config() -> Result<()> {
             if let Ok(root) = serde_json::from_str::<serde_json::Value>(&content) {
                 let hook_command = hook_path.display().to_string();
                 if hook_already_present(&root, &hook_command) {
-                    println!("✅ settings.json: RTK hook configured");
+                    println!(
+                        "✅ settings.json ({}): RTK hook configured",
+                        settings_path.display()
+                    );
                 } else {
-                    println!("⚠️  settings.json: exists but RTK hook not configured");
+                    println!(
+                        "⚠️  settings.json ({}): exists but RTK hook not configured",
+                        settings_path.display()
+                    );
                     println!("    Run: rtk init -g --auto-patch");
                 }
             } else {
-                println!("⚠️  settings.json: exists but invalid JSON");
+                println!(
+                    "⚠️  settings.json ({}): exists but invalid JSON",
+                    settings_path.display()
+                );
             }
         } else {
-            println!("⚪ settings.json: empty");
+            println!("⚪ settings.json ({}): empty", settings_path.display());
         }
     } else {
-        println!("⚪ settings.json: not found");
+        println!("⚪ settings.json ({}): not found", settings_path.display());
     }
 
     println!("\nUsage:");
@@ -1147,7 +1167,10 @@ pub fn show_config() -> Result<()> {
     println!("  rtk init -g --auto-patch    # Same as above but no prompt");
     println!("  rtk init -g --no-patch      # Skip settings.json (manual setup)");
     println!("  rtk init -g --uninstall     # Remove all RTK artifacts");
-    println!("  rtk init -g --claude-md     # Legacy: full injection into ~/.claude/CLAUDE.md");
+    println!(
+        "  rtk init -g --claude-md     # Legacy: full injection into {}/CLAUDE.md",
+        claude_dir.display()
+    );
     println!("  rtk init -g --hook-only     # Hook only, no RTK.md");
 
     Ok(())
diff --git a/src/integrity.rs b/src/integrity.rs
index 41bcf4e8..c3b5096c 100644
--- a/src/integrity.rs
+++ b/src/integrity.rs
@@ -119,12 +119,6 @@ pub fn remove_hash(hook_path: &Path) -> Result<bool> {
 ///
 /// Returns `IntegrityStatus` indicating the result. Callers decide
 /// how to handle each status (warn, block, ignore).
-pub fn verify_hook() -> Result<IntegrityStatus> {
-    let hook_path = resolve_hook_path()?;
-    verify_hook_at(&hook_path)
-}
-
-/// Verify hook integrity for a specific hook path (testable)
 pub fn verify_hook_at(hook_path: &Path) -> Result<IntegrityStatus> {
     let hash_file = hash_path(hook_path);
 
@@ -178,11 +172,11 @@ fn read_stored_hash(path: &Path) -> Result<String> {
     Ok(hash.to_string())
 }
 
-/// Resolve the default hook path (~/.claude/hooks/rtk-rewrite.sh)
+/// Resolve the default hook path (<claude-config-dir>/hooks/rtk-rewrite.sh)
 pub fn resolve_hook_path() -> Result<PathBuf> {
-    dirs::home_dir()
-        .map(|h| h.join(".claude").join("hooks").join("rtk-rewrite.sh"))
-        .context("Cannot determine home directory. Is $HOME set?")
+    Ok(crate::config::claude_config_dir()?
+        .join("hooks")
+        .join("rtk-rewrite.sh"))
 }
 
 /// Run integrity check and print results (for `rtk verify` subcommand)
@@ -243,7 +237,8 @@ pub fn run_verify(verbose: u8) -> Result<()> {
 /// No env-var bypass is provided — if the hook is legitimately modified,
 /// re-run `rtk init -g --auto-patch` to re-establish the baseline.
 pub fn runtime_check() -> Result<()> {
-    match verify_hook()? {
+    let hook_path = resolve_hook_path()?;
+    match verify_hook_at(&hook_path)? {
         IntegrityStatus::Verified | IntegrityStatus::NotInstalled => {
             // All good, proceed
         }
@@ -262,7 +257,8 @@ pub fn runtime_check() -> Result<()> {
                 actual.get(..16).unwrap_or(&actual)
             );
             eprintln!();
-            eprintln!("  The hook at ~/.claude/hooks/rtk-rewrite.sh has been modified.");
+
+            eprintln!("  The hook at {} has been modified.", hook_path.display());
             eprintln!("  This may indicate tampering. RTK will not execute.");
             eprintln!();
             eprintln!("  To restore:  rtk init -g --auto-patch");
diff --git a/src/main.rs b/src/main.rs
index 7116488e..de8bbc91 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -306,7 +306,7 @@ enum Commands {
 
     /// Initialize rtk instructions in CLAUDE.md
     Init {
-        /// Add to global ~/.claude/CLAUDE.md instead of local
+        /// Add to global CLAUDE.md (default: ~/.claude, override: CLAUDE_CONFIG_DIR)
         #[arg(short, long)]
         global: bool,
 

From 037eb24d302ad2fa08640c81f4b32a277f79ffda Mon Sep 17 00:00:00 2001
From: Gert Burger <gertburger@gmail.com>
Date: Fri, 6 Mar 2026 10:14:37 +0000
Subject: [PATCH 2/2] Use temp-env to prevent the modification of shared state
 in tests

---
 Cargo.lock      | 57 +++++++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml      |  1 +
 src/config.rs   | 17 ++++++++-------
 src/tracking.rs | 23 +++++++-------------
 4 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 042978b0..74346bf7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -688,6 +688,15 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
 [[package]]
 name = "log"
 version = "0.4.29"
@@ -737,6 +746,29 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -782,6 +814,15 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.6"
@@ -853,6 +894,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
+ "temp-env",
  "tempfile",
  "thiserror",
  "toml",
@@ -937,6 +979,12 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
 [[package]]
 name = "serde"
 version = "1.0.228"
@@ -1059,6 +1107,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "temp-env"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96374855068f47402c3121c6eed88d29cb1de8f3ab27090e273e420bdabcf050"
+dependencies = [
+ "parking_lot",
+]
+
 [[package]]
 name = "tempfile"
 version = "3.24.0"
diff --git a/Cargo.toml b/Cargo.toml
index dfc0aba6..820c2fde 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,6 +32,7 @@ ureq = "2"
 hostname = "0.4"
 
 [dev-dependencies]
+temp-env = "0.3"
 
 [profile.release]
 opt-level = 3
diff --git a/src/config.rs b/src/config.rs
index 398faa82..9914bcc0 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -201,17 +201,18 @@ history_days = 90
 
     #[test]
     fn test_claude_config_dir_env_override() {
-        std::env::set_var("CLAUDE_CONFIG_DIR", "/tmp/custom-claude");
-        let dir = claude_config_dir().unwrap();
-        std::env::remove_var("CLAUDE_CONFIG_DIR");
-        assert_eq!(dir, PathBuf::from("/tmp/custom-claude"));
+        temp_env::with_var("CLAUDE_CONFIG_DIR", Some("/tmp/custom-claude"), || {
+            let dir = claude_config_dir().unwrap();
+            assert_eq!(dir, PathBuf::from("/tmp/custom-claude"));
+        });
     }
 
     #[test]
     fn test_claude_config_dir_default() {
-        std::env::remove_var("CLAUDE_CONFIG_DIR");
-        let dir = claude_config_dir().unwrap();
-        let home = dirs::home_dir().unwrap();
-        assert_eq!(dir, home.join(".claude"));
+        temp_env::with_var_unset("CLAUDE_CONFIG_DIR", || {
+            let dir = claude_config_dir().unwrap();
+            let home = dirs::home_dir().unwrap();
+            assert_eq!(dir, home.join(".claude"));
+        });
     }
 }
diff --git a/src/tracking.rs b/src/tracking.rs
index bccf0654..1b7c528e 100644
--- a/src/tracking.rs
+++ b/src/tracking.rs
@@ -1291,27 +1291,20 @@ mod tests {
     // 7. get_db_path respects environment variable RTK_DB_PATH
     #[test]
     fn test_custom_db_path_env() {
-        use std::env;
-
         let custom_path = "/tmp/rtk_test_custom.db";
-        env::set_var("RTK_DB_PATH", custom_path);
-
-        let db_path = get_db_path().expect("Failed to get db path");
-        assert_eq!(db_path, PathBuf::from(custom_path));
-
-        env::remove_var("RTK_DB_PATH");
+        temp_env::with_var("RTK_DB_PATH", Some(custom_path), || {
+            let db_path = get_db_path().expect("Failed to get db path");
+            assert_eq!(db_path, PathBuf::from(custom_path));
+        });
     }
 
     // 8. get_db_path falls back to default when no custom config
     #[test]
     fn test_default_db_path() {
-        use std::env;
-
-        // Ensure no env var is set
-        env::remove_var("RTK_DB_PATH");
-
-        let db_path = get_db_path().expect("Failed to get db path");
-        assert!(db_path.ends_with("rtk/history.db"));
+        temp_env::with_var_unset("RTK_DB_PATH", || {
+            let db_path = get_db_path().expect("Failed to get db path");
+            assert!(db_path.ends_with("rtk/history.db"));
+        });
     }
 
     // 9. project_filter_params uses GLOB pattern with * wildcard // added