Defame1297
0f2bb242ad
Regenerates `plugins/*/skills`, `plugins/*/agents`, both per-plugin `plugin.json` manifests and the two marketplace mirrors from `.apm/` per ADR-0017, via `scripts/sync-plugin-content.sh --all`. The manifests matter beyond tidiness here: `plugin.json` carries the plugin version and wins over the marketplace entry at install time (calculatePluginVersion precedence). Until this ran, the patch bumps in the preceding commit were inert for anyone installing these plugins. ADR: 0017 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01EeH8SCbcrCAQrtymkNuhKP
77 lines
3.6 KiB
Markdown
77 lines
3.6 KiB
Markdown
---
|
|
name: git-commits
|
|
|
|
description: >
|
|
Use when creating, amending, squashing, or cherry-picking commits, including
|
|
writing and validating the Conventional Commits message.
|
|
Not history inspection -> `git-history`.
|
|
Not branch lifecycle -> `git-branches`.
|
|
|
|
metadata:
|
|
version: "0.1.4"
|
|
category: git
|
|
source_keys:
|
|
- conventional-commits-spec
|
|
- commitlint-config-conventional
|
|
- org-commit-conventions
|
|
- context7-git-htmldocs
|
|
|
|
allowed-tools: Bash
|
|
---
|
|
|
|
## Gotchas
|
|
|
|
- **Run git as `rtk git <subcommand>`, never bare `git`** — org convention, in `&&` chains too. Exceptions: ADR-0023 clause 3.
|
|
- **Refuse to force-push `main`/`master`** — a rewrite leaves the branch diverged and the reflex is to force it back; safe only where nobody else has based work on it.
|
|
- **`reset --hard` is a confirmation gate, not a default.** It overwrites the working tree, and uncommitted edits it discards were never in git, so no reflog recovers them. Name what will be lost and offer a stash first.
|
|
- **Never add `--no-verify`** — using it when a hook fails bypasses the QA gate the pipeline depends on. Only on the user's explicit demand, with a warning.
|
|
|
|
## Dispatch
|
|
|
|
Read exactly one flow file. Each is self-contained.
|
|
|
|
| Condition | Flow | Read |
|
|
|---|---|---|
|
|
| Composing a new commit from staged changes | create | `references/create-commit.md` |
|
|
| Amending, squashing, folding a fixup, rebasing onto a new base, or resetting HEAD | rewrite | `references/rewrite-history.md` |
|
|
| Replaying an existing commit onto the current branch | cherry-pick | `references/cherry-pick.md` |
|
|
|
|
## Gates on every flow
|
|
|
|
1. **Confirmation.** No history rewrite executes without explicit approval from the user or the calling agent. Cherry-pick needs the destination branch confirmed first.
|
|
2. **Atomicity.** The result must be one logical, independently reviewable and reversible change that leaves the repository buildable and testable. This binds an amend or a squashed result as much as a fresh commit — say so before writing it, not after.
|
|
3. **Secrets.** Before any commit or amend, scan the staged diff for anything resembling an API key,
|
|
token, password, connection string, or environment-specific config. Stop and flag it rather than
|
|
committing it.
|
|
4. **Validation.** Check the message against commitlint `config-conventional` before committing. If a type, footer, or breaking-change edge case is not obvious, read `references/conventional-commits-spec.md` — it carries the constraint table, the 11-type set, and the footer token rules.
|
|
5. **SemVer impact.** Report the bump the commit implies: `feat` → MINOR, `fix`/`perf`/`revert` → PATCH, any breaking change → MAJOR, everything else → none. Callers decide releases from this, so never omit it.
|
|
6. **Conflicts.** If a rebase or cherry-pick halts, offer resolution or an abort. Do not resolve automatically without confirmation.
|
|
|
|
## Output
|
|
|
|
For an agent caller, return:
|
|
|
|
```json
|
|
{
|
|
"operation": "create|amend|squash|cherry-pick",
|
|
"status": "success|conflict|rejected",
|
|
"message": "commit message or error description",
|
|
"commit_hash": "abc1234",
|
|
"semver_impact": "MAJOR|MINOR|PATCH|none",
|
|
"breaking_change": false,
|
|
"confirmation_required": false,
|
|
"details": {
|
|
"type": "feat",
|
|
"scope": "api",
|
|
"description": "add user authentication",
|
|
"body": "optional body text, or null",
|
|
"footers": ["Fixes: #123", "Refs: #456", "Co-authored-by: Bob <bob@example.com>"]
|
|
}
|
|
}
|
|
```
|
|
|
|
`details.footers` is an array of the resolved trailer lines, empty when there are none — never a
|
|
single joined string, and never omitted. Downstream agents index it.
|
|
|
|
For a human caller, show the same fields as a prose preview with a confirmation prompt.
|