@nvice-r/pr-commands 0.1.1 → 0.1.3

package/README.md

@@ -23,11 +23,16 @@ The interactive wizard:
 4. **Identity + token** — reads your API token from the keychain (or tells you how to add one).
 5. **Reviewers** — fetches the repo's default reviewers into an interactive checklist
    (`↑/↓` move · `space` toggle · `a` all · `n` none · `b` back · `enter` confirm; all pre-selected).
+   On reinstall, an existing roster is kept: its members are pre-selected instead, and entries
+   that aren't current default reviewers are carried over as-is.
 6. **Convention** — pick a preset, then review/edit its title-pattern, ticket-regex, and
    template-sections (each pre-filled from the preset, editable). A placeholder legend
    (`<ver>`, `<desc>`, `<ticket>`, …) is shown. Concrete values are written to config — `/pr`
    reads those, not a hard-coded table.
-7. **Install** — writes config + roster, drops the binaries and the `/pr` skill.
+7. **Agents** — checklist of supported agents (claude-code / antigravity / codex / opencode) with
+   installed ones pre-checked; toggle which get the `pr` skill. (`--agent` skips this; `--yes` = detected.)
+8. **Install** — writes config + roster + binaries, then installs the portable `pr` skill into
+   the chosen agents (symlinked to one canonical copy) + Claude's `/pr` command.
 
 Every prompt is reversible: in a list press `b` to step back; in a text field, append `:b` to
 the value and press enter (the field is pre-filled, so `:b` at the end triggers back). Back
@@ -39,8 +44,11 @@ Flags:
 |------|--------|
 | `--dir <path>` | repo to configure (default: cwd) |
 | `--provider <p>` | force `bitbucket`\|`github`\|`gitlab` instead of detecting |
+| `--agent <id>` | force skill install to this agent (repeatable): `claude-code`\|`antigravity`\|`codex`\|`opencode`. Default: auto-detect |
 | `--all` | install every ready provider binary, not just the detected one |
-| `--yes` | non-interactive: reviewers = all, convention = `trueid` |
+| `--agent-dir <dir>` | repo folder for the reviewer roster (default: primary agent's — `.claude`/`.agent`/`.codex`/`.opencode`) |
+| `--yes` | non-interactive: reviewers = existing roster if any, else all; convention = `trueid` |
+| `--reset-reviewers` | ignore an existing roster and rebuild it from the repo's default reviewers |
 | `--dry-run` | print planned actions, write nothing |
 | `--help` | usage |
 
@@ -65,16 +73,23 @@ npx @nvice-r/pr-commands --dry-run --dir /path/to/repo
 
 ## What gets installed
 
-Everything is **global** — nothing lands in a repo's `.claude/`, so it works identically from
-every clone and every git worktree, no symlinks.
+Everything user-global is **global** — nothing lands in a repo's agent dir, so it works
+identically from every clone and every git worktree, no repo-local symlinks.
 
 | Artifact | Path |
 |----------|------|
 | Shared library | `~/.local/bin/pr-common.sh` |
 | Provider binary | `~/.local/bin/bbpr` (`ghpr`/`glpr` later) |
 | Config | `~/.config/pr/config` |
-| Reviewer roster | `<main-repo-root>/<agent_dir>/pr-reviewers.txt` (default `.claude`; shared across worktrees) |
-| `/pr` skill | `~/.claude/commands/pr.md` |
+| Reviewer roster | `<main-repo-root>/<agent_dir>/pr-reviewers.txt` (primary agent's folder; shared across worktrees) |
+| Canonical skill | `~/.config/pr/skill/pr/SKILL.md` (single source) |
+| Per-agent skill | `<agent-skills-dir>/pr` → symlink to canonical |
+| Claude `/pr` command | `~/.claude/commands/pr.md` (dual-install, keeps the slash trigger) |
+
+The skill is a **portable `SKILL.md`** installed into every detected agent — **claude-code,
+antigravity, codex, opencode** — via one canonical copy each agent symlinks to (`npx skills`
+single-source model). Force a target with `--agent <id>`. A pre-existing non-symlink `pr` skill
+dir is never overwritten (the installer skips and warns).
 
 ## Usage
 
@@ -104,6 +119,30 @@ convention=trueid    # see presets
 Edit by hand any time. **A missing config is a hard error** — `/pr` and the binaries refuse to
 guess. Re-run the installer to regenerate.
 
+### Per-project convention (`.agents/config/pr.yaml`)
+
+When the repo has `.agents/config/pr.yaml` (this checkout, or the main checkout for worktrees),
+`/pr` reads the convention from it instead of the user config. One file per project, so teams
+with different conventions share the same skill:
+
+```yaml
+title_pattern: "[<ver>] Feature/<ver>/<ticket> <desc>"
+ticket_regex: "SC-(\\d+|NOTICKET)"
+template_sections: [What Happened, Insight, Proof of Work]
+body_rules: |
+  - Free-text project rules the skill follows literally.
+base: develop            # default base proposal
+draft: ask               # ask | true | false
+push: [origin]           # remotes pushed before create
+fork:                    # optional cross-repo mode (`/pr cross`)
+  remote: social-commerce
+  repo: workspace/fork-repo
+pre_pr: []               # commands run before confirm; non-zero exit stops /pr
+post_pr: [jira-update]   # sibling skills offered after create
+```
+
+Without the file, the convention keys below (written by the wizard) are used.
+
 ### Convention presets
 
 | preset | title pattern | ticket regex | template sections |
@@ -124,14 +163,18 @@ template_sections=Context|Changes|Risk
 
 ### Reviewers
 
-Roster lives **in the agent folder** under the main repo root (`agent_dir` in config, default
-`.claude`), so it's editable next to the code. Resolved via `git --git-common-dir/..`, so all
-worktrees of a repo share one roster:
+Roster lives in the **primary agent's repo folder** under the main repo root — `.claude`,
+`.agent` (Antigravity), `.codex` or `.opencode`, picked from the first agent you install for
+(override with `--agent-dir`). The choice is saved as `agent_dir` in the config so the bash binary
+reads the same path. Resolved via `git --git-common-dir/..`, so all worktrees of a repo share one
+roster:
 
 ```
-<main-repo-root>/.claude/pr-reviewers.txt        # or <agent_dir>/… — .cursor, .aider, …
+<main-repo-root>/<agent_dir>/pr-reviewers.txt
 ```
 
+Switching primary agent = re-run the installer; the old file still loads as a fallback.
+
 You (the author) are excluded on install — bbpr also drops self at PR time. One entry per line,
 trailing `# Name` comment optional:
 
@@ -140,10 +183,10 @@ trailing `# Name` comment optional:
 {fedcba98-7654-3210-fedc-ba9876543210}  # Bob
 ```
 
-It's plain data — edit freely, no reinstall. Consider gitignoring it unless the team wants the
-roster committed. Load order: `$BBPR_REVIEWERS` → `<agent_dir>/pr-reviewers.txt` → root
-`.pr-reviewers.txt` (pre-0.1.1) → global `~/.config/pr/reviewers/<ws>-<slug>.txt` → legacy.
-Run-time overrides: `--no-reviewers` skips all, `--reviewer <uuid>` appends.
+It's plain data — edit freely, no reinstall. Consider gitignoring the roster unless the team wants
+it committed. Load order: `$BBPR_REVIEWERS` → `<agent_dir>/pr-reviewers.txt` → `.pr/reviewers.txt`
+(0.1.2) → root `.pr-reviewers.txt` (pre-0.1.1) → global `~/.config/pr/reviewers/<ws>-<slug>.txt` →
+legacy. Run-time overrides: `--no-reviewers` skips all, `--reviewer <uuid>` appends.
 
 ### Auth precedence (email)
 
@@ -185,7 +228,8 @@ Full rationale in [`DECISIONS.md`](./DECISIONS.md).
 | reviewers not fetched | add the keychain token (see Prerequisites), re-run |
 | `WARN ~/.local/bin not on PATH` | add the export line above to your shell rc |
 | `not-yet-supported: <provider>` | GitHub/GitLab aren't implemented yet |
-| worktree runs old behavior | nothing is repo-local here; ensure `pr.md` is at `~/.claude/commands/pr.md`, not a stale repo copy |
+| worktree runs old behavior | skill/binaries are global, not repo-local; ensure no stale per-repo copy shadows them |
+| agent doesn't see the skill | re-run and force it: `npx @nvice-r/pr-commands --agent <id>`; check `<agent-skills-dir>/pr` symlink exists |
 
 ## Uninstall
 
@@ -193,16 +237,18 @@ Full rationale in [`DECISIONS.md`](./DECISIONS.md).
 rm ~/.local/bin/bbpr ~/.local/bin/pr-common.sh
 rm -rf ~/.config/pr
 rm ~/.claude/commands/pr.md
+# per-agent skill symlinks (remove those you installed):
+rm ~/.claude/skills/pr ~/.gemini/antigravity/skills/pr ~/.codex/skills/pr ~/.config/opencode/skills/pr
 # roster lives in each repo — remove per repo if wanted:
-rm <main-repo-root>/.claude/pr-reviewers.txt
+rm -rf <main-repo-root>/.pr
 ```
 
 ## Development
 
 ```
-install.js          npx entry (wizard)
-assets/bin/*        provider binaries + shared lib (source of truth; copied on install)
-assets/skill/pr.md  generic /pr skill (source of truth; copied on install)
+install.js             npx entry (wizard)
+assets/bin/*           provider binaries + shared lib (source of truth; copied on install)
+assets/skill/pr.body.md  shared /pr skill body (frontmatter added per-target on install)
 ```
 
 `assets/` is the single source of truth — both the installer (`install.js`)

package/assets/bin/bbpr

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
-# bbpr-version: 8
+# bbpr-version: 9
 # bbpr — create a Bitbucket Cloud pull request (REST API v2.0).
 # Provider-specific layer; all git/config/creds/reviewer logic lives in pr-common.sh.
 # Usage: bbpr --title "..." [--body|--body-file] [--source b] [--dest b] [--repo w/s]
 #             [--draft] [--reviewer uuid]... [--no-reviewers] [--email a] [--close-source]
+#             [--source-repo ws/fork]   (cross-repo: PR opens in --repo/origin, from the fork)
 
 set -euo pipefail
 
@@ -35,7 +36,7 @@ fi
 
 # --- Bitbucket payload (source/destination keys, draft, reviewers[]) ---
 PAYLOAD="$(
-  TITLE="$TITLE" BODY="$BODY" SOURCE="$SOURCE" DEST="$DEST" \
+  TITLE="$TITLE" BODY="$BODY" SOURCE="$SOURCE" DEST="$DEST" SOURCE_REPO="$SOURCE_REPO" \
   DRAFT="$DRAFT" CLOSE_SOURCE="$CLOSE_SOURCE" \
   REVIEWERS_JSON="$(printf '%s\n' "${FINAL_REVIEWERS[@]:-}" | python3 -c 'import json,sys; print(json.dumps([{"uuid": l.strip()} for l in sys.stdin if l.strip()]))')" \
   python3 -c '
@@ -48,6 +49,8 @@ p = {
   "draft": os.environ["DRAFT"] == "true",
   "close_source_branch": os.environ["CLOSE_SOURCE"] == "true",
 }
+if os.environ["SOURCE_REPO"]:
+  p["source"]["repository"] = {"full_name": os.environ["SOURCE_REPO"]}
 revs = json.loads(os.environ["REVIEWERS_JSON"])
 if revs: p["reviewers"] = revs
 print(json.dumps(p))
@@ -56,7 +59,7 @@ print(json.dumps(p))
 
 URL="https://api.bitbucket.org/2.0/repositories/${REPO}/pullrequests"
 echo "POST $URL"
-echo "source=$SOURCE  dest=$DEST  draft=$DRAFT  reviewers=${#FINAL_REVIEWERS[@]}"
+echo "source=${SOURCE_REPO:+$SOURCE_REPO:}$SOURCE  dest=$DEST  draft=$DRAFT  reviewers=${#FINAL_REVIEWERS[@]}"
 
 RESP="$(curl -sS -X POST "$URL" -u "${EMAIL}:${TOKEN}" \
   -H 'Content-Type: application/json' -d "$PAYLOAD")"
@@ -67,7 +70,7 @@ try: d = json.loads(sys.stdin.read())
 except Exception as e: print("non-JSON response", e); sys.exit(2)
 if "error" in d: print("ERROR:", json.dumps(d["error"], indent=2)); sys.exit(1)
 print(str(d.get("id")) + "\t" + str(d.get("links", {}).get("html", {}).get("href")))
-')"
+')" || { echo "$PR_INFO" >&2; exit 1; }   # surface the API error; set -e would swallow it
 
 NEW_PR_ID="$(echo "$PR_INFO" | cut -f1)"
 NEW_PR_URL="$(echo "$PR_INFO" | cut -f2)"

package/assets/bin/pr-common.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-# pr-common-version: 1
+# pr-common-version: 2
 # pr-common.sh — shared library for provider PR binaries (bbpr/ghpr/glpr).
 # NOT executable on its own — sourced by a provider binary, which then builds the
 # provider-specific payload + POST. Everything here is provider-AGNOSTIC.
 #
 # Provides (after `pr_common_init "$@"`): global vars
-#   TITLE BODY SOURCE DEST REPO EMAIL TOKEN DRAFT CLOSE_SOURCE
+#   TITLE BODY SOURCE DEST REPO SOURCE_REPO EMAIL TOKEN DRAFT CLOSE_SOURCE
 #   FINAL_REVIEWERS[]   (uuids, self already NOT dropped — provider does that)
 # Provides functions:
 #   die, get_token, pr_load_config, pr_parse_args, pr_git_defaults,
@@ -38,7 +38,7 @@ pr_load_config() {
     esac
   done < "$CONFIG_FILE"
   : "${CFG_TOKEN_SRC:=keychain}"
-  : "${CFG_AGENT_DIR:=.claude}"          # agent folder holding the roster (relative to main repo root)
+  : "${CFG_AGENT_DIR:=.claude}"          # primary agent's repo folder holding the roster (relative to main repo root)
 }
 
 # --- token retrieval, OS-switched (D1: OS is a function, not a binary axis) ---
@@ -61,10 +61,14 @@ get_token() {
 
 # --- arg parse (common flags across all providers) ---
 pr_parse_args() {
-  TITLE=""; BODY=""; BODY_FILE=""; SOURCE=""; DEST=""; REPO=""
+  TITLE=""; BODY=""; BODY_FILE=""; SOURCE=""; DEST=""; REPO=""; SOURCE_REPO=""
   DRAFT="false"; CLOSE_SOURCE="false"; NO_REVIEWERS="false"; EMAIL_ARG=""
   EXTRA_REVIEWERS=()
   while [ $# -gt 0 ]; do
+    case "$1" in
+      --title|--body|--body-file|--source|--dest|--target|--repo|--source-repo|--reviewer|--email)
+        [ $# -ge 2 ] || die "$1 needs a value" ;;
+    esac
     case "$1" in
       --title)         TITLE="$2"; shift 2 ;;
       --body)          BODY="$2"; shift 2 ;;
@@ -72,6 +76,7 @@ pr_parse_args() {
       --source)        SOURCE="$2"; shift 2 ;;
       --dest|--target) DEST="$2"; shift 2 ;;
       --repo)          REPO="$2"; shift 2 ;;
+      --source-repo)   SOURCE_REPO="$2"; shift 2 ;;   # fork → cross-repo PR
       --draft)         DRAFT="true"; shift ;;
       --close-source)  CLOSE_SOURCE="true"; shift ;;
       --reviewer)      EXTRA_REVIEWERS+=("$2"); shift 2 ;;
@@ -130,9 +135,10 @@ pr_load_reviewers() {
     local mainroot; mainroot="$(cd "$(git rev-parse --git-common-dir 2>/dev/null)/.." 2>/dev/null && pwd)"
     for cand in \
       ${mainroot:+"$mainroot/${CFG_AGENT_DIR:-.claude}/pr-reviewers.txt"} \
+      ${mainroot:+"$mainroot/.pr/reviewers.txt"} \
       ${mainroot:+"$mainroot/.pr-reviewers.txt"} \
       "$HOME/.config/pr/reviewers/${slug}.txt" \
-      "$HOME/.config/bbpr/bbpr-reviewers.txt"; do          # global + legacy fallbacks
+      "$HOME/.config/bbpr/bbpr-reviewers.txt"; do          # agent-dir primary; 0.1.2 .pr/ + root + global legacy fallbacks
       [ -f "$cand" ] && { file="$cand"; break; }
     done
   fi

package/assets/skill/pr.body.md

@@ -0,0 +1,278 @@
+Create a pull request for the current branch. Provider (Bitbucket / GitHub / GitLab) is
+auto-detected from the git remote; the matching binary (`bbpr` / `ghpr` / `glpr`) is invoked.
+Convention (title pattern, ticket regex, PR template, body rules, push remotes, hooks) comes
+from the repo's `.agents/config/pr.yaml` (one file per project, usually copied there by
+`/landing`). Without that file, the convention keys in `~/.config/pr/config` are used.
+
+Installed by `npx @nvice-r/pr-commands`. If setup is missing, this command STOPS and tells the
+user to run the installer — it never guesses config (D8: hard fail, no hardcoded fallback).
+
+If `$ARGUMENTS` starts with `help`/`-help`/`--help` (case-insensitive), print the **Help** block and stop.
+
+If `$ARGUMENTS` starts with `update` (case-insensitive), run **Update mode** (below) and stop —
+skip the create steps entirely.
+
+## Help (`/pr help`)
+
+```
+/pr — provider-agnostic PR helper (@nvice-r/pr-commands)
+
+USAGE
+  /pr [base-branch] [draft] [cross]
+                              Create a PR for the current branch (default).
+  /pr update [PR#] [short]    Rewrite an existing PR's description in place.
+  /pr help                    Show this help.
+
+CREATE
+  base-branch   Any arg containing "/". If omitted, inferred from closest ancestor
+                remote branch (saved per-branch after first run).
+  draft         Create as draft. Otherwise follows `draft:` in pr.yaml (default: ask).
+  cross         Fork mode: open the PR in origin from the fork in pr.yaml `fork:`.
+
+UPDATE
+  PR#           PR number to rewrite. If omitted, resolved from the current branch's
+                open PR. Re-drafts the body per convention, then PATCHes it in place.
+  short         Compress harder (caveman brevity): cut throat-clearing, restated ticket
+                goals, filler connectors. Keeps every file + technical fact.
+
+CONVENTION    <repo>/.agents/config/pr.yaml (per project; else convention keys in the user config)
+CONFIG        ~/.config/pr/config  (os, token_src, email, agent_dir; legacy convention keys)
+PROVIDER      auto from `git remote get-url origin` -> bbpr | ghpr | glpr
+REVIEWERS     <main-repo-root>/<agent_dir>/pr-reviewers.txt (per-repo, shared across worktrees; agent_dir from config)
+SETUP         npx @nvice-r/pr-commands
+```
+
+## Step 0 — verify install (HARD FAIL, no fallback)
+
+Run the checks; if any fails, STOP and tell the user to run `npx @nvice-r/pr-commands` (name the
+missing piece). Do NOT improvise config or reviewers.
+
+```bash
+# a. config present?
+CFG="${PR_CONFIG:-$HOME/.config/pr/config}"
+[ -f "$CFG" ] || { echo "MISSING config: $CFG"; }
+
+# b. detect provider from remote
+URL="$(git remote get-url origin 2>/dev/null)" || echo "no origin remote"
+case "$URL" in
+  *bitbucket.org*) PROVIDER=bitbucket; BIN=bbpr ;;
+  *github.com*)    PROVIDER=github;    BIN=ghpr ;;
+  *gitlab.com*)    PROVIDER=gitlab;    BIN=glpr ;;
+  *) echo "unknown provider for remote: $URL" ;;
+esac
+
+# c. matching binary installed?
+command -v "$BIN" >/dev/null 2>&1 || echo "MISSING binary: $BIN (run installer, or provider not yet supported)"
+
+# d. project convention file: this checkout first, then the main checkout (worktrees share it,
+#    because .agents/config/ is usually gitignored and only exists in the main checkout)
+TOP="$(git rev-parse --show-toplevel)"
+MAINROOT="$(cd "$(git rev-parse --git-common-dir)/.." && pwd)"
+PR_YAML=""
+for f in "$TOP/.agents/config/pr.yaml" "$MAINROOT/.agents/config/pr.yaml"; do
+  [ -f "$f" ] && { PR_YAML="$f"; break; }
+done
+echo "convention: ${PR_YAML:-$CFG (no .agents/config/pr.yaml)}"
+```
+
+- config missing → STOP: "run `npx @nvice-r/pr-commands`".
+- provider unknown → STOP: only bitbucket/github/gitlab supported.
+- `$BIN` = `ghpr`/`glpr` and not installed → STOP: "provider not yet supported (macOS+Bitbucket only for now)". (D6 stub.)
+- all pass → continue.
+
+## Step 1 — gather context (parallel)
+- `git rev-parse --abbrev-ref HEAD` — source branch (CURR)
+- `git config --get branch.<CURR>.bbprBase` — saved base, if any
+- `git log --oneline -20`
+- read the **convention source**: `$PR_YAML` if Step 0 found one, else the convention keys in `$CFG`.
+  Every later step that says "convention" means this source.
+
+**Convention keys** (YAML in `pr.yaml`; `key=value` in `$CFG`, where list values are pipe-separated):
+
+| key | meaning | if missing |
+|-----|---------|------------|
+| `title_pattern` | title template with `<ver> <desc> <ticket> <type> <scope> <issue>` | ask the user |
+| `ticket_regex` | ticket key in the branch name | no ticket |
+| `template_sections` | body `## ` headings, in order | `Summary`, `Changes` |
+| `body_rules` | extra project rules for the body (free text, follow literally) | none |
+| `base` | default base proposal (Step 2 d) | ask |
+| `draft` | `ask` / `true` / `false` | `ask` |
+| `push` | remotes to push before create (Step 7.5) | none (assume pushed) |
+| `fork` | `{remote, repo}` for cross-repo mode | cross mode unavailable |
+| `pre_pr` | shell commands run before confirm (Step 6.5) | none |
+| `post_pr` | sibling skills offered after create (Step 10) | none |
+
+## Step 2 — determine base branch (priority)
+a. `$1` (any arg containing `/`) → use it.
+b. else `branch.<CURR>.bbprBase` from git config → use silently.
+c. else infer — smallest non-zero `<ref>..HEAD` distance where `<ref>` is an ancestor of HEAD:
+   ```bash
+   for ref in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin | grep -v "^origin/<CURR>$"); do
+     if git merge-base --is-ancestor "$ref" HEAD 2>/dev/null; then
+       ahead=$(git rev-list --count "$ref"..HEAD)
+       [ "$ahead" -gt 0 ] && echo "$ahead $ref"
+     fi
+   done | sort -n | head -5
+   ```
+   Propose smallest-`ahead` candidate; confirm. Do NOT auto-pick a naming-pattern match — a
+   stacked PR on another in-flight ticket branch is common. Ties or all >20 ahead → ask.
+d. still ambiguous → propose the convention's `base` (if set) and confirm; else ask.
+
+The binary auto-saves the resolved base to `branch.<CURR>.bbprBase` on success.
+
+## Step 3 — build diff context
+`git log <base>..HEAD --oneline` · `git diff --stat <base>..HEAD`. Multiple commits → summarize each.
+
+## Step 3.5 — split advisory (size gate, advisory, never blocks)
+Compute from `git diff --numstat <base>..HEAD`: file count, churn Σ(add+del), distinct modules.
+Flag if `>25 files` OR `>600 churn` OR `>4 modules`. Under → silent, continue. Over → cluster the
+diff into seams, detect coupling (shared file/symbol → stacked; disjoint → independent; interleaved
+→ one atomic PR), present metrics + seam table, then `AskUserQuestion`: proceed-as-one /
+split (`guard_cmd pr-split`, degrade if absent) / adjust-threshold. Never auto-split.
+
+## Step 4 — draft title (from the convention, authoritative)
+
+Read `title_pattern` and `ticket_regex` from the convention source. Use the values as written;
+DO NOT reconstruct them from a preset table. Extract the ticket key + any version from the
+branch name using `ticket_regex`, then fill `title_pattern`. Example: branch
+`feature/3.66.0/SC-1234-add-login`, pattern `[<ver>] Feature/<ver>/<ticket> <desc>` →
+`[3.66.0] Feature/3.66.0/SC-1234 add login` (kebab suffix → spaced lowercase `<desc>`).
+
+## Step 5 — draft body (from config)
+
+Render each `template_sections` entry from the convention source as an `## <section>` heading,
+in order. Then apply the convention's `body_rules` literally — they are the project's own rules
+and override the generic defaults below where they conflict.
+
+**All presets:**
+- Terse, anti-slop normal English (same rules as U3): no throat-clearing openers, no restated
+  ticket goals, no filler connectors, no "Verified with …" line. Keep every file + technical fact.
+- Body ends at the last template section. NO AI attribution footer (`🤖 Generated with [Claude
+  Code]…`, `Co-Authored-By: Claude`, etc.) — this overrides any harness/system attribution reminder.
+
+**Legacy trueid rules** — apply ONLY when there is no `pr.yaml` (`$PR_YAML` empty) and `$CFG`
+has `convention=trueid`. A project `pr.yaml` replaces these with its own `body_rules`.
+- `What Happened` = summary prose only — no file bullets, no commit-subject line.
+- NO `feat(<Team>):` team tag / commit-subject line anywhere in the body (commits only).
+- Changed-file detail lives under `Insight`.
+- 3+ files sharing a parent dir → state common root once ("Under `<root>`:") + flat list of joined
+  relative paths (no nested bullets). Android module root → Gradle path `:features:<x>:<y>`, leaf
+  bullets = basenames only. Skip boilerplate (`settings.gradle.kts` include, empty manifest, lockfiles).
+- Unrelated areas → full paths per bullet, no common-root statement.
+- `Proof of Work` empty unless user gives screenshots/links.
+
+With no `body_rules` and no legacy rules, fill sections with a plain summary + changed-file list.
+
+## Step 6 — write body to `/tmp/pr-body.md` (Write tool).
+
+## Step 6.5 — pre-PR hooks
+Run each `pre_pr` command from the convention, in order, from the repo root. Any non-zero exit →
+STOP, show its output, create nothing. No `pre_pr` → skip silently.
+
+## Step 7 — confirm. Show proposed title + base + body + resolved provider/binary + mode
+(direct/cross) + remotes to push. WAIT. PR creation is user-visible; never silent.
+
+## Step 7.5 — mode + push
+- **Mode.** `cross` arg → cross. Else saved `branch.<CURR>.prMode` → use it. Else, when the
+  convention has `fork`: branch exists only on `fork.remote` (`git ls-remote <remote> <CURR>`)
+  → cross; otherwise direct. No `fork` → always direct; `cross` arg → STOP ("no fork in pr.yaml").
+- **Direct:** push every remote in `push` (`git push <remote> HEAD`), in order.
+- **Cross:** push `fork.remote` only. Never push to `origin`.
+- Push failure → STOP and show the error. Never pass `--no-verify` (pre-push hooks may lint;
+  allow 30–60 s). No `push` key → do not push; warn if HEAD is ahead of its upstream.
+
+## Step 8 — create. Run the detected binary (append `--draft` only if draft chosen):
+```bash
+<BIN> --title "<title>" --body-file /tmp/pr-body.md --dest "<base>" [--draft] \
+      [--source-repo "<fork.repo>"]        # cross mode only
+```
+Draft: `draft` arg → draft. Else convention `draft: true|false` → use it. Else (`ask` or unset)
+ask open-vs-draft before creating. After a cross-mode success, run
+`git config branch.<CURR>.prMode cross` so the next `/pr` reuses the mode. The binary attaches the
+per-repo reviewer roster automatically; `--no-reviewers` skips, `--reviewer <id>` appends.
+
+## Step 9 — print final PR URL + reviewer count from binary output. On error, surface raw response.
+
+## Step 10 — post-PR skills (guarded, optional).
+For each skill in the convention's `post_pr` (legacy config without `pr.yaml`: `jira-update`):
+`guard_cmd <skill>`; absent → one-line note, skip. Present → `AskUserQuestion`: run now
+(`/<skill> <ticket>` with the Step 4 ticket key) or skip. No ticket key → skip ticket-based skills.
+
+## Update mode (`/pr update [PR#] [short]`)
+
+Rewrites an existing open PR's **description** in place — no new branch, no new PR. Same Step 0
+install check runs first (config + provider + creds). Provider PATCH is currently Bitbucket-only,
+matching the create path; `ghpr`/`glpr` providers → STOP with the same "not yet supported" note.
+
+**U1 — parse args.** Tokens after `update`: a bare integer = `PR#`; the word `short` (or
+`caveman`) = compress-hard flag. Missing `PR#` → resolve from the current branch: query the
+provider for the open PR whose source branch is `HEAD` (Bitbucket: `GET /pullrequests?q=source.branch.name="<CURR>"&state=OPEN`). Zero or multiple matches → ask.
+
+**U2 — fetch current PR.** Resolve creds the same way the binary does — email from `$CFG`
+(`email=`), token from the OS keychain (macOS service `bitbucket-api-token`, account = email).
+`REPO` = workspace/slug from `git remote get-url origin`. Fetch title + description:
+```bash
+curl -sS -u "$EMAIL:$TOKEN" \
+  "https://api.bitbucket.org/2.0/repositories/$REPO/pullrequests/$PRNUM"
+```
+
+**U3 — re-draft the body.** Rebuild the description with the **Step 5** rules (trueid template
+when `convention=trueid`): `What Happened` prose, `Insight` file detail, `Proof of Work`. Prefer
+the diff/commits as the source of truth over the old text; carry forward Proof-of-Work links the
+old body already had. Default output = terse, anti-slop normal English:
+- Cut throat-clearing openers ("The X feature needs to…", "This adds…"), restated ticket goals,
+  and filler connectors ("as a consequence", "in order to").
+- Keep every changed file, every behavioural fact, and any bug-fix detail — brevity, not omission.
+
+With the `short` flag, compress harder toward caveman brevity (fragments, dropped articles) while
+keeping the section headings and every technical fact. Title stays unchanged unless the user asks.
+
+**U4 — confirm (diff-style).** Write the new body to `/tmp/pr-body.md`. Show a short before/after
+summary (what was cut) + the full new body. WAIT — editing a live PR is user-visible; never silent.
+
+**U5 — PATCH in place** (Bitbucket `PUT`, description only):
+```bash
+python3 - "$REPO" "$PRNUM" "$EMAIL" "$TOKEN" /tmp/pr-body.md <<'PY'
+import sys, json, base64, urllib.request, urllib.error
+repo, num, email, token, bodyfile = sys.argv[1:6]
+desc = open(bodyfile).read()
+data = json.dumps({"description": desc}).encode()
+url = f"https://api.bitbucket.org/2.0/repositories/{repo}/pullrequests/{num}"
+req = urllib.request.Request(url, data=data, method="PUT", headers={"Content-Type": "application/json"})
+req.add_header("Authorization", "Basic " + base64.b64encode(f"{email}:{token}".encode()).decode())
+try:
+    r = urllib.request.urlopen(req)
+    print(r.status, json.loads(r.read())["links"]["html"]["href"])
+except urllib.error.HTTPError as e:
+    print("ERR", e.code, e.read().decode()[:500])
+PY
+```
+On non-2xx, surface the raw response body. Reviewers/base/title are untouched — description only.
+
+**U6 — print PR URL.** No Jira sync offer on update (status unchanged).
+
+## Cross-command guard
+Sibling commands (`/pr-split`, `/jira-update`) are optional — a teammate may not have them, and
+they may live under any agent's skills/commands dir. Before invoking any, confirm it exists; if
+absent, degrade gracefully (one-line note). Reusable check (scans Claude command dir + every known
+agent skills dir):
+```bash
+guard_cmd() {  # usage: guard_cmd pr-split → prints path or "no-<cmd>"
+  local c="$1"
+  ls "$PWD/.claude/commands/$c.md" "$HOME/.claude/commands/$c.md" \
+     "${CLAUDE_CONFIG_DIR:-$HOME/.claude}/skills/$c/SKILL.md" \
+     "$HOME/.gemini/antigravity/skills/$c/SKILL.md" \
+     "${CODEX_HOME:-$HOME/.codex}/skills/$c/SKILL.md" \
+     "${XDG_CONFIG_HOME:-$HOME/.config}/opencode/skills/$c/SKILL.md" \
+     "$PWD/.claude/skills/$c/SKILL.md" "$PWD/.agents/skills/$c/SKILL.md" 2>/dev/null | head -1 \
+    || echo "no-$c"
+}
+```
+
+## Notes
+- Does NOT push — assumes branch pushed. Unpushed commits ahead of upstream → warn + ask.
+- Provider/token/convention all from config + remote — NO hardcoded team values here (D3/D4).
+- Verify worktree before any split branch work (`git symbolic-ref --short HEAD` + `git worktree list`);
+  background restacks can move branches mid-turn.
+- Caveman mode applies to replies — PR title/body default to normal English. Exception: `/pr update
+  … short` (a.k.a. `caveman`) is an explicit user opt-in to compress the body toward caveman brevity.

package/install.js

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 // @nvice-r/pr-commands installer. Zero external deps (Node >=16 builtins only).
 // Wizard: detect OS + provider, pick reviewers + convention, write config/roster,
-// install binaries -> ~/.local/bin, copy /pr skill -> ~/.claude/commands.
+// install binaries -> ~/.local/bin, install the portable `pr` SKILL.md into every
+// detected agent (symlinked to one canonical copy) + Claude /pr slash-command.
 //
-// Flags: --dir <path>  --provider <p>  --all  --yes  --dry-run  --help
+// Flags: --dir <path>  --provider <p>  --agent <id>  --all  --yes  --dry-run  --help
 
 'use strict';
 const fs = require('fs');
@@ -15,6 +16,7 @@ const { execFileSync } = require('child_process');
 
 const HOME = os.homedir();
 const PKG = __dirname;
+const PKG_VERSION = require('./package.json').version;
 const ASSETS = path.join(PKG, 'assets');
 const BACK = Symbol('back');   // returned by a prompt when the user wants the previous step
 
@@ -35,19 +37,53 @@ const PRESET_DEFS = {
 
 // ---- arg parse ----
 const argv = process.argv.slice(2);
-const flags = { dir: null, provider: null, all: false, yes: false, dryRun: false, agentDir: null };
+const flags = { dir: null, provider: null, all: false, yes: false, dryRun: false, agentDir: null, agents: null, resetReviewers: false };
 for (let i = 0; i < argv.length; i++) {
   const a = argv[i];
   if (a === '--help' || a === '-h') { printHelp(); process.exit(0); }
   else if (a === '--dir') flags.dir = argv[++i];
   else if (a === '--provider') flags.provider = argv[++i];
   else if (a === '--agent-dir') flags.agentDir = argv[++i];
+  else if (a === '--agent') (flags.agents ||= []).push(argv[++i]);
   else if (a === '--all') flags.all = true;
   else if (a === '--yes' || a === '-y') flags.yes = true;
   else if (a === '--dry-run') flags.dryRun = true;
+  else if (a === '--reset-reviewers') flags.resetReviewers = true;
   else { console.error(`unknown flag: ${a}`); process.exit(1); }
 }
-const AGENT_DIR = (flags.agentDir || '.claude').replace(/^\/+|\/+$/g, '');  // strip stray slashes
+const cleanDir = (d) => d.replace(/^\/+|\/+$/g, '');   // strip stray slashes
+
+// ---- portable skill ----
+// One canonical SKILL.md (~/.config/pr/skill/pr/); every detected agent's global skills
+// dir gets a symlink `pr` -> that dir (skills-CLI single-source model). Claude additionally
+// gets a /pr slash-command. Frontmatter differs per target; the body is shared (pr.body.md).
+const SKILL_FM = `---
+name: pr
+description: Create a pull request for the current branch, with the title and body drafted in the team's convention and the provider (Bitbucket/GitHub/GitLab) auto-detected from the git remote. Use when the user asks to open, create, raise, or draft a pull request / PR / merge request for the current branch, or types /pr.
+---
+
+`;
+const CMD_FM = `---
+description: Create a pull request for the current branch (provider auto-detected)
+argument-hint: [base-branch] [draft]
+model: sonnet
+---
+
+`;
+// base = probe dir deciding "installed"; skills = GLOBAL skills dir we link into;
+// repoDir = the agent's per-repo folder (holds the reviewer roster when it's the primary agent).
+// Env vars resolved the same way the agents themselves resolve them.
+function agentTargets() {
+  const claudeBase = process.env.CLAUDE_CONFIG_DIR || path.join(HOME, '.claude');
+  const codexBase  = process.env.CODEX_HOME || path.join(HOME, '.codex');
+  const xdg        = process.env.XDG_CONFIG_HOME || path.join(HOME, '.config');
+  return [
+    { id: 'claude-code', base: claudeBase,                             skills: path.join(claudeBase, 'skills'),                     repoDir: '.claude', claude: true },
+    { id: 'antigravity', base: path.join(HOME, '.gemini/antigravity'), skills: path.join(HOME, '.gemini/antigravity/skills'), repoDir: '.agent' },
+    { id: 'codex',       base: codexBase,                              skills: path.join(codexBase, 'skills'),                      repoDir: '.codex' },
+    { id: 'opencode',    base: path.join(xdg, 'opencode'),             skills: path.join(xdg, 'opencode/skills'),                   repoDir: '.opencode' },
+  ];
+}
 
 function printHelp() {
   console.log(`@nvice-r/pr-commands installer
@@ -56,9 +92,13 @@ function printHelp() {
 
   --dir <path>       Repo to configure (default: cwd)
   --provider <p>     Force bitbucket|github|gitlab (default: detect from remote)
-  --agent-dir <dir>  Agent folder for the roster, relative to main repo root (default: .claude)
+  --agent-dir <dir>  Repo folder holding the reviewer roster (default: primary agent's
+                     folder — .claude / .agent / .codex / .opencode)
+  --agent <id>       Force skill install to this agent (repeatable). Ids: claude-code,
+                     antigravity, codex, opencode. Default: auto-detect installed agents.
   --all              Install all provider binaries (default: only the detected one)
-  --yes              Accept defaults, no prompts (reviewers=all, convention=trueid)
+  --yes              Accept defaults, no prompts (reviewers=existing roster or all, convention=trueid)
+  --reset-reviewers  Ignore an existing roster and rebuild it from the repo's default reviewers
   --dry-run          Print planned actions, write nothing
   --help             This help`);
 }
@@ -73,8 +113,8 @@ const ask = (q) => new Promise((res) => {
 });
 // Editable pre-filled default: edit the shown value or hit enter to keep it.
 // `:b` (or `:back`) returns BACK; empty keeps the default.
-const askPrefill = (q, def, allowBack = true) => new Promise((res) => {
-  const r = readline.createInterface({ input: process.stdin, output: process.stdout, terminal: true });
+const askPrefill = (q, def, allowBack = true, completer = undefined) => new Promise((res) => {
+  const r = readline.createInterface({ input: process.stdin, output: process.stdout, terminal: true, completer });
   r.question(q, (a) => {
     r.close();
     const t = a.trim();
@@ -84,6 +124,22 @@ const askPrefill = (q, def, allowBack = true) => new Promise((res) => {
   });
   if (def && process.stdin.isTTY) r.write(def);   // inject editable text
 });
+// Tab-completion for filesystem paths (directories only — work dir is always a dir).
+// Preserves the user's typed prefix style (~, relative, absolute); appends "/" to each match.
+function pathCompleter(line) {
+  const cut = line.lastIndexOf('/');
+  const dirPart = cut >= 0 ? line.slice(0, cut + 1) : '';   // keeps trailing slash, e.g. "~/Doc" -> "~/"
+  const base = cut >= 0 ? line.slice(cut + 1) : line;
+  let realDir = dirPart || '.';
+  if (realDir.startsWith('~')) realDir = HOME + realDir.slice(1);
+  let ents;
+  try { ents = fs.readdirSync(realDir, { withFileTypes: true }); } catch { return [[], line]; }
+  const hits = ents
+    .filter((e) => e.isDirectory() && e.name.startsWith(base))
+    .map((e) => dirPart + e.name + '/')
+    .sort();
+  return [hits, line];
+}
 
 // Interactive checklist (↑/↓ move · space toggle · a all · n none · enter confirm).
 // Zero-dep raw-mode TTY. Returns array of selected indices. items: [{label}].
@@ -208,10 +264,69 @@ function writeFile(p, content, mode) {
 // Main repo root, shared across worktrees: git-common-dir points at the main .git
 // even from a linked worktree; its parent is the main checkout root. gitCommonDir
 // may be relative ('.git') or absolute ('/main/.git') — path.resolve handles both.
+// Existing roster, so a reinstall keeps it: --agent-dir, each agent's repo folder, then the
+// 0.1.2 neutral .pr/ location. Returns { file, entries: [{uuid, name}] } or null.
+function findExistingRoster(mroot) {
+  const dirs = [flags.agentDir && cleanDir(flags.agentDir), ...agentTargets().map((t) => t.repoDir)].filter(Boolean);
+  const files = [...new Set(dirs)].map((d) => path.join(mroot, d, 'pr-reviewers.txt'))
+    .concat(path.join(mroot, '.pr', 'reviewers.txt'));
+  const file = files.find((f) => fs.existsSync(f));
+  if (!file) return null;
+  const entries = [];
+  for (const line of fs.readFileSync(file, 'utf8').split('\n')) {
+    const m = line.match(/^\s*(\{[^}]+\})\s*(?:#\s*(.*))?$/);
+    if (m) entries.push({ uuid: m[1], name: (m[2] || '').trim() });
+  }
+  return { file, entries };
+}
 function mainRepoRoot(wd) {
   const gcd = shSafe('git', ['-C', wd, 'rev-parse', '--git-common-dir']);
   return gcd ? path.resolve(wd, gcd, '..') : null;
 }
+// Write the canonical SKILL.md, then link/copy it into each targeted agent. Claude also
+// gets the /pr slash-command. --agent forces a set; otherwise install to every detected
+// agent (claude-code is always included — it's this tool's native home).
+// Agents whose config dir exists (claude-code always included — this tool's native home).
+function detectedAgentIds() {
+  return agentTargets().filter((t) => t.id === 'claude-code' || fs.existsSync(t.base)).map((t) => t.id);
+}
+// Install the skill into exactly the agents in `ids`.
+function installSkill(ids) {
+  const set = new Set(ids || []);
+  const body = fs.readFileSync(path.join(ASSETS, 'skill/pr.body.md'), 'utf8');
+  const canonDir = path.join(HOME, '.config/pr/skill/pr');
+  writeFile(path.join(canonDir, 'SKILL.md'), SKILL_FM + body);
+
+  const hits = [];
+  for (const t of agentTargets()) {
+    if (!set.has(t.id)) continue;
+    linkSkill(t, canonDir);
+    if (t.claude) writeFile(path.join(t.base, 'commands/pr.md'), CMD_FM + body);  // dual: keep /pr
+    hits.push(t.id);
+  }
+  log(`  skill targeted: ${hits.join(', ') || '(none)'}`);
+}
+// Symlink <agent>/skills/pr -> canonical dir. Replace only OUR symlink; never clobber a
+// pre-existing real dir/file (could be the user's own `pr` skill). Copy if symlinks fail.
+function linkSkill(t, canonDir) {
+  const dst = path.join(t.skills, 'pr');
+  if (flags.dryRun) { log(`  [dry-run] link ${dst} -> ${canonDir}`); return; }
+  fs.mkdirSync(t.skills, { recursive: true });
+  let cur = null;
+  try { cur = fs.lstatSync(dst); } catch { /* absent */ }
+  if (cur) {
+    if (cur.isSymbolicLink()) fs.unlinkSync(dst);
+    else { log(`  SKIP ${dst} — exists and is not our symlink; remove it and re-run`); return; }
+  }
+  try {
+    fs.symlinkSync(canonDir, dst, 'dir');
+    log(`  linked ${dst} -> ${canonDir}`);
+  } catch (e) {
+    fs.mkdirSync(dst, { recursive: true });
+    fs.copyFileSync(path.join(canonDir, 'SKILL.md'), path.join(dst, 'SKILL.md'));
+    log(`  copied ${dst}/SKILL.md (symlink unavailable: ${e.code})`);
+  }
+}
 // Depth-limited scan for git repos beneath a non-repo dir. Stops descending once a
 // repo is found (no nested-repo noise); skips dotdirs + node_modules; caps results.
 function scanGitRepos(root, maxDepth = 3, cap = 50) {
@@ -316,6 +431,7 @@ async function fetchBitbucketReviewers(slug, email, token, selfUuid) {
     }
     if (stage > 1 && st.chosen) L.push(`  \x1b[32m✓\x1b[0m reviewers   ${st.chosen.length} selected`);
     if (stage > 2 && st.convention) L.push(`  \x1b[32m✓\x1b[0m convention  ${st.convention}`);
+    if (stage > 3 && st.agents) L.push(`  \x1b[32m✓\x1b[0m agents      ${st.agents.join(', ') || '(none)'}`);
     return L;
   };
   // Full-screen redraw: wipe, reprint header + breadcrumb + active-step marker. No accumulation on back.
@@ -336,7 +452,7 @@ async function fetchBitbucketReviewers(slug, email, token, selfUuid) {
     let wd;
     if (flags.dir || flags.yes) wd = path.resolve(flags.dir || process.cwd());
     else {
-      const a = await askPrefill('  repo path: ', st.workDir || process.cwd());
+      const a = await askPrefill('  repo path: ', st.workDir || process.cwd(), true, pathCompleter);
       if (a === BACK) return BACK;   // first step — driver just stays here
       wd = path.resolve(a);
     }
@@ -378,7 +494,7 @@ async function fetchBitbucketReviewers(slug, email, token, selfUuid) {
       log(`  WARN: no keychain token for ${pcfg.keychainSvc}/${email || '(none)'} — reviewers can't auto-fetch`);
       log(`    security add-generic-password -s ${pcfg.keychainSvc} -a ${email || 'you@example.com'} -w '<api-token>'`);
     } else log('  token: found');
-    if (st.slug !== slug) st.revs = undefined;   // invalidate reviewer cache if repo changed
+    if (st.slug !== slug) { st.revs = undefined; st.existing = undefined; st.chosenIdx = undefined; }   // repo changed → drop reviewer caches
     const mroot = mainRepoRoot(wd) || wd;        // shared across worktrees; roster lives here
     if (mroot !== wd) log(`  worktree detected → roster shared at main root: ${mroot}`);
     Object.assign(st, { workDir: wd, mainRoot: mroot, remoteUrl, provider, pcfg, slug, email, token });
@@ -387,6 +503,13 @@ async function fetchBitbucketReviewers(slug, email, token, selfUuid) {
   const sReviewers = async () => {
     screen(1, 'Reviewers');
     st.chosen = st.chosen || [];
+    if (st.existing === undefined) st.existing = flags.resetReviewers ? null : findExistingRoster(st.mainRoot);
+    const ex = st.existing;
+    if (ex) log(`  existing roster: ${ex.file} (${ex.entries.length})`);
+    // --yes (or no token to fetch with) + existing roster → keep it untouched, skip the fetch.
+    if (ex && (flags.yes || !(st.token && st.email))) {
+      st.chosen = ex.entries; st.extra = []; log('  kept existing roster (--reset-reviewers to rebuild)'); return;
+    }
     if (!(st.token && st.email)) { log('  skipped (no token) — edit the roster later.'); st.chosen = []; return; }
     if (st.selfUuid === undefined) st.selfUuid = await fetchSelfUuid(st.email, st.token);
     if (st.revs === undefined) st.revs = await fetchBitbucketReviewers(st.slug, st.email, st.token, st.selfUuid);
@@ -394,14 +517,18 @@ async function fetchBitbucketReviewers(slug, email, token, selfUuid) {
     if (!revs) { log('  WARN: could not fetch default-reviewers. Roster left empty.'); st.chosen = []; return; }
     if (revs.length === 0) { log('  repo has no default reviewers. Roster left empty.'); st.chosen = []; return; }
     if (flags.yes) { st.chosen = revs; st.chosenIdx = revs.map((_, i) => i); log(`  selected all ${revs.length}`); return; }
+    // Existing roster → pre-check its members; entries not among the defaults are kept as-is.
+    const exIds = ex ? new Set(ex.entries.map((e) => e.uuid)) : null;
+    st.extra = ex ? ex.entries.filter((e) => !revs.some((r) => r.uuid === e.uuid)) : [];
+    const preIdx = st.chosenIdx || (exIds ? revs.map((r, i) => (exIds.has(r.uuid) ? i : -1)).filter((i) => i >= 0) : null);
     const picked = await multiSelect(
-      `Reviewers for ${st.slug} (default: all):`,
-      revs.map((r) => ({ label: r.name })), true, st.chosenIdx || null,
+      `Reviewers for ${st.slug} (default: ${ex ? 'existing roster' : 'all'}):`,
+      revs.map((r) => ({ label: r.name })), true, preIdx,
     );
     if (picked === BACK) return BACK;
     st.chosenIdx = picked;
-    st.chosen = picked.map((i) => revs[i]);
-    log(`  chosen: ${st.chosen.length}`);
+    st.chosen = picked.map((i) => revs[i]).concat(st.extra);
+    log(`  chosen: ${st.chosen.length}${st.extra.length ? ` (incl. ${st.extra.length} kept from existing roster, not in defaults)` : ''}`);
   };
 
   const sPreset = async () => {
@@ -429,12 +556,32 @@ async function fetchBitbucketReviewers(slug, email, token, selfUuid) {
     st.conv[key] = v;
   };
 
+  // Pick which agents get the /pr skill. --agent overrides (non-interactive); --yes auto-detects;
+  // else an interactive checklist with detected agents pre-checked.
+  const sAgents = async () => {
+    screen(3, 'Agents');
+    const targets = agentTargets();
+    if (flags.agents) { st.agents = flags.agents; log(`  forced (--agent): ${st.agents.join(', ')}`); return; }
+    const detected = new Set(detectedAgentIds());
+    if (flags.yes) { st.agents = [...detected]; log(`  auto-detected: ${st.agents.join(', ')}`); return; }
+    const preIdx = targets.map((t, i) => (detected.has(t.id) ? i : -1)).filter((i) => i >= 0);
+    const picked = await multiSelect(
+      'Install the /pr skill into which agents? (detected pre-checked):',
+      targets.map((t) => ({ label: `${t.id}${detected.has(t.id) ? '  \x1b[2m(detected)\x1b[0m' : ''}` })),
+      false, preIdx,
+    );
+    if (picked === BACK) return BACK;
+    st.agents = picked.map((i) => targets[i].id);
+    log(`  agents: ${st.agents.join(', ') || '(none)'}`);
+  };
+
   const steps = flags.yes
-    ? [sWorkDir, sReviewers, sPreset]
+    ? [sWorkDir, sReviewers, sPreset, sAgents]
     : [sWorkDir, sReviewers, sPreset,
        editField('title_pattern:    ', 'title_pattern'),
        editField('ticket_regex:     ', 'ticket_regex'),
-       editField('template_sections:', 'template_sections')];
+       editField('template_sections:', 'template_sections'),
+       sAgents];
 
   let i = 0;
   while (i < steps.length) {
@@ -444,18 +591,30 @@ async function fetchBitbucketReviewers(slug, email, token, selfUuid) {
   }
 
   // --- install ---
-  screen(3, 'Install');
+  screen(4, 'Install');
   const { slug, pcfg, email, convention, conv, chosen } = st;
-  let cfg = `os=${cfgOs}\ntoken_src=${tokenSrc}\nemail=${email}\nconvention=${convention}\nagent_dir=${AGENT_DIR}\n`;
+  // Roster folder = --agent-dir, else the first chosen agent's repo folder, else .claude.
+  const agentIds = st.agents || detectedAgentIds();
+  const primary = agentTargets().find((t) => t.id === agentIds[0]);
+  const agentDir = cleanDir(flags.agentDir || (primary && primary.repoDir) || '.claude');
+  let cfg = `pkg_version=${PKG_VERSION}\nos=${cfgOs}\ntoken_src=${tokenSrc}\nemail=${email}\nconvention=${convention}\nagent_dir=${agentDir}\n`;
   if (conv.title_pattern)     cfg += `title_pattern=${conv.title_pattern}\n`;
   if (conv.ticket_regex)      cfg += `ticket_regex=${conv.ticket_regex}\n`;
   if (conv.template_sections) cfg += `template_sections=${conv.template_sections}\n`;
   writeFile(path.join(HOME, '.config/pr/config'), cfg, 0o600);
-  // Roster lives in the agent dir under the main repo root (shared across worktrees). Editable
-  // in place; pr-common.sh finds it first, falling back to root/global/legacy paths.
-  const roster = chosen.map((r) => `${r.uuid}  # ${r.name}`).join('\n') + (chosen.length ? '\n' : '');
-  const header = `# pr reviewers for ${slug} — {uuid}  # Name per line; blanks/# ignored. Edit freely.\n`;
-  writeFile(path.join(st.mainRoot, AGENT_DIR, 'pr-reviewers.txt'), header + (roster || '# (none selected)\n'));
+  // Roster: <main-repo-root>/<agent_dir>/pr-reviewers.txt — lives with the primary agent's repo
+  // folder, shared across worktrees. agent_dir is recorded in the config so the bash binary
+  // (which can't know the calling agent) reads the same path; legacy .pr/ + root + global paths
+  // remain load fallbacks.
+  const rosterFile = path.join(st.mainRoot, agentDir, 'pr-reviewers.txt');
+  const kept = st.existing && chosen === st.existing.entries;   // untouched existing roster
+  if (kept && st.existing.file === rosterFile) log(`  kept ${rosterFile}`);
+  else if (kept) writeFile(rosterFile, fs.readFileSync(st.existing.file));  // move to new agent_dir; old file left as fallback
+  else {
+    const roster = chosen.map((r) => `${r.uuid}  # ${r.name}`).join('\n') + (chosen.length ? '\n' : '');
+    const header = `# pr reviewers for ${slug} — {uuid}  # Name per line; blanks/# ignored. Edit freely.\n`;
+    writeFile(rosterFile, header + (roster || '# (none selected)\n'));
+  }
   const binDir = path.join(HOME, '.local/bin');
   const binsToInstall = flags.all
     ? Object.values(PROVIDERS).filter((p) => p.ready).map((p) => p.bin)
@@ -466,7 +625,7 @@ async function fetchBitbucketReviewers(slug, email, token, selfUuid) {
     if (!fs.existsSync(src)) { log(`  skip ${b} (asset not present yet)`); continue; }
     writeFile(path.join(binDir, b), fs.readFileSync(src), 0o755);
   }
-  writeFile(path.join(HOME, '.claude/commands/pr.md'), fs.readFileSync(path.join(ASSETS, 'skill/pr.md')));
+  installSkill(agentIds);
   if (!(process.env.PATH || '').split(':').includes(binDir)) {
     log(`\n  WARN: ${binDir} not on PATH. Add to your shell rc:`);
     log(`    export PATH="$HOME/.local/bin:$PATH"`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nvice-r/pr-commands",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Provider-agnostic PR helper for Claude Code — npx installer + bbpr/ghpr/glpr binaries + /pr skill",
   "bin": {
     "pr-commands": "install.js"

package/assets/skill/pr.md

@@ -1,157 +0,0 @@
----
-description: Create a pull request for the current branch (provider auto-detected)
-argument-hint: [base-branch] [draft]
-model: sonnet
----
-
-Create a pull request for the current branch. Provider (Bitbucket / GitHub / GitLab) is
-auto-detected from the git remote; the matching binary (`bbpr` / `ghpr` / `glpr`) is invoked.
-Convention (title pattern, ticket regex, PR template) comes from `~/.config/pr/config`.
-
-Installed by `npx @nvice-r/pr-commands`. If setup is missing, this command STOPS and tells the
-user to run the installer — it never guesses config (D8: hard fail, no hardcoded fallback).
-
-If `$ARGUMENTS` starts with `help`/`-help`/`--help` (case-insensitive), print the **Help** block and stop.
-
-## Help (`/pr help`)
-
-```
-/pr — provider-agnostic PR helper (@nvice-r/pr-commands)
-
-USAGE
-  /pr [base-branch] [draft]   Create a PR for the current branch (default).
-  /pr help                    Show this help.
-
-CREATE
-  base-branch   Any arg containing "/". If omitted, inferred from closest ancestor
-                remote branch (saved per-branch after first run).
-  draft         Create as draft. Otherwise opens ready (asks to confirm).
-
-CONFIG        ~/.config/pr/config  (os, token_src, email, convention)
-PROVIDER      auto from `git remote get-url origin` -> bbpr | ghpr | glpr
-REVIEWERS     ~/.config/pr/reviewers/<workspace>-<slug>.txt (per-repo, global location)
-SETUP         npx @nvice-r/pr-commands
-```
-
-## Step 0 — verify install (HARD FAIL, no fallback)
-
-Run the checks; if any fails, STOP and tell the user to run `npx @nvice-r/pr-commands` (name the
-missing piece). Do NOT improvise config or reviewers.
-
-```bash
-# a. config present?
-CFG="${PR_CONFIG:-$HOME/.config/pr/config}"
-[ -f "$CFG" ] || { echo "MISSING config: $CFG"; }
-
-# b. detect provider from remote
-URL="$(git remote get-url origin 2>/dev/null)" || echo "no origin remote"
-case "$URL" in
-  *bitbucket.org*) PROVIDER=bitbucket; BIN=bbpr ;;
-  *github.com*)    PROVIDER=github;    BIN=ghpr ;;
-  *gitlab.com*)    PROVIDER=gitlab;    BIN=glpr ;;
-  *) echo "unknown provider for remote: $URL" ;;
-esac
-
-# c. matching binary installed?
-command -v "$BIN" >/dev/null 2>&1 || echo "MISSING binary: $BIN (run installer, or provider not yet supported)"
-```
-
-- config missing → STOP: "run `npx @nvice-r/pr-commands`".
-- provider unknown → STOP: only bitbucket/github/gitlab supported.
-- `$BIN` = `ghpr`/`glpr` and not installed → STOP: "provider not yet supported (macOS+Bitbucket only for now)". (D6 stub.)
-- all pass → continue.
-
-## Step 1 — gather context (parallel)
-- `git rev-parse --abbrev-ref HEAD` — source branch (CURR)
-- `git config --get branch.<CURR>.bbprBase` — saved base, if any
-- `git log --oneline -20`
-- read `convention=` from `$CFG` (default `trueid` if unset — but config presence already enforced in Step 0)
-
-## Step 2 — determine base branch (priority)
-a. `$1` (any arg containing `/`) → use it.
-b. else `branch.<CURR>.bbprBase` from git config → use silently.
-c. else infer — smallest non-zero `<ref>..HEAD` distance where `<ref>` is an ancestor of HEAD:
-   ```bash
-   for ref in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin | grep -v "^origin/<CURR>$"); do
-     if git merge-base --is-ancestor "$ref" HEAD 2>/dev/null; then
-       ahead=$(git rev-list --count "$ref"..HEAD)
-       [ "$ahead" -gt 0 ] && echo "$ahead $ref"
-     fi
-   done | sort -n | head -5
-   ```
-   Propose smallest-`ahead` candidate; confirm. Do NOT auto-pick a naming-pattern match — a
-   stacked PR on another in-flight ticket branch is common. Ties or all >20 ahead → ask.
-d. still ambiguous → ask.
-
-The binary auto-saves the resolved base to `branch.<CURR>.bbprBase` on success.
-
-## Step 3 — build diff context
-`git log <base>..HEAD --oneline` · `git diff --stat <base>..HEAD`. Multiple commits → summarize each.
-
-## Step 3.5 — split advisory (size gate, advisory, never blocks)
-Compute from `git diff --numstat <base>..HEAD`: file count, churn Σ(add+del), distinct modules.
-Flag if `>25 files` OR `>600 churn` OR `>4 modules`. Under → silent, continue. Over → cluster the
-diff into seams, detect coupling (shared file/symbol → stacked; disjoint → independent; interleaved
-→ one atomic PR), present metrics + seam table, then `AskUserQuestion`: proceed-as-one /
-split (`guard_cmd pr-split`, degrade if absent) / adjust-threshold. Never auto-split.
-
-## Step 4 — draft title (from config, authoritative)
-
-Read `title_pattern=` and `ticket_regex=` directly from `$CFG` — the installer wrote concrete,
-possibly user-edited values, so DO NOT reconstruct them from a preset table. Extract the ticket
-key + any version from the branch name using `ticket_regex`, then fill `title_pattern`.
-
-`convention=` is only a behavior label (drives the trueid body rules in Step 5). Example
-(trueid): branch `feature/<ver>/SC-XXXX-...`, pattern `[<ver>] Feature/<ver>/SC-XXXX <desc>` →
-kebab suffix becomes spaced lowercase `<desc>`.
-
-## Step 5 — draft body (from config)
-
-Read `template_sections=` from `$CFG` (pipe-separated) and render each as an `## <section>`
-heading. These are authoritative — the installer wrote them (preset seed, possibly edited).
-
-**trueid template rules** (only when `convention=trueid`):
-- `What Happened` = summary prose only — no file bullets, no commit-subject line.
-- Changed-file detail lives under `Insight`.
-- 3+ files sharing a parent dir → state common root once ("Under `<root>`:") + flat list of joined
-  relative paths (no nested bullets). Android module root → Gradle path `:features:<x>:<y>`, leaf
-  bullets = basenames only. Skip boilerplate (`settings.gradle.kts` include, empty manifest, lockfiles).
-- Unrelated areas → full paths per bullet, no common-root statement.
-- `Proof of Work` empty unless user gives screenshots/links.
-
-For non-trueid presets, fill sections with a plain summary + changed-file list; no Gradle shorthand.
-
-## Step 6 — write body to `/tmp/pr-body.md` (Write tool).
-
-## Step 7 — confirm. Show proposed title + base + body + resolved provider/binary. WAIT. PR creation is user-visible; never silent.
-
-## Step 8 — create. Run the detected binary (append `--draft` only if draft chosen):
-```bash
-<BIN> --title "<title>" --body-file /tmp/pr-body.md --dest "<base>" [--draft]
-```
-Always ask open-vs-draft before creating unless `draft` was passed. The binary attaches the
-per-repo reviewer roster automatically; `--no-reviewers` skips, `--reviewer <id>` appends.
-
-## Step 9 — print final PR URL + reviewer count from binary output. On error, surface raw response.
-
-## Step 10 — offer Jira sync (guarded, optional).
-Reuse ticket key from Step 4. If none, skip. `guard_cmd jira-update`; if absent, just print URL + stop.
-If present, `AskUserQuestion`: sync now → `/jira-update <KEY>`, or skip (print reminder).
-
-## Cross-command guard
-Sibling commands (`/pr-split`, `/jira-update`) are optional — a teammate may not have them. Before
-invoking any, confirm it exists; if absent, degrade gracefully (one-line note). Reusable check:
-```bash
-guard_cmd() {  # usage: guard_cmd pr-split → prints path or "no-<cmd>"
-  ls "$PWD/.claude/commands/$1.md" "$HOME/.claude/commands/$1.md" \
-     "$PWD/.claude/skills/$1/SKILL.md" "$HOME/.claude/skills/$1/SKILL.md" 2>/dev/null | head -1 \
-    || echo "no-$1"
-}
-```
-
-## Notes
-- Does NOT push — assumes branch pushed. Unpushed commits ahead of upstream → warn + ask.
-- Provider/token/convention all from config + remote — NO hardcoded team values here (D3/D4).
-- Verify worktree before any split branch work (`git symbolic-ref --short HEAD` + `git worktree list`);
-  background restacks can move branches mid-turn.
-- Caveman mode applies to replies — but PR title/body must be normal English.