Worktrees

Ocho can assign an independent Git worktree to each agent. This way, multiple agents can work in the same repository at the same time without changing each other's files.

Start a Session in a Worktree

When starting a session, add the --worktree option and a name:

ocho new studio --provider claude --cwd ~/app --worktree search-fix

If you want to start from another commit, use --ref. If you want to name the branch, use --branch. If you want to fetch the latest changes first, use --fetch.

Manage Worktrees

ocho worktree list
ocho worktree remove PATH
ocho worktree restore CHECKPOINT

When a worktree is removed, your work will not be lost. After running ocho worktree remove, uncommitted changes are saved, and you will see a checkpoint. To retrieve this work, run ocho worktree restore CHECKPOINT.

For example, to remove the search-fix worktree and bring it back later:

$ ocho worktree remove ~/.local/share/fleet/worktrees/app-4adea9e8/search-fix
{
  "path": "/Users/you/.local/share/fleet/worktrees/app-4adea9e8/search-fix",
  "checkpoint": "refs/fleet/worktrees/search-fix-20261103T231358.027Z",
  "branch": "worktree-search-fix",
  "branch_deleted": true
}

$ ocho worktree restore refs/fleet/worktrees/search-fix-20261103T231358.027Z --repo ~/app --name search-fix
/Users/you/.local/share/fleet/worktrees/app-4adea9e8/search-fix