Commit

Ask-first, small atomic commit workflow. The user is always in control of what gets committed and when.

Recommended model: Haiku (simple git operations)

Rules

1. Show what changed

Run git diff --stat and git status. Show the summary to the user before doing anything else.

2. Group into smallest logical commits

Analyze the changes. Split into the smallest commits that are still logical and independent:

• One concern per commit
• A commit should do one thing: fix one bug, add one feature, or update one area
• Never mix unrelated changes in the same commit

3. Present each proposed commit

For each proposed commit, show:

Commit [N/M]:
  Files: path/to/file.ts, path/to/other.ts
  Message: feat(users): add email validation on registration
  Why its own commit: standalone feature, no dependency on other changes

After showing all proposed commits at once, start with the first and ask:

Commit 1/N ready. Commit this? [y / n / edit message]

4. Wait for explicit approval before each commit

Only run git commit after:

• User types y, or
• User provides an edited message

If user types n: skip this commit, move to next. Ask at the end if they want to revisit it.

If user types edit message: show current message, let them type the new one, confirm before committing.

5. Commit message format

type(scope?): description

Types: feat, fix, refactor, test, chore, perf, docs

Examples:

• feat(users): add email validation on registration
• fix(auth): correct JWT expiry check to use <=
• refactor(shared): extract response envelope helper
• test(users): add table-driven tests for createUser

Keep the description under 72 characters. Use imperative mood ("add", "fix", "extract" — not "added", "fixes", "extracting").

6. Never push without asking

After all commits, show the log:

Committed:
  abc1234 feat(users): add email validation on registration
  def5678 test(users): add tests for email validation

Then ask:

Push to remote? [y / n]

Never run git push without explicit y.

7. Flag unrelated changes

If there are changes unrelated to the current task (formatting cleanup, unrelated refactors), flag them separately:

Unrelated changes detected:

• path/to/file.ts (whitespace cleanup)

Include in a chore commit? [y / n / separate commit]

What NOT to do

• Never run git commit without user approval
• Never run git push without user approval
• Never combine unrelated changes into one commit silently
• Never use --no-verify to skip hooks
• Never amend commits that have already been confirmed — create a new one