@lovrozagar/grunt 0.6.1 → 0.7.0

package/CHANGELOG.md

@@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.7.0] - 2026-09-30
+
+### Added
+
+- Package manager detection for init/generate/check/doctor/setup: lockfile or `package.json` `"packageManager"`, then how grunt was launched, then TTY ask. `--pm npm|yarn|pnpm|bun` overrides. Non-interactive with no signal fails instead of assuming npm.
+
+### Fixed
+
+- Init no longer forces `npm install` / `npm run`
+- Init keeps `@lovrozagar/grunt` in `devDependencies` (moves it out of `dependencies` when present; adds it when missing)
+- Init INDEX/skills-map/refs-map are generated from the dest tree (grunt refs plus consumer extras) instead of copying the package maps
+- Init writes root `.mcp.json` when dest is missing it
+
+## [0.6.2] - 2026-09-17
+
+### Changed
+
+- TTY init defaults `Apply global prompt optimizations? (recommended)` to Yes (`--skip-globals` still defaults No)
+
+### Fixed
+
+- Init in `$HOME` no longer fails `emit-mcp-policy --check` after globals write `[features]` into the same `~/.grok/config.toml`
+- TTY init spinner `stop` keeps the phase name (no empty `◇`)
+
 ## [0.6.1] - 2026-09-17
 
 ### Changed

package/README.md

@@ -23,23 +23,26 @@ OSS drop-in; merges existing configs; switches default provider flow to Grunt.
 ## Install
 
 - Node.js 22+
-- Consumer:
+- Consumer (devDependency; init moves it there if it landed in `dependencies`):
 
 ```
-npm i -D @lovrozagar/grunt
-npm exec grunt
+npm i -D @lovrozagar/grunt && npm exec grunt
+pnpm add -D @lovrozagar/grunt && pnpm exec grunt
+yarn add -D @lovrozagar/grunt && yarn grunt
+bun add -D @lovrozagar/grunt && bunx grunt
 ```
 
-- Same as `npm exec grunt init` when no command
-- Do not `npm test` as a consumer
-- Package: `@lovrozagar/grunt` `0.6.0` MIT · https://github.com/lovrozagar/grunt
+- Same as `grunt init` when no command
+- Do not run this package's test script as a consumer
+- Package: `@lovrozagar/grunt` MIT · https://github.com/lovrozagar/grunt
+- Package manager: lockfile or `package.json` `"packageManager"`, then how grunt was launched, then TTY ask. `--pm npm|yarn|pnpm|bun` overrides. Non-interactive with no signal fails (does not assume npm).
 
 ## Prerequisites
 
 All OS. Print-only. Never auto-install.
 
 ```
-npm exec grunt doctor
+grunt doctor
 node scripts/doctor.mjs
 ```
 
@@ -47,7 +50,8 @@ Exit 1 if any required missing; 0 if all required ok. Optional tools are reporte
 
 | tool | required | install |
 | --- | --- | --- |
-| node ≥22 + npm | yes | https://nodejs.org (≥22) · nvm / OS pkg · win `winget install OpenJS.NodeJS.LTS` |
+| node ≥22 | yes | https://nodejs.org (≥22) · nvm / OS pkg · win `winget install OpenJS.NodeJS.LTS` |
+| package manager | yes | npm (ships with Node ≥22) · yarn/pnpm `corepack enable` · bun https://bun.sh · detected from the repo, else how grunt was launched |
 | git | yes | linux `sudo apt install git` · mac `brew install git` · win `winget install Git.Git` |
 | rtk | yes | linux/mac `curl -fsSL https://raw.githubusercontent.com/rtk-ai/rtk/master/install.sh \| sh` or `brew install rtk` · win release zip `rtk.exe` on PATH or WSL curl ([docs](https://www.rtk-ai.app/docs/getting-started/installation/)) |
 | rulesync | yes | `npm i -D rulesync` / npx (PATH or npx-able) |
@@ -61,7 +65,7 @@ Exit 1 if any required missing; 0 if all required ok. Optional tools are reporte
 | whisper-cli | no | local STT for `/listen` · mac `brew install whisper-cpp` · first listen downloads `ggml-base.en.bin` · setup in `.rulesync/reference/listen.md` |
 | listen | no | `node scripts/listen.mjs` · STT input · `grunt setup` / `node scripts/setup.mjs listen` · local whisper.cpp then OpenAI Whisper |
 
-Rulesync schema doctor is separate: `npm run grunt:rulesync:doctor`.
+Rulesync schema doctor is separate: `grunt:rulesync:doctor` (or SoT `rulesync:doctor`).
 
 ## Usage
 
@@ -73,13 +77,13 @@ Rulesync schema doctor is separate: `npm run grunt:rulesync:doctor`.
 
 ### Commands
 
-- `init` → `init()` — merge SoT, `npm install`, `grunt:rulesync:generate`, `grunt:sync:globals:apply`, `grunt:rulesync:check`
-- `generate` → `npm run grunt:rulesync:generate`
-- `check` → `npm run grunt:rulesync:check`
-- `sync-globals` → `npm run grunt:sync:globals` (dry-run); `--apply` → `grunt:sync:globals:apply`
-- `purge-mcps` → `npm run grunt:purge:global-mcps` (dry-run); `--apply` → `grunt:purge:global-mcps:apply`
-- `doctor` → `npm run grunt:doctor` (`npm exec grunt doctor` / `node scripts/doctor.mjs` stay). Rulesync schema: `npm run grunt:rulesync:doctor`
-- `setup` → `npm run grunt:setup` (`node scripts/setup.mjs`) — handheld speak / listen / google-workspace / browser. TTY walks each; flags for non-TTY keys/`--creds`
+- `init` → `init()` — merge SoT, install, `grunt:rulesync:generate`, `grunt:sync:globals:apply`, `grunt:rulesync:check`
+- `generate` → run `grunt:rulesync:generate`
+- `check` → run `grunt:rulesync:check`
+- `sync-globals` → run `grunt:sync:globals` (dry-run); `--apply` → `grunt:sync:globals:apply`
+- `purge-mcps` → run `grunt:purge:global-mcps` (dry-run); `--apply` → `grunt:purge:global-mcps:apply`
+- `doctor` → run `grunt:doctor` (`grunt doctor` / `node scripts/doctor.mjs` stay). Rulesync schema: `grunt:rulesync:doctor`
+- `setup` → run `grunt:setup` (`node scripts/setup.mjs`) — handheld speak / listen / google-workspace / browser. TTY walks each; flags for non-TTY keys/`--creds`
 - `upgrade` → same merge as init for an already-inited repo: copy owned trees/scripts, prune retired grunt-owned names, print reserved skill names
 - `help`
 - `version`
@@ -90,25 +94,31 @@ Rulesync schema doctor is separate: `npm run grunt:rulesync:doctor`.
 - `--yes` / `-y` / `--non-interactive` — no TTY menu; default command still `init`. Not `--apply`
 - `--apply` — write for `sync-globals` / `purge-mcps`
 - `--host <id>` — `sync-globals --host <id>`
+- `--pm <name>` — `npm` | `yarn` | `pnpm` | `bun`
 
 ## Init
 
-- Merge SoT `npm install` `grunt:rulesync:generate` `grunt:sync:globals:apply` `grunt:rulesync:check`
+- Merge SoT, install with the detected package manager, `grunt:rulesync:generate` `grunt:sync:globals:apply` `grunt:rulesync:check`
+- `@lovrozagar/grunt` is a consumer devDependency. Init moves it out of `dependencies` when it is there, and adds it when missing.
+- INDEX / skills-map / refs-map are generated from the dest `.rulesync` tree (grunt files plus consumer extras). Package copies of those maps are not stamped over dest.
+- Root `.mcp.json` is created when missing; generate still merges from `.rulesync/mcp-policy.jsonc`.
 - `--skip-globals` skips apply
-- TTY init asks `Apply global prompt optimizations? (recommended)` before writing `~/.grok/config.toml`
-- Re-init auto-skips globals when `<!-- grunt:begin -->` in `AGENTS.md`/`CLAUDE.md`
+- TTY init asks `Apply global prompt optimizations? (recommended)` (default Yes; `--skip-globals` defaults No)
+- Non-interactive re-init auto-skips globals when `<!-- grunt:begin -->` in `AGENTS.md`/`CLAUDE.md`
 - First init (no sentinel) applies globals unless flagged
 - Owned trees/scripts refresh; extra `.rulesync` files kept; patches to grunt-owned files lost
 - `cp` cannot delete dest extras. Init/upgrade then prune: retired skills `parent` `solo` `cascade`, agents `implementer` `thinker` (plus `.grok/roles/{implementer,thinker}.toml` and `.gemini/agents/{name}/`), scripts `telemetry.mjs` `grunt-config.mjs`, paths `.grok/parent.md` `.grok/skills/shared` `.rulesync/grunt.config.jsonc` plus local overlay and example, and reserved skill dirs this package no longer ships. Consumer extras stay.
-- Breaking: consumer npm scripts are `grunt:<SoT-key>` (`grunt:rulesync:generate`, `grunt:doctor`). Re-init migrates `package.json` (owned unprefixed keys + suffixes; `npm run` refs in other dest scripts). CI/husky/`npm run rulesync:*` / `npm run doctor` must switch. No aliases. SoT repo scripts stay unprefixed (`npm run rulesync:generate`).
+- Breaking: consumer scripts are `grunt:<SoT-key>` (`grunt:rulesync:generate`, `grunt:doctor`). Re-init migrates `package.json` (owned unprefixed keys + suffixes; `npm|yarn|pnpm|bun run` refs in other dest scripts). CI/husky/`run rulesync:*` / `run doctor` must switch. No aliases. SoT repo scripts stay unprefixed (`rulesync:generate`).
 
 ## Version bump
 
 Already-inited consumer (0.5.x → 0.6, and later):
 
 ```
-npm i -D @lovrozagar/grunt@latest
-npm exec grunt upgrade
+npm i -D @lovrozagar/grunt@latest && npm exec grunt upgrade
+pnpm add -D @lovrozagar/grunt@latest && pnpm exec grunt upgrade
+yarn add -D @lovrozagar/grunt@latest && yarn grunt upgrade
+bun add -D @lovrozagar/grunt@latest && bunx grunt upgrade
 ```
 
 `upgrade` is init plus a reserved-names print. Same merge, prune, and globals-skip rules as Init. New skills/scripts appear because they are in the package copy list. Dropped grunt-owned files disappear only if they are on the retired lists (or a reserved skill this package no longer ships). Do not expect a blind dest-dir mirror-delete; that would wipe consumer extras.
@@ -155,7 +165,7 @@ Pipeline (no `-t geminicli`):
 3. `emit-gemini.mjs` — `GEMINI.md` `.gemini/agents/{id}/agent.md` MCP `.gemini/settings.json`
 4. `emit-agent-shell-tools` — Claude grunt body `Bash`; other hosts `run_terminal_command` (hooks-union)
 
-`check` = rulesync check. `doctor` = unified prereqs. Schema: `npm run rulesync:doctor`.
+`check` = rulesync check. `doctor` = unified prereqs. Schema: `rulesync:doctor`.
 
 Emit writes other-CLI trees from `.rulesync` for the **next** process of that CLI. Not a live hop into another host.
 
@@ -170,7 +180,7 @@ Emit writes other-CLI trees from `.rulesync` for the **next** process of that CL
 
 Not git. Not `sync-globals`.
 
-First-hand: `npm exec grunt setup` (TTY). Per target: `node scripts/setup.mjs speak|listen|google-workspace|browser`. Spec: `.rulesync/reference/setup.md`.
+First-hand: `grunt setup` (TTY). Per target: `node scripts/setup.mjs speak|listen|google-workspace|browser`. Spec: `.rulesync/reference/setup.md`.
 
 | | where |
 | --- | --- |

package/cli/grunt.mjs

@@ -2,8 +2,16 @@ import { execFileSync } from "node:child_process"
 import { readFileSync } from "node:fs"
 import path from "node:path"
 import { fileURLToPath } from "node:url"
-import { destAlreadyInited, init, RESERVED_SKILLS, shouldAutoSkipGlobals, toGruntScriptName } from "./init.mjs"
+import { destAlreadyInited, init, RESERVED_SKILLS, toGruntScriptName } from "./init.mjs"
 import { confirm, isInteractive, select, spinner } from "./prompt.mjs"
+import {
+  PACKAGE_MANAGER_ASK,
+  PACKAGE_MANAGER_OPTIONS,
+  UNKNOWN_PACKAGE_MANAGER,
+  detectPackageManager,
+  isPackageManager,
+  runScriptArgs,
+} from "../scripts/package-manager.mjs"
 
 const PKG_ROOT = path.join(path.dirname(fileURLToPath(import.meta.url)), "..")
 
@@ -12,13 +20,13 @@ const USAGE = `Usage: grunt [command]
 Default (no command): TTY menu; else init — full setup
 
 Commands:
-  init          Full setup: merge SoT, npm install, grunt:rulesync:generate, grunt:sync:globals:apply, grunt:rulesync:check
-  generate      npm run grunt:rulesync:generate
-  check         npm run grunt:rulesync:check
-  sync-globals  npm run grunt:sync:globals (dry-run; --apply to write)
-  purge-mcps    npm run grunt:purge:global-mcps (dry-run; --apply to write)
-  doctor        npm run grunt:doctor
-  setup         npm run grunt:setup — handheld keys/OAuth (speak, listen, google-workspace, browser)
+  init          Full setup: merge SoT, install, grunt:rulesync:generate, grunt:sync:globals:apply, grunt:rulesync:check
+  generate      run grunt:rulesync:generate
+  check         run grunt:rulesync:check
+  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)
   upgrade       Re-init: copy owned files, prune retired grunt-owned names, print reserved skills
   help          Show this help
   version       Print package version
@@ -29,6 +37,7 @@ Flags:
   --non-interactive  Same as --yes
   --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)
 `
 
 const MENU_OPTIONS = [
@@ -45,26 +54,41 @@ const MENU_OPTIONS = [
 ]
 
 const YES_FLAGS = new Set(["--yes", "-y", "--non-interactive"])
+const NEEDS_PM = new Set([
+  "init",
+  "generate",
+  "check",
+  "sync-globals",
+  "purge-mcps",
+  "doctor",
+  "setup",
+  "upgrade",
+])
 
 function pkgVersion() {
   const pkg = JSON.parse(readFileSync(path.join(PKG_ROOT, "package.json"), "utf8"))
   return pkg.version
 }
 
-function npmRun(script, extra = []) {
-  const args = extra.length ? ["run", script, "--", ...extra] : ["run", script]
-  execFileSync("npm", args, { cwd: process.cwd(), stdio: "inherit" })
+function runScript(pm, script, extra = []) {
+  execFileSync(pm, runScriptArgs(pm, script, extra), { cwd: process.cwd(), stdio: "inherit" })
 }
 
 function hostValueOk(v) {
   return v != null && v !== "" && !String(v).startsWith("-")
 }
 
+function pmValueOk(v) {
+  return v != null && v !== "" && isPackageManager(v)
+}
+
 export function parseArgv(argv) {
   let skipGlobals = false
   let apply = false
   let host
   let hostError = false
+  let pm
+  let pmError = false
   const positionals = []
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i]
@@ -92,9 +116,25 @@ export function parseArgv(argv) {
       if (!hostValueOk(host)) hostError = true
       continue
     }
+    if (a === "--pm") {
+      const v = argv[i + 1]
+      if (!pmValueOk(v)) {
+        pmError = true
+        continue
+      }
+      pm = String(v).toLowerCase()
+      i += 1
+      continue
+    }
+    if (typeof a === "string" && a.startsWith("--pm=")) {
+      pm = a.slice("--pm=".length)
+      if (!pmValueOk(pm)) pmError = true
+      else pm = pm.toLowerCase()
+      continue
+    }
     positionals.push(a)
   }
-  return { cmd: positionals[0], args: positionals.slice(1), skipGlobals, apply, host, hostError }
+  return { cmd: positionals[0], args: positionals.slice(1), skipGlobals, apply, host, hostError, pm, pmError }
 }
 
 function hostExtra(host) {
@@ -105,15 +145,29 @@ function bindSpinner() {
   const spin = spinner()
   return (name, action) => {
     if (action === "start") spin.start(name)
-    else if (action === "stop") spin.stop()
+    else if (action === "stop") spin.stop(name)
   }
 }
 
 export const APPLY_GLOBALS_CONFIRM = "Apply global prompt optimizations? (recommended)"
 
-async function runInit(cwd, { skipGlobals, interactive }) {
+export async function resolveCliPackageManager({ cwd, env, override, interactive }) {
+  const detected = detectPackageManager({ cwd, env, override })
+  if (detected.manager) return detected.manager
+  if (interactive) {
+    return await select({
+      message: PACKAGE_MANAGER_ASK,
+      options: PACKAGE_MANAGER_OPTIONS,
+    })
+  }
+  process.stdout.write(`${UNKNOWN_PACKAGE_MANAGER}\n`)
+  process.exitCode = 1
+  return null
+}
+
+async function runInit(cwd, { skipGlobals, interactive, packageManager }) {
   if (!interactive) {
-    init(cwd, { skipGlobals })
+    init(cwd, { skipGlobals, packageManager })
     return
   }
   if (destAlreadyInited(cwd)) {
@@ -123,19 +177,19 @@ async function runInit(cwd, { skipGlobals, interactive }) {
     })
     if (!again) return
   }
-  const autoSkip = skipGlobals || shouldAutoSkipGlobals(cwd)
   const applyGlobals = await confirm({
     message: APPLY_GLOBALS_CONFIRM,
-    initialValue: !autoSkip,
+    initialValue: !skipGlobals,
   })
   init(cwd, {
     skipGlobals: !applyGlobals,
     applyGlobals,
     onPhase: bindSpinner(),
+    packageManager,
   })
 }
 
-async function dispatch(cmd, flags, interactive) {
+async function dispatch(cmd, flags, interactive, pm) {
   if (cmd === "help" || cmd === "--help" || cmd === "-h") {
     process.stdout.write(USAGE)
     return
@@ -148,38 +202,40 @@ async function dispatch(cmd, flags, interactive) {
     await runInit(process.cwd(), {
       skipGlobals: flags.skipGlobals,
       interactive: interactive && (!cmd || cmd === "init"),
+      packageManager: pm,
     })
     return
   }
   if (cmd === "generate") {
-    npmRun(toGruntScriptName("rulesync:generate"))
+    runScript(pm, toGruntScriptName("rulesync:generate"))
     return
   }
   if (cmd === "check") {
-    npmRun(toGruntScriptName("rulesync:check"))
+    runScript(pm, toGruntScriptName("rulesync:check"))
     return
   }
   if (cmd === "sync-globals") {
     const script = flags.apply ? toGruntScriptName("sync:globals:apply") : toGruntScriptName("sync:globals")
-    npmRun(script, hostExtra(flags.host))
+    runScript(pm, script, hostExtra(flags.host))
     return
   }
   if (cmd === "purge-mcps") {
-    npmRun(flags.apply ? toGruntScriptName("purge:global-mcps:apply") : toGruntScriptName("purge:global-mcps"))
+    runScript(pm, flags.apply ? toGruntScriptName("purge:global-mcps:apply") : toGruntScriptName("purge:global-mcps"))
     return
   }
   if (cmd === "doctor") {
-    npmRun(toGruntScriptName("doctor"))
+    runScript(pm, toGruntScriptName("doctor"))
     return
   }
   if (cmd === "setup") {
-    npmRun(toGruntScriptName("setup"), flags.args)
+    runScript(pm, toGruntScriptName("setup"), flags.args)
     return
   }
   if (cmd === "upgrade") {
     await runInit(process.cwd(), {
       skipGlobals: flags.skipGlobals,
       interactive: false,
+      packageManager: pm,
     })
     process.stdout.write(`reserved: ${RESERVED_SKILLS.join(" ")}\n`)
     return
@@ -188,9 +244,13 @@ async function dispatch(cmd, flags, interactive) {
   process.exitCode = 1
 }
 
+function commandNeedsPackageManager(cmd) {
+  return !cmd || NEEDS_PM.has(cmd)
+}
+
 export async function start() {
   const flags = parseArgv(process.argv.slice(2))
-  if (flags.hostError) {
+  if (flags.hostError || flags.pmError) {
     process.stdout.write(USAGE)
     process.exitCode = 1
     return
@@ -206,5 +266,15 @@ export async function start() {
     if (choice === "quit") return
     cmd = choice
   }
-  await dispatch(cmd, flags, interactive)
+  let pm
+  if (commandNeedsPackageManager(cmd)) {
+    pm = await resolveCliPackageManager({
+      cwd: process.cwd(),
+      env: process.env,
+      override: flags.pm,
+      interactive,
+    })
+    if (!pm) return
+  }
+  await dispatch(cmd, flags, interactive, pm)
 }

package/cli/grunt.test.ts

@@ -10,6 +10,8 @@ const toGruntScriptName = vi.hoisted(
   () => (k) => (String(k).startsWith("grunt:") ? k : `grunt:${k}`),
 );
 const execFileSync = vi.hoisted(() => vi.fn());
+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 confirm = vi.hoisted(() => vi.fn());
@@ -27,6 +29,16 @@ vi.mock("./init.mjs", () => ({
   GRUNT_NPM_PREFIX: "grunt:",
 }));
 vi.mock("node:child_process", () => ({ execFileSync }));
+vi.mock("../scripts/package-manager.mjs", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../scripts/package-manager.mjs")>();
+  actualDetect.fn = actual.detectPackageManager;
+  detectPackageManager.mockImplementation((...args: unknown[]) =>
+    actual.detectPackageManager(
+      ...(args as Parameters<typeof actual.detectPackageManager>),
+    ),
+  );
+  return { ...actual, detectPackageManager };
+});
 vi.mock("./prompt.mjs", () => ({
   isInteractive,
   select,
@@ -35,6 +47,10 @@ vi.mock("./prompt.mjs", () => ({
   bailIfCancel,
 }));
 
+import {
+  PACKAGE_MANAGER_ASK,
+  UNKNOWN_PACKAGE_MANAGER,
+} from "../scripts/package-manager.mjs";
 import { APPLY_GLOBALS_CONFIRM, parseArgv, start } from "./grunt.mjs";
 
 const USAGE = `Usage: grunt [command]
@@ -42,13 +58,13 @@ const USAGE = `Usage: grunt [command]
 Default (no command): TTY menu; else init — full setup
 
 Commands:
-  init          Full setup: merge SoT, npm install, grunt:rulesync:generate, grunt:sync:globals:apply, grunt:rulesync:check
-  generate      npm run grunt:rulesync:generate
-  check         npm run grunt:rulesync:check
-  sync-globals  npm run grunt:sync:globals (dry-run; --apply to write)
-  purge-mcps    npm run grunt:purge:global-mcps (dry-run; --apply to write)
-  doctor        npm run grunt:doctor
-  setup         npm run grunt:setup — handheld keys/OAuth (speak, listen, google-workspace, browser)
+  init          Full setup: merge SoT, install, grunt:rulesync:generate, grunt:sync:globals:apply, grunt:rulesync:check
+  generate      run grunt:rulesync:generate
+  check         run grunt:rulesync:check
+  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)
   upgrade       Re-init: copy owned files, prune retired grunt-owned names, print reserved skills
   help          Show this help
   version       Print package version
@@ -59,6 +75,7 @@ Flags:
   --non-interactive  Same as --yes
   --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)
 `;
 
 const pkgRoot = path.join(path.dirname(fileURLToPath(import.meta.url)), "..");
@@ -88,6 +105,10 @@ describe("start", () => {
     shouldAutoSkipGlobals.mockReset();
     shouldAutoSkipGlobals.mockReturnValue(false);
     execFileSync.mockReset();
+    detectPackageManager.mockReset();
+    detectPackageManager.mockImplementation((...args: unknown[]) =>
+      (actualDetect.fn as (...a: unknown[]) => unknown)(...args),
+    );
     isInteractive.mockReset();
     isInteractive.mockReturnValue(false);
     select.mockReset();
@@ -125,7 +146,10 @@ describe("start", () => {
     process.argv = ["node", "grunt"];
     await start();
     expect(init).toHaveBeenCalledOnce();
-    expect(init).toHaveBeenCalledWith(process.cwd(), { skipGlobals: false });
+    expect(init).toHaveBeenCalledWith(process.cwd(), {
+      skipGlobals: false,
+      packageManager: "npm",
+    });
     expect(execFileSync).not.toHaveBeenCalled();
     expect(select).not.toHaveBeenCalled();
   });
@@ -134,7 +158,10 @@ describe("start", () => {
     process.argv = ["node", "grunt", "init"];
     await start();
     expect(init).toHaveBeenCalledOnce();
-    expect(init).toHaveBeenCalledWith(process.cwd(), { skipGlobals: false });
+    expect(init).toHaveBeenCalledWith(process.cwd(), {
+      skipGlobals: false,
+      packageManager: "npm",
+    });
   });
 
   it.each([
@@ -145,7 +172,10 @@ describe("start", () => {
     process.argv = argv;
     await start();
     expect(init).toHaveBeenCalledOnce();
-    expect(init).toHaveBeenCalledWith(process.cwd(), { skipGlobals: true });
+    expect(init).toHaveBeenCalledWith(process.cwd(), {
+      skipGlobals: true,
+      packageManager: "npm",
+    });
   });
 
   it.each(["--yes", "-y", "--non-interactive"])(
@@ -156,7 +186,10 @@ describe("start", () => {
       expect(isInteractive).toHaveBeenCalledOnce();
       expect(select).not.toHaveBeenCalled();
       expect(init).toHaveBeenCalledOnce();
-      expect(init).toHaveBeenCalledWith(process.cwd(), { skipGlobals: false });
+      expect(init).toHaveBeenCalledWith(process.cwd(), {
+        skipGlobals: false,
+        packageManager: "npm",
+      });
     },
   );
 
@@ -280,7 +313,10 @@ describe("start", () => {
     process.argv = ["node", "grunt", "upgrade"];
     await start();
     expect(init).toHaveBeenCalledOnce();
-    expect(init).toHaveBeenCalledWith(process.cwd(), { skipGlobals: false });
+    expect(init).toHaveBeenCalledWith(process.cwd(), {
+      skipGlobals: false,
+      packageManager: "npm",
+    });
     expect(chunks.join("")).toBe("reserved: browser tmp write-plan\n");
     expect(select).not.toHaveBeenCalled();
   });
@@ -401,20 +437,100 @@ describe("start", () => {
     );
     expect(globalsConfirm?.[0]).toMatchObject({
       message: APPLY_GLOBALS_CONFIRM,
-      initialValue: false,
+      initialValue: true,
     });
     expect(init).toHaveBeenCalledWith(
       process.cwd(),
       expect.objectContaining({
         skipGlobals: false,
         applyGlobals: true,
+        packageManager: "npm",
         onPhase: expect.any(Function),
       }),
     );
     expect(isInteractive).toHaveBeenCalledOnce();
     expect(spin.start).toHaveBeenCalledWith("merge");
-    expect(spin.stop).toHaveBeenCalled();
+    expect(spin.stop).toHaveBeenCalledWith("merge");
     expect(spin.start).toHaveBeenCalledWith("install");
+    expect(spin.stop).toHaveBeenCalledWith("install");
+  });
+
+  it("init --pm pnpm passes packageManager", async () => {
+    process.argv = ["node", "grunt", "init", "--pm", "pnpm"];
+    await start();
+    expect(init).toHaveBeenCalledWith(process.cwd(), {
+      skipGlobals: false,
+      packageManager: "pnpm",
+    });
+  });
+
+  it("generate --pm pnpm runs pnpm", async () => {
+    process.argv = ["node", "grunt", "generate", "--pm", "pnpm"];
+    await start();
+    expect(execFileSync).toHaveBeenCalledWith("pnpm", ["run", "grunt:rulesync:generate"], {
+      cwd: process.cwd(),
+      stdio: "inherit",
+    });
+  });
+
+  it("setup --pm=yarn extra args omit npm --", async () => {
+    process.argv = ["node", "grunt", "setup", "--pm=yarn", "speak"];
+    await start();
+    expect(execFileSync).toHaveBeenCalledWith("yarn", ["run", "grunt:setup", "speak"], {
+      cwd: process.cwd(),
+      stdio: "inherit",
+    });
+  });
+
+  it("invalid --pm writes usage exit 1", async () => {
+    process.argv = ["node", "grunt", "generate", "--pm", "deno"];
+    await start();
+    expect(chunks.join("")).toBe(USAGE);
+    expect(process.exitCode).toBe(1);
+    expect(execFileSync).not.toHaveBeenCalled();
+  });
+
+  it("TTY menu then unknown manager asks", async () => {
+    detectPackageManager.mockReturnValue({ manager: null, source: null });
+    isInteractive.mockReturnValue(true);
+    select.mockResolvedValueOnce("generate").mockResolvedValueOnce("pnpm");
+    process.argv = ["node", "grunt"];
+    await start();
+    expect(select).toHaveBeenCalledTimes(2);
+    expect(execFileSync).toHaveBeenCalledWith("pnpm", ["run", "grunt:rulesync:generate"], {
+      cwd: process.cwd(),
+      stdio: "inherit",
+    });
+  });
+
+  it("TTY unknown manager asks then runs the choice", async () => {
+    detectPackageManager.mockReturnValue({ manager: null, source: null });
+    isInteractive.mockReturnValue(true);
+    select.mockResolvedValue("bun");
+    process.argv = ["node", "grunt", "generate"];
+    await start();
+    expect(select).toHaveBeenCalledWith({
+      message: PACKAGE_MANAGER_ASK,
+      options: [
+        { value: "npm", label: "npm" },
+        { value: "yarn", label: "yarn" },
+        { value: "pnpm", label: "pnpm" },
+        { value: "bun", label: "bun" },
+      ],
+    });
+    expect(execFileSync).toHaveBeenCalledWith("bun", ["run", "grunt:rulesync:generate"], {
+      cwd: process.cwd(),
+      stdio: "inherit",
+    });
+  });
+
+  it("non-interactive unknown manager writes hint and skips run", async () => {
+    detectPackageManager.mockReturnValue({ manager: null, source: null });
+    process.argv = ["node", "grunt", "generate"];
+    await start();
+    expect(chunks.join("")).toBe(`${UNKNOWN_PACKAGE_MANAGER}\n`);
+    expect(process.exitCode).toBe(1);
+    expect(execFileSync).not.toHaveBeenCalled();
   });
 
   it("TTY init --skip-globals default confirm false maps to skip", async () => {
@@ -431,6 +547,7 @@ describe("start", () => {
       expect.objectContaining({
         skipGlobals: true,
         applyGlobals: false,
+        packageManager: "npm",
         onPhase: expect.any(Function),
       }),
     );
@@ -461,3 +578,24 @@ describe("parseArgv --host", () => {
     });
   });
 });
+
+describe("parseArgv --pm", () => {
+  it("pair and equals", () => {
+    expect(parseArgv(["generate", "--pm", "PNPM"])).toMatchObject({
+      cmd: "generate",
+      pm: "pnpm",
+      pmError: false,
+    });
+    expect(parseArgv(["generate", "--pm=Yarn"])).toMatchObject({
+      pm: "yarn",
+      pmError: false,
+    });
+  });
+
+  it("missing, empty, flag, and unknown are pmError", () => {
+    expect(parseArgv(["generate", "--pm"])).toMatchObject({ pmError: true });
+    expect(parseArgv(["generate", "--pm="])).toMatchObject({ pmError: true });
+    expect(parseArgv(["generate", "--pm", "--yes"])).toMatchObject({ pmError: true });
+    expect(parseArgv(["generate", "--pm", "deno"])).toMatchObject({ pmError: true });
+  });
+});