--- name: taw-git description: 'Advanced git: create branches, open PRs (auto-generated body from diff + commits), fast-forward merge, recover mistakes. Triggers: "create PR", "open pull request", "tao branch", "merge", "tao PR", "git branch", "rebase".' --- # taw-git — Branch, PR, Merge, Recover For single-commit staging → use `taw-commit` instead. For history lookup → use `taw-trace`. ## When to invoke Trigger phrases (VN + EN): - "tao branch moi" / "new branch" / "tạo nhánh mới" - "mo PR" / "create pull request" / "push len github" / "open pr" - "merge branch vao main" / "merge feature" - "huy commit" / "revert" / "undo last commit" / "quay lai" ## Sub-commands ### 1. `branch ` — Create & switch Branch naming with type prefix matching `taw-commit` conventions: | Prefix | For | |---|---| | `feature/` | new user-visible feature | | `fix/` | bug fix | | `refactor/` | restructure, no behaviour change | | `chore/` | deps, config, env | | `hotfix/` | urgent production fix | | `experiment/` | throwaway spike | Workflow: ```bash git fetch origin git switch main git pull --ff-only origin main git switch -c / ``` If `main` is dirty (uncommitted work) → abort + VN: "taw: main đang có thay đổi chưa commit. Lưu trước rồi mới tạo branch." ### 2. `pr [base]` — Open pull request with smart body Default base: `main`. Uses `gh` CLI against **remote** refs (unpushed commits visible on GitHub). **Preflight:** ```bash command -v gh >/dev/null || { echo "taw: gh CLI not installed. brew install gh"; exit 1; } gh auth status >/dev/null 2>&1 || { echo "taw: gh not logged in. Run: gh auth login"; exit 1; } git remote get-url origin >/dev/null 2>&1 || { echo "taw: no origin remote"; exit 1; } ``` **Push current branch if not on remote:** ```bash HEAD_BRANCH="$(git rev-parse --abbrev-ref HEAD)" [ "$HEAD_BRANCH" = "main" ] && { echo "taw: không mở PR từ main"; exit 1; } git push -u origin "$HEAD_BRANCH" ``` **Gather PR content** (smart generation — not just commit dump): ```bash BASE="${1:-main}" git fetch origin "$BASE" git log "origin/$BASE..origin/$HEAD_BRANCH" --pretty="- %s" > /tmp/taw-pr-commits.txt git diff "origin/$BASE...origin/$HEAD_BRANCH" --stat > /tmp/taw-pr-stat.txt ``` **Check for existing PR template:** ```bash cat .github/PULL_REQUEST_TEMPLATE.md 2>/dev/null || \ cat .github/pull_request_template.md 2>/dev/null ``` If project template exists → fill its sections. Else use taw's default template below. **Extract issue references:** ```bash git log origin/$BASE..origin/$HEAD_BRANCH --pretty=%B | \ command grep -oE '#[0-9]+|[Cc]loses #[0-9]+|[Ff]ixes #[0-9]+' | sort -u echo "$HEAD_BRANCH" | command grep -oE '[0-9]+' | head -1 ``` **PR title** — reuse the most significant commit subject (feat > fix > refactor > chore). Strip trailing `[P]` tags. Max 72 chars. **PR body** (default template when no project template): ```markdown ## Summary <1-3 bullets — WHAT and WHY, not commit dump> - {outcome 1} - {outcome 2} ## Changes - **{area}** — {what changed there in plain terms} ## Test Plan - [ ] {step 1 — usually run dev server, navigate to /route} - [ ] {step 2 — golden-path action} - [ ] {step 3 — edge case or failure mode} - [ ] Run `npm test` — all pass - [ ] Run `npm run build` — succeeds ## Screenshots / Recording ## Related Closes # | Refs: --- 🤖 PR body generated by taw-git ``` **Open the PR:** ```bash gh pr create \ --base "$BASE" \ --head "$HEAD_BRANCH" \ --title "$TITLE" \ --body-file /tmp/taw-pr-body.md \ --web # opens browser to edit before submit — safer ``` For immediate submit: drop `--web`. **Without `gh` fallback:** emit URL user pastes: ``` taw: tạo PR tại đây, paste body từ /tmp/taw-pr-body.md: https://github.com///compare/...?expand=1 ``` **Post-create:** ``` taw: PR opened — https://github.com///pull/ Assign reviewer: gh pr edit --add-reviewer Add labels: gh pr edit --add-label