From 8f960fdbbf8f47bf6141bd79f0a3d33c6e9c356a Mon Sep 17 00:00:00 2001
From: Alex Clarke <alex.j.tusa@gmail.com>
Date: Fri, 22 May 2026 19:49:01 -0600
Subject: [PATCH] test: fixed broken cross tests that required home directory
 access

---
 src/config/request_context.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/config/request_context.rs b/src/config/request_context.rs
index fc879c6..bc74c9a 100644
--- a/src/config/request_context.rs
+++ b/src/config/request_context.rs
@@ -2969,6 +2969,7 @@ mod tests {
     #[test]
     #[serial]
     fn rebuild_tool_scope_mcp_disabled_skips_servers() {
+        let _guard = TestConfigDirGuard::new();
         let app_state = app_state_with_mcp_config(false, &["github", "slack"]);
         let mut ctx = RequestContext::new(app_state, WorkingMode::Cmd);
         let app = ctx.app.config.clone();
@@ -2982,6 +2983,7 @@ mod tests {
     #[test]
     #[serial]
     fn rebuild_tool_scope_no_enabled_servers_yields_empty_runtime() {
+        let _guard = TestConfigDirGuard::new();
         let app_state = app_state_with_mcp_config(true, &["github"]);
         let mut ctx = RequestContext::new(app_state, WorkingMode::Cmd);
         let app = ctx.app.config.clone();
@@ -2995,6 +2997,7 @@ mod tests {
     #[test]
     #[serial]
     fn rebuild_tool_scope_no_mcp_config_yields_empty_runtime() {
+        let _guard = TestConfigDirGuard::new();
         let app_state = app_state_with_mcp_config(true, &[]);
         let mut ctx = RequestContext::new(app_state, WorkingMode::Cmd);
         let app = ctx.app.config.clone();
@@ -3008,6 +3011,7 @@ mod tests {
     #[test]
     #[serial]
     fn rebuild_tool_scope_preserves_tool_tracker() {
+        let _guard = TestConfigDirGuard::new();
         let app_state = app_state_with_mcp_config(false, &[]);
         let mut ctx = RequestContext::new(app_state, WorkingMode::Cmd);
         let dummy = ToolCall {
@@ -3035,6 +3039,7 @@ mod tests {
     #[test]
     #[serial]
     fn rebuild_tool_scope_repl_mode_appends_user_interaction_functions() {
+        let _guard = TestConfigDirGuard::new();
         let app_state = app_state_with_mcp_config(false, &[]);
         let mut ctx = RequestContext::new(app_state, WorkingMode::Repl);
         let app = ctx.app.config.clone();
@@ -3058,6 +3063,7 @@ mod tests {
     #[test]
     #[serial]
     fn rebuild_tool_scope_cmd_mode_no_user_interaction_functions() {
+        let _guard = TestConfigDirGuard::new();
         let app_state = app_state_with_mcp_config(false, &[]);
         let mut ctx = RequestContext::new(app_state, WorkingMode::Cmd);
         let app = ctx.app.config.clone();