dlw-machine-setup 0.9.0 → 0.9.2

package/bin/installer.js

@@ -3948,26 +3948,29 @@ function deleteDirIfExists(absPath) {
     return false;
   }
 }
-function pruneEmptyParents(startPath, projectPath, maxLevels = 5) {
-  const removed = [];
-  let current = (0, import_path5.dirname)((0, import_path5.resolve)(startPath));
+function pruneEmptyAncestors(relPaths, projectPath) {
   const root = (0, import_path5.resolve)(projectPath);
-  for (let i = 0; i < maxLevels; i++) {
-    if (current === root) break;
-    if (!current.startsWith(root)) break;
-    if (!(0, import_fs5.existsSync)(current)) {
-      current = (0, import_path5.dirname)(current);
-      continue;
+  const ancestors = /* @__PURE__ */ new Set();
+  for (const rel of relPaths) {
+    let cur = (0, import_path5.resolve)((0, import_path5.join)(root, rel));
+    while (true) {
+      cur = (0, import_path5.dirname)(cur);
+      if (cur === root) break;
+      if (!cur.startsWith(root + import_path5.sep)) break;
+      ancestors.add(cur);
     }
+  }
+  const sorted = [...ancestors].sort((a, b) => b.length - a.length);
+  const removed = [];
+  for (const abs of sorted) {
+    if (!(0, import_fs5.existsSync)(abs)) continue;
     try {
-      const entries = (0, import_fs5.readdirSync)(current);
-      if (entries.length > 0) break;
-      (0, import_fs5.rmSync)(current, { recursive: false });
-      removed.push(current);
+      const entries = (0, import_fs5.readdirSync)(abs);
+      if (entries.length > 0) continue;
+      (0, import_fs5.rmdirSync)(abs);
+      removed.push(abs);
     } catch {
-      break;
     }
-    current = (0, import_path5.dirname)(current);
   }
   return removed;
 }
@@ -4104,14 +4107,14 @@ var fetch_contexts_default = defineStep({
       const rec = raw ?? {};
       const domains = rec.domains ?? [];
       const removed = [];
+      const relPaths = [];
       for (const domain of domains) {
-        const abs = resolveProjectPath((0, import_path6.join)("_ai-context", domain), ctx.config.projectPath);
+        const rel = (0, import_path6.join)("_ai-context", domain);
+        relPaths.push(rel);
+        const abs = resolveProjectPath(rel, ctx.config.projectPath);
         if (deleteDirIfExists(abs)) removed.push(domain);
       }
-      if (rec.contextsDirCreated) {
-        const firstAbs = resolveProjectPath((0, import_path6.join)("_ai-context", domains[0] ?? "_"), ctx.config.projectPath);
-        pruneEmptyParents(firstAbs, ctx.config.projectPath, 1);
-      }
+      pruneEmptyAncestors(relPaths, ctx.config.projectPath);
       return {
         status: "success",
         message: removed.length > 0 ? removed.join(", ") : "nothing to remove"
@@ -4704,9 +4707,8 @@ var fetch_factory_default = defineStep({
           removeMarkerBlock(abs, `<!-- ${bundle}:start -->`, `<!-- ${bundle}:end -->`);
         }
       }
-      const sortedCreated = [...rec.filesCreated ?? []].sort(
-        (a, b) => a.length - b.length
-      );
+      const created = rec.filesCreated ?? [];
+      const sortedCreated = [...created].sort((a, b) => a.length - b.length);
       for (const rel of sortedCreated) {
         const abs = resolveProjectPath(rel, projectPath);
         if (!(0, import_fs9.existsSync)(abs)) continue;
@@ -4718,6 +4720,8 @@ var fetch_factory_default = defineStep({
           summary.push(`removed ${rel}`);
         }
       }
+      const pruned = pruneEmptyAncestors(created, projectPath);
+      if (pruned.length > 0) summary.push(`pruned ${pruned.length} empty dir(s)`);
       return {
         status: "success",
         message: summary.length > 0 ? `${summary.length} action(s)` : "nothing to remove"
@@ -4892,16 +4896,13 @@ var fetch_abap_hooks_default = defineStep({
           removeMarkerBlock(abs, `<!-- ${bundle}:start -->`, `<!-- ${bundle}:end -->`);
         }
       }
-      for (const rel of rec.filesCreated ?? []) {
+      const created = rec.filesCreated ?? [];
+      for (const rel of created) {
         const abs = resolveProjectPath(rel, projectPath);
         if (isDirectorySafe(abs)) deleteDirIfExists(abs);
         else deleteFileIfExists(abs);
       }
-      const firstScript = (rec.filesCreated ?? [])[0];
-      if (firstScript) {
-        const abs = resolveProjectPath(firstScript, projectPath);
-        pruneEmptyParents(abs, projectPath, 1);
-      }
+      pruneEmptyAncestors(created, projectPath);
       return { status: "success" };
     }
   }
@@ -5239,7 +5240,10 @@ var red2 = (text) => `\x1B[31m${text}\x1B[0m`;
 var write_mcp_config_default = defineStep({
   name: "write-mcp-config",
   label: "Writing MCP configuration",
-  when: (ctx) => Object.keys(ctx.config.mcpConfig).length > 0,
+  /* Claude Code registers servers via `claude mcp add` (run-mcp-install-commands),
+   * so the project-scoped `.mcp.json` is redundant there. Cursor and GitHub
+   * Copilot have no equivalent CLI — they still need their config file. */
+  when: (ctx) => ctx.config.agent !== "claude-code" && Object.keys(ctx.config.mcpConfig).length > 0,
   execute: async (ctx) => {
     const filteredMcpConfig = getFilteredMcpConfig(ctx);
     const target = getAgentTarget(ctx.config.agent);
@@ -5368,23 +5372,24 @@ var run_mcp_install_commands_default = defineStep({
   },
   inverse: {
     label: "Unregistering MCP servers from Claude Code",
-    execute: async (raw) => {
+    execute: async (raw, ctx) => {
       const rec = raw ?? {};
       const servers = rec.registeredServers ?? [];
       if (servers.length === 0) return { status: "skipped", detail: "nothing was registered" };
       if (!isClaudeCliAvailable()) {
         return {
           status: "skipped",
-          detail: "`claude` CLI not found \u2014 leftover global registrations: " + servers.join(", ")
+          detail: "`claude` CLI not found \u2014 leftover registrations: " + servers.join(", ")
         };
       }
       const removed = [];
       const failed = [];
       for (const name of servers) {
-        const r = (0, import_child_process3.spawnSync)(`claude mcp remove ${name}`, {
+        const r = (0, import_child_process3.spawnSync)(`claude mcp remove ${name} --scope project`, {
           shell: true,
           stdio: "pipe",
-          encoding: "utf-8"
+          encoding: "utf-8",
+          cwd: ctx.config.projectPath
         });
         if (r.status === 0) removed.push(name);
         else failed.push(name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlw-machine-setup",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "One-shot installer for The Machine toolchain",
   "bin": {
     "dlw-machine-setup": "bin/installer.js"