fix(hooks): scope trunk protection to the project's own repository

block-push-to-main.sh blocked any push whose destination ref resolved to the
trunk, without first asking which repository the push targets. Trunk protection
exists to route changes to THIS project through a PR, but the guard fired on
pushes to unrelated repositories too, where there is no PR flow to route
through and nothing to protect.

The case that surfaced it: publishing a design doc to a GitLab project wiki. A
wiki lives in a separate `<project>.wiki.git` repository whose default — and
only — branch is `main`. Every wiki update tripped the guard, so wiki pages
could not be pushed at all. The same false positive hits a sibling checkout or
a vendored dependency that happens to sit on its trunk.

Resolve the target repository with the existing resolve_git_command_cwd helper
(it already understands `git -C <path> push` and `cd <path> && git push`), then
compare git-common-dir the way block-commit-outside-worktree.sh already does
and exit 0 when the push lands in a different repository. No new helper: this
reuses what lib.sh exports and mirrors the identity check the sibling guard was
already performing, so the two hooks now agree on what "this repo" means.

Comparing git-common-dir rather than git-dir keeps a linked worktree of this
project counted as this project, so the scoping cannot be used as an escape
hatch. Resolution uncertainty falls back to the inherited cwd, leaving an
unparsable command checked rather than waved through.

Extends tests/unit/test-block-push-regex.sh with 4 cases (2 reproducing the
false positive, 2 pinning the escape-hatch boundary):

  TC-BP-12  push another repo's main via `git -C`        -> allow
  TC-BP-13  push a `<project>.wiki.git` main via `cd &&` -> allow
  TC-BP-14  push this repo's main via `git -C <self>`    -> still block
  TC-BP-15  push this repo's main from a linked worktree -> still block

15/15 pass; the two new allow-cases fail on the unmodified hook (13 pass / 2
fail), and TC-BP-14/15 already passed before the change, confirming the scoping
narrows nothing it should still catch. Bare `git push` was verified separately
across all three shapes — same repo on a feature branch (allow), same repo on
trunk (block), and a different repo sitting on trunk (allow) — since
parse_push_target_refspec reads the current branch and only runs on the
same-repo path. test-block-commit-outside-worktree.sh,
test-install-git-pre-push.sh and test-chp-commit-file.sh still pass (they share
lib.sh); shellcheck -x is clean.

Author: IanLiYi1996

skills/autonomous-common/hooks/block-push-to-main.sh

@@ -22,6 +22,35 @@ if ! is_git_command "push" "$command"; then
   exit 0
 fi
 
+# Trunk protection guards THIS project's repository. Resolve the repository the
+# push actually targets (`git -C <path> push`, `cd <path> && git push`) and bow
+# out when it is a different one: a sibling checkout, a vendored dependency, or
+# a project's separate `<project>.wiki.git`. A wiki has no PR flow and `main` is
+# its only branch, so blocking it made wiki updates impossible rather than
+# routing them through review.
+#
+# Mirrors the identity check block-commit-outside-worktree.sh already performs.
+# Comparing git-common-dir (shared by a repo and all its linked worktrees) keeps
+# a worktree of this project counted as this project — the scoping must not
+# become an escape hatch (see TC-BP-14/15). Any resolution uncertainty falls
+# back to the inherited cwd, so an unparsable command is still checked.
+hook_common_dir=""
+if hook_common_dir=$(git rev-parse --path-format=absolute --git-common-dir 2>/dev/null); then
+  hook_common_dir=$(_canonical_existing_directory "$hook_common_dir") || hook_common_dir=""
+fi
+
+push_dir="$(pwd -P)"
+if resolved_dir=$(resolve_git_command_cwd "push" "$command" "$push_dir"); then
+  push_dir="$resolved_dir"
+fi
+
+if [[ -n "$hook_common_dir" ]] &&
+  target_common_dir=$(git -C "$push_dir" rev-parse --path-format=absolute --git-common-dir 2>/dev/null) &&
+  target_common_dir=$(_canonical_existing_directory "$target_common_dir") &&
+  [[ "$target_common_dir" != "$hook_common_dir" ]]; then
+  exit 0
+fi
+
 # Trunk branch name (issue #478, [INV-131]): BASE_BRANCH (the wrapper
 # resolves+exports it once at startup) → TRUNK_BRANCH (this hook's pre-#478
 # override, still honored standalone e.g. for a manually-run hook outside the

tests/unit/test-block-push-regex.sh

@@ -61,6 +61,30 @@ assert_exit() {
   fi
 }
 
+# Set up a SECOND, unrelated repo (with `main` checked out) to stand in for
+# another repository the agent legitimately pushes to — most importantly a
+# project's separate `<project>.wiki.git`, whose default and only branch is
+# `main` and which has no PR flow at all.
+setup_other_repo() {
+  local name="$1"
+  rm -rf "$TMPDIR/$name"
+  mkdir -p "$TMPDIR/$name"
+  git -C "$TMPDIR/$name" init --quiet --initial-branch=main
+  git -C "$TMPDIR/$name" -c user.email=test@test -c user.name=test commit \
+    --quiet --allow-empty -m init
+}
+
+# Run the hook with cwd = the project repo (what Claude Code actually passes)
+# while the command targets a different repo.
+run_hook_cwd() {
+  local cmd="$1" cwd="$2"
+  local input
+  input=$(printf '{"tool_input":{"command":%s},"cwd":%s}' \
+    "$(jq -Rn --arg c "$cmd" '$c')" "$(jq -Rn --arg d "$cwd" '$d')")
+  (cd "$cwd" && CLAUDE_PROJECT_DIR="$TMPDIR/repo" bash "$HOOK" <<<"$input")
+  echo $?
+}
+
 # ===========================================================================
 # TC-BP-01: Bare push from trunk → block
 # ===========================================================================
@@ -165,6 +189,59 @@ setup_repo main
 out=$(run_hook "git status")
 assert_exit "git status (not a push) allowed" "0" "$out"
 
+# ===========================================================================
+# TC-BP-12: push to ANOTHER repo's main via `git -C <other>` → allow
+# ===========================================================================
+# Trunk protection guards THIS project's repo. A push whose destination
+# repository is a different one is not this guard's business: the agent may
+# legitimately be publishing to a sibling checkout, a vendored dependency, or
+# a wiki. Blocking it is a pure false positive — there is no PR flow here to
+# route the change through.
+echo ""
+echo "=== TC-BP-12: push another repo's main via -C → allow ==="
+setup_repo main
+setup_other_repo other
+out=$(run_hook_cwd "git -C $TMPDIR/other push origin main" "$TMPDIR/repo")
+assert_exit "push to another repo's main via -C allowed" "0" "$out"
+
+# ===========================================================================
+# TC-BP-13: push to a .wiki.git clone's main via `cd && git push` → allow
+# ===========================================================================
+# The real-world shape that motivated this: publishing a design doc to a
+# GitLab project wiki. `<project>.wiki.git` is a separate repository whose
+# only branch is `main`, so the guard fired on every wiki update and the docs
+# could not be pushed at all.
+echo ""
+echo "=== TC-BP-13: push to <project>.wiki.git main via cd → allow ==="
+setup_repo main
+setup_other_repo project.wiki
+out=$(run_hook_cwd "cd $TMPDIR/project.wiki && git push origin main" "$TMPDIR/repo")
+assert_exit "push to <project>.wiki.git main allowed" "0" "$out"
+
+# ===========================================================================
+# TC-BP-14: push THIS repo's main via `git -C <self>` → still block
+# ===========================================================================
+# The scoping must not become an escape hatch: naming the project's own repo
+# explicitly still routes through trunk protection.
+echo ""
+echo "=== TC-BP-14: push own repo main via -C → still block ==="
+setup_repo main
+out=$(run_hook_cwd "git -C $TMPDIR/repo push origin main" "$TMPDIR/repo")
+assert_exit "push to own repo's main via -C still blocked" "2" "$out"
+
+# ===========================================================================
+# TC-BP-15: push main from a linked worktree of THIS repo → still block
+# ===========================================================================
+# A linked worktree shares its git-common-dir with the project repo, so it
+# must still count as "this repo" — otherwise every guard could be sidestepped
+# by committing from a worktree.
+echo ""
+echo "=== TC-BP-15: push own repo main from a linked worktree → still block ==="
+setup_repo main
+git -C "$TMPDIR/repo" worktree add --quiet -b feat/wt "$TMPDIR/wt" >/dev/null 2>&1
+out=$(run_hook_cwd "git push origin HEAD:refs/heads/main" "$TMPDIR/wt")
+assert_exit "push to own repo's main from linked worktree still blocked" "2" "$out"
+
 # ===========================================================================
 # Summary
 # ===========================================================================