@nvice-r/pr-commands 0.1.4 → 0.1.5

package/README.md

@@ -47,7 +47,7 @@ Flags:
 | `--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 |
 | `--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` |
+| `--yes` | non-interactive: reviewers = existing roster if any, else all; convention = `versioned` |
 | `--reset-reviewers` | ignore an existing roster and rebuild it from the repo's default reviewers |
 | `--dry-run` | print planned actions, write nothing |
 | `--help` | usage |
@@ -98,7 +98,7 @@ In Claude Code, from any configured repo:
 
 ```
 /pr                 # infer base, draft PR, confirm, create
-/pr feature/2.3.0/center   # explicit base branch
+/pr develop         # explicit base branch
 /pr draft           # create as draft
 /pr help            # help
 ```
@@ -114,7 +114,7 @@ confirmation, then calls the detected binary. It never creates a PR silently.
 os=macos             # macos | linux
 token_src=keychain   # keychain | secret-tool | env
 email=you@example.com
-convention=trueid    # see presets
+convention=versioned # see presets
 ```
 
 Edit by hand any time. **A missing config is a hard error** — `/pr` and the binaries refuse to
@@ -128,7 +128,7 @@ with different conventions share the same skill:
 
 ```yaml
 title_pattern: "[<ver>] Feature/<ver>/<ticket> <desc>"
-ticket_regex: "SC-(\\d+|NOTICKET)"
+ticket_regex: "PROJ-\\d+"
 template_sections: [What Happened, Insight, Proof of Work]
 body_rules: |
   - Free-text project rules the skill follows literally.
@@ -136,10 +136,10 @@ 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
+  remote: upstream
+  repo: workspace/repo
 pre_pr: []               # commands run before confirm; non-zero exit stops /pr
-post_pr: [jira-update]   # sibling skills offered after create
+post_pr: []              # sibling skills offered after create
 ```
 
 Without the file, the convention keys below (written by the wizard) are used.
@@ -148,7 +148,7 @@ Without the file, the convention keys below (written by the wizard) are used.
 
 | preset | title pattern | ticket regex | template sections |
 |--------|---------------|--------------|-------------------|
-| `trueid` | `[<ver>] Feature/<ver>/SC-XXXX <desc>` | `SC-\d+` | What Happened / Insight / Proof of Work |
+| `versioned` | `[<ver>] Feature/<ver>/<ticket> <desc>` | `[A-Z]+-\d+` | What Happened / Insight / Proof of Work |
 | `conventional` | `<type>(<scope>): <desc>` | `[A-Z]+-\d+` | Summary / Changes / Testing |
 | `github-default` | `<desc> (#<issue>)` | `#\d+` | Summary / Test plan |
 | `custom` | your `title_pattern=` | your `ticket_regex=` | your `template_sections=` (pipe-separated) |
@@ -185,9 +185,8 @@ trailing `# Name` comment optional:
 ```
 
 It's plain data — edit freely, no reinstall. Consider gitignoring the roster unless the team wants
-it committed. Load order: `$PR_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.
+it committed. `$PR_REVIEWERS` (a file path) overrides the roster location. Run-time overrides:
+`--no-reviewers` skips all, `--reviewer <uuid>` appends.
 
 ### Auth precedence (email)
 
@@ -225,8 +224,6 @@ pr-commands check     # which host, and is it supported?
 pr-commands help
 ```
 
-Full rationale in [`DECISIONS.md`](./DECISIONS.md).
-
 ## Troubleshooting
 
 | symptom | fix |
@@ -248,26 +245,7 @@ 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 -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.body.md  shared /pr skill body (frontmatter added per-target on install)
-```
-
-`assets/` is the single source of truth — both the installer (`install.js`)
-and the published package (`files` in `package.json`) read from it. No duplicate
-tree to keep in sync.
-
-Publish (owner only):
-
-```bash
-npm login
-npm publish --access public
+rm <main-repo-root>/<agent_dir>/pr-reviewers.txt
 ```
 
 ## License

package/assets/skill/pr.body.md

@@ -36,7 +36,7 @@ UPDATE
                 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)
+CONFIG        ~/.config/pr/config  (os, token_src, email, agent_dir; fallback convention keys)
 PROVIDER      auto from `git remote get-url origin` (run by `pr-commands`)
 REVIEWERS     <main-repo-root>/<agent_dir>/pr-reviewers.txt (per-repo, shared across worktrees; agent_dir from config)
 SETUP         npx @nvice-r/pr-commands
@@ -97,7 +97,7 @@ echo "convention: ${PR_YAML:-$CFG (no .agents/config/pr.yaml)}"
 | `post_pr` | sibling skills offered after create (Step 10) | none |
 
 ## Step 2 — determine base branch (priority)
-a. `$1` (any arg containing `/`) → use it.
+a. an argument containing `/` → use it as the base.
 b. else saved `branch.<CURR>.base` from git config → use silently.
 c. else infer — smallest non-zero `<ref>..HEAD` distance where `<ref>` is an ancestor of HEAD:
    ```bash
@@ -129,8 +129,12 @@ split (`guard_cmd pr-split`, degrade if absent) / adjust-threshold. Never auto-s
 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>`).
+`feature/3.66.0/PROJ-1234-add-login`, pattern `[<ver>] Feature/<ver>/<ticket> <desc>` →
+`[3.66.0] Feature/3.66.0/PROJ-1234 add login` (kebab suffix → spaced lowercase `<desc>`).
+
+A pattern placeholder the branch name cannot supply (`<ticket>`, `<ver>`) → ask the user; never
+invent one. A matched key with no digits (e.g. `PROJ-NOTICKET`) is a **placeholder ticket**: fine
+in the title, but it is not a real ticket key (see Step 10).
 
 ## Step 5 — draft body (from config)
 
@@ -144,8 +148,8 @@ and override the generic defaults below where they conflict.
 - 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`.
+**`versioned` preset rules** — apply ONLY when there is no `pr.yaml` (`$PR_YAML` empty) and `$CFG`
+has `convention=versioned`. 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`.
@@ -155,7 +159,7 @@ has `convention=trueid`. A project `pr.yaml` replaces these with its own `body_r
 - 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.
+With no `body_rules` and no preset rules, fill sections with a plain summary + changed-file list.
 
 ## Step 6 — write body to `/tmp/pr-body.md` (Write tool).
 
@@ -188,9 +192,10 @@ per-repo reviewer roster automatically; `--no-reviewers` skips, `--reviewer <id>
 ## Step 9 — print final PR URL + reviewer count from `pr-commands` 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`):
+For each skill in the convention's `post_pr`:
 `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.
+(`/<skill> <ticket>` with the Step 4 ticket key) or skip. No ticket key, or only a placeholder
+ticket (no digits, e.g. `PROJ-NOTICKET`) → skip ticket-based skills with a one-line note.
 
 ## Update mode (`/pr update [PR#] [short]`)
 
@@ -210,8 +215,8 @@ 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
+**U3 — re-draft the body.** Rebuild the description with the **Step 5** rules (`versioned` template
+when `convention=versioned`): `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,
@@ -252,7 +257,7 @@ absent, degrade gracefully (one-line note). Reusable check (scans Claude command
 agent skills dir):
 ```bash
 guard_cmd() {  # usage: guard_cmd pr-split → prints path or "no-<cmd>"
-  local c="$1"
+  local c="${@:1:1}"   # first arg; avoids the positional form the skill loader rewrites
   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" \

package/install.js

@@ -27,11 +27,11 @@ const PROVIDERS = {
   github:    { host: 'github.com',    keychainSvc: 'github-api-token',    ready: false },
   gitlab:    { host: 'gitlab.com',     keychainSvc: 'gitlab-api-token',    ready: false },
 };
-const CONVENTIONS = ['trueid', 'conventional', 'github-default', 'custom'];
+const CONVENTIONS = ['versioned', 'conventional', 'github-default', 'custom'];
 // Concrete, editable defaults per preset. Whatever the user confirms is written to config,
 // so `custom` is just "a preset with blank seeds" — same edit flow for every choice.
 const PRESET_DEFS = {
-  trueid:           { title_pattern: '[<ver>] Feature/<ver>/SC-XXXX <desc>', ticket_regex: 'SC-\\d+',    template_sections: 'What Happened|Insight|Proof of Work' },
+  versioned:        { title_pattern: '[<ver>] Feature/<ver>/<ticket> <desc>', ticket_regex: '[A-Z]+-\\d+', template_sections: 'What Happened|Insight|Proof of Work' },
   conventional:     { title_pattern: '<type>(<scope>): <desc>',              ticket_regex: '[A-Z]+-\\d+', template_sections: 'Summary|Changes|Testing' },
   'github-default': { title_pattern: '<desc> (#<issue>)',                    ticket_regex: '#\\d+',       template_sections: 'Summary|Test plan' },
   custom:           { title_pattern: '',                                     ticket_regex: '',            template_sections: '' },
@@ -99,7 +99,7 @@ function printHelp() {
   --agent <id>       Force skill install to this agent (repeatable). Ids: claude-code,
                      antigravity, codex, opencode. Default: auto-detect installed agents.
   --all              Install every ready host provider (default: only the detected one)
-  --yes              Accept defaults, no prompts (reviewers=existing roster or all, convention=trueid)
+  --yes              Accept defaults, no prompts (reviewers=existing roster or all, convention=versioned)
   --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`);
@@ -243,7 +243,7 @@ function printLegend() {
   console.log('  Placeholders (used in title_pattern; filled by /pr from the branch):');
   console.log('    \x1b[2m<ver>     branch version    e.g. 2.3.0\x1b[0m');
   console.log('    \x1b[2m<desc>    description       from branch suffix / commits\x1b[0m');
-  console.log('    \x1b[2m<ticket>  ticket key        matched by ticket_regex, e.g. SC-5424\x1b[0m');
+  console.log('    \x1b[2m<ticket>  ticket key        matched by ticket_regex, e.g. PROJ-123\x1b[0m');
   console.log('    \x1b[2m<type>    conventional type feat | fix | chore | ...\x1b[0m');
   console.log('    \x1b[2m<scope>   conventional scope e.g. auth\x1b[0m');
   console.log('    \x1b[2m<issue>   issue number      e.g. 42\x1b[0m');
@@ -550,11 +550,11 @@ async function fetchBitbucketReviewers(slug, email, token, selfUuid) {
   const sPreset = async () => {
     screen(2, 'Convention — preset');
     if (flags.yes) {
-      st.convention = st.convention || 'trueid';
+      st.convention = PRESET_DEFS[st.convention] ? st.convention : 'versioned';
       st.conv = { ...PRESET_DEFS[st.convention] };
       return;
     }
-    const idx = Math.max(0, CONVENTIONS.indexOf(st.convention || 'trueid'));
+    const idx = Math.max(0, CONVENTIONS.indexOf(st.convention || 'versioned'));
     const pick = await multiSelectOne('Convention preset:', CONVENTIONS, idx);
     if (pick === BACK) return BACK;
     const chosenConv = CONVENTIONS[pick];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nvice-r/pr-commands",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Provider-agnostic PR helper for Claude Code — npx installer + one `pr-commands` command (per-host providers) + /pr skill",
   "bin": {
     "pr-commands-setup": "install.js"