dlw-machine-setup 0.9.3 → 0.9.5

package/bin/installer.js

@@ -4465,20 +4465,29 @@ function runBundleV2(manifest, ctx) {
     filesPatched: [],
     markerBlockFiles: []
   };
-  const hookPatches = /* @__PURE__ */ new Map();
+  const mergePatches = /* @__PURE__ */ new Map();
   for (const asset of manifest.assets ?? []) {
-    runAsset(asset, profile, hookPatches, ctx, result);
+    runAsset(asset, profile, mergePatches, ctx, result);
     result.opsExecuted++;
   }
-  for (const [file, patch] of hookPatches) {
-    runMergeJson({ op: "merge-json", file, patch }, manifest.name, ctx, result);
-  }
   for (const op of manifest.ops ?? []) {
     if (op.when === "hooks-supported" && !profile.handlers.hook.supported) continue;
     if (op.when === "statusline-supported" && !profile.statusLineSupported) continue;
-    executeOp(substituteHookDir(op, profile), manifest.name, ctx, result);
+    const substituted = substituteHookDir(op, profile);
+    if (substituted.op === "merge-json") {
+      const existing = mergePatches.get(substituted.file);
+      mergePatches.set(
+        substituted.file,
+        deepMerge2(existing ?? {}, substituted.patch)
+      );
+    } else {
+      executeOp(substituted, manifest.name, ctx, result);
+    }
     result.opsExecuted++;
   }
+  for (const [file, patch] of mergePatches) {
+    runMergeJson({ op: "merge-json", file, patch }, manifest.name, ctx, result);
+  }
   writeGitignoreBlock(manifest, ctx, result);
   const snippet = result.instructionsSnippet;
   if (snippet) {
@@ -5568,7 +5577,13 @@ var write_state_default = defineStep({
         instructions: target.instructions,
         mcpConfig: target.mcpConfig,
         contexts: "_ai-context/",
-        factory: ctx.installed.factoryInstalled ? "factory/" : null,
+        /* Factory v2 bundle lands assets under .claude/ via the
+         * Claude Code profile (agents/, skills/, factory/, hooks/, plus
+         * a merge into .claude/settings.json). The legacy 'factory/'
+         * top-level path was retired in installer v0.8.0 when the
+         * per-agent profile dispatch took over — keeping it here would
+         * mislead the uninstall preview which reads this field. */
+        factory: ctx.installed.factoryInstalled ? ".claude/" : null,
         abapHooks: ctx.installed.abapHooksInstalled ? ".claude/hooks/" : null,
         globalConfig: (0, import_path14.join)((0, import_os2.homedir)(), ".one-shot-installer")
       }
@@ -5969,15 +5984,13 @@ async function previewAndConfirm(config, options) {
   console.log(`    ${instructionFile.padEnd(domainColWidth + 14)}${instructionMode}`);
   console.log(`    ${mcpConfigFile.padEnd(domainColWidth + 14)}${mcpMode}`);
   console.log(`    ${".gitignore".padEnd(domainColWidth + 14)}${gitignoreMode}`);
-  if (config.installFactory) {
-    const factoryExists = (0, import_fs16.existsSync)((0, import_path16.join)(config.projectPath, "factory"));
-    const factoryMode = factoryExists ? yellow2("overwrite") : green2("create");
-    console.log(`    ${"factory/".padEnd(domainColWidth + 14)}${factoryMode}`);
-  }
-  if (config.installAbapHooks) {
-    const hooksDir = (0, import_path16.join)(config.projectPath, ".claude", "hooks");
-    const hooksMode = (0, import_fs16.existsSync)(hooksDir) ? yellow2("merge") : green2("create");
-    console.log(`    ${".claude/hooks/".padEnd(domainColWidth + 14)}${hooksMode}`);
+  if (config.installFactory || config.installAbapHooks) {
+    const claudeDir = (0, import_path16.join)(config.projectPath, ".claude");
+    const claudeMode = (0, import_fs16.existsSync)(claudeDir) ? yellow2("merge") : green2("create");
+    console.log(`    ${".claude/".padEnd(domainColWidth + 14)}${claudeMode}`);
+    const settingsPath = (0, import_path16.join)(config.projectPath, ".claude", "settings.json");
+    const settingsMode = (0, import_fs16.existsSync)(settingsPath) ? yellow2("merge") : green2("create");
+    console.log(`    ${".claude/settings.json".padEnd(domainColWidth + 14)}${settingsMode}`);
   }
   if (serverEntries.length > 0) {
     console.log("");

package/package.json

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