git-commit

Git Commit

Goal

Create a clean Git commit for the current task. Include only changes that are related to the user's request and the work Agent performed in the current context, then use a mainstream Conventional Commits message in concise, direct English. For larger changes, include a short commit body with a bullet summary of the main code changes.

Workflow

1. Confirm the repository root with git rev-parse --show-toplevel.
2. Inspect the current Git state:
   • Run git status --short.
   • Check staged changes with git diff --cached --stat and git diff --cached.
   • Check unstaged changes with git diff --stat and inspect relevant diffs.
   • Check untracked files with git ls-files --others --exclude-standard.
3. Determine what should be committed:
   • Treat the current conversation, user request, and files Codex edited for that task as the primary commit boundary.
   • If the user named files, paths, or a scope, commit only those changes.
   • If the user simply says "commit", "提交", or similar, commit the changes related to the current task, not every dirty file in the repository.
   • Commit all dirty files only when the user explicitly asks to commit everything/all changes, and still exclude secrets, local config, dependency caches, logs, and unsupported build artifacts.
   • If changes were already staged before this request, verify whether they belong to the current task before including them. Unstage unrelated staged changes if needed, without discarding their content.
   • If the worktree contains unrelated or ambiguous changes, ask before staging them.
4. Stage the intended files with explicit paths whenever possible. Avoid broad staging commands when unrelated changes are present.
5. Re-check git status --short and git diff --cached --stat before committing.
6. Compose an English Conventional Commits message:
   • Use <type>(<scope>): <summary> when a clear scope exists.
   • Use <type>: <summary> when no concise scope is obvious.
   • Keep the subject under 72 characters when practical.
   • Use imperative, present-tense English.
   • Do not end the subject with a period.
7. Add a commit body only when the change is large, multi-part, or not obvious from the subject:
   • Leave a blank line after the subject.
   • Add Summary: followed by concise bullets.
   • Each bullet should describe a concrete code change or user-visible behavior.
8. Run git commit with the prepared message.
9. Verify the result with git status --short and git log -1 --pretty=fuller --stat.