Context
Fork is 1839 commits ahead of upstream with major enhancements:
- Budget orchestration, WebUI, usage tracking, deadlock detection
Need careful sync strategy to get beneficial upstream changes without breaking our features.
Risk Assessment
| Risk |
Areas |
| HIGH |
Budget orchestrator, hook system, background agents |
| MEDIUM |
Test infrastructure, shared utilities, config schema |
| LOW |
Bug fixes, docs, new non-conflicting features |
Recommended Strategy
Cherry-Pick (NOT merge)
git fetch upstream
git checkout -b sync-upstream-YYYY-MM-DD origin/dev
git cherry-pick <commit-hash>
bun run typecheck && bun test # After EACH pick
Weekly Check
git fetch upstream
git log --oneline --since="1 week ago" upstream/dev ^origin/dev
Anti-Patterns
❌ git merge upstream/dev
❌ Batch cherry-picking without testing
❌ Skipping documentation
Success Criteria
Context
Fork is 1839 commits ahead of upstream with major enhancements:
Need careful sync strategy to get beneficial upstream changes without breaking our features.
Risk Assessment
Recommended Strategy
Cherry-Pick (NOT merge)
Weekly Check
git fetch upstream git log --oneline --since="1 week ago" upstream/dev ^origin/devAnti-Patterns
❌
git merge upstream/dev❌ Batch cherry-picking without testing
❌ Skipping documentation
Success Criteria