Phase 1b: Rename all ~94 commands across 12 plugins to /<noun> <action> sub-command pattern. Git-flow consolidated from 8→5 commands (commit variants absorbed into --push/--merge/--sync flags). Dispatch files, name: frontmatter, and cross-reference updates for all plugins. Phase 2: Design documents for 8 new plugins in docs/designs/. Phase 3: Scaffold 8 new plugins — saas-api-platform, saas-db-migrate, saas-react-platform, saas-test-pilot, data-seed, ops-release-manager, ops-deploy-pipeline, debug-mcp. Each with plugin.json, commands, agents, skills, README, and claude-md-integration. Marketplace grows from 12→20. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
3.1 KiB
3.1 KiB
name, description
| name | description |
|---|---|
| git-workflow | Branch naming, merge process, and git operations |
Git Workflow
Purpose
Defines branch naming conventions, merge protocols, and git operations.
When to Use
- Orchestrator agent: When coordinating git operations
- Executor agent: When creating branches and commits
- Commands:
/sprint start,/sprint close
Branch Naming Convention (MANDATORY)
| Type | Pattern | Example |
|---|---|---|
| Features | feat/<issue>-<desc> |
feat/45-jwt-service |
| Bug fixes | fix/<issue>-<desc> |
fix/46-login-timeout |
| Debugging | debug/<issue>-<desc> |
debug/47-memory-leak |
Validation Rules
- Issue number MUST be present
- Prefix MUST be
feat/,fix/, ordebug/ - Description: kebab-case (lowercase, hyphens)
- No spaces or special characters
Creating Feature Branch
git checkout development
git pull origin development
git checkout -b feat/45-jwt-service
Branch Isolation
Each task MUST have its own branch.
Task #45 → feat/45-jwt-service (isolated)
Task #48 → feat/48-api-docs (isolated)
Never have two agents work on the same branch.
Sequential Merge Protocol
After task completion, merge sequentially (never simultaneously):
1. Task #45 completes → merge feat/45-jwt-service to development
2. Task #48 completes → merge feat/48-api-docs to development
3. Never merge simultaneously - always sequential to detect conflicts
Merge Steps
git checkout development
git pull origin development
git merge feat/45-jwt-service --no-ff
git push origin development
git branch -d feat/45-jwt-service
If Merge Conflict Occurs
- Stop second task
- Resolve conflict manually or assign to human
- Resume/restart second task with updated base
Commit Message Format
<type>: <description>
[Optional body with details]
[Optional: Closes #XX]
Types
| Type | Use For |
|---|---|
feat |
New feature |
fix |
Bug fix |
refactor |
Code refactoring |
docs |
Documentation |
test |
Test additions |
chore |
Maintenance |
Auto-Close Keywords
Use in commit message to auto-close issues:
Closes #XXFixes #XXResolves #XX
Example
feat: implement JWT token generation
- Add generate_token(user_id, email) function
- Add verify_token(token) function
- Include refresh logic per Sprint 12 lesson
Closes #45
Merge Request Template
When branch protection requires MR (check via get_branch_protection):
## Summary
Brief description of changes made.
## Related Issues
Closes #45
## Testing
- Describe how changes were tested
- Include test commands if relevant
NEVER include subtask checklists in MR body. The issue already has them.
Sprint Close Git Operations
Offer to handle:
- Commit any remaining changes
- Merge feature branches to development
- Tag sprint completion (if release)
- Clean up merged branches
# Tag sprint completion
git tag -a v0.18.0 -m "Sprint 18 release"
git push origin v0.18.0
# Clean up merged branches
git branch -d feat/45-jwt-service feat/46-login-endpoint