push-and-pr

Context

• Status: !git status
• Branch: !git branch --show-current
• Remote: !git remote -v
• Unpushed commits: !git log @{u}..HEAD --oneline 2>/dev/null || echo "No upstream set"

Git Rules

• Trunk-based development with rebase (linear history)
• PR title = Conventional Commit format, ≤72 chars
• PR description: what / why / how to test / risks
• PR base always main, merge strategy: Rebase and merge
• --force-with-lease only on personal feature branches after rebase
• Use gh for all GitHub operations
• Large PRs (>400 LOC) — consider splitting

Algorithm

1. Guard: git status — ensure working tree is clean (everything committed).
2. If on main: ask user (AskUserQuestion): "You're on main. Push directly or create a feature branch for PR?"
3. Push directly: git push origin main → output "Pushed to main." STOP.
4. Create branch: help create feature branch, switch to it, then continue.
5. If on feature branch: continue.
6. Sync: git fetch origin → git rebase origin/main → git push -u origin HEAD --force-with-lease.
7. PR:
8. Check if PR exists: gh pr view --json number — if exists, just push updates.
9. Create: gh pr create --base main --head <current-branch>.
10. Title: Conventional Commit format.
11. Body: what / why / how to test / risks.
12. Checks: gh pr checks --watch — if failing, diagnose and fix, re-push.
13. Review: Review using repo's PR template/checklist if present.
14. Merge: All checks green → ask user (AskUserQuestion): "Merge and delete branch?"
15. Yes: gh pr merge --rebase → git switch main && git pull origin main → git branch -D <branch> && git push origin --delete <branch>.
16. No: output PR link and stop.
17. Output: PR link, check statuses, summary of what was done.

Act immediately — no confirmation needed (except merge step).