Fix scope guard blocking project root from subdirectory CWDs

resolve_scope_root() now walks up from CWD looking for .git to find the
repository root, preventing false positives when working in subdirectories
like cli/, src/, or tests/. Safety ceiling at /workspaces prevents scope
from escaping the workspace boundary.

Author: AnExiledDev

.devcontainer/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CodeForge Devcontainer Changelog
 
+## v2.0.3 — 2026-03-03
+
+### Workspace Scope Guard
+
+- Fix scope guard blocking project root access from subdirectory CWDs — now detects git repository root and uses it as scope boundary
+
 ## v2.0.2 — 2026-03-02
 
 ### Security

.devcontainer/plugins/devs-marketplace/plugins/workspace-scope-guard/README.md

@@ -41,6 +41,17 @@ This means:
 
 Example: if CWD is `/workspaces/projects/MyApp/.claude/worktrees/agent-abc123`, the scope root becomes `/workspaces/projects/MyApp/`. All paths under that root are permitted.
 
+### Git Root Detection
+
+When CWD is a subdirectory of a git repository, the guard automatically expands scope to the **repository root** (the directory containing `.git`). This prevents false positives when working in subdirectories like `src/`, `cli/`, or `tests/`.
+
+The walk stops at `/workspaces` or the filesystem root as a safety ceiling — scope never expands beyond the workspace boundary.
+
+Priority order:
+1. **Worktree detection** — `.claude/worktrees/` in CWD → project root
+2. **Git root detection** — walk up to `.git` → repository root
+3. **Fallback** — CWD unchanged (non-git directories)
+
 ### Path Resolution
 
 Both CWD and target paths are resolved via `os.path.realpath()` before comparison. This prevents false positives when paths involve symlinks or bind mounts.

.devcontainer/plugins/devs-marketplace/plugins/workspace-scope-guard/scripts/guard-workspace-scope.py

@@ -6,6 +6,7 @@
 Permanently blacklists /workspaces/.devcontainer/ — no exceptions, no bypass.
 Bash enforcement via two-layer detection: write target extraction + workspace path scan.
 Worktree-aware: detects .claude/worktrees/ in CWD and expands scope to project root.
+Git-root-aware: walks up from CWD to find .git, expanding scope to repository root.
 Fails closed on any error.
 
 Exit code 2 blocks the operation with an error message.
@@ -156,15 +157,30 @@ def is_allowlisted(resolved_path: str) -> bool:
 def resolve_scope_root(cwd: str) -> str:
     """Resolve CWD to the effective scope root.
 
-    When CWD is inside a .claude/worktrees/<id> directory, the scope root
-    is the project root (the parent of .claude/worktrees/). This allows
-    sibling worktrees and the main project directory to remain in-scope.
-
-    Returns cwd unchanged when not in a worktree.
+    Priority:
+    1. Worktree detection: if CWD is inside .claude/worktrees/<id>, scope root
+       is the project root (parent of .claude/worktrees/).
+    2. Git root detection: walk up from CWD looking for .git directory/file.
+       Stops at / or /workspaces to prevent scope from escaping the workspace.
+    3. Fallback: CWD unchanged (non-git directories).
     """
+    # 1. Worktree detection
     idx = cwd.find(_WORKTREE_SEGMENT)
     if idx != -1:
         return cwd[:idx]
+
+    # 2. Git root detection — walk up looking for .git
+    current = cwd
+    while True:
+        if os.path.exists(os.path.join(current, ".git")):
+            return current
+        parent = os.path.dirname(current)
+        # Safety ceiling: stop at filesystem root or /workspaces
+        if parent == current or current == "/workspaces":
+            break
+        current = parent
+
+    # 3. Fallback — no git root found
     return cwd
 
 

.devcontainer/plugins/devs-marketplace/plugins/workspace-scope-guard/scripts/inject-workspace-cwd.py

@@ -5,6 +5,7 @@
 
 Worktree-aware: when CWD is inside .claude/worktrees/, injects the project
 root as the scope boundary instead of the worktree-specific path.
+Git-root-aware: walks up from CWD to find .git, expanding scope to repository root.
 
 Fires on: SessionStart, UserPromptSubmit, PreToolUse, SubagentStart
 Always exits 0 (advisory, never blocking).
@@ -19,10 +20,32 @@
 
 
 def resolve_scope_root(cwd: str) -> str:
-    """Resolve CWD to project root when inside a worktree."""
+    """Resolve CWD to the effective scope root.
+
+    Priority:
+    1. Worktree detection: if CWD is inside .claude/worktrees/<id>, scope root
+       is the project root (parent of .claude/worktrees/).
+    2. Git root detection: walk up from CWD looking for .git directory/file.
+       Stops at / or /workspaces to prevent scope from escaping the workspace.
+    3. Fallback: CWD unchanged (non-git directories).
+    """
+    # 1. Worktree detection
     idx = cwd.find(_WORKTREE_SEGMENT)
     if idx != -1:
         return cwd[:idx]
+
+    # 2. Git root detection — walk up looking for .git
+    current = cwd
+    while True:
+        if os.path.exists(os.path.join(current, ".git")):
+            return current
+        parent = os.path.dirname(current)
+        # Safety ceiling: stop at filesystem root or /workspaces
+        if parent == current or current == "/workspaces":
+            break
+        current = parent
+
+    # 3. Fallback — no git root found
     return cwd
 
 

tests/plugins/test_guard_workspace_scope.py

@@ -1,16 +1,73 @@
 """Tests for workspace scope guard plugin.
 
 Covers: is_blacklisted, is_in_scope, is_allowlisted, get_target_path,
-        extract_primary_command, extract_write_targets, check_bash_scope.
+        extract_primary_command, extract_write_targets, check_bash_scope,
+        resolve_scope_root.
 """
 
+import os
 from unittest.mock import patch
 
 import pytest
 
 from tests.conftest import guard_workspace_scope
 
 
+# ---------------------------------------------------------------------------
+# resolve_scope_root
+# ---------------------------------------------------------------------------
+class TestResolveScopeRoot:
+    @pytest.mark.parametrize(
+        "cwd, git_at, expected",
+        [
+            (
+                "/workspaces/projects/MyApp/src/components",
+                "/workspaces/projects/MyApp",
+                "/workspaces/projects/MyApp",
+            ),
+            (
+                "/workspaces/projects/MyApp/src/deeply/nested",
+                "/workspaces/projects/MyApp",
+                "/workspaces/projects/MyApp",
+            ),
+            (
+                "/workspaces/projects/MyApp",
+                "/workspaces/projects/MyApp",
+                "/workspaces/projects/MyApp",
+            ),
+            (
+                "/workspaces/projects/MyApp/src",
+                None,
+                "/workspaces/projects/MyApp/src",
+            ),
+            (
+                "/workspaces/projects/MyApp/.claude/worktrees/abc/src",
+                "/workspaces/projects/MyApp",
+                "/workspaces/projects/MyApp",
+            ),
+        ],
+        ids=[
+            "subdirectory_finds_git_root",
+            "deeply_nested_finds_git_root",
+            "already_at_git_root",
+            "no_git_fallback_to_cwd",
+            "worktree_takes_priority",
+        ],
+    )
+    def test_resolve_scope_root(self, cwd, git_at, expected):
+        original_exists = os.path.exists
+
+        def mock_exists(path):
+            if git_at and path == os.path.join(git_at, ".git"):
+                return True
+            if path.endswith("/.git"):
+                return False
+            return original_exists(path)
+
+        with patch("os.path.exists", side_effect=mock_exists):
+            assert guard_workspace_scope.resolve_scope_root(cwd) == expected
+
+
 # ---------------------------------------------------------------------------
 # is_blacklisted
 # ---------------------------------------------------------------------------
@@ -210,13 +267,17 @@ def test_blocked(self, command, cwd):
             ("echo x > /workspaces/other/file", "/workspaces"),
             ("echo x > /tmp/scratch", "/workspaces/proj"),
             ("", "/workspaces/proj"),
+            ("ls /workspaces/proj/other-dir", "/workspaces/proj"),
+            ("cat /workspaces/proj/README.md", "/workspaces/proj"),
         ],
         ids=[
             "write_inside_scope",
             "no_paths",
             "cwd_is_workspaces_bypass",
             "allowlisted_tmp",
             "empty_command",
+            "sibling_dir_in_scope",
+            "project_root_file_in_scope",
         ],
     )
     def test_allowed(self, command, cwd):