mover-os 4.4.0 → 4.4.2

package/install.js

@@ -343,7 +343,16 @@ function textInput({ label = "", initial = "", mask = null, placeholder = "" })
           value = value.slice(0, pos) + value.slice(pos + 1);
         }
       }
-      else if (data.startsWith("\x1b")) { /* ignore escape sequences */ }
+      else if (data === "\x1b") {
+        // Escape — cancel input
+        stdin.removeListener("data", handler);
+        stdin.setRawMode(false);
+        stdin.pause();
+        ln();
+        resolve(null);
+        return;
+      }
+      else if (data.startsWith("\x1b")) { /* ignore other escape sequences */ }
       else {
         for (const ch of data) {
           if (ch.charCodeAt(0) >= 32) {
@@ -420,8 +429,8 @@ function interactiveSelect(items, { multi = false, preSelected = [], defaultInde
       lines++;
 
       const hint = multi
-        ? dim("  ↑↓ navigate  space select  a all  enter confirm")
-        : dim("  ↑↓ navigate  enter select");
+        ? dim("  ↑↓ navigate  space select  a all  enter confirm  esc back")
+        : dim("  ↑↓ navigate  enter select  esc back");
       w(`\x1b[2K${BAR_COLOR}│${S.reset}${hint}\n`);
       lines++;
 
@@ -467,6 +476,20 @@ function interactiveSelect(items, { multi = false, preSelected = [], defaultInde
         }
         return;
       }
+      else if (data === "\x1b" || data === "\x1b\x1b" || (!multi && data === "q")) {
+        // Escape — go back / cancel
+        stdin.removeListener("data", handler);
+        stdin.setRawMode(false);
+        stdin.pause();
+        if (prevLines > 0) {
+          w(`\x1b[${prevLines}A`);
+          for (let i = 0; i < prevLines; i++) w("\x1b[2K\n");
+          w(`\x1b[${prevLines}A`);
+        }
+        w(S.show);
+        resolve(null);
+        return;
+      }
       else if (data === "\x03") { cleanup(); ln(); process.exit(0); }
 
       render();
@@ -655,6 +678,7 @@ function parseArgs() {
     if (a === "--key" && args[i + 1]) { opts.key = args[++i]; continue; }
     // 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 === "--help" || a === "-h") {
       ln();
       ln(`  ${bold("moveros")} ${dim("— the Mover OS companion CLI")}`);
@@ -708,6 +732,17 @@ function detectObsidianVaults() {
   }
 }
 
+function compareVersions(a, b) {
+  const pa = a.split(".").map(Number);
+  const pb = b.split(".").map(Number);
+  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
+    const va = pa[i] || 0, vb = pb[i] || 0;
+    if (va > vb) return 1;
+    if (va < vb) return -1;
+  }
+  return 0;
+}
+
 // ─── Change detection (update mode) ─────────────────────────────────────────
 function detectChanges(bundleDir, vaultPath, selectedAgentIds) {
   const home = os.homedir();
@@ -2995,8 +3030,10 @@ async function cmdCapture(opts) {
         { id: "link", name: "Link", tier: "URL with optional note" },
         { id: "dump", name: "Brain dump", tier: "Free-form text" },
       ], { multi: false });
+      if (!type) return;
     }
     content = await textInput({ label: `Enter ${type}:` });
+    if (content === null) return;
   }
   if (!type) type = "task";
 
@@ -3052,6 +3089,7 @@ async function cmdWho(opts) {
       { id: "yes", name: "Create stub", tier: `Creates ${name}.md in People/` },
       { id: "no", name: "Skip", tier: "" },
     ], { multi: false });
+    if (!create) return;
     if (create === "yes") {
       const peopleDir = path.join(entitiesDir, "People");
       fs.mkdirSync(peopleDir, { recursive: true });
@@ -3503,10 +3541,14 @@ async function cmdPrayer(opts) {
   barLn();
   const choice = await interactiveSelect(items, { multi: false });
 
+  if (!choice || choice === "back") return;
+
   if (choice === "fetch") {
     barLn();
     const city = await textInput({ label: "City", placeholder: "London" });
+    if (city === null) return;
     const country = await textInput({ label: "Country", placeholder: "United Kingdom" });
+    if (country === null) return;
     barLn();
 
     if (city && country) {
@@ -3532,7 +3574,7 @@ async function cmdPrayer(opts) {
     barLn(dim("  Format examples:"));
     barLn(dim("    2026-03-08  05:20  13:00  16:15  18:01  19:45"));
     barLn(dim("    March 8: Fajr 05:20, Dhuhr 13:00, Asr 16:15, Maghrib 18:01, Isha 19:45"));
-    barLn(dim("  Type 'done' on a new line when finished."));
+    barLn(dim("  Type 'done' or press Enter on empty line to finish. 'back' to cancel."));
     barLn();
 
     const lines = [];
@@ -3540,7 +3582,14 @@ async function cmdPrayer(opts) {
     await new Promise((resolve) => {
       const ask = () => {
         rl.question(`${BAR_COLOR}\u2502${S.reset}  `, (line) => {
-          if (line.trim().toLowerCase() === "done" || line.trim() === "") {
+          const t = line.trim().toLowerCase();
+          if (t === "done" || t === "") {
+            rl.close();
+            resolve();
+            return;
+          }
+          if (t === "back" || t === "cancel") {
+            lines.length = 0; // clear
             rl.close();
             resolve();
             return;
@@ -3649,7 +3698,7 @@ async function cmdBackup(opts) {
   ];
 
   const choices = await interactiveSelect(items, { multi: true, preSelected: ["engine"] });
-  if (choices.length === 0) { barLn(dim("  Cancelled.")); return; }
+  if (!choices || choices.length === 0) { barLn(dim("  Cancelled.")); return; }
 
   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")}`;
@@ -4215,6 +4264,39 @@ async function main() {
     process.exit(1);
   }
 
+  // ── CLI self-update check ──
+  if (opts.command === "update" && !opts._selfUpdated) {
+    try {
+      const localVer = require("./package.json").version;
+      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 sp = spinner("Updating CLI");
+        try {
+          execSync("npm i -g mover-os", { stdio: "ignore", timeout: 60000 });
+          sp.stop(`CLI updated to ${npmVer}`);
+          barLn(dim("  Re-running with updated CLI..."));
+          barLn();
+          // Re-exec with new code — pass args through, add flag to prevent loop
+          const args = process.argv.slice(2).concat("--_self-updated");
+          const { spawnSync } = require("child_process");
+          const result = spawnSync(process.argv[0], [process.argv[1], ...args], {
+            stdio: "inherit", cwd: process.cwd(),
+          });
+          process.exit(result.status || 0);
+        } catch (e) {
+          sp.stop(yellow(`CLI self-update failed: ${e.message}`));
+          barLn(dim("  Continuing with current version..."));
+        }
+      } else {
+        barLn(`${green("\u2713")} ${dim("CLI is up to date")} ${dim(`(${localVer})`)}`);
+      }
+    } catch {
+      barLn(dim("  Could not check for CLI updates (offline?)"));
+    }
+    barLn();
+  }
+
   // ── Headless quick update ──
   if (opts.command === "update") {
     // Validate stored key
@@ -4347,6 +4429,7 @@ async function main() {
         mask: "\u25AA",
         placeholder: "MOVER-XXXX-XXXX",
       });
+      if (key === null) return;
 
       const sp = spinner("Validating...");
       const valid = await validateKey(key);
@@ -4433,12 +4516,14 @@ async function main() {
       });
 
       const selected = await interactiveSelect(vaultItems, { multi: false });
+      if (!selected) return;
 
       if (selected === "__manual__") {
         vaultPath = await textInput({
           label: "Where is your Obsidian vault?",
           initial: path.join(os.homedir(), "Mover-OS"),
         });
+        if (vaultPath === null) return;
       } else {
         vaultPath = selected;
       }
@@ -4447,6 +4532,7 @@ async function main() {
         label: "Where is your Obsidian vault?",
         initial: path.join(os.homedir(), "Mover-OS"),
       });
+      if (vaultPath === null) return;
     }
   } else {
     barLn(dim(`Vault: ${vaultPath}`));
@@ -4483,6 +4569,7 @@ async function main() {
       ],
       { multi: false, defaultIndex: 0 }
     );
+    if (!installMode) return;
   }
 
   // ── Uninstall flow ──
@@ -4522,7 +4609,7 @@ async function main() {
       preSelected: ["engine"],
     });
 
-    if (backupChoices.length > 0 && !(backupChoices.length === 1 && backupChoices.includes("skip"))) {
+    if (backupChoices && backupChoices.length > 0 && !(backupChoices.length === 1 && backupChoices.includes("skip"))) {
       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");
@@ -4685,12 +4772,13 @@ async function main() {
     multi: true,
     preSelected: detectedIds,
   });
+  if (!selectedIds) return;
   const selectedAgents = AGENTS.filter((a) => selectedIds.includes(a.id));
 
   if (selectedAgents.length === 0) {
     barLn(yellow("No agents selected."));
     outro("Cancelled.");
-    process.exit(0);
+    return;
   }
 
   // ── Change detection + selection (update mode only) ──
@@ -4735,9 +4823,9 @@ async function main() {
         { multi: false, defaultIndex: 0 }
       );
 
-      if (applyChoice === "cancel") {
+      if (!applyChoice || applyChoice === "cancel") {
         outro("Cancelled.");
-        process.exit(0);
+        return;
       }
 
       if (applyChoice === "select") {
@@ -4771,6 +4859,7 @@ async function main() {
             multi: true,
             preSelected: changedPreSelected,
           });
+          if (!selectedFileIds) return;
 
           // Build workflow filter Set
           const selectedWfFiles = selectedFileIds
@@ -4817,6 +4906,7 @@ async function main() {
       multi: true,
       preSelected,
     });
+    if (!selectedCatIds) return;
 
     installSkills = selectedCatIds.length > 0;
     if (installSkills) {
@@ -4843,6 +4933,7 @@ async function main() {
       ],
       { multi: false, defaultIndex: 0 }
     );
+    if (!slChoice) return;
     installStatusLine = slChoice === "yes";
   }
 
@@ -4862,6 +4953,7 @@ async function main() {
       ],
       { multi: false, defaultIndex: 1 }
     );
+    if (!ptChoice) return;
     if (ptChoice === "yes") {
       prayerSetup = true;
       barLn();
@@ -4876,6 +4968,7 @@ async function main() {
         ],
         { multi: false, defaultIndex: 0 }
       );
+      if (!method || method === "later") { /* skip */ }
 
       const moverDir = path.join(os.homedir(), ".mover");
       if (!fs.existsSync(moverDir)) fs.mkdirSync(moverDir, { recursive: true, mode: 0o700 });
@@ -4887,7 +4980,7 @@ async function main() {
         barLn(dim("    2026-03-08  05:20  13:00  16:15  18:01  19:45"));
         barLn(dim("    March 8: Fajr 05:20, Dhuhr 13:00, Asr 16:15, Maghrib 18:01, Isha 19:45"));
         barLn(dim("  Or paste a whole table — the system will parse it."));
-        barLn(dim("  When done, type 'done' on a new line and press Enter."));
+        barLn(dim("  Type 'done' or press Enter on empty line to finish. 'back' to cancel."));
         barLn();
 
         const lines = [];
@@ -4895,7 +4988,14 @@ async function main() {
         await new Promise((resolve) => {
           const ask = () => {
             rl.question(`${BAR_COLOR}\u2502${S.reset}  `, (line) => {
-              if (line.trim().toLowerCase() === "done" || line.trim() === "") {
+              const t = line.trim().toLowerCase();
+              if (t === "done" || t === "") {
+                rl.close();
+                resolve();
+                return;
+              }
+              if (t === "back" || t === "cancel") {
+                lines.length = 0;
                 rl.close();
                 resolve();
                 return;
@@ -4920,7 +5020,9 @@ async function main() {
       } else if (method === "fetch") {
         barLn();
         const city = await textInput({ label: "City (e.g. London, Watford, Istanbul)", placeholder: "London" });
+        if (city === null) break;
         const country = await textInput({ label: "Country", placeholder: "United Kingdom" });
+        if (country === null) break;
         barLn();
 
         if (city && country) {

package/package.json

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