@lovrozagar/grunt 0.4.2 → 0.5.0

package/cli/init.mjs

@@ -2,6 +2,11 @@ import { execFileSync } from "node:child_process"
 import fs from "node:fs"
 import path from "node:path"
 import { fileURLToPath } from "node:url"
+import {
+  WORKSPACE_SKILLS_REL,
+  findSkillContentConflicts,
+  formatSkillConflictWarn,
+} from "../scripts/skill-conflicts.mjs"
 
 const PKG_ROOT = path.join(path.dirname(fileURLToPath(import.meta.url)), "..")
 
@@ -9,10 +14,12 @@ const PRODUCT_SCRIPTS = [
   "check-globals.mjs",
   "emit-agent-shell-tools.mjs",
   "emit-gemini.mjs",
+  "emit-maps.mjs",
   "guarded-roots.mjs",
   "emit-mcp-policy.mjs",
   "gate-fat-tools.mjs",
   "hooks-union.mjs",
+  "pipeline.mjs",
   "grunt-job.mjs",
   "parse-need.mjs",
   "persist-handoff.mjs",
@@ -23,6 +30,7 @@ const PRODUCT_SCRIPTS = [
   "sync-global-settings.mjs",
   "browser.mjs",
   "doctor.mjs",
+  "skill-conflicts.mjs",
   "scrub-text",
 ]
 
@@ -377,7 +385,7 @@ export function mergePackageJson(dest, pkgRoot) {
   const srcPkg = JSON.parse(fs.readFileSync(path.join(pkgRoot, "package.json"), "utf8"))
   destPkg.scripts = { ...(destPkg.scripts || {}) }
   for (const [k, v] of Object.entries(srcPkg.scripts || {})) {
-    if (k === "test") continue
+    if (k === "test" || k.endsWith(":raw")) continue
     destPkg.scripts[k] = mergeScriptValue(k, v, destPkg.scripts[k])
   }
   destPkg.devDependencies = { ...(destPkg.devDependencies || {}) }
@@ -406,6 +414,17 @@ export function init(dest, { pkgRoot: pkgRootOpt, execFileSync: exec = execFileS
   const self = samePath(dest, pkgRoot)
 
   phase("merge", () => {
+    const wsSkills = path.join(dest, WORKSPACE_SKILLS_REL)
+    const pkgSkills = path.join(pkgRoot, WORKSPACE_SKILLS_REL)
+    if (!samePath(wsSkills, pkgSkills)) {
+      for (const c of findSkillContentConflicts({
+        workspaceSkillsDir: wsSkills,
+        packagedSkillsDir: pkgSkills,
+      })) {
+        console.warn(formatSkillConflictWarn(c.name))
+      }
+    }
+
     for (const dir of COPY_DIRS) {
       const src = path.join(pkgRoot, dir)
       const d = path.join(dest, dir)

package/cli/init.test.ts

@@ -44,10 +44,12 @@ const PRODUCT_FILES = [
   "check-globals.mjs",
   "emit-agent-shell-tools.mjs",
   "emit-gemini.mjs",
+  "emit-maps.mjs",
   "guarded-roots.mjs",
   "emit-mcp-policy.mjs",
   "gate-fat-tools.mjs",
   "hooks-union.mjs",
+  "pipeline.mjs",
   "grunt-job.mjs",
   "parse-need.mjs",
   "persist-handoff.mjs",
@@ -58,6 +60,7 @@ const PRODUCT_FILES = [
   "sync-global-settings.mjs",
   "browser.mjs",
   "doctor.mjs",
+  "skill-conflicts.mjs",
 ];
 
 const SRC_CLAUDE_SETTINGS = {
@@ -495,8 +498,15 @@ describe("snapshot/remerge guarded roots", () => {
       fs.writeFileSync(path.join(dest, "AGENTS.md"), "fresh ssot\n");
     });
     runGuardedRoots("generate", { cwd: dest, exec });
-    expect(exec).toHaveBeenCalledTimes(1);
-    expect(String(exec.mock.calls[0][0])).toContain("rulesync:generate:raw");
+    expect(exec.mock.calls.map((c) => c[0])).toEqual([
+      "rulesync generate -t claudecode,codexcli,antigravity-cli,grokcli -f rules,subagents,skills",
+      "rulesync generate -t claudecode,codexcli,antigravity-cli -f hooks",
+      "node scripts/emit-mcp-policy.mjs",
+      "node scripts/emit-gemini.mjs",
+      "node scripts/emit-agent-shell-tools.mjs",
+      "node scripts/emit-maps.mjs",
+      "node scripts/hooks-union.mjs",
+    ]);
     expect(fs.readFileSync(path.join(dest, "AGENTS.md"), "utf8")).toBe(
       "<!-- grunt:begin -->\nfresh ssot\n<!-- grunt:end -->\nkeep me\n",
     );
@@ -595,8 +605,12 @@ describe("snapshot/remerge guarded roots", () => {
         return stop;
       },
     });
-    expect(exec).toHaveBeenCalledTimes(1);
-    expect(String(exec.mock.calls[0][0])).toContain("rulesync:watch:raw");
+    expect(exec.mock.calls.map((c) => c[0])).toEqual([
+      "node scripts/emit-mcp-policy.mjs",
+      "node scripts/emit-gemini.mjs",
+      "node scripts/emit-agent-shell-tools.mjs",
+      "rulesync generate -t claudecode,codexcli,antigravity-cli,grokcli -f rules,subagents,skills --watch",
+    ]);
     expect(stop).toHaveBeenCalledTimes(1);
     expect(fs.readFileSync(path.join(dest, "AGENTS.md"), "utf8")).toBe(
       "<!-- grunt:begin -->\nwatch2\n<!-- grunt:end -->\nkeep me\n",
@@ -952,6 +966,45 @@ describe("mergePackageJson", () => {
     warnSpy.mockRestore();
   });
 
+  it("does not merge :raw scripts from src", () => {
+    const pkgRoot = stubPkgRoot({
+      name: "fixture-pkg",
+      scripts: {
+        "rulesync:generate": "node ./scripts/guarded-roots.mjs generate",
+        "rulesync:generate:raw": "echo raw",
+        "rulesync:check:raw": "echo check-raw",
+        "rulesync:watch:raw": "echo watch-raw",
+      },
+      devDependencies: { "smol-toml": "^1.8.0", rulesync: "latest" },
+    });
+    const dest = tmp("pj-raw-src-");
+    mergePackageJson(dest, pkgRoot);
+    const out = JSON.parse(fs.readFileSync(path.join(dest, "package.json"), "utf8"));
+    expect(out.scripts["rulesync:generate"]).toBe("node ./scripts/guarded-roots.mjs generate");
+    expect(out.scripts["rulesync:generate:raw"]).toBeUndefined();
+    expect(out.scripts["rulesync:check:raw"]).toBeUndefined();
+    expect(out.scripts["rulesync:watch:raw"]).toBeUndefined();
+  });
+
+  it("leaves dest-only :raw keys", () => {
+    const pkgRoot = stubPkgRoot({
+      name: "fixture-pkg",
+      scripts: { "rulesync:generate": "node ./scripts/guarded-roots.mjs generate" },
+      devDependencies: { "smol-toml": "^1.8.0", rulesync: "latest" },
+    });
+    const dest = tmp("pj-raw-dest-");
+    fs.writeFileSync(
+      path.join(dest, "package.json"),
+      JSON.stringify({
+        scripts: { "rulesync:generate:raw": "echo consumer-raw" },
+      }),
+    );
+    mergePackageJson(dest, pkgRoot);
+    const out = JSON.parse(fs.readFileSync(path.join(dest, "package.json"), "utf8"));
+    expect(out.scripts["rulesync:generate"]).toBe("node ./scripts/guarded-roots.mjs generate");
+    expect(out.scripts["rulesync:generate:raw"]).toBe("echo consumer-raw");
+  });
+
   it("replaces a grunt-owned script with no suffix", () => {
     const pkgRoot = stubPkgRoot({
       name: "fixture-pkg",
@@ -1262,6 +1315,30 @@ describe("init", () => {
       ["merge", "stop"],
     ]);
   });
+
+  it("warns when dest skill differs from packaged then force-overwrites; keeps extras", () => {
+    const pkgRoot = stubPkgRoot();
+    const pkgSkill = path.join(pkgRoot, ".rulesync", "skills", "parent");
+    fs.mkdirSync(pkgSkill, { recursive: true });
+    fs.writeFileSync(path.join(pkgSkill, "SKILL.md"), "grunt-parent\n");
+    const dest = tmp("grunt-sk-conflict-");
+    const destSkill = path.join(dest, ".rulesync", "skills", "parent");
+    const destExtra = path.join(dest, ".rulesync", "skills", "my-extra");
+    fs.mkdirSync(destSkill, { recursive: true });
+    fs.mkdirSync(destExtra, { recursive: true });
+    fs.writeFileSync(path.join(destSkill, "SKILL.md"), "custom-parent\n");
+    fs.writeFileSync(path.join(destExtra, "SKILL.md"), "keep-me\n");
+    const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+    init(dest, { pkgRoot, execFileSync: vi.fn(), skipGlobals: true });
+    expect(
+      warnSpy.mock.calls.some(
+        (c) => String(c[0]).includes("parent") && String(c[0]).includes("re-init overwrites"),
+      ),
+    ).toBe(true);
+    warnSpy.mockRestore();
+    expect(fs.readFileSync(path.join(destSkill, "SKILL.md"), "utf8")).toBe("grunt-parent\n");
+    expect(fs.readFileSync(path.join(destExtra, "SKILL.md"), "utf8")).toBe("keep-me\n");
+  });
 });
 
 describe("destAlreadyInited / shouldAutoSkipGlobals", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lovrozagar/grunt",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Multi-agent orchestrator SoT — deep-merge rulesync trees, product scripts, and generate pipeline into a consumer repo",
   "keywords": [
     "agents",
@@ -27,10 +27,12 @@
     "scripts/check-globals.mjs",
     "scripts/emit-agent-shell-tools.mjs",
     "scripts/emit-gemini.mjs",
+    "scripts/emit-maps.mjs",
     "scripts/guarded-roots.mjs",
     "scripts/emit-mcp-policy.mjs",
     "scripts/gate-fat-tools.mjs",
     "scripts/hooks-union.mjs",
+    "scripts/pipeline.mjs",
     "scripts/grunt-job.mjs",
     "scripts/parse-need.mjs",
     "scripts/persist-handoff.mjs",
@@ -41,6 +43,7 @@
     "scripts/sync-global-settings.mjs",
     "scripts/browser.mjs",
     "scripts/doctor.mjs",
+    "scripts/skill-conflicts.mjs",
     "scripts/scrub-text",
     ".rulesync",
     ".grok",
@@ -63,11 +66,8 @@
   },
   "scripts": {
     "rulesync:generate": "node ./scripts/guarded-roots.mjs generate",
-    "rulesync:generate:raw": "rulesync generate -t claudecode,codexcli,antigravity-cli,grokcli -f rules,subagents,skills && rulesync generate -t claudecode,codexcli,antigravity-cli -f hooks && node scripts/emit-mcp-policy.mjs && node scripts/emit-gemini.mjs && node scripts/emit-agent-shell-tools.mjs && node scripts/hooks-union.mjs",
     "rulesync:watch": "node ./scripts/guarded-roots.mjs watch",
-    "rulesync:watch:raw": "node scripts/emit-mcp-policy.mjs && node scripts/emit-gemini.mjs && node scripts/emit-agent-shell-tools.mjs && rulesync generate -t claudecode,codexcli,antigravity-cli,grokcli -f rules,subagents,skills --watch",
     "rulesync:check": "node ./scripts/guarded-roots.mjs check",
-    "rulesync:check:raw": "rulesync generate -t claudecode,codexcli,antigravity-cli,grokcli -f rules,skills --check && rulesync generate -t codexcli,antigravity-cli,grokcli -f subagents --check && rulesync generate -t claudecode,codexcli,antigravity-cli -f hooks --check && node scripts/emit-mcp-policy.mjs --check && node scripts/emit-gemini.mjs --check && node scripts/emit-agent-shell-tools.mjs --check && node scripts/check-globals.mjs && node scripts/hooks-union.mjs --check",
     "hooks:union": "node scripts/hooks-union.mjs",
     "hooks:check": "node scripts/hooks-union.mjs --check",
     "doctor": "node ./scripts/doctor.mjs",

package/scripts/doctor.mjs

@@ -4,6 +4,12 @@ import { execFileSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import {
+  PACKAGED_SKILLS_REL,
+  WORKSPACE_SKILLS_REL,
+  findSkillContentConflicts,
+  formatSkillConflictWarn,
+} from "./skill-conflicts.mjs";
 
 export const CHROMIUM_BINS = [
   "chromium",
@@ -23,6 +29,12 @@ const RTK_DOCS = "https://www.rtk-ai.app/docs/getting-started/installation/";
 const LP_INSTALL_SH = "curl -fsSL https://pkg.lightpanda.io/install.sh | bash";
 const RULESYNC_SCHEMA = "rulesync schema doctor: npm run rulesync:doctor";
 const REQUIRED = ["node", "npm", "git", "rtk", "rulesync", "lightpanda", "chromium"];
+export const REQUIRED_MAP_FILES = [
+  { name: "INDEX.md", rel: ".rulesync/reference/INDEX.md" },
+  { name: "skills-map.md", rel: ".rulesync/reference/skills-map.md" },
+  { name: "refs-map.md", rel: ".rulesync/reference/refs-map.md" },
+  { name: "law.md", rel: ".rulesync/reference/law.md" },
+];
 
 export function nodeMajor(version) {
   const m = String(version || "").match(/(\d+)/);
@@ -158,12 +170,35 @@ export function installHints(id, platform = process.platform) {
 }
 
 function row(name, status, extra = "") {
-  const a = String(name).padEnd(10);
+  const a = String(name).padEnd(14);
   const b = String(status).padEnd(18);
   const c = extra ? String(extra).trim() : "";
   return c ? `${a} ${b} ${c}` : `${a} ${b}`;
 }
 
+function mapFilePresent(cwd, rel) {
+  try {
+    return fs.statSync(path.join(cwd, rel)).isFile();
+  } catch {
+    return false;
+  }
+}
+
+function isDir(abs) {
+  try {
+    return fs.statSync(abs).isDirectory();
+  } catch {
+    return false;
+  }
+}
+
+/** Product SoT: reference tree or skills (emit-maps in play). No .rulesync / no those trees → bins-only. */
+export function mapsRequired(cwd) {
+  const rs = path.join(cwd || "", ".rulesync");
+  if (!isDir(rs)) return false;
+  return isDir(path.join(rs, "reference")) || isDir(path.join(rs, "skills"));
+}
+
 export function runDoctor({
   cwd = process.cwd(),
   pathEnv = process.env.PATH,
@@ -232,10 +267,37 @@ export function runDoctor({
     }
   }
 
+  const missingMaps = [];
+  if (mapsRequired(cwd)) {
+    for (const f of REQUIRED_MAP_FILES) {
+      if (mapFilePresent(cwd, f.rel)) {
+        lines.push(row(f.name, "ok", f.rel));
+      } else {
+        missingMaps.push(f);
+        lines.push(row(f.name, "missing", f.rel));
+      }
+    }
+    if (missingMaps.length) {
+      lines.push(`maps missing: ${missingMaps.map((f) => f.name).join(", ")}`);
+    }
+  }
+
+  const skillConflicts = findSkillContentConflicts({
+    workspaceSkillsDir: path.join(cwd || "", WORKSPACE_SKILLS_REL),
+    packagedSkillsDir: path.join(cwd || "", PACKAGED_SKILLS_REL),
+  });
+  if (skillConflicts.length) {
+    lines.push("");
+    lines.push("skill conflicts (warn; re-init overwrites grunt-owned names):");
+    for (const c of skillConflicts) {
+      lines.push(formatSkillConflictWarn(c.name));
+    }
+  }
+
   lines.push("");
   lines.push(RULESYNC_SCHEMA);
   const stdout = `${lines.join("\n")}\n`;
-  return { code: missingRequired.length ? 1 : 0, stdout, stderr: "" };
+  return { code: missingRequired.length || missingMaps.length ? 1 : 0, stdout, stderr: "" };
 }
 
 function main() {