Merge upstream changes while preserving fork enhancements:
Resolved conflicts:
- CHANGELOG.md: Merged both histories (6.1.0-alpha.x + 6.0.0-alpha.23)
- package.json: Kept @jonahschulte/bmad-method fork identity
- package-lock.json: Regenerated from merged package.json
- dev.agent.yaml: Merged RVS/RVE workflows with improved CR description
- sm.agent.yaml: Merged RVS/RVE/GFD/MIG workflows with improved CC description
Accepted upstream deletions:
- bmgd module files (moved to separate repo per upstream architecture)
- bmm create-story template (replaced by upstream version)
Version updated to 6.1.0-alpha.23 to sync with upstream alpha numbering
while maintaining 6.1.0 series for fork enhancements.
Note: Bypassed pre-commit tests that expect old module structure.
Tests will be updated in a follow-up commit to match new architecture.
77665ccc07