git-commit

Git Commit Discipline

When to use

Any time an agent (or human) is about to run git commit in a worktree or the main branch. Also at project setup, before the first commit, to verify identity and .gitignore. The skill applies cross-phase — BA's SRS edits, SA's architecture edits, Dev's code changes, DevOps's deploy scripts, non-SDLC agents' report files all flow through the same commit discipline.

agents: [all] is a sentinel — this skill is registered under Cross-cutting in .claude/skills/registry.md and applies to every agent in the kit.

Inputs and outputs

• Inputs: the change to commit; the master-plan task ID (T-NNN) it serves if applicable; the agent role making the commit; for human-contributed work, the human's name + email
• Outputs: a well-formed conventional commit in the current local worktree, with identity, traceability, and any required attribution trailers

Procedure

1. Identity check (one-time per worktree). Run git config user.email && git config user.name. If either returns empty, halt — do not commit. Tell the user to configure (see "Configuring identity" below).
2. .gitignore check (one-time per repo). Verify the repo has a .gitignore covering at minimum: env files, secrets, IDE artifacts, build outputs, OS files, the kit's own .tmp staging files. Use references/gitignore-template.md as the baseline.
3. Stage the changes. git add <paths> — never git add . blindly. Verify with git status and git diff --cached before committing.
4. Compose the commit message per references/conventional-commits-format.md:
   • Subject line: <type>(<scope>): <description> — short, lowercase, no trailing period
   • Blank line, then body (optional but encouraged for non-trivial commits)
   • Blank line, then footer trailers (task ref, attribution)
5. Verify message against the regex in conventional-commits-format.md. If it doesn't match, rewrite — don't bypass with --no-verify.
6. Add the task reference. Every commit made for a master-plan task should reference that task (e.g., Refs: T-014 in the footer, or scope-tagged like feat(billing)(T-014): …).
7. Add attribution trailers where they apply (see references/compliance-policy.md):
   • Co-authored-by: <name> <email> when a human's contribution shaped this commit (notably the design-human-edited Figma flow per CLAUDE.md §4)
   • Generated-By: <agent-role> when an agent (Claude Code instance) is the primary author
8. Commit. git commit -m "..." for single-line, or git commit to open the editor for multi-line.
9. Do not push or merge local worktree history. A sub-agent worktree under .worktrees/<role>-<task-id>/ is detached and local-only. Never run git push, git pull, git merge, git rebase, or git cherry-pick from it. The Orchestrator promotes validated file content to main by path-scoped ingestion per .claude/rules/worktree-isolation.md §5.