/commit

Commit staged/unstaged changes following commit best practices. Checks branch status and updates PR description if applicable.

Steps:

1. Detect changes across repositories:

   • For each modified/new file being committed, check its git root: git -C <file-dir> rev-parse --show-toplevel
   • Group files by their git root directory
   • If multiple repos detected, inform user:

     Changes detected in multiple repositories:
     - /path/to/repo1: file1.md, file2.tsx
     - /path/to/repo2: file3.md
     These will be committed separately.
     

   • Process each repo independently through remaining steps

2. Check branch status (per repo):

   • Run git branch --show-current to get current branch
   • If on main, ask user to create a feature branch first
   • Get git username: git config user.name | tr '[:upper:]' '[:lower:]' | tr ' ' '-'
   • Branch naming format: <username>.<type>-<description>
     • Examples: johndoe.docs-update-readme, janedoe.feat-new-feature

3. Check if branch PR was already merged or closed:

   • Run gh pr view --json mergedAt,state -q '{mergedAt,state}'
   • If mergedAt has a timestamp OR state is "CLOSED": PR is done
   • CRITICAL: If merged/closed, DO NOT commit to this branch - commits won't reach main!
   • Warn user and MUST create new branch from main

4. If branch was merged/closed, handle it:

   git checkout main
   git pull origin main
   git checkout -b <username>.<type>-<description>
   

   • Ask user for new branch name using the <username>.<type>-<description> format

5. Check for changes:

   • Run git status to see staged and unstaged changes
   • Run git diff --stat to summarize changes
   • If no changes, tell user and exit

6. Stage changes (if needed):

   • Show unstaged files and ask which to include
   • Run git add <files> for selected files

7. Generate commit message:

   • Follow conventional commits: type: brief description
   • Types: feat, fix, docs, chore, refactor, test, style
   • Maximum 50 characters
   • NO emoji, NO AI attribution, NO co-authorship

8. Show commit preview and get confirmation:

   • Show what will be committed
   • Show proposed commit message
   • WAIT for explicit "yes" before executing

9. Commit:

   git commit -m "<message>"
   

10. Post-commit: Ask user's intent: Ask user:

    Committed! What would you like to do?
    1. Push now
    2. Continue making changes (will push later)
    

11. If "Continue making changes":

    • Done for this repo
    • Skip to step 14 (repeat for next repo)

12. If "Push now" - Check PR status: Run: gh pr view --json number,state,mergedAt 2>/dev/null

    Case A: PR exists and state="OPEN"

    • Push: git push origin <branch>
    • Run /pr-describe to update PR description with new changes
    • Show PR link

    Case B: PR exists and state="CLOSED" or mergedAt is set

    • BLOCK - Do not push!
    • Warn: "This branch's PR is closed/merged. Commits won't reach main."
    • Suggest creating new branch from main

    Case C: No PR exists Ask:

    No PR exists. What would you like to do?
    1. Just push (no PR yet)
    2. Push and create PR
    

    • If "Just push":

      • git push -u origin <branch> (first push) or git push origin <branch>

    • If "Push and create PR":

      1. Push: git push -u origin <branch>
      2. Create PR: gh pr create --title "<type>: <brief description>" --body ""
      3. Run /pr-describe to generate and set proper description
      4. Show PR link

13. Confirm with summary of what was done (committed, pushed, PR status)

14. Repeat for next repo (if multiple repos detected in step 1)

Commit Message Format

type: brief description (50 chars max)

Types:

• feat: - New feature
• fix: - Bug fix
• docs: - Documentation
• style: - Formatting
• refactor: - Code restructure
• test: - Tests
• chore: - Maintenance

Examples

• feat: add now page to portfolio
• fix: resolve file path issue
• docs: update installation guide
• chore: update dependencies