@tyroneross/build-loop 0.36.0 → 0.43.0

package/hooks/hooks.json

@@ -7,57 +7,66 @@
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/session-start-architecture.sh\" </dev/null >/dev/null 2>&1; exit 0",
-            "timeout": 2000
+            "timeout": 2
           },
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/session-start-retrieval.sh\" </dev/null >/dev/null 2>&1; exit 0",
-            "timeout": 2000
+            "timeout": 2
           },
           {
             "type": "command",
-            "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/session-start-rally-point.sh\" </dev/null 2>/dev/null; exit 0",
-            "timeout": 2000
+            "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/session-start-rally-point.sh\" 2>/dev/null; exit 0",
+            "timeout": 2
           },
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/session-start-worktree-gc.sh\" </dev/null >/dev/null 2>&1; exit 0",
-            "timeout": 2000
+            "timeout": 2
           },
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/session-start-git-hooks.sh\" </dev/null >/dev/null 2>&1; exit 0",
-            "timeout": 2000
+            "timeout": 2
           },
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/session-start-plugin-drift.sh\" </dev/null >/dev/null 2>&1; exit 0",
-            "timeout": 2000
+            "timeout": 2
           },
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/session-start-plugin-heal.sh\" </dev/null >/dev/null 2>&1; exit 0",
-            "timeout": 2000
+            "timeout": 2
           },
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/session-start-memory.sh\" </dev/null >/dev/null 2>&1; exit 0",
-            "timeout": 6000
+            "timeout": 6
           },
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/session-start-closeout.sh\" </dev/null >/dev/null 2>&1; exit 0",
-            "timeout": 3000
+            "timeout": 3
           },
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/closeout.sh\" session-start </dev/null 2>/dev/null; exit 0",
-            "timeout": 3000
+            "timeout": 3
           },
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/session-start-extensions.sh\" </dev/null 2>/dev/null; exit 0",
-            "timeout": 2000
+            "timeout": 2
+          }
+        ]
+      },
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/session-start-codex-hook-trust.sh\" </dev/null 2>/dev/null || printf '{}'",
+            "timeout": 5
           }
         ]
       }
@@ -69,7 +78,7 @@
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/route-guard.sh\" prompt-submit 2>/dev/null || printf '{}'",
-            "timeout": 3000
+            "timeout": 3
           }
         ]
       }
@@ -81,7 +90,7 @@
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/route-guard.sh\" pre-skill 2>/dev/null || printf '{}'",
-            "timeout": 3000
+            "timeout": 3
           }
         ]
       },
@@ -91,12 +100,12 @@
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/pre-edit-architecture.sh\" >/dev/null 2>&1; exit 0",
-            "timeout": 2000
+            "timeout": 2
           },
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/pre-edit-rally-point.sh\"; exit 0",
-            "timeout": 2000
+            "timeout": 2
           }
         ]
       },
@@ -106,12 +115,22 @@
           {
             "type": "command",
             "command": "root=\"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}\"; hook=\"$root/scripts/hooks/pre_bash_dispatch.sh\"; if [ -x \"$hook\" ]; then \"$hook\"; else printf '{}'; fi",
-            "timeout": 9000
+            "timeout": 9
           },
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/pre-edit-rally-point.sh\"; exit 0",
-            "timeout": 2000
+            "timeout": 2
+          }
+        ]
+      },
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "python3 \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/scripts/tool_trace.py\" --workdir \"$CLAUDE_PROJECT_DIR\" hook --phase start >/dev/null 2>&1 || true",
+            "timeout": 1
           }
         ]
       }
@@ -123,12 +142,22 @@
           {
             "type": "command",
             "command": "[ -f .build-loop/state.json ] || exit 0; python3 -c \"import json,sys; s=json.load(open('.build-loop/state.json')); p7=s.get('phases',{}).get('fact_check',{}).get('completed',False); active=s.get('active',False); sys.exit(0 if (not active or p7) else 1)\" 2>/dev/null && exit 0; echo \"$TOOL_INPUT\" | grep -qE '\\b(git\\s+push|npm\\s+publish|vercel\\s+deploy|gh\\s+release)\\b' && echo 'Build loop Phase 7 (fact-check) has not completed. Run fact-check before deploying.'; exit 0",
-            "timeout": 3000
+            "timeout": 3
           },
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/post-push-closeout.sh\" </dev/null >/dev/null 2>&1; exit 0",
-            "timeout": 2000
+            "timeout": 2
+          }
+        ]
+      },
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "python3 \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/scripts/tool_trace.py\" --workdir \"$CLAUDE_PROJECT_DIR\" hook --phase end >/dev/null 2>&1 || true",
+            "timeout": 1
           }
         ]
       }
@@ -139,43 +168,71 @@
         "hooks": [
           {
             "type": "command",
-            "command": "if [ -n \"$CLAUDE_TRANSCRIPT_PATH\" ]; then nohup python3 \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/scripts/scan_transcript_for_decisions.py\" --workdir \"$CLAUDE_PROJECT_DIR\" --transcript \"$CLAUDE_TRANSCRIPT_PATH\" --log-file \"${XDG_STATE_HOME:-$HOME/.local/state}/build-loop/scan.log\" </dev/null >/dev/null 2>&1 & fi; printf '{}'",
-            "timeout": 5000
+            "command": "python3 \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/scripts/state_finalize.py\" --workdir \"$CLAUDE_PROJECT_DIR\" --mark-incomplete-as-crashed </dev/null >/dev/null 2>&1; printf '{}'",
+            "timeout": 2
           },
           {
             "type": "command",
-            "command": "if [ -n \"$CLAUDE_TRANSCRIPT_PATH\" ]; then root=\"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}\"; nohup env PYTHONPATH=\"$root/scripts\" python3 -m scan_corrections --workdir \"$CLAUDE_PROJECT_DIR\" --transcript \"$CLAUDE_TRANSCRIPT_PATH\" --source stop-hook </dev/null >/dev/null 2>&1 & fi; printf '{}'",
-            "timeout": 5000
+            "command": "root=\"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}\"; hook=\"$root/scripts/hooks/stop_finalize.sh\"; if [ -x \"$hook\" ]; then \"$hook\"; else printf '{}'; fi",
+            "timeout": 30
           },
           {
             "type": "command",
-            "command": "if [ -n \"$CLAUDE_TRANSCRIPT_PATH\" ]; then root=\"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}\"; nohup env PYTHONPATH=\"$root/scripts\" python3 -m scan_findings --workdir \"$CLAUDE_PROJECT_DIR\" --transcript \"$CLAUDE_TRANSCRIPT_PATH\" --log-file \"${XDG_STATE_HOME:-$HOME/.local/state}/build-loop/findings-scan.log\" </dev/null >/dev/null 2>&1 & fi; printf '{}'",
-            "timeout": 5000
-          },
+            "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/closeout.sh\" stop 2>/dev/null; exit 0",
+            "timeout": 6
+          }
+        ]
+      },
+      {
+        "matcher": "",
+        "hooks": [
           {
             "type": "command",
-            "command": "python3 \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/scripts/state_finalize.py\" --workdir \"$CLAUDE_PROJECT_DIR\" --mark-incomplete-as-crashed </dev/null >/dev/null 2>&1; printf '{}'",
-            "timeout": 2000
-          },
+            "command": "if [ -f \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/scripts/commit_state_check.py\" ]; then python3 \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/scripts/commit_state_check.py\" --workdir \"${CLAUDE_PROJECT_DIR}\" --hook; else printf '{}'; fi",
+            "timeout": 5
+          }
+        ]
+      },
+      {
+        "matcher": "",
+        "hooks": [
           {
             "type": "command",
-            "command": "root=\"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}\"; hook=\"$root/scripts/hooks/stop_finalize.sh\"; if [ -x \"$hook\" ]; then \"$hook\"; else printf '{}'; fi",
-            "timeout": 30000
-          },
+            "command": "python3 \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/scripts/tool_trace.py\" --workdir \"$CLAUDE_PROJECT_DIR\" ingest >/dev/null 2>&1 || true; printf '{}'",
+            "timeout": 5
+          }
+        ]
+      },
+      {
+        "hooks": [
           {
             "type": "command",
-            "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/closeout.sh\" stop 2>/dev/null; exit 0",
-            "timeout": 6000
+            "command": "bash \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/hooks/stop-transcript-sweep.sh\" all 2>/dev/null || printf '{}'",
+            "timeout": 5
           }
         ]
-      },
+      }
+    ],
+    "SessionEnd": [
       {
         "matcher": "",
         "hooks": [
           {
             "type": "command",
-            "command": "if [ -f \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/scripts/commit_state_check.py\" ]; then python3 \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/scripts/commit_state_check.py\" --workdir \"${CLAUDE_PROJECT_DIR}\" --hook; else printf '{}'; fi",
-            "timeout": 5000
+            "command": "root=\"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}\"; s=\"$root/scripts/hooks/session_end_retro_sweep.py\"; tp=$(python3 -c 'import sys,json;print(json.load(sys.stdin).get(\"transcript_path\",\"\"))' 2>/dev/null); if [ -n \"$tp\" ] && [ -f \"$s\" ]; then nohup python3 \"$s\" \"$tp\" </dev/null >/dev/null 2>&1 & fi; exit 0",
+            "timeout": 5
+          }
+        ]
+      }
+    ],
+    "PostToolUseFailure": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "python3 \"${CLAUDE_PLUGIN_ROOT:-$CLAUDE_PROJECT_DIR}/scripts/tool_trace.py\" --workdir \"$CLAUDE_PROJECT_DIR\" hook --phase error >/dev/null 2>&1 || true",
+            "timeout": 1
           }
         ]
       }

package/hooks/pre-commit

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Public-repo hygiene pre-commit hook.
+# Public-repo hygiene and independent-audit pre-commit hook.
 #
 # build-loop is open source. This hook blocks a commit that stages a
 # private app slug (see scripts/check_private_slugs.py for the editable
@@ -26,4 +26,23 @@ if [ -f "$RUNTIME_MEMORY_GUARD" ]; then
 fi
 # --- END private-slug-guard pre-commit ---
 
+# --- BEGIN portability-guard pre-commit ---
+# Blocks a commit that ships a maintainer-machine path to installed users.
+# Runs from the repo (no secret config needed, unlike the slug guard), so
+# there is no .git/hooks copy to desync. See scripts/check_portability.py.
+PORTABILITY_GUARD="$RALLY_POINT_TOPLEVEL/scripts/check_portability.py"
+if [ -f "$PORTABILITY_GUARD" ]; then
+  python3 "$PORTABILITY_GUARD" || exit 1
+fi
+# --- END portability-guard pre-commit ---
+
+# --- BEGIN independent-audit pre-commit ---
+# Covers manual, Codex, IDE, and other commit paths. The auditor blocks only
+# deterministic integrity failures; its advisory packet remains visible.
+INDEPENDENT_AUDIT="$RALLY_POINT_TOPLEVEL/scripts/audit_before_commit.py"
+if [ -f "$INDEPENDENT_AUDIT" ]; then
+  python3 "$INDEPENDENT_AUDIT" || exit $?
+fi
+# --- END independent-audit pre-commit ---
+
 exit 0

package/hooks/pre-edit-rally-point.sh

@@ -34,8 +34,7 @@ PKG="$SCRIPT_DIR/../scripts/rally_point"
 # the payload is forwarded to Python via the environment.
 STDIN_JSON=""
 if [ ! -t 0 ]; then
-    STDIN_JSON=$(cat 2>/dev/null || true)
-    STDIN_JSON=$(printf '%s' "$STDIN_JSON" | head -c 65536)
+    STDIN_JSON=$(head -c 65536 2>/dev/null || true)
 fi
 
 # Extract file_path (Edit/Write) and command (Bash) from the event JSON.
@@ -44,6 +43,7 @@ fi
 # with NUL handling across portable awk/read.
 FILE_PATH=""
 TOOL_CMD=""
+EVENT_SESSION_ID=""
 if [ -n "$STDIN_JSON" ]; then
     EXTRACTED=$(STDIN_JSON="$STDIN_JSON" python3 - <<'PYEOF' 2>/dev/null
 import json, os, sys
@@ -55,22 +55,27 @@ except (ValueError, TypeError):
 ti = (d.get("tool_input") or {}) if isinstance(d.get("tool_input"), dict) else {}
 fp = ti.get("file_path") or ti.get("path") or ti.get("filename") or ""
 cmd = ti.get("command") or ""
+session_id = d.get("session_id") or ""
 # Emit fp as base64 (single line, no newlines), then cmd as base64. The
 # bash side decodes; this avoids embedded-newline parsing entirely.
 import base64
 b64 = lambda s: base64.b64encode(s.encode("utf-8", "replace")).decode("ascii") if s else ""
-sys.stdout.write(b64(fp) + "\n" + b64(cmd) + "\n")
+sys.stdout.write(b64(fp) + "\n" + b64(cmd) + "\n" + b64(session_id) + "\n")
 PYEOF
 )
     if [ -n "$EXTRACTED" ]; then
         FILE_PATH_B64=$(printf '%s\n' "$EXTRACTED" | sed -n '1p')
         TOOL_CMD_B64=$(printf '%s\n' "$EXTRACTED" | sed -n '2p')
+        EVENT_SESSION_ID_B64=$(printf '%s\n' "$EXTRACTED" | sed -n '3p')
         if [ -n "$FILE_PATH_B64" ]; then
             FILE_PATH=$(printf '%s' "$FILE_PATH_B64" | base64 --decode 2>/dev/null || true)
         fi
         if [ -n "$TOOL_CMD_B64" ]; then
             TOOL_CMD=$(printf '%s' "$TOOL_CMD_B64" | base64 --decode 2>/dev/null || true)
         fi
+        if [ -n "$EVENT_SESSION_ID_B64" ]; then
+            EVENT_SESSION_ID=$(printf '%s' "$EVENT_SESSION_ID_B64" | base64 --decode 2>/dev/null || true)
+        fi
     fi
 fi
 
@@ -83,9 +88,11 @@ fi
 # without polluting the terminal by default.
 if [ "${BUILD_LOOP_RALLY_DEBUG:-0}" = "1" ]; then
     python3 "$PKG/hooks.py" pre-edit --workdir "$WORKDIR" --tool claude_code \
+        --session-id "$EVENT_SESSION_ID" \
         --file-path "$FILE_PATH" --command "$TOOL_CMD" || exit 0
 else
     python3 "$PKG/hooks.py" pre-edit --workdir "$WORKDIR" --tool claude_code \
+        --session-id "$EVENT_SESSION_ID" \
         --file-path "$FILE_PATH" --command "$TOOL_CMD" 2>/dev/null || exit 0
 fi
 

package/hooks/session-start-codex-hook-trust.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: Apache-2.0
+# Report Codex hooks that are registered but never trusted, so they cannot
+# silently never run. Advisory: emits context only when there IS a gap, and
+# always exits 0.
+#
+# WHY: Codex records hook trust in ~/.codex/config.toml keyed by ORDINAL
+# POSITION. Nothing compared it to .codex/hooks.json, so on 2026-08-23 a sweep
+# found 28 of 46 registered hooks across 10 repos had never been trusted --
+# including one that had shipped in git 9 days earlier.
+set +e
+PLUGIN_ROOT="${CLAUDE_PLUGIN_ROOT:-${CLAUDE_PROJECT_DIR:-$PWD}}"
+WORKDIR="${CLAUDE_PROJECT_DIR:-$PWD}"
+CHECK="${PLUGIN_ROOT}/scripts/codex_hook_trust_check.py"
+
+[ -f "$CHECK" ] || { printf '{}'; exit 0; }
+[ -f "${WORKDIR}/.codex/hooks.json" ] || { printf '{}'; exit 0; }
+command -v python3 >/dev/null 2>&1 || { printf '{}'; exit 0; }
+
+REPORT="$(python3 "$CHECK" --workdir "$WORKDIR" 2>/dev/null)"
+[ -n "$REPORT" ] || { printf '{}'; exit 0; }
+
+REPORT="$REPORT" python3 -c '
+import json, os
+print(json.dumps({"hookSpecificOutput": {
+    "hookEventName": "SessionStart",
+    "additionalContext": os.environ.get("REPORT", ""),
+}}))
+' 2>/dev/null || printf '{}'
+exit 0

package/hooks/session-start-git-hooks.sh

@@ -5,7 +5,8 @@
 # in one hook body — the test gate added per the 2026-06-29 RCA so new sessions get
 # the prevent-before-merge control automatically) + the artifact-guard pre-commit segment
 # (regenerate-and-restage checked-in artifacts; block undeclared third-party
-# imports — chained so it coexists with the rally-point private-slug segment).
+# imports — chained so it coexists with the Rally Point hygiene and independent
+# commit-audit segment).
 # Skips silently when: not inside a git repo, Python unavailable, hook
 # source not found, or a foreign (non-build-loop) pre-push is already
 # installed (requires --force to overwrite; we never force on auto-install).
@@ -14,4 +15,5 @@ cd "${CLAUDE_PROJECT_DIR:-$PWD}" 2>/dev/null || exit 0
 git rev-parse --git-dir >/dev/null 2>&1 || exit 0
 python3 "${PLUGIN_ROOT}/scripts/install_git_hooks.py" --install >/dev/null 2>&1 || true
 python3 "${PLUGIN_ROOT}/scripts/artifact_guard.py" --install-hook >/dev/null 2>&1 || true
+python3 "${PLUGIN_ROOT}/scripts/rally_point/install_git_hook.py" --repo "$PWD" >/dev/null 2>&1 || true
 exit 0

package/hooks/session-start-rally-point.sh

@@ -15,6 +15,36 @@ W="${CLAUDE_PROJECT_DIR:-$PWD}"
 PKG="$(dirname "$D")/scripts/rally_point"
 [ -d "$PKG" ] || exit 0
 
+# Claude's hook event is the authoritative session identity. Do not depend on
+# CLAUDE_SESSION_ID being exported: plugin hooks receive the same session_id on
+# stdin at SessionStart, PreToolUse, and Stop. The shared Python resolver keeps
+# explicit/event, environment, and process fallbacks identical for every path.
+STDIN_JSON=""
+if [ ! -t 0 ]; then
+    STDIN_JSON=$(head -c 65536 2>/dev/null || true)
+fi
+EVENT_SESSION_ID=""
+if [ -n "$STDIN_JSON" ]; then
+    EVENT_SESSION_ID=$(STDIN_JSON="$STDIN_JSON" python3 - <<'PYEOF' 2>/dev/null
+import json, os
+try:
+    event = json.loads(os.environ.get("STDIN_JSON") or "{}")
+except (TypeError, ValueError):
+    event = {}
+value = event.get("session_id") if isinstance(event, dict) else ""
+print(str(value or "").replace("\n", " ").replace("\t", " "), end="")
+PYEOF
+    ) || EVENT_SESSION_ID=""
+fi
+RALLY_HOOK_SESSION_ID=""
+if [ -f "$PKG/actor_identity.py" ]; then
+    RALLY_HOOK_SESSION_ID=$(RALLY_OBSERVER_PID="${PPID:-0}" \
+        python3 "$PKG/actor_identity.py" --tool claude_code \
+        --session-id "$EVENT_SESSION_ID" --field session-id 2>/dev/null || true)
+fi
+[ -n "$RALLY_HOOK_SESSION_ID" ] || \
+    RALLY_HOOK_SESSION_ID="${EVENT_SESSION_ID:-${BUILD_LOOP_RALLY_SESSION_ID:-${CLAUDE_SESSION_ID:-${RALLY_AGENT_ID:-${RALLY_SESSION_ID:-claude-${PPID}}}}}}"
+
 # Guard: if CLAUDE_PROJECT_DIR is unset and $PWD is not a git repo, the
 # launch cwd is not a rally room — defer the join to pre-edit (operative
 # repo resolution from the first Edit/Write/Bash). This is the no-op path.
@@ -27,15 +57,19 @@ fi
 # Step 1: checkpoint_read restore line (verbose: surface delta if any).
 # ``session-start-safe`` no-ops cleanly when the resolved workdir is not a
 # git repo (belt-and-braces — the shell guard above already filters).
-python3 "$PKG/hooks.py" session-start-safe --workdir "$W" --verbose 2>/dev/null || true
+python3 "$PKG/hooks.py" session-start-safe --workdir "$W" --verbose \
+    --tool claude_code --session-id "$RALLY_HOOK_SESSION_ID" 2>/dev/null || true
 
 # Step 2: probe announce + listen (fully detached watcher).
 if [ "${BUILD_LOOP_RALLY_POINT_SKIP_WATCH:-}" = "1" ]; then
     [ -f "$PKG/session_probe.py" ] && WORKDIR="$W" python3 "$PKG/session_probe.py" \
-        --workdir "$W" --tool claude_code --mode hook >/dev/null 2>&1 || true
+        --workdir "$W" --tool claude_code --session-id "$RALLY_HOOK_SESSION_ID" \
+        --mode hook >/dev/null 2>&1 || true
 else
     [ -f "$PKG/session_probe.py" ] && WORKDIR="$W" python3 "$PKG/session_probe.py" \
-        --workdir "$W" --tool claude_code --mode hook --start-watch >/dev/null 2>&1 || true
+        --workdir "$W" --tool claude_code --session-id "$RALLY_HOOK_SESSION_ID" \
+        --mode hook --start-watch \
+        --watch-parent-pid "${PPID}" >/dev/null 2>&1 || true
 fi
 
 # Step 3: opportunistic reaper sweep — physical cleanup of over-TTL presence/claims/lead.
@@ -43,7 +77,8 @@ fi
 [ -f "$PKG/reaper.py" ] && python3 "$PKG/reaper.py" --workdir "$W" --apply >/dev/null 2>&1 || true
 
 # Step 4: advance cursor past probe's own writes (silent; same script, no VERBOSE).
-python3 "$PKG/hooks.py" session-start-advance --workdir "$W" 2>/dev/null || true
+python3 "$PKG/hooks.py" session-start-advance --workdir "$W" \
+    --tool claude_code --session-id "$RALLY_HOOK_SESSION_ID" 2>/dev/null || true
 
 # Step 5: on-PATH-vs-pin rally version staleness guard (lane E-a). This is
 # the control that would have caught the rally version-mismatch incident:
@@ -63,4 +98,17 @@ if command -v rally >/dev/null 2>&1; then
     fi
 fi
 
+# Step 6: peer-on-same-workdir commit-collision WARN (lane EC-03 rca). Advisory +
+# fail-open: warns (never blocks) when a peer session is active on THIS workdir —
+# the precondition for the concurrent-write race (two writers on one checkout race
+# on HEAD/index; commits land on the wrong branch). On any error this silently
+# no-ops and NEVER affects the hook's exit code.
+[ -f "$PKG/peer_collision.py" ] && python3 "$PKG/peer_collision.py" --workdir "$W" 1>/dev/null || true
+
+# Step 7: orphan/stale-session NOTICE (lane EC-04 coord — notify half). Advisory +
+# fail-open + READ-ONLY: a dry-run count of over-TTL sessions surfaced as a WARN.
+# It never reaps (Step 3 already does that capability-gated); it only tells the
+# human cleanup is pending. Prints only to stderr; exit 0 preserved.
+[ -f "$PKG/orphan_notice.py" ] && python3 "$PKG/orphan_notice.py" --workdir "$W" 1>/dev/null || true
+
 exit 0

package/hooks/session-start-worktree-gc.sh

@@ -1,105 +1,58 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: Apache-2.0
-# Worktree GC: remove merged+clean stale worktrees/branches, AUTO-PRUNE orphans.
-# ACT mode (bundle-first removal of merged worktrees + branches) is ON by default
-# so cross-run residue self-heals (intent.md A5); set BUILDLOOP_GC_ACT=0 to opt out
-# (report-only). Locked, dirty, or unmerged worktrees are never removed either way.
-cd "${CLAUDE_PROJECT_DIR:-$PWD}" 2>/dev/null || exit 0
-git rev-parse --git-dir >/dev/null 2>&1 || exit 0
-R=".build-loop/worktree-gc-last.txt"
-mkdir -p "$(dirname "$R")"
-_bundle_done=0
+# SessionStart worktree report. This hook never mutates Git.
+#
+# Destructive finalization requires a direct collapse_run/reaper invocation with
+# explicit owner release. BUILDLOOP_GC_ACT is intentionally ignored: Stop is a
+# turn boundary, and SessionStart cannot prove the prior terminal process exited.
 
-# Rally exclusion (defense-in-depth, optional). If `rally` is on PATH and
-# `rally sessions --json` returns a list of live sessions, collect their
-# `cwd` paths so we can skip any worktree owned by an active session in
-# addition to the path-prefix guard below. Rally owns its own worktree
-# lifecycle; build-loop's GC must never reap a rally-owned worktree (force-
-# removing it deletes the cwd of a live agent process and every subsequent
-# hook fails with posix_spawn ENOENT). The path-prefix exclusion is the
-# PRIMARY guard and works even when `rally` is not installed.
-_rally_cwds=""
-if command -v rally >/dev/null 2>&1; then
-  _rally_cwds=$(rally sessions --json 2>/dev/null \
-    | awk 'match($0, /"cwd"[[:space:]]*:[[:space:]]*"[^"]+"/){
-             s=substr($0,RSTART,RLENGTH);
-             sub(/^"cwd"[[:space:]]*:[[:space:]]*"/,"",s);
-             sub(/"$/,"",s);
-             print s
-           }' 2>/dev/null || true)
-fi
+set -u
 
-{
-  printf '# Worktree GC report — %s\n\n## Stale candidates (REPORT-ONLY)\n' "$(date -u +%FT%TZ)"
+PROJECT_DIR="${CLAUDE_PROJECT_DIR:-$PWD}"
+cd "$PROJECT_DIR" 2>/dev/null || exit 0
+git rev-parse --git-dir >/dev/null 2>&1 || exit 0
 
-  # Collect candidates; in ACT mode, acted-on items are echoed inline (ACT:removed)
-  # and split into their own report section by the awk pass below.
-  git worktree list --porcelain 2>/dev/null \
-    | awk '/^worktree /{p=$2} /^branch /{b=$2; sub("refs/heads/","",b); if(p && b){print p" "b}; p=""; b=""}' \
-    | while read -r path branch; do
-        [ "$branch" = main ] && continue
-        # Rally-owned worktrees are NEVER touched by build-loop's GC.
-        # Primary guard: path-prefix exclusion (works without rally on PATH).
-        case "$path" in
-          */.rally/worktrees/*)
-            echo "  SKIP:rally-owned  $path  branch=$branch"
-            continue
-            ;;
-        esac
-        # Defense-in-depth: live rally session cwd cross-check.
-        if [ -n "$_rally_cwds" ]; then
-          _skip=0
-          while IFS= read -r _cwd; do
-            [ -z "$_cwd" ] && continue
-            if [ "$_cwd" = "$path" ]; then
-              _skip=1
-              break
-            fi
-          done <<EOF
-$_rally_cwds
-EOF
-          if [ "$_skip" = "1" ]; then
-            echo "  SKIP:rally-live-session  $path  branch=$branch"
-            continue
-          fi
-        fi
-        git merge-base --is-ancestor "$branch" main 2>/dev/null || continue
-        dirty=$(git -C "$path" status --porcelain 2>/dev/null | wc -l | tr -d ' ')
-        locked=unlocked
-        [ -f "$path/.git" ] && grep -q locked "$path/.git" 2>/dev/null && locked=locked
-        echo "  $path  branch=$branch  merged=yes  dirty=$dirty  $locked"
+REPORT=".build-loop/worktree-gc-last.txt"
+REPORT_DIR=".build-loop/worktree-gc"
+mkdir -p "$(dirname "$REPORT")" "$REPORT_DIR"
 
-        if [ "${BUILDLOOP_GC_ACT:-1}" = "1" ] && [ "$dirty" = "0" ] && [ "$locked" = "unlocked" ]; then
-          # Reversibility: one bundle per run, created before first removal.
-          if [ "$_bundle_done" = "0" ]; then
-            mkdir -p ".build-loop/bundles"
-            git bundle create ".build-loop/bundles/gc-$(date -u +%Y%m%dT%H%M%SZ).bundle" --all >/dev/null 2>&1
-            _bundle_done=1
-          fi
-          git worktree remove -f -f "$path" >/dev/null 2>&1
-          git branch -D "$branch" >/dev/null 2>&1
-          echo "  ACT:removed  $path  branch=$branch"
-        fi
-      done
+HOOK_DIR="$(cd "$(dirname "$0")" 2>/dev/null && pwd)"
+PLUGIN_ROOT="${CLAUDE_PLUGIN_ROOT:-$(cd "$HOOK_DIR/.." 2>/dev/null && pwd)}"
+REAPER="$PLUGIN_ROOT/scripts/worktree_reaper/__main__.py"
+_py=""
+if [ -f "$HOOK_DIR/_resolve_python.sh" ]; then
+    # shellcheck source=hooks/_resolve_python.sh
+    . "$HOOK_DIR/_resolve_python.sh"
+fi
 
-  printf '\n## Auto-prune (Git-proven orphans only)\n'
-  git worktree prune -v 2>/dev/null
-} > "$R" 2>&1
+stamp="$(date -u +%Y%m%dT%H%M%SZ)"
+tmp="${REPORT}.tmp.$$"
+json_tmp="${REPORT_DIR}/${stamp}-$$.json"
+err_tmp="${REPORT_DIR}/${stamp}-$$.stderr"
 
-# Rewrite report to split REPORT-ONLY from Auto-removed sections cleanly.
-if [ "${BUILDLOOP_GC_ACT:-1}" = "1" ] && grep -q 'ACT:removed' "$R" 2>/dev/null; then
-  tmp=$(mktemp)
-  awk '
-    /^## Stale candidates/ { in_stale=1 }
-    in_stale && /  ACT:removed / {
-      sub("  ACT:removed  ", "  ")
-      if (!printed_hdr) { removed=removed "\n## Auto-removed (merged, bundled)\n"; printed_hdr=1 }
-      removed=removed $0 "\n"
-      next
-    }
-    { print }
-    END { printf "%s", removed }
-  ' "$R" > "$tmp" && mv "$tmp" "$R"
+if [ -n "$_py" ] && [ -f "$REAPER" ]; then
+    "$_py" "$REAPER" --workdir "$PWD" --dry-run --json >"$json_tmp" 2>"$err_tmp"
+    rc=$?
+else
+    rc=127
+    : >"$json_tmp"
+    printf '%s\n' "worktree reporter unavailable (python or reaper missing)" >"$err_tmp"
 fi
 
+{
+    printf '# Worktree report — %s\n\n' "$(date -u +%FT%TZ)"
+    printf 'Mode: REPORT-ONLY (SessionStart never owns terminal release)\n'
+    if [ "${BUILDLOOP_GC_ACT:-0}" = "1" ]; then
+        printf 'Notice: BUILDLOOP_GC_ACT=1 ignored; use an explicit owner-released finalizer call.\n'
+    fi
+    printf 'Exit: %s\n\n' "$rc"
+    printf '## Summary\n\n'
+    cat "$err_tmp"
+    printf '\n## JSON\n\n```json\n'
+    cat "$json_tmp"
+    printf '\n```\n'
+} >"$tmp" 2>/dev/null
+
+mv "$tmp" "$REPORT" 2>/dev/null || true
+rm -f "$err_tmp"
 exit 0