@gcunharodrigues/wrxn 0.20.1 → 0.21.0

package/bin/wrxn.cjs

@@ -15,6 +15,7 @@ const connect = require('../lib/connect.cjs');
 const ship = require('../lib/ship.cjs');
 const protect = require('../lib/protect.cjs');
 const release = require('../lib/release.cjs');
+const releaseCut = require('../lib/release-cut.cjs');
 const brain = require('../lib/brain.cjs');
 const statusline = require('../lib/statusline.cjs');
 const { convert } = require('../lib/convert.cjs');
@@ -142,6 +143,16 @@ Usage:
                                  running it (a non-destructive preview). Stops at the first failing
                                  step (a failed push never opens a PR).
 
+  wrxn release [minor|patch|major] [--base <main>] [--root <dir>]
+                                 one-command deliberate release (ADR 0010): bump package.json+lock,
+                                 commit chore(release): <pkg> X.Y.Z on chore/release-X.Y.Z, then
+                                 delegate push → PR (base main) → arm auto-merge to the ship path. The
+                                 level is auto-computed from conventional commits since the last tag
+                                 (REUSE release-check); pass minor|patch|major to force it. Does NOT
+                                 publish or tag — CD publishes on merge. Repo-agnostic (cwd package.json
+                                 + git). Refuses loud (no mutation) when it can't safely release: not on
+                                 main, dirty tree, behind origin/main, or nothing releasable + no level.
+
   wrxn protect [--root <dir>]    apply the wrxn-main-gate server-side ruleset to this repo's origin —
                                  the hard gate that replaces the settings.local.json env-flag dance:
                                  block direct push to the default branch, require a PR + the wrxn-ci
@@ -544,6 +555,29 @@ async function main(argv) {
     return 2;
   }
 
+  if (cmd === 'release') {
+    // One-command deliberate release (ADR 0010): compute the bump (explicit level, else auto from
+    // conventional commits since the last tag — REUSE release-check) → npm version → commit
+    // chore(release) on chore/release-X.Y.Z → DELEGATE push/PR/arm to the ship path. Does NOT publish
+    // or tag — CD owns that on merge. Repo-agnostic (operates on the cwd package.json + git). The git/
+    // npm/ship side effects run through release-cut's realDeps (real invocation). Refuses loud (exit 2,
+    // NO mutation) on: not on main / dirty tree / behind origin/main / nothing releasable + no level.
+    const root = path.resolve(args.flags.root || process.cwd());
+    const arg = args._[1]; // optional minor|patch|major
+    const base = args.flags.base || releaseCut.DEFAULT_BASE;
+    const res = releaseCut.cutRelease({ arg, base, root });
+    if (res.refused) {
+      process.stderr.write(`wrxn: refusing to release — ${res.reason} (nothing changed)\n`);
+      return 2;
+    }
+    if (!res.ok) {
+      process.stderr.write(`wrxn: release failed at "${res.step}"${res.detail ? ` — ${res.detail}` : ''}\n`);
+      return 2;
+    }
+    process.stdout.write(`released ${res.version} (${res.bump}, ${res.source}) — committed ${res.branch}, delegated to ship → PR on ${res.base} with auto-merge armed (CD publishes on merge)\n`);
+    return 0;
+  }
+
   if (cmd === 'protect') {
     // Apply the wrxn-main-gate server-side ruleset to this repo's origin — the hard gate that replaces
     // the disarmable settings.local.json env-flag dance (ADR 0007). Repo-agnostic: the slug is read from

package/lib/release-cut.cjs

@@ -0,0 +1,160 @@
+'use strict';
+
+// wrxn release — one-command deliberate release (PRD #101 / issue #102).
+//
+// Collapses the manual 4-step chore(release) dance into one command: compute the bump, apply
+// `npm version <bump> --no-git-tag-version`, commit `chore(release): <pkg> X.Y.Z` on
+// `chore/release-X.Y.Z`, then DELEGATE push → PR(base main) → arm-auto-merge to the existing
+// `wrxn ship` path. It does NOT publish or tag — CD owns that on merge (ADR 0010).
+//
+// REUSE > CREATE: the bump is computed by lib/release.cjs's `shouldRelease` (the release-check
+// type-gate; its previously-vestigial `bump` is now consumed); the push/PR/arm is the existing
+// lib/ship.cjs `ship`. New code is only the thin orchestration + guards.
+//
+// Side effects go through an INJECTED `deps` boundary (readState / applyBump / commit / ship),
+// defaulting to the real git/npm/gh impls — so the whole flow is unit-testable with NO live push.
+// This mirrors lib/ship.cjs's injected invoker, finer-grained per the tdd skill's mocking.md
+// ("SDK-style boundary functions over one generic fetcher": each boundary returns one shape).
+
+const fs = require('fs');
+const path = require('path');
+const { execFileSync } = require('child_process');
+const { shouldRelease, parseLog } = require('./release.cjs');
+const ship = require('./ship.cjs');
+
+const BUMPS = ['major', 'minor', 'patch'];
+const TRUNK = 'main';
+const DEFAULT_BASE = 'main';
+
+function refusal(reason) {
+  return { ok: false, refused: true, reason };
+}
+
+/**
+ * Decide the release bump. PURE. An explicit level wins; otherwise it is auto-computed from the
+ * conventional commits since the last tag (REUSE lib/release.cjs's release-check classifier — its
+ * once-vestigial `bump` output is now consumed). No level AND nothing releasable → refuse.
+ * @returns {{ bump:string, source:'explicit'|'auto' } | { refuse:true, reason:string }}
+ * @throws on an unknown explicit level (a malformed release is never runnable).
+ */
+function decideBump({ arg, commits, lastTag } = {}) {
+  if (arg != null && arg !== '') {
+    if (!BUMPS.includes(arg)) throw new Error(`unknown release level "${arg}" — expected ${BUMPS.join(' | ')}`);
+    return { bump: arg, source: 'explicit' };
+  }
+  const { release, bump } = shouldRelease(commits || []);
+  if (!release) return { refuse: true, reason: `nothing to release since ${lastTag || 'the last release'}` };
+  return { bump, source: 'auto' };
+}
+
+/**
+ * The branch + PR title a release commits and ships, derived from the package name and the
+ * post-bump version. PURE. Version is passed through verbatim so prerelease tags (recon-wrxn's
+ * `6.0.0-wrxn.N`) survive — npm version is the authority on the new version, not this helper.
+ * @returns {{ branch:string, title:string }}
+ * @throws when name or version is missing.
+ */
+function releaseSpec({ name, version } = {}) {
+  if (!name || !version) throw new Error('releaseSpec requires a package name and version');
+  return {
+    branch: `chore/release-${version}`,
+    title: `chore(release): ${name} ${version}`,
+  };
+}
+
+/**
+ * Cut a deliberate release. Guards (each refuses loud, non-zero, NO mutation) → bump decision →
+ * npm version → commit → delegate to ship. Side effects run through the injected `deps` boundary.
+ * @returns {{ ok:true, ... } | { ok:false, refused?:true, reason?:string, step?:string, detail?:string }}
+ */
+function cutRelease({ arg, base = DEFAULT_BASE, root, deps } = {}) {
+  const d = deps || realDeps(root || process.cwd());
+  const state = d.readState();
+  // ── guards ──
+  if (state.branch !== TRUNK) return refusal(`not on ${TRUNK} (on "${state.branch}") — release is cut from ${TRUNK}`);
+  if (state.dirty) return refusal('the working tree is dirty — commit or stash before releasing');
+  if (state.behind > 0) return refusal(`behind origin/${TRUNK} by ${state.behind} — pull before releasing`);
+  // ── bump decision (explicit arg wins; else auto from commits since the tag; else refuse) ──
+  let decision;
+  try {
+    decision = decideBump({ arg, commits: state.commits, lastTag: state.lastTag });
+  } catch (err) {
+    return refusal(err.message);
+  }
+  if (decision.refuse) return refusal(decision.reason);
+  // ── mutate: npm version (the version authority) → commit chore(release) → delegate to ship ──
+  const applied = d.applyBump(decision.bump);
+  if (!applied.ok) return { ok: false, step: 'npm-version', detail: applied.detail };
+  const spec = releaseSpec({ name: state.name, version: applied.newVersion });
+  const committed = d.commit({ branch: spec.branch, title: spec.title });
+  if (!committed.ok) return { ok: false, step: 'commit', detail: committed.detail };
+  const shipped = d.ship({ branch: spec.branch, title: spec.title, base });
+  if (!shipped.ok) return { ok: false, step: 'ship', failed: shipped.failed, detail: shipped.detail, branch: spec.branch };
+  return {
+    ok: true,
+    bump: decision.bump,
+    source: decision.source,
+    version: applied.newVersion,
+    branch: spec.branch,
+    title: spec.title,
+    base,
+  };
+}
+
+/**
+ * The real side-effect boundary (the CLI layer wires this — what makes the release "validated by
+ * invocation"). Each method is one SDK-style operation over the cwd repo, repo-agnostic (reads the
+ * package.json + git in `root`, so the SAME command releases wrxn-kernel and recon-wrxn):
+ *   readState — current branch, dirty, behind origin/main, last tag, commits since it, pkg name/version
+ *   applyBump — `npm version <bump> --no-git-tag-version`; npm is the version authority (returns it)
+ *   commit    — branch chore/release-X.Y.Z, stage package.json (+ lockfile if present), commit
+ *   ship      — REUSE lib/ship.cjs (push → PR base main → arm auto-merge); NOT reimplemented here
+ */
+function realDeps(root) {
+  const git = (...a) => execFileSync('git', ['-C', root, ...a], { encoding: 'utf8' }).trim();
+  return {
+    readState() {
+      let branch = '';
+      try { branch = git('branch', '--show-current'); } catch { branch = ''; }
+      let dirty = false;
+      try { dirty = git('status', '--porcelain') !== ''; } catch { dirty = false; }
+      // Best-effort fetch so "behind" reflects the real remote; never block on a fetch failure
+      // (offline / no remote) — the server-side require-up-to-date ruleset is the hard gate.
+      try { execFileSync('git', ['-C', root, 'fetch', 'origin', TRUNK, '--quiet'], { stdio: 'ignore' }); } catch { /* offline / no remote */ }
+      let behind = 0;
+      try { behind = parseInt(git('rev-list', '--count', `HEAD..origin/${TRUNK}`), 10) || 0; } catch { behind = 0; }
+      let lastTag = '';
+      try { lastTag = git('describe', '--tags', '--abbrev=0'); } catch { lastTag = ''; }
+      let commits = [];
+      try { commits = parseLog(git('log', '--format=%B%x00', lastTag ? `${lastTag}..HEAD` : 'HEAD')); } catch { commits = []; }
+      const pkg = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8'));
+      return { branch, dirty, behind, lastTag, commits, name: pkg.name, version: pkg.version };
+    },
+    applyBump(bump) {
+      try {
+        execFileSync('npm', ['version', bump, '--no-git-tag-version'], { cwd: root, encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] });
+        const pkg = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8'));
+        return { ok: true, newVersion: pkg.version };
+      } catch (err) {
+        return { ok: false, detail: `npm version ${bump} failed: ${err.message}` };
+      }
+    },
+    commit({ branch, title }) {
+      try {
+        git('checkout', '-b', branch);
+        const files = ['package.json'];
+        if (fs.existsSync(path.join(root, 'package-lock.json'))) files.push('package-lock.json');
+        git('add', '--', ...files);
+        git('commit', '-m', title);
+        return { ok: true };
+      } catch (err) {
+        return { ok: false, detail: `commit failed: ${err.message}` };
+      }
+    },
+    ship({ branch, title, base }) {
+      return ship.ship({ branch, title, base }); // real defaultInvoke (git push + gh)
+    },
+  };
+}
+
+module.exports = { decideBump, releaseSpec, cutRelease, realDeps, BUMPS, DEFAULT_BASE };

package/lib/release.cjs

@@ -60,4 +60,17 @@ function decidePublish({ typeRelease, versionOnNpm } = {}) {
   return Boolean(typeRelease) || !versionOnNpm;
 }
 
-module.exports = { shouldRelease, parseLog, decidePublish };
+/**
+ * decideWarn({ typeRelease, versionOnNpm }) → boolean. The silent-skip detector (#103): warn when the
+ * merged commits warrant a type release AND package.json.version is already on npm. In that case
+ * decidePublish is true (typeRelease), so the run proceeds — but the publish step's idempotency guard
+ * skips the already-published version, so nothing reaches npm: the releasable commits silently never
+ * ship. The workflow turns this into a visible `::warning::` to run `wrxn release` (bump + publish).
+ * Pure — the npm probe stays in the workflow. False for a normal publish (versionOnNpm false) and for
+ * non-release merges (the idempotent no-op is expected, not a mistake).
+ */
+function decideWarn({ typeRelease, versionOnNpm } = {}) {
+  return Boolean(typeRelease) && Boolean(versionOnNpm);
+}
+
+module.exports = { shouldRelease, parseLog, decidePublish, decideWarn };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gcunharodrigues/wrxn",
-  "version": "0.20.1",
+  "version": "0.21.0",
   "description": "WRXN Kernel — installable AI operating system. Two profiles (project | workspace), pull-based updates, managed/seeded/state file classes.",
   "bin": {
     "wrxn": "bin/wrxn.cjs"

package/payload/.claude/agents/devops.md

@@ -25,6 +25,11 @@ are global slash-skills with no local file; the promote is yours). Follow these
    opens a PR, and arms auto-merge (`gh pr merge --auto --squash`) — no settings file, no env flag, no
    GitHub clicks. `--branch` defaults to the current branch; pass `--base` if the trunk is not `main`.
    Run `wrxn ship --dry-run` first if you want to preview the exact promote plan before it runs.
+   - **Multi-issue PR bodies — one closing keyword PER issue.** When the PR resolves more than one
+     issue, write a closing keyword before EACH number (`Closes #104, closes #105`, or one `Closes #N`
+     per line). GitHub auto-closes only the issue directly after a keyword, so a comma/`+` list after a
+     single keyword (`Closes #104, #105`) closes ONLY the first — trailing slices leak open (real: PR
+     #106 left #105 open). Applies on squash-merge too (GitHub reads the PR body + the squash message).
 3. **Confirm auto-merge is armed** (e.g. `gh pr view --json autoMergeRequest` shows it enabled). The
    server-enforced CI ruleset is now the authority: GitHub merges to the trunk the instant CI is green.
    You never merge by hand and you never push directly to the trunk.