@lovrozagar/grunt 0.4.2 → 0.5.2

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,13 +14,17 @@ 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",
+  "grunt-config.mjs",
   "parse-need.mjs",
   "persist-handoff.mjs",
+  "persist-tmp.mjs",
   "persist-plan.mjs",
   "purge-global-mcps.mjs",
   "scrub-spawn-prompt.mjs",
@@ -23,6 +32,7 @@ const PRODUCT_SCRIPTS = [
   "sync-global-settings.mjs",
   "browser.mjs",
   "doctor.mjs",
+  "skill-conflicts.mjs",
   "scrub-text",
 ]
 
@@ -30,14 +40,30 @@ const COPY_DIRS = [".rulesync", ".grok", ".codex", ".claude", ".agents"]
 const GUARDED_MD_FILES = ["AGENTS.md", "CLAUDE.md"]
 export const GUARDED_ROOT_FILES = ["AGENTS.md", "CLAUDE.md", "GEMINI.md"]
 // .mcp.json is intentionally not copied here: scripts/emit-mcp-policy.mjs
-// (run via `rulesync:generate`, see mergeClaudeSettings ordering) owns and
+// (run via consumer `grunt:rulesync:generate`, see mergeClaudeSettings ordering) owns and
 // merges it, so a plain-copy would just be clobbered/redundant.
+export const GRUNT_NPM_PREFIX = "grunt:"
+export function toGruntScriptName(k) {
+  return k.startsWith(GRUNT_NPM_PREFIX) ? k : `${GRUNT_NPM_PREFIX}${k}`
+}
+export const LAUNCH_SCRIPTS = {
+  antigravity: "antigravity --dangerously-skip-permissions",
+  claude: "claude --dangerously-skip-permissions",
+  codex: "codex --dangerously-bypass-approvals-and-sandbox",
+  gemini: "gemini --yolo",
+  grok: "grok --yolo",
+}
 const OWNED_HOOK_FILES = ["scrub-spawn-prompt.mjs", "gate-fat-tools.mjs", "orchestrate-parent.js"]
 export const SENTINEL_BEGIN = "<!-- grunt:begin -->"
 export const SENTINEL_END = "<!-- grunt:end -->"
 export const MAX_GUARDED_MARKDOWN_BYTES = 2 * 1024 * 1024
-const GRUNT_REGION_RE = /<!-- grunt:begin -->\r?\n?[\s\S]*?<!-- grunt:end -->\r?\n?/g
-const GRUNT_INTERIOR_RE = /<!-- grunt:begin -->\r?\n?([\s\S]*?)<!-- grunt:end -->/g
+const GRUNT_REGION_RE =
+  /(?:^|(?<=\n)|(?<=\r\n))[ \t]*<!-- grunt:begin -->[ \t]*\r?\n?[\s\S]*?(?:^|(?<=\n)|(?<=\r\n))[ \t]*<!-- grunt:end -->[ \t]*\r?\n?/g
+const GRUNT_INTERIOR_RE =
+  /(?:^|(?<=\n)|(?<=\r\n))[ \t]*<!-- grunt:begin -->[ \t]*\r?\n?([\s\S]*?)(?:^|(?<=\n)|(?<=\r\n))[ \t]*<!-- grunt:end -->/g
+const ORPHAN_END_RE = /(?:^|\r?\n)[ \t]*<!-- grunt:end -->[ \t]*(?=\r?\n|$)|<!-- grunt:end -->/g
+const BEGIN_LINE_RE = /^[ \t]*<!-- grunt:begin -->[ \t]*$/
+const END_LINE_RE = /^[ \t]*<!-- grunt:end -->[ \t]*$/
 
 function sortKeys(obj) {
   return Object.fromEntries(Object.keys(obj).sort().map((k) => [k, obj[k]]))
@@ -110,18 +136,43 @@ function inspectGuardedBuffer(buf) {
 }
 
 export function extractUserMarkdown(text) {
-  return String(text).replace(cloneRe(GRUNT_REGION_RE), "")
+  let user = String(text).replace(cloneRe(GRUNT_REGION_RE), "")
+  const i = user.indexOf(SENTINEL_BEGIN)
+  if (i >= 0) user = user.slice(0, i)
+  user = user.replace(cloneRe(ORPHAN_END_RE), "")
+  return userRemainderIsBlank(user) ? "" : user
+}
+
+function unwrapStackedMarkers(text) {
+  const lines = String(text).split(/\r?\n/)
+  let start = 0
+  let end = lines.length
+  while (start < end && BEGIN_LINE_RE.test(lines[start])) start++
+  while (end > start && lines[end - 1] === "") end--
+  while (end > start && END_LINE_RE.test(lines[end - 1])) {
+    end--
+    while (end > start && lines[end - 1] === "") end--
+  }
+  return lines.slice(start, end).join("\n")
 }
 
 export function extractGruntBody(text) {
+  const src = String(text)
   const parts = []
   const re = cloneRe(GRUNT_INTERIOR_RE)
   let m
-  while ((m = re.exec(String(text)))) {
-    parts.push(trimTrailingNewlines(m[1]))
+  while ((m = re.exec(src))) {
+    parts.push(trimTrailingNewlines(unwrapStackedMarkers(m[1])))
   }
-  if (!parts.length) return null
-  return parts.join("\n")
+  if (parts.length) return parts.join("\n")
+  const i = src.indexOf(SENTINEL_BEGIN)
+  if (i >= 0) {
+    return trimTrailingNewlines(
+      unwrapStackedMarkers(src.slice(i + SENTINEL_BEGIN.length).replace(/^[ \t]*\r?\n/, "")),
+    )
+  }
+  if (!src.includes(SENTINEL_END)) return null
+  return trimTrailingNewlines(unwrapStackedMarkers(src))
 }
 
 function userRemainderIsBlank(user) {
@@ -129,9 +180,10 @@ function userRemainderIsBlank(user) {
 }
 
 export function composeGuardedMarkdown(gruntBody, userRemainder, nl = "\n") {
-  const body = toNewline(trimTrailingNewlines(gruntBody), nl)
+  const raw = extractGruntBody(gruntBody) ?? gruntBody
+  const body = toNewline(trimTrailingNewlines(raw), nl)
   const block = `${SENTINEL_BEGIN}${nl}${body}${nl}${SENTINEL_END}${nl}`
-  const user = userRemainder == null ? "" : String(userRemainder)
+  const user = extractUserMarkdown(userRemainder == null ? "" : String(userRemainder))
   if (!user || userRemainderIsBlank(user)) return block
   return block + toNewline(user, nl)
 }
@@ -176,7 +228,7 @@ export function mergeGuardedMarkdown(dest, pkgRoot, file, { alreadyInited = fals
   const d = path.join(dest, file)
   if (samePath(src, d)) return
   const srcText = fs.readFileSync(src, "utf8")
-  return writeMergedGuardedFile(d, srcText)
+  return writeMergedGuardedFile(d, extractGruntBody(srcText) ?? srcText)
 }
 
 export function snapshotGuardedRoots(root) {
@@ -331,7 +383,13 @@ export function mergeClaudeSettings(destRoot, pkgRoot) {
 }
 
 function looksGruntOwnedPrefix(prefix) {
-  return /rulesync|sync:globals|^npm run /.test(prefix)
+  return /rulesync|sync:globals|^npm run |guarded-roots\.mjs|hooks-union\.mjs|doctor\.mjs|sync-global-settings\.mjs|check-globals\.mjs|purge-global-mcps\.mjs/.test(
+    prefix,
+  )
+}
+
+function escapeRe(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
 }
 
 function commandCount(script) {
@@ -356,14 +414,29 @@ function extraOwnedSuffix(cur, newSrc) {
   return null
 }
 
-function mergeScriptValue(name, newSrc, cur) {
-  if (cur == null) return newSrc
+function mergeScriptValue(newSrc, cur) {
   if (cur.startsWith(newSrc)) return cur
   const suffix = extraOwnedSuffix(cur, newSrc)
   if (suffix != null) return newSrc + suffix
-  if (looksGruntOwnedPrefix(cur)) return newSrc
-  console.warn(`script \`${name}\` left untouched (unrelated customization)`)
-  return cur
+  return newSrc
+}
+
+function rewriteNpmRunRefs(scripts, srcKeys) {
+  const keys = srcKeys
+    .filter((k) => k !== toGruntScriptName(k))
+    .sort((a, b) => b.length - a.length)
+  if (!keys.length) return
+  for (const name of Object.keys(scripts)) {
+    let val = scripts[name]
+    if (typeof val !== "string") continue
+    for (const k of keys) {
+      val = val.replace(
+        new RegExp(`npm run ${escapeRe(k)}(?=$|\\s|;|&)`, "g"),
+        `npm run ${toGruntScriptName(k)}`,
+      )
+    }
+    scripts[name] = val
+  }
 }
 
 export function mergePackageJson(dest, pkgRoot) {
@@ -376,10 +449,39 @@ export function mergePackageJson(dest, pkgRoot) {
 
   const srcPkg = JSON.parse(fs.readFileSync(path.join(pkgRoot, "package.json"), "utf8"))
   destPkg.scripts = { ...(destPkg.scripts || {}) }
+  const srcKeys = []
   for (const [k, v] of Object.entries(srcPkg.scripts || {})) {
-    if (k === "test") continue
-    destPkg.scripts[k] = mergeScriptValue(k, v, destPkg.scripts[k])
+    if (k === "test" || k.endsWith(":raw") || k in LAUNCH_SCRIPTS) continue
+    srcKeys.push(k)
+    const destKey = toGruntScriptName(k)
+    const current = destPkg.scripts[destKey]
+    const legacy = destPkg.scripts[k]
+    const ownedLegacy =
+      legacy != null &&
+      (legacy.startsWith(v) || extraOwnedSuffix(legacy, v) != null || looksGruntOwnedPrefix(legacy))
+    if (current != null) {
+      destPkg.scripts[destKey] = mergeScriptValue(v, current)
+    } else if (ownedLegacy) {
+      destPkg.scripts[destKey] = mergeScriptValue(v, legacy)
+    } else {
+      destPkg.scripts[destKey] = v
+    }
+    if (k !== destKey && ownedLegacy) {
+      delete destPkg.scripts[k]
+    } else if (k !== destKey && legacy != null) {
+      console.warn(
+        `script \`${k}\` left untouched (unrelated customization); writing \`${destKey}\``,
+      )
+    }
   }
+  for (const [k, v] of Object.entries(LAUNCH_SCRIPTS)) {
+    const destKey = toGruntScriptName(k)
+    const current = destPkg.scripts[destKey]
+    destPkg.scripts[destKey] = current != null ? mergeScriptValue(v, current) : v
+    const staleKey = `grunt:yolo:${k}`
+    if (destPkg.scripts[staleKey] === v) delete destPkg.scripts[staleKey]
+  }
+  rewriteNpmRunRefs(destPkg.scripts, srcKeys)
   destPkg.devDependencies = { ...(destPkg.devDependencies || {}) }
   destPkg.devDependencies["smol-toml"] = srcPkg.devDependencies["smol-toml"]
   destPkg.devDependencies["rulesync"] = srcPkg.devDependencies["rulesync"]
@@ -406,6 +508,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)
@@ -454,12 +567,12 @@ export function init(dest, { pkgRoot: pkgRootOpt, execFileSync: exec = execFileS
   }
   runNpm("install", ["install"])
   const guardedSnap = snapshotGuardedRoots(dest)
-  runNpm("generate", ["run", "rulesync:generate"])
+  runNpm("generate", ["run", toGruntScriptName("rulesync:generate")])
   remergeGuardedRoots(dest, guardedSnap)
   if (!skipGlobalsApply) {
-    runNpm("sync-globals", ["run", "sync:globals:apply"])
+    runNpm("sync-globals", ["run", toGruntScriptName("sync:globals:apply")])
   }
   withGuardedCheckInteriors(dest, () => {
-    runNpm("check", ["run", "rulesync:check"])
+    runNpm("check", ["run", toGruntScriptName("rulesync:check")])
   })
 }