@spardutti/claude-skills 2.56.1 → 2.56.3

package/README.md

@@ -36,7 +36,7 @@ npx @spardutti/claude-skills
 ```
 
 ```text
-  Claude Skills Installer v2.56.1
+  Claude Skills Installer v2.56.3
 
   ── Frontend ──────────────────────────────
   ◉ react              ◯ tanstack-query

package/hooks/gate-config.sh

@@ -18,6 +18,11 @@ load_gauntlet_conf() {  # load_gauntlet_conf <project conf> <fallback conf>
   if [ -f "$conf" ]; then . "$conf"; fi
 }
 
+json_field() {  # json_field <json> <key> — a flat string value; \" is unescaped, \n is kept as two characters
+  printf '%s' "$1" | grep -oE "\"$2\"[[:space:]]*:[[:space:]]*\"([^\"\\\\]|\\\\.)*\"" | head -1 \
+    | sed -E 's/^[^:]*:[[:space:]]*"//; s/"$//; s/\\"/"/g'
+}
+
 # set -f: unquoted, the list is glob-expanded before it is split, and */components/ui/*.tsx
 # expanded into the very path it should match.
 is_ignored() {

package/hooks/ship-gate-hook.sh

@@ -19,9 +19,10 @@
 # now: the cost is paid once, at the point work actually ships.
 
 INPUT=$(cat)
+. "$(cd "$(dirname "$0")" && pwd)/gate-config.sh" 2>/dev/null || exit 0
 
-CMD=$(printf '%s' "$INPUT" | grep -o '"command"[[:space:]]*:[[:space:]]*"[^"]*"' \
-      | head -1 | sed 's/.*:[[:space:]]*"//; s/"$//')
+CMD=$(json_field "$INPUT" command)
+CWD=$(json_field "$INPUT" cwd)
 
 PROJECT_DIR="${CLAUDE_PROJECT_DIR:-$PWD}"
 cd "$PROJECT_DIR" 2>/dev/null || exit 0
@@ -30,16 +31,31 @@ cd "$PROJECT_DIR" 2>/dev/null || exit 0
 # protected branch — that is a direct ship with no PR in front of it. The branch
 # is read from git rather than parsed out of the command, because `git push` with
 # no arguments names no branch at all.
+push_dirs() {  # one "<cd dir><TAB><-C dir>" line per push in the command
+  local dir=. seg re_c='^git -C +"?([^" ]+)"? +push( |$)' re_cd='^cd +"?([^" ]+)"?$' re_push='^git push( |$)'
+  while IFS= read -r seg; do
+    seg=$(printf '%s' "$seg" | sed -E 's/^[[:space:]]*(\$\(|\()?[[:space:]]*//; s/[[:space:]]*$//')
+    if [[ $seg =~ $re_cd ]]; then dir=${BASH_REMATCH[1]}
+    elif [[ $seg =~ $re_c ]]; then printf '%s\t%s\n' "$dir" "${BASH_REMATCH[1]}"
+    elif [[ $seg =~ $re_push ]]; then printf '%s\t\n' "$dir"
+    fi
+  done < <(printf '%s\n' "$CMD" | sed -E 's/\\n|&&|\|\||;|\|/\n/g')
+}
+
+push_branch() {  # push_branch <cd dir> <-C dir>; a folder git cannot read falls back to the main folder
+  git -C "${CWD:-.}" -C "$1" ${2:+-C "$2"} branch --show-current 2>/dev/null || git branch --show-current 2>/dev/null
+}
+
 case "$CMD" in
   *"gh pr create"*|*"gh pr merge"*) ;;
-  *"git push"*)
-    BRANCH=$(git branch --show-current 2>/dev/null)
-    case "$BRANCH" in
-      main|master|develop|development|dev) ;;
-      *) exit 0 ;;
-    esac
+  *)
+    PUSHES=$(push_dirs); [ -n "$PUSHES" ] || exit 0
+    PROTECTED=""
+    while IFS=$'\t' read -r d c; do
+      case "$(push_branch "$d" "$c")" in main|master|develop|development|dev) PROTECTED=1 ;; esac
+    done <<< "$PUSHES"
+    [ -n "$PROTECTED" ] || exit 0
     ;;
-  *) exit 0 ;;
 esac
 
 json_escape() {
@@ -63,7 +79,7 @@ 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 create"*) printf '%s\n' "$CMD" | sed -nE 's/.*(--head[ =]|-H )"?([^ ;&|"]+).*/\2/p' ;;
     *"gh pr merge"*) merge_branch ;;
   esac
 }
@@ -91,6 +107,9 @@ worktree_of() {
 # A PR from a worktree ships that folder's diff, so its receipt is keyed there,
 # not in the folder this session started in.
 TARGET="$PROJECT_DIR"
+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)
 [ -n "$BRANCH" ] && WT=$(worktree_of "$BRANCH") && [ -n "$WT" ] && TARGET="$WT"
 
@@ -102,7 +121,7 @@ KEY=$(CLAUDE_PROJECT_DIR="$TARGET" bash "$GATE" --key 2>/dev/null)
 # A gate run by hand skips /ship's audit and review, so the PR waits for /ship itself.
 # A merge whose branch gh cannot name is left to the receipt alone.
 MARKER="$PROJECT_DIR/.claude/hooks/ship-mark.sh"
-case "$CMD" in *"gh pr create"*) MARK_BRANCH=${BRANCH:-$(git branch --show-current)} ;; *) MARK_BRANCH=$BRANCH ;; esac
+case "$CMD" in *"gh pr create"*) MARK_BRANCH=${BRANCH:-$(git -C "$TARGET" branch --show-current)} ;; *) MARK_BRANCH=$BRANCH ;; esac
 if [ -f "$MARKER" ] && [ -n "$MARK_BRANCH" ] && ! CLAUDE_PROJECT_DIR="$TARGET" bash "$MARKER" check "$MARK_BRANCH"; then
   deny "BLOCKED: /ship has not run on branch $MARK_BRANCH.
 
@@ -111,8 +130,20 @@ by hand is not enough: /ship also runs the skills audit and the code review.
 The gate's earlier pass is reused, so only those two steps cost time."
 fi
 
+SHIP_LOG="$PROJECT_DIR/.claude/hooks/ship-log.mjs"
+log_ready() {
+  case "$CMD" in *"gh pr create"*) ;; *) return 0 ;; esac
+  [ -f "$SHIP_LOG" ] && command -v node >/dev/null || return 0
+  TODO=$(SHIP_LOG_ROOT="$TARGET" node "$SHIP_LOG" ready 2>/dev/null) || [ -z "$TODO" ] || deny "BLOCKED: the ship log is not filled in for this /ship. Do these, then create the PR again:
+$TODO
+
+A finding's shape is in The ship log section of /ship. Log each one with the verdict
+you already reached; never log a finding you did not settle."
+}
+
 RECEIPT="/tmp/claude-shipgate-$KEY"
 if [ -f "$RECEIPT" ]; then
+  log_ready
   exit 0
 fi
 

package/hooks/ship-log.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { spawnSync } from "node:child_process";
-import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, 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";
@@ -12,10 +12,10 @@ 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".
 function conf() {
   const root = git(["rev-parse", "--show-toplevel"]) || process.cwd();
-  const script = 'cd "$2" && . "$1/gate-config.sh" || exit 1; load_gauntlet_conf .claude/gauntlet.conf "$1/../gauntlet.conf"; printf "\\nSHIP_LOG_ON=%s\\nSHIP_LOG_DIR=%s\\n" "$GAUNTLET_SHIP_LOG" "$GAUNTLET_SHIP_LOG_DIR"';
+  const script = 'cd "$2" && . "$1/gate-config.sh" || exit 1; load_gauntlet_conf .claude/gauntlet.conf "$1/../gauntlet.conf"; printf "\\nSHIP_LOG_ON=%s\\nSHIP_LOG_DIR=%s\\nDIARY_DIR=%s\\n" "$GAUNTLET_SHIP_LOG" "$GAUNTLET_SHIP_LOG_DIR" "$(diary_dir "$1")"';
   const out = spawnSync("bash", ["-c", script, "_", HERE, root], { encoding: "utf8" }).stdout;
   const value = (key) => out.split("\n").findLast((l) => l.startsWith(`${key}=`))?.slice(key.length + 1) ?? "";
-  return { on: value("SHIP_LOG_ON") === "1", dir: value("SHIP_LOG_DIR") || join(process.env.HOME ?? "", ".claude", "ship-logs"), root };
+  return { on: value("SHIP_LOG_ON") === "1", dir: value("SHIP_LOG_DIR") || join(process.env.HOME ?? "", ".claude", "ship-logs"), diary: value("DIARY_DIR"), root };
 }
 
 function identity(root) {
@@ -45,8 +45,8 @@ 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 };
 }
 
-function finalize(dir, path, record, tag, status, reason) {
-  Object.assign(record, { status, reason: reason ?? null, finished: now() });
+function finalize(dir, path, record, tag, status, reason, at) {
+  Object.assign(record, { status, reason: reason ?? null, finished: at ?? now() });
   record.summary = summarize(record);
   const stem = `${record.app}_${record.finished.slice(0, 10)}_${tag}`;
   let out = join(dir, `${stem}.json`);
@@ -56,8 +56,25 @@ function finalize(dir, path, record, tag, status, reason) {
   console.log(`ship-log: saved ${out}`);
 }
 
+function prOf(branch) {
+  const r = spawnSync("gh", ["pr", "list", "--head", branch, "--state", "all", "--json", "number,createdAt", "--limit", "1"], { encoding: "utf8" });
+  try { return r.status === 0 ? JSON.parse(r.stdout)[0] : undefined; } catch { return undefined; }
+}
+
+// Agents skip the `pr` call, so a log whose branch has a PR by now is closed at that PR.
+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);
+    if (pr) finalize(dir, path, Object.assign(record, { pr: pr.number }), `pr${pr.number}`, "pr-opened", null, pr.createdAt);
+  }
+}
+
 // A ship that never reached pr or end was abandoned; keep it, but never fold it into the next one.
 function restart(dir, path, record, id) {
+  closeOpened(dir, id.app);
   if (existsSync(path)) finalize(dir, path, record, id.branch.replace(/[^\w.-]+/g, "-"), "abandoned");
   save(path, load(path, id));
 }
@@ -89,6 +106,33 @@ function addStep(record, [name, edge]) {
   if (step.start && step.end) step.seconds = Math.round((Date.parse(step.end) - Date.parse(step.start)) / 1000);
 }
 
+// Worktrees share one diary, so only this branch's latest review since the ship started counts.
+function lastReview(diary, branch, since) {
+  const file = join(diary, "review-findings.jsonl");
+  const rows = existsSync(file) ? readFileSync(file, "utf8").split("\n").filter(Boolean) : [];
+  const last = rows.map((l) => { try { return JSON.parse(l); } catch { return null; } })
+    .filter((r) => r?.branch === branch && r.ts >= since && typeof r.reply === "string").at(-1);
+  const json = last?.reply.match(/```json\s*([\s\S]*?)```/)?.[1];
+  try {
+    const list = json && JSON.parse(json);
+    return Array.isArray(list) ? { ts: last.ts, count: list.length } : null;
+  } catch { return null; }
+}
+
+// Agents skipped the log's steps even when the text sat inside them, so the PR hook asks this.
+// A ship with no review (a release, a forced run) is never held.
+function missing(record, c) {
+  const review = lastReview(c.diary, record.branch, record.started);
+  if (!review) return [];
+  const quote = (s) => `'${s.replaceAll("'", "'\\''")}'`;
+  const cmd = (args) => `SHIP_LOG_ROOT=${quote(c.root)} node ${quote(join(HERE, "ship-log.mjs"))} ${args}`;
+  const out = [];
+  if (!record.steps.review?.end) out.push(cmd("step review end"));
+  const have = record.findings.filter((f) => f.by === "review" && f.ts >= review.ts).length;
+  if (have < review.count) out.push(`${cmd("finding '<json>'")} for every review finding: ${have} of ${review.count} logged; a duplicate is verdict "skipped", note "duplicate of <what>"`);
+  return out;
+}
+
 function run(mode, args) {
   const c = conf();
   if (mode === "report") return printReport(args[0] ?? c.dir);
@@ -96,6 +140,11 @@ function run(mode, args) {
   if (!c.on) return 0;
   const id = identity(c.root), path = openPath(c.dir, id), record = load(path, id);
   if (mode === "start") return restart(c.dir, path, record, id), 0;
+  if (mode === "ready") {
+    const todo = existsSync(path) ? missing(record, c) : [];
+    if (todo.length) console.log(todo.map((t) => `  - ${t}`).join("\n"));
+    return todo.length ? 1 : 0;
+  }
   // A gate run by hand or on a release is not a ship; only /ship's start opens one.
   if (mode === "gate" && !existsSync(path)) return 0;
   if (mode === "gate") addGateRun(record, args);
@@ -106,12 +155,13 @@ function run(mode, args) {
     return finalize(c.dir, path, record, `pr${args[0]}`, "pr-opened"), 0;
   }
   else if (mode === "end") return finalize(c.dir, path, record, id.branch.replace(/[^\w.-]+/g, "-"), "stopped", args.join(" ") || null), 0;
-  else throw new Error("usage: ship-log.mjs on | start | gate <report> <exit> <seconds> <base> | step <name> start|end | finding '<json>' | pr <number> | end [reason] | report [dir]");
+  else throw new Error("usage: ship-log.mjs on | start | ready | gate <report> <exit> <seconds> <base> | step <name> start|end | finding '<json>' | pr <number> | end [reason] | report [dir]");
   save(path, record);
   return 0;
 }
 
 try {
+  if (process.env.SHIP_LOG_ROOT) process.chdir(process.env.SHIP_LOG_ROOT);
   process.exit(run(process.argv[2], process.argv.slice(3)) ?? 0);
 } catch (err) {
   console.error(`ship-log: ${err.message}`);

package/hooks/skill-flags-record.sh

@@ -20,7 +20,9 @@ MODEL=""
 [ -f "$TRANSCRIPT" ] && MODEL=$(grep -o '"model":"[^"]*"' "$TRANSCRIPT" | tail -1 | sed 's/.*:"//; s/"$//')
 
 . "$SCRIPT_DIR/gate-config.sh" 2>/dev/null || exit 0
-BRANCH=$(git -C "$PROJECT_DIR" branch --show-current 2>/dev/null | json_string)
+CWD=$(json_field "$INPUT" cwd)
+# A review run in a worktree belongs to the worktree's branch, not the main folder's.
+BRANCH=$(git -C "${CWD:-$PROJECT_DIR}" branch --show-current 2>/dev/null | json_string)
 printf '{"ts":"%s","branch":"%s","model":"%s","reply":"%s"}\n' "$(date -u +%Y-%m-%dT%H:%M:%SZ)" "$BRANCH" "$MODEL" "$REPLY" \
   >> "$(diary_dir "$SCRIPT_DIR")/$LOG"
 

package/package.json

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