Branching Reference

Branch Types

Type Base Target Purpose
cycle/p<phase>-c<cycle><agent>-<slug> dev dev TDD work
fix/<description> dev dev Bug fixes
chore/<description> dev dev Maintenance
hotfix/<description> main main Emergency fixes

Flow

1

cycle/fix/chore → dev → stage → main → tag

Cycle Naming

1
2
3
4
5

cycle/p<phase>-c<cycle><agent>-<slug>
       │       │      │       └─ kebab-case description
       │       │      └─ agent id (A=wave1, AA=wave2, AAA=wave3)
       │       └─ cycle number
       └─ phase number

Wave = length of agent id:

Just Commands

1
2
3
4
5
6
7
8
9
10
11
12
13
14

# Start a cycle
just cycle-start <phase> <cycle> <agent> <slug>
# Example: just cycle-start 1 1 A happy-path

# Create worktree for parallel work
just cycle-worktree <phase> <cycle> <agent> <slug>

# Promotions
just promote-stage    # dev → stage
just promote-main     # stage → main
just release <ver>    # tag vX.Y.Z

# After hotfix
just hotfix-forward   # main → dev, main → stage

Hotfix Flow

1
2
3
4
5

hotfix/... → main → release tag
                  ↓
           just hotfix-forward
                  ↓
         dev + stage updated