Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: add git commit and branch helper skills#378

Merged
tmchow merged 5 commits into
mainfrom
feat/commit-skills
Mar 25, 2026
Merged

feat: add git commit and branch helper skills#378
tmchow merged 5 commits into
mainfrom
feat/commit-skills

Conversation

@tmchow
Copy link
Copy Markdown
Collaborator

@tmchow tmchow commented Mar 25, 2026

Summary

Three new git workflow skills adapted from Anthropic's commit-commands plugin. The originals are lightweight commands that run git commit and gh pr create with minimal guidance. These skills take an opinionated approach — convention-aware commit messages, adaptive PR descriptions, user confirmation before destructive actions — and are built as skills rather than commands.

Skills

git-commit — Convention-aware commit creation. Checks loaded project instructions first (AGENTS.md, CLAUDE.md), falls back to recent commit history patterns, defaults to conventional commits. Includes lightweight logical commit splitting at the file level when changes have clearly distinct concerns (no git add -p surgery).

git-commit-push-pr — Produces PR descriptions that scale in depth with the change:

Change profile Description approach
Small + simple 1-2 sentences, ~300 chars, no headers
Small + non-trivial Short Problem/Fix narrative
Medium feature Summary + what changed + design decisions
Large/architectural Full narrative with rationale and migration notes
Performance Before/after metrics table

Key behaviors:

  • Leads with value ("Fixes timeout during batch exports") not files ("Updated handler.py")
  • Design decisions section for medium+ PRs explaining why, not just what
  • Conditional test plan — included only when testing approach is non-obvious, omitted for straightforward changes
  • No #-prefixed list items (prevents GitHub issue auto-linking)
  • No empty template sections

git-clean-gone-branches — Adapted from the original clean_gone command with several fixes: runs git fetch --prune first (original didn't), asks for user confirmation before deleting (original auto-deleted), uses a shell script with safer regex parsing, and handles worktree cleanup.

Adaptations from the originals

  • All three use command git / command gh to account for shell aliases and proxies like Rust Token Killer (rtk)
  • Built as skills (progressive disclosure, bundled scripts) rather than one-shot commands
  • git-commit-push-pr adds the entire adaptive PR description system (the original just called gh pr create with no body guidance)
  • git-commit adds convention detection and logical commit splitting (the original had no message guidance)

Eval results

Tested git-commit-push-pr across 8 scenarios using the skill-creator eval framework (with-skill vs without-skill baseline):

  • Brevity calibration: small-bugfix description went from ~1000 chars to ~330 chars after iteration
  • Design decisions: consistently present in medium+ PRs, absent where unwarranted
  • Conditional test plan: correctly omitted for obvious cases, included for complex scenarios (webhook retry with backoff timing, timeout handling, idempotency verification)
  • Commit splitting: correctly split mixed concerns, kept single commit for coherent features and ambiguous groupings

tmchow added 3 commits March 25, 2026 13:45
- Replace deprecated Commands section with proper Skills sections
- Move Skills before Agents — skills are the entry points, agents are implementation details
- Add Core Workflow section with all ce:* skills front and center
- Add Git Workflow section for new git-commit/push/pr skills
- Add Workflow Utilities section absorbing former Utility Commands
- Add Beta/Experimental section for lfg and slfg
- Add note that agents are invoked by skills, not directly by users
- Update skill count from 40+ to 43
The skill generated outdated output — referenced deprecated tools
(TodoWrite, MultiEdit), project-specific integrations, and used
command-style templates that no longer match current skill conventions.
The plugin ecosystem has better skill-authoring tooling elsewhere.
… skills

Three new skills replacing the deprecated commit-commands plugin:

- git-commit: Convention-aware commit creation with logical commit
  splitting at the file level when changes have distinct concerns
- git-commit-push-pr: Adaptive PR descriptions that scale in depth with
  change complexity, conditional test plans, and GitHub-safe formatting
- git-clean-gone-branches: Fetch-first branch cleanup with user
  confirmation and worktree handling, using a shell script for reliable
  parsing

All three use `command git` to bypass RTK proxies and shell aliases.
@tmchow tmchow changed the title feat: add git-commit, git-commit-push-pr, and git-clean-gone-branches skills feat: add git commit and branch helper skills Mar 25, 2026
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a42aab248a

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread plugins/compound-engineering/README.md Outdated
tmchow added 2 commits March 25, 2026 14:51
Address PR review feedback:
- clean-gone script now skips the currently checked-out branch (marked
  with *) to prevent git branch -D from failing on the active branch
- README skill count corrected to 42 (was 43)
@tmchow tmchow merged commit fe08af2 into main Mar 25, 2026
2 checks passed
This was referenced Mar 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant