worktree-fleet
Add the Claude Code plugin. Open Claude in a repo. Work normally.
worktree-fleet keeps parallel Claude sessions in sibling Git worktrees aware of each other. When one worktree advances your integration branch, the others see it, catch up when safe, or get a clear blocked message when a human decision is needed.
No central service. No hidden branches. No git stash. No stale-main drift quietly piling up behind your back.
Install For Claude
In Claude Code:
/plugin marketplace add mgdickinson/worktree-fleet
/plugin install worktree-fleet@worktree-fleet
That's it.
Now open Claude in any Git repo. On session start, the plugin initializes fleet state for that repo, installs safe Git hook blocks, registers the Claude session, and starts a small local monitor.
From then on, Claude has fleet awareness while it works.
If Claude tries to manually git pull, git merge main, or git rebase main, the plugin redirects it back through worktree-fleet sync so fleet can do the safety check first.
If Claude tries to mutate worktrees with raw Git, the plugin makes it check the fleet board first.
What You Get
- Active Claude sessions across sibling worktrees
- Changed files, host-observed tool paths, and optional planned intent
- Pending integration-branch updates
- Safe automatic catch-up when possible
- Clear blocked states when sync would be risky
- A live observer with
worktree-fleet observe
- Local activity logs so you can see what happened later
Most days, you do not need to touch the CLI. The plugin is the point.
The Nice Button
When you want to see whether fleet is actually working:
worktree-fleet observe
It opens a local dashboard with working status, agent heartbeat health, process liveness, safety hook status, pending catch-ups, sync blocks, divergent main targets, path contention, recent main events, and the local activity feed.
When you want the terminal version:
worktree-fleet watch
It shows sessions, worktrees, changed files, observed tool paths, optional planned intent, pending updates, blocked reasons, divergent targets, and recent activity in a compact terminal frame. Use worktree-fleet watch --web to launch the local observer from the watch command.
When you want a one-shot health check:
worktree-fleet status --refresh-current
When you want to force the current worktree to catch up:
worktree-fleet sync
When a feature worktree is ready to land onto local main:
worktree-fleet land
land syncs first, requires clean current and integration worktrees, fast-forwards the local integration branch, and records the main-advance event for sibling sessions.
When you want the local audit trail, including Claude monitor starts, stops, and sidecar errors:
worktree-fleet activity --all --limit 50
Why This Exists
Claude is great at running multiple focused worktree sessions. Git is great at letting those worktrees drift apart while nobody notices.
worktree-fleet closes that gap. It records exact main-advance SHAs locally, watches active sessions, and only integrates when the current worktree is safe to touch. If there are staged changes, dirty overlap, an active merge/rebase, a missing commit object, or divergent main targets, it stops and tells you why.
What Gets Installed
State lives under:
~/.worktree-fleet/
├── activity/
├── adapters/
├── bus/main-events/
├── intents/
├── repos/
└── sessions/
The Claude plugin installs managed blocks into the repo's Git hooks. Existing hook content is preserved. Hook failures are logged and do not block normal Git commands.
Claude monitor and sidecar diagnostics are recorded in ~/.worktree-fleet/activity/*.jsonl as sidecar-started, sidecar-error, and sidecar-stopped events.
Remove fleet-managed hooks and local adapter registration with:
worktree-fleet uninstall
Codex And Other CLIs
Claude gets the native plugin path. Codex has two pieces:
- the Codex plugin, which gives Codex the fleet-aware skills
- a repo
AGENTS.md block, which tells native Codex sessions to use fleet before worktree, sync, and land operations
- the
fleet codex wrapper, which gives CLI Codex heartbeat/session sidecar behavior
For native Codex, install the package once and stamp the current repo:
npm install -g @mgdickinson/worktree-fleet
cd /path/to/repo
worktree-fleet setup --adapter codex
worktree-fleet setup --adapter codex writes a managed block into the repo's AGENTS.md. That gives Codex native app sessions repo-level instructions to check the fleet board before worktree operations, use worktree-fleet sync for catch-up, and use worktree-fleet land for merging completed work back to local main. Existing AGENTS.md content is preserved; worktree-fleet adapter uninstall codex removes only the managed block.
Install the Codex plugin marketplace:
