@phuc1403/musketeer 0.7.0 → 0.9.0

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>
+```

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

@@ -1,48 +1,48 @@
-# Merge Workflow
-
-Execute via `git-manager` subagent.
-
-## Variables
-- TO_BRANCH: target (defaults to `main`)
-- FROM_BRANCH: source (defaults to current branch)
-
-## Step 1: Sync with Remote
-
-**IMPORTANT: Always merge `main` (or any default branch) to current branch first.**
-
-```bash
-git fetch origin
-git checkout {TO_BRANCH}
-git pull origin {TO_BRANCH}
-```
-
-## Step 2: Merge from REMOTE
-```bash
-git merge origin/{FROM_BRANCH} --no-ff -m "merge: {FROM_BRANCH} into {TO_BRANCH}"
-```
-
-**Why `origin/{FROM_BRANCH}`:** Ensures merging only committed+pushed changes, not local WIP.
-
-## Step 3: Resolve Conflicts
-If conflicts:
-1. Resolve manually
-2. `git add . && git commit`
-3. If clarifications needed, report to main agent
-
-## Step 4: Push
-```bash
-git push origin {TO_BRANCH}
-```
-
-## Pre-Merge Checklist
-- Fetch latest: `git fetch origin`
-- Ensure FROM_BRANCH pushed to remote
-- Check for conflicts: `git merge --no-commit --no-ff origin/{FROM_BRANCH}` then abort
-
-## Error Handling
-
-| Error | Action |
-|-------|--------|
-| Merge conflicts | Resolve manually, then commit |
-| Branch not found | Verify branch name, ensure pushed |
-| Push rejected | `git pull --rebase`, retry |
+# Merge Workflow
+
+Execute via `git-manager` subagent.
+
+## Variables
+- TO_BRANCH: target (defaults to `main`)
+- FROM_BRANCH: source (defaults to current branch)
+
+## Step 1: Sync with Remote
+
+**IMPORTANT: Always merge `main` (or any default branch) to current branch first.**
+
+```bash
+git fetch origin
+git checkout {TO_BRANCH}
+git pull origin {TO_BRANCH}
+```
+
+## Step 2: Merge from REMOTE
+```bash
+git merge origin/{FROM_BRANCH} --no-ff -m "merge: {FROM_BRANCH} into {TO_BRANCH}"
+```
+
+**Why `origin/{FROM_BRANCH}`:** Ensures merging only committed+pushed changes, not local WIP.
+
+## Step 3: Resolve Conflicts
+If conflicts:
+1. Resolve manually
+2. `git add . && git commit`
+3. If clarifications needed, report to main agent
+
+## Step 4: Push
+```bash
+git push origin {TO_BRANCH}
+```
+
+## Pre-Merge Checklist
+- Fetch latest: `git fetch origin`
+- Ensure FROM_BRANCH pushed to remote
+- Check for conflicts: `git merge --no-commit --no-ff origin/{FROM_BRANCH}` then abort
+
+## Error Handling
+
+| Error | Action |
+|-------|--------|
+| Merge conflicts | Resolve manually, then commit |
+| Branch not found | Verify branch name, ensure pushed |
+| Push rejected | `git pull --rebase`, retry |

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

@@ -1,58 +1,58 @@
-# Pull Request Workflow
-
-Execute via `git-manager` subagent.
-
-## Variables
-- TO_BRANCH: target (defaults to `main`)
-- FROM_BRANCH: source (defaults to current branch)
-
-## CRITICAL: Use REMOTE diff
-PRs based on remote branches. Local diff includes unpushed changes.
-
-## Tool 1: Sync + Analyze
-
-**IMPORTANT: Always merge `main` (or any default branch) to current branch first.**
-
-```bash
-git fetch origin && \
-git push -u origin HEAD 2>/dev/null || true && \
-BASE=${BASE_BRANCH:-main} && \
-HEAD=$(git rev-parse --abbrev-ref HEAD) && \
-echo "=== PR: $HEAD → $BASE ===" && \
-echo "=== COMMITS ===" && \
-git log origin/$BASE...origin/$HEAD --oneline && \
-echo "=== FILES ===" && \
-git diff origin/$BASE...origin/$HEAD --stat
-```
-
-**If "Branch not on remote":** Push first, retry.
-
-## Tool 2: Generate Content
-**Title:** Conventional commit format, <72 chars, NO version numbers
-**Body:** Summary bullets + Test plan checklist
-
-## Tool 3: Create PR
-```bash
-gh pr create --base $BASE --head $HEAD --title "..." --body "$(cat <<'EOF'
-## Summary
-- Bullet points
-
-## Test plan
-- [ ] Test item
-EOF
-)"
-```
-
-## DO NOT use (local comparison)
-- ❌ `git diff main...HEAD`
-- ❌ `git diff --cached`
-- ❌ `git status`
-
-## Error Handling
-
-| Error | Action |
-|-------|--------|
-| Branch not on remote | `git push -u origin HEAD`, retry |
-| Empty diff | Warn: "No changes for PR" |
-| Push rejected | `git pull --rebase`, resolve, push |
-| No upstream | `git push -u origin HEAD` |
+# Pull Request Workflow
+
+Execute via `git-manager` subagent.
+
+## Variables
+- TO_BRANCH: target (defaults to `main`)
+- FROM_BRANCH: source (defaults to current branch)
+
+## CRITICAL: Use REMOTE diff
+PRs based on remote branches. Local diff includes unpushed changes.
+
+## Tool 1: Sync + Analyze
+
+**IMPORTANT: Always merge `main` (or any default branch) to current branch first.**
+
+```bash
+git fetch origin && \
+git push -u origin HEAD 2>/dev/null || true && \
+BASE=${BASE_BRANCH:-main} && \
+HEAD=$(git rev-parse --abbrev-ref HEAD) && \
+echo "=== PR: $HEAD → $BASE ===" && \
+echo "=== COMMITS ===" && \
+git log origin/$BASE...origin/$HEAD --oneline && \
+echo "=== FILES ===" && \
+git diff origin/$BASE...origin/$HEAD --stat
+```
+
+**If "Branch not on remote":** Push first, retry.
+
+## Tool 2: Generate Content
+**Title:** Conventional commit format, <72 chars, NO version numbers
+**Body:** Summary bullets + Test plan checklist
+
+## Tool 3: Create PR
+```bash
+gh pr create --base $BASE --head $HEAD --title "..." --body "$(cat <<'EOF'
+## Summary
+- Bullet points
+
+## Test plan
+- [ ] Test item
+EOF
+)"
+```
+
+## DO NOT use (local comparison)
+- ❌ `git diff main...HEAD`
+- ❌ `git diff --cached`
+- ❌ `git status`
+
+## Error Handling
+
+| Error | Action |
+|-------|--------|
+| Branch not on remote | `git push -u origin HEAD`, retry |
+| Empty diff | Warn: "No changes for PR" |
+| Push rejected | `git pull --rebase`, resolve, push |
+| No upstream | `git push -u origin HEAD` |

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

@@ -1,52 +1,52 @@
-# Push Workflow
-
-Execute via `git-manager` subagent.
-
-## Pre-Push Checklist
-1. All changes committed
-2. Secrets scanned (see `safety-protocols.md`)
-3. Branch pushed to remote
-
-## Tool 1: Verify State
-```bash
-git status && \
-git log origin/$(git rev-parse --abbrev-ref HEAD)..HEAD --oneline 2>/dev/null || echo "NO_UPSTREAM"
-```
-
-**If uncommitted changes:** Warn user, suggest commit first.
-**If NO_UPSTREAM:** Use `git push -u origin HEAD`.
-
-## Tool 2: Push
-```bash
-git push origin HEAD
-```
-
-**On success:** Report commit hashes pushed.
-
-## Error Handling
-
-| Error | Cause | Solution |
-|-------|-------|----------|
-| `rejected - non-fast-forward` | Remote has newer commits | `git pull --rebase`, resolve conflicts, push again |
-| `no upstream branch` | Branch not tracked | `git push -u origin HEAD` |
-| `Authentication failed` | Invalid credentials | Check `gh auth status` or SSH keys |
-| `Repository not found` | Wrong remote URL | Verify `git remote -v` |
-| `Permission denied` | No write access | Check repository permissions |
-
-## Force Push (DANGER)
-
-**NEVER force push to main/master/production branches.**
-
-If user explicitly requests force push on feature branch:
-```bash
-git push -f origin HEAD
-```
-
-**Warn user:** "Force push rewrites history. Collaborators may lose work."
-
-## Output Format
-```
-✓ pushed: N commits to origin/{branch}
-  - abc123 feat(auth): add login
-  - def456 fix(api): resolve timeout
-```
+# Push Workflow
+
+Execute via `git-manager` subagent.
+
+## Pre-Push Checklist
+1. All changes committed
+2. Secrets scanned (see `safety-protocols.md`)
+3. Branch pushed to remote
+
+## Tool 1: Verify State
+```bash
+git status && \
+git log origin/$(git rev-parse --abbrev-ref HEAD)..HEAD --oneline 2>/dev/null || echo "NO_UPSTREAM"
+```
+
+**If uncommitted changes:** Warn user, suggest commit first.
+**If NO_UPSTREAM:** Use `git push -u origin HEAD`.
+
+## Tool 2: Push
+```bash
+git push origin HEAD
+```
+
+**On success:** Report commit hashes pushed.
+
+## Error Handling
+
+| Error | Cause | Solution |
+|-------|-------|----------|
+| `rejected - non-fast-forward` | Remote has newer commits | `git pull --rebase`, resolve conflicts, push again |
+| `no upstream branch` | Branch not tracked | `git push -u origin HEAD` |
+| `Authentication failed` | Invalid credentials | Check `gh auth status` or SSH keys |
+| `Repository not found` | Wrong remote URL | Verify `git remote -v` |
+| `Permission denied` | No write access | Check repository permissions |
+
+## Force Push (DANGER)
+
+**NEVER force push to main/master/production branches.**
+
+If user explicitly requests force push on feature branch:
+```bash
+git push -f origin HEAD
+```
+
+**Warn user:** "Force push rewrites history. Collaborators may lose work."
+
+## Output Format
+```
+✓ pushed: N commits to origin/{branch}
+  - abc123 feat(auth): add login
+  - def456 fix(api): resolve timeout
+```