Part of Forge DevKit ecosystem
◇ forge-autopilot
Agent Teams without merge hell
The problem
Agent Teams = merge conflict chaos
"I literally can't merge their branches." Multiple agents editing the same files without coordination.
No conflict detection before execution
You discover file conflicts AFTER agents finish. Hours of work wasted on irreconcilable changes.
Autonomous agents with no strategy
Agent Teams is infrastructure. Without a strategy layer, agents work fast but break things faster.
forge-autopilot adds a strategy layer on top of Agent Teams: triage, conflict detection, and wave planning. Source: Claude Code docs
How it works
Triage
Backlog analyst classifies features by complexity, risk, and design needs. File dependency mapping.
Detect conflicts
Conflict detector identifies shared files between features. Classifies as SAFE, RISKY, or BLOCKING.
Plan waves
Groups conflict-free features into parallel waves. BLOCKING conflicts force sequential execution.
Execute
Teammates execute in isolated worktrees. Tech lead reviews. Auto-merge with conflict prevention.
Key capabilities
◇Conflict-free wave planning
Backlog→conflict detection→wave grouping→parallel execution. No merge conflicts by design.
◇3 autonomy modes
Supervised (review each), semi-auto (review at checkpoints), full-auto (review at end).
◇Isolated worktrees
Each teammate works in a separate git worktree. No file interference. Clean merges.
◇Cross-repo triage
Features spanning multiple repos are detected and handled in triage phase.
◇Batch reporting
Summary report after each wave: decisions, conflicts resolved, files touched, test results.
Sample output
A real-world example of what this module produces.
◆ Wave 1 - Execution Plan
Teammate Task Worktree Files
agent-1 TF-142 SSO login flow wt/feat-sso 4
agent-2 TF-143 Cart rounding wt/fix-cart 2
agent-3 TF-145 Rate limiting wt/feat-ratelimit 3
Conflict check: 0 file overlaps detected
Autonomy: semi-auto (pause on merge conflicts)
Est. duration: ~12 minWho is this for
Tech Lead
Run parallel feature development with conflict-free wave planning - no merge hell.
CTO
Multiply team throughput by letting AI agents batch-execute your backlog safely.
Senior Developer
Delegate batch work to autonomous teammates while you focus on architecture decisions.
forge-autopilot vs Raw Claude Agent Teams
| Dimension | Raw Claude Agent Teams | Forge DevKit |
|---|---|---|
| What it is | Infrastructure for spawning agents | Strategy layer: triage → conflict detection → wave planning |
| Conflict handling | None - discover conflicts after | Pre-execution conflict detection and wave grouping |
| Autonomy control | All or nothing | 3 modes: supervised, semi-auto, full-auto |