@phuc1403/musketeer 0.8.0 → 0.10.0

package/template/.claude/skills/git/references/gh-cli-guide.md

@@ -1,109 +1,109 @@
-# GitHub CLI Guide
-
-## Authentication
-```bash
-gh auth login        # Interactive login
-gh auth status       # Check auth state
-gh auth logout       # Logout
-```
-
-## Pull Requests
-
-### Create PR
-```bash
-# Basic
-gh pr create --base main --head feature-branch --title "feat: add login" --body "Summary"
-
-# With HEREDOC body
-gh pr create --base main --title "feat(auth): add OAuth" --body "$(cat <<'EOF'
-## Summary
-- Added OAuth2 provider support
-- Implemented token refresh
-
-## Test plan
-- [ ] Unit tests pass
-- [ ] Manual login test
-EOF
-)"
-
-# Draft mode
-gh pr create --draft --title "WIP: new feature"
-
-# Assign reviewers
-gh pr create --reviewer @user1,@user2
-
-# Add labels
-gh pr create --label "bug,priority:high"
-```
-
-### View/Review PR
-```bash
-gh pr list                    # List PRs
-gh pr view 123                # View PR details
-gh pr view 123 --web          # Open in browser
-gh pr checkout 123            # Checkout PR locally
-gh pr diff 123                # View PR diff
-gh pr status                  # Your PRs + reviews
-```
-
-### Merge PR
-```bash
-gh pr merge 123               # Default merge commit
-gh pr merge 123 --squash      # Squash commits
-gh pr merge 123 --rebase      # Rebase merge
-gh pr merge 123 --auto        # Auto-merge when checks pass
-gh pr merge 123 --delete-branch  # Delete branch after
-```
-
-### PR Comments
-```bash
-gh pr comment 123 --body "LGTM!"
-gh api repos/{owner}/{repo}/pulls/123/comments  # View all
-```
-
-## Issues
-
-```bash
-gh issue list                 # List issues
-gh issue view 42              # View issue
-gh issue create --title "Bug" --body "Description"
-gh issue develop 42 -c        # Create branch from issue
-```
-
-## Repository
-
-```bash
-gh repo view                  # Current repo info
-gh repo clone owner/repo      # Clone
-gh browse                     # Open repo in browser
-gh browse path/to/file:42     # Open file at line
-```
-
-## Workflow Runs
-
-```bash
-gh run list                   # List workflow runs
-gh run view <run-id>          # View run details
-gh run watch                  # Watch running workflow
-gh run rerun <run-id>         # Rerun failed workflow
-```
-
-## JSON Output (scripting)
-
-```bash
-gh pr list --json number,title,author
-gh pr view 123 --json commits,reviews
-gh issue list --json number,title --jq '.[].title'
-```
-
-## Common Patterns
-
-### Create PR with auto-merge
-```bash
-gh pr create --fill && gh pr merge --auto --squash
-```
-
-### Close stale PRs
-```bash
-gh pr list --state open --json number -q '.[].number' | xargs -I {} gh pr close {}
-```
+# GitHub CLI Guide
+
+## Authentication
+```bash
+gh auth login        # Interactive login
+gh auth status       # Check auth state
+gh auth logout       # Logout
+```
+
+## Pull Requests
+
+### Create PR
+```bash
+# Basic
+gh pr create --base main --head feature-branch --title "feat: add login" --body "Summary"
+
+# With HEREDOC body
+gh pr create --base main --title "feat(auth): add OAuth" --body "$(cat <<'EOF'
+## Summary
+- Added OAuth2 provider support
+- Implemented token refresh
+
+## Test plan
+- [ ] Unit tests pass
+- [ ] Manual login test
+EOF
+)"
+
+# Draft mode
+gh pr create --draft --title "WIP: new feature"
+
+# Assign reviewers
+gh pr create --reviewer @user1,@user2
+
+# Add labels
+gh pr create --label "bug,priority:high"
+```
+
+### View/Review PR
+```bash
+gh pr list                    # List PRs
+gh pr view 123                # View PR details
+gh pr view 123 --web          # Open in browser
+gh pr checkout 123            # Checkout PR locally
+gh pr diff 123                # View PR diff
+gh pr status                  # Your PRs + reviews
+```
+
+### Merge PR
+```bash
+gh pr merge 123               # Default merge commit
+gh pr merge 123 --squash      # Squash commits
+gh pr merge 123 --rebase      # Rebase merge
+gh pr merge 123 --auto        # Auto-merge when checks pass
+gh pr merge 123 --delete-branch  # Delete branch after
+```
+
+### PR Comments
+```bash
+gh pr comment 123 --body "LGTM!"
+gh api repos/{owner}/{repo}/pulls/123/comments  # View all
+```
+
+## Issues
+
+```bash
+gh issue list                 # List issues
+gh issue view 42              # View issue
+gh issue create --title "Bug" --body "Description"
+gh issue develop 42 -c        # Create branch from issue
+```
+
+## Repository
+
+```bash
+gh repo view                  # Current repo info
+gh repo clone owner/repo      # Clone
+gh browse                     # Open repo in browser
+gh browse path/to/file:42     # Open file at line
+```
+
+## Workflow Runs
+
+```bash
+gh run list                   # List workflow runs
+gh run view <run-id>          # View run details
+gh run watch                  # Watch running workflow
+gh run rerun <run-id>         # Rerun failed workflow
+```
+
+## JSON Output (scripting)
+
+```bash
+gh pr list --json number,title,author
+gh pr view 123 --json commits,reviews
+gh issue list --json number,title --jq '.[].title'
+```
+
+## Common Patterns
+
+### Create PR with auto-merge
+```bash
+gh pr create --fill && gh pr merge --auto --squash
+```
+
+### Close stale PRs
+```bash
+gh pr list --state open --json number -q '.[].number' | xargs -I {} gh pr close {}
+```

package/template/.claude/skills/git/references/safety-protocols.md

@@ -1,69 +1,69 @@
-# Git Safety Protocols
-
-## Secret Detection Patterns
-
-### Scan Command
-```bash
-git diff --cached | grep -iE "(AKIA|api[_-]?key|token|password|secret|credential|private[_-]?key|mongodb://|postgres://|mysql://|redis://|-----BEGIN)"
-```
-
-### Patterns to Detect
-
-| Category | Pattern | Example |
-|----------|---------|---------|
-| API Keys | `api[_-]?key`, `apiKey` | `API_KEY=abc123` |
-| AWS | `AKIA[0-9A-Z]{16}` | `AKIAIOSFODNN7EXAMPLE` |
-| Tokens | `token`, `auth_token`, `jwt` | `AUTH_TOKEN=xyz` |
-| Passwords | `password`, `passwd`, `pwd` | `DB_PASSWORD=secret` |
-| Private Keys | `-----BEGIN PRIVATE KEY-----` | PEM files |
-| DB URLs | `mongodb://`, `postgres://`, `mysql://` | Connection strings |
-| OAuth | `client_secret`, `oauth_token` | `CLIENT_SECRET=abc` |
-
-### Files to Warn About
-- `.env`, `.env.*` (except `.env.example`)
-- `*.key`, `*.pem`, `*.p12`
-- `credentials.json`, `secrets.json`
-- `config/private.*`
-
-### Action on Detection
-1. **BLOCK commit immediately**
-2. Show matching lines: `git diff --cached | grep -B2 -A2 <pattern>`
-3. Suggest: "Add to .gitignore or use environment variables"
-4. Offer to unstage: `git reset HEAD <file>`
-
-## Branch Protection
-
-### Never Force Push To
-- `main`, `master`, `production`, `prod`, `release/*`
-
-### Pre-Merge Checks
-```bash
-# Check for conflicts before merge
-git merge --no-commit --no-ff origin/{branch} && git merge --abort
-```
-
-### Remote-First Operations
-Always use `origin/{branch}` for comparisons:
-- ✅ `git diff origin/main...origin/feature`
-- ❌ `git diff main...HEAD` (includes local uncommitted)
-
-## Error Recovery
-
-### Undo Last Commit (unpushed)
-```bash
-git reset --soft HEAD~1  # Keep changes staged
-git reset HEAD~1         # Keep changes unstaged
-```
-
-### Abort Merge
-```bash
-git merge --abort
-```
-
-### Discard Local Changes
-```bash
-git checkout -- <file>   # Single file
-git reset --hard HEAD    # All files (DANGER)
-```
-
-**Always confirm with user before destructive operations.**
+# Git Safety Protocols
+
+## Secret Detection Patterns
+
+### Scan Command
+```bash
+git diff --cached | grep -iE "(AKIA|api[_-]?key|token|password|secret|credential|private[_-]?key|mongodb://|postgres://|mysql://|redis://|-----BEGIN)"
+```
+
+### Patterns to Detect
+
+| Category | Pattern | Example |
+|----------|---------|---------|
+| API Keys | `api[_-]?key`, `apiKey` | `API_KEY=abc123` |
+| AWS | `AKIA[0-9A-Z]{16}` | `AKIAIOSFODNN7EXAMPLE` |
+| Tokens | `token`, `auth_token`, `jwt` | `AUTH_TOKEN=xyz` |
+| Passwords | `password`, `passwd`, `pwd` | `DB_PASSWORD=secret` |
+| Private Keys | `-----BEGIN PRIVATE KEY-----` | PEM files |
+| DB URLs | `mongodb://`, `postgres://`, `mysql://` | Connection strings |
+| OAuth | `client_secret`, `oauth_token` | `CLIENT_SECRET=abc` |
+
+### Files to Warn About
+- `.env`, `.env.*` (except `.env.example`)
+- `*.key`, `*.pem`, `*.p12`
+- `credentials.json`, `secrets.json`
+- `config/private.*`
+
+### Action on Detection
+1. **BLOCK commit immediately**
+2. Show matching lines: `git diff --cached | grep -B2 -A2 <pattern>`
+3. Suggest: "Add to .gitignore or use environment variables"
+4. Offer to unstage: `git reset HEAD <file>`
+
+## Branch Protection
+
+### Never Force Push To
+- `main`, `master`, `production`, `prod`, `release/*`
+
+### Pre-Merge Checks
+```bash
+# Check for conflicts before merge
+git merge --no-commit --no-ff origin/{branch} && git merge --abort
+```
+
+### Remote-First Operations
+Always use `origin/{branch}` for comparisons:
+- ✅ `git diff origin/main...origin/feature`
+- ❌ `git diff main...HEAD` (includes local uncommitted)
+
+## Error Recovery
+
+### Undo Last Commit (unpushed)
+```bash
+git reset --soft HEAD~1  # Keep changes staged
+git reset HEAD~1         # Keep changes unstaged
+```
+
+### Abort Merge
+```bash
+git merge --abort
+```
+
+### Discard Local Changes
+```bash
+git checkout -- <file>   # Single file
+git reset --hard HEAD    # All files (DANGER)
+```
+
+**Always confirm with user before destructive operations.**

package/template/.claude/skills/git/references/workflow-commit.md

@@ -1,58 +1,58 @@
-# Commit Workflow
-
-Execute via `git-manager` subagent.
-
-## Tool 1: Stage + Analyze
-```bash
-git add -A && \
-echo "=== STAGED ===" && git diff --cached --stat && \
-echo "=== SECURITY ===" && \
-git diff --cached | grep -c -iE "(api[_-]?key|token|password|secret|credential)" | awk '{print "SECRETS:"$1}' && \
-echo "=== GROUPS ===" && \
-git diff --cached --name-only | awk -F'/' '{
-  if ($0 ~ /\.(md|txt)$/) print "docs:"$0
-  else if ($0 ~ /test|spec/) print "test:"$0
-  else if ($0 ~ /\.claude/) print "config:"$0
-  else if ($0 ~ /package\.json|lock/) print "deps:"$0
-  else print "code:"$0
-}'
-```
-
-**If SECRETS > 0:** STOP, show matches, block commit.
-
-## Tool 2: Split Decision
-
-NOTE: 
-- Search for related issues on GitHub and add to body.
-- Only use `feat`, `fix`, or `perf` prefixes for files in `.claude` directory (do not use `docs`).
-
-**From groups, decide:**
-
-**A) Single commit:** Same type/scope, FILES ≤ 3, LINES ≤ 50
-
-**B) Multi commit:** Mixed types/scopes, group by:
-- Group 1: `config:` → `chore(config): ...`
-- Group 2: `deps:` → `chore(deps): ...`
-- Group 3: `test:` → `test: ...`
-- Group 4: `code:` → `feat|fix: ...`
-- Group 5: `docs:` → `docs: ...`
-
-## Tool 3: Commit
-
-**Single:**
-```bash
-git commit -m "type(scope): description"
-```
-
-**Multi (sequential):**
-```bash
-git reset && git add file1 file2 && git commit -m "type(scope): desc"
-```
-Repeat for each group.
-
-## Tool 4: Push (if requested)
-```bash
-git push && echo "✓ pushed: yes" || echo "✓ pushed: no"
-```
-
-**Only push if user explicitly requested** ("push", "commit and push").
+# Commit Workflow
+
+Execute via `git-manager` subagent.
+
+## Tool 1: Stage + Analyze
+```bash
+git add -A && \
+echo "=== STAGED ===" && git diff --cached --stat && \
+echo "=== SECURITY ===" && \
+git diff --cached | grep -c -iE "(api[_-]?key|token|password|secret|credential)" | awk '{print "SECRETS:"$1}' && \
+echo "=== GROUPS ===" && \
+git diff --cached --name-only | awk -F'/' '{
+  if ($0 ~ /\.(md|txt)$/) print "docs:"$0
+  else if ($0 ~ /test|spec/) print "test:"$0
+  else if ($0 ~ /\.claude/) print "config:"$0
+  else if ($0 ~ /package\.json|lock/) print "deps:"$0
+  else print "code:"$0
+}'
+```
+
+**If SECRETS > 0:** STOP, show matches, block commit.
+
+## Tool 2: Split Decision
+
+NOTE: 
+- Search for related issues on GitHub and add to body.
+- Only use `feat`, `fix`, or `perf` prefixes for files in `.claude` directory (do not use `docs`).
+
+**From groups, decide:**
+
+**A) Single commit:** Same type/scope, FILES ≤ 3, LINES ≤ 50
+
+**B) Multi commit:** Mixed types/scopes, group by:
+- Group 1: `config:` → `chore(config): ...`
+- Group 2: `deps:` → `chore(deps): ...`
+- Group 3: `test:` → `test: ...`
+- Group 4: `code:` → `feat|fix: ...`
+- Group 5: `docs:` → `docs: ...`
+
+## Tool 3: Commit
+
+**Single:**
+```bash
+git commit -m "type(scope): description"
+```
+
+**Multi (sequential):**
+```bash
+git reset && git add file1 file2 && git commit -m "type(scope): desc"
+```
+Repeat for each group.
+
+## Tool 4: Push (if requested)
+```bash
+git push && echo "✓ pushed: yes" || echo "✓ pushed: no"
+```
+
+**Only push if user explicitly requested** ("push", "commit and push").

package/template/.claude/skills/git/references/workflow-merge-pr.md

@@ -0,0 +1,136 @@
+# Merge PR Workflow
+
+Execute via `git-manager` subagent.
+
+## Variables
+- PR_REFS: one or more PR numbers or GitHub PR URLs
+- READY_LABEL: `ready to ship`
+
+## Step 1: Parse and Inspect
+
+Require at least one PR ref:
+
+```bash
+gh auth status
+gh repo view --json nameWithOwner,defaultBranchRef
+for pr in "$@"; do
+  gh pr view "$pr" --json number,url,title,baseRefName,headRefName,mergeStateStatus,statusCheckRollup
+done
+```
+
+If any PR ref is invalid, from another repo, closed, or not visible to `gh`, stop before reviewing or merging any PRs.
+
+## Step 2: Review
+
+For each PR, run the code review:
+
+```bash
+/code-review <PR number or URL>
+```
+
+Do not label or merge until all of these hold:
+- the review reports no Critical or Important findings
+- `mergeStateStatus` from Step 1 shows no conflicts
+- required PR checks are terminal and green (`statusCheckRollup` from Step 1)
+
+The review reports findings; it does not auto-fix them and posts nothing back to
+GitHub. Fix anything blocking, push, then re-run this step before continuing.
+
+`/code-review` ships in the optional `code-review` component. If it is not
+installed, review the PR diff directly (`gh pr diff <PR>`) and apply the same
+gate before labeling — never skip the review step.
+
+If a PR still needs changes, stop the entire merge batch. Report:
+- PR number/URL
+- remaining findings or blockers
+- exact failed checks or merge state, if any
+- recommended next action
+
+## Step 3: Apply Ready Label
+
+Ensure the label exists, then apply it to each reviewed-ready PR:
+
+```bash
+gh label list --json name --jq '.[].name' | grep -Fx "ready to ship" >/dev/null \
+  || gh label create "ready to ship" --color "0E8A16" --description "Reviewed and ready to merge"
+gh pr edit "$PR_REF" --add-label "ready to ship"
+```
+
+If labeling fails for any reason other than an already-existing label, stop and report the exact `gh` error.
+
+## Step 4: Merge
+
+Merge reviewed-ready PRs one at a time in the order provided.
+
+Before each merge:
+- re-read `mergeStateStatus`, `baseRefName`, and `statusCheckRollup`
+- confirm required checks are still green or use auto-merge if branch protection is waiting on pending checks
+- use the repository's allowed merge method and branch-protection rules
+
+Select the merge method before running `gh pr merge`; do not let `gh` prompt interactively:
+
+```bash
+MERGE_METHOD_FLAG="--merge" # or --squash / --rebase, based on repo convention
+gh pr merge "$PR_REF" --auto --delete-branch "$MERGE_METHOD_FLAG"
+```
+
+Use `--auto` when required checks are pending. If checks are already green, use the same repo convention without `--auto`:
+
+```bash
+gh pr merge "$PR_REF" --delete-branch "$MERGE_METHOD_FLAG"
+```
+
+Never force push. Never direct-push to protected target branches.
+
+## Step 5: Watch Target-Branch CI
+
+After each merge, capture the base branch and merge commit:
+
+```bash
+gh pr view "$PR_REF" --json baseRefName,mergeCommit
+```
+
+Watch CI/deploy workflows for that merge commit on the target branch:
+
+```bash
+gh run list --branch "$BASE_BRANCH" --commit "$MERGE_SHA" --json databaseId,status,conclusion,name,url
+gh run watch "$RUN_ID" --exit-status
+```
+
+If no workflow appears immediately, poll briefly before deciding there are no workflows for the merge commit.
+
+## Step 6: CI Failure Convergence
+
+If target-branch CI fails:
+
+1. Inspect failed logs:
+   ```bash
+   gh run view "$RUN_ID" --json status,conclusion,jobs
+   gh run view "$RUN_ID" --job "$JOB_ID" --log
+   ```
+2. If the failure is transient infrastructure, rerun failed jobs once:
+   ```bash
+   gh run rerun "$RUN_ID" --failed
+   ```
+3. If the failure is deterministic and repo-fixable, stop and report it with:
+   workflow name, run id, job id, the failing command, and the exact error.
+4. Once the fix is made, ship it through PR review/merge, then watch target-branch CI again.
+
+Stop when target-branch CI succeeds, an external blocker remains, or the same blocker survives 3 attempts.
+
+## Output Format
+
+```text
+reviewed: PR #123 no blocking findings, CI green
+labeled: PR #123 ready to ship
+merged: PR #123 into dev (merge SHA abc123)
+CI: green for abc123
+```
+
+If blocked:
+
+```text
+stopped: PR #123 not merge-ready
+reason: <finding/check/merge blocker>
+suggestion: <next action>
+```