Add watch-merge command and update commit-push-pr

.claude/commands/commit-push-pr.md

@@ -1,5 +1,5 @@
 ---
-allowed-tools: Bash(git checkout --branch:*), Bash(git add:*), Bash(git status:*), Bash(git push:*), Bash(git commit:*), Bash(gh pr create:*)
+allowed-tools: Bash(git checkout --branch:*), Bash(git add:*), Bash(git status:*), Bash(git push:*), Bash(git commit:*), Bash(gh pr create:*), Bash(gh label list:*), Bash(gh pr edit:*)
 description: Commit, push, and open a PR
 ---
 
@@ -17,3 +17,4 @@ Based on the above changes:
 3. Push the branch to origin
 4. Create a pull request using `gh pr create`, don't add claude as a collaborator in the PR description
 5. You have the capability to call multiple tools in a single response. You MUST do all of the above in a single message. Do not use any other tools or do anything else. Do not send any other text or messages besides these tool calls.
+6. Add appropriate labels to the PR

.claude/commands/watch-merge.md

@@ -0,0 +1,20 @@
+---
+allowed-tools: Bash(gh pr checks:*), Bash(gh pr merge:*), Bash(gh run view:*), Bash(git pull:*)
+description: Watch PR checks, fix failures, and squash merge
+---
+
+## Context
+
+- Current branch: !`git branch --show-current`
+- Latest PR: !`gh pr list --author @me --limit 1 --json number,title,url --jq '.[] | "#\(.number) \(.title) \(.url)"'`
+
+## Your task
+
+1. Watch the most recent PR's checks using `gh pr checks <number> --watch` until they all complete
+2. If all checks pass, squash merge the PR with `gh pr merge <number> --squash --delete-branch`, then `git pull`
+3. If any checks fail:
+   a. Inspect the failed check logs using `gh run view` to understand what went wrong
+   b. Fix the issue in the code
+   c. Commit and push the fix
+   d. Go back to step 1 and watch the checks again
+4. Repeat until all checks pass and the PR is merged