Thomas Tiotto contributor

Claude Worktree Toolkit

Install when you juggle multiple PRs or branches in Claude Code and need git worktrees with hooks that actually move the session directory.

Overview

claude-worktree-toolkit is a plugin marketplace for the Build phase that adds Graphite-aware git worktree commands and hooks so Claude Code sessions follow the active branch.

What is this marketplace?

  • worktree-toolkit plugin: create worktrees from PR numbers or branch names with a live picker
  • /worktree and /unworktree commands plus WorktreeCreate/WorktreeRemove hooks
  • Session project directory follows the worktree via EnterWorktree/ExitWorktree tooling
  • Reclaim worktree branches back into main and auto-copy gitignored dev files
  • Graphite-aware workflow for parallel branch work in Claude Code
  • 1 plugin (worktree-toolkit)
  • Marketplace version 1.0.0
  • Owner: Thomas Tiotto

Compatible agents: Claude Code, any compatible agent

What problem does it solve?

Switching branches or PRs in Claude Code is painful when worktrees exist but the agent session stays rooted in the wrong directory.

Who is it for?

Solo builders using Claude Code with multiple concurrent PRs, Graphite stacks, or parallel feature branches.

Skip if: Builders on a single-branch hobby repo who never use worktrees or Claude Code slash commands.

What do I get? / Deliverables

After install, /worktree and bundled hooks move your Claude Code session into the right worktree with dev files copied and branches easy to reclaim.

  • worktree-toolkit plugin with /worktree and /unworktree commands
  • Hooks that sync session cwd with EnterWorktree/ExitWorktree
  • Faster context switches between PRs without broken agent paths

Plugins in this marketplace

1 plugin — install individually after you add the marketplace.

Recommended Marketplaces

Journey fit

Worktree switching is a day-to-day development integration problem while you are actively building and reviewing branches. The toolkit wires git worktrees, Graphite-aware flows, and native EnterWorktree/ExitWorktree hooks—classic repo integration work.

How it compares

Git worktree integration for Claude Code, not a testing or deployment marketplace.

Common Questions / FAQ

Who is Claude Worktree Toolkit for?

Claude Code users who manage several branches or PRs and want worktrees without manual directory juggling.

When should I use Claude Worktree Toolkit?

Use it whenever you start or switch work on a PR or branch and need the Claude session directory to follow the worktree automatically.

How do I add Claude Worktree Toolkit to my agent?

Register the thomast8/Claude Worktree Toolkit marketplace in Claude Code, enable worktree-toolkit from ./plugins/worktree-toolkit, then use /worktree and /unworktree in session.

This week for builders

Five minutes, every Monday — the tools, releases and tactics for shipping solo.

unsubscribe anytime.