@adia-ai/adia-ui-forge 0.8.8 → 0.8.9

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "adia-forge",
-  "version": "0.8.8",
+  "version": "0.8.9",
   "description": "Maintain the adia-ui (@adia-ai) framework itself \u2014 author primitives and shells, run the A2UI generation pipeline and its corpus, review gen-UI quality, sweep QA, cut releases, deploy. The maintainer counterpart to adia-factory (the consumer/app-author plugin).",
   "author": {
     "name": "Kim",

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog — adia-forge
 
+## [0.8.9] — 2026-07-19
+
+### Fixed
+- **`release-pack.mjs` now actually creates `release/vX.Y.Z`** before staging — `step5Commit()` previously committed on whatever branch was checked out (the v0.8.8 cut landed its release commit on local `main`, caught and recovered by hand). Idempotent (checkout if the branch exists — a resumed run — create with `-b` otherwise); `step1ReBaseline()` now asserts the starting branch is `main` or the release branch itself for cut modes. Guarded: checking out an *existing* release branch on a dirty tree now fails with a real diagnostic (which files, what to do) instead of an opaque git error.
+- **Step 9's settle-wait polls the registry itself**, not one proxy workflow — the old code waited for `publish-a2ui-validator.yml` alone as a stand-in for all 11 publishes; a straggler on any other package made the immediately-following fail-closed registry check abort on a pure timing false alarm (hit live on the v0.8.8 cut). Now polls all 11 packages + `latest` directly, every 15s up to ~10-18min, per the skill's own doctrine ("the registry is the verify target, never a workflow's green check"). The existing fail-closed check remains as a final confirmation.
+- **`pr-bridge.mjs` refuses to merge a DRAFT PR** — a real incident: it attempted to merge an author-marked draft, which GitHub's API rejects, and the old code (no `isDraft` check anywhere) crashed uncaught. `bridgeDecision()` now treats `isDraft` as an unconditional stop; the `gh pr merge` call and the top-level `main().catch` are both wrapped so no rejection reason — draft or otherwise — can crash invisibly under the script's own documented `grep -E "pr-bridge" | tail -N` usage pattern.
+
+### Maintenance
+- **`.claude-plugin/plugin.json` version bump** — moves in lockstep with package.json (the `/plugin update` cache key).
+- **`skills/` touched in this release window** (2 file(s), e.g. `scripts/pr-bridge.mjs`) — carried by the entries above.
+
 ## [0.8.8] — 2026-07-19
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adia-ai/adia-ui-forge",
-  "version": "0.8.8",
+  "version": "0.8.9",
   "description": "Maintain the adia-ui (@adia-ai) framework itself \u2014 author primitives and shells, run the A2UI generation pipeline and its corpus, review gen-UI quality, sweep QA, cut releases, deploy. The maintainer counterpart to adia-factory (the consumer/app-author plugin).",
   "keywords": [
     "adia-ui",

package/skills/adia-release/scripts/pr-bridge.mjs

@@ -124,6 +124,20 @@ export function bridgeDecision(state) {
     if (!PASS.has(concl)) reasons.push(`check '${c.name}' landed ${concl}`);
     else gatingLanded++;
   }
+  // gh#(pr-bridge draft guard): a draft PR is the AUTHOR's own "not ready"
+  // signal — GitHub's API refuses to merge one anyway (GraphQL: "Pull
+  // Request is still a draft"), and the old code had no isDraft check, so
+  // bridgeDecision said MERGE, the gh pr merge call threw, and the whole
+  // script crashed uncaught. A caller piping through `grep -E "pr-bridge" |
+  // tail -N` (this script's own documented usage pattern) sees only the
+  // last N lines BEFORE the crash and no error — reads as quiet success.
+  // Unconditional stop (review nit: placed after the per-check loop above,
+  // not literally first — but every reasons.push() here is unconditional and
+  // the "stop" decision below fires on ANY non-empty reasons list, so a
+  // draft overrides an otherwise-perfect merge regardless of ordering):
+  // never attempt the merge call on a draft, no matter how green everything
+  // else is.
+  if (state.isDraft) reasons.push('PR is a DRAFT — the author has not marked it ready for review; never auto-merge a draft');
   if (state.reviewDecision === 'CHANGES_REQUESTED') reasons.push('a review requests changes');
   if (state.unresolvedThreads > 0) reasons.push(`${state.unresolvedThreads} unresolved review thread(s) — admin merge cannot bypass these`);
   if (state.mergeable === 'CONFLICTING') reasons.push('PR is CONFLICTING with the base branch');
@@ -144,7 +158,7 @@ export function bridgeDecision(state) {
 // ── GitHub reads ──────────────────────────────────────────────────
 function readPrState(prNumber) {
   const view = JSON.parse(sh(
-    `gh pr view ${prNumber} --json state,mergeable,reviewDecision,statusCheckRollup,headRefName,baseRefName`,
+    `gh pr view ${prNumber} --json state,isDraft,mergeable,reviewDecision,statusCheckRollup,headRefName,baseRefName`,
   ));
   const checks = (view.statusCheckRollup || []).map((c) => ({
     name: c.name || c.context || '?',
@@ -156,6 +170,7 @@ function readPrState(prNumber) {
   )).data.repository.pullRequest.reviewThreads.nodes;
   return {
     state: view.state,
+    isDraft: view.isDraft,
     headRefName: view.headRefName,
     baseRefName: view.baseRefName,
     checks,
@@ -240,7 +255,19 @@ async function main() {
     }
     if (d.action === 'merge') {
       console.log(`\n[pr-bridge] all gates green — merging PR #${prNumber} (admin merge per house flow §5.7)`);
-      sh(`gh pr merge ${prNumber} --admin --merge --delete-branch`);
+      // Defense in depth: the isDraft check above should catch this, but
+      // GitHub's own merge call is the actual authority — never let its
+      // rejection crash uncaught (a caller filtering output for the
+      // "pr-bridge" prefix, this script's own documented usage, would see
+      // the run go quiet mid-merge with no clear failure, easy to misread
+      // as success). Report loudly and exit 1 instead of throwing.
+      try {
+        sh(`gh pr merge ${prNumber} --admin --merge --delete-branch`);
+      } catch (e) {
+        console.error(`\n[pr-bridge] STOP — gh pr merge rejected PR #${prNumber}: ${e.message || e}`);
+        console.error('  Nothing else mutated by this run; investigate and merge manually if appropriate.');
+        process.exit(1);
+      }
       break;
     }
     if (Date.now() > deadline) {
@@ -269,10 +296,12 @@ async function main() {
 // ── Selftest — the predicate is the load-bearing part ─────────────
 function selftest() {
   const ck = (name, status, conclusion) => ({ name, status, conclusion });
-  const base = { unresolvedThreads: 0, reviewDecision: 'REVIEW_REQUIRED', mergeable: 'MERGEABLE' };
+  const base = { unresolvedThreads: 0, reviewDecision: 'REVIEW_REQUIRED', mergeable: 'MERGEABLE', isDraft: false };
   const cases = [
     ['all green → merge',
       { ...base, checks: [ck('Static checks + MCP smoke', 'COMPLETED', 'SUCCESS'), ck('CodeRabbit', '', 'SUCCESS')] }, 'merge'],
+    ['DRAFT PR with all-green checks → stop, never attempt gh pr merge (real incident: PR #362)',
+      { ...base, isDraft: true, checks: [ck('Static checks + MCP smoke', 'COMPLETED', 'SUCCESS'), ck('CodeRabbit', '', 'SUCCESS')] }, 'stop'],
     ['fail-soft failure is advisory → merge',
       { ...base, checks: [ck('Static checks + MCP smoke', 'COMPLETED', 'SUCCESS'), ck('Audit health (fail-soft)', 'COMPLETED', 'FAILURE')] }, 'merge'],
     ['EMPTY check set → wait, never blind-merge (reviewer finding #1)',
@@ -313,4 +342,12 @@ function selftest() {
 
 const argv = process.argv.slice(2);
 if (argv[0] === 'selftest') selftest();
-else main().catch((e) => { console.error(e.message || e); process.exit(1); });
+else main().catch((e) => {
+  // Reviewer finding (PR #364): every OTHER error path (readPrState()'s gh
+  // pr view/graphql calls on every poll, git push/gh pr create, the
+  // re-baseline sequence) throws up to this top-level handler, which had NO
+  // "[pr-bridge]" prefix — invisible under the exact `grep -E "pr-bridge" |
+  // tail -N` filter this PR exists to fix. Same class, different call site.
+  console.error(`[pr-bridge] STOP — ${e.message || e}`);
+  process.exit(1);
+});

package/skills/adia-release/scripts/release-pack.mjs

@@ -229,6 +229,21 @@ function shCapture(cmd, args) {
 // ── Step 1 — Re-baseline ──────────────────────────────────────────
 function step1ReBaseline(args) {
   console.log('\n=== Step 1 — Re-baseline ===');
+  // cut-procedure.md §Step 1 requires `git branch --show-current` == main
+  // before a cut starts — cutting on any other branch pushes a stale main ref
+  // while tags point at the wrong tip (recovery-paths.md §Scenario 8). The doc
+  // asserted this; nothing here ever checked it (gh#358). The one legitimate
+  // exception is resuming this SAME cut after step5Commit already created and
+  // checked out release/vX.Y.Z — allow only that exact branch name back in.
+  if ((args.mode === 'cut' || args.mode === 'from-scratch') && !args.dry) {
+    const branch = shQuiet('git branch --show-current', args).trim();
+    const releaseBranch = `release/v${args.version}`;
+    if (branch !== 'main' && branch !== releaseBranch) {
+      console.error(`ERROR: on branch '${branch}' — cut modes start from 'main' (or resume on '${releaseBranch}'). Switch branches before proceeding.`);
+      process.exit(1);
+    }
+    console.log(`  branch: ${branch} (ok)`);
+  }
   console.log('git status --short:');
   sh('git status --short', args);
   console.log('\norigin/main..HEAD (unpushed):');
@@ -362,6 +377,30 @@ function step5Commit(args) {
     return;
   }
   console.log('\n=== Step 5 — Stage + Commit ===');
+  // cut-procedure.md §Step 5: "Branch FIRST, then stage" — this step never
+  // actually created release/vX.Y.Z, so the commit landed on whatever branch
+  // was checked out (main, on the v0.8.8 cut — gh#358). Idempotent: if the
+  // branch already exists (a resumed run), check it out rather than failing;
+  // step1ReBaseline's branch assertion is what stops a genuinely wrong branch
+  // from reaching this point.
+  const releaseBranch = `release/v${args.version}`;
+  const currentBranch = args.dry ? null : shQuiet('git branch --show-current', args).trim();
+  if (currentBranch !== releaseBranch) {
+    const exists = !args.dry && shQuiet(`git branch --list ${releaseBranch}`, args).trim().length > 0;
+    // Reviewer finding (PR #359): checking out an EXISTING release branch (a
+    // resumed run) on a dirty tree fails with a raw, opaque git error — Step 4
+    // (promote/bump/lockfile) runs immediately before this and dirties exactly
+    // the files a release branch differs from main in. A fresh `-b` create
+    // from clean main can't hit this, so the check only guards the resume path.
+    if (exists && !args.dry) {
+      const dirty = shQuiet('git status --porcelain', args).trim();
+      if (dirty) {
+        console.error(`ERROR: '${releaseBranch}' already exists, but the working tree is dirty — checking out would fail or silently carry these changes onto the resumed branch:\n${dirty}\n  Commit, stash, or discard first, then re-run.`);
+        process.exit(1);
+      }
+    }
+    sh(`git checkout ${exists ? '' : '-b '}${releaseBranch}`, args);
+  }
   sh('git reset HEAD >/dev/null 2>&1 || true', args);
   const releaseFiles = [
     'package-lock.json',
@@ -512,11 +551,34 @@ async function step9Publish(args) {
   // Give GH a moment to index the runs created by the per-tag push in Step 8.
   if (!args.dry) sh('sleep 6', args);
   sh(`node ${SCRIPT_DIR}/dispatch-publish.mjs --version ${args.version} --scope ${args.scope} --verify-triggered`, args);
-  console.log('\n  Waiting for publishes to settle...');
-  sh(`until [ "$(gh run list --workflow=publish-a2ui-validator.yml --limit 1 --json status -q '.[0].status')" = "completed" ]; do sleep 5; done`, args);
-  console.log('  ✓ publishes settled');
+  // gh#354: this used to poll ONE workflow (publish-a2ui-validator.yml) as a
+  // sample-of-one proxy for all 11 publishes settling — a straggler on any
+  // OTHER package's workflow made the fail-closed check below abort on a pure
+  // timing false alarm (hit live on the v0.8.8 cut: a2ui-retrieval published
+  // successfully ~1 minute after validator did, after the old proxy had
+  // already declared "settled" and the registry read caught it mid-flight).
+  // Poll the REGISTRY itself instead — the skill's own doctrine (SKILL.md:
+  // "the registry is the verify target, never a workflow's green check")
+  // applies here as much as it does to the final check.
+  console.log(`\n  Waiting for the registry to confirm all ${PACKAGES.length} packages at ${args.version} (polling every 15s, up to 10min)...`);
+  sh(
+    `for i in $(seq 1 40); do ` +
+    `fail=0; ` +
+    `for pkg in ${PACKAGES.join(' ')}; do ` +
+    `v="$(npm view "${args.scope}/$pkg" version 2>/dev/null || true)"; ` +
+    `[ "$v" = "${args.version}" ] || fail=1; ` +
+    `done; ` +
+    `latest="$(npm view ${args.scope}/web-components dist-tags.latest 2>/dev/null || true)"; ` +
+    `[ "$latest" = "${args.version}" ] || fail=1; ` +
+    `[ "$fail" = 0 ] && { echo "  ✓ registry confirms all ${PACKAGES.length} + latest, after $i check(s)"; exit 0; }; ` +
+    `sleep 15; ` +
+    `done; ` +
+    `echo "  registry did not converge after 10min — the fail-closed check below will report exactly which package(s) are still stale"`,
+    args,
+  );
   // Fail-closed: the registry is the verify target (SKILL.md) — a missing or
-  // stale package aborts the cut here, before GH releases + site deploy.
+  // stale package aborts the cut here, before GH releases + site deploy. This
+  // is now a final confirmation of the poll above, not the first real read.
   console.log(`\n  Post-publish registry verification, all ${PACKAGES.length} at ${args.version} + npm latest (fail-closed):`);
   sh(
     `fail=0; ` +
@@ -648,6 +710,8 @@ function selftest() {
       `${GATE_ROSTER.length}-gate roster`,
       `✓ all ${GATE_ROSTER.length}/${GATE_ROSTER.length} gates passed`,
       'STOPPING per invariant 3',
+      // gh#358 — the release branch must actually be created, not just documented.
+      'git checkout -b release/v9.9.9',
     ];
     for (const marker of need) {
       if (!out.includes(marker)) {