mover-os 4.5.2 → 4.5.4

package/install.js

@@ -92,17 +92,10 @@ function waveGradient(text, frame, totalFrames) {
 // ─── TUI: Alternate screen buffer ────────────────────────────────────────────
 let _inAltScreen = false;
 function enterAltScreen() {
-  if (!IS_TTY || _inAltScreen) return;
-  w("\x1b[?1049h");   // Enter alternate screen
-  w("\x1b[2J\x1b[H"); // Clear + cursor home
-  w(S.hide);
-  _inAltScreen = true;
+  // Disabled: keep output in terminal scrollback history
 }
 function exitAltScreen() {
-  if (!IS_TTY || !_inAltScreen) return;
-  w("\x1b[?1049l");   // Restore original screen
-  w(S.show);
-  _inAltScreen = false;
+  // Disabled: no alt screen to exit
 }
 function clearContent() {
   w("\x1b[2J\x1b[H"); // Clear screen + cursor to top
@@ -723,9 +716,14 @@ const DOWNLOAD_URL = "https://moveros.dev/api/download";
 
 async function downloadPayload(key) {
   const https = require("https");
-  const tmpDir = path.join(os.tmpdir(), `moveros-${Date.now()}`);
-  fs.mkdirSync(tmpDir, { recursive: true });
-  const tarPath = path.join(tmpDir, "payload.tar.gz");
+  const moverDir = path.join(os.homedir(), ".mover");
+  fs.mkdirSync(moverDir, { recursive: true, mode: 0o700 });
+  // Clean old staged src/ before extracting fresh
+  const stagedSrc = path.join(moverDir, "src");
+  if (fs.existsSync(stagedSrc)) {
+    fs.rmSync(stagedSrc, { recursive: true, force: true });
+  }
+  const tarPath = path.join(moverDir, "payload.tar.gz");
 
   // Download tarball
   await new Promise((resolve, reject) => {
@@ -785,9 +783,9 @@ async function downloadPayload(key) {
     req.end();
   });
 
-  // Extract tarball
+  // Extract tarball into ~/.mover/ (produces ~/.mover/src/)
   try {
-    execSync(`tar -xzf "${tarPath}" -C "${tmpDir}"`, { stdio: "ignore" });
+    execSync(`tar -xzf "${tarPath}" -C "${moverDir}"`, { stdio: "ignore" });
   } catch {
     throw new Error("Failed to extract payload. Ensure 'tar' is available.");
   }
@@ -795,7 +793,7 @@ async function downloadPayload(key) {
   // Clean up tarball
   try { fs.unlinkSync(tarPath); } catch {}
 
-  return tmpDir;
+  return moverDir;
 }
 
 // ─── Path helpers ────────────────────────────────────────────────────────────
@@ -956,12 +954,15 @@ function detectChanges(bundleDir, vaultPath, selectedAgentIds) {
   const home = os.homedir();
   const result = { workflows: [], hooks: [], rules: null, templates: [], skills: [], statusline: "unchanged" };
 
+  // Expand selection IDs to target IDs (e.g. "gemini-cli" → includes "antigravity")
+  const targetIds = expandTargetIds(selectedAgentIds);
+
   // --- Workflows: compare source vs first installed destination ---
   const wfSrc = path.join(bundleDir, "src", "workflows");
   const wfDests = [
-    selectedAgentIds.includes("claude-code") && path.join(home, ".claude", "commands"),
-    selectedAgentIds.includes("cursor") && path.join(home, ".cursor", "commands"),
-    selectedAgentIds.includes("antigravity") && path.join(home, ".gemini", "antigravity", "global_workflows"),
+    targetIds.includes("claude-code") && path.join(home, ".claude", "commands"),
+    targetIds.includes("cursor") && path.join(home, ".cursor", "commands"),
+    targetIds.includes("antigravity") && path.join(home, ".gemini", "antigravity", "global_workflows"),
   ].filter(Boolean);
   const wfDest = wfDests.find((d) => fs.existsSync(d));
 
@@ -984,7 +985,7 @@ function detectChanges(bundleDir, vaultPath, selectedAgentIds) {
   // --- Hooks: compare with CRLF normalization ---
   const hooksSrc = path.join(bundleDir, "src", "hooks");
   const hooksDest = path.join(home, ".claude", "hooks");
-  if (fs.existsSync(hooksSrc) && selectedAgentIds.includes("claude-code")) {
+  if (fs.existsSync(hooksSrc) && targetIds.includes("claude-code")) {
     for (const file of fs.readdirSync(hooksSrc).filter((f) => f.endsWith(".sh") || f.endsWith(".md"))) {
       const srcContent = fs.readFileSync(path.join(hooksSrc, file), "utf8")
         .replace(/\r\n/g, "\n").replace(/\r/g, "\n");
@@ -1005,9 +1006,9 @@ function detectChanges(bundleDir, vaultPath, selectedAgentIds) {
   // --- Rules: compare source vs first installed destination ---
   const rulesSrc = path.join(bundleDir, "src", "system", "Mover_Global_Rules.md");
   const rulesDests = [
-    selectedAgentIds.includes("claude-code") && path.join(home, ".claude", "CLAUDE.md"),
-    selectedAgentIds.includes("cursor") && path.join(home, ".cursor", "rules", "mover-os.mdc"),
-    selectedAgentIds.includes("gemini-cli") && path.join(home, ".gemini", "GEMINI.md"),
+    targetIds.includes("claude-code") && path.join(home, ".claude", "CLAUDE.md"),
+    targetIds.includes("cursor") && path.join(home, ".cursor", "rules", "mover-os.mdc"),
+    targetIds.includes("gemini-cli") && path.join(home, ".gemini", "GEMINI.md"),
   ].filter(Boolean);
   const rulesDest = rulesDests.find((d) => fs.existsSync(d));
   if (fs.existsSync(rulesSrc) && rulesDest) {
@@ -1049,9 +1050,9 @@ function detectChanges(bundleDir, vaultPath, selectedAgentIds) {
   // --- Skills: compare source vs installed ---
   const skillsSrc = path.join(bundleDir, "src", "skills");
   const skillsDests = [
-    selectedAgentIds.includes("claude-code") && path.join(home, ".claude", "skills"),
-    selectedAgentIds.includes("cursor") && path.join(home, ".cursor", "skills"),
-    selectedAgentIds.includes("cline") && path.join(home, ".cline", "skills"),
+    targetIds.includes("claude-code") && path.join(home, ".claude", "skills"),
+    targetIds.includes("cursor") && path.join(home, ".cursor", "skills"),
+    targetIds.includes("cline") && path.join(home, ".cline", "skills"),
   ].filter(Boolean);
   const skillsDest = skillsDests.find((d) => fs.existsSync(d));
   if (fs.existsSync(skillsSrc) && skillsDest) {
@@ -1081,17 +1082,94 @@ function detectChanges(bundleDir, vaultPath, selectedAgentIds) {
   // --- Statusline ---
   const slSrc = path.join(bundleDir, "src", "hooks", "statusline.js");
   const slDest = path.join(home, ".claude", "statusline.js");
-  if (fs.existsSync(slSrc) && fs.existsSync(slDest) && selectedAgentIds.includes("claude-code")) {
+  if (fs.existsSync(slSrc) && fs.existsSync(slDest) && targetIds.includes("claude-code")) {
     const srcSl = fs.readFileSync(slSrc, "utf8").replace(/\r\n/g, "\n");
     const destSl = fs.readFileSync(slDest, "utf8").replace(/\r\n/g, "\n");
     result.statusline = srcSl === destSl ? "unchanged" : "changed";
-  } else if (fs.existsSync(slSrc) && !fs.existsSync(slDest) && selectedAgentIds.includes("claude-code")) {
+  } else if (fs.existsSync(slSrc) && !fs.existsSync(slDest) && targetIds.includes("claude-code")) {
     result.statusline = "new";
   }
 
   return result;
 }
 
+function autoBackupBeforeUpdate(changes, selectedAgentIds, vaultPath) {
+  const home = os.homedir();
+  const targetIds = expandTargetIds(selectedAgentIds);
+  const now = new Date();
+  const ts = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-${String(now.getDate()).padStart(2, "0")}_${String(now.getHours()).padStart(2, "0")}${String(now.getMinutes()).padStart(2, "0")}`;
+  const backupRoot = path.join(home, ".mover", "backups", `pre-update-${ts}`);
+  let backed = 0;
+
+  const backup = (src, relPath) => {
+    if (!fs.existsSync(src)) return;
+    const dest = path.join(backupRoot, relPath);
+    fs.mkdirSync(path.dirname(dest), { recursive: true });
+    try { fs.copyFileSync(src, dest); backed++; } catch {}
+  };
+
+  // Workflows
+  const wfDests = [
+    targetIds.includes("claude-code") && path.join(home, ".claude", "commands"),
+    targetIds.includes("cursor") && path.join(home, ".cursor", "commands"),
+    targetIds.includes("antigravity") && path.join(home, ".gemini", "antigravity", "global_workflows"),
+  ].filter(Boolean);
+  for (const f of changes.workflows.filter((x) => x.status === "changed")) {
+    for (const dir of wfDests) {
+      backup(path.join(dir, f.file), path.join("workflows", path.basename(dir), f.file));
+    }
+  }
+
+  // Hooks
+  if (targetIds.includes("claude-code")) {
+    for (const f of changes.hooks.filter((x) => x.status === "changed")) {
+      backup(path.join(home, ".claude", "hooks", f.file), path.join("hooks", f.file));
+    }
+  }
+
+  // Rules
+  if (changes.rules === "changed") {
+    const rulesDests = [
+      targetIds.includes("claude-code") && path.join(home, ".claude", "CLAUDE.md"),
+      targetIds.includes("gemini-cli") && path.join(home, ".gemini", "GEMINI.md"),
+      targetIds.includes("cursor") && path.join(home, ".cursor", "rules", "mover-os.mdc"),
+    ].filter(Boolean);
+    for (const p of rulesDests) {
+      backup(p, path.join("rules", path.basename(p)));
+    }
+  }
+
+  // Skills
+  const skillsDests = [
+    targetIds.includes("claude-code") && path.join(home, ".claude", "skills"),
+    targetIds.includes("cursor") && path.join(home, ".cursor", "skills"),
+    targetIds.includes("cline") && path.join(home, ".cline", "skills"),
+  ].filter(Boolean);
+  for (const f of (changes.skills || []).filter((x) => x.status === "changed")) {
+    for (const dir of skillsDests) {
+      const skillFile = path.join(dir, f.file, "SKILL.md");
+      if (fs.existsSync(skillFile)) {
+        backup(skillFile, path.join("skills", f.file, path.basename(dir), "SKILL.md"));
+      }
+    }
+  }
+
+  // Statusline
+  if (changes.statusline === "changed" && targetIds.includes("claude-code")) {
+    backup(path.join(home, ".claude", "statusline.js"), "statusline.js");
+  }
+
+  // Templates
+  for (const f of changes.templates.filter((x) => x.status === "changed")) {
+    backup(path.join(vaultPath, f.file), path.join("templates", f.file));
+  }
+
+  if (backed > 0) {
+    statusLine("ok", "Auto-backup", `${backed} files → ${dim(backupRoot)}`);
+  }
+  return backed;
+}
+
 function countChanges(changes) {
   let n = 0;
   n += changes.workflows.filter((f) => f.status !== "unchanged").length;
@@ -1627,6 +1705,17 @@ const AGENTS = AGENT_SELECTIONS.map((s) => ({
   detect: AGENT_REGISTRY[s.targets[0]].detect,
 }));
 
+// Expand selection IDs to install target IDs (e.g. "gemini-cli" → ["gemini-cli", "antigravity"])
+function expandTargetIds(selectionIds) {
+  const result = [];
+  for (const id of selectionIds) {
+    const sel = AGENT_SELECTIONS.find((s) => s.id === id);
+    if (sel) { for (const t of sel.targets) result.push(t); }
+    else result.push(id);
+  }
+  return [...new Set(result)];
+}
+
 // ─── Utility functions ──────────────────────────────────────────────────────
 function cmdExists(cmd) {
   try {
@@ -1991,19 +2080,19 @@ async function fetchPrayerTimes(city, country) {
   const https = require("https");
   const year = new Date().getFullYear();
   const allTimes = {};
+  let failedMonths = 0;
 
   for (let month = 1; month <= 12; month++) {
     try {
       const url = `https://api.aladhan.com/v1/calendarByCity/${year}/${month}?city=${encodeURIComponent(city)}&country=${encodeURIComponent(country)}&method=15`;
       const body = await new Promise((resolve, reject) => {
-        const req = https.request(url, { method: "GET", timeout: 10000 }, (res) => {
+        const req = https.get(url, { timeout: 10000 }, (res) => {
           let data = "";
           res.on("data", (c) => (data += c));
           res.on("end", () => resolve(data));
         });
         req.on("error", reject);
         req.on("timeout", () => { req.destroy(); reject(new Error("Timeout")); });
-        req.end();
       });
 
       const json = JSON.parse(body);
@@ -2020,9 +2109,11 @@ async function fetchPrayerTimes(city, country) {
             isha: t.Isha.replace(/\s*\(.*\)/, ""),
           };
         }
+      } else {
+        failedMonths++;
       }
     } catch {
-      // Skip failed months — partial data is still useful
+      failedMonths++;
     }
   }
 
@@ -2113,6 +2204,8 @@ function writeMoverConfig(vaultPath, agentIds, licenseKey, opts = {}) {
       if (existing.settings) config.settings = { ...existing.settings };
       // Preserve prayer_times fallback
       if (existing.prayer_times) config.prayer_times = existing.prayer_times;
+      // Preserve frecency data
+      if (existing.cli_usage) config.cli_usage = existing.cli_usage;
       config.updatedAt = new Date().toISOString();
     } catch {}
   }
@@ -3031,7 +3124,8 @@ async function cmdDoctor(opts) {
   // Per-agent checks
   barLn();
   barLn(dim("  Agents:"));
-  const cfgData = fs.existsSync(cfg) ? JSON.parse(fs.readFileSync(cfg, "utf8")) : {};
+  let cfgData = {};
+  if (fs.existsSync(cfg)) { try { cfgData = JSON.parse(fs.readFileSync(cfg, "utf8")); } catch { statusLine("warn", "Config", "corrupt JSON"); } }
   const installedAgents = cfgData.agents || [];
   if (installedAgents.length === 0) {
     barLn(dim("    No agents recorded in config."));
@@ -3057,7 +3151,7 @@ async function cmdDoctor(opts) {
       const hasCmds = fs.existsSync(cp) && fs.readdirSync(cp).length > 0;
       checks.push(hasCmds ? "commands" : dim("no commands"));
     }
-    const allOk = checks.every((c) => !c.includes("missing"));
+    const allOk = checks.every((c) => c === strip(c)); // styled text = problem
     statusLine(allOk ? "ok" : "warn", `  ${reg.name}`, checks.join(", "));
   }
 
@@ -3102,7 +3196,7 @@ async function cmdPulse(opts) {
     const focusMatch = ac.match(/\*\*Focus:\*\*\s*(.+)/i) || ac.match(/Single Test:\s*(.+)/i);
     if (focusMatch) focus = focusMatch[1].trim();
     // Blockers
-    const blockerSection = ac.match(/##.*Blocker[s]?[\s\S]*?(?=\n##|\n---|\Z)/i);
+    const blockerSection = ac.match(/##.*Blocker[s]?[\s\S]*?(?=\n##|\n---|$)/i);
     if (blockerSection) {
       const lines = blockerSection[0].split("\n").filter((l) => l.trim().startsWith("-") || l.trim().startsWith("*"));
       blockers = lines.map((l) => l.replace(/^[\s*-]+/, "").trim()).filter(Boolean).slice(0, 3);
@@ -3491,7 +3585,7 @@ async function cmdReplay(opts) {
   const daily = fs.readFileSync(dailyPath, "utf8");
 
   // Extract session log entries
-  const logMatch = daily.match(/##\s*Session Log[\s\S]*?(?=\n## [^#]|\Z)/i);
+  const logMatch = daily.match(/##\s*Session Log[\s\S]*?(?=\n## [^#]|$)/i);
   if (!logMatch) {
     barLn(dim("  No session log found in this Daily Note."));
     return;
@@ -3766,27 +3860,29 @@ async function cmdPrayer(opts) {
     barLn();
     const city = await textInput({ label: "City", placeholder: "London" });
     if (city === null) return;
+    if (!city.trim()) { barLn(yellow("  City cannot be empty.")); return; }
     const country = await textInput({ label: "Country", placeholder: "United Kingdom" });
     if (country === null) return;
+    if (!country.trim()) { barLn(yellow("  Country cannot be empty.")); return; }
     barLn();
 
-    if (city && country) {
-      const sp = spinner("Fetching prayer times (12 months)");
-      const result = await fetchPrayerTimes(city.trim(), country.trim());
-      if (result && Object.keys(result.times).length > 0) {
-        fs.writeFileSync(ttPath, JSON.stringify(result, null, 2), "utf8");
-        sp.stop(`Saved ${Object.keys(result.times).length} days`);
-        barLn(dim("  These are calculated adhan times, not mosque jama'ah times."));
-        barLn(dim("  For your mosque's specific times, choose 'Paste mosque timetable'."));
-      } else {
-        sp.stop(yellow("Could not fetch. Check city/country spelling."));
-      }
+    const sp = spinner("Fetching prayer times (12 months)");
+    const result = await fetchPrayerTimes(city.trim(), country.trim());
+    if (result && Object.keys(result.times).length > 0) {
+      fs.writeFileSync(ttPath, JSON.stringify(result, null, 2), "utf8");
+      sp.stop(`Saved ${Object.keys(result.times).length} days`);
+      barLn(dim("  These are calculated adhan times, not mosque jama'ah times."));
+      barLn(dim("  For your mosque's specific times, choose 'Paste mosque timetable'."));
+
+      // Auto-enable
+      if (!cfg.settings) cfg.settings = {};
+      cfg.settings.show_prayer_times = true;
+      fs.writeFileSync(cfgPath, JSON.stringify(cfg, null, 2), "utf8");
+    } else {
+      sp.stop(yellow("Could not fetch prayer times."));
+      barLn(yellow("  Check the city/country spelling and try again."));
+      barLn(dim("  Example: City = London, Country = United Kingdom"));
     }
-
-    // Auto-enable
-    if (!cfg.settings) cfg.settings = {};
-    cfg.settings.show_prayer_times = true;
-    fs.writeFileSync(cfgPath, JSON.stringify(cfg, null, 2), "utf8");
   } else if (choice === "paste") {
     barLn();
     barLn(dim("  Paste your mosque's timetable below."));
@@ -4046,10 +4142,11 @@ async function cmdRestore(opts) {
   const archivesDir = path.join(vault, "04_Archives");
   if (!fs.existsSync(archivesDir)) { barLn(yellow("  No archives found.")); return; }
 
+  const backupPrefixes = ["Backup_", "Engine_Backup_", "Areas_Backup_", "Agent_Backup_"];
   const backups = fs.readdirSync(archivesDir)
     .filter((d) => {
       const full = path.join(archivesDir, d);
-      return fs.statSync(full).isDirectory() && (d.startsWith("Backup_") || d.startsWith("Engine_Backup_"));
+      return fs.statSync(full).isDirectory() && backupPrefixes.some((p) => d.startsWith(p));
     })
     .sort()
     .reverse();
@@ -4077,25 +4174,67 @@ async function cmdRestore(opts) {
 
   const backupPath = path.join(archivesDir, selected);
 
-  // Check for engine dir in backup
-  const engPath = path.join(backupPath, "engine");
-  if (fs.existsSync(engPath)) {
-    const engineDir = path.join(vault, "02_Areas", "Engine");
-    let restored = 0;
-    for (const f of fs.readdirSync(engPath).filter((f) => fs.statSync(path.join(engPath, f)).isFile())) {
-      fs.copyFileSync(path.join(engPath, f), path.join(engineDir, f));
-      restored++;
+  let totalRestored = 0;
+
+  if (selected.startsWith("Areas_Backup_")) {
+    // Areas backup: restore entire 02_Areas folder
+    const areasTarget = path.join(vault, "02_Areas");
+    copyDirRecursive(backupPath, areasTarget);
+    statusLine("ok", "Areas", "folder restored");
+    totalRestored++;
+  } else if (selected.startsWith("Agent_Backup_")) {
+    // Agent backup: restore rules/skills per agent
+    let agentCount = 0;
+    for (const agDir of fs.readdirSync(backupPath).filter((d) => fs.statSync(path.join(backupPath, d)).isDirectory())) {
+      const reg = AGENT_REGISTRY[agDir];
+      if (!reg) continue;
+      const srcDir = path.join(backupPath, agDir);
+      // Restore rules file
+      if (reg.rules && reg.rules.dest) {
+        const rulesFile = fs.readdirSync(srcDir).find((f) => !f.startsWith("skills") && fs.statSync(path.join(srcDir, f)).isFile());
+        if (rulesFile) {
+          try {
+            const dest = reg.rules.dest(vault);
+            fs.mkdirSync(path.dirname(dest), { recursive: true });
+            fs.copyFileSync(path.join(srcDir, rulesFile), dest);
+            agentCount++;
+          } catch {}
+        }
+      }
+      // Restore skills directory
+      const skillsSrc = path.join(srcDir, "skills");
+      if (fs.existsSync(skillsSrc) && reg.skills && reg.skills.dest) {
+        try {
+          copyDirRecursive(skillsSrc, reg.skills.dest(vault));
+          agentCount++;
+        } catch {}
+      }
     }
-    statusLine("ok", "Engine", `${restored} files restored`);
+    statusLine("ok", "Agents", `${agentCount} items restored`);
+    totalRestored = agentCount;
   } else {
-    // Legacy backup format (files directly in backup dir)
-    const engineDir = path.join(vault, "02_Areas", "Engine");
-    let restored = 0;
-    for (const f of fs.readdirSync(backupPath).filter((f) => f.endsWith(".md") && f !== ".backup-manifest.json")) {
-      fs.copyFileSync(path.join(backupPath, f), path.join(engineDir, f));
-      restored++;
+    // Engine backup (Engine_Backup_ or legacy Backup_)
+    const engPath = path.join(backupPath, "engine");
+    if (fs.existsSync(engPath)) {
+      const engineDir = path.join(vault, "02_Areas", "Engine");
+      let restored = 0;
+      for (const f of fs.readdirSync(engPath).filter((f) => fs.statSync(path.join(engPath, f)).isFile())) {
+        fs.copyFileSync(path.join(engPath, f), path.join(engineDir, f));
+        restored++;
+      }
+      statusLine("ok", "Engine", `${restored} files restored`);
+      totalRestored = restored;
+    } else {
+      // Legacy backup format (files directly in backup dir)
+      const engineDir = path.join(vault, "02_Areas", "Engine");
+      let restored = 0;
+      for (const f of fs.readdirSync(backupPath).filter((f) => f.endsWith(".md") && f !== ".backup-manifest.json")) {
+        fs.copyFileSync(path.join(backupPath, f), path.join(engineDir, f));
+        restored++;
+      }
+      if (restored > 0) statusLine("ok", "Engine", `${restored} files restored`);
+      totalRestored = restored;
     }
-    if (restored > 0) statusLine("ok", "Engine", `${restored} files restored`);
   }
 
   barLn();
@@ -4597,7 +4736,12 @@ async function cmdUpdateComprehensive(opts, bundleDir, startTime) {
         barLn(`${yellow("CLI update available:")} ${dim(localVer)} ${dim("\u2192")} ${green(npmVer)}`);
         const sp = spinner("Updating CLI");
         try {
-          execSync("npm i -g mover-os", { stdio: "ignore", timeout: 60000 });
+          try {
+            execSync("npm i -g mover-os", { stdio: "ignore", timeout: 60000 });
+          } catch {
+            // Retry with sudo (macOS/Linux where global npm needs root)
+            execSync("sudo npm i -g mover-os", { stdio: "ignore", timeout: 60000 });
+          }
           sp.stop(`CLI updated to ${npmVer}`);
           barLn(dim("  Re-running with updated CLI..."));
           barLn();
@@ -4609,7 +4753,7 @@ async function cmdUpdateComprehensive(opts, bundleDir, startTime) {
           process.exit(result.status || 0);
         } catch (e) {
           sp.stop(yellow(`CLI self-update failed: ${e.message}`));
-          barLn(dim("  Continuing with current version..."));
+          barLn(dim("  Try: sudo npm i -g mover-os"));
         }
       } else {
         statusLine("ok", "CLI", `up to date (${localVer})`);
@@ -4678,123 +4822,54 @@ async function cmdUpdateComprehensive(opts, bundleDir, startTime) {
     newVer = pkg.version || newVer;
   } catch {}
 
-  // Quick mode: skip interactive steps
+  // ── Stage only — no direct file overwrite ──
+  // Files are staged at ~/.mover/src/. The /update AI workflow handles
+  // the actual apply with merge support for user customizations.
+
+  const detectedAgents = AGENTS.filter((a) => a.detect());
+  const selectedIds = detectedAgents.map((a) => a.id);
+
+  // Quick mode: force-apply (CI/headless — no user customizations to protect)
   if (isQuick) {
-    const detectedAgents = AGENTS.filter((a) => a.detect());
     if (detectedAgents.length === 0) { outro(red("No AI agents detected.")); process.exit(1); }
-    const selectedIds = detectedAgents.map((a) => a.id);
     const changes = detectChanges(bundleDir, vaultPath, selectedIds);
     const totalChanged = countChanges(changes);
     displayChangeSummary(changes, installedVer, newVer);
     if (totalChanged === 0) { outro(green("Already up to date.")); return; }
+    autoBackupBeforeUpdate(changes, selectedIds, vaultPath);
     barLn(bold("Updating..."));
     barLn();
     createVaultStructure(vaultPath);
     installTemplateFiles(bundleDir, vaultPath);
     const writtenFiles = new Set();
-    const skillOpts = { install: true, categories: null, workflows: null };
+    const skillOpts = { install: true, categories: null, workflows: null, statusLine: changes.statusline !== "unchanged" };
     for (const agent of detectedAgents) {
-      const fn = AGENT_INSTALLERS[agent.id];
-      if (!fn) continue;
-      const sp = spinner(agent.name);
-      const steps = fn(bundleDir, vaultPath, skillOpts, writtenFiles, agent.id);
-      await sleep(200);
-      sp.stop(steps.length > 0 ? `${agent.name}  ${dim(steps.join(", "))}` : `${agent.name}  ${dim("configured")}`);
+      const sel = AGENT_SELECTIONS.find((s) => s.id === agent.id);
+      const targets = sel ? sel.targets : [agent.id];
+      for (const targetId of targets) {
+        const fn = AGENT_INSTALLERS[targetId];
+        if (!fn) continue;
+        const targetReg = AGENT_REGISTRY[targetId];
+        const displayName = targetReg ? targetReg.name : agent.name;
+        const sp = spinner(displayName);
+        const steps = fn(bundleDir, vaultPath, skillOpts, writtenFiles, targetId);
+        await sleep(200);
+        sp.stop(steps.length > 0 ? `${displayName}  ${dim(steps.join(", "))}` : `${displayName}  ${dim("configured")}`);
+      }
     }
     fs.writeFileSync(path.join(vaultPath, ".mover-version"), `${require("./package.json").version}\n`, "utf8");
     writeMoverConfig(vaultPath, selectedIds);
     barLn();
     const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
-    outro(`${green("Done.")} ${totalChanged} files updated in ${elapsed}s. Run ${bold("/update")} if version bumped.`);
+    outro(`${green("Done.")} ${totalChanged} files updated in ${elapsed}s.`);
     return;
   }
 
+  // ── Interactive mode: stage + summary ──
   // Step 4: What's New
   showWhatsNew(installedVer, newVer);
 
-  // Step 5: Backup Offer
-  const engine = detectEngineFiles(vaultPath);
-  if (engine.exists) {
-    question("Back up before updating?");
-    barLn(dim("  Select what to save. Esc to skip."));
-    barLn();
-    const backupItems = [
-      { id: "engine", name: "Engine files", tier: "Identity, Strategy, Goals, Context" },
-    ];
-    if (fs.existsSync(path.join(vaultPath, "02_Areas"))) {
-      backupItems.push({ id: "areas", name: "Full Areas folder", tier: "Everything in 02_Areas/" });
-    }
-    const detectedForBackup = AGENTS.filter((a) => a.detect()).map((a) => a.id);
-    if (detectedForBackup.length > 0) {
-      backupItems.push({ id: "agents", name: "Agent configs", tier: `Rules, skills from ${detectedForBackup.length} agent(s)` });
-    }
-    const backupChoices = await interactiveSelect(backupItems, { multi: true, preSelected: ["engine"] });
-    if (backupChoices && backupChoices.length > 0) {
-      const now = new Date();
-      const ts = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-${String(now.getDate()).padStart(2, "0")}_${String(now.getHours()).padStart(2, "0")}${String(now.getMinutes()).padStart(2, "0")}`;
-      const archivesDir = path.join(vaultPath, "04_Archives");
-      if (backupChoices.includes("engine")) {
-        const engineDir = path.join(vaultPath, "02_Areas", "Engine");
-        const backupDir = path.join(archivesDir, `Engine_Backup_${ts}`);
-        try {
-          fs.mkdirSync(backupDir, { recursive: true });
-          let backed = 0;
-          for (const f of fs.readdirSync(engineDir).filter(f => fs.statSync(path.join(engineDir, f)).isFile())) {
-            fs.copyFileSync(path.join(engineDir, f), path.join(backupDir, f));
-            backed++;
-          }
-          statusLine("ok", "Backed up", `${backed} Engine files`);
-        } catch (err) { barLn(yellow(`  Backup failed: ${err.message}`)); }
-      }
-      if (backupChoices.includes("areas")) {
-        try {
-          copyDirRecursive(path.join(vaultPath, "02_Areas"), path.join(archivesDir, `Areas_Backup_${ts}`));
-          statusLine("ok", "Backed up", "Full Areas folder");
-        } catch (err) { barLn(yellow(`  Areas backup failed: ${err.message}`)); }
-      }
-      if (backupChoices.includes("agents")) {
-        try {
-          const agentBackupDir = path.join(archivesDir, `Agent_Backup_${ts}`);
-          fs.mkdirSync(agentBackupDir, { recursive: true });
-          let agentsBacked = 0;
-          for (const ag of AGENTS.filter((a) => a.detect())) {
-            const agDir = path.join(agentBackupDir, ag.id);
-            fs.mkdirSync(agDir, { recursive: true });
-            for (const cp of (ag.configPaths || [])) {
-              if (fs.existsSync(cp.src)) {
-                try { fs.copyFileSync(cp.src, path.join(agDir, path.basename(cp.src))); agentsBacked++; } catch {}
-              }
-            }
-          }
-          statusLine("ok", "Backed up", `${agentsBacked} agent config files`);
-        } catch (err) { barLn(yellow(`  Agent backup failed: ${err.message}`)); }
-      }
-    }
-    barLn();
-  }
-
-  // Step 6: Agent Management
-  const visibleAgents = AGENTS.filter((a) => !a.hidden);
-  const detectedIds = visibleAgents.filter((a) => a.detect()).map((a) => a.id);
-  const cfgPath = path.join(os.homedir(), ".mover", "config.json");
-  let currentAgents = [];
-  if (fs.existsSync(cfgPath)) {
-    try { currentAgents = JSON.parse(fs.readFileSync(cfgPath, "utf8")).agents || []; } catch {}
-  }
-  const preSelectedAgents = [...new Set([...detectedIds, ...currentAgents])];
-
-  question(`Agents ${dim("(add or remove)")}`);
-  barLn();
-  const agentItems = visibleAgents.map((a) => ({
-    ...a,
-    _detected: detectedIds.includes(a.id),
-  }));
-  const selectedIds = await interactiveSelect(agentItems, { multi: true, preSelected: preSelectedAgents });
-  if (!selectedIds || selectedIds.length === 0) return;
-  const selectedAgents = AGENTS.filter((a) => selectedIds.includes(a.id));
-  barLn();
-
-  // Step 7: Change Detection
+  // Step 5: Change Detection (compare staged vs installed)
   const changes = detectChanges(bundleDir, vaultPath, selectedIds);
   const totalChanged = countChanges(changes);
   question("Change Summary");
@@ -4804,121 +4879,21 @@ async function cmdUpdateComprehensive(opts, bundleDir, startTime) {
   if (totalChanged === 0) {
     barLn(green("  Already up to date."));
     barLn();
-    const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
-    outro(`${green("Done.")} No changes needed. ${dim(`(${elapsed}s)`)}`);
+    outro(green("No changes needed. Engine files may still need migration — run /update."));
     return;
   }
 
-  const applyChoice = await interactiveSelect([
-    { id: "all", name: "Yes, update all changed files", tier: "" },
-    { id: "select", name: "Select individually", tier: "" },
-    { id: "cancel", name: "Cancel", tier: "" },
-  ], { multi: false, defaultIndex: 0 });
-  if (!applyChoice || applyChoice === "cancel") { outro("Cancelled."); return; }
-
-  let selectedWorkflows = null;
-  let skipHooks = false, skipRules = false, skipTemplates = false;
-  if (applyChoice === "select") {
-    const changedItems = [];
-    const changedPreSelected = [];
-    for (const f of changes.workflows.filter((x) => x.status !== "unchanged")) {
-      const id = `wf:${f.file}`;
-      changedItems.push({ id, name: `/${f.file.replace(".md", "")}`, tier: dim(f.status === "new" ? "new" : "changed") });
-      changedPreSelected.push(id);
-    }
-    for (const f of changes.hooks.filter((x) => x.status !== "unchanged")) {
-      const id = `hook:${f.file}`;
-      changedItems.push({ id, name: f.file, tier: dim(f.status === "new" ? "new hook" : "hook") });
-      changedPreSelected.push(id);
-    }
-    if (changes.rules === "changed") {
-      changedItems.push({ id: "rules", name: "Global Rules", tier: dim("rules") });
-      changedPreSelected.push("rules");
-    }
-    for (const f of changes.templates.filter((x) => x.status !== "unchanged")) {
-      const id = `tmpl:${f.file}`;
-      changedItems.push({ id, name: f.file.replace(/\\/g, "/"), tier: dim(f.status === "new" ? "new" : "changed") });
-      changedPreSelected.push(id);
-    }
-    if (changedItems.length > 0) {
-      question("Select files to update");
-      barLn();
-      const selectedFileIds = await interactiveSelect(changedItems, { multi: true, preSelected: changedPreSelected });
-      if (!selectedFileIds) return;
-      const selectedWfFiles = selectedFileIds.filter((id) => id.startsWith("wf:")).map((id) => id.slice(3));
-      if (selectedWfFiles.length < changes.workflows.filter((x) => x.status !== "unchanged").length) {
-        selectedWorkflows = new Set(selectedWfFiles);
-      }
-      skipHooks = !selectedFileIds.some((id) => id.startsWith("hook:"));
-      skipRules = !selectedFileIds.includes("rules");
-      skipTemplates = !selectedFileIds.some((id) => id.startsWith("tmpl:"));
-    }
-  }
-
-  // Step 8: Apply Changes (with progress animation)
+  // Stage confirmation
   barLn();
-  question(bold("Applying updates"));
+  statusLine("ok", "Staged", `${totalChanged} updated files at ${dim("~/.mover/src/")}`);
   barLn();
-
-  const installSteps = [];
-  installSteps.push({ label: "Vault structure", fn: async () => { createVaultStructure(vaultPath); await sleep(100); } });
-  if (!skipTemplates) {
-    installSteps.push({ label: "Template files", fn: async () => { installTemplateFiles(bundleDir, vaultPath); await sleep(100); } });
-  }
-
-  const writtenFiles = new Set();
-  const skillOpts = { install: true, categories: null, workflows: selectedWorkflows, skipHooks, skipRules, skipTemplates };
-  for (const agent of selectedAgents) {
-    const sel = AGENT_SELECTIONS.find((s) => s.id === agent.id);
-    const targets = sel ? sel.targets : [agent.id];
-    for (const targetId of targets) {
-      const fn = AGENT_INSTALLERS[targetId];
-      if (!fn) continue;
-      const targetReg = AGENT_REGISTRY[targetId];
-      const displayName = targetReg ? targetReg.name : agent.name;
-      installSteps.push({ label: displayName, fn: async () => { fn(bundleDir, vaultPath, skillOpts, writtenFiles, targetId); await sleep(150); } });
-    }
-  }
-
-  await installProgress(installSteps);
-
-  // Step 9: Skills Refresh
+  barLn(bold("  Next step:"));
+  barLn(`  Run ${bold("/update")} in your AI agent to apply changes.`);
+  barLn(dim("  The AI will compare each file against your local version,"));
+  barLn(dim("  preserve your customizations, and merge new content."));
   barLn();
-  const allSkills = findSkills(bundleDir);
-  if (allSkills.length > 0 && selectedAgents.some((a) => a.id !== "aider")) {
-    question("Refresh skill categories?");
-    barLn();
-    const catCounts = {};
-    for (const sk of allSkills) { catCounts[sk.category] = (catCounts[sk.category] || 0) + 1; }
-    const categoryItems = CATEGORY_META.map((c) => ({
-      id: c.id,
-      name: `${c.name}  ${dim(`(${catCounts[c.id] || 0})`)}`,
-      tier: dim(c.desc),
-    }));
-    const selectedCatIds = await interactiveSelect(categoryItems, { multi: true, preSelected: ["development", "obsidian"] });
-    if (selectedCatIds && selectedCatIds.length > 0) {
-      const catSet = new Set(selectedCatIds);
-      const refreshOpts = { install: true, categories: catSet, workflows: null };
-      for (const agent of selectedAgents) {
-        const fn = AGENT_INSTALLERS[agent.id];
-        if (fn) fn(bundleDir, vaultPath, refreshOpts, writtenFiles, agent.id);
-      }
-      const skillCount = allSkills.filter((s) => s.category === "tools" || catSet.has(s.category)).length;
-      statusLine("ok", "Skills refreshed", `${skillCount} across ${selectedAgents.length} agent(s)`);
-    }
-    barLn();
-  }
-
-  // Update version marker + config
-  fs.writeFileSync(path.join(vaultPath, ".mover-version"), `${require("./package.json").version}\n`, "utf8");
-  writeMoverConfig(vaultPath, selectedIds, updateKey);
-
-  // Step 10: Summary + Success
-  barLn();
-  await successAnimation(`Mover OS updated — ${totalChanged} files`);
-
   const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
-  outro(`${green("Done.")} ${dim(`${elapsed}s`)}  Run ${bold("/update")} in your agent to sync Engine.`);
+  outro(`Files staged. Run ${bold("/update")} to apply. ${dim(`(${elapsed}s)`)}`);
 }
 
 // ─── Vault Resolution Helper ─────────────────────────────────────────────────
@@ -5284,8 +5259,8 @@ async function main() {
       ],
       { multi: false, defaultIndex: 1 }
     );
-    if (!ptChoice) return;
-    if (ptChoice === "yes") {
+    if (!ptChoice || ptChoice === "no") { /* skip prayer setup */ }
+    else if (ptChoice === "yes") {
       prayerSetup = true;
       barLn();
       question("How would you like to set up prayer times?");
@@ -5299,7 +5274,9 @@ async function main() {
         ],
         { multi: false, defaultIndex: 0 }
       );
-      if (!method || method === "later") { /* skip */ }
+      if (!method || method === "later") {
+        // User cancelled method pick — still enable the setting, no timetable
+      } else {
 
       const moverDir = path.join(os.homedir(), ".mover");
       if (!fs.existsSync(moverDir)) fs.mkdirSync(moverDir, { recursive: true, mode: 0o700 });
@@ -5351,26 +5328,31 @@ async function main() {
       } else if (method === "fetch") {
         barLn();
         const city = await textInput({ label: "City (e.g. London, Watford, Istanbul)", placeholder: "London" });
-        if (city === null) return;
-        const country = await textInput({ label: "Country", placeholder: "United Kingdom" });
-        if (country === null) return;
-        barLn();
-
-        if (city && country) {
-          const sp = spinner("Fetching prayer times");
-          const tt = await fetchPrayerTimes(city.trim(), country.trim());
-          if (tt && Object.keys(tt.times).length > 0) {
-            const ttPath = path.join(moverDir, "prayer-timetable.json");
-            fs.writeFileSync(ttPath, JSON.stringify(tt, null, 2), "utf8");
-            sp.stop(`Prayer times  ${dim(`${Object.keys(tt.times).length} days from aladhan.com`)}`);
-            barLn(dim("  Note: these are calculated adhan times, not mosque jama'ah times."));
-            barLn(dim("  For your mosque's specific times, run: moveros prayer"));
+        if (!city || !city.trim()) {
+          barLn(yellow("  City cannot be empty. Run moveros prayer later to set up."));
+        } else {
+          const country = await textInput({ label: "Country", placeholder: "United Kingdom" });
+          if (!country || !country.trim()) {
+            barLn(yellow("  Country cannot be empty. Run moveros prayer later to set up."));
           } else {
-            sp.stop(yellow("Could not fetch. Run moveros prayer later."));
+            barLn();
+            const sp = spinner("Fetching prayer times");
+            const tt = await fetchPrayerTimes(city.trim(), country.trim());
+            if (tt && Object.keys(tt.times).length > 0) {
+              const ttPath = path.join(moverDir, "prayer-timetable.json");
+              fs.writeFileSync(ttPath, JSON.stringify(tt, null, 2), "utf8");
+              sp.stop(`Prayer times  ${dim(`${Object.keys(tt.times).length} days from aladhan.com`)}`);
+              barLn(dim("  Note: these are calculated adhan times, not mosque jama'ah times."));
+              barLn(dim("  For your mosque's specific times, run: moveros prayer"));
+            } else {
+              sp.stop(yellow("Could not fetch prayer times."));
+              barLn(yellow("  Check city/country spelling. Run moveros prayer later to retry."));
+            }
           }
         }
       }
       // method === "later" → just enable the setting, no timetable yet
+      } // end if method !== "later"
     }
   }
 

package/package.json

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