Hooks can't find attestation in git worktrees (hardcoded relative .git/lrc path)

[leaft]

Summary

The lrc-managed git hooks fail to locate an existing attestation when committing inside a linked git worktree (git worktree add). Even after a successful lrc review / lrc review --vouch / lrc review --skip, the commit is rejected with:

LiveReview: review attestation missing for staged changes. Run 'lrc review --staged' (or --skip/--vouch) and retry commit.

lrc_version: v0.3.9 (from the managed hook section header).

Root cause

The hooks locate the attestation using a hardcoded relative path .git/lrc/.... In a linked worktree, .git is not a directory — it is a pointer file whose contents are gitdir: /path/to/main/.git/worktrees/<name>. So .git/lrc/attestations/<tree>.json never resolves, and the [ -f "$ATTEST_FILE" ] test always fails.

Meanwhile lrc review writes the attestation to the per-worktree git dir, i.e. <main>/.git/worktrees/<name>/lrc/attestations/<tree>.json — which is exactly where git rev-parse --git-dir points from inside the worktree. So the file is written to one location and looked up in another.

Notably, the hooks already compute the correct dir but don't use it. In lrc/prepare-commit-msg and lrc/commit-msg:

LRC_DIR=".git/lrc"                 # <-- hardcoded, breaks in worktrees
ATTEST_DIR="$LRC_DIR/attestations"
...
GIT_DIR="$(git rev-parse --git-dir 2>/dev/null || echo .git)"   # computed but never used for ATTEST_DIR
...
TREE_HASH="$(git write-tree 2>/dev/null || true)"
ATTEST_FILE="$ATTEST_DIR/$TREE_HASH.json"

And in lrc/pre-commit:

TREE_HASH="$(git write-tree 2>/dev/null || true)"
ATTEST_FILE=".git/lrc/attestations/$TREE_HASH.json"   # <-- same hardcoded .git

All three hooks (pre-commit, prepare-commit-msg, commit-msg) share this bug.

Reproduction

# main repo
git init main && cd main
echo a > a.txt && git add a.txt
lrc review --skip          # writes attestation, commit works here
git commit -m "init"

# linked worktree on a new branch
git worktree add ../wt -b feature
cd ../wt
echo b > b.txt && git add b.txt
lrc review --skip          # reports success; attestation written to
                           #   <main>/.git/worktrees/wt/lrc/attestations/<tree>.json
git commit -m "change"     # FAILS: "review attestation missing for staged changes"

You can confirm the attestation exists and matches the staged tree:

git write-tree
# -> <tree-hash>   (matches the .json filename under the per-worktree git dir)
cat "$(git rev-parse --git-dir)/lrc/attestations/<tree-hash>.json"
# -> {"action":"vouched",...}   (present and correct)

Expected

Inside a linked worktree, a valid attestation produced by lrc review for the current staged tree should let the commit proceed, exactly as in a normal (non-worktree) checkout.

Actual

The commit is rejected because the hooks look under the literal .git/lrc/... relative path, which is invalid in a worktree (.git is a file, not a directory).

Suggested fix

Derive the lrc dir from git instead of hardcoding .git. The hooks already compute GIT_DIR; just use it:

GIT_DIR="$(git rev-parse --git-dir 2>/dev/null || echo .git)"
LRC_DIR="$GIT_DIR/lrc"
ATTEST_DIR="$LRC_DIR/attestations"

(git rev-parse --git-dir returns the per-worktree git dir, matching where the CLI writes the attestation. If attestations are intended to be shared across worktrees, --git-common-dir would be the alternative — but the CLI currently writes to the per-worktree dir, so --git-dir keeps hook and CLI consistent.) The same substitution is needed in pre-commit (which inlines the literal .git/lrc/attestations/...).

The .git/lrc/disabled check at the top of the hooks has the same hardcoded-path issue and should use $GIT_DIR/lrc/disabled too — otherwise the hook cannot be disabled from within a worktree either.

Workaround note

git commit --no-verify does not help, because the attestation check also runs in prepare-commit-msg, which git does not skip with --no-verify (it only skips pre-commit and commit-msg). A one-shot git -c core.hooksPath=<empty-dir> commit ... after a genuine lrc review/--vouch is the only clean bypass until this is fixed.

Environment

• OS: macOS
• git: 2.50.1
• git-lrc: v0.3.9

[shrsv]

Thank you for the detailed report plus suggested fix @leaft, appreciate it!

We will release a fix today.

[shrsv]

Hi, I've put in a fix to this worktree issue in the latest release

You can get it with lrc self-update or by reinstalling with the instructions in README.

Thank you. Let me know if I missed any nuances, since I'm not a big worktree user myself.

And again, appreciate the report!

[leaft]

Thanks @shrsv — v0.3.11's git-hook fix works ✅ But after lrc self-update to v0.4.0 I just hit a closely-related bug on the Claude harness surface (lrc hooks install --surface claude). Same class of issue (worktree attestation lookup goes to the wrong location), different code path — reporting here rather than opening a new issue, but happy to split it if you'd prefer.

Reproduction

# Main checkout: this is where Claude Code session was started,
# so $CLAUDE_PROJECT_DIR = /path/to/main
cd /path/to/main

# Inside the Claude shell (or any process inheriting that CLAUDE_PROJECT_DIR):
git worktree add ../wt -b feature
cd ../wt
echo b > b.txt && git add b.txt
git commit -m "change"

The Claude PreToolUse gate rejects the commit:

LiveReview: checking whether the current staged tree already has a valid review.
LiveReview: if not, a blocking browser review will open before git commit can continue.
Error: no diff content collected
LiveReview: blocking review exited with code 1 before git commit could continue

If I run lrc review --staged --vouch in the worktree first, it succeeds and writes the attestation to <main>/.git/worktrees/wt/lrc/attestations/<tree>.json (v0.3.11 fix is working — confirmed). But the Claude wrapper still rejects the subsequent git commit with the same "no diff content collected".

Root cause

~/.lrc/claude/hooks/run-blocking-review-git-commit.sh cds into $LRC_CLAUDE_PROJECT_DIR (= the Claude session's $CLAUDE_PROJECT_DIR, which is the main checkout) before running lrc review --staged, the disable-marker check, and the final exec ... git commit:

project_dir="${LRC_CLAUDE_PROJECT_DIR:-$PWD}"
...
cd "$project_dir"            # ← jumps from the worktree to the main checkout

git_dir="$(git rev-parse --git-dir 2>/dev/null || echo .git)"
disabled_claude_file="$git_dir/lrc/disabled-claude"

if [[ -f "$disabled_claude_file" ]]; then
  exec bash -c "$original_command"     # exec'd in MAIN, not worktree
fi

lrc review --staged --blocking-review ...     # MAIN's staged tree (empty)
exec env LRC_CLAUDE_REVIEW_HANDLED=1 bash -c "$original_command"  # commit in MAIN

Three things misfire as a result:

1. lrc review --staged looks at the main repo's staged tree (empty if all work is in the worktree) → "no diff content collected", regardless of any attestation already present in the worktree's git-dir.
2. The disabled-claude marker is looked up under main's git-dir, so lrc hooks disable --surface claude run inside the worktree has no effect; the only way to bypass the gate is to write the marker on the main repo.
3. Even if step 1 somehow passed, the final exec ... git commit would run in the main checkout — committing the wrong tree (in my test: → No staged files found followed by main's branch banner).

Suggested fix

run-blocking-review-git-commit.sh should run the review + final git commit in the directory where the user actually issued git commit, not in $CLAUDE_PROJECT_DIR. The Claude PreToolUse payload (the JSON piped into the outer wrapper) includes the calling tool's cwd; threading it through as e.g. LRC_CLAUDE_INVOCATION_CWD and cd-ing there at the top of run-blocking-review-git-commit.sh would fix all three failures in one shot.

If preserving the $CLAUDE_PROJECT_DIR cd is desirable for some reason I'm not aware of, a more conservative variant: detect when the invocation cwd is a linked worktree path that resolves into $CLAUDE_PROJECT_DIR/.git/worktrees/* and prefer the invocation cwd only in that case.

Happy to test a patch when you have one. Thanks again for the quick turnaround on v0.3.11!

[shrsv]

Got it - I think I slipped up somewhere in the process yesterday, will check it out and put a fix. Sorry about that.

[shrsv]

Hi @leaft - pls check the latest release - https://github.com/HexmosTech/git-lrc/releases/tag/v0.4.1

Should be fixed now. The directory is set to cwd now, and from there the usual git-rev-parse, etc is done.

I'm also building up testing infra, etc to catch regressions better (already a basic suite in place).

Thanks for helping make git-lrc more reliable.