Merge pull request #182 from netresearch/fix/pr-status-gate-path

fix(hooks): recommend pr-status.sh by its resolved absolute path

Author: CybotTM

scripts/validate_git_command.py

@@ -198,14 +198,29 @@ def reply_path_without_pr(cmd: str) -> str | None:
     return None
 
 
+# The plugin's scripts are not on PATH: recommending a bare `pr-status.sh`
+# sends the reader into `command not found` (exit 127) and a hunt through the
+# plugin cache before the gate's advice becomes followable (2026-08-13). The
+# script ships in this plugin, so the message can name the invocable path;
+# the bare name stays as fallback for layouts where the sibling is absent.
+_PR_STATUS_SH = os.path.join(
+    os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+    "skills",
+    "git-workflow",
+    "scripts",
+    "pr-status.sh",
+)
+PR_STATUS = _PR_STATUS_SH if os.path.isfile(_PR_STATUS_SH) else "pr-status.sh"
+
+
 def handrolled_pr_poll(cmd: str) -> str | None:
     if "--watch" in cmd or not POLLS_PR.search(cmd):
         return None
     if not (POLL_LOOP.search(cmd) or FOR_LOOP_POLL.search(cmd)):
         return None
     return (
         "Hand-rolled poll over pull-request state. Use "
-        "`pr-status.sh -R <owner/repo> <pr> --watch` instead: it returns at the "
+        f"`{PR_STATUS} -R <owner/repo> <pr> --watch` instead: it returns at the "
         "FIRST actionable event — a check that failed, a review that arrived, a "
         "thread that needs an answer — where a loop written here waits for the "
         "one outcome it was told about and sleeps through the rest. A loop that "
@@ -243,13 +258,13 @@ def merge_readiness_without_pr_status(cmd: str) -> str | None:
         if QUERIES_FORGE.match(segment) and MERGE_READINESS_FIELD.search(segment):
             return (
                 "Merge readiness asked of gh directly. Use "
-                "`pr-status.sh -R <owner/repo> <pr>` instead: it reports checks, "
+                f"`{PR_STATUS} -R <owner/repo> <pr>` instead: it reports checks, "
                 "reviews, rulesets and unresolved threads together and ends with "
                 "a NEXT: line naming the action. mergeable_state and "
                 "mergeStateStatus answer only 'blocked' and never say why, so an "
                 "unresolved thread or a red check stays invisible and the pull "
                 "request looks like it is merely waiting. To find out which "
-                "required context is unmet, run pr-status.sh first, then the "
+                f"required context is unmet, run {PR_STATUS} first, then the "
                 "GraphQL query with `isRequired` — that one is not gated."
             )
     return None

tests/test_validate_git_command.py

@@ -10,6 +10,7 @@
 
 import json
 import os
+import re
 import subprocess
 import sys
 import tempfile
@@ -136,6 +137,33 @@ def fifo_case() -> bool:
         os.rmdir(tmp)
 
 
+def pr_status_path_case(command: str) -> bool:
+    """The deny must name an invocable pr-status.sh, not a bare command name.
+
+    The plugin's scripts are not on PATH: a bare `pr-status.sh` produced
+    `command not found` (exit 127) and a hunt through the plugin cache
+    (2026-08-13). The recommendation must carry the absolute path of the
+    script shipped in this plugin, and that path must exist. Both gates
+    that recommend the script are exercised, so a later message edit
+    cannot drop the interpolation from one of them unnoticed.
+    """
+    payload = json.dumps({"tool_name": "Bash", "tool_input": {"command": command}})
+    proc = subprocess.run(
+        [sys.executable, HOOK],
+        input=payload,
+        capture_output=True,
+        text=True,
+        timeout=10,
+        check=False,
+    )
+    out = proc.stdout.strip()
+    if not out.startswith("{"):
+        return False
+    reason = json.loads(out)["hookSpecificOutput"].get("permissionDecisionReason", "")
+    match = re.search(r"`(/[^`\s]+/pr-status\.sh)", reason)
+    return bool(match and os.path.isfile(match.group(1)))
+
+
 def main() -> int:
     fails = 0
     for name, expected, command in CASES:
@@ -151,6 +179,23 @@ def main() -> int:
         f"got={'no-hang' if ok else 'HUNG'}"
     )
 
+    for name, command in [
+        (
+            "merge-readiness deny names pr-status.sh path",
+            "gh pr view 6651 --json mergeStateStatus",
+        ),
+        (
+            "poll deny names pr-status.sh path",
+            "until [ x = y ]; do gh pr view 1 --json state; sleep 30; done",
+        ),
+    ]:
+        ok = pr_status_path_case(command)
+        fails += 0 if ok else 1
+        print(
+            f"  {'OK  ' if ok else 'FAIL'} {name:<44} "
+            f"want=abs-path got={'abs-path' if ok else 'bare-name'}"
+        )
+
     print(f"  ---- failures: {fails}")
     return 1 if fails else 0