mover-os 4.6.2 → 4.6.4

package/README.md

@@ -6,7 +6,7 @@
 
 Mover OS turns Obsidian into an AI-powered execution engine. It audits your behavior against your stated strategy, extracts reusable knowledge from daily work, and evolves based on your corrections.
 
-**Works best with Claude Code.** Supports 14 AI coding agents.
+**Works best with Claude Code.** Supports 15 AI coding agents.
 
 **Version:** 4.3 | **Status:** Production
 
@@ -91,22 +91,24 @@ bash src/install/link.sh
 
 ## Supported Agents
 
-Works with **14 AI coding agents.** The installer auto-detects and configures each one:
+Works with **15 AI coding agents.** The installer auto-detects and configures each one:
 
 | Agent | What Gets Installed |
 |-------|---------------------|
-| Claude Code | Rules + 22 commands + 61 skills + 6 hooks |
-| Cursor | Rules + 22 commands + 61 skills |
-| Cline | Rules + 61 skills |
-| Windsurf | Rules + 61 skills |
-| Gemini CLI | Rules + 22 workflows + 61 skills |
-| GitHub Copilot | Rules + 61 skills |
-| Codex CLI | Rules + 61 skills |
-| Codex (Cloud) | Rules + 61 skills |
-| Antigravity | Rules + 22 workflows |
-| OpenClaw | Rules + 61 skills |
-| Roo Code | Rules + 61 skills |
-| Amp | Rules + 61 skills |
+| Claude Code | Rules + 23 commands + 62 skills + 18 hooks |
+| Cursor | Rules + 23 commands + 62 skills |
+| Cline | Rules + 62 skills |
+| Windsurf | Rules + 62 skills |
+| Gemini CLI | Rules + 23 workflows + 62 skills |
+| GitHub Copilot | Rules + 62 skills |
+| Codex | Rules + 62 skills |
+| Antigravity | Rules + 23 workflows |
+| Amazon Q | Rules + 62 skills |
+| OpenCode | Rules + 62 skills |
+| Kilo Code | Rules + 62 skills |
+| Amp | Rules + 62 skills |
+| Roo Code | Rules + 62 skills |
+| Continue.dev | Rules + 62 skills |
 | Aider | Rules |
 
 > Claude Code gets the deepest integration — hooks, native slash commands, and the full correction lifecycle. Every other agent gets the core system.
@@ -196,10 +198,10 @@ Your `02_Areas/Engine/` folder is the brain. Core files that the AI reads before
 ```
 Mover OS Bundle/
   src/
-    workflows/     # 22 AI command handlers (markdown)
+    workflows/     # 23 AI command handlers (markdown)
     system/        # Global Rules + Install Manifest
-    hooks/         # 6 Claude Code lifecycle hooks
-    skills/        # 61 curated skill packs
+    hooks/         # 18 hook files (11 registered in settings.json)
+    skills/        # 62 curated skill packs
     install/       # link.sh (hard-link re-linker)
     structure/     # Vault template (PARA + Engine)
 ```

package/install.js

@@ -17,6 +17,39 @@ const { execSync } = require("child_process");
 
 const VERSION = "4";
 
+// ─── JSON output helper ──────────────────────────────────────────────────────
+function jsonOut(command, data, ok = true) {
+  const envelope = {
+    ok,
+    command,
+    version: require("./package.json").version,
+    timestamp: new Date().toISOString(),
+    data,
+  };
+  if (!ok && data.error) envelope.error = data.error;
+  process.stdout.write(JSON.stringify(envelope, null, 2) + "\n");
+}
+
+// ─── Output budget (30K chars = Anthropic bash tool truncation limit) ────────
+const MAX_OUTPUT_CHARS = 28000; // Leave 2K buffer below 30K limit
+let _outputCharCount = 0;
+const _origWrite = process.stdout.write.bind(process.stdout);
+if (!IS_TTY) {
+  // In non-TTY (agent) mode, track output size and warn before truncation
+  process.stdout.write = function(chunk, ...args) {
+    const str = typeof chunk === "string" ? chunk : chunk.toString();
+    _outputCharCount += str.length;
+    if (_outputCharCount > MAX_OUTPUT_CHARS && !_outputCharCount._warned) {
+      _origWrite("\n... output truncated (approaching 30K char limit) ...\n");
+      _outputCharCount._warned = true;
+    }
+    return _origWrite(chunk, ...args);
+  };
+}
+
+// ─── Exit codes (semantic, for agent parsing) ────────────────────────────────
+const EXIT = { OK: 0, ERROR: 1, USAGE: 2, NOT_FOUND: 3, PERMISSION: 4, CONFLICT: 5, NETWORK: 6 };
+
 // ─── ANSI ────────────────────────────────────────────────────────────────────
 const IS_TTY = process.stdout.isTTY && process.stdin.isTTY;
 const S = IS_TTY
@@ -342,6 +375,25 @@ async function shimmerText(text, duration = 400) {
   w(`\r\x1b[2K  ${text}\n`);
 }
 
+async function installProgress(steps) {
+  const total = steps.length;
+  for (let i = 0; i < total; i++) {
+    const step = steps[i];
+    w(`\x1b[2K\r  ${progressBar(i, total, 30)} ${S.dim}${step.label}${S.reset}`);
+    await step.fn();
+    w(`\x1b[2K\r  ${progressBar(i + 1, total, 30)} ${S.green}\u2713${S.reset} ${step.label}\n`);
+    await sleep(60);
+  }
+}
+
+async function successAnimation(message) {
+  if (!IS_TTY) { ln(`\n  ${message}\n`); return; }
+  ln();
+  await shimmerText(green("  \u2713"), 150);
+  await shimmerText(bold(message), 300);
+  ln();
+}
+
 // ─── TUI: waitForEsc ────────────────────────────────────────────────────────
 function waitForEsc() {
   return new Promise((r) => {
@@ -363,37 +415,6 @@ function waitForEsc() {
   });
 }
 
-// ─── TUI: Animated progress for install/update ──────────────────────────────
-async function installProgress(steps) {
-  const total = steps.length;
-  for (let i = 0; i < total; i++) {
-    const step = steps[i];
-    w(`\x1b[2K\r  ${progressBar(i, total, 30)} ${S.dim}${step.label}${S.reset}`);
-    await step.fn();
-    w(`\x1b[2K\r  ${progressBar(i + 1, total, 30)} ${S.green}\u2713${S.reset} ${step.label}\n`);
-    await sleep(60);
-  }
-}
-
-// ─── TUI: Success animation ─────────────────────────────────────────────────
-async function successAnimation(message) {
-  if (!IS_TTY) { ln(message); return; }
-  const check = [
-    "       \u2713",
-    "      \u2713",
-    "     \u2713",
-    "  \u2713 \u2713",
-    "   \u2713",
-  ];
-  ln();
-  for (const line of check) {
-    await shimmerText(green(line), 200);
-  }
-  ln();
-  await shimmerText(bold(message), 400);
-  ln();
-}
-
 // ─── Clack-style frame ──────────────────────────────────────────────────────
 const BAR_COLOR = S.cyan;
 const bar = () => w(`${BAR_COLOR}│${S.reset}`);
@@ -583,8 +604,8 @@ function interactiveSelect(items, { multi = false, preSelected = [], defaultInde
       lines++;
 
       const hint = multi
-        ? dim("  ↑↓ navigate  space select  a all  enter confirm  esc back")
-        : dim("  ↑↓ navigate  enter select  esc back");
+        ? dim(`  ↑↓ move  space toggle  a all  enter done  esc cancel${selected.size > 0 ? `  (${selected.size} selected)` : ""}`)
+        : dim("  ↑↓ move  enter select  esc cancel");
       w(`\x1b[2K${BAR_COLOR}│${S.reset}${hint}\n`);
       lines++;
 
@@ -658,7 +679,7 @@ function interactiveSelect(items, { multi = false, preSelected = [], defaultInde
 // No hardcoded keys — every key must be a real Polar license.
 
 async function validateKey(key) {
-  if (!key) return false;
+  if (!key) return { valid: false, reason: "empty" };
   const k = key.trim();
 
   // Polar license key validation
@@ -679,15 +700,19 @@ async function validateKey(key) {
           try { resolve(JSON.parse(data)); } catch { reject(new Error("Invalid response")); }
         });
       });
-      req.on("error", reject);
-      req.on("timeout", () => { req.destroy(); reject(new Error("Timeout")); });
+      req.on("error", (err) => reject(Object.assign(err, { _isNetwork: true })));
+      req.on("timeout", () => { req.destroy(); reject(Object.assign(new Error("Timeout"), { _isNetwork: true })); });
       req.write(body);
       req.end();
     });
-    return result.status === "granted";
-  } catch {
-    // Network error — cannot validate without Polar
-    return false;
+    return result.status === "granted"
+      ? { valid: true }
+      : { valid: false, reason: "rejected" };
+  } catch (err) {
+    if (err._isNetwork || err.code === "ENOTFOUND" || err.code === "ECONNREFUSED" || err.code === "ETIMEDOUT") {
+      return { valid: false, reason: "network", error: err.message };
+    }
+    return { valid: false, reason: "rejected" };
   }
 }
 
@@ -877,6 +902,7 @@ const CLI_COMMANDS = {
   backup:   { desc: "Manual backup wizard",                      alias: [] },
   restore:  { desc: "Restore from backup",                       alias: [] },
   prayer:   { desc: "Manage prayer times",                        alias: [] },
+  status:   { desc: "Full system state (vault, agents, version)",  alias: [] },
   help:     { desc: "Interactive guide to Mover OS",              alias: ["-h"] },
   test:     { desc: "Run integration tests (dev)",               alias: [], hidden: true },
 };
@@ -893,6 +919,10 @@ function parseArgs() {
     // Backward compat: --update / -u → command 'update'
     if (a === "--update" || a === "-u") { opts.command = "update"; continue; }
     if (a === "--_self-updated") { opts._selfUpdated = true; continue; }
+    if (a === "--yes" || a === "-y") { opts.yes = true; continue; }
+    if (a === "--json") { opts.json = true; continue; }
+    if (a === "--quiet" || a === "-q") { opts.quiet = true; continue; }
+    if (a === "--dry-run") { opts.dryRun = true; continue; }
     if (a === "--help" || a === "-h") {
       ln();
       ln(`  ${bold("moveros")} ${dim("— the Mover OS companion CLI")}`);
@@ -908,6 +938,10 @@ function parseArgs() {
       ln(`  ${dim("Options")}`);
       ln(`    --key KEY       License key (skip interactive prompt)`);
       ln(`    --vault PATH    Obsidian vault path (skip detection)`);
+      ln(`    --yes, -y       Accept defaults (non-interactive mode)`);
+      ln(`    --json          Structured JSON output (for status command)`);
+      ln(`    --quiet, -q     Minimal output, one value per line`);
+      ln(`    --dry-run       Show what would change without doing it`);
       ln(`    --update, -u    Quick update (backward compat)`);
       ln();
       ln(`  ${dim("Run")} moveros ${dim("with no args for interactive menu")}`);
@@ -2401,9 +2435,8 @@ function writeMoverConfig(vaultPath, agentIds, licenseKey, opts = {}) {
     vaultPath: vaultPath,
     agents: agentIds,
     feedbackWebhook: "https://moveros.dev/api/feedback",
-    track_food: true,
-    track_sleep: true,
     installedAt: new Date().toISOString(),
+    settings: { track_food: true, track_sleep: true, friction_level: 3, review_day: "Sunday" },
   };
   if (licenseKey) config.licenseKey = licenseKey;
   // If config exists, preserve existing values
@@ -2413,10 +2446,15 @@ function writeMoverConfig(vaultPath, agentIds, licenseKey, opts = {}) {
       if (existing.installedAt) config.installedAt = existing.installedAt;
       if (existing.licenseKey && !licenseKey) config.licenseKey = existing.licenseKey;
       if (existing.feedbackWebhook) config.feedbackWebhook = existing.feedbackWebhook;
-      if (existing.track_food !== undefined) config.track_food = existing.track_food;
-      if (existing.track_sleep !== undefined) config.track_sleep = existing.track_sleep;
+      // Migrate root-level track_food/track_sleep to settings block (legacy compat)
+      if (existing.track_food !== undefined && !existing.settings?.track_food) {
+        config.settings.track_food = existing.track_food;
+      }
+      if (existing.track_sleep !== undefined && !existing.settings?.track_sleep) {
+        config.settings.track_sleep = existing.track_sleep;
+      }
       // Preserve settings block (prayer times, review_day, etc.)
-      if (existing.settings) config.settings = { ...existing.settings };
+      if (existing.settings) config.settings = { ...config.settings, ...existing.settings };
       // Preserve prayer_times fallback
       if (existing.prayer_times) config.prayer_times = existing.prayer_times;
       // Preserve frecency data
@@ -3300,6 +3338,7 @@ const CLI_HANDLERS = {
   settings: async (opts) => { await cmdSettings(opts); },
   backup:   async (opts) => { await cmdBackup(opts); },
   restore:  async (opts) => { await cmdRestore(opts); },
+  status:    async (opts) => { await cmdStatus(opts); },
   doctor:    async (opts) => { await cmdDoctor(opts); },
   prayer:    async (opts) => { await cmdPrayer(opts); },
   help:      async (opts) => { await cmdHelp(opts); },
@@ -3307,11 +3346,54 @@ const CLI_HANDLERS = {
   test:      async (opts) => { await cmdTest(opts); },
 };
 
+// ─── moveros status ──────────────────────────────────────────────────────────
+async function cmdStatus(opts) {
+  const vault = requireVault(opts.vault);
+  if (!vault) return;
+  const home = os.homedir();
+  const cfgPath = path.join(home, ".mover", "config.json");
+  let cfg = {};
+  if (fs.existsSync(cfgPath)) { try { cfg = JSON.parse(fs.readFileSync(cfgPath, "utf8")); } catch {} }
+  const agents = cfg.agents || [];
+  const ver = fs.existsSync(path.join(vault, ".mover-version")) ? fs.readFileSync(path.join(vault, ".mover-version"), "utf8").trim() : "unknown";
+  const engineDir = path.join(vault, "02_Areas", "Engine");
+  const engineFiles = ["Identity_Prime.md", "Strategy.md", "Active_Context.md", "Goals.md", "Mover_Dossier.md", "Auto_Learnings.md"];
+  const engineOk = engineFiles.filter((f) => fs.existsSync(path.join(engineDir, f))).length;
+
+  const data = {
+    vault: vault,
+    version: ver,
+    agents: agents,
+    agentCount: agents.length,
+    engineFiles: { present: engineOk, total: engineFiles.length },
+    settings: cfg.settings || {},
+    licenseKey: cfg.licenseKey ? cfg.licenseKey.substring(0, 12) + "..." : null,
+    hasManifest: fs.existsSync(path.join(home, ".mover", "manifest.json")),
+  };
+
+  if (opts.json) {
+    jsonOut("status", data);
+    return;
+  }
+
+  barLn(bold("  System Status"));
+  barLn();
+  barLn(`  ${bold("Vault:")}       ${vault}`);
+  barLn(`  ${bold("Version:")}     ${ver}`);
+  barLn(`  ${bold("Agents:")}      ${agents.length} (${agents.join(", ")})`);
+  barLn(`  ${bold("Engine:")}      ${engineOk}/${engineFiles.length} files present`);
+  barLn(`  ${bold("License:")}     ${data.licenseKey || dim("not set")}`);
+  barLn(`  ${bold("Manifest:")}    ${data.hasManifest ? green("present") : yellow("missing (legacy install)")}`);
+  barLn(`  ${bold("Settings:")}    friction=${cfg.settings?.friction_level || 3}, review=${cfg.settings?.review_day || "Sunday"}, food=${cfg.settings?.track_food !== false ? "on" : "off"}, sleep=${cfg.settings?.track_sleep !== false ? "on" : "off"}`);
+  barLn();
+  barLn(dim("  Run moveros doctor for detailed health check."));
+}
+
 // ─── moveros doctor ─────────────────────────────────────────────────────────
 async function cmdDoctor(opts) {
   const vault = resolveVaultPath(opts.vault);
   if (!vault) {
-    barLn(red("No Mover OS vault found. Use: moveros doctor --vault /path"));
+    // handled by requireVault()
     return;
   }
   const home = os.homedir();
@@ -3395,13 +3477,16 @@ async function cmdDoctor(opts) {
 
   barLn();
   barLn(dim("  Run moveros install or moveros update to fix any issues."));
+
+  barLn();
+  barLn(dim("  Fix any issues above, then run /mover-check in your AI agent for deeper validation."));
 }
 
 // ─── moveros pulse ──────────────────────────────────────────────────────────
 async function cmdPulse(opts) {
   const vault = resolveVaultPath(opts.vault);
   if (!vault) {
-    barLn(red("No vault found. Use: moveros pulse --vault /path"));
+    // handled by requireVault()
     return;
   }
   const engineDir = path.join(vault, "02_Areas", "Engine");
@@ -3507,14 +3592,16 @@ async function cmdPulse(opts) {
     } catch {}
   }
   barLn();
+
+  barLn();
+  barLn(dim("  Run /morning for full session primer or moveros capture for quick capture."));
 }
 
 // cmdWarm removed — hooks + rules + /morning handle session priming
 
 // ─── moveros capture ────────────────────────────────────────────────────────
 async function cmdCapture(opts) {
-  const vault = resolveVaultPath(opts.vault);
-  if (!vault) { barLn(red("No vault found.")); return; }
+  const vault = requireVault(opts.vault);
 
   const now = new Date();
   const ymd = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-${String(now.getDate()).padStart(2, "0")}`;
@@ -3590,8 +3677,7 @@ async function cmdCapture(opts) {
 
 // ─── moveros who ────────────────────────────────────────────────────────────
 async function cmdWho(opts) {
-  const vault = resolveVaultPath(opts.vault);
-  if (!vault) { barLn(red("No vault found.")); return; }
+  const vault = requireVault(opts.vault);
 
   const name = opts.rest.join(" ").trim();
   if (!name) { barLn(yellow("Usage: moveros who <name>")); return; }
@@ -3638,12 +3724,14 @@ async function cmdWho(opts) {
     for (const l of lines) barLn(`  ${l}`);
     barLn();
   }
+
+  barLn();
+  barLn(dim("  Entities live in 03_Library/Entities/. Run /harvest to extract people from sessions."));
 }
 
 // ─── moveros diff ───────────────────────────────────────────────────────────
 async function cmdDiff(opts) {
-  const vault = resolveVaultPath(opts.vault);
-  if (!vault) { barLn(red("No vault found.")); return; }
+  const vault = requireVault(opts.vault);
   if (!cmdExists("git")) { barLn(red("Git required for moveros diff.")); return; }
 
   const target = opts.rest[0] || "strategy";
@@ -3697,12 +3785,14 @@ async function cmdDiff(opts) {
     barLn(dim("  Not a git repo or no history available."));
   }
   barLn();
+
+  barLn();
+  barLn(dim("  Run /history in your AI agent for full Engine evolution analysis."));
 }
 
 // ─── moveros sync ───────────────────────────────────────────────────────────
 async function cmdSync(opts) {
-  const vault = resolveVaultPath(opts.vault);
-  if (!vault) { barLn(red("No vault found.")); return; }
+  const vault = requireVault(opts.vault);
   const apply = opts.rest.includes("--apply");
   const home = os.homedir();
 
@@ -3775,12 +3865,14 @@ async function cmdSync(opts) {
     barLn(dim(`  ${staleCount} agent(s) need updating. Run: moveros sync --apply`));
   }
   barLn();
+
+  barLn();
+  barLn(dim("  Run moveros update for comprehensive update with merge support."));
 }
 
 // ─── moveros replay ─────────────────────────────────────────────────────────
 async function cmdReplay(opts) {
-  const vault = resolveVaultPath(opts.vault);
-  if (!vault) { barLn(red("No vault found.")); return; }
+  const vault = requireVault(opts.vault);
 
   const engineDir = path.join(vault, "02_Areas", "Engine");
   let dateStr = opts.rest.find((a) => a.startsWith("--date="))?.split("=")[1];
@@ -3837,12 +3929,14 @@ async function cmdReplay(opts) {
     barLn(`  ${progressBar(done, tasks.length, 25, "Completion")}`);
     barLn();
   }
+
+  barLn();
+  barLn(dim("  Run /log in your AI agent for full session capture."));
 }
 
 // ─── moveros context ────────────────────────────────────────────────────────
 async function cmdContext(opts) {
-  const vault = resolveVaultPath(opts.vault);
-  if (!vault) { barLn(red("No vault found.")); return; }
+  const vault = requireVault(opts.vault);
 
   const target = opts.rest[0];
   const home = os.homedir();
@@ -4230,23 +4324,57 @@ async function cmdSettings(opts) {
     };
   });
 
+  items.push({ id: "_reset", name: dim("Reset all to defaults"), tier: "Resets every setting to its default value" });
   question(dim("  Select a setting to edit (esc to go back)"));
   barLn();
   const picked = await interactiveSelect(items);
   if (!picked) return;
 
+  if (picked === "_reset") {
+    cfg.settings = {};
+    for (const [k, m] of Object.entries(KNOWN_SETTINGS)) {
+      cfg.settings[k] = m.defaults;
+    }
+    fs.writeFileSync(cfgPath, JSON.stringify(cfg, null, 2), "utf8");
+    statusLine("ok", "All settings", "reset to defaults");
+    barLn();
+    return;
+  }
+
   const meta = KNOWN_SETTINGS[picked];
   const current = settings[picked] !== undefined ? settings[picked] : meta.defaults;
 
   if (meta.type === "boolean") {
-    // Toggle immediately
     const newVal = !current;
     if (!cfg.settings) cfg.settings = {};
     cfg.settings[picked] = newVal;
     fs.writeFileSync(cfgPath, JSON.stringify(cfg, null, 2), "utf8");
     statusLine("ok", picked, newVal ? "on" : "off");
+  } else if (picked === "friction_level") {
+    const flItems = [
+      { id: "1", name: "1 — Gentle", tier: "Surface conflicts, easy to override" },
+      { id: "2", name: "2 — Moderate", tier: "Ask for justification on off-plan work" },
+      { id: "3", name: "3 — Firm", tier: "Hold the line, identify avoidance (recommended)" },
+      { id: "4", name: "4 — Hard block", tier: "Refuse destructive actions without confirmation" },
+    ];
+    const flPick = await interactiveSelect(flItems, { defaultIndex: (current || 3) - 1 });
+    if (flPick) {
+      if (!cfg.settings) cfg.settings = {};
+      cfg.settings[picked] = parseInt(flPick, 10);
+      fs.writeFileSync(cfgPath, JSON.stringify(cfg, null, 2), "utf8");
+      statusLine("ok", picked, flPick);
+    }
+  } else if (picked === "review_day") {
+    const days = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"];
+    const dayItems = days.map((d) => ({ id: d, name: d, tier: d === "Sunday" ? "Default — end-of-week reflection" : "" }));
+    const dayPick = await interactiveSelect(dayItems, { defaultIndex: days.indexOf(current || "Sunday") });
+    if (dayPick) {
+      if (!cfg.settings) cfg.settings = {};
+      cfg.settings[picked] = dayPick;
+      fs.writeFileSync(cfgPath, JSON.stringify(cfg, null, 2), "utf8");
+      statusLine("ok", picked, dayPick);
+    }
   } else {
-    // Prompt for new value
     const answer = await textInput({ label: `${picked}`, initial: String(current) });
     if (answer === null || answer.trim() === "" || answer === String(current)) return;
     let val = answer.trim();
@@ -4261,8 +4389,7 @@ async function cmdSettings(opts) {
 
 // ─── moveros backup ─────────────────────────────────────────────────────────
 async function cmdBackup(opts) {
-  const vault = resolveVaultPath(opts.vault);
-  if (!vault) { barLn(red("No vault found.")); return; }
+  const vault = requireVault(opts.vault);
   const home = os.homedir();
 
   barLn(bold("  Backup"));
@@ -4359,8 +4486,7 @@ async function cmdBackup(opts) {
 
 // ─── moveros restore ────────────────────────────────────────────────────────
 async function cmdRestore(opts) {
-  const vault = resolveVaultPath(opts.vault);
-  if (!vault) { barLn(red("No vault found.")); return; }
+  const vault = requireVault(opts.vault);
 
   const archivesDir = path.join(vault, "04_Archives");
   if (!fs.existsSync(archivesDir)) { barLn(yellow("  No archives found.")); return; }
@@ -4957,6 +5083,16 @@ async function cmdUpdateComprehensive(opts, bundleDir, startTime) {
       const npmVer = execSync("npm view mover-os version", { encoding: "utf8", timeout: 10000 }).trim();
       if (npmVer && npmVer !== localVer && compareVersions(npmVer, localVer) > 0) {
         barLn(`${yellow("CLI update available:")} ${dim(localVer)} ${dim("\u2192")} ${green(npmVer)}`);
+        const selfUpdateChoice = IS_TTY ? await interactiveSelect(
+          [
+            { id: "yes", name: "Update CLI first", tier: `Downloads v${npmVer} before proceeding` },
+            { id: "no", name: "Skip, continue with current", tier: `Stay on v${localVer}` },
+          ],
+          { multi: false, defaultIndex: 0 }
+        ) : "yes";
+        if (selfUpdateChoice === "no" || !selfUpdateChoice) {
+          statusLine("ok", "CLI", `${localVer} (update skipped)`);
+        } else {
         const sp = spinner("Updating CLI");
         try {
           try {
@@ -4979,6 +5115,7 @@ async function cmdUpdateComprehensive(opts, bundleDir, startTime) {
           sp.stop(yellow(`CLI self-update failed: ${e.message}`));
           barLn(dim("  Try: sudo npm i -g mover-os"));
         }
+        } // end selfUpdateChoice === "yes"
       } else {
         statusLine("ok", "CLI", `up to date (${localVer})`);
       }
@@ -5010,13 +5147,20 @@ async function cmdUpdateComprehensive(opts, bundleDir, startTime) {
     if (!updateKey) return;
   }
   const sp1 = spinner("Validating license");
-  const keyValid = await validateKey(updateKey);
-  if (!keyValid && keyFromConfig) {
+  const keyResult = await validateKey(updateKey);
+  if (!keyResult.valid && keyResult.reason === "network" && keyFromConfig) {
     sp1.stop(dim("License check skipped (offline — using stored key)"));
-  } else if (!keyValid) {
-    sp1.stop(red("Invalid key"));
-    outro(red("Valid license key required."));
+  } else if (!keyResult.valid && keyResult.reason === "network") {
+    sp1.stop(yellow("Could not connect"));
+    barLn(yellow("  Could not reach license server. Check your internet connection and try again."));
+    outro("Update cancelled.");
     process.exit(1);
+  } else if (!keyResult.valid) {
+    sp1.stop(red("Key not recognized"));
+    barLn(red("  This license key was not recognized. Check your email from Polar for the correct key."));
+    barLn(dim("  Purchase at https://moveros.dev if you need a key."));
+    outro("Update cancelled.");
+    process.exit(EXIT.PERMISSION);
   } else {
     sp1.stop(green("License verified"));
   }
@@ -5055,7 +5199,7 @@ async function cmdUpdateComprehensive(opts, bundleDir, startTime) {
 
   // Quick mode: force-apply (CI/headless — no user customizations to protect)
   if (isQuick) {
-    if (detectedAgents.length === 0) { outro(red("No AI agents detected.")); process.exit(1); }
+    if (detectedAgents.length === 0) { outro(red("No AI agents detected.")); process.exit(EXIT.NOT_FOUND); }
     const changes = detectChanges(bundleDir, vaultPath, selectedIds);
     const totalChanged = countChanges(changes);
     displayChangeSummary(changes, installedVer, newVer);
@@ -5085,7 +5229,7 @@ async function cmdUpdateComprehensive(opts, bundleDir, startTime) {
     writeMoverConfig(vaultPath, selectedIds);
     barLn();
     const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
-    outro(`${green("Done.")} ${totalChanged} files updated in ${elapsed}s.`);
+    await successAnimation(`${totalChanged} files updated in ${elapsed}s.`);
     return;
   }
 
@@ -5256,8 +5400,8 @@ async function cmdUpdateComprehensive(opts, bundleDir, startTime) {
       const targets = sel ? sel.targets : [agent.id];
       for (const tid of targets) {
         const reg = AGENT_REGISTRY[tid];
-        if (reg && reg.rules) {
-          const destPath = typeof reg.rules === "function" ? reg.rules() : reg.rules;
+        if (reg && reg.rules && reg.rules.dest) {
+          const destPath = typeof reg.rules.dest === "function" ? reg.rules.dest(vaultPath) : reg.rules.dest;
           installRules(bundleDir, destPath, tid);
         }
       }
@@ -5276,10 +5420,10 @@ async function cmdUpdateComprehensive(opts, bundleDir, startTime) {
       const targets = sel ? sel.targets : [agent.id];
       for (const tid of targets) {
         const reg = AGENT_REGISTRY[tid];
-        if (reg && reg.skills) {
-          const destDir = typeof reg.skills === "function" ? reg.skills() : reg.skills;
+        if (reg && reg.skills && reg.skills.dest) {
+          const destDir = typeof reg.skills.dest === "function" ? reg.skills.dest(vaultPath) : reg.skills.dest;
           if (destDir && !writtenFiles.has(destDir)) {
-            installSkills(bundleDir, destDir, null, null);
+            installSkillPacks(bundleDir, destDir, null);
             writtenFiles.add(destDir);
           }
         }
@@ -5394,6 +5538,16 @@ function resolveVaultPath(explicitVault) {
   return obsVaults.find((p) => fs.existsSync(path.join(p, ".mover-version"))) || null;
 }
 
+function requireVault(explicitVault) {
+  const v = resolveVaultPath(explicitVault);
+  if (!v) {
+    barLn(red("  No Mover OS vault found."));
+    barLn(dim("  Use --vault /path or run moveros install to set up."));
+    return null;
+  }
+  return v;
+}
+
 // ─── Main ───────────────────────────────────────────────────────────────────
 async function main() {
   const opts = parseArgs();
@@ -5489,6 +5643,7 @@ async function main() {
   }
 
   if (!key) {
+    barLn(dim("  Purchased at moveros.dev — check your email for the key."));
     let validated = false;
     let attempts = 0;
     while (attempts < 3) {
@@ -5500,15 +5655,21 @@ async function main() {
       if (key === null) return;
 
       const sp = spinner("Validating...");
-      const valid = await validateKey(key);
-      if (valid) {
+      const keyResult = await validateKey(key);
+      if (keyResult.valid) {
         sp.stop(green("License verified"));
         await activateKey(key);
         validated = true;
         break;
       }
 
-      sp.stop(red("Invalid key"));
+      if (keyResult.reason === "network") {
+        sp.stop(yellow("Could not connect"));
+        barLn(yellow("  Check your internet connection and try again."));
+      } else {
+        sp.stop(red("Key not recognized"));
+        barLn(red("  Check your email from Polar for the correct key."));
+      }
       attempts++;
       if (attempts < 3) {
         barLn(red("Try again."));
@@ -5526,15 +5687,19 @@ async function main() {
     }
   } else {
     const sp = spinner("Validating license...");
-    if (!await validateKey(key)) {
-      sp.stop(red("Invalid key"));
+    const storedKeyResult = await validateKey(key);
+    if (!storedKeyResult.valid && storedKeyResult.reason === "network") {
+      sp.stop(dim("Offline — using stored key"));
+    } else if (!storedKeyResult.valid) {
+      sp.stop(red("Stored key not recognized"));
       barLn();
       barLn(dim("Get a key at https://moveros.dev"));
       outro("Cancelled.");
       process.exit(1);
+    } else {
+      sp.stop(green("License verified"));
+      await activateKey(key);
     }
-    sp.stop(green("License verified"));
-    await activateKey(key);
     barLn();
   }
 
@@ -5547,9 +5712,26 @@ async function main() {
       dlSp.stop(green("Downloaded"));
     } catch (err) {
       dlSp.stop(red("Download failed"));
-      barLn(red(err.message));
-      barLn();
-      barLn(dim("Check your connection and try again."));
+      const msg = err.message || "";
+      if (msg.includes("Timeout") || msg.includes("timeout")) {
+        barLn(red("  Connection timed out."));
+        barLn(dim("  Check your internet connection and try again."));
+      } else if (msg.includes("401") || msg.includes("rejected")) {
+        barLn(red("  License key rejected by server."));
+        barLn(dim("  Has your key expired? Check polar.sh or email support@moveros.dev."));
+      } else if (msg.includes("500") || msg.includes("502") || msg.includes("503")) {
+        barLn(red("  Server error."));
+        barLn(dim("  Try again in a few minutes. If it persists, email support@moveros.dev."));
+      } else if (msg.includes("extract") || msg.includes("tar")) {
+        barLn(red("  Failed to extract payload."));
+        barLn(dim("  Ensure 'tar' is available. On Windows, install Git Bash."));
+      } else if (msg.includes("Untrusted")) {
+        barLn(red("  Unexpected download redirect."));
+        barLn(dim("  This may be a bug. Report at github.com/azkhh/Mover-OS/issues."));
+      } else {
+        barLn(red(`  ${msg}`));
+        barLn(dim("  Check your internet connection and try again."));
+      }
       outro("Cancelled.");
       process.exit(1);
     }
@@ -5642,7 +5824,7 @@ async function main() {
     barLn(dim("You need at least one to use Mover OS. Recommended: Claude Code (claude.ai/code)"));
     barLn();
   }
-  question(`Select your AI agents${detectedIds.length > 0 ? dim("  (detected agents pre-selected)") : ""}`);
+  question(`[1/4] Select your AI agents${detectedIds.length > 0 ? dim("  (detected agents pre-selected)") : ""}`);
   barLn();
 
   const selectedIds = await interactiveSelect(agentItems, {
@@ -5664,7 +5846,7 @@ async function main() {
 
   // ── Skills ──
   const allSkills = findSkills(bundleDir);
-  let installSkills = false;
+  let doInstallSkills = false;
   let selectedCategories = null; // null = all, Set = filtered
 
   if (allSkills.length > 0 && selectedAgents.some((a) => a.id !== "aider")) {
@@ -5674,7 +5856,7 @@ async function main() {
       catCounts[sk.category] = (catCounts[sk.category] || 0) + 1;
     }
 
-    question(`${bold(String(allSkills.length))} skill packs available. Select categories:`);
+    question(`[2/4] ${bold(String(allSkills.length))} skill packs available. Select categories:`);
     barLn();
 
     const categoryItems = CATEGORY_META.map((c) => ({
@@ -5692,8 +5874,8 @@ async function main() {
     });
     if (!selectedCatIds) return;
 
-    installSkills = selectedCatIds.length > 0;
-    if (installSkills) {
+    doInstallSkills = selectedCatIds.length > 0;
+    if (doInstallSkills) {
       selectedCategories = new Set(selectedCatIds);
       // Count how many skills will be installed (selected categories + tools)
       const skillCount = allSkills.filter((s) => s.category === "tools" || selectedCategories.has(s.category)).length;
@@ -5705,7 +5887,7 @@ async function main() {
   let installStatusLine = false;
   if (selectedIds.includes("claude-code")) {
     barLn();
-    question("Install Claude Code status line?");
+    question("[3/4] Install Claude Code status line?");
     barLn(dim("  Live status bar with model, context %, project, session cost, and Mover OS data."));
     barLn(dim("  Example: Opus 4.6 · 24% · my-project (main) · 2h14m · $12.50"));
     barLn(dim("           ▸ next task · 2/5 done · Sleep by 22:00 · logged 30m ago"));
@@ -5722,24 +5904,10 @@ async function main() {
     installStatusLine = slChoice === "yes";
   }
 
-  // ── Prayer times (optional) ──
+  // ── Prayer times — moved out of install flow (available via: moveros prayer) ──
   let prayerSetup = false;
-  {
-    barLn();
-    question("Would you like prayer time reminders?");
-    barLn(dim("  Shows next prayer time in the status line and Daily Notes."));
-    barLn(dim("  Designed for Muslims — skip if not relevant to you."));
-    barLn();
-
-    const ptChoice = await interactiveSelect(
-      [
-        { id: "yes", name: "Yes, set up prayer times", tier: "You can paste your mosque's timetable or fetch by city" },
-        { id: "no", name: "No, skip", tier: "You can enable later with: moveros prayer" },
-      ],
-      { multi: false, defaultIndex: 1 }
-    );
-    if (!ptChoice || ptChoice === "no") { /* skip prayer setup */ }
-    else if (ptChoice === "yes") {
+  if (false) { // Prayer setup deferred to post-install: moveros prayer
+    {
       prayerSetup = true;
       barLn();
       question("How would you like to set up prayer times?");
@@ -5840,13 +6008,13 @@ async function main() {
     let confirmed = false;
     while (!confirmed) {
       barLn();
-      question(bold("Review your selections") + dim("  (enter to change, esc to cancel)"));
+      question(bold("[4/4] Review your selections") + dim("  (enter to change, esc to cancel)"));
       barLn();
 
       const agentNames = selectedAgents.map((a) => a.name).join(", ");
-      const skillsLabel = installSkills && selectedCategories
+      const skillsLabel = doInstallSkills && selectedCategories
         ? [...selectedCategories].join(", ")
-        : installSkills ? "all categories" : "none";
+        : doInstallSkills ? "all categories" : "none";
       const slLabel = selectedIds.includes("claude-code") ? (installStatusLine ? "yes" : "no") : null;
 
       const reviewItems = [
@@ -5889,8 +6057,8 @@ async function main() {
         question("Select skill categories:");
         const newCats = await interactiveSelect(categoryItems, { multi: true, preSelected: selectedCategories ? [...selectedCategories] : ["development", "obsidian"] });
         if (newCats) {
-          installSkills = newCats.length > 0;
-          selectedCategories = installSkills ? new Set(newCats) : null;
+          doInstallSkills = newCats.length > 0;
+          selectedCategories = doInstallSkills ? new Set(newCats) : null;
         }
       } else if (pick === "statusline") {
         installStatusLine = !installStatusLine;
@@ -5925,12 +6093,20 @@ async function main() {
               sCfg.settings[sPick] = !(sCfg.settings[sPick] !== undefined ? sCfg.settings[sPick] : sMeta.defaults);
             } else if (sPick === "friction_level") {
               const cur = sCfg.settings[sPick] || sMeta.defaults;
-              sCfg.settings[sPick] = cur >= 4 ? 1 : cur + 1;
+              const flItems = [
+                { id: "1", name: "1 — Gentle", tier: "Surface conflicts, easy to override" },
+                { id: "2", name: "2 — Moderate", tier: "Ask for justification on off-plan work" },
+                { id: "3", name: "3 — Firm", tier: "Hold the line, identify avoidance (recommended)" },
+                { id: "4", name: "4 — Hard block", tier: "Refuse destructive actions without confirmation" },
+              ];
+              const flPick = await interactiveSelect(flItems, { defaultIndex: cur - 1 });
+              if (flPick) sCfg.settings[sPick] = parseInt(flPick, 10);
             } else if (sPick === "review_day") {
               const days = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"];
               const cur = sCfg.settings[sPick] || sMeta.defaults;
-              const idx = days.indexOf(cur);
-              sCfg.settings[sPick] = days[(idx + 1) % days.length];
+              const dayItems = days.map((d) => ({ id: d, name: d, tier: d === "Sunday" ? "Default — end-of-week reflection" : "" }));
+              const dayPick = await interactiveSelect(dayItems, { defaultIndex: days.indexOf(cur) });
+              if (dayPick) sCfg.settings[sPick] = dayPick;
             }
             fs.mkdirSync(path.dirname(sCfgPath), { recursive: true });
             fs.writeFileSync(sCfgPath, JSON.stringify(sCfg, null, 2), "utf8");
@@ -5996,7 +6172,7 @@ async function main() {
 
   // 4. Per-agent installation
   const writtenFiles = new Set(); // Track shared files to avoid double-writes (e.g. GEMINI.md)
-  const skillOpts = { install: installSkills, categories: selectedCategories, statusLine: installStatusLine, workflows: selectedWorkflows, skipHooks, skipRules, skipTemplates };
+  const skillOpts = { install: doInstallSkills, categories: selectedCategories, statusLine: installStatusLine, workflows: selectedWorkflows, skipHooks, skipRules, skipTemplates };
   for (const agent of selectedAgents) {
     // Expand selections to targets (e.g. "gemini-cli" → ["gemini-cli", "antigravity"])
     const sel = AGENT_SELECTIONS.find((s) => s.id === agent.id);
@@ -6106,7 +6282,7 @@ async function main() {
 
   // ── Done ──
   const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
-  outro(`${green("Done.")} Mover OS v${VERSION} installed. ${dim(`${totalSteps} steps in ${elapsed}s`)}`);
+  await successAnimation(`Mover OS v${VERSION} installed. ${dim(`${totalSteps} steps in ${elapsed}s`)}`);
 
   // Size check on installed rules files
   const rulesFile = path.join(bundleDir, "src", "system", "Mover_Global_Rules.md");
@@ -6128,25 +6304,27 @@ async function main() {
   ln(`  ${bold("What was installed")}`);
   ln();
   ln(`  ${green("▸")} ${bold("23")} workflows    ${dim("slash commands for daily rhythm, projects, strategy")}`);
-  ln(`  ${green("▸")} ${bold("63")} skills        ${dim("curated packs for dev, marketing, CRO, design")}`);
+  ln(`  ${green("▸")} ${bold("62")} skills        ${dim("curated packs for dev, marketing, CRO, design")}`);
   if (selectedIds.includes("claude-code")) {
-    ln(`  ${green("▸")} ${bold("6")}  hooks         ${dim("lifecycle guards (engine protection, git safety)")}`);
+    ln(`  ${green("▸")} ${bold("18")} hooks         ${dim("lifecycle guards (engine protection, git safety)")}`);
   }
   ln(`  ${green("▸")} ${bold(String(selectedAgents.length))}  agent${selectedAgents.length > 1 ? "s" : ""}        ${dim(agentNames.join(", "))}`);
   ln(`  ${green("▸")} PARA vault     ${dim("folders, templates, Engine scaffold")}`);
   ln();
 
-  // ── Next steps ──
+  // ── Next steps (animated slide-in) ──
   ln(gray("  ─────────────────────────────────────────────"));
   ln();
-  ln(`  ${bold("Next steps")}`);
-  ln();
-  ln(`  ${cyan("1")}  Open your vault in ${bold("Obsidian")}`);
-  ln(`     ${dim("This is where you view and browse your files")}`);
-  ln();
-  ln(`  ${cyan("2")}  Open the vault folder in your AI agent`);
-  ln(`     ${dim("Installed: " + agentNames.join(", "))}`);
-  ln();
+  await slideIn([
+    `  ${bold("Next steps")}`,
+    "",
+    `  ${cyan("1")}  Open your vault in ${bold("Obsidian")}`,
+    `     ${dim("This is where you view and browse your files")}`,
+    "",
+    `  ${cyan("2")}  Open the vault folder in your AI agent`,
+    `     ${dim("Installed: " + agentNames.join(", "))}`,
+    "",
+  ]);
   ln(`  ${cyan("3")}  Enable the Obsidian theme`);
   ln(`     ${dim("Settings → Appearance → CSS snippets → minimal-theme")}`);
   ln();
@@ -6167,6 +6345,7 @@ async function main() {
   ln(`  ${green("▸")} ${bold("moveros pulse")}     ${dim("Dashboard — energy, tasks, streaks")}`);
   ln(`  ${green("▸")} ${bold("moveros doctor")}    ${dim("Health check across all agents")}`);
   ln(`  ${green("▸")} ${bold("moveros capture")}   ${dim("Quick inbox — tasks, links, ideas")}`);
+  ln(`  ${green("▸")} ${bold("moveros prayer")}    ${dim("Set up prayer time reminders")}`);
   ln(`  ${green("▸")} ${bold("moveros update")}    ${dim("Update agents, rules, and skills")}`);
   ln(`  ${green("▸")} ${bold("moveros")}           ${dim("Full menu with all commands")}`);
   ln();

package/package.json

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