timothyandClaude Opus 4.8
35e41fdaad
Build ErsatzTV Image / Docs update reminder (push) Has been skipped
Build ErsatzTV Image / Build & test (.NET) (push) Successful in 8m1s
Build ErsatzTV Image / EF migration integrity (SQLite + MySql) (push) Successful in 10m13s
Build ErsatzTV Image / Build & push image (amd64) (push) Has been cancelled
Wave 2 hook H7: never commit/merge inside a sibling worktree another session created (burned us on #289 path-leak + the plumbing-merge workaround). Ownership = a per-session .claude-worktree-owner marker: - posttooluse-worktree-marker.sh stamps a worktree with session_id on `git worktree add` (parses the <path> arg past -b/-B/--reason flags). - pretooluse-worktree-guard.sh denies `git commit`/`git merge` whose effective dir (resolves `git -C <p>` and leading `cd <p> &&`) is a worktree whose marker names a DIFFERENT session. Fail-open: no marker, unparsable, or own session -> allow. Main tree + pre-convention worktrees are never marked, so unaffected. Also completes Wave 1's rollout, which committed pretooluse-bash-guard.sh but left .claude/settings.json and the agent-ram/nav-guard hooks untracked (so nothing was actually wired). Adds the settings.json that registers all five hooks (PreToolUse Bash x2, nav, Agent; PostToolUse Bash) + the .gitignore worktree-marker line, screenshot-scratch rules, and the decisions.md TOC left uncommitted last session. All hooks pipe-tested (7 guard cases + 6 marker cases). Refs #303. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
46 lines
2.7 KiB
Bash
Executable File
46 lines
2.7 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# PreToolUse / Bash — deny `git commit`/`git merge` inside a sibling worktree that
|
|
# a DIFFERENT session created (burned us twice — #289 path-leak, the plumbing-merge
|
|
# workaround exists precisely because of this). Ownership is a `.claude-worktree-owner`
|
|
# marker (session id) written at `git worktree add` time by posttooluse-worktree-marker.sh.
|
|
#
|
|
# Fail-open by design: no marker, unparsable input, or marker == this session → allow.
|
|
# So the main tree (never marked) and pre-convention worktrees (no marker) are unaffected;
|
|
# only a commit/merge into another session's marked worktree is blocked.
|
|
set -euo pipefail
|
|
input=$(cat)
|
|
cmd=$(printf '%s' "$input" | jq -r '.tool_input.command // ""' 2>/dev/null || true)
|
|
cwd=$(printf '%s' "$input" | jq -r '.cwd // ""' 2>/dev/null || true)
|
|
me=$(printf '%s' "$input" | jq -r '.session_id // ""' 2>/dev/null || true)
|
|
|
|
# Only guard the state-mutating ops. Match `git commit`/`git merge` in command position
|
|
# (line start or after a shell separator) so a quoted mention never false-trips.
|
|
printf '%s' "$cmd" | grep -qE '(^|[;&|(]|&&|\|\|)[[:space:]]*git[[:space:]]+(-C[[:space:]]+[^[:space:]]+[[:space:]]+)?(commit|merge)\b' || exit 0
|
|
|
|
[ -z "$cwd" ] && cwd="$PWD"
|
|
|
|
# Determine the effective directory the git op runs in. Two common redirections in the
|
|
# lore's usage move it off the session cwd: `git -C <path>` and a leading `cd <path> &&`.
|
|
effdir="$cwd"
|
|
cpath=$(printf '%s' "$cmd" | grep -oE 'git[[:space:]]+-C[[:space:]]+[^[:space:]&|;]+' | head -1 | sed -E 's/^git[[:space:]]+-C[[:space:]]+//' | tr -d '"'"'"'' || true)
|
|
cdpath=$(printf '%s' "$cmd" | grep -oE '^[[:space:]]*cd[[:space:]]+[^[:space:]&|;]+' | head -1 | sed -E 's/^[[:space:]]*cd[[:space:]]+//' | tr -d '"'"'"'' || true)
|
|
if [ -n "${cpath:-}" ]; then
|
|
effdir="$cpath"
|
|
elif [ -n "${cdpath:-}" ]; then
|
|
effdir="$cdpath"
|
|
fi
|
|
# Resolve a relative effective dir against the session cwd.
|
|
case "$effdir" in /*) : ;; *) effdir="$cwd/$effdir" ;; esac
|
|
|
|
root=$(git -C "$effdir" rev-parse --show-toplevel 2>/dev/null || true)
|
|
[ -z "$root" ] && exit 0
|
|
marker="$root/.claude-worktree-owner"
|
|
[ -f "$marker" ] || exit 0
|
|
owner=$(tr -d '[:space:]' < "$marker" 2>/dev/null || true)
|
|
[ -z "$owner" ] && exit 0
|
|
[ "$owner" = "$me" ] && exit 0
|
|
|
|
# Marker names a DIFFERENT session → deny.
|
|
jq -n --arg o "$owner" --arg r "$root" '{hookSpecificOutput:{hookEventName:"PreToolUse",permissionDecision:"deny",permissionDecisionReason:("Blocked: worktree \($r) is owned by session \($o), not this one. Never commit/merge inside a sibling worktree another session created (#289 path-leak, plumbing-merge workaround). Commit from your own tree; if you genuinely own this worktree now, overwrite its .claude-worktree-owner marker with your session id.")}}'
|
|
exit 0
|