Skip to content
Skill Authoring
Skill

/commit-work

Create high-quality git commits: review/stage intended changes, split into logical commits, and write clear commit messages (including Conventional Commits). Use when the user asks to commit, craft a commit message, stage changes, or split work into multiple commits.

BOOST
From plugin
agent-toolkit
2.6k43 skills6 agents8 commands
Install
$ npx -y skills add softaworks/agent-toolkit --skill commit-work --agent claude-code

How it fires

How this skill gets triggered: by you, by Claude, or both.

  • Fires itselfAuto-invocation. Claude auto-loads it when your prompt matches the work.Auto-invocation is when the right skill fires by itself at the right moment, driven by a FLOW.md router and a hook, instead of you invoking it by name. It is the difference between a skill being installed and a skill actually getting used.Read the full definition →
  • You can call itInvoke it directly when you want it.
  • Slash command/commit-work

Context preview

The summary Claude sees to decide when to auto-load this skill.

Create high-quality git commits: review/stage intended changes, split into logical commits, and write clear commit messages (including Conventional Commits). Use when the user asks to commit, craft a commit message, stage changes, or split work into multiple commits.

SKILL.md

commit-work.SKILL.md
name: commit-work
description: "Create high-quality git commits: review/stage intended changes, split into logical commits, and write clear commit messages (including Conventional Commits). Use when the user asks to commit, craft a commit message, stage changes, or split work into multiple commits."

Commit work

Goal

Make commits that are easy to review and safe to ship:

  • only intended changes are included
  • commits are logically scoped (split when needed)
  • commit messages describe what changed and why

Inputs to ask for (if missing)

  • Single commit or multiple commits? (If unsure: default to multiple small commits when there are unrelated changes.)
  • Commit style: Conventional Commits are required.
  • Any rules: max subject length, required scopes.

Workflow (checklist)

1) Inspect the working tree before staging

  • `git status`
  • `git diff` (unstaged)
  • If many changes: `git diff --stat`

2) Decide commit boundaries (split if needed)

  • Split by: feature vs refactor, backend vs frontend, formatting vs logic, tests vs prod code, dependency bumps vs behavior changes.
  • If changes are mixed in one file, plan to use patch staging.

3) Stage only what belongs in the next commit

  • Prefer patch staging for mixed changes: `git add -p`
  • To unstage a hunk/file: `git restore --staged -p` or `git restore --staged <path>`

4) Review what will actually be committed

  • `git diff --cached`
  • Sanity checks:
  • no secrets or tokens
  • no accidental debug logging
  • no unrelated formatting churn

5) Describe the staged change in 1-2 sentences (before writing the message)

  • "What changed?" + "Why?"
  • If you cannot describe it cleanly, the commit is probably too big or mixed; go back to step 2.

6) Write the commit message

  • Use Conventional Commits (required):
  • `type(scope): short summary`
  • blank line
  • body (what/why, not implementation diary)
  • footer (BREAKING CHANGE) if needed
  • Prefer an editor for multi-line messages: `git commit -v`
  • Use `references/commit-message-template.md` if helpful.

7) Run the smallest relevant verification

  • Run the repo's fastest meaningful check (unit tests, lint, or build) before moving on.

8) Repeat for the next commit until the working tree is clean

Deliverable

Provide:

  • the final commit message(s)
  • a short summary per commit (what/why)
  • the commands used to stage/review (at minimum: `git diff --cached`, plus any tests run)
Read more
Ships withagent-toolkit

Opinionated skills shared by @leonardocouy for improving daily work efficiency with Claude Code. Skills are packaged instructions and scripts that extend agent capabilities across development, documentation, planning, and professional workflows.

Get the whole plugin

Other skills on agent-toolkit.