Narrow tracked-humanize guard to .humanize/ to avoid false blocks

The tracked-state check used '.humanize-*' globs which matched unrelated
dot-prefixed files the command-side guard already allows (for example
.humanize-backup and .humanizeconfig, per tests/test-humanize-escape.sh).
In an active loop, a repo that intentionally tracked such a file was
incorrectly blocked with "Tracked Humanize State Blocked" even with no
RLCR artifacts present.

Scope the detection to .humanize/ via a single ls-files pathspec. This
stays consistent with git_adds_humanize, correctly omits paths the user
has staged for removal via git rm --cached, and drops the redundant
diff --cached probe.

Update the block message (inline fallback and prompt template) to drop
the dangerous "git rm --cached -r .humanize-*" hint, which could strip
user files like .humanize-backup from the index.

Add a stop-gate regression test asserting that tracked .humanize-backup
and .humanizeconfig do not trigger the tracked-state block reason.

Author: SihaoLiu

hooks/lib/loop-common.sh

@@ -1322,21 +1322,21 @@ IMPORTANT: The commit message must NOT contain the literal string \".humanize\"
 # Return success if local Humanize runtime state has entered git tracking or the index.
 # Untracked .humanize state is allowed; tracked or staged state must be blocked.
 # Usage: git_has_tracked_humanize_state [project_root]
+#
+# Intentionally scoped to .humanize/ to stay consistent with git_adds_humanize,
+# which explicitly allows unrelated paths like .humanize-backup or
+# .humanizeconfig (see tests/test-humanize-escape.sh). ls-files covers both
+# committed entries and paths staged via git add; paths the user has staged for
+# removal via git rm --cached are correctly omitted so the user can unstick
+# themselves without being re-blocked.
 git_has_tracked_humanize_state() {
     local project_root="${1:-.}"
 
     if [[ ! -d "$project_root/.git" ]] && ! git -C "$project_root" rev-parse --git-dir >/dev/null 2>&1; then
         return 1
     fi
 
-    if git -C "$project_root" ls-files --error-unmatch .humanize >/dev/null 2>&1; then
-        return 0
-    fi
-    if git -C "$project_root" ls-files '.humanize/*' '.humanize-*' | grep -q '.'; then
-        return 0
-    fi
-
-    if git -C "$project_root" diff --cached --name-only -- .humanize '.humanize-*' | grep -q '.'; then
+    if git -C "$project_root" ls-files -- .humanize 2>/dev/null | grep -q '.'; then
         return 0
     fi
 
@@ -1348,20 +1348,16 @@ git_has_tracked_humanize_state() {
 git_tracked_humanize_blocked_message() {
     local fallback="# Tracked Humanize State Blocked
 
-Detected tracked or staged files under \`.humanize/\` (or legacy \`.humanize-*\`).
+Detected tracked or staged files under \`.humanize/\`.
 
 These files are local Humanize loop state and must remain outside version control.
 
 ## Required Fix
 
-1. Remove Humanize state from the index, for example:
+1. Remove Humanize state from the index:
 
        git rm --cached -r .humanize
 
-   If legacy tracked state exists, remove those entries too:
-
-       git rm --cached -r .humanize-*
-
 2. Keep only real project files staged.
 3. Retry the stop action after the local state is no longer tracked.
 

prompt-template/block/git-tracked-humanize.md

@@ -1,19 +1,15 @@
 # Tracked Humanize State Blocked
 
-Detected tracked or staged files under `.humanize/` or legacy `.humanize-*`.
+Detected tracked or staged files under `.humanize/`.
 
 These files are local Humanize loop state and must remain outside version control.
 
 ## Required Fix
 
-1. Remove Humanize state from the index, for example:
+1. Remove Humanize state from the index:
 
        git rm --cached -r .humanize
 
-   If legacy tracked state exists, remove those entries too:
-
-       git rm --cached -r .humanize-*
-
 2. Keep only real project files staged.
 3. Retry the stop action after the local state is no longer tracked.
 

tests/test-stop-gate.sh

@@ -144,30 +144,63 @@ else
     fail "rlcr-stop-gate reports tracked Humanize state with dedicated reason" "output containing Tracked Humanize State Blocked" "$OUTPUT3"
 fi
 
-# Test 4: No active loop -> gate allows exit (exit 0)
+# Test 4: Unrelated dot-prefixed files that happen to start with .humanize-
+# must not be treated as loop state. .humanize-backup and .humanizeconfig are
+# explicitly allowed by the git add validator (tests/test-humanize-escape.sh);
+# the tracked-state guard must stay consistent and ignore them.
 T4_DIR="$TEST_DIR/t4"
-mkdir -p "$T4_DIR/empty-project"
+mkdir -p "$T4_DIR"
+setup_active_loop_fixture "$T4_DIR/project"
+echo "not loop state" > "$T4_DIR/project/.humanize-backup"
+echo "not loop state" > "$T4_DIR/project/.humanizeconfig"
+git -C "$T4_DIR/project" add -f .humanize-backup .humanizeconfig
 
 set +e
 (
-    cd "$T4_DIR/empty-project"
+    cd "$T4_DIR/project"
     "$GATE_SCRIPT"
 ) > "$T4_DIR/out.txt" 2>&1
 EXIT4=$?
 set -e
 
-if [[ "$EXIT4" -eq 0 ]]; then
-    pass "rlcr-stop-gate exits 0 when no active loop exists"
+if [[ "$EXIT4" -eq 10 ]]; then
+    pass "rlcr-stop-gate does not confuse .humanize-backup with loop state"
 else
     OUTPUT4=$(cat "$T4_DIR/out.txt" 2>/dev/null || true)
-    fail "rlcr-stop-gate exits 0 when no active loop exists" "exit 0" "exit $EXIT4; output: $OUTPUT4"
+    fail "rlcr-stop-gate does not confuse .humanize-backup with loop state" "exit 10" "exit $EXIT4; output: $OUTPUT4"
 fi
 
-if grep -q "^ALLOW:" "$T4_DIR/out.txt" 2>/dev/null; then
-    pass "rlcr-stop-gate reports ALLOW when no active loop"
+if ! grep -q "Tracked Humanize State Blocked" "$T4_DIR/out.txt" 2>/dev/null; then
+    pass "rlcr-stop-gate does not emit tracked-state reason for .humanize-backup"
 else
     OUTPUT4=$(cat "$T4_DIR/out.txt" 2>/dev/null || true)
-    fail "rlcr-stop-gate reports ALLOW when no active loop" "output containing ALLOW:" "$OUTPUT4"
+    fail "rlcr-stop-gate does not emit tracked-state reason for .humanize-backup" "no Tracked Humanize State Blocked line" "$OUTPUT4"
+fi
+
+# Test 5: No active loop -> gate allows exit (exit 0)
+T5_DIR="$TEST_DIR/t5"
+mkdir -p "$T5_DIR/empty-project"
+
+set +e
+(
+    cd "$T5_DIR/empty-project"
+    "$GATE_SCRIPT"
+) > "$T5_DIR/out.txt" 2>&1
+EXIT5=$?
+set -e
+
+if [[ "$EXIT5" -eq 0 ]]; then
+    pass "rlcr-stop-gate exits 0 when no active loop exists"
+else
+    OUTPUT5=$(cat "$T5_DIR/out.txt" 2>/dev/null || true)
+    fail "rlcr-stop-gate exits 0 when no active loop exists" "exit 0" "exit $EXIT5; output: $OUTPUT5"
+fi
+
+if grep -q "^ALLOW:" "$T5_DIR/out.txt" 2>/dev/null; then
+    pass "rlcr-stop-gate reports ALLOW when no active loop"
+else
+    OUTPUT5=$(cat "$T5_DIR/out.txt" 2>/dev/null || true)
+    fail "rlcr-stop-gate reports ALLOW when no active loop" "output containing ALLOW:" "$OUTPUT5"
 fi
 
 print_test_summary "RLCR Stop Gate Wrapper Test Summary"