@spardutti/claude-skills 2.64.0 → 2.66.0

package/README.md

@@ -223,6 +223,7 @@ scripts/       validate-skills.mjs — checks skill length caps and reference in
                version-check.sh — SessionStart nudge when a newer catalog is published
                skill-flags-record.sh — logs each /ship skills audit and /code-review; skill-report.mjs tallies them
                edit-check.sh — PostToolUse check on each edited file: line-limit.sh, lint-ratchet.mjs, .edit-rules.json
+               bash-check.sh — PostToolUse check on files a shell command changed: runs edit-check.sh on each
                diary-check.mjs — run at the end of /ship; says when the diaries hold enough for /add-rule
                registry.mjs — the *.registry.yaml checks for /plan-feature and /registry
                line-limit.sh — the 200-line ratchet, shared by the edit check, the ship gate and preflight

package/hooks/bash-check.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+INPUT=$(cat)
+HERE="$(cd "$(dirname "$0")" && pwd)"
+PROJECT_DIR="${CLAUDE_PROJECT_DIR:-$PWD}"
+TOP=$(git -C "$PROJECT_DIR" rev-parse --show-toplevel 2>/dev/null) || exit 0
+PREFIX=$(git -C "$PROJECT_DIR" rev-parse --show-prefix)
+export GIT_OPTIONAL_LOCKS=0
+
+changed_files() {
+  { git -c core.quotepath=off diff --name-only --relative HEAD 2>/dev/null
+    git -c core.quotepath=off ls-files --others --exclude-standard
+  } | while IFS= read -r f; do [ -f "$f" ] && printf '%s\n' "$f"; done | sort -u
+}
+
+# The seen list judges each file version once, so a known failure does not block every later command.
+check_dir() (
+  cd "$1" || exit 0
+  local seen paths now fresh f hashes
+  seen=$(git rev-parse --git-path claude-bash-check-seen)
+  paths=$(changed_files)
+  [ -n "$paths" ] && hashes=$(printf '%s\n' "$paths" | git hash-object --stdin-paths)
+  now=$([ -n "$paths" ] && paste -d' ' <(printf '%s\n' "$hashes") <(printf '%s\n' "$paths"))
+  fresh=$(printf '%s\n' "$now" | grep -Fxvf "$([ -f "$seen" ] && echo "$seen" || echo /dev/null)")
+  printf '%s\n' "$now" > "$seen"
+  printf '%s\n' "$fresh" | while read -r _ f; do
+    [ -n "$f" ] || continue
+    printf '{"tool_input":{"file_path":"%s/%s"}}' "$PWD" "$f" \
+      | CLAUDE_PROJECT_DIR="$PWD" bash "$HERE/edit-check.sh" 2>&1 >/dev/null
+  done
+)
+
+# A worktree counts only when this command names it, so another session's files never block this one.
+FAILS=""
+while IFS= read -r wt; do
+  case "$INPUT $TOP" in *"$wt"*) ;; *) continue ;; esac
+  dir="$wt/$PREFIX"
+  [ -d "$dir" ] && FAILS="$FAILS$(check_dir "$dir")"
+done < <(git -C "$TOP" worktree list --porcelain | sed -n 's/^worktree //p')
+
+[ -z "$FAILS" ] && exit 0
+printf 'A shell command changed files that break the edit rules:\n%s\n' "$FAILS" >&2
+exit 2

package/hooks/registry-lib.mjs

@@ -77,10 +77,11 @@ export function triggerHits(entry, text) {
   return entry.triggers.filter((t) => new RegExp(`\\b${escape(t)}\\b`, "i").test(text));
 }
 
-// A location is a folder or one file, like sim/aim.gd beside unrelated systems in sim/.
+export const locationsOf = (entry) => [].concat(entry.location ?? []).map((l) => l.replace(/^\.\//, "")).filter(Boolean);
+
+// A location is a folder or files, like sim/aim.gd beside unrelated systems in sim/.
 export function insideLocation(entry, file) {
-  const loc = (entry.location ?? "").replace(/^\.\//, "");
-  return loc !== "" && (file === loc || file.startsWith(loc.replace(/\/?$/, "/")));
+  return locationsOf(entry).some((loc) => file === loc || file.startsWith(loc.replace(/\/?$/, "/")));
 }
 
 export const isAllowed = (entry, file) => entry.allowed.some((a) => (a.endsWith("/") ? file.startsWith(a) : file === a));

package/hooks/registry.mjs

@@ -2,7 +2,7 @@
 import { existsSync, readFileSync, statSync } from "node:fs";
 import { dirname, join, relative, resolve } from "node:path";
 import {
-  REGISTRY_SUFFIX, addedText, escape, insideLocation, isAllowed, loadRegistry, planMarks, projectFiles, projectRoot, symbolsOf, triggerHits,
+  REGISTRY_SUFFIX, addedText, escape, insideLocation, isAllowed, loadRegistry, locationsOf, planMarks, projectFiles, projectRoot, symbolsOf, triggerHits,
 } from "./registry-lib.mjs";
 import { loadEditRules } from "./text-rules.mjs";
 
@@ -61,7 +61,7 @@ function evaluate() {
     const outside = files.filter((f) => !insideLocation(e, f) && !isAllowed(e, f) && !f.endsWith(REGISTRY_SUFFIX));
     const hits = outside.flatMap((f) => readFileSync(join(root, f), "utf8").split("\n").flatMap((line, i) =>
       e.does.filter((code) => calls(line, code)).map((code) => `registry SUSPECT ${e.name} ${f}:${i + 1} ${code}`)));
-    console.log(hits.length ? hits.join("\n") : `registry eval ${e.name}: nothing outside ${e.location} does its job`);
+    console.log(hits.length ? hits.join("\n") : `registry eval ${e.name}: nothing outside ${locationsOf(e).join(", ")} does its job`);
   }
 }
 
@@ -82,16 +82,30 @@ function stale() {
     if (/^\s+-\s/m.test(e.text)) say("write lists on one line, like triggers: [aim, target]");
     if (seen.has(e.name)) say(`name ${e.name} is used twice`);
     seen.add(e.name);
+    staleLocation(e, say);
     staleCode(e, say);
   }
   if (problems.length) fail(problems);
 }
 
+// A folder wide enough to hold another system hides that folder from eval.
+function staleLocation(e, say) {
+  const bare = (l) => l.replace(/\/$/, "");
+  const own = locationsOf(e).map(bare);
+  for (const other of entries) {
+    if (other === e) continue;
+    const held = locationsOf(other).map(bare).filter((l) => !own.includes(l) && insideLocation(e, l));
+    if (held.length) say(`location holds ${other.name}'s ${held.join(", ")} — list this system's own files`);
+  }
+}
+
 function staleCode(e, say) {
-  const loc = join(root, e.location ?? "");
-  if (!e.location || !existsSync(loc)) return say(`location ${e.location} not found`);
-  const near = statSync(loc).isDirectory() ? loc : dirname(loc);
-  if (e.example && !existsSync(join(near, e.example)) && !existsSync(join(root, e.example))) say(`example ${e.example} not found`);
+  const locs = locationsOf(e);
+  const where = locs.join(", ");
+  const gone = locs.filter((l) => !existsSync(join(root, l)));
+  if (!locs.length || gone.length) return say(`location ${gone.join(", ") || e.location} not found`);
+  const near = locs.map((l) => (statSync(join(root, l)).isDirectory() ? join(root, l) : dirname(join(root, l))));
+  if (e.example && !near.some((n) => existsSync(join(n, e.example))) && !existsSync(join(root, e.example))) say(`example ${e.example} not found`);
   const syms = symbolsOf(e.extend_by);
   if (!syms.length) say("extend_by names no symbol — write names like `AimStrategy`");
   const code = files.filter((f) => insideLocation(e, f) && !f.endsWith(REGISTRY_SUFFIX))
@@ -99,9 +113,9 @@ function staleCode(e, say) {
   for (const s of syms) {
     // A plain word like `first` matches `var first = enemies[0]`; `Aim.first` only matches real use.
     if (/^[a-z][a-z0-9]*$/.test(s)) say(`\`${s}\` is too common a word to prove use — name its owner, like \`Owner.${s}\``);
-    else if (!s.split(".").every((part) => uses(code, part))) say(`${s} from extend_by is not found in ${e.location}`);
+    else if (!s.split(".").every((part) => uses(code, part))) say(`${s} from extend_by is not found in ${where}`);
   }
-  for (const c of e.does) if (!calls(code, c)) say(`does ${c} is not found in ${e.location}`);
+  for (const c of e.does) if (!calls(code, c)) say(`does ${c} is not found in ${where}`);
 }
 
 function fail(lines) {

package/lib/hook-settings.mjs

@@ -13,6 +13,7 @@ const SHIP_GATE_HOOK_FILENAME = "ship-gate-hook.sh";
 const VERSION_CHECK_FILENAME = "version-check.sh";
 const SKILL_FLAGS_FILENAME = "skill-flags-record.sh";
 const EDIT_CHECK_FILENAME = "edit-check.sh";
+const BASH_CHECK_FILENAME = "bash-check.sh";
 const LEGACY_EVAL_FILENAME = "skill-forced-eval-hook.sh";
 const LEGACY_AUDIT_RUNNER_FILENAME = "skill-audit-runner.sh";
 
@@ -103,6 +104,12 @@ export async function registerHooks(settingsPath) {
   };
   upsert(settings.hooks.PostToolUse, EDIT_CHECK_FILENAME, editCheckEntry);
 
+  const bashCheckEntry = {
+    matcher: "Bash",
+    hooks: [{ type: "command", command: `$CLAUDE_PROJECT_DIR/.claude/hooks/${BASH_CHECK_FILENAME}` }],
+  };
+  upsert(settings.hooks.PostToolUse, BASH_CHECK_FILENAME, bashCheckEntry);
+
   // Register SessionStart version check. No matcher: startup and resume both
   // want it, and the script's own daily stamp keeps a burst of resumes quiet.
   const versionCheckCommand = `$CLAUDE_PROJECT_DIR/.claude/hooks/${VERSION_CHECK_FILENAME}`;

package/lib/setup-hook.mjs

@@ -31,6 +31,7 @@ import { homedir } from "node:os";
 //                             and finding, one file per ship, in one folder
 //   edit-check.sh             PostToolUse — line-limit.sh, lint-ratchet.mjs and
 //                             text-rules.mjs on each edited file
+//   bash-check.sh             PostToolUse on Bash — edit-check.sh on files a command changed
 //   registry.mjs              run by /plan-feature and /registry — the *.registry.yaml checks
 
 const GATE_FILENAME = "skill-gate.sh";
@@ -47,6 +48,7 @@ const VERSION_CHECK_FILENAME = "version-check.sh";
 const SKILL_FLAGS_FILENAME = "skill-flags-record.sh";
 const SKILL_REPORT_FILENAME = "skill-report.mjs";
 const EDIT_CHECK_FILENAME = "edit-check.sh";
+const BASH_CHECK_FILENAME = "bash-check.sh";
 const LINE_LIMIT_FILENAME = "line-limit.sh";
 const LINT_RATCHET_FILENAME = "lint-ratchet.mjs";
 const TEXT_RULES_FILENAME = "text-rules.mjs";
@@ -157,6 +159,7 @@ export async function setupHook(targetDir = process.cwd()) {
     SKILL_FLAGS_FILENAME,
     SKILL_REPORT_FILENAME,
     EDIT_CHECK_FILENAME,
+    BASH_CHECK_FILENAME,
     LINE_LIMIT_FILENAME,
     LINT_RATCHET_FILENAME,
     TEXT_RULES_FILENAME,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spardutti/claude-skills",
-  "version": "2.64.0",
+  "version": "2.66.0",
   "description": "Guardrails for Claude Code — best-practice skills, planning commands, and delivery gates.",
   "type": "module",
   "repository": {
@@ -11,7 +11,7 @@
     "claude-skills": "bin/cli.mjs"
   },
   "scripts": {
-    "prepack": "cp ../README.md README.md && mkdir -p hooks && cp ../scripts/skill-gate.sh ../scripts/skill-gate-automark.sh ../scripts/skill-application-gate.sh ../scripts/gauntlet.sh ../scripts/ship-gate.sh ../scripts/gate-config.sh ../scripts/ship-gate-projects.sh ../scripts/ship-gate-structure.sh ../scripts/ship-gate-files.sh ../scripts/ship-gate-hook.sh ../scripts/version-check.sh ../scripts/skill-flags-record.sh ../scripts/skill-report.mjs ../scripts/edit-check.sh ../scripts/line-limit.sh ../scripts/lint-ratchet.mjs ../scripts/text-rules.mjs ../scripts/ratchet-baseline.mjs ../scripts/diary-check.mjs ../scripts/diary-lib.mjs ../scripts/ship-log.mjs ../scripts/ship-log-parse.mjs ../scripts/ship-log-report.mjs ../scripts/ship-mark.sh ../scripts/ship-prep.sh ../scripts/registry.mjs ../scripts/registry-lib.mjs hooks/",
+    "prepack": "cp ../README.md README.md && mkdir -p hooks && cp ../scripts/skill-gate.sh ../scripts/skill-gate-automark.sh ../scripts/skill-application-gate.sh ../scripts/gauntlet.sh ../scripts/ship-gate.sh ../scripts/gate-config.sh ../scripts/ship-gate-projects.sh ../scripts/ship-gate-structure.sh ../scripts/ship-gate-files.sh ../scripts/ship-gate-hook.sh ../scripts/version-check.sh ../scripts/skill-flags-record.sh ../scripts/skill-report.mjs ../scripts/edit-check.sh ../scripts/bash-check.sh ../scripts/line-limit.sh ../scripts/lint-ratchet.mjs ../scripts/text-rules.mjs ../scripts/ratchet-baseline.mjs ../scripts/diary-check.mjs ../scripts/diary-lib.mjs ../scripts/ship-log.mjs ../scripts/ship-log-parse.mjs ../scripts/ship-log-report.mjs ../scripts/ship-mark.sh ../scripts/ship-prep.sh ../scripts/registry.mjs ../scripts/registry-lib.mjs hooks/",
     "postpack": "git checkout -- README.md && rm -rf hooks"
   },
   "engines": {