mover-os 4.0.8 → 4.0.10

package/install.js

@@ -251,7 +251,7 @@ function interactiveSelect(items, { multi = false, preSelected = [], defaultInde
         let tierLabel = "";
         if (item.tier === "Full") tierLabel = `${S.green}Full${S.reset}`;
         else if (item.tier === "Enhanced") tierLabel = `${S.cyan}Enhanced${S.reset}`;
-        else if (item.tier === "Basic+" || item.tier === "Basic") tierLabel = `${S.gray}${item.tier}${S.reset}`;
+        else if (item.tier === "Basic") tierLabel = `${S.gray}Basic${S.reset}`;
         else if (item.tier === "recommended") tierLabel = `${S.green}recommended${S.reset}`;
         else if (item.tier) tierLabel = dim(item.tier);
 
@@ -397,6 +397,9 @@ async function runUninstall(vaultPath) {
     { label: "Antigravity rules", path: path.join(home, ".gemini", "GEMINI.md") },
     { label: "Antigravity workflows", path: path.join(home, ".gemini", "antigravity", "global_workflows"), dir: true },
     { label: "Codex instructions", path: path.join(home, ".codex", "instructions.md") },
+    { label: "Codex skills", path: path.join(home, ".codex", "skills"), dir: true },
+    { label: "Windsurf skills", path: path.join(home, ".windsurf", "skills"), dir: true },
+    { label: "Antigravity skills", path: path.join(home, ".gemini", "antigravity", "skills"), dir: true },
     { label: "Claude Code hooks", path: path.join(home, ".claude", "hooks"), dir: true },
   ];
 
@@ -466,6 +469,7 @@ async function runUninstall(vaultPath) {
 
 // ─── Agent definitions ──────────────────────────────────────────────────────
 const AGENTS = [
+  // ── Full (rules + skills + commands/workflows + hooks) ──
   {
     id: "claude-code",
     name: "Claude Code",
@@ -484,54 +488,62 @@ const AGENTS = [
     tier: "Full",
     detect: () => globDirExists(path.join(os.homedir(), ".vscode", "extensions"), "saoudrizwan.claude-dev-*"),
   },
-  {
-    id: "codex",
-    name: "Codex CLI",
-    tier: "Enhanced",
-    detect: () => cmdExists("codex") || fs.existsSync(path.join(os.homedir(), ".codex")),
-  },
   {
     id: "windsurf",
     name: "Windsurf",
-    tier: "Enhanced",
+    tier: "Full",
     detect: () => fs.existsSync(path.join(os.homedir(), ".windsurf")) || cmdExists("windsurf"),
   },
   {
-    id: "openclaw",
-    name: "OpenClaw",
+    id: "gemini-cli",
+    name: "Gemini CLI",
+    tier: "Full",
+    detect: () => cmdExists("gemini") || fs.existsSync(path.join(os.homedir(), ".gemini", "settings.json")),
+  },
+  {
+    id: "copilot",
+    name: "GitHub Copilot",
+    tier: "Full",
+    detect: () => cmdExists("gh"),
+  },
+  // ── Enhanced (rules + skills) ──
+  {
+    id: "codex-cli",
+    name: "Codex CLI",
     tier: "Enhanced",
-    detect: () => fs.existsSync(path.join(os.homedir(), ".openclaw")) || cmdExists("openclaw"),
+    detect: () => cmdExists("codex") || fs.existsSync(path.join(os.homedir(), ".codex")),
   },
   {
-    id: "gemini-cli",
-    name: "Gemini CLI",
+    id: "codex-cloud",
+    name: "Codex (Cloud)",
     tier: "Enhanced",
-    detect: () => cmdExists("gemini") || fs.existsSync(path.join(os.homedir(), ".gemini", "settings.json")),
+    detect: () => false, // Browser-based — no local detection possible
   },
   {
     id: "antigravity",
     name: "Antigravity",
-    tier: "Basic+",
+    tier: "Enhanced",
     detect: () => fs.existsSync(path.join(os.homedir(), ".gemini", "antigravity")),
   },
+  {
+    id: "openclaw",
+    name: "OpenClaw",
+    tier: "Enhanced",
+    detect: () => fs.existsSync(path.join(os.homedir(), ".openclaw")) || cmdExists("openclaw"),
+  },
   {
     id: "roo-code",
     name: "Roo Code",
-    tier: "Basic",
+    tier: "Enhanced",
     detect: () => globDirExists(path.join(os.homedir(), ".vscode", "extensions"), "rooveterinaryinc.roo-cline-*"),
   },
-  {
-    id: "copilot",
-    name: "GitHub Copilot",
-    tier: "Basic",
-    detect: () => cmdExists("gh"),
-  },
   {
     id: "amp",
     name: "Amp",
-    tier: "Basic",
+    tier: "Enhanced",
     detect: () => cmdExists("amp") || fs.existsSync(path.join(os.homedir(), ".amp")),
   },
+  // ── Basic (rules only) ──
   {
     id: "aider",
     name: "Aider",
@@ -589,6 +601,72 @@ function copyDirRecursive(src, dest) {
   }
 }
 
+// ─── Skill categories (maps skill folder name → category) ───────────────────
+const SKILL_CATEGORIES = {
+  // Development
+  "agent-code-reviewer": "development",
+  "agent-security-auditor": "development",
+  "systematic-debugging": "development",
+  "find-bugs": "development",
+  "refactoring": "development",
+  "react-best-practices": "development",
+  "webhook-handler-patterns": "development",
+  // Marketing
+  "copywriting": "marketing",
+  "copy-editing": "marketing",
+  "seo-audit": "marketing",
+  "seo-content-writer": "marketing",
+  "social-content": "marketing",
+  "email-sequence": "marketing",
+  "paid-ads": "marketing",
+  "analytics-tracking": "marketing",
+  "human-writer": "marketing",
+  "marketing-ideas": "marketing",
+  "marketing-psychology": "marketing",
+  "ab-test-setup": "marketing",
+  // CRO
+  "page-cro": "cro",
+  "form-cro": "cro",
+  "signup-flow-cro": "cro",
+  "onboarding-cro": "cro",
+  "popup-cro": "cro",
+  "paywall-upgrade-cro": "cro",
+  // Strategy
+  "pricing-strategy": "strategy",
+  "launch-strategy": "strategy",
+  "competitor-alternatives": "strategy",
+  "free-tool-strategy": "strategy",
+  "referral-program": "strategy",
+  "agent-strategy-analyst": "strategy",
+  "agent-research-analyst": "strategy",
+  "agent-content-researcher": "strategy",
+  // SEO
+  "programmatic-seo": "seo",
+  "schema-markup": "seo",
+  // Design
+  "frontend-design": "design",
+  "ui-ux-pro-max": "design",
+  // Obsidian
+  "obsidian-markdown": "obsidian",
+  "obsidian-bases": "obsidian",
+  "obsidian-cli": "obsidian",
+  "json-canvas": "obsidian",
+  // Tools (always installed — core utilities)
+  "defuddle": "tools",
+  "skill-creator": "tools",
+  "find-skills": "tools",
+};
+
+const CATEGORY_META = [
+  { id: "development", name: "Development", desc: "code review, debugging, security" },
+  { id: "marketing", name: "Marketing", desc: "copy, SEO, social, email, ads" },
+  { id: "cro", name: "CRO", desc: "page optimization, forms, popups" },
+  { id: "strategy", name: "Strategy", desc: "pricing, launch, competitors" },
+  { id: "seo", name: "SEO", desc: "programmatic SEO, schema markup" },
+  { id: "design", name: "Design", desc: "frontend, UI/UX" },
+  { id: "obsidian", name: "Obsidian", desc: "markdown, bases, canvas, CLI" },
+];
+
 function findSkills(bundleDir) {
   const skillsDir = path.join(bundleDir, "src", "skills");
   if (!fs.existsSync(skillsDir)) return [];
@@ -598,7 +676,7 @@ function findSkills(bundleDir) {
       const full = path.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (fs.existsSync(path.join(full, "SKILL.md"))) {
-          skills.push({ name: entry.name, path: full });
+          skills.push({ name: entry.name, path: full, category: SKILL_CATEGORIES[entry.name] || "tools" });
         } else {
           walk(full);
         }
@@ -832,11 +910,13 @@ function installRules(bundleDir, destPath) {
   return linkOrCopy(src, destPath) !== null;
 }
 
-function installSkillPacks(bundleDir, destDir) {
+function installSkillPacks(bundleDir, destDir, selectedCategories) {
   const skills = findSkills(bundleDir);
   fs.mkdirSync(destDir, { recursive: true });
   let count = 0;
   for (const skill of skills) {
+    // Filter by category if categories were selected (tools always installed)
+    if (selectedCategories && skill.category !== "tools" && !selectedCategories.has(skill.category)) continue;
     const dest = path.join(destDir, skill.name);
     if (fs.existsSync(dest)) fs.rmSync(dest, { recursive: true, force: true });
     copyDirRecursive(skill.path, dest);
@@ -870,7 +950,7 @@ function installHooksForClaude(bundleDir, vaultPath) {
 }
 
 // ─── Per-agent install orchestrators ────────────────────────────────────────
-function installClaudeCode(bundleDir, vaultPath) {
+function installClaudeCode(bundleDir, vaultPath, skillOpts) {
   const home = os.homedir();
   const steps = [];
 
@@ -882,9 +962,11 @@ function installClaudeCode(bundleDir, vaultPath) {
   const wfCount = installWorkflows(bundleDir, cmdsDir);
   if (wfCount > 0) steps.push(`${wfCount} commands`);
 
-  const skillsDir = path.join(claudeDir, "skills");
-  const skCount = installSkillPacks(bundleDir, skillsDir);
-  if (skCount > 0) steps.push(`${skCount} skills`);
+  if (skillOpts && skillOpts.install) {
+    const skillsDir = path.join(claudeDir, "skills");
+    const skCount = installSkillPacks(bundleDir, skillsDir, skillOpts.categories);
+    if (skCount > 0) steps.push(`${skCount} skills`);
+  }
 
   if (vaultPath) {
     const hkCount = installHooksForClaude(bundleDir, vaultPath);
@@ -894,7 +976,7 @@ function installClaudeCode(bundleDir, vaultPath) {
   return steps;
 }
 
-function installCursor(bundleDir, vaultPath) {
+function installCursor(bundleDir, vaultPath, skillOpts) {
   const home = os.homedir();
   const steps = [];
 
@@ -913,14 +995,16 @@ function installCursor(bundleDir, vaultPath) {
   const wfCount = installWorkflows(bundleDir, cmdsDir);
   if (wfCount > 0) steps.push(`${wfCount} commands`);
 
-  const skillsDir = path.join(home, ".cursor", "skills");
-  const skCount = installSkillPacks(bundleDir, skillsDir);
-  if (skCount > 0) steps.push(`${skCount} skills`);
+  if (skillOpts && skillOpts.install) {
+    const skillsDir = path.join(home, ".cursor", "skills");
+    const skCount = installSkillPacks(bundleDir, skillsDir, skillOpts.categories);
+    if (skCount > 0) steps.push(`${skCount} skills`);
+  }
 
   return steps;
 }
 
-function installCline(bundleDir, vaultPath) {
+function installCline(bundleDir, vaultPath, skillOpts) {
   const steps = [];
 
   if (vaultPath) {
@@ -932,39 +1016,62 @@ function installCline(bundleDir, vaultPath) {
       steps.push("rules");
     }
 
-    const skillsDir = path.join(vaultPath, ".cline", "skills");
-    const skCount = installSkillPacks(bundleDir, skillsDir);
-    if (skCount > 0) steps.push(`${skCount} skills`);
+    if (skillOpts && skillOpts.install) {
+      const skillsDir = path.join(vaultPath, ".cline", "skills");
+      const skCount = installSkillPacks(bundleDir, skillsDir, skillOpts.categories);
+      if (skCount > 0) steps.push(`${skCount} skills`);
+    }
   }
 
   return steps;
 }
 
-function installCodex(bundleDir, vaultPath) {
+function installCodexCli(bundleDir, vaultPath, skillOpts) {
   const home = os.homedir();
   const steps = [];
 
-  if (vaultPath) {
-    fs.writeFileSync(path.join(vaultPath, "AGENTS.md"), generateAgentsMd(), "utf8");
-    steps.push("AGENTS.md");
-  }
-
   const codexDir = path.join(home, ".codex");
   fs.mkdirSync(codexDir, { recursive: true });
   if (installRules(bundleDir, path.join(codexDir, "instructions.md"))) steps.push("global instructions");
 
+  if (skillOpts && skillOpts.install) {
+    const skillsDir = path.join(codexDir, "skills");
+    const skCount = installSkillPacks(bundleDir, skillsDir, skillOpts.categories);
+    if (skCount > 0) steps.push(`${skCount} skills`);
+  }
+
+  return steps;
+}
+
+function installCodexCloud(bundleDir, vaultPath, skillOpts) {
+  const steps = [];
+
+  if (vaultPath && installSkills) {
+    const skillsDir = path.join(vaultPath, ".agents", "skills");
+    const skCount = installSkillPacks(bundleDir, skillsDir, skillOpts.categories);
+    if (skCount > 0) steps.push(`${skCount} skills`);
+  }
+
   return steps;
 }
 
-function installWindsurf(bundleDir, vaultPath) {
+function installWindsurf(bundleDir, vaultPath, skillOpts) {
+  const home = os.homedir();
   const steps = [];
   if (vaultPath) {
     if (installRules(bundleDir, path.join(vaultPath, ".windsurfrules"))) steps.push("rules");
   }
+
+  if (skillOpts && skillOpts.install) {
+    const skillsDir = path.join(home, ".windsurf", "skills");
+    const skCount = installSkillPacks(bundleDir, skillsDir, skillOpts.categories);
+    if (skCount > 0) steps.push(`${skCount} skills`);
+  }
+
   return steps;
 }
 
-function installOpenClaw(bundleDir, vaultPath) {
+function installOpenClaw(bundleDir, vaultPath, skillOpts) {
   const home = os.homedir();
   const workspace = path.join(home, ".openclaw", "workspace");
   const steps = [];
@@ -988,42 +1095,64 @@ function installOpenClaw(bundleDir, vaultPath) {
     steps.push("USER.md");
   }
 
-  const skCount = installSkillPacks(bundleDir, path.join(workspace, "skills"));
-  if (skCount > 0) steps.push(`${skCount} skills`);
+  if (skillOpts && skillOpts.install) {
+    const skCount = installSkillPacks(bundleDir, path.join(workspace, "skills"), skillOpts.categories);
+    if (skCount > 0) steps.push(`${skCount} skills`);
+  }
 
   return steps;
 }
 
-function installGeminiCli(bundleDir) {
+function installGeminiCli(bundleDir, vaultPath, skillOpts, writtenFiles) {
   const home = os.homedir();
   const steps = [];
 
   const geminiDir = path.join(home, ".gemini");
   fs.mkdirSync(geminiDir, { recursive: true });
-  if (installRules(bundleDir, path.join(geminiDir, "GEMINI.md"))) steps.push("rules");
+  const geminiMdPath = path.join(geminiDir, "GEMINI.md");
+  if (!writtenFiles.has(geminiMdPath)) {
+    if (installRules(bundleDir, geminiMdPath)) steps.push("rules");
+    writtenFiles.add(geminiMdPath);
+  } else {
+    steps.push("rules (shared)");
+  }
 
-  const skCount = installSkillPacks(bundleDir, path.join(geminiDir, "skills"));
-  if (skCount > 0) steps.push(`${skCount} skills`);
+  if (skillOpts && skillOpts.install) {
+    const skCount = installSkillPacks(bundleDir, path.join(geminiDir, "skills"), skillOpts.categories);
+    if (skCount > 0) steps.push(`${skCount} skills`);
+  }
 
   return steps;
 }
 
-function installAntigravity(bundleDir) {
+function installAntigravity(bundleDir, vaultPath, skillOpts, writtenFiles) {
   const home = os.homedir();
   const steps = [];
 
   const geminiDir = path.join(home, ".gemini");
   fs.mkdirSync(geminiDir, { recursive: true });
-  if (installRules(bundleDir, path.join(geminiDir, "GEMINI.md"))) steps.push("rules");
+  const geminiMdPath = path.join(geminiDir, "GEMINI.md");
+  if (!writtenFiles.has(geminiMdPath)) {
+    if (installRules(bundleDir, geminiMdPath)) steps.push("rules");
+    writtenFiles.add(geminiMdPath);
+  } else {
+    steps.push("rules (shared)");
+  }
 
   const wfDir = path.join(geminiDir, "antigravity", "global_workflows");
   const wfCount = installWorkflows(bundleDir, wfDir);
   if (wfCount > 0) steps.push(`${wfCount} workflows`);
 
+  if (skillOpts && skillOpts.install) {
+    const skillsDir = path.join(geminiDir, "antigravity", "skills");
+    const skCount = installSkillPacks(bundleDir, skillsDir, skillOpts.categories);
+    if (skCount > 0) steps.push(`${skCount} skills`);
+  }
+
   return steps;
 }
 
-function installRooCode(bundleDir, vaultPath) {
+function installRooCode(bundleDir, vaultPath, skillOpts) {
   const steps = [];
   if (vaultPath) {
     const rulesDir = path.join(vaultPath, ".roo", "rules");
@@ -1033,11 +1162,17 @@ function installRooCode(bundleDir, vaultPath) {
       fs.copyFileSync(src, path.join(rulesDir, "mover-os.md"));
       steps.push("rules");
     }
+
+    if (skillOpts && skillOpts.install) {
+      const skillsDir = path.join(vaultPath, ".roo", "skills");
+      const skCount = installSkillPacks(bundleDir, skillsDir, skillOpts.categories);
+      if (skCount > 0) steps.push(`${skCount} skills`);
+    }
   }
   return steps;
 }
 
-function installCopilot(bundleDir, vaultPath) {
+function installCopilot(bundleDir, vaultPath, skillOpts) {
   const steps = [];
   if (vaultPath) {
     const ghDir = path.join(vaultPath, ".github");
@@ -1047,21 +1182,31 @@ function installCopilot(bundleDir, vaultPath) {
       fs.copyFileSync(src, path.join(ghDir, "copilot-instructions.md"));
       steps.push("rules");
     }
+
+    if (skillOpts && skillOpts.install) {
+      const skillsDir = path.join(ghDir, "skills");
+      const skCount = installSkillPacks(bundleDir, skillsDir, skillOpts.categories);
+      if (skCount > 0) steps.push(`${skCount} skills`);
+    }
   }
   return steps;
 }
 
-function installAmp(bundleDir, vaultPath) {
+function installAmp(bundleDir, vaultPath, skillOpts) {
   const steps = [];
   if (vaultPath) {
-    fs.writeFileSync(path.join(vaultPath, "AGENTS.md"), generateAgentsMd(), "utf8");
-    steps.push("AGENTS.md");
     if (installRules(bundleDir, path.join(vaultPath, "AMP.md"))) steps.push("AMP.md");
+
+    if (skillOpts && skillOpts.install) {
+      const skillsDir = path.join(vaultPath, ".agents", "skills");
+      const skCount = installSkillPacks(bundleDir, skillsDir, skillOpts.categories);
+      if (skCount > 0) steps.push(`${skCount} skills`);
+    }
   }
   return steps;
 }
 
-function installAider(bundleDir, vaultPath) {
+function installAider(bundleDir, vaultPath, skillOpts) {
   const steps = [];
   if (vaultPath) {
     const agentsMdPath = path.join(vaultPath, "AGENTS.md");
@@ -1083,7 +1228,8 @@ const AGENT_INSTALLERS = {
   "claude-code": installClaudeCode,
   cursor: installCursor,
   cline: installCline,
-  codex: installCodex,
+  "codex-cli": installCodexCli,
+  "codex-cloud": installCodexCloud,
   windsurf: installWindsurf,
   openclaw: installOpenClaw,
   "gemini-cli": installGeminiCli,
@@ -1298,19 +1444,39 @@ async function main() {
   // ── Skills ──
   const allSkills = findSkills(bundleDir);
   let installSkills = false;
+  let selectedCategories = null; // null = all, Set = filtered
 
   if (allSkills.length > 0 && selectedAgents.some((a) => ["Full", "Enhanced"].includes(a.tier))) {
-    question(`Install ${bold(String(allSkills.length))} skill packs?  ${dim("code review, marketing, security...")}`);
+    // Count skills per category
+    const catCounts = {};
+    for (const sk of allSkills) {
+      catCounts[sk.category] = (catCounts[sk.category] || 0) + 1;
+    }
+
+    question(`${bold(String(allSkills.length))} skill packs available. Select categories:`);
     barLn();
 
-    const skillChoice = await interactiveSelect(
-      [
-        { id: "yes", name: "Yes" },
-        { id: "no", name: "No" },
-      ],
-      { multi: false, defaultIndex: 0 }
-    );
-    installSkills = skillChoice === "yes";
+    const categoryItems = CATEGORY_META.map((c) => ({
+      id: c.id,
+      name: `${c.name}  ${dim(`(${catCounts[c.id] || 0})`)}`,
+      tier: dim(c.desc),
+    }));
+
+    // Pre-select Development + Obsidian (core categories everyone needs)
+    const preSelected = ["development", "obsidian"];
+
+    const selectedCatIds = await interactiveSelect(categoryItems, {
+      multi: true,
+      preSelected,
+    });
+
+    installSkills = selectedCatIds.length > 0;
+    if (skillOpts && skillOpts.install) {
+      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;
+      barLn(dim(`${skillCount} skills selected`));
+    }
   }
 
   // ── Install with animated spinners ──
@@ -1369,11 +1535,16 @@ 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 };
   for (const agent of selectedAgents) {
     const fn = AGENT_INSTALLERS[agent.id];
     if (!fn) continue;
     sp = spinner(agent.name);
-    const steps = (agent.id === "antigravity" || agent.id === "gemini-cli") ? fn(bundleDir) : fn(bundleDir, vaultPath);
+    const usesWrittenFiles = agent.id === "antigravity" || agent.id === "gemini-cli";
+    const steps = usesWrittenFiles
+      ? fn(bundleDir, vaultPath, skillOpts, writtenFiles)
+      : fn(bundleDir, vaultPath, skillOpts);
     await sleep(250);
     if (steps.length > 0) {
       sp.stop(`${agent.name}  ${dim(steps.join(", "))}`);
@@ -1384,8 +1555,8 @@ async function main() {
     }
   }
 
-  // 5. AGENTS.md — only for agents that need it
-  const needsAgentsMd = selectedAgents.some((a) => ["codex", "amp", "aider", "openclaw"].includes(a.id));
+  // 5. AGENTS.md — only for agents that need it (consolidated write)
+  const needsAgentsMd = selectedAgents.some((a) => ["codex-cli", "codex-cloud", "amp", "aider"].includes(a.id));
   if (needsAgentsMd) {
     fs.writeFileSync(path.join(vaultPath, "AGENTS.md"), generateAgentsMd(), "utf8");
     sp = spinner("AGENTS.md");

package/package.json

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

package/src/structure/02_Areas/Engine/Daily_Template.md

@@ -65,6 +65,10 @@ Break down the task blocks here
 
 - 09:00 -
 
+**Food:**
+
+**Sleep:** Total: | Deep:
+
 
 ---
 

package/src/workflows/analyse-day.md

@@ -27,6 +27,8 @@ LOAD (Memory Hierarchy):
 4. Identity_Prime.md (P3)
 5. Mover_Dossier.md (P3)
 6. Last 3 Daily Notes (P5) — yesterday + 2 days before, needed for multi-day pattern detection. Delegate reading to subagents (model: haiku) to keep main context clean. Extract: task completion rates, energy patterns, carry-over tasks, session log signals.
+7. Active project's `project_state.md` (P4) — get project path from Active_Context `## 4. TECHNICAL CONTEXT`. Read current phase, blockers, last milestone. Proactive load, not reactive.
+8. Active_Context `## 5. RECENT MEMORIES` / `## 5. ACTIVE SESSIONS` — rolling session buffer for operational context on recent work.
 
 CONSTRAINTS:
 - All verdicts grounded in log data, not assumptions
@@ -65,7 +67,7 @@ Read these files and extract the map:
 
 **From Strategy.md:** Primary Metric, Hypothesis, Daily Volume Targets, Variables, Constants.
 **From Identity_Prime.md:** Core Identity, Anti-Identity triggers, Non-negotiables.
-**From Active_Context.md:** Current project, phase, blockers, energy.
+**From Active_Context.md:** Current project, phase, blockers, energy. Also read `## 5. RECENT MEMORIES` / `## 5. ACTIVE SESSIONS` for operational context on what was worked on across recent sessions.
 **From Auto_Learnings.md:** Last 5 entries. Cross-reference with today's log.
 **From Daily Note:** Full content, especially Session Log and task list.
 
@@ -92,6 +94,20 @@ If yes: flag as RECURRING. If new pattern: flag as NEW.
 
 Perform these checks. Do not output this monologue directly.
 
+### 4A.pre Critical Path Check
+
+Before scoring strategy alignment, determine whether today's work is on the critical path. Uses project_state.md (loaded in Pre-Flight item 7) + sessions buffer (item 8).
+
+1. **What is the stated Single Test?** Read from today's Daily Note `## Focus` section.
+2. **What are its prerequisites?** Using project_state.md current phase, plan.md task dependencies, and Active_Context Technical Context, identify what must be done before the Single Test goal can be achieved.
+3. **Is today's work a direct prerequisite?** Classify today's actual work:
+   - `[DIRECT]` — working on the Single Test itself
+   - `[PREREQUISITE]` — working on something that unblocks the Single Test (strategic, not drift)
+   - `[DRIFT]` — unrelated work that doesn't advance the critical path
+4. **Low confidence guard:** If Confidence < 3 on prerequisite status, label as `[INFERRED]` and don't assert drift. "This appears to be prerequisite work, but I'm not certain of the dependency chain."
+
+Output: `Critical Path: [DIRECT|PREREQUISITE|DRIFT]` — this verdict feeds into 4A and 4E below.
+
 ### 4A. Strategy Audit
 Compare Daily Log inputs VS Strategy.md Targets.
 - Volume low? -> "Execution Failure" (Discipline issue).
@@ -135,6 +151,7 @@ Compare how the user spent their time vs what Strategy.md says the bottleneck is
 - If user spent time building/planning when the bottleneck is execution: call it out directly.
 - Be careful not to hallucinate — only flag if you have clear evidence from the Session Log and task list.
 - Confidence labeling required: this is inference, not fact.
+- **Use Critical Path verdict from 4A.pre:** If today's work is `[DIRECT]` or `[PREREQUISITE]`, it IS strategic even if it doesn't directly touch the Primary Metric. Only `[DRIFT]` work gets the normal leverage comparison. Prerequisite work that unblocks the Single Test is high-leverage by definition.
 
 **Leverage Check (Naval Framework):**
 Classify today's work on this axis — be honest, not generous:

package/src/workflows/log.md

@@ -27,6 +27,12 @@ git rev-parse --show-toplevel
 ```
 Save result as VAULT_ROOT. ALL Engine file paths below are relative to this root, NOT to the current working directory.
 
+WORKING DIRECTORY (capture project context):
+```bash
+pwd
+```
+Save as WORKING_DIR. Extract project name: if inside `01_Projects/[Name]/`, capture `[Name]`. Otherwise use the directory basename.
+
 DAILY NOTE PATH (derive from SESSION_END_TIME):
 ```
 {VAULT_ROOT}/02_Areas/Engine/Dailies/YYYY-MM/Daily - YYYY-MM-DD.md
@@ -81,7 +87,10 @@ Before reviewing history, determine the session type:
 - AUTONOMOUS sessions: mark ALL timestamps as `[AUTO]` and add note: "Agent-driven session. User may not have been present."
 - SEMI-AUTONOMOUS: mark agent-only work timestamps with `[AUTO]`, user-present segments with normal timestamps
 
-Tag the session log section: `### Session Log [ATTENDED]` or `### Session Log [AUTONOMOUS]` or `### Session Log [SEMI-AUTO]`
+Tag the session log section: `### Session Log [ATTENDED] — HH:MM-HH:MM [Platform] [Project]` or `### Session Log [AUTONOMOUS]` or `### Session Log [SEMI-AUTO]`
+
+Include WORKING_DIR project name in the session header. If the session spans multiple projects, note the primary one.
+Example: `### Session Log [ATTENDED] — 14:00-15:30 [Claude Code] [Mover OS Bundle]`
 
 ---
 

package/src/workflows/morning.md

@@ -61,6 +61,21 @@ If Active_Context is stale (>3 days): "Your context is [X] days old. Consider ru
 
 ---
 
+## 2.3 MONTHLY REVIEW CHECK
+
+Read `monthly_review_last_run` from Active_Context.md Workflow State.
+
+Quick date check (no subagent — pure math):
+- Is today within the **last 3 days of the month**?
+- Has `monthly_review_last_run` already fired this month?
+
+If last 3 days of month AND monthly review hasn't run this month:
+- "Monthly review hasn't run yet this month and the month ends in [X] days. Run `/review-week` before the month closes — it triggers monthly mode automatically on the last review-day."
+
+Otherwise: skip silently. No output.
+
+---
+
 ## 2.5 PROJECT PORTFOLIO (Quick Health Scan)
 
 Scan `{VAULT_ROOT}/01_Projects/` for all project folders. For each, check:

package/src/workflows/plan-tomorrow.md

@@ -26,6 +26,8 @@ LOAD (Memory Hierarchy):
 5. Mover_Dossier.md (P3)
 6. Goals.md (if exists)
 7. Last 3-5 Daily Notes (P5)
+8. Active project's `project_state.md` (P4) — get project path from Active_Context `## 4. TECHNICAL CONTEXT`. Read current phase, blockers, last milestone from Solutions Ledger and Changelog. Skip if no active project.
+9. Active_Context `## 5. RECENT MEMORIES` / `## 5. ACTIVE SESSIONS` — rolling session buffer for operational awareness of recent work across sessions.
 
 CONSTRAINTS:
 - All task selections grounded in Strategy.md or Identity_Prime.md
@@ -55,6 +57,15 @@ Is it after **6pm** AND `/analyse-day` has NOT been run today?
 
 If template missing: BLOCK. "Daily_Template.md not found. Create it or run `/setup`."
 
+### 1D. Monthly Review Check
+Read `monthly_review_last_run` from Active_Context.md Workflow State.
+- Is tomorrow within the **last 3 days of the month**?
+- Has `monthly_review_last_run` already fired this month?
+
+If last 3 days AND monthly hasn't run: SUGGEST (don't block). "Monthly review hasn't run yet and the month ends soon. Consider running `/review-week` before month-end — it auto-triggers monthly mode on the last review-day."
+
+Otherwise: skip silently.
+
 ---
 
 ## 2. RESILIENCE CHECK
@@ -123,11 +134,16 @@ If a project is mentioned:
 ## 4. STRATEGIC LOGIC
 
 ### 4A. Zombie Task Audit
+
+**Cardinal rule: The AI NEVER removes, kills, or drops a zombie task without explicit user confirmation. The task stays in the plan until the user decides. Surface the problem, don't solve it unilaterally.**
+
 Is there a task carried over > 2 times?
-- If yes: Flag it. "ZOMBIE TASK (x[N]): [Task]. This has been on your list for [N] days. That means you either don't want to do it, don't know how to do it, or it's not important enough. Which one?"
-- If x3+: ESCALATE. "This has been carried [X] times. Copying it forward again is not a plan. Three options: break it into a 15-minute first step, delegate it, or kill it. Carrying it forward is NOT an option."
-- If x5+: HARD BLOCK. "This task has been on your list for [X] days. It's dead weight. I'm removing it from tomorrow's plan unless you can tell me exactly when and how you'll do it."
-- Do NOT let the user say "I'll get to it tomorrow" without a specific time block and first step.
+
+- **x2:** Flag it. "ZOMBIE TASK (x2): [Task]. This has been on your list for 2 days. Three possible reasons: you don't want to do it, you don't know how to start, or it's not actually important. Which one?" **WAIT for the user's answer before proceeding.**
+- **x3-x4:** ESCALATE. "ZOMBIE (x[N]): [Task]. Carried [N] times. Three options: (1) Break it into a 15-minute first step, (2) Delegate it, (3) Kill it. Which one?" **WAIT for the user's choice. Do NOT auto-select. Task stays in plan until user decides.**
+- **x5+:** CRITICAL ZOMBIE. "CRITICAL ZOMBIE (x[N]): [Task] has been on your list for [N] days. Something is blocking this. What is it?" **WAIT for the user's response. Task remains in the plan until the user explicitly says to remove it. Never pre-emptively remove.**
+
+Do NOT let the user say "I'll get to it tomorrow" without a specific time block and first step.
 
 ### 4B. Dependency Awareness
 For each task, classify:
@@ -144,11 +160,17 @@ Cite: [Identity_Prime.md] for identity alignment checks.
 
 If a task has no carry marker, treat it as `(x1)` and write `(x2)`. If a task already has `(xN)`, increment to `(x(N+1))`. Never remove the carry marker.
 
-### 4D. The Single Test
-From Strategy.md Primary Metric: What ONE task directly impacts it?
-- Default: The Single Test MUST impact the primary metric.
-- Overwhelm Exception: If overwhelm detected, Single Test = a "Simplification Task."
-- If Strategy has multiple metrics: track all, but prioritize primary.
+### 4D. The Single Test (Dependency-Aware)
+
+1. **Identify the goal:** Read Strategy.md Primary Metric. What outcome are we driving toward?
+2. **Prerequisite scan:** Using project_state.md (loaded in Pre-Flight item 8) + Active_Context Technical Context + recent session buffer, identify the prerequisites for that goal. Which are done? Which aren't?
+3. **Dependency reasoning:**
+   - If ALL prerequisites are complete: Single Test = the goal itself (direct metric impact).
+   - If prerequisites are INCOMPLETE: Single Test = the next incomplete prerequisite, NOT the goal. The goal can't be attacked until its dependencies are cleared.
+   - Example: Goal = "purchase path live". Prerequisites = [landing page (incomplete), payment provider (not started)]. Single Test = "finish landing page", not "add payment link".
+4. **Overwhelm Exception:** If overwhelm detected (from Section 2), Single Test = a "Simplification Task" regardless of dependency state.
+5. **Multiple metrics:** If Strategy has multiple metrics, track all but prioritize primary. Apply prerequisite scan to each.
+6. **Low confidence:** If prerequisite status is unclear (Confidence < 3), state what you see and ask: "Is [X] a prerequisite for [goal]? I want to get the Single Test right."
 
 ### 4E. Review Day Special
 Is the plan for the user's configured review day (from `review_week_day` in Active_Context.md, default: Sunday)?

package/src/workflows/review-week.md

@@ -369,6 +369,7 @@ Always runs — Active_Context is always stale after a week.
 5. Section 4 (Technical Context): if active project changed, update project name, path, and tech stack
 6. Section 5 (Active Sessions): verify buffer is current — trim to last 5 entries
 7. Write workflow state: `weekly_review_last_run: [YYYY-MM-DD]`
+8. If MONTHLY_MODE was true: also write `monthly_review_last_run: [YYYY-MM-DD]` to Workflow State
 
 "Proposed Active_Context.md changes:
 [DIFF FORMAT — only the lines that change, not the full file]

package/src/workflows/setup.md

@@ -75,10 +75,11 @@ This is not the interview. This is context-loading. Don't ask questions yet. Mov
    Copy `Someday_Maybe.md` template to `02_Areas/Engine/Someday_Maybe.md` if it doesn't exist.
 2. **Re-Setup Protection:** Check if core Engine files already exist (Identity_Prime.md, Strategy.md, Mover_Dossier.md).
    - If ANY exist: "Existing Engine files detected: [list]. Options:"
-     - **(A) Fresh Start:** Archive existing to `04_Archives/Engine_Backup_YYYY-MM-DD/` and start clean.
-     - **(B) Update Mode:** Interview to fill gaps in existing files. Skip banks already covered.
-     - **(C) Cancel:** Exit setup.
+     - **(A) Update Mode:** Keep existing files. Interview to fill any gaps in existing files. Skip banks already covered. (RECOMMENDED — safe default)
+     - **(B) Cancel:** Exit setup.
+     - **(C) Fresh Start:** Archive existing to `04_Archives/Engine_Backup_YYYY-MM-DD/` and start clean. (DESTRUCTIVE)
    - WAIT FOR USER CHOICE. Do not overwrite without explicit consent.
+   - **If user selects (C) Fresh Start:** "This will ARCHIVE your existing Engine files (Identity, Strategy, Dossier, Goals) to `04_Archives/Engine_Backup_YYYY-MM-DD/` and start from scratch. Type 'ARCHIVE' to confirm." WAIT for user to type 'ARCHIVE'. If they type anything else, return to option selection.
 3. **Welcome:**
    "Welcome to Mover OS. I'm The System — I learn how you work and hold you accountable to your own goals.
    To set this up properly, I need to understand you — not just what you do, but how you think. The more honest you are, the better this works."