@eventmodelers/cli 1.0.51 → 1.0.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eventmodelers/cli",
-  "version": "1.0.51",
+  "version": "1.0.53",
   "description": "Eventmodelers CLI — real-time Claude agent + skills for Claude Code, for any stack (Node, Supabase, Axon, Cratis, OpenCQRS, UmaDB, Kurrent, or modeling-only)",
   "type": "module",
   "bin": {

package/stacks/axon/templates/build-kit/CLAUDE.md

@@ -31,7 +31,7 @@ If not tasked explicitely to change routes, ignore routes*.ts
 
 Ignore case for files and slices in prompts. "CartItems" slice is the same as "cartitems"
 
-Do not change files with tests unless explicitely instructed: *.test.ts
+Do not change files with tests unless explicitely instructed, or the change brings the test in line with slice.json (e.g. step 4's field/spec diff): *.test.ts
 
 At the start of every session, read `.build-kit/AGENTS.md` if it exists to load accumulated project learnings.
 

package/stacks/kurrent/templates/build-kit/CLAUDE.md

@@ -62,7 +62,7 @@ specific package.
 
 Ignore case for files and slices in prompts. "CartItems" slice is the same as "cartitems".
 
-Do not change test files unless explicitly instructed: `src/test/java/**/*Test.java`.
+Do not change test files unless explicitly instructed, or the change brings the test in line with slice.json (e.g. step 4's field/spec diff): `src/test/java/**/*Test.java`.
 
 At the start of every session, read `.build-kit/AGENTS.md` if it exists to load accumulated project
 learnings.

package/stacks/node/templates/build-kit/CLAUDE.md

@@ -24,7 +24,7 @@ If not tasked explicitely to change routes, ignore routes*.ts
 
 Ignore case for files and slices in prompts. "CartItems" slice is the same as "cartitems"
 
-Do not change files with tests unless explicitely instructed: *.test.ts
+Do not change files with tests unless explicitely instructed, or the change brings the test in line with slice.json (e.g. step 4's field/spec diff): *.test.ts
 
 At the start of every session, read `.build-kit/AGENTS.md` if it exists to load accumulated project learnings.
 
@@ -76,8 +76,10 @@ It loads every check under `.build-kit/lib/checks/` and rejects the commit if an
 
 If a commit is rejected, split it — commit the out-of-scope file separately from the slice work, or add
 the missing test/fix the field — rather than passing `--no-verify`. Run `npm run run:checks` any time
-you want to check staged files before committing. To add a new check, read
-`.build-kit/lib/checks/README.md` and drop in a file following its interface — no other wiring needed.
+you want to check your current work (by default this checks every uncommitted change — staged,
+unstaged, and untracked; pass `-- --staged` to check only what's staged, matching what the pre-commit
+hook itself checks). To add a new check, read `.build-kit/lib/checks/README.md` and drop in a file
+following its interface — no other wiring needed.
 
 ## Example Slice Structure
 

package/stacks/node/templates/build-kit/lib/check-commit-scope.cjs

@@ -2,7 +2,9 @@
 'use strict';
 
 // Runner for the slice commit-scope guard. Loads every check module from
-// ./checks/*.cjs and runs it against the currently staged changeset.
+// ./checks/*.cjs and runs it against the currently changed files — every
+// uncommitted change (staged + unstaged + untracked) by default, or just
+// the staged changeset with --staged.
 //
 // Check interface (see ./checks/README.md for the full contract + a template):
 //   module.exports = {
@@ -16,7 +18,8 @@
 // `run()` returns an array of violations (empty array/undefined/null = pass).
 //
 // `ctx` passed to every check:
-//   changes        [{status, path}] — staged files (git status letter + path)
+//   changes        [{status, path}] — changed files (git status letter + path);
+//                  all uncommitted changes by default, staged-only with --staged
 //   touchesSlice    true — this commit touches src/slices/{context}/{slice}/**
 //                   (the runner already gates on this before loading checks)
 //   repoRoot        absolute path to the repo root
@@ -24,7 +27,7 @@
 //
 // Zero dependencies — plain Node, so it works from git's pre-commit hook
 // (see ../../.githooks/pre-commit), from `npm run run:checks`, or from CI.
-// Invoked as: node .build-kit/lib/check-commit-scope.cjs
+// Invoked as: node .build-kit/lib/check-commit-scope.cjs [--staged]
 
 const { execSync } = require('child_process');
 const fs = require('fs');
@@ -32,8 +35,7 @@ const path = require('path');
 
 const SLICE_PATTERN = /^src\/slices\/[^/]+\/[^/]+\//;
 
-function stagedChanges() {
-  const out = execSync('git diff --cached --name-status --no-renames', { encoding: 'utf8' });
+function parseNameStatus(out) {
   return out
     .split('\n')
     .filter(Boolean)
@@ -43,6 +45,21 @@ function stagedChanges() {
     });
 }
 
+function stagedChanges() {
+  return parseNameStatus(execSync('git diff --cached --name-status --no-renames', { encoding: 'utf8' }));
+}
+
+function allChanges() {
+  // Working tree vs HEAD already covers both staged and unstaged edits to
+  // tracked files; untracked (never-`git add`ed) files need a separate call.
+  const tracked = parseNameStatus(execSync('git diff HEAD --name-status --no-renames', { encoding: 'utf8' }));
+  const untracked = execSync('git ls-files --others --exclude-standard', { encoding: 'utf8' })
+    .split('\n')
+    .filter(Boolean)
+    .map((p) => ({ status: 'A', path: p }));
+  return [...tracked, ...untracked];
+}
+
 function loadChecks() {
   const checksDir = path.join(__dirname, 'checks');
   if (!fs.existsSync(checksDir)) return [];
@@ -68,11 +85,12 @@ function loadChecks() {
 }
 
 function main() {
+  const staged = process.argv.includes('--staged');
   let changes;
   try {
-    changes = stagedChanges();
+    changes = staged ? stagedChanges() : allChanges();
   } catch (err) {
-    console.error('check-commit-scope: could not read staged changes —', err.message);
+    console.error(`check-commit-scope: could not read ${staged ? 'staged' : 'uncommitted'} changes —`, err.message);
     process.exit(1);
   }
 

package/stacks/node/templates/build-kit/lib/checks/10-slice-scope.cjs

@@ -14,15 +14,38 @@ const ALLOWED_EXCEPTIONS = [
 
 const MIGRATION_PATTERN = /^migrations\/V\d+__.*\.sql$/;
 
+// Captures the {context}/{slice} segment so files from two different slices
+// in one commit can be told apart — SLICE_PATTERN alone only proves a path is
+// *inside some* slice folder, not which one.
+const SLICE_KEY_PATTERN = /^src\/slices\/([^/]+\/[^/]+)\//;
+
 module.exports = {
   name: 'slice-scope',
   run(ctx) {
     const violations = [];
+
+    const sliceKeys = new Set();
+    for (const { path: p } of ctx.changes) {
+      const m = p.match(SLICE_KEY_PATTERN);
+      if (m) sliceKeys.add(m[1]);
+    }
+    const primarySlice = [...sliceKeys].sort()[0] || null;
+
     for (const { path: p } of ctx.changes) {
-      if (ctx.SLICE_PATTERN.test(p)) continue;
       if (MIGRATION_PATTERN.test(p)) continue;
       if (ALLOWED_EXCEPTIONS.some((r) => r.test(p))) continue;
-      violations.push({ path: p, reason: 'outside src/slices/{context}/{slice}/ and not a documented exception' });
+
+      const m = p.match(SLICE_KEY_PATTERN);
+      if (!m) {
+        violations.push({ path: p, reason: 'outside src/slices/{context}/{slice}/ and not a documented exception' });
+        continue;
+      }
+      if (m[1] !== primarySlice) {
+        violations.push({
+          path: p,
+          reason: `touches slice "${m[1]}" but this commit's scope is "${primarySlice}" — split into separate commits`,
+        });
+      }
     }
     return violations;
   },

package/stacks/node/templates/root/.githooks/pre-commit

@@ -7,5 +7,5 @@ repo_root=$(git rev-parse --show-toplevel)
 script="$repo_root/.build-kit/lib/check-commit-scope.cjs"
 
 if [ -f "$script" ]; then
-  node "$script"
+  node "$script" --staged
 fi

package/stacks/opencqrs/templates/build-kit/CLAUDE.md

@@ -48,7 +48,7 @@ package.
 
 Ignore case for files and slices in prompts. "CartItems" slice is the same as "cartitems".
 
-Do not change test files unless explicitly instructed: `src/test/java/**/*Test.java`.
+Do not change test files unless explicitly instructed, or the change brings the test in line with slice.json (e.g. step 4's field/spec diff): `src/test/java/**/*Test.java`.
 
 At the start of every session, read `.build-kit/AGENTS.md` if it exists to load accumulated project
 learnings.

package/stacks/supabase/templates/build-kit/CLAUDE.md

@@ -24,7 +24,7 @@ If not tasked explicitely to change routes, ignore routes*.ts
 
 Ignore case for files and slices in prompts. "CartItems" slice is the same as "cartitems"
 
-Do not change files with tests unless explicitely instructed: *.test.ts
+Do not change files with tests unless explicitely instructed, or the change brings the test in line with slice.json (e.g. step 4's field/spec diff): *.test.ts
 
 At the start of every session, read `.build-kit/AGENTS.md` if it exists to load accumulated project learnings.
 
@@ -80,8 +80,10 @@ and rejects the commit if any of them find a problem:
 
 If a commit is rejected, split it — commit the out-of-scope file separately from the slice work, or add
 the missing test/fix the field — rather than passing `--no-verify`. Run `npm run run:checks` any time
-you want to check staged files before committing. To add a new check, read
-`.build-kit/lib/checks/README.md` and drop in a file following its interface — no other wiring needed.
+you want to check your current work (by default this checks every uncommitted change — staged,
+unstaged, and untracked; pass `-- --staged` to check only what's staged, matching what the pre-commit
+hook itself checks). To add a new check, read `.build-kit/lib/checks/README.md` and drop in a file
+following its interface — no other wiring needed.
 
 ## Example Slice Structure
 

package/stacks/supabase/templates/build-kit/lib/check-commit-scope.cjs

@@ -2,7 +2,9 @@
 'use strict';
 
 // Runner for the slice commit-scope guard. Loads every check module from
-// ./checks/*.cjs and runs it against the currently staged changeset.
+// ./checks/*.cjs and runs it against the currently changed files — every
+// uncommitted change (staged + unstaged + untracked) by default, or just
+// the staged changeset with --staged.
 //
 // Check interface (see ./checks/README.md for the full contract + a template):
 //   module.exports = {
@@ -16,7 +18,8 @@
 // `run()` returns an array of violations (empty array/undefined/null = pass).
 //
 // `ctx` passed to every check:
-//   changes        [{status, path}] — staged files (git status letter + path)
+//   changes        [{status, path}] — changed files (git status letter + path);
+//                  all uncommitted changes by default, staged-only with --staged
 //   touchesSlice    true — this commit touches src/slices/{context}/{slice}/**
 //                   (the runner already gates on this before loading checks)
 //   repoRoot        absolute path to the repo root
@@ -24,7 +27,7 @@
 //
 // Zero dependencies — plain Node, so it works from git's pre-commit hook
 // (see ../../.githooks/pre-commit), from `npm run run:checks`, or from CI.
-// Invoked as: node .build-kit/lib/check-commit-scope.cjs
+// Invoked as: node .build-kit/lib/check-commit-scope.cjs [--staged]
 
 const { execSync } = require('child_process');
 const fs = require('fs');
@@ -35,8 +38,7 @@ const SLICE_PATTERN = /^src\/slices\/[^/]+\/[^/]+\//;
 // of its own — still counts as "this is a slice commit" for the gate below.
 const WEBHOOK_FUNCTION_PATTERN = /^supabase\/functions\/[^/]+\/index\.ts$/;
 
-function stagedChanges() {
-  const out = execSync('git diff --cached --name-status --no-renames', { encoding: 'utf8' });
+function parseNameStatus(out) {
   return out
     .split('\n')
     .filter(Boolean)
@@ -46,6 +48,21 @@ function stagedChanges() {
     });
 }
 
+function stagedChanges() {
+  return parseNameStatus(execSync('git diff --cached --name-status --no-renames', { encoding: 'utf8' }));
+}
+
+function allChanges() {
+  // Working tree vs HEAD already covers both staged and unstaged edits to
+  // tracked files; untracked (never-`git add`ed) files need a separate call.
+  const tracked = parseNameStatus(execSync('git diff HEAD --name-status --no-renames', { encoding: 'utf8' }));
+  const untracked = execSync('git ls-files --others --exclude-standard', { encoding: 'utf8' })
+    .split('\n')
+    .filter(Boolean)
+    .map((p) => ({ status: 'A', path: p }));
+  return [...tracked, ...untracked];
+}
+
 function loadChecks() {
   const checksDir = path.join(__dirname, 'checks');
   if (!fs.existsSync(checksDir)) return [];
@@ -71,11 +88,12 @@ function loadChecks() {
 }
 
 function main() {
+  const staged = process.argv.includes('--staged');
   let changes;
   try {
-    changes = stagedChanges();
+    changes = staged ? stagedChanges() : allChanges();
   } catch (err) {
-    console.error('check-commit-scope: could not read staged changes —', err.message);
+    console.error(`check-commit-scope: could not read ${staged ? 'staged' : 'uncommitted'} changes —`, err.message);
     process.exit(1);
   }
 

package/stacks/supabase/templates/build-kit/lib/checks/10-slice-scope.cjs

@@ -18,16 +18,39 @@ const ALLOWED_EXCEPTIONS = [
 
 const MIGRATION_PATTERN = /^supabase\/migrations\/V\d+__.*\.sql$/;
 
+// Captures the {context}/{slice} segment so files from two different slices
+// in one commit can be told apart — SLICE_PATTERN alone only proves a path is
+// *inside some* slice folder, not which one.
+const SLICE_KEY_PATTERN = /^src\/slices\/([^/]+\/[^/]+)\//;
+
 module.exports = {
   name: 'slice-scope',
   run(ctx) {
     const violations = [];
+
+    const sliceKeys = new Set();
+    for (const { path: p } of ctx.changes) {
+      const m = p.match(SLICE_KEY_PATTERN);
+      if (m) sliceKeys.add(m[1]);
+    }
+    const primarySlice = [...sliceKeys].sort()[0] || null;
+
     for (const { path: p } of ctx.changes) {
-      if (ctx.SLICE_PATTERN.test(p)) continue;
       if (WEBHOOK_FUNCTION_PATTERN.test(p)) continue;
       if (MIGRATION_PATTERN.test(p)) continue;
       if (ALLOWED_EXCEPTIONS.some((r) => r.test(p))) continue;
-      violations.push({ path: p, reason: 'outside src/slices/{context}/{slice}/ and not a documented exception' });
+
+      const m = p.match(SLICE_KEY_PATTERN);
+      if (!m) {
+        violations.push({ path: p, reason: 'outside src/slices/{context}/{slice}/ and not a documented exception' });
+        continue;
+      }
+      if (m[1] !== primarySlice) {
+        violations.push({
+          path: p,
+          reason: `touches slice "${m[1]}" but this commit's scope is "${primarySlice}" — split into separate commits`,
+        });
+      }
     }
     return violations;
   },

package/stacks/supabase/templates/root/.githooks/pre-commit

@@ -7,5 +7,5 @@ repo_root=$(git rev-parse --show-toplevel)
 script="$repo_root/.build-kit/lib/check-commit-scope.cjs"
 
 if [ -f "$script" ]; then
-  node "$script"
+  node "$script" --staged
 fi

package/stacks/umadb/templates/build-kit/CLAUDE.md

@@ -37,7 +37,7 @@ other specific package.
 
 Ignore case for files and slices in prompts. "CartItems" slice is the same as "cartitems".
 
-Do not change test files unless explicitly instructed.
+Do not change test files unless explicitly instructed, or the change brings the test in line with slice.json (e.g. step 4's field/spec diff).
 
 At the start of every session, read `.build-kit/AGENTS.md` if it exists to load accumulated project learnings.