feat(marketplace): command consolidation + 8 new plugins (v8.1.0 → v9.0.0) [BREAKING]
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>
This commit is contained in:
@@ -40,11 +40,11 @@ Use conventional commits:
|
||||
|
||||
| Command | Use Case |
|
||||
|---------|----------|
|
||||
| `/git-commit` | Create commit with smart message |
|
||||
| `/git-commit-push` | Commit and push |
|
||||
| `/git-commit-merge` | Commit and merge to base |
|
||||
| `/branch-start` | Start new branch |
|
||||
| `/git-status` | Enhanced status |
|
||||
| `/gitflow commit` | Smart commit with optional --push, --merge, --sync |
|
||||
| `/gitflow commit --push` | Commit and push to remote |
|
||||
| `/gitflow commit --merge` | Commit and merge into target branch |
|
||||
| `/gitflow branch-start` | Start new branch |
|
||||
| `/gitflow status` | Enhanced status |
|
||||
|
||||
### Protected Branches
|
||||
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
---
|
||||
name: git-commit-merge
|
||||
description: Commit current changes and merge branch into target
|
||||
agent: git-assistant
|
||||
---
|
||||
|
||||
# /git-commit-merge - Commit and Merge
|
||||
|
||||
## Skills
|
||||
|
||||
- skills/visual-header.md
|
||||
- skills/commit-conventions.md
|
||||
- skills/merge-workflow.md
|
||||
- skills/git-safety.md
|
||||
- skills/environment-variables.md
|
||||
|
||||
## Purpose
|
||||
|
||||
Commit current changes, then merge the current branch into a target branch.
|
||||
|
||||
## Parameters
|
||||
|
||||
| Parameter | Description |
|
||||
|-----------|-------------|
|
||||
| `--target` | Target branch (default: GIT_DEFAULT_BASE) |
|
||||
| `--squash` | Squash commits on merge |
|
||||
| `--no-delete` | Keep branch after merge |
|
||||
|
||||
## Workflow
|
||||
|
||||
1. **Display header** - Show GIT-FLOW Commit & Merge header
|
||||
2. **Run /git-commit** - Execute standard commit workflow
|
||||
3. **Identify target** - Prompt for target branch if not specified
|
||||
4. **Select strategy** - Merge commit, squash, or rebase (per merge-workflow.md)
|
||||
5. **Execute merge** - Switch to target, pull, merge, push
|
||||
6. **Handle conflicts** - Guide resolution if needed
|
||||
7. **Cleanup** - Offer to delete merged branch (per git-safety.md)
|
||||
8. **Report** - Show merge summary
|
||||
|
||||
## Output
|
||||
|
||||
```
|
||||
Committed: abc1234
|
||||
feat(auth): add password reset functionality
|
||||
|
||||
Merged feat/password-reset -> development
|
||||
Deleted branch: feat/password-reset
|
||||
|
||||
development is now at: def5678
|
||||
```
|
||||
@@ -1,46 +0,0 @@
|
||||
---
|
||||
name: git-commit-push
|
||||
description: Create a commit and push to remote in one operation
|
||||
agent: git-assistant
|
||||
---
|
||||
|
||||
# /git-commit-push - Commit and Push
|
||||
|
||||
## Skills
|
||||
|
||||
- skills/visual-header.md
|
||||
- skills/commit-conventions.md
|
||||
- skills/sync-workflow.md
|
||||
- skills/git-safety.md
|
||||
- skills/environment-variables.md
|
||||
|
||||
## Purpose
|
||||
|
||||
Create a commit and push to the remote repository in one operation.
|
||||
|
||||
## Parameters
|
||||
|
||||
| Parameter | Description |
|
||||
|-----------|-------------|
|
||||
| `--message`, `-m` | Override auto-generated message |
|
||||
| `--force` | Force push (requires confirmation) |
|
||||
|
||||
## Workflow
|
||||
|
||||
1. **Display header** - Show GIT-FLOW Commit & Push header
|
||||
2. **Run /git-commit** - Execute standard commit workflow
|
||||
3. **Check upstream** - Set up tracking if needed (`git push -u`)
|
||||
4. **Push** - Push to remote
|
||||
5. **Handle conflicts** - Offer rebase/merge/force if push fails (per sync-workflow.md)
|
||||
6. **Verify safety** - Warn before push to protected branches (per git-safety.md)
|
||||
7. **Report** - Show push result
|
||||
|
||||
## Output
|
||||
|
||||
```
|
||||
Committed: abc1234
|
||||
feat(auth): add password reset functionality
|
||||
|
||||
Pushed to: origin/feat/password-reset
|
||||
Remote URL: https://github.com/user/repo
|
||||
```
|
||||
@@ -1,49 +0,0 @@
|
||||
---
|
||||
name: git-commit-sync
|
||||
description: Commit, push, and sync with base branch
|
||||
agent: git-assistant
|
||||
---
|
||||
|
||||
# /git-commit-sync - Commit, Push, and Sync
|
||||
|
||||
## Skills
|
||||
|
||||
- skills/visual-header.md
|
||||
- skills/commit-conventions.md
|
||||
- skills/sync-workflow.md
|
||||
- skills/merge-workflow.md
|
||||
- skills/environment-variables.md
|
||||
|
||||
## Purpose
|
||||
|
||||
Full sync operation: commit local changes, push to remote, sync with upstream/base branch, and detect stale branches.
|
||||
|
||||
## Parameters
|
||||
|
||||
| Parameter | Description |
|
||||
|-----------|-------------|
|
||||
| `--base` | Override default base branch |
|
||||
| `--no-rebase` | Use merge instead of rebase |
|
||||
|
||||
## Workflow
|
||||
|
||||
1. **Display header** - Show GIT-FLOW Commit Sync header
|
||||
2. **Run /git-commit** - Execute standard commit workflow
|
||||
3. **Push to remote** - Push committed changes
|
||||
4. **Fetch with prune** - `git fetch --all --prune`
|
||||
5. **Sync with base** - Rebase on base branch (per sync-workflow.md)
|
||||
6. **Handle conflicts** - Guide resolution if conflicts occur (per merge-workflow.md)
|
||||
7. **Push again** - `git push --force-with-lease` if rebased
|
||||
8. **Detect stale** - Report stale local branches
|
||||
9. **Report status** - Show sync summary
|
||||
|
||||
## Output
|
||||
|
||||
```
|
||||
Committed: abc1234
|
||||
Pushed to: origin/feat/password-reset
|
||||
Synced with: development (xyz7890)
|
||||
|
||||
Status: Clean, up-to-date
|
||||
Stale branches: 2 found - run /branch-cleanup
|
||||
```
|
||||
@@ -1,44 +0,0 @@
|
||||
---
|
||||
name: git-commit
|
||||
description: Create a git commit with auto-generated conventional commit message
|
||||
agent: git-assistant
|
||||
---
|
||||
|
||||
# /git-commit - Smart Commit
|
||||
|
||||
## Skills
|
||||
|
||||
- skills/visual-header.md
|
||||
- skills/git-safety.md
|
||||
- skills/commit-conventions.md
|
||||
- skills/environment-variables.md
|
||||
|
||||
## Purpose
|
||||
|
||||
Create a git commit with an auto-generated conventional commit message based on staged changes.
|
||||
|
||||
## Parameters
|
||||
|
||||
| Parameter | Description |
|
||||
|-----------|-------------|
|
||||
| `--message`, `-m` | Override auto-generated message |
|
||||
| `--all`, `-a` | Stage all changes before commit |
|
||||
|
||||
## Workflow
|
||||
|
||||
1. **Display header** - Show GIT-FLOW Smart Commit header
|
||||
2. **Check protected branch** - Warn if on protected branch (per git-safety.md)
|
||||
3. **Analyze changes** - Run `git status` and `git diff --staged`
|
||||
4. **Handle unstaged** - Prompt to stage if nothing staged
|
||||
5. **Generate message** - Create conventional commit message (per commit-conventions.md)
|
||||
6. **Confirm or edit** - Present message with options to use, edit, regenerate, or cancel
|
||||
7. **Execute commit** - Run `git commit` with message and co-author footer
|
||||
|
||||
## Output
|
||||
|
||||
```
|
||||
Committed: abc1234
|
||||
feat(auth): add password reset functionality
|
||||
|
||||
Files: 3 changed, 45 insertions(+), 12 deletions(-)
|
||||
```
|
||||
@@ -1,10 +1,10 @@
|
||||
---
|
||||
name: branch-cleanup
|
||||
name: gitflow branch-cleanup
|
||||
description: Remove merged and stale branches locally and optionally on remote
|
||||
agent: git-assistant
|
||||
---
|
||||
|
||||
# /branch-cleanup - Clean Merged and Stale Branches
|
||||
# /gitflow branch-cleanup - Clean Merged and Stale Branches
|
||||
|
||||
## Skills
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
---
|
||||
name: branch-start
|
||||
name: gitflow branch-start
|
||||
description: Create a new feature/fix/chore branch with consistent naming
|
||||
agent: git-assistant
|
||||
---
|
||||
|
||||
# /branch-start - Start New Branch
|
||||
# /gitflow branch-start - Start New Branch
|
||||
|
||||
## Skills
|
||||
|
||||
98
plugins/git-flow/commands/gitflow-commit.md
Normal file
98
plugins/git-flow/commands/gitflow-commit.md
Normal file
@@ -0,0 +1,98 @@
|
||||
---
|
||||
name: gitflow commit
|
||||
description: Create a git commit with auto-generated conventional commit message. Supports --push, --merge, --sync flags.
|
||||
agent: git-assistant
|
||||
---
|
||||
|
||||
# /gitflow commit - Smart Commit
|
||||
|
||||
## Skills
|
||||
|
||||
- skills/visual-header.md
|
||||
- skills/git-safety.md
|
||||
- skills/commit-conventions.md
|
||||
- skills/sync-workflow.md
|
||||
- skills/merge-workflow.md
|
||||
- skills/environment-variables.md
|
||||
|
||||
## Purpose
|
||||
|
||||
Create a git commit with an auto-generated conventional commit message. Optionally push, merge, or sync in the same operation.
|
||||
|
||||
## Parameters
|
||||
|
||||
| Parameter | Description |
|
||||
|-----------|-------------|
|
||||
| `--message`, `-m` | Override auto-generated message |
|
||||
| `--all`, `-a` | Stage all changes before commit |
|
||||
| `--push` | After commit: push to remote (replaces former `/git-commit-push`) |
|
||||
| `--merge [target]` | After commit: merge into target branch (replaces former `/git-commit-merge`) |
|
||||
| `--sync` | After commit: push and sync with base branch (replaces former `/git-commit-sync`) |
|
||||
| `--force` | Force push (with --push or --sync, requires confirmation) |
|
||||
| `--squash` | Squash commits on merge (with --merge) |
|
||||
| `--no-delete` | Keep branch after merge (with --merge) |
|
||||
| `--base` | Override default base branch (with --sync) |
|
||||
| `--no-rebase` | Use merge instead of rebase (with --sync) |
|
||||
|
||||
## Workflow
|
||||
|
||||
### Base: Commit
|
||||
1. **Display header** — GIT-FLOW Smart Commit
|
||||
2. **Check protected branch** — per git-safety.md
|
||||
3. **Analyze changes** — `git status` and `git diff --staged`
|
||||
4. **Handle unstaged** — Prompt to stage if nothing staged
|
||||
5. **Generate message** — Create conventional commit (per commit-conventions.md)
|
||||
6. **Confirm or edit** — Present message with options
|
||||
7. **Execute commit**
|
||||
|
||||
### Flag: --push
|
||||
8. **Check upstream** — Set up tracking if needed
|
||||
9. **Push to remote**
|
||||
10. **Handle conflicts** — Offer rebase/merge/force if push fails
|
||||
|
||||
### Flag: --merge
|
||||
8. **Identify target** — Prompt for target branch if not specified
|
||||
9. **Select strategy** — Merge commit, squash, or rebase (per merge-workflow.md)
|
||||
10. **Execute merge** — Switch to target, pull, merge, push
|
||||
11. **Handle conflicts** — Guide resolution
|
||||
12. **Cleanup** — Offer to delete merged branch
|
||||
|
||||
### Flag: --sync
|
||||
8. **Push committed changes**
|
||||
9. **Fetch with prune** — `git fetch --all --prune`
|
||||
10. **Sync with base** — Rebase on base branch (per sync-workflow.md)
|
||||
11. **Handle conflicts** — Guide resolution (per merge-workflow.md)
|
||||
12. **Push again** — `git push --force-with-lease` if rebased
|
||||
13. **Report stale branches**
|
||||
|
||||
## Flag Mutual Exclusivity
|
||||
|
||||
`--push`, `--merge`, and `--sync` are mutually exclusive. If multiple are provided, error with:
|
||||
"Only one of --push, --merge, or --sync may be specified."
|
||||
|
||||
## Output
|
||||
|
||||
### Base commit:
|
||||
```
|
||||
Committed: abc1234
|
||||
feat(auth): add password reset functionality
|
||||
```
|
||||
|
||||
### With --push:
|
||||
```
|
||||
Committed: abc1234
|
||||
Pushed to: origin/feat/password-reset
|
||||
```
|
||||
|
||||
### With --merge:
|
||||
```
|
||||
Committed: abc1234
|
||||
Merged feat/password-reset -> development
|
||||
```
|
||||
|
||||
### With --sync:
|
||||
```
|
||||
Committed: abc1234
|
||||
Pushed to: origin/feat/password-reset
|
||||
Synced with: development
|
||||
```
|
||||
@@ -1,10 +1,10 @@
|
||||
---
|
||||
name: git-config
|
||||
name: gitflow config
|
||||
description: Configure git-flow settings for the current project
|
||||
agent: git-assistant
|
||||
---
|
||||
|
||||
# /git-config - Configure git-flow
|
||||
# /gitflow config - Configure Git-Flow
|
||||
|
||||
## Skills
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
---
|
||||
name: git-status
|
||||
name: gitflow status
|
||||
description: Show comprehensive git status with recommendations
|
||||
agent: git-assistant
|
||||
---
|
||||
|
||||
# /git-status - Enhanced Status
|
||||
# /gitflow status - Enhanced Git Status
|
||||
|
||||
## Skills
|
||||
|
||||
@@ -51,6 +51,6 @@ Unstaged:
|
||||
2. Ready to commit with 1 staged file
|
||||
|
||||
--- Quick Actions ---
|
||||
/git-commit - Commit staged changes
|
||||
/git-commit-push - Commit and push
|
||||
/gitflow commit - Commit staged changes
|
||||
/gitflow commit --push - Commit and push
|
||||
```
|
||||
17
plugins/git-flow/commands/gitflow.md
Normal file
17
plugins/git-flow/commands/gitflow.md
Normal file
@@ -0,0 +1,17 @@
|
||||
---
|
||||
description: Git workflow automation with safety enforcement
|
||||
---
|
||||
|
||||
# /gitflow
|
||||
|
||||
Git workflow automation with smart commits, branch management, and safety enforcement.
|
||||
|
||||
## Sub-commands
|
||||
|
||||
| Sub-command | Description |
|
||||
|-------------|-------------|
|
||||
| `/gitflow commit` | Smart commit with optional --push, --merge, --sync |
|
||||
| `/gitflow branch-start` | Create a properly-named feature branch |
|
||||
| `/gitflow branch-cleanup` | Clean up merged/stale branches |
|
||||
| `/gitflow status` | Enhanced git status with recommendations |
|
||||
| `/gitflow config` | Configure git-flow settings |
|
||||
@@ -104,7 +104,7 @@ gitGraph
|
||||
```
|
||||
Or use git-flow command:
|
||||
```
|
||||
/branch-start add user authentication
|
||||
/gitflow branch-start add user authentication
|
||||
```
|
||||
|
||||
2. **Implement changes**
|
||||
@@ -125,7 +125,7 @@ gitGraph
|
||||
5. **Cleanup**
|
||||
- Delete feature branch after merge
|
||||
```
|
||||
/branch-cleanup
|
||||
/gitflow branch-cleanup
|
||||
```
|
||||
|
||||
### Release Promotion
|
||||
|
||||
@@ -6,7 +6,7 @@ Defines branch naming conventions and validation rules for consistent repository
|
||||
|
||||
## When to Use
|
||||
|
||||
- Creating new branches with `/branch-start`
|
||||
- Creating new branches with `/gitflow branch-start`
|
||||
- Validating branch names
|
||||
- Converting descriptions to branch names
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ Defines conventional commit message format for consistent, parseable commit hist
|
||||
|
||||
## When to Use
|
||||
|
||||
- Generating commit messages in `/git-commit`
|
||||
- Generating commit messages in `/gitflow commit`
|
||||
- Validating user-provided commit messages
|
||||
- Explaining commit format to users
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ Centralized reference for all git-flow environment variables and their defaults.
|
||||
|
||||
## When to Use
|
||||
|
||||
- Configuring git-flow behavior in `/git-config`
|
||||
- Configuring git-flow behavior in `/gitflow config`
|
||||
- Documenting available options to users
|
||||
- Setting up project-specific overrides
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ Defines merge strategies, conflict resolution approaches, and post-merge cleanup
|
||||
|
||||
## When to Use
|
||||
|
||||
- Merging feature branches in `/git-commit-merge`
|
||||
- Merging feature branches in `/gitflow commit --merge`
|
||||
- Resolving conflicts during sync operations
|
||||
- Cleaning up after successful merges
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ Defines push/pull patterns, rebase strategies, upstream tracking, and stale bran
|
||||
|
||||
## When to Use
|
||||
|
||||
- Pushing commits in `/git-commit-push`
|
||||
- Full sync operations in `/git-commit-sync`
|
||||
- Pushing commits in `/gitflow commit --push`
|
||||
- Full sync operations in `/gitflow commit --sync`
|
||||
- Detecting and reporting stale branches
|
||||
|
||||
## Push Workflow
|
||||
@@ -92,7 +92,7 @@ Stale local branches (remote deleted):
|
||||
- feat/old-feature (was tracking origin/feat/old-feature)
|
||||
- fix/merged-bugfix (was tracking origin/fix/merged-bugfix)
|
||||
|
||||
Run /branch-cleanup to remove these branches.
|
||||
Run /gitflow branch-cleanup to remove these branches.
|
||||
```
|
||||
|
||||
## Remote Pruning
|
||||
@@ -123,7 +123,7 @@ No conflicts detected.
|
||||
|
||||
Cleanup:
|
||||
Remote refs pruned: 2
|
||||
Stale local branches: 2 (run /branch-cleanup to remove)
|
||||
Stale local branches: 2 (run /gitflow branch-cleanup to remove)
|
||||
```
|
||||
|
||||
## Tracking Setup
|
||||
|
||||
@@ -19,56 +19,56 @@ Standard header format for consistent visual output across all git-flow commands
|
||||
|
||||
## Command Headers
|
||||
|
||||
### /git-commit
|
||||
### /gitflow commit
|
||||
```
|
||||
+----------------------------------------------------------------------+
|
||||
| GIT-FLOW Smart Commit |
|
||||
+----------------------------------------------------------------------+
|
||||
```
|
||||
|
||||
### /git-commit-push
|
||||
### /gitflow commit --push
|
||||
```
|
||||
+----------------------------------------------------------------------+
|
||||
| GIT-FLOW Commit & Push |
|
||||
+----------------------------------------------------------------------+
|
||||
```
|
||||
|
||||
### /git-commit-sync
|
||||
### /gitflow commit --sync
|
||||
```
|
||||
+----------------------------------------------------------------------+
|
||||
| GIT-FLOW Commit Sync |
|
||||
+----------------------------------------------------------------------+
|
||||
```
|
||||
|
||||
### /git-commit-merge
|
||||
### /gitflow commit --merge
|
||||
```
|
||||
+----------------------------------------------------------------------+
|
||||
| GIT-FLOW Commit & Merge |
|
||||
+----------------------------------------------------------------------+
|
||||
```
|
||||
|
||||
### /branch-start
|
||||
### /gitflow branch-start
|
||||
```
|
||||
+----------------------------------------------------------------------+
|
||||
| GIT-FLOW Branch Start |
|
||||
+----------------------------------------------------------------------+
|
||||
```
|
||||
|
||||
### /branch-cleanup
|
||||
### /gitflow branch-cleanup
|
||||
```
|
||||
+----------------------------------------------------------------------+
|
||||
| GIT-FLOW Branch Cleanup |
|
||||
+----------------------------------------------------------------------+
|
||||
```
|
||||
|
||||
### /git-status
|
||||
### /gitflow status
|
||||
```
|
||||
+----------------------------------------------------------------------+
|
||||
| GIT-FLOW Status |
|
||||
+----------------------------------------------------------------------+
|
||||
```
|
||||
|
||||
### /git-config
|
||||
### /gitflow config
|
||||
```
|
||||
+----------------------------------------------------------------------+
|
||||
| GIT-FLOW Configuration |
|
||||
|
||||
Reference in New Issue
Block a user