@spardutti/claude-skills 2.60.3 → 2.60.4

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

@@ -45,7 +45,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}`;

package/hooks/ship-prep.sh

@@ -69,8 +69,11 @@ scope() {
   fi
   echo "diff $diff"
   echo "review /code-review medium origin/$(base_branch)...$branch"
-  node "$HERE/ship-log.mjs" step audit start >/dev/null 2>&1
-  node "$HERE/ship-log.mjs" step review start >/dev/null 2>&1
+  # A release branch skips the audit and the review, so starting them left steps that never end.
+  case "$branch" in chore/release-*) ;; *)
+    node "$HERE/ship-log.mjs" step audit start >/dev/null 2>&1
+    node "$HERE/ship-log.mjs" step review start >/dev/null 2>&1 ;;
+  esac
   return 0
 }
 

package/package.json

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