@spardutti/claude-skills 2.60.3 → 2.60.5

package/hooks/ship-gate-hook.sh

@@ -80,11 +80,18 @@ git rev-parse --git-dir >/dev/null 2>&1 || exit 0
 pr_branch() {
   case "$CMD" in
     *"gh pr create"*) printf '%s\n' "$CMD" | sed -nE 's/.*(--head[ =]|-H )"?([^ ;&|"]+).*/\2/p' ;;
-    *"gh pr merge"*) merge_branch ;;
+    *"gh pr merge"*) merge_field headRefName ;;
   esac
 }
 
-merge_branch() {
+pr_base() {
+  case "$CMD" in
+    *"gh pr create"*) printf '%s\n' "$CMD" | sed -nE 's/.*(--base[ =]|-B )"?([^ ;&|"]+).*/\2/p' ;;
+    *"gh pr merge"*) merge_field baseRefName ;;
+  esac
+}
+
+merge_field() {  # merge_field <gh pr field>
   local pr="" repo="" next=""
   for t in $(printf '%s\n' "$CMD" | sed 's/.*gh pr merge//; s/[;&|].*//'); do
     if [ "$next" = repo ]; then repo=$t; next=""; continue; fi
@@ -96,7 +103,7 @@ merge_branch() {
     esac
   done
   [ -n "$pr" ] || return 0
-  gh pr view "$pr" ${repo:+-R "$repo"} --json headRefName -q .headRefName 2>/dev/null
+  gh pr view "$pr" ${repo:+-R "$repo"} --json "$1" -q ".$1" 2>/dev/null
 }
 
 worktree_of() {
@@ -111,6 +118,11 @@ case "$CMD" in *"gh pr create"*)
   CWD_TOP=$(git -C "${CWD:-.}" rev-parse --show-toplevel 2>/dev/null) && [ -n "$CWD_TOP" ] && TARGET="$CWD_TOP" ;;
 esac
 BRANCH=$(pr_branch)
+# A release PR carries only work each feature PR already gated, and the gate on the
+# trunk measures it against itself, so a receipt there proves nothing.
+case "$BRANCH" in dev|develop|development)
+  case "$(pr_base)" in main|master) exit 0 ;; esac ;;
+esac
 [ -n "$BRANCH" ] && WT=$(worktree_of "$BRANCH") && [ -n "$WT" ] && TARGET="$WT"
 
 # Ask the gate for the key rather than recomputing it here. Two implementations

package/hooks/ship-log.mjs

@@ -1,12 +1,14 @@
 #!/usr/bin/env node
 import { spawnSync } from "node:child_process";
-import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
 import { git, parseReport, prSize } from "./ship-log-parse.mjs";
 import { printReport, tally } from "./ship-log-report.mjs";
 
 const HERE = dirname(resolve(process.argv[1]));
 const VERDICTS = ["confirmed", "refuted", "unconfirmed", "skipped"];
+// A release ships only work its feature PRs already logged.
+const RELEASE = /^(main|master|dev|develop|development|chore\/release-.*)$/;
 const now = () => new Date().toISOString().replace(/\.\d+Z$/, "Z");
 
 // gate-config.sh owns the config files and their order, so the gate and this agree on "on".
@@ -45,7 +47,19 @@ function summarize(record) {
   return { minutes: Math.round(minutes * 10) / 10, gateRuns: record.gate.length, gateSeconds: record.gate.reduce((n, r) => n + (r.seconds ?? 0), 0), findings: by };
 }
 
+// Survivors fixed but never logged: a FAIL that a later PASS cleared, with no mutation finding since.
+function settleSurvivors(record) {
+  const i = record.gate.findLastIndex((g) => g.verdict === "FAIL" && g.projects?.some((p) => p.survivors?.length));
+  if (i < 0 || !record.gate.slice(i + 1).some((g) => g.verdict === "PASS")) return;
+  if (record.findings.some((f) => f.by === "mutation" && f.ts >= record.gate[i].ts)) return;
+  for (const s of record.gate[i].projects.flatMap((p) => p.survivors ?? [])) {
+    record.findings.push({ ts: now(), by: "mutation", what: `${s.mutator ?? s.kind} at ${s.at}`, file: s.at.split(":")[0],
+      verdict: "confirmed", fixed: true, note: "logged by ship-log: a later gate run passed" });
+  }
+}
+
 function finalize(dir, path, record, tag, status, reason, at) {
+  settleSurvivors(record);
   Object.assign(record, { status, reason: reason ?? null, finished: at ?? now() });
   record.summary = summarize(record);
   const stem = `${record.app}_${record.finished.slice(0, 10)}_${tag}`;
@@ -57,7 +71,7 @@ function finalize(dir, path, record, tag, status, reason, at) {
 }
 
 function prOf(branch) {
-  const r = spawnSync("gh", ["pr", "list", "--head", branch, "--state", "all", "--json", "number,createdAt,state", "--limit", "1"], { encoding: "utf8" });
+  const r = spawnSync("gh", ["pr", "list", "--head", branch, "--state", "all", "--json", "number,createdAt,closedAt,state", "--limit", "1"], { encoding: "utf8" });
   try { return r.status === 0 ? JSON.parse(r.stdout)[0] : undefined; } catch { return undefined; }
 }
 
@@ -68,8 +82,10 @@ function closeOpened(dir, app) {
   const open = join(dir, "open");
   for (const f of existsSync(open) ? readdirSync(open).filter((n) => n.startsWith(`${app}__`)) : []) {
     const path = join(open, f), record = JSON.parse(readFileSync(path, "utf8"));
-    if (!record.gate.length && !record.findings.length) continue;
-    const pr = prOf(record.branch);
+    const pr = prOf(record.branch), empty = !record.gate.length && !record.findings.length;
+    // A /ship that only merged fills nothing, so once its PR closes there is nothing to keep.
+    if (empty && pr?.closedAt >= record.started) { rmSync(path); continue; }
+    if (empty) continue;
     const opened = pr && pr.createdAt >= record.started;
     if (!pr || (!opened && pr.state !== "OPEN")) continue;
     finalize(dir, path, Object.assign(record, { pr: pr.number }), `pr${pr.number}`,
@@ -144,6 +160,11 @@ function run(mode, args) {
   if (mode === "on") return c.on ? 0 : 1;
   if (!c.on) return 0;
   const id = identity(c.root), path = openPath(c.dir, id), record = load(path, id);
+  if (mode === "start" && RELEASE.test(id.branch)) {
+    closeOpened(c.dir, id.app);
+    if (existsSync(path)) rmSync(path);
+    return 0;
+  }
   if (mode === "start") return restart(c.dir, path, record, id), 0;
   if (mode === "ready") {
     const todo = existsSync(path) ? missing(record, c) : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spardutti/claude-skills",
-  "version": "2.60.3",
+  "version": "2.60.5",
   "description": "Guardrails for Claude Code — best-practice skills, planning commands, and delivery gates.",
   "type": "module",
   "repository": {