Eden Academy Git Worktree Setup for Parallel Agent Development
šÆ Overview
This setup enables 6 specialized Claude Coding Agents to work simultaneously on different Eden Academy features without conflicts.
š Recommended Directory Structure
``
/Users/seth/
āāā eden-academy/ # Main repository (main branch)
āāā eden-worktrees/ # Worktree container directory
ā āāā arch/ # ARCH - Architecture Guardian worktree
ā āāā truth/ # TRUTH - Registry Data Guardian worktree
ā āāā lore/ # LORE - Narrative & Culture worktree
ā āāā helvetica/ # HELVETICA - Visual Design worktree
ā āāā token/ # TOKEN - Economics worktree
ā āāā launcher/ # LAUNCHER - Agent Quality worktree
`
š Initial Setup Commands
1. Create Worktree Container Directory
`
bash
mkdir -p /Users/seth/eden-worktrees
`
2. Create Feature Branches and Worktrees
#### ARCH - System Architecture & ADRs
`
bash
git worktree add -b feature/architecture /Users/seth/eden-worktrees/arch
`
#### TRUTH - Data Integrity & Registry
`
bash
git worktree add -b feature/data-integrity /Users/seth/eden-worktrees/truth
`
#### LORE - Narrative & Cultural Mission
`
bash
git worktree add -b feature/narrative /Users/seth/eden-worktrees/lore
`
#### HELVETICA - Visual Design & Brand
`
bash
git worktree add -b feature/visual-design /Users/seth/eden-worktrees/helvetica
`
#### TOKEN - Economics & Metrics
`
bash
git worktree add -b feature/economics /Users/seth/eden-worktrees/token
`
#### LAUNCHER - Agent Quality & Onboarding
`
bash
git worktree add -b feature/agent-quality /Users/seth/eden-worktrees/launcher
`
š Agent-to-Worktree Mapping
| Claude Agent | Worktree | Branch | Primary Focus |
| ARCH | /arch | feature/architecture | System coherence, ADRs, API contracts |
| TRUTH | /truth | feature/data-integrity | Single source of truth, data models |
| LORE | /lore | feature/narrative | Cultural mission, language consistency |
| HELVETICA | /helvetica | feature/visual-design | Brand excellence, UI/UX standards |
| TOKEN | /token | feature/economics | Economic models, pricing, metrics |
| LAUNCHER | /launcher | feature/agent-quality | Launch criteria, quality gates |
š Development Workflow
1. Starting Work in a Worktree
`
bash
Navigate to agent's worktree
cd /Users/seth/eden-worktrees/
Pull latest from main
git pull origin main
Start development server (if needed)
npm run dev
`
2. Making Changes
Each agent works independently in their worktree:
`
bash
Make changes
Test locally
Commit frequently with descriptive messages
git add .
git commit -m "feat(agent-name): Description of change"
`
3. Syncing with Main
`
bash
Fetch latest changes
git fetch origin main
Rebase on main to keep history clean
git rebase origin/main
Push to remote
git push origin feature/
`
4. Integration Pattern
`
bash
In main repository
cd /Users/seth/eden-academy
Update main
git pull origin main
Merge feature branch
git merge --no-ff feature/
Or create PR for review
gh pr create --base main --head feature/
`
š Merge Strategy
Priority Order for Merging
TRUTH - Data model changes (foundation)
ARCH - System design changes
TOKEN - Economic model updates
LORE - Content and cultural updates
HELVETICA - UI/UX improvements
LAUNCHER - Agent quality features
Conflict Resolution
ā¢ Each worktree maintains independence
ā¢ Rebase frequently on main
ā¢ Coordinate through PR reviews
ā¢ Use Code Reviewer worktree for conflict resolution
š ļø Utility Commands
List All Worktrees
`
bash
git worktree list
`
Remove a Worktree
`
bash
git worktree remove /Users/seth/eden-worktrees/
`
Clean Up Stale Worktrees
`
bash
git worktree prune
`
Switch Between Worktrees
`
bash
Use aliases for quick switching
alias arch='cd /Users/seth/eden-worktrees/arch'
alias truth='cd /Users/seth/eden-worktrees/truth'
alias lore='cd /Users/seth/eden-worktrees/lore'
alias helvetica='cd /Users/seth/eden-worktrees/helvetica'
alias token='cd /Users/seth/eden-worktrees/token'
alias launcher='cd /Users/seth/eden-worktrees/launcher'
alias main='cd /Users/seth/eden-academy' # main repository
`
šÆ Current MVP Priorities by Worktree
Immediate Setup (Do Now)
HELVETICA - Admin documentation viewer improvements
LAUNCHER - Agent onboarding flow
TOKEN - Revenue calculator implementation
Next Phase
TRUTH - Data model standardization with spirit-registry
ARCH - ADR documentation for integrations
LORE - Content refinement and cultural alignment
š Best Practices
Commit Often: Small, focused commits in each worktree
Pull Frequently: Stay updated with main branch
Clear Boundaries: Each agent owns their worktree
Document Changes: Update relevant .md files
Test Locally: Each worktree has its own dev server
Communicate: Use PR descriptions for context
šØ Important Notes
ā¢ Each worktree is a full copy of the repository
ā¢ Node modules need to be installed in each worktree
ā¢ Environment variables (.env) need to be copied to each worktree
ā¢ Dev servers can run simultaneously on different ports
š§ Setup Script
Save this as setup-worktrees.sh
:
`
bash
#!/bin/bash
Create worktree directory
mkdir -p /Users/seth/eden-worktrees
Create all worktrees for the 6 Claude Coding Agents
git worktree add -b feature/architecture /Users/seth/eden-worktrees/arch
git worktree add -b feature/data-integrity /Users/seth/eden-worktrees/truth
git worktree add -b feature/narrative /Users/seth/eden-worktrees/lore
git worktree add -b feature/visual-design /Users/seth/eden-worktrees/helvetica
git worktree add -b feature/economics /Users/seth/eden-worktrees/token
git worktree add -b feature/agent-quality /Users/seth/eden-worktrees/launcher
Copy env files to each worktree
for dir in /Users/seth/eden-worktrees/*/; do
cp /Users/seth/eden-academy/.env.local "$dir" 2>/dev/null || true
echo "ā
Set up worktree: $dir"
done
echo "š All worktrees created successfully!"
git worktree list
`
š Quick Start
Run the setup script to create all worktrees
Each agent navigates to their worktree
Install dependencies: npm install
Start development: npm run dev -- --port
`
Begin feature development
š Port Allocation
| Worktree | Dev Server Port | Claude Agent |