diff --git a/server/src/http/mcp/shell_tools.rs b/server/src/http/mcp/shell_tools.rs
index a1c01fa3..81e0d8b5 100644
--- a/server/src/http/mcp/shell_tools.rs
+++ b/server/src/http/mcp/shell_tools.rs
@@ -87,9 +87,10 @@ fn validate_working_dir(working_dir: &str, ctx: &AppContext) -> Result<PathBuf,
     let merge_workspace = project_root.join(".huskies").join("merge_workspace");
     let canonical_mw = merge_workspace.canonicalize().unwrap_or_default();
 
-    if !canonical_wd.starts_with(&canonical_wt)
-        && !(!canonical_mw.as_os_str().is_empty() && canonical_wd.starts_with(&canonical_mw))
-    {
+    let in_worktrees = canonical_wd.starts_with(&canonical_wt);
+    let in_merge_ws =
+        !canonical_mw.as_os_str().is_empty() && canonical_wd.starts_with(&canonical_mw);
+    if !in_worktrees && !in_merge_ws {
         return Err(format!(
             "working_dir must be inside .huskies/worktrees/ or .huskies/merge_workspace/. Got: {working_dir}"
         ));