@nvice-r/pr-commands 0.1.1 → 0.1.2

package/README.md

@@ -27,7 +27,10 @@ The interactive wizard:
    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,6 +42,7 @@ 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` |
 | `--dry-run` | print planned actions, write nothing |
@@ -65,16 +69,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>/.pr/reviewers.txt` (neutral, agent-agnostic; 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
 
@@ -124,12 +135,12 @@ 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 a **neutral `.pr/` folder** under the main repo root — it's data the bash binary
+reads, not an agent artifact, so it's agent-agnostic (survives switching agents). Editable next to
+the code. 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>/.pr/reviewers.txt
 ```
 
 You (the author) are excluded on install — bbpr also drops self at PR time. One entry per line,
@@ -140,10 +151,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 `.pr/` unless the team wants the
+roster committed. Load order: `$BBPR_REVIEWERS` → `.pr/reviewers.txt` → `<agent_dir>/pr-reviewers.txt`
+(0.1.1) → 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 +196,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 +205,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/pr-common.sh

@@ -129,10 +129,11 @@ pr_load_reviewers() {
     # main repo root, shared across worktrees: git-common-dir/.. (empty if git call fails)
     local mainroot; mainroot="$(cd "$(git rev-parse --git-common-dir 2>/dev/null)/.." 2>/dev/null && pwd)"
     for cand in \
+      ${mainroot:+"$mainroot/.pr/reviewers.txt"} \
       ${mainroot:+"$mainroot/${CFG_AGENT_DIR:-.claude}/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          # neutral primary; agent-dir + root + global legacy fallbacks
       [ -f "$cand" ] && { file="$cand"; break; }
     done
   fi

package/assets/skill/{pr.md → pr.body.md}

@@ -1,9 +1,3 @@
----
-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`.
@@ -13,6 +7,9 @@ user to run the installer — it never guesses config (D8: hard fail, no hardcod
 
 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`)
 
 ```
@@ -20,6 +17,7 @@ If `$ARGUMENTS` starts with `help`/`-help`/`--help` (case-insensitive), print th
 
 USAGE
   /pr [base-branch] [draft]   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
@@ -27,9 +25,15 @@ CREATE
                 remote branch (saved per-branch after first run).
   draft         Create as draft. Otherwise opens ready (asks to confirm).
 
+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.
+
 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)
+REVIEWERS     <main-repo-root>/.pr/reviewers.txt (per-repo, shared across worktrees, agent-agnostic)
 SETUP         npx @nvice-r/pr-commands
 ```
 
@@ -138,14 +142,74 @@ per-repo reviewer roster automatically; `--no-reviewers` skips, `--reviewer <id>
 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).
 
+## 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. Before
-invoking any, confirm it exists; if absent, degrade gracefully (one-line note). Reusable check:
+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>"
-  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"
+  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"
 }
 ```
 
@@ -154,4 +218,5 @@ guard_cmd() {  # usage: guard_cmd pr-split → prints path or "no-<cmd>"
 - 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.
+- 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');
@@ -35,13 +36,14 @@ 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 };
 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;
@@ -49,6 +51,37 @@ for (let i = 0; i < argv.length; i++) {
 }
 const AGENT_DIR = (flags.agentDir || '.claude').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.
+// 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'),                     claude: true },
+    { id: 'antigravity', base: path.join(HOME, '.gemini/antigravity'), skills: path.join(HOME, '.gemini/antigravity/skills') },
+    { id: 'codex',       base: codexBase,                              skills: path.join(codexBase, 'skills') },
+    { id: 'opencode',    base: path.join(xdg, 'opencode'),             skills: path.join(xdg, 'opencode/skills') },
+  ];
+}
+
 function printHelp() {
   console.log(`@nvice-r/pr-commands installer
 
@@ -56,7 +89,9 @@ 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>  (deprecated) Legacy roster folder; roster now lives in <root>/.pr/
+  --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)
   --dry-run          Print planned actions, write nothing
@@ -73,8 +108,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 +119,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}].
@@ -212,6 +263,50 @@ 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 +411,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 +432,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);
     }
@@ -429,12 +525,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 +560,19 @@ 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`;
   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.
+  // Roster: neutral <main-repo-root>/.pr/reviewers.txt — agent-agnostic (bash reads it, not the
+  // agent), shared across worktrees, survives switching agents. pr-common.sh finds it first,
+  // falling back to the legacy agent-dir/root/global 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'));
+  writeFile(path.join(st.mainRoot, '.pr', 'reviewers.txt'), 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 +583,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(st.agents || detectedAgentIds());
   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.2",
   "description": "Provider-agnostic PR helper for Claude Code — npx installer + bbpr/ghpr/glpr binaries + /pr skill",
   "bin": {
     "pr-commands": "install.js"