@eventmodelers/cli 1.0.52 → 1.0.54

package/cli.js

@@ -1874,7 +1874,11 @@ program
 
     console.log(`🔎 Running checks from ${relative(cwd, checkScript)}...`);
     try {
-      execSync(`node "${checkScript}"`, { cwd: kitDir, stdio: 'inherit' });
+      // cwd must be the project root (not kitDir/.build-kit) — the script's
+      // `git diff --relative` scopes its output to cwd's subtree, so running
+      // it from inside .build-kit/ makes every changed file outside .build-kit/
+      // (i.e. everything under src/) invisible, and the check silently no-ops.
+      execSync(`node "${checkScript}"`, { cwd, stdio: 'inherit' });
     } catch (err) {
       process.exit(err.status || 1);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eventmodelers/cli",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "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/shared/build-kit/lib/util/find-slice.cjs

@@ -21,6 +21,7 @@ function findSliceJson(repoRoot, context, sliceName) {
   const root = path.join(repoRoot, '.build-kit', '.slices');
   if (!fs.existsSync(root)) return null;
 
+  const wantContext = normalize(context);
   const wantSlice = normalize(sliceName);
   const candidates = [];
 
@@ -33,6 +34,7 @@ function findSliceJson(repoRoot, context, sliceName) {
 
   for (const contextDir of contextDirs) {
     if (!contextDir.isDirectory()) continue;
+    if (normalize(contextDir.name) !== wantContext) continue;
     const contextPath = path.join(root, contextDir.name);
     let sliceDirs;
     try {

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

@@ -22,7 +22,9 @@
 //                  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
+//   repoRoot        absolute path to this project's own root (process.cwd()) —
+//                   not the outer git repo's top-level when this project is a
+//                   subdirectory of a larger repo
 //   SLICE_PATTERN   RegExp matching a path inside a slice's own folder
 //
 // Zero dependencies — plain Node, so it works from git's pre-commit hook
@@ -45,14 +47,20 @@ function parseNameStatus(out) {
     });
 }
 
+// --relative scopes and rewrites paths relative to cwd instead of the git
+// top-level — required when this runs from a subdirectory of a larger repo
+// (e.g. a `backend/` folder inside a monorepo): without it, every path comes
+// back prefixed (`backend/src/slices/...`), SLICE_PATTERN never matches, and
+// the whole guard silently no-ops on every commit. `git ls-files` is already
+// cwd-relative by default, so it needs no such flag.
 function stagedChanges() {
-  return parseNameStatus(execSync('git diff --cached --name-status --no-renames', { encoding: 'utf8' }));
+  return parseNameStatus(execSync('git diff --cached --name-status --no-renames --relative', { 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 tracked = parseNameStatus(execSync('git diff HEAD --name-status --no-renames --relative', { encoding: 'utf8' }));
   const untracked = execSync('git ls-files --others --exclude-standard', { encoding: 'utf8' })
     .split('\n')
     .filter(Boolean)
@@ -102,7 +110,12 @@ function main() {
   const ctx = {
     changes,
     touchesSlice,
-    repoRoot: execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim(),
+    // Deliberately process.cwd(), not `git rev-parse --show-toplevel` — this
+    // project can be a subdirectory of a larger repo (see the --relative note
+    // on allChanges/stagedChanges above), and every path here (and every path
+    // checks join onto repoRoot, e.g. `.build-kit/.slices/`) is relative to
+    // this project's own root, not the outer git repo's.
+    repoRoot: process.cwd(),
     SLICE_PATTERN,
   };
 

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

@@ -3,9 +3,16 @@
 # is versioned and shared by every clone instead of living only in .git/hooks/.
 set -e
 
-repo_root=$(git rev-parse --show-toplevel)
-script="$repo_root/.build-kit/lib/check-commit-scope.cjs"
+# Deliberately NOT `git rev-parse --show-toplevel` — when this project is a
+# subdirectory of a larger repo (a monorepo with `.githooks` installed inside
+# e.g. `backend/`), show-toplevel returns the outer repo's root, `.build-kit`
+# doesn't exist there, and the hook would silently no-op on every commit.
+# This script's own location is always `<project_root>/.githooks/pre-commit`,
+# so use that instead — and cd into it so check-commit-scope.cjs's own
+# process.cwd()/--relative git-diff logic sees the right root too.
+project_root=$(cd "$(dirname "$0")/.." && pwd)
+script="$project_root/.build-kit/lib/check-commit-scope.cjs"
 
 if [ -f "$script" ]; then
-  node "$script" --staged
+  (cd "$project_root" && node "$script" --staged)
 fi

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

@@ -22,7 +22,9 @@
 //                  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
+//   repoRoot        absolute path to this project's own root (process.cwd()) —
+//                   not the outer git repo's top-level when this project is a
+//                   subdirectory of a larger repo
 //   SLICE_PATTERN   RegExp matching a path inside a slice's own folder
 //
 // Zero dependencies — plain Node, so it works from git's pre-commit hook
@@ -48,14 +50,20 @@ function parseNameStatus(out) {
     });
 }
 
+// --relative scopes and rewrites paths relative to cwd instead of the git
+// top-level — required when this runs from a subdirectory of a larger repo
+// (e.g. a `backend/` folder inside a monorepo): without it, every path comes
+// back prefixed (`backend/src/slices/...`), SLICE_PATTERN never matches, and
+// the whole guard silently no-ops on every commit. `git ls-files` is already
+// cwd-relative by default, so it needs no such flag.
 function stagedChanges() {
-  return parseNameStatus(execSync('git diff --cached --name-status --no-renames', { encoding: 'utf8' }));
+  return parseNameStatus(execSync('git diff --cached --name-status --no-renames --relative', { 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 tracked = parseNameStatus(execSync('git diff HEAD --name-status --no-renames --relative', { encoding: 'utf8' }));
   const untracked = execSync('git ls-files --others --exclude-standard', { encoding: 'utf8' })
     .split('\n')
     .filter(Boolean)
@@ -105,7 +113,12 @@ function main() {
   const ctx = {
     changes,
     touchesSlice,
-    repoRoot: execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim(),
+    // Deliberately process.cwd(), not `git rev-parse --show-toplevel` — this
+    // project can be a subdirectory of a larger repo (see the --relative note
+    // on allChanges/stagedChanges above), and every path here (and every path
+    // checks join onto repoRoot, e.g. `.build-kit/.slices/`) is relative to
+    // this project's own root, not the outer git repo's.
+    repoRoot: process.cwd(),
     SLICE_PATTERN,
   };
 

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

@@ -3,9 +3,16 @@
 # is versioned and shared by every clone instead of living only in .git/hooks/.
 set -e
 
-repo_root=$(git rev-parse --show-toplevel)
-script="$repo_root/.build-kit/lib/check-commit-scope.cjs"
+# Deliberately NOT `git rev-parse --show-toplevel` — when this project is a
+# subdirectory of a larger repo (a monorepo with `.githooks` installed inside
+# e.g. `backend/`), show-toplevel returns the outer repo's root, `.build-kit`
+# doesn't exist there, and the hook would silently no-op on every commit.
+# This script's own location is always `<project_root>/.githooks/pre-commit`,
+# so use that instead — and cd into it so check-commit-scope.cjs's own
+# process.cwd()/--relative git-diff logic sees the right root too.
+project_root=$(cd "$(dirname "$0")/.." && pwd)
+script="$project_root/.build-kit/lib/check-commit-scope.cjs"
 
 if [ -f "$script" ]; then
-  node "$script" --staged
+  (cd "$project_root" && node "$script" --staged)
 fi