mustard-claude 3.1.23 → 3.1.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mustard-claude",
-  "version": "3.1.23",
+  "version": "3.1.25",
   "description": "Framework-agnostic CLI for Claude Code project setup",
   "type": "module",
   "bin": {

package/templates/commands/mustard/scan/SKILL.md

@@ -4,7 +4,16 @@
 
 ## Trigger
 
-`/scan` or `/scan <subproject>`
+`/scan`, `/scan <subproject>`, `/scan --force`, `/scan <subproject> --force`
+
+## Flags
+
+- `--force` — descarta tudo o que é `<!-- mustard:generated -->` e regera do zero. Semântica:
+  - Ignora o incremental skip do Step 1/C: **todos** os subprojetos são reprocessados, independente de hash match ou `gitDirty`.
+  - Bypassa o fast-path de §2.6 (Bootstrap): sempre regenera `.claude/CLAUDE.md` e afins.
+  - Repassa "FORCE MODE" aos Task agents do Step 3 (eles apagam `{subproject}/.claude/skills/*/` com header `mustard:generated` antes de regerar).
+  - Roda sempre os dois comandos de §4.7 (`sync-registry.js --force` + `skill-generator.js --force`), mesmo com registry já v4.0.
+  - Skills sem o header `mustard:generated` (user-authored) são **preservadas**.
 
 ## Execution Model
 
@@ -49,6 +58,7 @@ Parse JSON output → list of `{ name, path, role, agent, stackSummary, gitDirty
 4. **Hash mismatch OR gitDirty** → include in agent launch list (dirty files indicate changes the previous scan may not have captured)
 5. If ALL subprojects can be skipped → skip to step 4 (Update CLAUDE.md) + step 5 (Compile) directly
 6. **No old cache** → scan ALL subprojects (first run)
+7. **`--force` ativo** → ignore tudo acima: marque **todos** os subprojetos como `needs-rescan`, não compare hashes, não pule nada.
 
 **Module-level incremental** (when subproject hash changed):
 - Compare `moduleHashes[subproject][module]` with cached values
@@ -98,7 +108,7 @@ If `.claude/docs/` exists and contains `.md` files:
 
 ### 2.6. Bootstrap (if needed)
 
-**Fast-path**: If root `CLAUDE.md` exists AND `.claude/entity-registry.json` exists → skip to step 3 (Launch Agents).
+**Fast-path**: If root `CLAUDE.md` exists AND `.claude/entity-registry.json` exists AND `--force` is **not** active → skip to step 3 (Launch Agents).
 Bootstrap only runs on first scan or when foundational files are missing.
 
 Otherwise create foundational files:
@@ -202,6 +212,12 @@ Path: {path}
 Role: {role}
 Stack: {stackSummary}
 
+FORCE MODE (only when /scan was invoked with --force):
+- Before generating skills, scan {path}/.claude/skills/ and delete every subdirectory
+  whose SKILL.md contains "<!-- mustard:generated" (preserve user-authored skills that
+  lack that marker).
+- Also delete any pre-existing _backup/ under {path}/.claude/commands/ to avoid stacking stale backups.
+
 Tasks:
 1. Read existing knowledge from {path}/.claude/commands/ and {path}/CLAUDE.md
 2. Backup generated files to {path}/.claude/commands/_backup/
@@ -330,6 +346,8 @@ Mark all with `<!-- mustard:generated -->`. Overwrite on next scan.
 
 After agent-generated skills (4.6), run the registry-based skill generator to create structural pattern skills from `_patterns`:
 
+> With `--force`, **always** run both commands — even if `entity-registry.json` already exists at v4.0.
+
 ```bash
 node .claude/scripts/sync-registry.js --force
 node .claude/scripts/skill-generator.js --force
@@ -349,7 +367,7 @@ These skills are derived from **detected patterns** (not hardcoded). They comple
 **Skip conditions:**
 - `entity-registry.json` version < 4.0 → skip (registry not populated)
 - `skill-generator.js` not present → skip
-- Pattern skill already exists and was NOT generated by mustard → skip (user-edited)
+- Pattern skill already exists and was NOT generated by mustard → skip (user-edited, unless `--force` — but `skill-generator.js` already preserves user-authored skills by checking the `mustard:generated` header)
 
 ### 4. Update CLAUDE.md files
 

package/templates/scripts/sync-detect.js

@@ -518,26 +518,44 @@ function getSubmodulePaths() {
 }
 
 /**
- * Fallback: scan root directory for folders that contain a CLAUDE.md file.
+ * Fallback: scan recursively (BFS, max depth 3) for folders that contain a
+ * CLAUDE.md file. Stops descending into a branch as soon as a CLAUDE.md is
+ * found, so nested workspaces (e.g. subproject/.claude/CLAUDE.md) don't get
+ * double-registered.
+ *
+ * Depth 3 covers common monorepo shapes: apps/X/, services/api/v1/.
+ * Fully agnostic — no hardcoded directory names.
  */
 function scanForSubprojects() {
-  const paths = [];
-  try {
-    const entries = fs.readdirSync(ROOT, { withFileTypes: true });
+  const IGNORE = new Set([
+    "node_modules", "bin", "obj", "dist", ".next",
+    "_backup", "migrations", ".claude", ".git",
+  ]);
+  const MAX_DEPTH = 3;
+  const results = [];
+
+  function walk(absDir, relDir, depth) {
+    if (depth > MAX_DEPTH) return;
+    if (depth > 0 && fs.existsSync(path.join(absDir, "CLAUDE.md"))) {
+      results.push(relDir.split(path.sep).join("/"));
+      return;
+    }
+    let entries;
+    try {
+      entries = fs.readdirSync(absDir, { withFileTypes: true });
+    } catch {
+      return;
+    }
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
       if (entry.name.startsWith(".")) continue;
-      if (entry.name === "node_modules") continue;
-
-      const claudePath = path.join(ROOT, entry.name, "CLAUDE.md");
-      if (fs.existsSync(claudePath)) {
-        paths.push(entry.name);
-      }
+      if (IGNORE.has(entry.name)) continue;
+      walk(path.join(absDir, entry.name), path.join(relDir, entry.name), depth + 1);
     }
-  } catch {
-    // ignore
   }
-  return paths;
+
+  walk(ROOT, "", 0);
+  return results;
 }
 
 // ---------------------------------------------------------------------------