Skip to content

fix: Claude WorktreeCreate hook read wrong stdin fields, breaking worktree bootstrap #769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theoephraim merged 1 commit into from
Jun 10, 2026
Merged

fix: Claude WorktreeCreate hook read wrong stdin fields, breaking worktree bootstrap #769

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions .claude/hooks/setup-worktree.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,27 @@ set -euo pipefail
# Everything except the final path is redirected to stderr to keep stdout clean.
# Mirrors .codex/scripts/setup-worktree.sh for parity with the Codex setup.
#
# stdin payload (observed from a real invocation, June 2026): session_id,
# transcript_path, cwd, hook_event_name, name. The docs call the name field
# `worktree_name`, so accept either. There is no path or base-commit field —
# the hook picks the worktree path and base itself.
#
# Requires: jq, bun (both expected on a varlock dev machine).

input="$(cat)"
worktree_path="$(jq -r '.worktree_path' <<<"$input")"
worktree_name="$(jq -r '.worktree_name' <<<"$input")"
base_commit="$(jq -r '.base_commit' <<<"$input")"

worktree_name="$(jq -r '.name // .worktree_name // empty' <<<"$input")"
if [ -z "$worktree_name" ]; then
worktree_name="wt-$(jq -r '.session_id // empty' <<<"$input" | cut -c1-8)"
fi

repo_root="${CLAUDE_PROJECT_DIR:-$(git rev-parse --show-toplevel)}"
worktree_path="$repo_root/.claude/worktrees/$worktree_name"

# Create the worktree on a new branch, mirroring Claude's `claude/<name>` convention.
# Fall back to a detached worktree if the branch already exists.
git worktree add -b "claude/$worktree_name" "$worktree_path" "$base_commit" 1>&2 \
|| git worktree add --detach "$worktree_path" "$base_commit" 1>&2
git -C "$repo_root" worktree add -b "claude/$worktree_name" "$worktree_path" HEAD 1>&2 \
|| git -C "$repo_root" worktree add --detach "$worktree_path" HEAD 1>&2

# Project setup inside the new worktree (same as .codex/scripts/setup-worktree.sh).
(
Expand Down