dlw-machine-setup 0.9.4 → 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) {

package/package.json

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