git-wt

git worktree add that never nests a worktree inside a checkout.

A worktree created inside a repository (<repo>/wt/x, <repo>/.claude/worktrees/x) sits under the outer checkout's package.json, node_modules, and tool configs. Anything that walks up the tree (Node module resolution, workspace detection, ESLint/TypeScript config lookup) sees the outer repo, and tools run in the outer repo scan the worktree as source. git wt add moves such paths to $GIT_WT_HOME/<repo>-<hash>/<path>; paths already outside every checkout pass through unchanged.

Install

brew install tgrnd/tap/git-wt

Or copy git-wt anywhere on your PATH; git runs git-<name> executables as git <name>.

Usage

git wt add [<git worktree add options>] <path> [<commit-ish>]
git wt path <path>    # print where <path> would be created

Variable	Default	Meaning
GIT_WT_HOME	~/.claude/.worktrees	Base folder for remapped worktrees
GIT_WT_REMAP	1	0 passes every path through as given

Claude Code plugin

This repo is also a Claude Code plugin, installed separately from the command:

claude plugin marketplace add tgrnd/tgulls-grounded-plugins
claude plugin install git-wt@tgulls-grounded-plugins

Inside a session: /plugin marketplace add tgrnd/tgulls-grounded-plugins, then /plugin install git-wt@tgulls-grounded-plugins. To try it from a checkout instead: claude --plugin-dir <path to this repo>. The hooks need jq.

Worktrees Claude Code creates (claude --worktree, subagent worktrees). The WorktreeCreate and WorktreeRemove hooks replace Claude Code's built-in creation, which always nests worktrees under <repo>/.claude/worktrees/. The create hook keeps Claude Code's naming (worktree-<slug> branches), rebuilds worktree.baseRef (GIT_WT_BASE_REF=fresh|head) and copies .worktreeinclude files. It uses the git-wt shipped with the plugin, so these work without the Homebrew install. The remove hook keeps the branch and refuses worktrees with uncommitted changes. Claude Code's cleanup of stale worktrees only looks in .claude/worktrees, so remove relocated ones with git worktree remove / git worktree prune.

If you added these hooks to settings.json by hand before, remove them: Claude Code runs every configured WorktreeCreate hook and doesn't document which path wins.

Worktrees Claude adds by hand. A PreToolUse hook rewrites git [options] worktree add … in Bash tool calls to git [options] wt add … with the same arguments.

• git-wt must be on PATH for this one (e.g. via Homebrew), because the rewritten command runs in Claude's shell. Without it the command is left as is and Claude Code shows a message saying why.
• The rewritten command always asks for approval: Claude Code documents rewritten input only with allow (which would bypass your permission rules) or ask.
• The hook runs on every Bash command but changes only git [options] worktree add; other worktree subcommands, git wt, and look-alikes (git worktrees, echo worktree add) pass through untouched (test.sh covers each).
• Matching is textual: git must start the command or follow whitespace or ; & | ( {, and only git options (-C <dir>, -c <k=v>, --git-dir <dir>, -p, --long[=value]…), whitespace and \ line continuations may sit between git, worktree and add. So quoted text such as echo "x; git worktree add a" is rewritten too.
• GIT_WT_REMAP=0 in Claude Code's environment turns the rewrite off.

Tests

sh test.sh