@keighleykodric/weeve 0.1.2 → 0.1.4

package/bin/weeve.js

@@ -64,6 +64,7 @@ const FIRST_STEP_ORDER = [
 const cmd = process.argv[2];
 const args = process.argv.slice(3);
 
+// Run a command in the current working directory
 function run(command) {
   try {
     execSync(command, { stdio: "inherit" });
@@ -72,6 +73,34 @@ function run(command) {
   }
 }
 
+// Run a command globally (always from HOME) so skills install to ~/.agents/, not cwd
+function runGlobal(command) {
+  try {
+    execSync(command, { stdio: "inherit", cwd: os.homedir() });
+  } catch {
+    process.exit(1);
+  }
+}
+
+const SKILLS_DIR = path.join(os.homedir(), ".agents", "skills");
+
+// Return installed weeve lanes by scanning ~/.agents/skills/ for known lane dirs
+function installedLanes() {
+  if (!fs.existsSync(SKILLS_DIR)) return {};
+  const entries = new Set(fs.readdirSync(SKILLS_DIR));
+  const laneMap = {};
+  for (const lane of Object.keys(LANES)) {
+    if (entries.has(lane)) {
+      // Count all skill dirs that start with this lane name
+      const count = [...entries].filter(
+        (e) => e === lane || e.startsWith(lane + "-")
+      ).length;
+      laneMap[lane] = { count, source: `keighleykodric/weeve-${lane}` };
+    }
+  }
+  return laneMap;
+}
+
 function installLanes(lanes) {
   const invalid = lanes.filter((l) => !LANES[l]);
   if (invalid.length) {
@@ -84,10 +113,10 @@ function installLanes(lanes) {
   for (const lane of lanes) {
     const repo = `${ORG}/weeve-${lane}`;
     console.log(`  + ${lane} — ${LANES[lane]}`);
-    run(`npx skills add ${repo}`);
+    runGlobal(`npx skills add ${repo}`);
   }
   // Always install framework skills from the weeve repo itself
-  run(`npx skills add ${ORG}/weeve`);
+  runGlobal(`npx skills add ${ORG}/weeve`);
   // Show the right first step based on what was installed
   const firstLane = FIRST_STEP_ORDER.find((l) => lanes.includes(l));
   if (firstLane && firstLane !== "pilot") {
@@ -109,7 +138,6 @@ switch (cmd) {
       process.exit(1);
     }
 
-    // Check if first arg is a preset
     if (args.length === 1 && PRESETS[args[0]]) {
       const preset = args[0];
       console.log(`Preset: ${preset} (${PRESETS[preset].join(", ")})`);
@@ -120,10 +148,121 @@ switch (cmd) {
     break;
   }
 
+  case "update": {
+    // Re-install all currently installed lanes to pull the latest skill versions
+    const laneMap = installedLanes();
+    const installed = Object.keys(laneMap).filter((l) => LANES[l]);
+
+    if (!installed.length) {
+      console.log("\nNo weeve lanes installed. Run 'weeve add <lane>' first.\n");
+      break;
+    }
+
+    console.log(`\nUpdating ${installed.length} lane(s)...\n`);
+    for (const lane of installed) {
+      const repo = `${ORG}/weeve-${lane}`;
+      console.log(`  ↑ ${lane}`);
+      runGlobal(`npx skills add ${repo}`);
+    }
+    runGlobal(`npx skills add ${ORG}/weeve`);
+    console.log(`\nDone. All lanes updated to latest.\n`);
+    break;
+  }
+
+  case "remove":
+  case "uninstall": {
+    if (!args.length) {
+      console.error("Usage: weeve remove <lane|preset> [lane2...]");
+      process.exit(1);
+    }
+
+    let lanes;
+    if (args.length === 1 && PRESETS[args[0]]) {
+      const preset = args[0];
+      console.log(`Removing preset: ${preset} (${PRESETS[preset].join(", ")})`);
+      lanes = PRESETS[preset];
+    } else {
+      const invalid = args.filter((l) => !LANES[l]);
+      if (invalid.length) {
+        console.error(`Unknown lane(s): ${invalid.join(", ")}`);
+        console.error(`Run 'weeve list' to see available lanes.`);
+        process.exit(1);
+      }
+      lanes = args;
+    }
+
+    console.log(`\nRemoving ${lanes.length} lane(s)...\n`);
+    for (const lane of lanes) {
+      const repo = `${ORG}/weeve-${lane}`;
+      console.log(`  - ${lane}`);
+      runGlobal(`npx skills remove ${repo}`);
+    }
+    console.log(`\nDone. Removed: ${lanes.join(", ")}\n`);
+    break;
+  }
+
+  case "setup": {
+    const configDir = path.join(os.homedir(), ".config", "weeve");
+    const configPath = path.join(configDir, "config.yaml");
+
+    if (fs.existsSync(configPath)) {
+      console.log(`\nConfig already exists at ${configPath}\n`);
+      console.log(fs.readFileSync(configPath, "utf8"));
+      console.log("Delete it and re-run 'weeve setup' to reconfigure.\n");
+      break;
+    }
+
+    // Auto-detect common vault locations
+    const vaultCandidates = [
+      path.join(os.homedir(), "Library/Mobile Documents/iCloud~md~obsidian/Documents"),
+      path.join(os.homedir(), "Documents/Obsidian"),
+      path.join(os.homedir(), "Obsidian"),
+      path.join(os.homedir(), "vault"),
+    ];
+    const detectedVault = vaultCandidates.find((p) => fs.existsSync(p)) || "";
+
+    // Auto-detect common repos root
+    const reposCandidates = [
+      path.join(os.homedir(), "GitHub"),
+      path.join(os.homedir(), "code"),
+      path.join(os.homedir(), "projects"),
+      path.join(os.homedir(), "dev"),
+    ];
+    const detectedRepos = reposCandidates.find((p) => fs.existsSync(p)) || path.join(os.homedir(), "GitHub");
+
+    const readline = require("readline");
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+
+    const vaultPrompt = detectedVault
+      ? `Vault path [${detectedVault}]: `
+      : `Vault path (Obsidian vault root): `;
+
+    rl.question(vaultPrompt, (vaultAnswer) => {
+      const vaultPath = vaultAnswer.trim() || detectedVault;
+      if (!vaultPath) {
+        console.error("Vault path is required.");
+        rl.close();
+        process.exit(1);
+      }
+
+      rl.question(`Repos root [${detectedRepos}]: `, (reposAnswer) => {
+        const reposRoot = reposAnswer.trim() || detectedRepos;
+        rl.close();
+
+        fs.mkdirSync(configDir, { recursive: true });
+        fs.writeFileSync(configPath, `vault_path: "${vaultPath}"\nrepos_root: "${reposRoot}"\n`);
+        console.log(`\nConfig written to ${configPath}`);
+        console.log(`  vault_path   ${vaultPath}`);
+        console.log(`  repos_root   ${reposRoot}`);
+        console.log(`\nRun 'weeve add all' to install lanes.\n`);
+      });
+    });
+    break;
+  }
+
   case "init": {
     const presetArg = args[0];
 
-    // Resolve lanes to scaffold
     let lanes;
     if (!presetArg) {
       lanes = Object.keys(LANES);
@@ -140,7 +279,6 @@ switch (cmd) {
     const cwd = process.cwd();
     const yamlPath = path.join(cwd, "weeve.yaml");
 
-    // Bail if weeve.yaml already exists
     if (fs.existsSync(yamlPath)) {
       console.error(`Warning: weeve.yaml already exists in ${cwd}. Exiting without changes.`);
       process.exit(1);
@@ -154,7 +292,6 @@ switch (cmd) {
     }
 
     // 1b. Create loom/ content-type folders based on installed lanes, plus shared/ and archive/
-    // Loom is organised by content type, not lane — multiple lanes share the same folder.
     const loomFolders = new Set(["shared"]);
     const LOOM_MAP = {
       strategy:    ["compass"],
@@ -301,39 +438,10 @@ switch (cmd) {
   }
 
   case "status": {
-    const lockPath = path.join(os.homedir(), ".claude", "skills-lock.json");
+    const laneMap = installedLanes();
 
-    if (!fs.existsSync(lockPath)) {
-      console.log("No weeve lanes installed. Run 'weeve add <lane>' to get started.");
-      break;
-    }
-
-    let lock;
-    try {
-      lock = JSON.parse(fs.readFileSync(lockPath, "utf8"));
-    } catch {
-      console.error(`Could not parse ${lockPath}`);
-      process.exit(1);
-    }
-
-    const skills = lock.skills || {};
-
-    // Group skills by weeve lane (source matches keighleykodric/weeve-<lane>)
-    const laneMap = {};
-    for (const [skillName, skillData] of Object.entries(skills)) {
-      const source = skillData.source || "";
-      const match = source.match(/^keighleykodric\/weeve-(.+)$/);
-      if (match) {
-        const lane = match[1];
-        if (!laneMap[lane]) {
-          laneMap[lane] = { count: 0, source };
-        }
-        laneMap[lane].count++;
-      }
-    }
-
-    if (Object.keys(laneMap).length === 0) {
-      console.log("No weeve lanes installed. Run 'weeve add <lane>' to get started.");
+    if (!Object.keys(laneMap).length) {
+      console.log("\nNo weeve lanes installed. Run 'weeve add <lane>' to get started.\n");
       break;
     }
 
@@ -356,39 +464,6 @@ switch (cmd) {
     break;
   }
 
-  case "remove":
-  case "uninstall": {
-    if (!args.length) {
-      console.error("Usage: weeve remove <lane|preset> [lane2...]");
-      process.exit(1);
-    }
-
-    // Expand preset or validate individual lanes
-    let lanes;
-    if (args.length === 1 && PRESETS[args[0]]) {
-      const preset = args[0];
-      console.log(`Removing preset: ${preset} (${PRESETS[preset].join(", ")})`);
-      lanes = PRESETS[preset];
-    } else {
-      const invalid = args.filter((l) => !LANES[l]);
-      if (invalid.length) {
-        console.error(`Unknown lane(s): ${invalid.join(", ")}`);
-        console.error(`Run 'weeve list' to see available lanes.`);
-        process.exit(1);
-      }
-      lanes = args;
-    }
-
-    console.log(`\nRemoving ${lanes.length} lane(s)...\n`);
-    for (const lane of lanes) {
-      const repo = `${ORG}/weeve-${lane}`;
-      console.log(`  - ${lane}`);
-      run(`npx skills remove ${repo}`);
-    }
-    console.log(`\nDone. Removed: ${lanes.join(", ")}\n`);
-    break;
-  }
-
   case "demo": {
     const presetArg = args[0];
 
@@ -430,7 +505,6 @@ switch (cmd) {
       process.exit(1);
     }
 
-    // Recursively copy demo folder to cwd
     function copyDir(src, dest) {
       fs.mkdirSync(dest, { recursive: true });
       for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
@@ -452,7 +526,7 @@ switch (cmd) {
     const firstCmd = firstLane && firstLane !== "pilot" ? `/${firstLane}-intro` : `/pilot-intro`;
 
     console.log(`\nDemo ready: ${demoName} (${presetArg} preset)\n`);
-    console.log(`  weeve.yaml      project config (docs_root: ./docs)`);
+    console.log(`  weeve.yaml      project config`);
     console.log(`  docs/shared/    weeve-project.md, weeve-guardrails.md, weeve-intake.md\n`);
     console.log(`Next steps:`);
     console.log(`  1. weeve add ${presetArg}   — install the lanes`);
@@ -464,7 +538,6 @@ switch (cmd) {
     const subcmd = args[0];
 
     if (!subcmd || subcmd === "show") {
-      // Walk up from cwd to find weeve.yaml
       let dir = process.cwd();
       let found = null;
       for (let i = 0; i < 4; i++) {
@@ -487,7 +560,6 @@ switch (cmd) {
       const raw = fs.readFileSync(found, "utf8");
       console.log(`\nProject config: ${found}\n`);
 
-      // Parse and display key fields
       const nameMatch = raw.match(/^\s{2}name:\s*(.+)$/m);
       const tagMatch = raw.match(/^\s{2}tag:\s*(.+)$/m);
       const docsMatch = raw.match(/^\s{2}docs_root:\s*(.+)$/m);
@@ -495,22 +567,35 @@ switch (cmd) {
 
       const name = nameMatch ? nameMatch[1].trim() : "(not set)";
       const tag = tagMatch ? tagMatch[1].trim() : "(not set)";
-      const docsRoot = docsMatch ? docsMatch[1].trim() : `<vault>/Projects/${tag}/docs (via Claudette)`;
-      const schema = schemaMatch ? schemaMatch[1].trim() : "(not set)";
+      const schemaVersion = schemaMatch ? schemaMatch[1].trim() : "(not set)";
+
+      // Resolve docs_root: explicit in weeve.yaml > weeve config > default
+      let docsRoot;
+      if (docsMatch) {
+        docsRoot = docsMatch[1].trim();
+      } else {
+        const weeveConfig = path.join(os.homedir(), ".config", "weeve", "config.yaml");
+        if (fs.existsSync(weeveConfig)) {
+          const cfgRaw = fs.readFileSync(weeveConfig, "utf8");
+          const vaultMatch = cfgRaw.match(/^vault_path:\s*"?(.+?)"?\s*$/m);
+          const vault = vaultMatch ? vaultMatch[1] : null;
+          docsRoot = vault ? `${vault}/Projects/${tag}/weeve` : `<vault>/Projects/${tag}/weeve`;
+        } else {
+          docsRoot = `<vault>/Projects/${tag}/weeve  (run 'weeve setup' to configure)`;
+        }
+      }
 
       const maxLabel = 14;
       console.log(`  ${"name".padEnd(maxLabel)}${name}`);
       console.log(`  ${"tag".padEnd(maxLabel)}${tag}`);
       console.log(`  ${"docs_root".padEnd(maxLabel)}${docsRoot}`);
-      console.log(`  ${"schema_version".padEnd(maxLabel)}${schema}`);
+      console.log(`  ${"schema_version".padEnd(maxLabel)}${schemaVersion}`);
 
-      // Check for repos
       const reposBlock = raw.match(/^\s{2}repos:\n((?:\s{4}.+\n?)*)/m);
       if (reposBlock) {
         console.log(`  ${"repos".padEnd(maxLabel)}${reposBlock[1].trim().split("\n").length} registered`);
       }
 
-      // Check for depends_on
       const depsBlock = raw.match(/^\s{2}depends_on:\n((?:\s{4}.+\n?)*)/m);
       if (depsBlock) {
         const depTags = [...depsBlock[1].matchAll(/tag:\s*(\S+)/g)].map((m) => m[1]);
@@ -519,13 +604,6 @@ switch (cmd) {
         console.log(`  ${"depends_on".padEnd(maxLabel)}${depList}`);
       }
 
-      // Check for shared docs
-      const sharedDir = path.join(path.dirname(found), "docs", "shared");
-      if (fs.existsSync(sharedDir)) {
-        const sharedFiles = fs.readdirSync(sharedDir).filter((f) => f.endsWith(".md"));
-        console.log(`  ${"shared/".padEnd(maxLabel)}${sharedFiles.join(", ")}`);
-      }
-
       console.log();
       break;
     }
@@ -570,8 +648,10 @@ switch (cmd) {
  Cross-functional contract framework
 
 Commands:
+  weeve setup                   Configure weeve (vault path, repos root)
   weeve add <lane> [lane2...]   Install one or more lanes
   weeve add <preset>            Install a preset group of lanes
+  weeve update                  Update all installed lanes to latest
   weeve remove <lane> [lane2…]  Remove one or more lanes
   weeve remove <preset>         Remove a preset group of lanes
   weeve init [preset]           Scaffold weeve structure in current directory
@@ -582,9 +662,11 @@ Commands:
   weeve presets                 Show preset groups
 
 Examples:
+  weeve setup                   First-time setup — configure vault and repos root
   weeve add compass ally pilot  Install three lanes
   weeve add core                Install core preset (compass, layers-plus, ally, rubric, pilot)
   weeve add all                 Install everything
+  weeve update                  Pull latest versions of all installed lanes
   weeve init core               Scaffold folder structure for the core preset
   weeve demo core               Copy the Prism demo project (ready to run immediately)
   weeve status                  See which lanes are installed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keighleykodric/weeve",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Cross-functional contract framework — install and manage Weeve lanes",
   "bin": {
     "weeve": "./bin/weeve.js"