@nvice-r/pr-commands 0.1.0 → 0.1.1

package/README.md

@@ -73,7 +73,7 @@ every clone and every git worktree, no symlinks.
 | Shared library | `~/.local/bin/pr-common.sh` |
 | Provider binary | `~/.local/bin/bbpr` (`ghpr`/`glpr` later) |
 | Config | `~/.config/pr/config` |
-| Reviewer roster | `<main-repo-root>/.pr-reviewers.txt` (shared across worktrees) |
+| Reviewer roster | `<main-repo-root>/<agent_dir>/pr-reviewers.txt` (default `.claude`; shared across worktrees) |
 | `/pr` skill | `~/.claude/commands/pr.md` |
 
 ## Usage
@@ -124,11 +124,12 @@ template_sections=Context|Changes|Risk
 
 ### Reviewers
 
-Roster lives **in the work dir** at the main repo root, 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 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:
 
 ```
-<main-repo-root>/.pr-reviewers.txt
+<main-repo-root>/.claude/pr-reviewers.txt        # or <agent_dir>/… — .cursor, .aider, …
 ```
 
 You (the author) are excluded on install — bbpr also drops self at PR time. One entry per line,
@@ -140,9 +141,9 @@ trailing `# Name` comment optional:
 ```
 
 It's plain data — edit freely, no reinstall. Consider gitignoring it unless the team wants the
-roster committed. Load order: `$BBPR_REVIEWERS` → work-dir file → global
-`~/.config/pr/reviewers/<ws>-<slug>.txt` → legacy. Run-time overrides: `--no-reviewers` skips
-all, `--reviewer <uuid>` appends.
+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.
 
 ### Auth precedence (email)
 
@@ -193,7 +194,7 @@ rm ~/.local/bin/bbpr ~/.local/bin/pr-common.sh
 rm -rf ~/.config/pr
 rm ~/.claude/commands/pr.md
 # roster lives in each repo — remove per repo if wanted:
-rm <main-repo-root>/.pr-reviewers.txt
+rm <main-repo-root>/.claude/pr-reviewers.txt
 ```
 
 ## Development

package/assets/bin/pr-common.sh

@@ -20,11 +20,11 @@ CONFIG_FILE="${PR_CONFIG:-$HOME/.config/pr/config}"
 die() { echo "${PR_CMD:-pr}: $*" >&2; exit 1; }
 
 # --- config load (safe parse, no `source` of untrusted file) ---
-# Sets: CFG_OS CFG_TOKEN_SRC CFG_EMAIL CFG_CONVENTION (+ optional custom_* keys)
+# Sets: CFG_OS CFG_TOKEN_SRC CFG_EMAIL CFG_CONVENTION CFG_AGENT_DIR (+ optional custom_* keys)
 pr_load_config() {
   [ -f "$CONFIG_FILE" ] || die "no $CONFIG_FILE — run: npx @nvice-r/pr-commands"
   local k v
-  CFG_OS=""; CFG_TOKEN_SRC=""; CFG_EMAIL=""; CFG_CONVENTION=""
+  CFG_OS=""; CFG_TOKEN_SRC=""; CFG_EMAIL=""; CFG_CONVENTION=""; CFG_AGENT_DIR=""
   while IFS='=' read -r k v; do
     k="${k%%#*}"; k="${k//[[:space:]]/}"      # strip comment + whitespace from key
     [ -z "$k" ] && continue
@@ -34,9 +34,11 @@ pr_load_config() {
       token_src)  CFG_TOKEN_SRC="$v" ;;
       email)      CFG_EMAIL="$v" ;;
       convention) CFG_CONVENTION="$v" ;;
+      agent_dir)  CFG_AGENT_DIR="$v" ;;
     esac
   done < "$CONFIG_FILE"
   : "${CFG_TOKEN_SRC:=keychain}"
+  : "${CFG_AGENT_DIR:=.claude}"          # agent folder holding the roster (relative to main repo root)
 }
 
 # --- token retrieval, OS-switched (D1: OS is a function, not a binary axis) ---
@@ -127,9 +129,10 @@ 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/${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          # legacy fallback
+      "$HOME/.config/bbpr/bbpr-reviewers.txt"; do          # global + legacy fallbacks
       [ -f "$cand" ] && { file="$cand"; break; }
     done
   fi

package/install.js

@@ -35,17 +35,19 @@ const PRESET_DEFS = {
 
 // ---- arg parse ----
 const argv = process.argv.slice(2);
-const flags = { dir: null, provider: null, all: false, yes: false, dryRun: false };
+const flags = { dir: null, provider: null, all: false, yes: false, dryRun: false, agentDir: 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 === '--all') flags.all = true;
   else if (a === '--yes' || a === '-y') flags.yes = true;
   else if (a === '--dry-run') flags.dryRun = true;
   else { console.error(`unknown flag: ${a}`); process.exit(1); }
 }
+const AGENT_DIR = (flags.agentDir || '.claude').replace(/^\/+|\/+$/g, '');  // strip stray slashes
 
 function printHelp() {
   console.log(`@nvice-r/pr-commands installer
@@ -54,6 +56,7 @@ 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)
   --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
@@ -443,16 +446,16 @@ async function fetchBitbucketReviewers(slug, email, token, selfUuid) {
   // --- install ---
   screen(3, 'Install');
   const { slug, pcfg, email, convention, conv, chosen } = st;
-  let cfg = `os=${cfgOs}\ntoken_src=${tokenSrc}\nemail=${email}\nconvention=${convention}\n`;
+  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 work dir (main repo root — shared across worktrees). Editable
-  // in place; pr-common.sh finds it first, falling back to the global path.
+  // 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, '.pr-reviewers.txt'), header + (roster || '# (none selected)\n'));
+  writeFile(path.join(st.mainRoot, AGENT_DIR, '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)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nvice-r/pr-commands",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Provider-agnostic PR helper for Claude Code — npx installer + bbpr/ghpr/glpr binaries + /pr skill",
   "bin": {
     "pr-commands": "install.js"
@@ -15,7 +15,14 @@
   "publishConfig": {
     "access": "public"
   },
-  "keywords": ["claude-code", "pull-request", "bitbucket", "github", "gitlab", "cli"],
+  "keywords": [
+    "claude-code",
+    "pull-request",
+    "bitbucket",
+    "github",
+    "gitlab",
+    "cli"
+  ],
   "author": "nvice.r",
   "license": "MIT"
 }