@lovrozagar/grunt 0.9.4 → 0.10.0

package/cli/grunt.test.ts

@@ -14,7 +14,9 @@ const detectPackageManager = vi.hoisted(() => vi.fn());
 const actualDetect = vi.hoisted(() => ({ fn: null as null | ((...args: unknown[]) => unknown) }));
 const isInteractive = vi.hoisted(() => vi.fn(() => false));
 const select = vi.hoisted(() => vi.fn());
+const multiselect = vi.hoisted(() => vi.fn(async () => []));
 const confirm = vi.hoisted(() => vi.fn());
+const selectedPacks = vi.hoisted(() => vi.fn(() => [] as string[]));
 const spinner = vi.hoisted(() =>
   vi.fn(() => ({ start: vi.fn(), stop: vi.fn() })),
 );
@@ -46,10 +48,15 @@ vi.mock("../scripts/package-manager.mjs", async (importOriginal) => {
 vi.mock("./prompt.mjs", () => ({
   isInteractive,
   select,
+  multiselect,
   confirm,
   spinner,
   bailIfCancel,
 }));
+vi.mock("../scripts/feature-packs.mjs", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../scripts/feature-packs.mjs")>();
+  return { ...actual, selectedPacks };
+});
 
 import {
   PACKAGE_MANAGER_ASK,
@@ -68,7 +75,7 @@ Commands:
   sync-globals  run grunt:sync:globals (dry-run; --apply to write)
   purge-mcps    run grunt:purge:global-mcps (dry-run; --apply to write)
   doctor        run grunt:doctor
-  setup         run grunt:setup — handheld keys/OAuth (speak, listen, google-workspace, browser)
+  setup         run grunt:setup — handheld keys/OAuth (speak, listen, google-workspace, browser, jev)
   upgrade       Self-update to the latest grunt, then re-init: copy owned files, prune retired names, print reserved skills
   map [dir]     Code-only folder map (git-tracked, no files); dir for depth
   help          Show this help
@@ -82,6 +89,7 @@ Flags:
   --apply            Write for sync-globals / purge-mcps
   --host <id>        sync-globals host
   --pm <name>        npm | yarn | pnpm | bun (else lockfile, then how grunt was launched, then ask)
+  --packs <list>     Optional packs: google-workspace,listen,speak,clasp or none
 `;
 
 const pkgRoot = path.join(path.dirname(fileURLToPath(import.meta.url)), "..");
@@ -125,6 +133,10 @@ describe("start", () => {
     spinner.mockImplementation(() => ({ start: vi.fn(), stop: vi.fn() }));
     bailIfCancel.mockReset();
     bailIfCancel.mockImplementation((v) => v);
+    multiselect.mockReset();
+    multiselect.mockResolvedValue([]);
+    selectedPacks.mockReset();
+    selectedPacks.mockReturnValue([]);
   });
 
   afterEach(() => {
@@ -659,6 +671,46 @@ describe("parseArgv --pm", () => {
     });
   });
 
+  it("TTY upgrade asks packs only", async () => {
+    isInteractive.mockReturnValue(true);
+    confirm.mockClear();
+    multiselect.mockClear();
+    init.mockClear();
+    multiselect.mockResolvedValue(["listen", "speak"]);
+    process.argv = ["node", "grunt", "upgrade", "--no-self-update"];
+    await start();
+    expect(confirm).not.toHaveBeenCalled();
+    expect(multiselect).toHaveBeenCalledWith(
+      expect.objectContaining({ message: "Optional packs", required: false, initialValues: [] }),
+    );
+    expect(init).toHaveBeenCalledWith(process.cwd(), {
+      skipGlobals: false,
+      packageManager: "npm",
+      packs: ["listen", "speak"],
+    });
+  });
+
+  it("TTY init pre-checks a saved features file and skips the pack prompt when --packs is set", async () => {
+    isInteractive.mockReturnValue(true);
+    selectedPacks.mockReturnValue(["speak"]);
+    confirm.mockResolvedValue(true);
+    process.argv = ["node", "grunt", "init"];
+    await start();
+    expect(multiselect).toHaveBeenCalledWith(
+      expect.objectContaining({ initialValues: ["speak"], required: false }),
+    );
+    multiselect.mockClear();
+    confirm.mockClear();
+    init.mockClear();
+    process.argv = ["node", "grunt", "init", "--packs", "listen"];
+    await start();
+    expect(multiselect).not.toHaveBeenCalled();
+    expect(init).toHaveBeenCalledWith(
+      process.cwd(),
+      expect.objectContaining({ packs: ["listen"], applyGlobals: true }),
+    );
+  });
+
   it("missing, empty, flag, and unknown are pmError", () => {
     expect(parseArgv(["generate", "--pm"])).toMatchObject({ pmError: true });
     expect(parseArgv(["generate", "--pm="])).toMatchObject({ pmError: true });
@@ -666,3 +718,72 @@ describe("parseArgv --pm", () => {
     expect(parseArgv(["generate", "--pm", "deno"])).toMatchObject({ pmError: true });
   });
 });
+
+describe("parseArgv --packs", () => {
+  it("pair, equals, and none", () => {
+    expect(parseArgv(["init", "--packs", "speak,listen"])).toMatchObject({
+      cmd: "init",
+      packs: ["listen", "speak"],
+      packsError: false,
+    });
+    expect(parseArgv(["init", "--packs=google-workspace,clasp"])).toMatchObject({
+      packs: ["google-workspace", "clasp"],
+      packsError: false,
+    });
+    expect(parseArgv(["init", "--packs", "none"])).toMatchObject({ packs: [], packsError: false });
+    expect(parseArgv(["init", "--packs="])).toMatchObject({ packs: [], packsError: false });
+  });
+
+  it("missing, flag, and unknown are packsError", () => {
+    expect(parseArgv(["init", "--packs"])).toMatchObject({ packsError: true });
+    expect(parseArgv(["init", "--packs", "--yes"])).toMatchObject({ packsError: true });
+    expect(parseArgv(["init", "--packs", "nope"])).toMatchObject({ packsError: true });
+    expect(parseArgv(["init", "--packs=nope"])).toMatchObject({ packsError: true });
+  });
+
+  it("unknown --packs writes usage", async () => {
+    const lines: string[] = [];
+    const stdoutWrite = process.stdout.write;
+    const exitCode = process.exitCode;
+    const argv = process.argv.slice();
+    process.stdout.write = ((buf: string | Uint8Array) => {
+      lines.push(String(buf));
+      return true;
+    }) as typeof process.stdout.write;
+    process.exitCode = 0;
+    process.argv = ["node", "grunt", "init", "--packs", "nope"];
+    init.mockClear();
+    try {
+      await start();
+      expect(lines.join("")).toBe(USAGE);
+      expect(process.exitCode).toBe(1);
+      expect(init).not.toHaveBeenCalled();
+    } finally {
+      process.stdout.write = stdoutWrite;
+      process.exitCode = exitCode;
+      process.argv = argv;
+    }
+  });
+
+  it("TTY upgrade with --packs skips the pack prompt", async () => {
+    isInteractive.mockReturnValue(true);
+    multiselect.mockClear();
+    confirm.mockClear();
+    init.mockClear();
+    process.argv = ["node", "grunt", "upgrade", "--no-self-update", "--packs", "listen"];
+    const stdoutWrite = process.stdout.write;
+    process.stdout.write = (() => true) as typeof process.stdout.write;
+    try {
+      await start();
+      expect(multiselect).not.toHaveBeenCalled();
+      expect(confirm).not.toHaveBeenCalled();
+      expect(init).toHaveBeenCalledWith(process.cwd(), {
+        skipGlobals: false,
+        packageManager: "npm",
+        packs: ["listen"],
+      });
+    } finally {
+      process.stdout.write = stdoutWrite;
+    }
+  });
+});

package/cli/init.mjs

@@ -15,7 +15,13 @@ import {
   snapshotGuardedRoots,
   remergeGuardedRoots,
   withGuardedCheckInteriors,
+  mergeReferenceMarkdown,
 } from "../scripts/guarded-md.mjs"
+import {
+  COMMANDS as PIPELINE_COMMANDS,
+  PIPELINE_CONFIG_REL,
+  inferPipelineSkip,
+} from "../scripts/pipeline.mjs"
 import {
   PACKAGE_MANAGERS,
   UNKNOWN_PACKAGE_MANAGER,
@@ -25,6 +31,14 @@ import {
   runScriptArgs,
 } from "../scripts/package-manager.mjs"
 import { LAW_REL, emitMaps } from "../scripts/emit-maps.mjs"
+import {
+  isUnselectedPackPath,
+  resolvePackSelection,
+  unselectedPackRels,
+  unselectedRefNames,
+  unselectedScriptNames,
+  writePacks,
+} from "../scripts/feature-packs.mjs"
 
 export {
   GUARDED_ROOT_FILES,
@@ -41,6 +55,8 @@ export {
   remergeGuardedRoots,
   healGuardedRootFile,
   withGuardedCheckInteriors,
+  extraH2Sections,
+  mergeReferenceMarkdown,
 } from "../scripts/guarded-md.mjs"
 
 const PKG_ROOT = path.join(path.dirname(fileURLToPath(import.meta.url)), "..")
@@ -70,9 +86,12 @@ export const PRODUCT_SCRIPTS = [
   "scrub-text-lib.mjs",
   "session-map.mjs",
   "sync-global-settings.mjs",
+  "board.mjs",
   "browser.mjs",
+  "feature-packs.mjs",
   "speak.mjs",
   "listen.mjs",
+  "jev.mjs",
   "google-workspace.mjs",
   "interactive.mjs",
   "prompt.mjs",
@@ -112,6 +131,7 @@ export const RESERVED_SKILLS = [
   "google-workspace",
   "handoff",
   "implement-plan",
+  "jev",
   "listen",
   "pickup",
   "speak",
@@ -147,6 +167,23 @@ export const LAUNCH_SCRIPTS = {
   gemini: "gemini --yolo",
   grok: "grok --yolo",
 }
+/** Exact prior grunt defaults. A dest script equal to one of these migrates to the current value. */
+export const HISTORICAL_SCRIPT_DEFAULTS = {
+  antigravity: ["antigravity"],
+  claude: ["claude"],
+  codex: ["codex"],
+  gemini: ["gemini"],
+  grok: ["grok"],
+}
+export const E2E_VITEST_CONFIGS = [
+  "vitest.e2e.config.ts",
+  "vitest.e2e.config.mts",
+  "vitest.e2e.config.js",
+  "vitest.e2e.config.mjs",
+  "vitest.e2e.config.cjs",
+]
+export const REFERENCE_REL = ".rulesync/reference"
+export { PIPELINE_CONFIG_REL }
 const OWNED_HOOK_FILES = [
   "scrub-spawn-prompt.mjs",
   "gate-fat-tools.mjs",
@@ -333,11 +370,62 @@ function extraOwnedSuffix(cur, newSrc) {
   return null
 }
 
-function mergeScriptValue(newSrc, cur) {
+function mergeScriptValue(newSrc, cur, historical = []) {
   if (cur.startsWith(newSrc)) return cur
   const suffix = extraOwnedSuffix(cur, newSrc)
   if (suffix != null) return newSrc + suffix
-  return newSrc
+  if (historical.includes(cur)) return newSrc
+  if (looksGruntOwnedPrefix(cur)) return newSrc
+  return cur
+}
+
+function historicalFor(key) {
+  return HISTORICAL_SCRIPT_DEFAULTS[key] || []
+}
+
+function hasE2eConfig(dest) {
+  return E2E_VITEST_CONFIGS.some((name) => fs.existsSync(path.join(dest, name)))
+}
+
+export function snapshotReferenceDocs(dest) {
+  const dir = path.join(dest, REFERENCE_REL)
+  const snap = {}
+  if (!fs.existsSync(dir)) return snap
+  for (const name of fs.readdirSync(dir)) {
+    if (!name.endsWith(".md") || GENERATED_MAP_FILES.has(name)) continue
+    const abs = path.join(dir, name)
+    if (!fs.statSync(abs).isFile()) continue
+    snap[name] = fs.readFileSync(abs, "utf8")
+  }
+  return snap
+}
+
+export function remergeReferenceDocs(dest, snap, pkgRoot, skip = new Set()) {
+  const pkgDir = path.join(pkgRoot, REFERENCE_REL)
+  const destDir = path.join(dest, REFERENCE_REL)
+  for (const [name, existing] of Object.entries(snap)) {
+    if (skip.has(name)) continue
+    const pkgFile = path.join(pkgDir, name)
+    if (!fs.existsSync(pkgFile)) continue
+    const incoming = fs.readFileSync(pkgFile, "utf8")
+    fs.mkdirSync(destDir, { recursive: true })
+    fs.writeFileSync(path.join(destDir, name), mergeReferenceMarkdown(existing, incoming))
+  }
+}
+
+export function seedPipelineConfig(dest, destPipelineSrc) {
+  if (!destPipelineSrc || !/export const COMMANDS/.test(destPipelineSrc)) return false
+  const abs = path.join(dest, PIPELINE_CONFIG_REL)
+  if (fs.existsSync(abs)) return false
+  const overlay = {}
+  for (const mode of Object.keys(PIPELINE_COMMANDS)) {
+    const skip = inferPipelineSkip(destPipelineSrc, mode)
+    if (skip.length) overlay[mode] = { skip }
+  }
+  if (!Object.keys(overlay).length) return false
+  fs.mkdirSync(path.dirname(abs), { recursive: true })
+  fs.writeFileSync(abs, `${JSON.stringify(overlay, null, 2)}\n`)
+  return true
 }
 
 function rewritePackageManagerRunRefs(scripts, srcKeys) {
@@ -394,17 +482,19 @@ export function mergePackageJson(dest, pkgRoot) {
   const srcKeys = []
   for (const [k, v] of Object.entries(srcPkg.scripts || {})) {
     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]
+    if (k === "test:e2e" && current == null && legacy == null && !hasE2eConfig(dest)) continue
+    srcKeys.push(k)
+    const historical = historicalFor(k)
     const ownedLegacy =
       legacy != null &&
       (legacy.startsWith(v) || extraOwnedSuffix(legacy, v) != null || looksGruntOwnedPrefix(legacy))
     if (current != null) {
-      destPkg.scripts[destKey] = mergeScriptValue(v, current)
+      destPkg.scripts[destKey] = mergeScriptValue(v, current, historical)
     } else if (ownedLegacy) {
-      destPkg.scripts[destKey] = mergeScriptValue(v, legacy)
+      destPkg.scripts[destKey] = mergeScriptValue(v, legacy, historical)
     } else {
       destPkg.scripts[destKey] = v
     }
@@ -419,7 +509,7 @@ export function mergePackageJson(dest, pkgRoot) {
   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
+    destPkg.scripts[destKey] = current != null ? mergeScriptValue(v, current, historicalFor(k)) : v
     const staleKey = `grunt:yolo:${k}`
     if (destPkg.scripts[staleKey] === v) delete destPkg.scripts[staleKey]
   }
@@ -478,7 +568,7 @@ export function resolveInitPackageManager(dest, { packageManager, env = process.
   return detected.manager
 }
 
-export function init(dest, { pkgRoot: pkgRootOpt, execFileSync: exec = execFileSync, skipGlobals = false, applyGlobals, onPhase, packageManager, env = process.env } = {}) {
+export function init(dest, { pkgRoot: pkgRootOpt, execFileSync: exec = execFileSync, skipGlobals = false, applyGlobals, onPhase, packageManager, env = process.env, packs } = {}) {
   dest = path.resolve(dest)
   const pkgRoot = path.resolve(pkgRootOpt ?? PKG_ROOT)
   const skipGlobalsApply =
@@ -494,6 +584,9 @@ export function init(dest, { pkgRoot: pkgRootOpt, execFileSync: exec = execFileS
   }
 
   const self = samePath(dest, pkgRoot)
+  const selection = self ? { packs: [], answered: false } : resolvePackSelection(dest, packs)
+  const selected = new Set(selection.packs)
+  const allowPack = (src) => !isUnselectedPackPath(path.relative(pkgRoot, src), selected)
 
   phase("merge", () => {
     const wsSkills = path.join(dest, WORKSPACE_SKILLS_REL)
@@ -507,18 +600,25 @@ export function init(dest, { pkgRoot: pkgRootOpt, execFileSync: exec = execFileS
       }
     }
 
+    const refSnap = self ? {} : snapshotReferenceDocs(dest)
+    let destPipelineSrc = ""
+    if (!self) {
+      const destPipeline = path.join(dest, "scripts", "pipeline.mjs")
+      if (fs.existsSync(destPipeline)) destPipelineSrc = fs.readFileSync(destPipeline, "utf8")
+    }
+
     for (const dir of COPY_DIRS) {
       const src = path.join(pkgRoot, dir)
       const d = path.join(dest, dir)
       fs.mkdirSync(d, { recursive: true })
       if (samePath(src, d)) continue
       if (dir === ".claude") {
-        copyTree(src, d, (s) => path.basename(s) !== "settings.json")
+        copyTree(src, d, (s) => path.basename(s) !== "settings.json" && allowPack(s))
         mergeClaudeSettings(dest, pkgRoot)
       } else if (dir === ".rulesync") {
-        copyTree(src, d, (s) => !GENERATED_MAP_FILES.has(path.basename(s)))
+        copyTree(src, d, (s) => !GENERATED_MAP_FILES.has(path.basename(s)) && allowPack(s))
       } else {
-        copyTree(src, d)
+        copyTree(src, d, allowPack)
       }
     }
 
@@ -529,7 +629,9 @@ export function init(dest, { pkgRoot: pkgRootOpt, execFileSync: exec = execFileS
     }
 
     fs.mkdirSync(path.join(dest, "scripts"), { recursive: true })
+    const skipScripts = unselectedScriptNames(selected)
     for (const name of PRODUCT_SCRIPTS) {
+      if (skipScripts.has(name)) continue
       const src = path.join(pkgRoot, "scripts", name)
       const d = path.join(dest, "scripts", name)
       if (samePath(src, d)) continue
@@ -540,8 +642,14 @@ export function init(dest, { pkgRoot: pkgRootOpt, execFileSync: exec = execFileS
     mergeGitignore(dest)
 
     if (!self) {
+      remergeReferenceDocs(dest, refSnap, pkgRoot, unselectedRefNames(selected))
+      seedPipelineConfig(dest, destPipelineSrc)
       mergePackageJson(dest, pkgRoot)
       copyRootIfMissing(dest, pkgRoot)
+      for (const rel of unselectedPackRels(selected)) {
+        fs.rmSync(path.join(dest, rel), { recursive: true, force: true })
+      }
+      if (selection.answered) writePacks(dest, selection.packs)
       emitDestMaps(dest)
     }
   })