mover-os 4.6.6 → 4.6.7

package/install.js

@@ -1156,15 +1156,17 @@ function saveUpdateManifest(manifest) {
   fs.writeFileSync(p, JSON.stringify(manifest, null, 2), "utf8");
 }
 
-function savePristineCopy(category, srcFile) {
+function savePristineCopy(category, srcFile, relPath) {
   const pristineDir = path.join(os.homedir(), ".mover", "installed", category);
-  fs.mkdirSync(pristineDir, { recursive: true });
+  const destName = relPath || path.basename(srcFile);
+  const destPath = path.join(pristineDir, destName);
+  fs.mkdirSync(path.dirname(destPath), { recursive: true });
   const content = fs.readFileSync(srcFile, "utf8").replace(/\r\n/g, "\n");
-  fs.writeFileSync(path.join(pristineDir, path.basename(srcFile)), content, "utf8");
+  fs.writeFileSync(destPath, content, "utf8");
 }
 
-function compareForUpdate(category, srcFile, destFile, manifest) {
-  const fileName = `${category}/${path.basename(srcFile)}`;
+function compareForUpdate(category, srcFile, destFile, manifest, relPath) {
+  const fileName = relPath ? `${category}/${relPath}` : `${category}/${path.basename(srcFile)}`;
   const newHash = fileContentHash(srcFile);
   const pristineHash = manifest?.files?.[fileName];
 
@@ -1312,9 +1314,9 @@ function diff3Merge(a, o, b) {
 
 // ── Auto-Merge (uses diff3 + pristine snapshots) ──────────────────────────
 
-function tryAutoMerge(category, srcFile, destFile) {
+function tryAutoMerge(category, srcFile, destFile, relPath) {
   const pristineDir = path.join(os.homedir(), ".mover", "installed", category);
-  const pristineFile = path.join(pristineDir, path.basename(srcFile));
+  const pristineFile = path.join(pristineDir, relPath || path.basename(srcFile));
   if (!fs.existsSync(pristineFile)) return { success: false, reason: "no-pristine" };
 
   const base = fs.readFileSync(pristineFile, "utf8").replace(/\r\n/g, "\n");
@@ -2475,18 +2477,21 @@ function writeMoverConfig(vaultPath, agentIds, licenseKey, opts = {}) {
 
 function installTemplateFiles(bundleDir, vaultPath) {
   const structDir = path.join(bundleDir, "src", "structure");
-  if (!fs.existsSync(structDir)) return 0;
+  if (!fs.existsSync(structDir)) return { count: 0, hashes: {} };
 
   let count = 0;
+  const hashes = {};
   const walk = (dir, rel) => {
     for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
       const srcPath = path.join(dir, entry.name);
-      const destPath = path.join(vaultPath, rel, entry.name);
+      const entryRel = path.join(rel, entry.name);
+      const destPath = path.join(vaultPath, entryRel);
 
       if (entry.isDirectory()) {
-        walk(srcPath, path.join(rel, entry.name));
+        walk(srcPath, entryRel);
       } else {
-        const relNorm = rel.replace(/\\/g, "/");
+        const relNorm = entryRel.replace(/\\/g, "/");
+        // Engine files are SACRED — never overwrite existing
         if (relNorm.includes("02_Areas") && relNorm.includes("Engine") && fs.existsSync(destPath)) {
           continue;
         }
@@ -2495,11 +2500,17 @@ function installTemplateFiles(bundleDir, vaultPath) {
           fs.copyFileSync(srcPath, destPath);
           count++;
         }
+        // Track hash and save pristine copy for ALL non-Engine template files
+        if (!(relNorm.includes("02_Areas") && relNorm.includes("Engine"))) {
+          const relKey = relNorm;
+          hashes[`templates/${relKey}`] = fileContentHash(srcPath);
+          savePristineCopy("templates", srcPath, relKey);
+        }
       }
     }
   };
   walk(structDir, "");
-  return count;
+  return { count, hashes };
 }
 
 function installWorkflows(bundleDir, destDir, selectedWorkflows) {
@@ -5325,9 +5336,9 @@ async function cmdUpdateComprehensive(opts, bundleDir, startTime) {
     statusLine("ok", "/update", "workflow synced");
   }
 
-  // Vault structure + templates (safe scaffolding)
+  // Vault structure (folders only — no file changes)
   createVaultStructure(vaultPath);
-  installTemplateFiles(bundleDir, vaultPath);
+  // NOTE: templates are now handled via smart merge below (after manifest load), NOT installTemplateFiles()
 
   // Update version marker
   fs.writeFileSync(path.join(vaultPath, ".mover-version"), `${require("./package.json").version}\n`, "utf8");
@@ -5392,6 +5403,70 @@ async function cmdUpdateComprehensive(opts, bundleDir, startTime) {
     }
   }
 
+  // ── Templates: vault scaffold files (same smart merge as workflows) ──
+  const tmplSrcDir = path.join(bundleDir, "src", "structure");
+  if (fs.existsSync(tmplSrcDir)) {
+    const walkTmplUpdate = (dir, rel) => {
+      for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+        const srcPath = path.join(dir, entry.name);
+        const entryRel = path.join(rel, entry.name);
+        if (entry.isDirectory()) {
+          walkTmplUpdate(srcPath, entryRel);
+          continue;
+        }
+        const relNorm = entryRel.replace(/\\/g, "/");
+        // Engine files are SACRED — never touch via update
+        if (relNorm.includes("02_Areas") && relNorm.includes("Engine")) continue;
+
+        const destFile = path.join(vaultPath, entryRel);
+        const result = compareForUpdate("templates", srcPath, destFile, manifest, relNorm);
+
+        switch (result.action) {
+          case "install":
+            fs.mkdirSync(path.dirname(destFile), { recursive: true });
+            fs.copyFileSync(srcPath, destFile);
+            savePristineCopy("templates", srcPath, relNorm);
+            updated.push(relNorm);
+            break;
+          case "safe-overwrite":
+            fs.copyFileSync(srcPath, destFile);
+            savePristineCopy("templates", srcPath, relNorm);
+            updated.push(relNorm);
+            break;
+          case "user-only-skip":
+            userOnly.push(relNorm);
+            break;
+          case "skip":
+            skippedFiles.push(relNorm);
+            break;
+          case "legacy-overwrite": {
+            // First update with manifest — backup then overwrite
+            const backupDir = path.join(os.homedir(), ".mover", "backups", `pre-update-${new Date().toISOString().slice(0, 10)}`);
+            fs.mkdirSync(path.join(backupDir, "templates", path.dirname(relNorm)), { recursive: true });
+            if (fs.existsSync(destFile)) fs.copyFileSync(destFile, path.join(backupDir, "templates", relNorm));
+            fs.copyFileSync(srcPath, destFile);
+            savePristineCopy("templates", srcPath, relNorm);
+            updated.push(relNorm);
+            break;
+          }
+          case "conflict": {
+            const mergeResult = tryAutoMerge("templates", srcPath, destFile, relNorm);
+            if (mergeResult.success) {
+              fs.writeFileSync(destFile, mergeResult.content, "utf8");
+              savePristineCopy("templates", srcPath, relNorm);
+              autoMerged.push(relNorm);
+            } else {
+              conflicts.push({ name: relNorm, reason: mergeResult.reason, conflictCount: mergeResult.conflictCount });
+            }
+            break;
+          }
+        }
+        newManifest.files[`templates/${relNorm}`] = result.newHash;
+      }
+    };
+    walkTmplUpdate(tmplSrcDir, "");
+  }
+
   // ── Rules: keep sentinel merge + track pristine ──
   if (changes.rules === "changed") {
     const rulesSrc = path.join(bundleDir, "src", "system", "Mover_Global_Rules.md");
@@ -6151,11 +6226,12 @@ async function main() {
   totalSteps++;
 
   // 2. Template files (runs in both modes — only creates missing files, never overwrites)
+  let tmplResult = { count: 0, hashes: {} };
   if (!skipTemplates) {
     sp = spinner("Engine templates");
-    const templatesInstalled = installTemplateFiles(bundleDir, vaultPath);
+    tmplResult = installTemplateFiles(bundleDir, vaultPath);
     await sleep(200);
-    sp.stop(`Engine templates${templatesInstalled > 0 ? dim(`  ${templatesInstalled} files`) : dim("  up to date")}`);
+    sp.stop(`Engine templates${tmplResult.count > 0 ? dim(`  ${tmplResult.count} files`) : dim("  up to date")}`);
     totalSteps++;
   }
 
@@ -6277,6 +6353,10 @@ async function main() {
         mfst.files[`hooks/${f}`] = fileContentHash(path.join(hooksDir, f));
       }
     }
+    // Template files (vault scaffolding — installTemplateFiles now returns hashes)
+    if (tmplResult && tmplResult.hashes) {
+      Object.assign(mfst.files, tmplResult.hashes);
+    }
     saveUpdateManifest(mfst);
   } catch {}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mover-os",
-  "version": "4.6.6",
+  "version": "4.6.7",
   "description": "The self-improving OS for AI agents. Turns Obsidian into an execution engine.",
   "bin": {
     "moveros": "install.js"