From aca8f47f7b879e019129df998376d8ec1cf05e99 Mon Sep 17 00:00:00 2001
From: Shivakumar <kumar@appz.dev>
Date: Mon, 20 Jul 2026 20:11:10 +0530
Subject: [PATCH 1/2] test(agentflare-shim): cover in_scoped_project's
 home-boundary walk-up

Non-trivial branching logic (project-marker walk-up, stopping at home
so ~/.agentflare's own dir never false-positives as a project marker --
a real bug already found once on the bash-function prototype of this
same idea) shipped with zero test coverage.
---
 crates/agentflare-shim/src/main.rs | 57 +++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/crates/agentflare-shim/src/main.rs b/crates/agentflare-shim/src/main.rs
index 5094df05..359e7ac0 100644
--- a/crates/agentflare-shim/src/main.rs
+++ b/crates/agentflare-shim/src/main.rs
@@ -28,7 +28,7 @@
 use std::env;
 use std::ffi::OsString;
 use std::path::{Path, PathBuf};
-use std::process::{Command, exit};
+use std::process::{exit, Command};
 
 use agentflare_shim::{is_set, path_without_shim_dir, run_real, tool_name_from_exe, trace};
 
@@ -109,3 +109,58 @@ fn main() {
         Err(_) => run_real(&tool, filtered_path.as_ref(), &args),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::fs;
+
+    #[test]
+    fn finds_marker_in_start_dir() {
+        let tmp = std::env::temp_dir().join(format!("agentflare-shim-test-{}", std::process::id()));
+        fs::create_dir_all(&tmp).unwrap();
+        fs::write(tmp.join(PROJECT_MARKER), "").unwrap();
+        assert!(in_scoped_project(&tmp, None));
+        let _ = fs::remove_dir_all(&tmp);
+    }
+
+    #[test]
+    fn finds_marker_in_an_ancestor_dir() {
+        let tmp =
+            std::env::temp_dir().join(format!("agentflare-shim-test-anc-{}", std::process::id()));
+        let sub = tmp.join("a").join("b");
+        fs::create_dir_all(&sub).unwrap();
+        fs::write(tmp.join(PROJECT_MARKER), "").unwrap();
+        assert!(in_scoped_project(&sub, None));
+        let _ = fs::remove_dir_all(&tmp);
+    }
+
+    #[test]
+    fn stops_at_home_without_treating_agentflares_own_dir_as_a_project_marker() {
+        // ~/.agentflare is agentflare's own app-data dir, not a project
+        // marker -- walking past `home` (inclusive of home itself) must
+        // never false-positive on it. Regression for the bug the doc
+        // comment on `in_scoped_project` calls out.
+        let tmp =
+            std::env::temp_dir().join(format!("agentflare-shim-test-home-{}", std::process::id()));
+        let sub = tmp.join("sub");
+        fs::create_dir_all(&sub).unwrap();
+        fs::write(tmp.join(PROJECT_MARKER), "").unwrap();
+        assert!(!in_scoped_project(&sub, Some(&tmp)));
+        let _ = fs::remove_dir_all(&tmp);
+    }
+
+    #[test]
+    fn no_marker_anywhere_is_not_scoped() {
+        // Bound the walk-up with an explicit synthetic `home` one level
+        // above `tmp`, rather than `None` -- an unbounded walk from a real
+        // temp dir keeps climbing past this test's control (e.g. up into
+        // the real machine's actual `~/.agentflare`, giving a false pass/fail
+        // that has nothing to do with the logic under test).
+        let tmp =
+            std::env::temp_dir().join(format!("agentflare-shim-test-none-{}", std::process::id()));
+        fs::create_dir_all(&tmp).unwrap();
+        assert!(!in_scoped_project(&tmp, tmp.parent()));
+        let _ = fs::remove_dir_all(&tmp);
+    }
+}

From 9d3cbff03971542fa46523de37d532824ec4515d Mon Sep 17 00:00:00 2001
From: Shivakumar <kumar@appz.dev>
Date: Mon, 20 Jul 2026 23:15:49 +0530
Subject: [PATCH 2/2] fmt: reorder std::process import to match CI's rustfmt
 version

Agentflare-Agent: claude-code_2-1-215_agent
Agentflare-Branch: test/agentflare-shim-home-boundary-coverage
---
 crates/agentflare-shim/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/agentflare-shim/src/main.rs b/crates/agentflare-shim/src/main.rs
index 359e7ac0..92df7e07 100644
--- a/crates/agentflare-shim/src/main.rs
+++ b/crates/agentflare-shim/src/main.rs
@@ -28,7 +28,7 @@
 use std::env;
 use std::ffi::OsString;
 use std::path::{Path, PathBuf};
-use std::process::{exit, Command};
+use std::process::{Command, exit};
 
 use agentflare_shim::{is_set, path_without_shim_dir, run_real, tool_name_from_exe, trace};