vexp-cli 2.2.1 → 2.2.3

package/dist/cli.js

@@ -8,7 +8,7 @@ import * as fs from "fs";
 import * as net from "net";
 import { checkbox, confirm } from "@inquirer/prompts";
 import { getBinaryPath, getInstalledVersion, getMcpServerPath, binaryEnv } from "./binary.js";
-import { detectAgents, getAgentList, configureSelectedAgents } from "./agent-config.js";
+import { detectAgents, getAgentList, configureSelectedAgents, resolveAgentName, suggestAgentName } from "./agent-config.js";
 import { CLI_VERSION } from "./version.js";
 import { activateLicense, deactivateLicense, readLicenseLimits, readDeviceBlocked, } from "./license.js";
 import { checkForUpdate } from "./update-check.js";
@@ -18,6 +18,7 @@ import { runServe } from "./serve.js";
 import { runDoctor } from "./doctor.js";
 import { socketPathFor } from "./socket-path.js";
 import { isTraceEnabled } from "./trace.js";
+import { resolveParentWorkspace, listWorkspaceRepos, addRepoToWorkspace, } from "./workspace-repos.js";
 const program = new Command();
 program
     .name("vexp")
@@ -54,8 +55,11 @@ program.hook("preAction", async (_thisCmd, actionCmd) => {
         return;
     if (AUTOSTART_SKIP.has(actionCmd.name()))
         return;
-    const workspaceRoot = findConfiguredWorkspace();
-    if (!workspaceRoot)
+    // Effective workspace: inside a connected secondary repo this resolves to
+    // the parent, so we boot (or reuse) the parent daemon instead of spawning
+    // a conflicting one for the child.
+    const eff = findEffectiveWorkspace();
+    if (!eff)
         return;
     let binaryPath;
     try {
@@ -66,7 +70,7 @@ program.hook("preAction", async (_thisCmd, actionCmd) => {
     }
     // Full bootstrap: daemon + MCP + autostart-if-needed. All three steps are
     // internally idempotent — no duplicate processes across invocations.
-    await ensureBootstrap(workspaceRoot, binaryPath);
+    await ensureBootstrap(eff.root, binaryPath);
 });
 // ────────────────────────────────────────────────────
 // Resolve the platform binary (no network — bundled via npm)
@@ -83,7 +87,7 @@ function ensureBinary() {
 // Tier limits are now enforced directly by the Rust daemon via license.jwt verification.
 // Track whether we're in interactive REPL mode (don't call process.exit)
 let replMode = false;
-function runBinary(binaryPath, args) {
+function runBinary(binaryPath, args, options) {
     if (replMode) {
         // In REPL mode, run synchronously and don't exit the process.
         // CRITICAL: stdin must be "ignore" (not "inherit") — inheriting stdin
@@ -94,6 +98,7 @@ function runBinary(binaryPath, args) {
         // CLI, never stdin, so ignoring it is safe.
         const result = spawnSync(binaryPath, args, {
             stdio: ["ignore", "inherit", "inherit"],
+            cwd: options?.cwd,
             env: binaryEnv(binaryPath),
         });
         if (result.error) {
@@ -103,6 +108,7 @@ function runBinary(binaryPath, args) {
     }
     const child = spawn(binaryPath, args, {
         stdio: "inherit",
+        cwd: options?.cwd,
         env: binaryEnv(binaryPath),
     });
     child.on("exit", (code) => {
@@ -143,12 +149,16 @@ function runBinaryAsync(binaryPath, args, options) {
 // ────────────────────────────────────────────────────
 /**
  * Walk up from cwd looking for `.vexp/manifest.json` — the marker that
- * `vexp setup` has been run on this tree. Returns null if none found.
+ * `vexp setup` has been run on this tree. A `.vexp/parent_workspace.json`
+ * counts too: a freshly-connected secondary repo has the parent link before
+ * its first index writes a manifest, and it must already resolve to the
+ * parent workspace instead of looking unconfigured. Returns null if none found.
  */
 function findConfiguredWorkspace(startDir = process.cwd()) {
     let current = path.resolve(startDir);
     while (true) {
-        if (fs.existsSync(path.join(current, ".vexp", "manifest.json")))
+        if (fs.existsSync(path.join(current, ".vexp", "manifest.json")) ||
+            fs.existsSync(path.join(current, ".vexp", "parent_workspace.json")))
             return current;
         const parent = path.dirname(current);
         if (parent === current)
@@ -156,6 +166,22 @@ function findConfiguredWorkspace(startDir = process.cwd()) {
         current = parent;
     }
 }
+/**
+ * Workspace the CLI should actually operate on. When cwd is inside a
+ * secondary repo of a multi-repo workspace (it carries a valid
+ * `.vexp/parent_workspace.json`), every daemon interaction targets the PARENT:
+ * spawning a second daemon in the child made both fight over the same repo
+ * DBs (double watchers, duplicate LLM in VRAM) until the user killed
+ * everything. `parent` is set only when redirected, so callers can tell the
+ * user what happened.
+ */
+function findEffectiveWorkspace(startDir = process.cwd()) {
+    const ws = findConfiguredWorkspace(startDir);
+    if (!ws)
+        return null;
+    const parent = resolveParentWorkspace(ws);
+    return parent ? { root: parent.parentRoot, parent } : { root: ws };
+}
 /** True if the Unix socket at `socketPath` accepts a connection within `timeoutMs`. */
 function isSocketAlive(socketPath, timeoutMs = 300) {
     return new Promise((resolve) => {
@@ -486,7 +512,13 @@ program
     const args = ["daemon-cmd", action];
     if (opts.follow)
         args.push("--follow");
-    runBinary(binaryPath, args);
+    // Inside a connected secondary repo, daemon commands target the PARENT
+    // workspace daemon — the child must never run its own competing daemon.
+    const eff = findEffectiveWorkspace();
+    if (eff?.parent) {
+        console.log(chalk.cyan(`This repo is part of workspace "${eff.parent.workspaceName}" — targeting the parent daemon (${shortPath(eff.root)})`));
+    }
+    runBinary(binaryPath, args, eff?.parent ? { cwd: eff.root } : undefined);
 });
 program
     .command("doctor")
@@ -555,8 +587,24 @@ program
         const detectedNames = new Set(detected.map((a) => a.agent));
         let selectedNames;
         if (typeof opts.agents === "string") {
-            // Explicit list from --agents flag
-            selectedNames = opts.agents.split(",").map((s) => s.trim());
+            // Explicit list from --agents flag. Resolve every name BEFORE writing
+            // anything: matching is exact downstream, so an unrecognised name used
+            // to configure nothing while setup still reported success — the worst
+            // possible outcome for the flag whose whole point is automation.
+            const requested = opts.agents.split(",").map((s) => s.trim()).filter(Boolean);
+            const unknown = requested.filter((n) => resolveAgentName(n) === null);
+            if (unknown.length > 0 || requested.length === 0) {
+                console.error(chalk.red(`\n✖ Unknown agent: ${unknown.map((u) => `"${u}"`).join(", ") || "(empty --agents list)"}`));
+                for (const u of unknown) {
+                    const hint = suggestAgentName(u);
+                    if (hint)
+                        console.error(chalk.yellow(`  Did you mean: ${hint}?`));
+                }
+                console.error(chalk.dim(`  Valid agents: ${allAgents.map((a) => a.agent).join(", ")}`));
+                console.error(chalk.dim("  Names are matched ignoring case and punctuation.\n"));
+                process.exit(1);
+            }
+            selectedNames = requested.map((n) => resolveAgentName(n));
             console.log(chalk.dim(`  Agents (from flag): ${selectedNames.join(", ")}`));
         }
         else {
@@ -981,10 +1029,10 @@ await checkForUpdate();
 // ── Sub-menu: Setup & Config ──
 const MENU_CONFIG = [
     { key: "1", label: "init", hint: "Create .vexp/ and run first index", description: "Creates .vexp/ directory, runs a full index, installs git hooks.\n    Run once when adding vexp to a new project." },
-    { key: "2", label: "index", hint: "Re-index the repository", description: "Scans all source files, builds the AST graph (nodes + edges),\n    and saves it to .vexp/index.db.\n    Output: file count, node count, edge count, time elapsed." },
+    { key: "2", label: "index", hint: "Re-index the workspace (all connected repos)", description: "Scans all source files, builds the AST graph (nodes + edges),\n    and saves it to .vexp/index.db. In a multi-repo workspace every\n    connected repo is re-indexed, not just the current one.\n    Output: file count, node count, edge count, time elapsed." },
     { key: "3", label: "setup", hint: "Full setup (index + agents + hooks)", description: "One-command bootstrap: indexes the codebase, detects AI agents,\n    writes MCP configs, installs git hooks." },
     { key: "4", label: "setup-agents", hint: "Choose which AI agents to configure", description: "Select agents (Claude, Cursor, Windsurf, Copilot, …) to configure.\n    Creates config directories and writes MCP settings for each." },
-    { key: "5", label: "daemon-cmd", hint: "Manage daemon (start/stop/status/logs)", description: "Controls the background daemon:\n    start  → launches the daemon (indexes + watches for changes)\n    stop   → stops the running daemon\n    status → shows node/edge/file counts\n    logs   → prints .vexp/vexp.log" },
+    { key: "5", label: "daemon-cmd", hint: "Manage daemon (start/stop/restart/status/logs)", description: "Controls the background daemon:\n    start   → launches the daemon (indexes + watches for changes)\n    stop    → stops the running daemon\n    restart → stop + start (reloads workspace.json, indexes new repos)\n    status  → shows node/edge/file counts\n    logs    → prints .vexp/vexp.log" },
     { key: "6", label: "setup-llm", hint: "Configure local LLM compression (vexp-devmind)", description: "Install, update, or disable the optional local LLM (vexp-devmind).\n    Runs entirely on your machine (~3.5 GB download).\n    Enables smart prompt preprocessing and higher-quality memory compression." },
 ];
 // ── Sub-menu: Explore & Analyze ──
@@ -999,6 +1047,11 @@ const MENU_SAVINGS = [
     { key: "1", label: "summary", hint: "View savings summary", description: "Shows total tokens saved, average saving %, and breakdown by tool.\n    Choose a period: 7 / 14 / 30 / 60 / 90 days." },
     { key: "2", label: "export", hint: "Export report to .vexp/token-savings-report.md", description: "Generates a markdown report with breakdown by tool and daily trend,\n    then saves it to .vexp/token-savings-report.md." },
 ];
+// ── Sub-menu: Repos & Workspace ──
+const MENU_REPOS = [
+    { key: "1", label: "list", hint: "Show repos connected to this workspace", description: "Lists the repositories of this multi-repo workspace\n    (.vexp/workspace.json): alias, path, primary marker." },
+    { key: "2", label: "add", hint: "Connect another repository to this workspace", description: "Adds a repository to .vexp/workspace.json and links it back via\n    .vexp/parent_workspace.json — same writes as the VS Code\n    \"vexp: Add Repository\" command. Restart the daemon to index it." },
+];
 // ── Sub-menu: License ──
 const MENU_LICENSE = [
     { key: "1", label: "status", hint: "Show current license plan and limits", description: "Displays your current plan (free / pro / team), node limits,\n    repo limits, and license expiry." },
@@ -1040,12 +1093,18 @@ async function printBanner() {
     // banner says "not running", but the Rust daemon-cmd status probes the
     // socket and reports "running". Using the socket here makes the banner
     // agree with status.
-    const ws = findConfiguredWorkspace();
-    if (!ws) {
+    const eff = findEffectiveWorkspace();
+    if (!eff) {
         console.log(chalk.dim("  ○ Daemon: no workspace configured here"));
         console.log(chalk.dim("    → type '1 > 3' to run full setup, or `vexp setup`"));
     }
     else {
+        // Connected secondary repo: every daemon interaction targets the parent
+        // workspace — say so up front, since the status below is the PARENT's.
+        if (eff.parent) {
+            console.log(chalk.cyan(`  ◆ Workspace: this repo is part of "${eff.parent.workspaceName}" — using the parent daemon (${shortPath(eff.root)})`));
+        }
+        const ws = eff.root;
         const socketAlive = await isSocketAlive(socketPathFor(ws));
         if (socketAlive) {
             // Display PID + uptime when we can read them; otherwise a plain "running".
@@ -1081,7 +1140,7 @@ async function printBanner() {
         }
         else if (installed) {
             console.log(chalk.yellow("  ○ LLM: installed but not active"));
-            console.log(chalk.dim("    → type '1 > 6 > start' to start it, or `vexp setup-llm --start`"));
+            console.log(chalk.dim("    → type '1 > 6 > start' to start it, or `vexp setup-llm --enable`"));
         }
         else {
             console.log(chalk.dim("  ○ LLM: not installed"));
@@ -1098,6 +1157,7 @@ function printMainMenu() {
     console.log(`   ${chalk.cyan.bold("2")}  ${chalk.green("Explore & Analyze".padEnd(20))} ${chalk.dim("Query context, skeletons, impact, flow")}`);
     console.log(`   ${chalk.cyan.bold("3")}  ${chalk.green("Token Savings".padEnd(20))} ${chalk.dim("View savings stats, export report")}`);
     console.log(`   ${chalk.cyan.bold("4")}  ${chalk.green("License".padEnd(20))} ${chalk.dim("View or activate your license")}`);
+    console.log(`   ${chalk.cyan.bold("5")}  ${chalk.green("Repos & Workspace".padEnd(20))} ${chalk.dim("List / connect workspace repositories")}`);
     console.log(`   ${chalk.cyan.bold("q")}  ${chalk.red("Exit".padEnd(20))} ${chalk.dim("Quit")}`);
     console.log("");
 }
@@ -1120,11 +1180,13 @@ async function interactiveMode() {
     // `vexp setup` still get a working state (daemon + MCP :7821 up, OS
     // autostart installed for the next reboot). All steps are idempotent so
     // running this alongside `vexp setup` never creates duplicates.
-    const workspaceRoot = findConfiguredWorkspace();
-    if (workspaceRoot) {
+    const eff = findEffectiveWorkspace();
+    if (eff) {
         try {
             const binaryPath = getBinaryPath();
-            await ensureBootstrap(workspaceRoot, binaryPath);
+            // Effective root: in a connected secondary repo this boots the PARENT
+            // daemon (which serves this repo too) instead of a conflicting child one.
+            await ensureBootstrap(eff.root, binaryPath);
         }
         catch { /* banner will reflect actual state */ }
     }
@@ -1139,6 +1201,7 @@ async function interactiveMode() {
         explore: chalk.cyan.bold("  vexp/explore> "),
         savings: chalk.cyan.bold("  vexp/savings> "),
         license: chalk.cyan.bold("  vexp/license> "),
+        repos: chalk.cyan.bold("  vexp/repos> "),
     };
     while (true) {
         const input = (await ask(rl, prompts[currentMenu])).trim().toLowerCase();
@@ -1174,8 +1237,13 @@ async function interactiveMode() {
                 printSubMenu("License", MENU_LICENSE);
                 continue;
             }
+            if (input === "5" || input === "repos") {
+                currentMenu = "repos";
+                printSubMenu("Repos & Workspace", MENU_REPOS);
+                continue;
+            }
             // Allow direct command names from any sub-menu
-            const allItems = [...MENU_CONFIG, ...MENU_EXPLORE, ...MENU_SAVINGS, ...MENU_LICENSE];
+            const allItems = [...MENU_CONFIG, ...MENU_EXPLORE, ...MENU_SAVINGS, ...MENU_LICENSE, ...MENU_REPOS];
             const direct = allItems.find((m) => m.label === input);
             if (direct) {
                 await executeCommand(direct.label, rl);
@@ -1183,12 +1251,12 @@ async function interactiveMode() {
                 printMainMenu();
                 continue;
             }
-            console.log(chalk.dim("  Choose 1-4 or type a command name. 'q' to exit.\n"));
+            console.log(chalk.dim("  Choose 1-5 or type a command name. 'q' to exit.\n"));
             continue;
         }
         // ── Sub-menus ──
-        const menuMap = { config: MENU_CONFIG, explore: MENU_EXPLORE, savings: MENU_SAVINGS, license: MENU_LICENSE };
-        const titles = { config: "Setup & Config", explore: "Explore & Analyze", savings: "Token Savings", license: "License" };
+        const menuMap = { config: MENU_CONFIG, explore: MENU_EXPLORE, savings: MENU_SAVINGS, license: MENU_LICENSE, repos: MENU_REPOS };
+        const titles = { config: "Setup & Config", explore: "Explore & Analyze", savings: "Token Savings", license: "License", repos: "Repos & Workspace" };
         if (input === "b" || input === "back") {
             currentMenu = "main";
             printMainMenu();
@@ -1225,7 +1293,27 @@ async function executeCommand(label, rl) {
             }
             case "index": {
                 const binaryPath = ensureBinary();
-                runBinary(binaryPath, ["index"]);
+                // Workspace-aware: re-index every connected repo, not just the cwd
+                // one. From a connected child this targets the parent workspace, so
+                // the result matches what the daemon serves.
+                const eff = findEffectiveWorkspace();
+                const repos = eff ? listWorkspaceRepos(eff.root) : [];
+                if (!eff || repos.length === 0) {
+                    runBinary(binaryPath, ["index"]);
+                    break;
+                }
+                if (eff.parent) {
+                    console.log(chalk.cyan(`    This repo is part of workspace "${eff.parent.workspaceName}" — indexing all its repos`));
+                }
+                console.log(chalk.dim(`    Indexing ${repos.length} workspace repo(s)…\n`));
+                for (const r of repos) {
+                    if (!r.exists) {
+                        console.log(chalk.yellow(`    ⚠ Skipping "${r.alias}" — directory not found: ${shortPath(r.resolvedPath)}`));
+                        continue;
+                    }
+                    console.log(chalk.bold(`    ● ${r.alias}`));
+                    runBinary(binaryPath, ["index", r.resolvedPath]);
+                }
                 break;
             }
             case "setup": {
@@ -1239,15 +1327,23 @@ async function executeCommand(label, rl) {
             case "daemon-cmd": {
                 // Sticky sub-sub-menu: stay here until user types 'b' (back).
                 const binaryPath = ensureBinary();
-                const valid = new Set(["start", "stop", "status", "logs"]);
+                const valid = new Set(["start", "stop", "restart", "status", "logs"]);
+                // Inside a connected secondary repo every action targets the parent
+                // workspace daemon — running one here would fight over the same DBs.
+                const eff = findEffectiveWorkspace();
+                if (eff?.parent) {
+                    console.log(chalk.cyan(`    This repo is part of workspace "${eff.parent.workspaceName}" — daemon commands target the parent (${shortPath(eff.root)})`));
+                }
+                const daemonCwd = eff?.parent ? { cwd: eff.root } : undefined;
                 const printDaemonMenu = () => {
                     console.log("");
                     console.log(chalk.cyan("    ── Daemon ──"));
-                    console.log(`      ${chalk.bold("start")}   ${chalk.dim("Launch the daemon for this workspace")}`);
-                    console.log(`      ${chalk.bold("stop")}    ${chalk.dim("Stop the running daemon")}`);
-                    console.log(`      ${chalk.bold("status")}  ${chalk.dim("Show node/edge/file counts and uptime")}`);
-                    console.log(`      ${chalk.bold("logs")}    ${chalk.dim("Tail .vexp/vexp.log")}`);
-                    console.log(`      ${chalk.dim("b")}       ${chalk.dim("Back to Setup & Config")}`);
+                    console.log(`      ${chalk.bold("start")}    ${chalk.dim("Launch the daemon for this workspace")}`);
+                    console.log(`      ${chalk.bold("stop")}     ${chalk.dim("Stop the running daemon")}`);
+                    console.log(`      ${chalk.bold("restart")}  ${chalk.dim("Stop + start (reloads workspace.json, indexes new repos)")}`);
+                    console.log(`      ${chalk.bold("status")}   ${chalk.dim("Show node/edge/file counts and uptime")}`);
+                    console.log(`      ${chalk.bold("logs")}     ${chalk.dim("Tail .vexp/vexp.log")}`);
+                    console.log(`      ${chalk.dim("b")}        ${chalk.dim("Back to Setup & Config")}`);
                     console.log("");
                 };
                 printDaemonMenu();
@@ -1258,11 +1354,11 @@ async function executeCommand(label, rl) {
                     if (action === "b" || action === "back")
                         break;
                     if (valid.has(action)) {
-                        runBinary(binaryPath, ["daemon-cmd", action]);
+                        runBinary(binaryPath, ["daemon-cmd", action], daemonCwd);
                         printDaemonMenu();
                         continue;
                     }
-                    console.log(chalk.dim("    Unknown action. Use start, stop, status, logs, or 'b' to go back."));
+                    console.log(chalk.dim("    Unknown action. Use start, stop, restart, status, logs, or 'b' to go back."));
                 }
                 break;
             }
@@ -1383,6 +1479,79 @@ async function executeCommand(label, rl) {
                 }
                 break;
             }
+            // ── Repos & Workspace commands ──
+            case "list": {
+                const eff = findEffectiveWorkspace();
+                if (!eff) {
+                    console.log(chalk.yellow("    No configured workspace here — run setup first (1 > 3, or `vexp setup`)."));
+                    break;
+                }
+                if (eff.parent) {
+                    console.log(chalk.cyan(`    This repo is part of workspace "${eff.parent.workspaceName}" — showing the repos of ${shortPath(eff.root)}`));
+                }
+                const repos = listWorkspaceRepos(eff.root);
+                if (repos.length === 0) {
+                    console.log(chalk.dim("    Single-repo workspace (no .vexp/workspace.json yet)."));
+                    console.log(chalk.dim("    Use 'add' to connect another repository."));
+                    break;
+                }
+                console.log("");
+                for (const r of repos) {
+                    const marker = r.isPrimary ? chalk.cyan(" (primary)") : "";
+                    const missing = r.exists ? "" : chalk.red(" [missing]");
+                    console.log(`    ${chalk.green("●")} ${chalk.bold(r.alias.padEnd(20))} ${chalk.dim(shortPath(r.resolvedPath))}${marker}${missing}`);
+                }
+                console.log(chalk.dim(`\n    ${repos.length} repo(s) in workspace "${path.basename(eff.root)}"`));
+                break;
+            }
+            case "add": {
+                const eff = findEffectiveWorkspace();
+                if (!eff) {
+                    console.log(chalk.yellow("    No configured workspace here — run setup first (1 > 3, or `vexp setup`)."));
+                    break;
+                }
+                if (eff.parent) {
+                    console.log(chalk.cyan(`    This repo is part of workspace "${eff.parent.workspaceName}" — the repository will be added to ${shortPath(eff.root)}`));
+                }
+                const repoPath = (await ask(rl, chalk.cyan("    Path of the repository to connect: "))).trim();
+                if (!repoPath)
+                    break;
+                const limits = readLicenseLimits();
+                const result = addRepoToWorkspace(eff.root, repoPath, limits.maxRepos);
+                if (result.status === "invalid") {
+                    console.log(chalk.red(`    ✗ ${result.reason}`));
+                    break;
+                }
+                if (result.status === "limit") {
+                    console.log(chalk.yellow(`    Your ${limits.plan} plan supports up to ${result.maxRepos} repo${result.maxRepos === 1 ? "" : "s"}.`));
+                    console.log(chalk.dim("    Upgrade at https://vexp.dev/#pricing to add more repositories."));
+                    break;
+                }
+                if (result.status === "exists") {
+                    console.log(chalk.dim(`    "${result.alias}" is already part of this workspace.`));
+                    break;
+                }
+                console.log(chalk.green(`    ✓ Added "${result.alias}" to workspace "${path.basename(eff.root)}"`));
+                // A live 2.2.3+ daemon hot-reloads workspace.json (2s poll): the new
+                // repo is indexed and watched automatically, no restart needed. Only
+                // when the daemon is down do we offer to start it.
+                if (await isSocketAlive(socketPathFor(eff.root))) {
+                    console.log(chalk.dim(`    The running daemon will detect the change and index "${result.alias}" automatically within seconds.`));
+                }
+                else {
+                    const yn = (await ask(rl, chalk.cyan(`    Start the daemon now to index "${result.alias}"? [Y/n]: `))).trim().toLowerCase();
+                    if (yn === "" || yn === "y" || yn === "yes") {
+                        const binaryPath = ensureBinary();
+                        console.log(chalk.dim("    Starting vexp daemon…\n"));
+                        runBinary(binaryPath, ["daemon-cmd", "start"], { cwd: eff.root });
+                        console.log(chalk.green(`    ✓ Now indexing "${result.alias}".`));
+                    }
+                    else {
+                        console.log(chalk.dim(`    Run 'vexp daemon-cmd start' in ${shortPath(eff.root)} later to index it.`));
+                    }
+                }
+                break;
+            }
             // ── License commands ──
             case "status": {
                 const limits = readLicenseLimits();