mover-os 4.6.1 → 4.6.3

package/install.js

@@ -199,15 +199,23 @@ async function printHeader(animate = IS_TTY) {
   ln(`  ${dim(`v${pkgVer}`)}  ${gray("the agentic operating system for obsidian")}${infoRight ? `  ${infoRight}` : ""}`);
 
   // Non-blocking update check
+  let _updateAvailable = null;
   try {
     const latest = execSync("npm view mover-os version", { encoding: "utf8", timeout: 5000 }).trim();
     if (latest && latest !== pkgVer && compareVersions(latest, pkgVer) > 0) {
-      ln(`  ${yellow(`Update available: v${pkgVer} → v${latest}`)}  ${dim(`run ${bold("moveros update")}`)}`);
+      _updateAvailable = latest;
     }
   } catch {}
 
   ln();
-  ln(gray("  ─────────────────────────────────────────────"));
+  if (_updateAvailable) {
+    ln(`  ${yellow("┌──────────────────────────────────────────┐")}`);
+    ln(`  ${yellow("│")}  Update available: ${dim(`v${pkgVer}`)} ${dim("\u2192")} ${green(`v${_updateAvailable}`)}${" ".repeat(Math.max(0, 16 - _updateAvailable.length - pkgVer.length))}${yellow("│")}`);
+    ln(`  ${yellow("│")}  Run ${bold("moveros update")} to get the latest       ${yellow("│")}`);
+    ln(`  ${yellow("└──────────────────────────────────────────┘")}`);
+  } else {
+    ln(gray("  ─────────────────────────────────────────────"));
+  }
   ln();
 }
 
@@ -5248,8 +5256,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);
         }
       }
@@ -5268,10 +5276,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);
           }
         }
@@ -5656,7 +5664,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")) {
@@ -5684,8 +5692,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;
@@ -5827,74 +5835,108 @@ async function main() {
     }
   }
 
-  // ── Settings step — let user configure before install (loops until esc) ──
+  // ── Confirmation gate — review and optionally change selections ──
   {
-    barLn();
-    question("Configure settings " + dim("(esc to continue with defaults)"));
-    barLn();
-    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 = {};
+    let confirmed = false;
+    while (!confirmed) {
+      barLn();
+      question(bold("Review your selections") + dim("  (enter to change, esc to cancel)"));
+      barLn();
 
-      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 agentNames = selectedAgents.map((a) => a.name).join(", ");
+      const skillsLabel = doInstallSkills && selectedCategories
+        ? [...selectedCategories].join(", ")
+        : doInstallSkills ? "all categories" : "none";
+      const slLabel = selectedIds.includes("claude-code") ? (installStatusLine ? "yes" : "no") : null;
+
+      const reviewItems = [
+        { id: "_install", name: green(bold("  Install")), tier: "Proceed with the selections above" },
+        { id: "agents", name: `Agents          ${dim(agentNames)}`, tier: "Change which AI agents to install for" },
+        { id: "skills", name: `Skills          ${dim(skillsLabel)}`, tier: "Change skill categories" },
       ];
-      const settingsPick = await interactiveSelect(settingsItems);
-      if (!settingsPick) { editingSettings = false; break; }
-      const meta = KNOWN_SETTINGS[settingsPick];
-      if (meta) {
-        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(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]));
-          }
-        }
-        fs.mkdirSync(path.dirname(cfgPath), { recursive: true });
-        fs.writeFileSync(cfgPath, JSON.stringify(cfg, null, 2), "utf8");
+      if (slLabel !== null) {
+        reviewItems.push({ id: "statusline", name: `Status line     ${dim(slLabel)}`, tier: "Toggle Claude Code status line" });
       }
-    }
-  }
+      reviewItems.push({ id: "settings", name: `Settings        ${dim("enter to configure")}`, tier: "Configure review_day, tracking, friction level" });
 
-  // ── 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 pick = await interactiveSelect(reviewItems, { defaultIndex: 0 });
+      if (!pick) { outro("Cancelled."); return; }
 
-    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;
+      if (pick === "_install") {
+        confirmed = true;
+      } else if (pick === "agents") {
+        barLn();
+        question("Select your AI agents");
+        const agentItems = AGENTS.map((a) => {
+          const detected = a.detect();
+          return { id: a.id, name: `${a.name}${detected ? dim("  (detected)") : ""}`, tier: dim(a.tier), _detected: detected };
+        });
+        const newIds = await interactiveSelect(agentItems, { multi: true, preSelected: selectedIds });
+        if (newIds && newIds.length > 0) {
+          selectedIds.length = 0;
+          newIds.forEach((id) => selectedIds.push(id));
+          selectedAgents.length = 0;
+          AGENTS.filter((a) => selectedIds.includes(a.id)).forEach((a) => selectedAgents.push(a));
+        }
+      } else if (pick === "skills") {
+        barLn();
+        const allSkills = findSkills(bundleDir);
+        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),
+        }));
+        question("Select skill categories:");
+        const newCats = await interactiveSelect(categoryItems, { multi: true, preSelected: selectedCategories ? [...selectedCategories] : ["development", "obsidian"] });
+        if (newCats) {
+          doInstallSkills = newCats.length > 0;
+          selectedCategories = doInstallSkills ? new Set(newCats) : null;
+        }
+      } else if (pick === "statusline") {
+        installStatusLine = !installStatusLine;
+      } else if (pick === "settings") {
+        // Re-enter settings loop
+        barLn();
+        question("Configure settings " + dim("(enter to toggle/edit, esc to go back)"));
+        barLn();
+        const sCfgPath = path.join(os.homedir(), ".mover", "config.json");
+        let sCfg = {};
+        if (fs.existsSync(sCfgPath)) { try { sCfg = JSON.parse(fs.readFileSync(sCfgPath, "utf8")); } catch {} }
+        if (!sCfg.settings) sCfg.settings = {};
+        const installSettings = [
+          { key: "track_food",     label: "Track food",     desc: "Track meals in daily notes" },
+          { key: "track_sleep",    label: "Track sleep",    desc: "Track sleep in daily notes" },
+          { key: "friction_level", label: "Friction level", desc: "AI pushback intensity (1=gentle, 4=hard block)" },
+          { key: "review_day",     label: "Review day",     desc: "Day for weekly review" },
+        ];
+        let sLoop = true;
+        while (sLoop) {
+          const sItems = installSettings.map((s) => {
+            const meta = KNOWN_SETTINGS[s.key];
+            const val = sCfg.settings[s.key] !== undefined ? sCfg.settings[s.key] : meta.defaults;
+            const display = meta.type === "boolean" ? (val ? green("on") : dim("off")) : String(val);
+            return { id: s.key, name: `${s.label.padEnd(18)}${display}`, tier: s.desc };
+          });
+          const sPick = await interactiveSelect(sItems);
+          if (!sPick) { sLoop = false; break; }
+          const sMeta = KNOWN_SETTINGS[sPick];
+          if (sMeta) {
+            if (sMeta.type === "boolean") {
+              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;
+            } 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];
+            }
+            fs.mkdirSync(path.dirname(sCfgPath), { recursive: true });
+            fs.writeFileSync(sCfgPath, JSON.stringify(sCfg, null, 2), "utf8");
+          }
+        }
+      }
     }
   }
 
@@ -5954,7 +5996,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);

package/package.json

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