Anyone else frustrated that claude -w branches from origin/main instead of HEAD? ( #27134 ) I was on a feature branch, hit claude -w , and the worktree started from main. So I just built a plugin to fix it. worktree-plus hooks into WorktreeCreate/WorktreeRemove and makes it work like real git worktree : Branches from HEAD , not origin/main Real branch resolution — reuses local branch if it exists, tracks remote if available, otherwise creates new from HEAD worktree.guessRemote support (auto-tracks origin/<branch> ) Custom branch prefix — set WORKTREE_BRANCH_PREFIX to use feat- , fix- , or no prefix instead of worktree- .worktreelink file — symlink heavy or globally managed directories instead of copying ( docs/ , datasets, etc.) Dirty worktrees are preserved on cleanup, not nuked Install claude marketplace add https://github.com/LeeJuOh/claude-code-zero claude plugin add worktree-plus@claude-code-zero Usage Just use claude -w as usual. The hooks take care of everything. https://github.com/LeeJuOh/claude-code-zero — would love feedback ``` submitted by /u/AdPast8543
Originally posted by u/AdPast8543 on r/ClaudeCode
You must log in or # to comment.