// worktrees

Every agent gets its own branch.

Each agent works in a dedicated git worktree on its own branch. They cannot see each other's files and cannot block each other — so parallel work produces zero merge conflicts by construction.

§ 01

One worktree per agent

When the Supervisor spawns an agent, it creates a fresh git worktree on a new branch — zevyn/<role>/<id>. The agent gets a complete, independent checkout of your repo to work in.

worktree
main
├ builder/oauth-7c5c running
├ builder/session-3d2a running
└ scout/routes-9f8b idle

Same repo, separate filesystems. What one agent edits, the others never see until it merges.

§ 02

Conflict-free by construction

Merge conflicts happen when two changes touch the same lines without knowing about each other. Zevyn removes the precondition: agents are isolated, and the Supervisor merges them one at a time, in dependency order.

  • No shared working directory — no half-written files.
  • No git lock contention between parallel agents.
  • Each branch merges against an up-to-date main.
Note

When a branch merges cleanly, its worktree is removed automatically. Discarded branches are cleaned up too.

§ 03

Review on your terms

Every worktree is a normal git branch. Inspect the diff against main, run it, and merge or discard — one decision at a time. Agents only land what you say lands.

// related

Stop supervising one agent.

Zevyn Studio is launching soon. Join the waitlist and start directing a team.