mover-os 4.6.0 → 4.6.1

package/install.js

@@ -1670,9 +1670,14 @@ async function runUninstall(vaultPath) {
           barLn(`${dim("Could not reach Polar — license not deactivated")}`);
         }
       }
-      // Remove config file
-      fs.unlinkSync(configPath);
-      barLn(`${green("\u2713")} ${dim("~/.mover/config.json")}`);
+      // Remove config file but preserve license key for reinstall
+      if (cfg.licenseKey) {
+        fs.writeFileSync(configPath, JSON.stringify({ licenseKey: cfg.licenseKey }, null, 2), "utf8");
+        barLn(`${green("\u2713")} ${dim("~/.mover/config.json (license key preserved for reinstall)")}`);
+      } else {
+        fs.unlinkSync(configPath);
+        barLn(`${green("\u2713")} ${dim("~/.mover/config.json")}`);
+      }
       removed++;
     } catch {}
   }
@@ -1880,13 +1885,14 @@ const AGENT_REGISTRY = {
   },
 };
 
-// User-selectable agents (14 selections). Each maps to 1+ install targets.
+// User-selectable agents (15 selections). Each maps to 1+ install targets.
 const AGENT_SELECTIONS = [
   { id: "claude-code",   targets: ["claude-code"],   name: "Claude Code" },
   { id: "cursor",        targets: ["cursor"],         name: "Cursor" },
   { id: "cline",         targets: ["cline"],          name: "Cline" },
   { id: "windsurf",      targets: ["windsurf"],       name: "Windsurf" },
-  { id: "gemini-cli",    targets: ["gemini-cli", "antigravity"], name: "Gemini CLI + Antigravity" },
+  { id: "gemini-cli",    targets: ["gemini-cli"],   name: "Gemini CLI" },
+  { id: "antigravity",   targets: ["antigravity"],   name: "Antigravity" },
   { id: "copilot",       targets: ["copilot"],        name: "GitHub Copilot" },
   { id: "codex",         targets: ["codex"],          name: "Codex" },
   { id: "amazon-q",      targets: ["amazon-q"],       name: "Amazon Q Developer" },
@@ -5093,6 +5099,21 @@ async function cmdUpdateComprehensive(opts, bundleDir, startTime) {
     return;
   }
 
+  // ── Confirmation gate ──
+  barLn();
+  const updateConfirm = await interactiveSelect(
+    [
+      { id: "yes", name: "Apply updates", tier: `${totalChanged} file${totalChanged > 1 ? "s" : ""} will be updated` },
+      { id: "no", name: "Cancel", tier: "No changes will be made" },
+    ],
+    { multi: false, defaultIndex: 0 }
+  );
+  if (!updateConfirm || updateConfirm === "no") {
+    outro("Update cancelled.");
+    return;
+  }
+  barLn();
+
   // ── Apply safe system files directly (no user customizations in these) ──
   const home = os.homedir();
   let appliedCount = 0;
@@ -5677,8 +5698,9 @@ async function main() {
   if (selectedIds.includes("claude-code")) {
     barLn();
     question("Install Claude Code status line?");
-    barLn(dim("  Shows model, project, context usage, and session cost in your terminal."));
-    barLn(dim("  Example: [Opus 4.6] my-project | Context: 42% | $3.50"));
+    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"));
     barLn();
 
     const slChoice = await interactiveSelect(
@@ -5805,30 +5827,33 @@ async function main() {
     }
   }
 
-  // ── Settings step — let user configure before install ──
+  // ── Settings step — let user configure before install (loops until esc) ──
   {
     barLn();
-    question("Configure settings " + dim("(esc to use defaults)"));
+    question("Configure settings " + dim("(esc to continue with defaults)"));
     barLn();
-    const settingsItems = [
-      { id: "review_day", name: "review_day          Sunday      Weekly review day" },
-      { id: "track_food", name: "track_food          on          Track food in daily notes" },
-      { id: "track_sleep", name: "track_sleep         on          Track sleep in daily notes" },
-      { id: "friction_level", name: "friction_level      3           Max friction level (1-4)" },
-    ];
-    const settingsPick = await interactiveSelect(settingsItems);
-    if (settingsPick) {
+    let editingSettings = true;
+    while (editingSettings) {
+      const cfgPath = path.join(os.homedir(), ".mover", "config.json");
+      let cfg = {};
+      if (fs.existsSync(cfgPath)) { try { cfg = JSON.parse(fs.readFileSync(cfgPath, "utf8")); } catch {} }
+      if (!cfg.settings) cfg.settings = {};
+
+      const settingsItems = [
+        { id: "review_day", name: `review_day          ${(cfg.settings.review_day || "Sunday").toString().padEnd(12)}Weekly review day` },
+        { id: "track_food", name: `track_food          ${(cfg.settings.track_food !== undefined ? (cfg.settings.track_food ? "on" : "off") : "on").padEnd(12)}Track food in daily notes` },
+        { id: "track_sleep", name: `track_sleep         ${(cfg.settings.track_sleep !== undefined ? (cfg.settings.track_sleep ? "on" : "off") : "on").padEnd(12)}Track sleep in daily notes` },
+        { id: "friction_level", name: `friction_level      ${(cfg.settings.friction_level || 3).toString().padEnd(12)}Max friction level (1-4)` },
+      ];
+      const settingsPick = await interactiveSelect(settingsItems);
+      if (!settingsPick) { editingSettings = false; break; }
       const meta = KNOWN_SETTINGS[settingsPick];
       if (meta) {
-        const cfgPath = path.join(os.homedir(), ".mover", "config.json");
-        let cfg = {};
-        if (fs.existsSync(cfgPath)) { try { cfg = JSON.parse(fs.readFileSync(cfgPath, "utf8")); } catch {} }
-        if (!cfg.settings) cfg.settings = {};
         if (meta.type === "boolean") {
           cfg.settings[settingsPick] = !(cfg.settings[settingsPick] !== undefined ? cfg.settings[settingsPick] : meta.defaults);
           statusLine("ok", settingsPick, cfg.settings[settingsPick] ? "on" : "off");
         } else {
-          const answer = await textInput({ label: settingsPick, initial: String(meta.defaults) });
+          const answer = await textInput({ label: settingsPick, initial: String(cfg.settings[settingsPick] !== undefined ? cfg.settings[settingsPick] : meta.defaults) });
           if (answer !== null && answer.trim() !== "") {
             cfg.settings[settingsPick] = meta.type === "number" ? parseInt(answer.trim(), 10) : answer.trim();
             statusLine("ok", settingsPick, JSON.stringify(cfg.settings[settingsPick]));
@@ -5840,6 +5865,39 @@ async function main() {
     }
   }
 
+  // ── Confirmation gate — show what will be installed ──
+  {
+    barLn();
+    question(bold("Review your selections:"));
+    barLn();
+    barLn(`  ${bold("Vault:")}       ${vaultPath}`);
+    barLn(`  ${bold("Agents:")}      ${selectedAgents.map((a) => a.name).join(", ")}`);
+    if (installSkills && selectedCategories) {
+      barLn(`  ${bold("Skills:")}      ${[...selectedCategories].join(", ")}`);
+    } else if (installSkills) {
+      barLn(`  ${bold("Skills:")}      all categories`);
+    } else {
+      barLn(`  ${bold("Skills:")}      none`);
+    }
+    if (selectedIds.includes("claude-code")) {
+      barLn(`  ${bold("Status line:")} ${installStatusLine ? "yes" : "no"}`);
+    }
+    barLn(`  ${bold("Prayer:")}      ${prayerSetup ? "yes" : "no"}`);
+    barLn();
+
+    const confirmChoice = await interactiveSelect(
+      [
+        { id: "yes", name: "Install", tier: "Proceed with the selections above" },
+        { id: "no", name: "Cancel", tier: "Go back and start over" },
+      ],
+      { multi: false, defaultIndex: 0 }
+    );
+    if (!confirmChoice || confirmChoice === "no") {
+      outro("Cancelled.");
+      return;
+    }
+  }
+
   // ── Install with animated spinners ──
   barLn();
   question(bold("Installing..."));

package/package.json

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