@lovrozagar/grunt 0.6.1 → 0.6.2

package/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [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

@@ -95,8 +95,8 @@ Rulesync schema doctor is separate: `npm run grunt:rulesync:doctor`.
 
 - Merge SoT `npm install` `grunt:rulesync:generate` `grunt:sync:globals:apply` `grunt:rulesync:check`
 - `--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.

package/cli/grunt.mjs

@@ -2,7 +2,7 @@ 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"
 
 const PKG_ROOT = path.join(path.dirname(fileURLToPath(import.meta.url)), "..")
@@ -105,7 +105,7 @@ 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)
   }
 }
 
@@ -123,10 +123,9 @@ 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,

package/cli/grunt.test.ts

@@ -401,7 +401,7 @@ describe("start", () => {
     );
     expect(globalsConfirm?.[0]).toMatchObject({
       message: APPLY_GLOBALS_CONFIRM,
-      initialValue: false,
+      initialValue: true,
     });
     expect(init).toHaveBeenCalledWith(
       process.cwd(),
@@ -413,8 +413,9 @@ describe("start", () => {
     );
     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("TTY init --skip-globals default confirm false maps to skip", async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lovrozagar/grunt",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Multi-agent orchestrator SoT — deep-merge rulesync trees, product scripts, and generate pipeline into a consumer repo",
   "keywords": [
     "agents",

package/scripts/check-globals.mjs

@@ -36,7 +36,7 @@ export function checkGlobals({ home, workspaceRoot } = {}) {
   if (!homeDir) {
     return { ok: false, error: `HOME required; ${APPLY_HINT}` };
   }
-  const homeConfig = path.join(homeDir, HOME_REL);
+  const homeConfig = path.resolve(homeDir, HOME_REL);
   const homeParsed = parseTomlFile(homeConfig, "home ~/.grok/config.toml");
   if (!homeParsed.ok) {
     if (homeParsed.missing) {
@@ -54,7 +54,10 @@ export function checkGlobals({ home, workspaceRoot } = {}) {
     };
   }
 
-  const projectConfig = path.join(ws, PROJECT_REL);
+  const projectConfig = path.resolve(ws, PROJECT_REL);
+  if (projectConfig === homeConfig) {
+    return { ok: true };
+  }
   const projectParsed = parseTomlFile(projectConfig, "project .grok/config.toml");
   if (!projectParsed.ok) {
     if (projectParsed.missing) {

package/scripts/emit-mcp-policy.mjs

@@ -175,9 +175,14 @@ function isMcpToolRule(s) {
   return s === "MCPTool" || s.startsWith("MCPTool(");
 }
 
-function desiredGrok(disk, policy) {
+export function isHomeGrokConfig(workspaceRoot, home) {
+  if (!workspaceRoot || !home) return false;
+  return path.resolve(workspaceRoot, GROK_REL) === path.resolve(home, GROK_REL);
+}
+
+function desiredGrok(disk, policy, { keepHomeTables = false } = {}) {
   const obj = isPlainObject(disk) ? { ...disk } : {};
-  delete obj.features;
+  if (!keepHomeTables) delete obj.features;
   delete obj.permissions;
 
   const plugins = isPlainObject(obj.plugins) ? { ...obj.plugins } : {};
@@ -288,9 +293,9 @@ function geminiCheckOk(disk, desired) {
   return deepEqual(disk.mcpServers, desired.mcpServers);
 }
 
-function grokCheckOk(disk, desired, policy) {
+function grokCheckOk(disk, desired, policy, { keepHomeTables = false } = {}) {
   if (!isPlainObject(disk)) return false;
-  if (Object.prototype.hasOwnProperty.call(disk, "features")) return false;
+  if (!keepHomeTables && Object.prototype.hasOwnProperty.call(disk, "features")) return false;
   if (Array.isArray(disk.permissions)) return false;
   if (isPlainObject(disk.plugins) && Object.prototype.hasOwnProperty.call(disk.plugins, "deny_default")) {
     return false;
@@ -336,13 +341,14 @@ function writeOrCheck({ check, abs, nextText, diskRaw }) {
   return true;
 }
 
-export function emitMcpPolicy({ workspaceRoot, check = false } = {}) {
+export function emitMcpPolicy({ workspaceRoot, check = false, home } = {}) {
   const ws = workspaceRoot || process.cwd();
   const policy = loadPolicy(ws);
   const valid = validatePolicy(policy);
   if (!valid.ok) {
     return { ok: false, check, error: valid.error };
   }
+  const keepHomeTables = isHomeGrokConfig(ws, home || process.env.HOME);
 
   const grokAbs = path.join(ws, GROK_REL);
   const claudeAbs = path.join(ws, CLAUDE_SETTINGS_REL);
@@ -365,7 +371,7 @@ export function emitMcpPolicy({ workspaceRoot, check = false } = {}) {
   const agentsDisk = agentsRaw == null ? null : parseJsonFile(agentsRaw, {});
   const geminiDisk = geminiRaw == null ? null : parseJsonFile(geminiRaw, {});
 
-  const grokDesired = desiredGrok(grokDisk, policy);
+  const grokDesired = desiredGrok(grokDisk, policy, { keepHomeTables });
   const claudeDesired = desiredClaudeSettings(claudeDisk, policy);
   const mcpDesired = desiredMcpJson(policy);
   const codexDesired = desiredCodex(codexDisk, policy);
@@ -374,7 +380,7 @@ export function emitMcpPolicy({ workspaceRoot, check = false } = {}) {
 
   if (check) {
     const drift = [];
-    if (grokRaw == null || !grokCheckOk(grokDisk, grokDesired, policy)) drift.push(GROK_REL);
+    if (grokRaw == null || !grokCheckOk(grokDisk, grokDesired, policy, { keepHomeTables })) drift.push(GROK_REL);
     if (claudeRaw == null || !claudeCheckOk(claudeDisk, claudeDesired)) drift.push(CLAUDE_SETTINGS_REL);
     if (mcpDisk == null || !deepEqual(mcpDisk, mcpDesired)) drift.push(MCP_JSON_REL);
     const codexOk =