vexp-cli 3.3.8 → 3.4.0

package/dist/agent-consent.js

@@ -3,6 +3,7 @@ import * as path from "path";
 import { TextDecoder } from "util";
 import { vexpHome } from "./state-home.js";
 import { canonicalWorkspaceRoot } from "./socket-path.js";
+import { linkedWorktreeMain, worktreeConsentSource } from "./git-worktree.js";
 export function agentConsentPath() {
     return path.join(vexpHome(), ".vexp", "agent-consent.json");
 }
@@ -153,8 +154,52 @@ export function decisionForKey(consent, key, agent) {
         return "no";
     return undefined;
 }
+/**
+ * The answer for `agent` in the project at `root`. A linked git worktree
+ * with no answer of its own for the agent takes its main checkout's (the
+ * rule vexp-core's worktree_consent_source and both MCP servers apply to a
+ * worktree's index: a main checkout set up for vexp). Each `git worktree
+ * add` gave a fresh key with no answers, so a worktree asked again about
+ * every tool the main checkout had answered for (field report,
+ * 2026-11-07). An answer given IN the worktree is keyed by the worktree, as
+ * before, and wins. "Never" is machine-wide and needs no inheriting.
+ * Lockstep with the extension's decisionFor.
+ */
 export function decisionFor(consent, root, agent, opts) {
-    return decisionForKey(consent, consentKey(root, opts), agent);
+    return decisionsFor(consent, root, opts)(agent);
+}
+/** An answer recorded for a project itself ("yes" or "no"), not through "never". */
+function ownAnswer(consent, key, agent) {
+    const here = consent.workspaces[key]?.[agent];
+    return here === "yes" || here === "no";
+}
+/**
+ * decisionFor for every agent of one project, with the worktree's main
+ * checkout looked up once: planAgentSetup asks about every agent.
+ */
+export function decisionsFor(consent, root, opts) {
+    const key = consentKey(root, opts);
+    const main = worktreeConsentSource(root);
+    const mainKey = main ? consentKey(main, opts) : undefined;
+    return (agent) => mainKey !== undefined && !ownAnswer(consent, key, agent)
+        ? decisionForKey(consent, mainKey, agent)
+        : decisionForKey(consent, key, agent);
+}
+/**
+ * The agents whose answer in the linked worktree at `root` comes from its
+ * main checkout (decisionFor): the worktree has none of its own for them
+ * and the main checkout has a "yes" or a "no". undefined when `root` takes
+ * nothing from another checkout. What `vexp doctor` says the answers come
+ * from.
+ */
+export function inheritedAnswers(consent, root, opts) {
+    const main = worktreeConsentSource(root);
+    if (!main)
+        return undefined;
+    const key = consentKey(root, opts);
+    const mainKey = consentKey(main, opts);
+    const agents = Object.keys(consent.workspaces[mainKey] ?? {}).filter((agent) => ownAnswer(consent, mainKey, agent) && !ownAnswer(consent, key, agent));
+    return agents.length > 0 ? { main, agents } : undefined;
 }
 /** Temp file + rename, so a reader never sees half a file. */
 function writeAtomic(file, content) {
@@ -236,9 +281,74 @@ export function recordAgentConsent(root, agent, decision, opts) {
         else
             delete workspaces[key];
         const out = { ...raw, version: typeof raw.version === "number" ? raw.version : 1, workspaces, never };
+        pruneGoneWorktrees(out, workspaces, key, linkedWorktreeMain(root));
         writeAtomic(file, JSON.stringify(out, null, 2) + "\n");
     }
     catch {
         /* see above */
     }
 }
+/**
+ * The keys of linked worktrees that answers were saved for, under
+ * `worktrees`, each with its main checkout: a worktree is made and removed
+ * by the dozen (an agent harness makes one per task), and the key of each
+ * removed one stayed in this file for good. At each save, a worktree that
+ * is gone for good loses its answers (worktreeGone). One that is only out
+ * of reach keeps them: to fs.existsSync, an unplugged disk, an offline
+ * share, a dropped mount or a folder this user may not enter all looked
+ * like a removed worktree, and once the volume was back a "Not here" given
+ * in the worktree became its main checkout's "yes" (review, 2026-11-07).
+ * Only keys saved as a worktree's go. The list is written only while it
+ * names one, so a file with no worktree in it keeps its bytes. Lockstep
+ * with the extension.
+ */
+function pruneGoneWorktrees(out, workspaces, key, main) {
+    const listed = {};
+    if (isPlainObject(out.worktrees)) {
+        for (const [k, m] of Object.entries(out.worktrees))
+            if (typeof m === "string")
+                listed[k] = m;
+    }
+    if (main !== null && workspaces[key] !== undefined)
+        listed[key] = main;
+    for (const [k, m] of Object.entries(listed)) {
+        if (workspaces[k] === undefined)
+            delete listed[k];
+        else if (worktreeGone(k, m)) {
+            delete workspaces[k];
+            delete listed[k];
+        }
+    }
+    if (Object.keys(listed).length > 0)
+        out.worktrees = listed;
+    else
+        delete out.worktrees;
+}
+/**
+ * Removed, not just out of reach: the worktree folder does not exist
+ * (ENOENT or ENOTDIR, not EACCES, EIO or ENOTCONN), while the folder that
+ * held it and its main checkout's .git do. An unplugged disk, an offline
+ * share or an unmounted volume takes the parent folder or the main checkout
+ * with it; a worktree beside its main checkout at the root of a Linux mount
+ * leaves only the empty mount point as its parent, and the main checkout's
+ * .git is gone with the mount. Lockstep with the extension.
+ */
+function worktreeGone(k, main) {
+    try {
+        fs.statSync(k);
+        return false;
+    }
+    catch (e) {
+        const code = e.code;
+        if (code !== "ENOENT" && code !== "ENOTDIR")
+            return false;
+    }
+    try {
+        fs.statSync(path.dirname(k));
+        fs.statSync(path.join(main, ".git"));
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

package/dist/cli.js

@@ -8,11 +8,11 @@ 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 { getAgentList, configureSelectedAgents, resolveAgentName, suggestAgentName, setGuardMode, setInterventionMode, plannedWrites, takeSkippedConfigs, takeUnreachableTargets, takeCodexHookApprovals, codexHookApprovalStep, planAgentSetup, nonInteractiveAgentChoice, setupAgentsCommand } from "./agent-config.js";
+import { getAgentList, configureSelectedAgents, resolveAgentName, suggestAgentName, setGuardMode, setInterventionMode, plannedWrites, takeSkippedConfigs, takeUnreachableTargets, takeCodexHookApprovals, takeSetupNotes, codexHookApprovalStep, planAgentSetup, nonInteractiveAgentChoice, setupAgentsCommand, deadAntigravityEntryFiles } from "./agent-config.js";
 import { recordAgentConsent } from "./agent-consent.js";
 import { CLI_VERSION } from "./version.js";
 import { deactivateLicense, readLicenseLimits, readDeviceBlocked, refreshFromDisk, } from "./license.js";
-import { runActivation, planLabel as licensePlanLabel, isLifetimePlan, printCheckInStatus, } from "./license-activate.js";
+import { runActivation, planLabel as licensePlanLabel, isLifetimePlan, printCheckInStatus, allToolsLines, } from "./license-activate.js";
 import { checkForUpdate } from "./update-check.js";
 import { ensureMcpHttpServer, mcpHttpStatus } from "./mcp-supervisor.js";
 import { installAutostart, uninstallAutostart, autostartStatus, migrateClaudeUnpinIfNeeded } from "./autostart.js";
@@ -26,6 +26,7 @@ import { parseDaemonRows, daemonsToStop, engineSaid, daemonWasStopped, stopNotes
 import { replaceOlderDaemon, parseEngineVersion, commandMayReplaceDaemon } from "./daemon-upgrade.js";
 import { mutableOutput, askSecretOn } from "./secret-prompt.js";
 import { isTraceEnabled } from "./trace.js";
+import { DEVMIND_REQUIREMENT, LLM_MENU, bannerText, llmBannerLines, llmMenuChoice, parseSetupLlmStatus } from "./devmind.js";
 import { resolveParentWorkspace, listWorkspaceRepos, addRepoToWorkspace, } from "./workspace-repos.js";
 const program = new Command();
 program
@@ -46,7 +47,8 @@ Daemons:
     [daemon]
     idle_timeout_minutes = 30
 
-  VEXP_IDLE_TIMEOUT_MINUTES sets it for one daemon. A daemon an editor window started stops
+  VEXP_IDLE_TIMEOUT_MINUTES sets it for one daemon. Unset, a daemon an agent's session started
+  stops after 30 minutes without use (0 turns that off). A daemon an editor window started stops
   with that window instead. vexp daemons lists them; vexp doctor says whether the setting is on.
 `;
 program.addHelpText("after", IDLE_STOP_HELP);
@@ -782,18 +784,23 @@ program
     .command("compress <file>")
     .description("Compress a markdown/text file using prose compression (backup to <name>.original.md)")
     .option("--level <lvl>", "Compression level: off | lite | full | ultra", "full")
+    .option("--llm", "Use the local LLM (DevMind) for this file: needs the model installed (or an [llm] endpoint), and runs also with LLM compression switched off, for this file only. Without a usable GPU it runs on the CPU as an explicit one-off, slower; falls back to rule-based compression when no model can be used")
     .action(async (file, opts) => {
     const binaryPath = ensureBinary();
-    runBinary(binaryPath, ["compress", file, "--level", opts.level]);
+    runBinary(binaryPath, ["compress", file, "--level", opts.level, ...(opts.llm ? ["--llm"] : [])]);
 });
 program
     .command("setup-llm")
-    .description("Configure optional local LLM compression (vexp-devmind). Runs interactive wizard by default.")
-    .option("--status", "Print current LLM config and readiness")
-    .option("--disable", "Disable LLM compression without removing model files")
-    .option("--install", "Non-interactive install (for CI / first-run)")
+    // The requirement is said before anyone downloads, and every flag says
+    // what it does (review, 2026-11-08). The flags are vexp-core's, passed
+    // through. Lockstep with packages/vexp-core/src/main.rs (SetupLlm).
+    .description(`Configure the optional local LLM compression (DevMind, vexp-devmind). ${DEVMIND_REQUIREMENT} Runs the interactive wizard by default.`)
+    .option("--status", "Print the LLM config, whether DevMind runs on this machine (and why not), the hardware, and what the workspace daemon runs")
+    .option("--disable", "Turn LLM compression off; the model files stay on disk (see --uninstall)")
+    .option("--install", "Install without prompts: checks first that DevMind can run here and downloads nothing when it cannot; on NVIDIA fetches the CUDA plugin and runtime (~1 GB) before the model (~3.5 GB)")
     .option("--check-updates", "Check for model updates without downloading")
-    .option("--enable", "Enable a previously-installed LLM without re-downloading anything")
+    .option("--enable", "Turn a previously installed model back on without downloading anything; refuses where DevMind cannot run")
+    .option("--uninstall", "Remove what vexp downloaded for DevMind (the model, the CUDA plugin and runtime, the GPU markers) and turn it off")
     .action(async (opts) => {
     const binaryPath = ensureBinary();
     const args = ["setup-llm"];
@@ -807,6 +814,8 @@ program
         args.push("--check-updates");
     if (opts.enable)
         args.push("--enable");
+    if (opts.uninstall)
+        args.push("--uninstall");
     runBinary(binaryPath, args);
 });
 program
@@ -891,6 +900,20 @@ function printCodexHookApprovals() {
         console.log(chalk.yellow(`  ! ${codexHookApprovalStep(root)}`));
     }
 }
+/**
+ * What this run left as it is on purpose (takeSetupNotes): a file committed
+ * to the repository that only this checkout's path would have changed, or
+ * that a cleanup would have deleted; .vscode/mcp.json left without vexp
+ * because .mcp.json defines it. Said in the words the extension logs.
+ */
+function printSetupNotes() {
+    const notes = takeSetupNotes();
+    if (notes.length === 0)
+        return;
+    console.log("");
+    for (const note of notes)
+        console.log(chalk.dim(`  ${note}`));
+}
 function agentMark(plan, agent) {
     const pre = plan.configure.includes(agent);
     const kind = plan.kinds[agent];
@@ -1067,6 +1090,14 @@ program
                         console.log(chalk.dim(`      - ${line}`));
                     }
                 }
+                // Every setup takes vexp's dead Antigravity entries out, whichever
+                // agents it sets up; with Antigravity chosen its lines name them.
+                const dead = selectedNames.includes("Antigravity") ? [] : deadAntigravityEntryFiles();
+                if (dead.length > 0) {
+                    console.log(chalk.dim("    machine-wide:"));
+                    for (const file of dead)
+                        console.log(chalk.dim(`      - ${file}  (vexp's old unpinned entry removed)`));
+                }
                 console.log(chalk.dim("\n  Nothing was written (dry run)."));
             }
             else {
@@ -1132,14 +1163,9 @@ program
                 }
                 // Agents selected whose config target does not exist on this
                 // machine yet: rules land, tools do not, and nothing said so.
-                const unreachable = takeUnreachableTargets();
-                if (unreachable.length > 0) {
-                    console.log("");
-                    console.log(chalk.yellow(`  ⚠ ${unreachable.length} agent config(s) could not be written yet:`));
-                    for (const f of unreachable)
-                        console.log(chalk.yellow(`    ${f}`));
-                }
+                printUnreachableTargets();
                 printCodexHookApprovals();
+                printSetupNotes();
             }
         }
     }
@@ -1275,9 +1301,32 @@ async function runSetupAgents(dir) {
             console.log(chalk.dim(`    → ${mcpFile}`));
         }
     }
+    printUnreachableTargets();
     printCodexHookApprovals();
+    printSetupNotes();
     console.log(chalk.green(`\n  ✓ ${result.agents.length} agent(s) configured\n`));
 }
+/**
+ * Agents selected whose config target cannot be written (none on this
+ * machine yet, one setup refuses to write through, such as Antigravity's
+ * .agents/mcp_config.json when it is a link to the machine-wide file, a
+ * pinned project file that leads out of the project through a link or is
+ * a link to nothing (projectWriteLanding), or a file whose mcpServers /
+ * servers / mcp is not an object, left untouched):
+ * rules land, tools do not, and nothing said so. Every setup path prints
+ * it: `vexp setup-agents` and the REPL's setup ended with a check mark
+ * over a refusal that only `vexp setup` showed. Not "yet": a file left
+ * untouched stays so until the user fixes it.
+ */
+function printUnreachableTargets() {
+    const unreachable = takeUnreachableTargets();
+    if (unreachable.length === 0)
+        return;
+    console.log("");
+    console.log(chalk.yellow(`  ⚠ ${unreachable.length} agent config(s) could not be written:`));
+    for (const f of unreachable)
+        console.log(chalk.yellow(`    ${f}`));
+}
 /** Full setup from REPL — reuses the existing readline to avoid stdin conflicts. */
 async function runSetupInteractive(rl) {
     const workspaceRoot = process.cwd();
@@ -1340,7 +1389,9 @@ async function runSetupInteractive(rl) {
         if (result.mcpConfigs.length > 0) {
             console.log(chalk.dim(`\n  MCP configs: ${result.mcpConfigs.join(", ")}`));
         }
+        printUnreachableTargets();
         printCodexHookApprovals();
+        printSetupNotes();
         console.log(chalk.green(`\n  ✓ Setup complete — ${result.agents.length} agent(s) configured\n`));
     }
     // Login autostart — opt-in only. The daemon already cold-starts on demand,
@@ -1425,10 +1476,7 @@ program
         console.log(`  Email:     ${limits.email}`);
     console.log(`  Max nodes: ${limits.maxNodes === 0 ? "unlimited" : limits.maxNodes.toLocaleString()}`);
     console.log(`  Max repos: ${limits.maxRepos === 0 ? "unlimited" : limits.maxRepos}`);
-    console.log(`  All tools: ${limits.allTools ? "yes" : "no (7/10)"}`);
-    if (limits.allTools) {
-        console.log(`             (the MCP tool list shows 4 by default to keep the catalog small; every tool stays callable — VEXP_ALL_TOOLS=1 lists them all)`);
-    }
+    allToolsLines(limits.allTools).forEach((l, n) => console.log(`  ${n === 0 ? "" : " ".repeat(11)}${l}`));
     if (limits.renewsAt) {
         console.log(ltd
             ? `  Renewal:   none — lifetime licence (local token auto-refreshes, ` +
@@ -1573,6 +1621,7 @@ program
         console.log(chalk.dim(`  Codex starts vexp in each session's own folder; 'vexp use ${JSON.stringify(resolved)} --pin' would make every session use this project instead`));
     }
     printCodexHookApprovals();
+    printSetupNotes();
 });
 // ────────────────────────────────────────────────────
 // Version
@@ -1593,7 +1642,7 @@ const MENU_CONFIG = [
     { 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/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." },
+    { key: "6", label: "setup-llm", hint: "Configure local LLM compression (vexp-devmind)", description: "Install, update, disable or remove 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.\n    DevMind needs an NVIDIA GPU (Linux, Windows) or an Apple Silicon Mac;\n    without one it stays off and vexp works the same." },
 ];
 // ── Sub-menu: Explore & Analyze ──
 const MENU_EXPLORE = [
@@ -1683,7 +1732,10 @@ async function printBanner() {
             console.log(chalk.dim("    → type '1 > 5 > start' to launch it, or `vexp daemon-cmd start`"));
         }
     }
-    // ── LLM status line (3 states: active / installed-not-active / not installed) ──
+    // ── LLM status line ──
+    // From the engine's --status: "(active)" only when the workspace daemon
+    // runs the model, and DevMind off on this machine said calmly, with no
+    // download offered (review, 2026-11-08; see llmBannerLines).
     try {
         const llmBin = ensureBinary();
         const stdout = execFileSync(llmBin, ["setup-llm", "--status"], {
@@ -1691,20 +1743,13 @@ async function printBanner() {
             encoding: "utf-8",
             stdio: ["pipe", "pipe", "pipe"],
             env: binaryEnv(llmBin),
+            // Its "Daemon now" line names the daemon of the folder it runs in:
+            // the one the daemon line above reports.
+            cwd: eff?.root,
         });
-        const operational = /Operational:\s*true/i.test(stdout);
-        const installed = /Installed:\s*true/i.test(stdout);
-        const model = stdout.match(/Model:\s*(.+)/)?.[1]?.trim() ?? "";
-        if (operational) {
-            console.log(chalk.green(`  ● LLM: ${model || "local"} (active)`));
-        }
-        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 --enable`"));
-        }
-        else {
-            console.log(chalk.dim("  ○ LLM: not installed"));
-            console.log(chalk.dim("    → type '1 > 6 > install' to download (~3.5 GB), or `vexp setup-llm --install`"));
+        for (const l of llmBannerLines(parseSetupLlmStatus(stdout))) {
+            const text = bannerText(l);
+            console.log(l.tone === "green" ? chalk.green(text) : l.tone === "yellow" ? chalk.yellow(text) : chalk.dim(text));
         }
     }
     catch {
@@ -1929,16 +1974,17 @@ async function executeCommand(label, rl, outCtl) {
             case "setup-llm": {
                 // Sticky sub-sub-menu.
                 const llmBinary = ensureBinary();
+                // One table prints the menu, reads the answer and names the keys
+                // in the banner's hints: those said '1 > 6 > start', which this
+                // prompt refused (review, 2026-11-08).
                 const printLlmMenu = () => {
                     console.log("");
                     console.log(chalk.cyan("    ── Local LLM (vexp-devmind) ──"));
                     console.log(chalk.dim("    All processing runs locally — no data leaves your machine."));
+                    console.log(chalk.dim(`    ${DEVMIND_REQUIREMENT}`));
                     console.log("");
-                    console.log(`      ${chalk.bold("1")}  Install / Reinstall  ${chalk.dim("(~3.5 GB download)")}`);
-                    console.log(`      ${chalk.bold("2")}  Start                ${chalk.dim("(enable without re-downloading)")}`);
-                    console.log(`      ${chalk.bold("3")}  Check for updates    ${chalk.dim("(no download if up to date)")}`);
-                    console.log(`      ${chalk.bold("4")}  Status               ${chalk.dim("(current config + hardware)")}`);
-                    console.log(`      ${chalk.bold("5")}  Disable              ${chalk.dim("(keep files, stop using LLM)")}`);
+                    for (const e of LLM_MENU)
+                        console.log(`      ${chalk.bold(e.key)}  ${e.label.padEnd(20)} ${chalk.dim(e.note)}`);
                     console.log(`      ${chalk.dim("b")}  ${chalk.dim("Back to Setup & Config")}`);
                     console.log("");
                 };
@@ -1949,27 +1995,22 @@ async function executeCommand(label, rl, outCtl) {
                         continue;
                     if (c === "b" || c === "back")
                         break;
-                    switch (c) {
-                        case "1":
-                            console.log(chalk.dim("    Starting LLM setup (this may take several minutes)…\n"));
-                            runBinary(llmBinary, ["setup-llm", "--install"]);
-                            break;
-                        case "2":
-                            runBinary(llmBinary, ["setup-llm", "--enable"]);
-                            break;
-                        case "3":
-                            runBinary(llmBinary, ["setup-llm", "--check-updates"]);
-                            break;
-                        case "4":
-                            runBinary(llmBinary, ["setup-llm", "--status"]);
-                            break;
-                        case "5":
-                            runBinary(llmBinary, ["setup-llm", "--disable"]);
-                            break;
-                        default:
-                            console.log(chalk.dim("    Unknown option. Use 1-5 or 'b' to go back."));
+                    const choice = llmMenuChoice(c);
+                    if (!choice) {
+                        console.log(chalk.dim(`    Unknown option. Use 1-${LLM_MENU.length} or 'b' to go back.`));
+                        continue;
+                    }
+                    if (choice.flag === "--install") {
+                        console.log(chalk.dim("    Starting LLM setup (this may take several minutes)…\n"));
+                    }
+                    if (choice.flag === "--uninstall") {
+                        const yes = (await ask(rl, chalk.cyan("    Remove the DevMind model and the CUDA files vexp downloaded? (y/N) "))).trim().toLowerCase();
+                        if (yes !== "y" && yes !== "yes") {
+                            printLlmMenu();
                             continue;
+                        }
                     }
+                    runBinary(llmBinary, ["setup-llm", choice.flag]);
                     printLlmMenu();
                 }
                 break;
@@ -2128,10 +2169,7 @@ async function executeCommand(label, rl, outCtl) {
                     console.log(`    Email:     ${limits.email}`);
                 console.log(`    Max nodes: ${limits.maxNodes === 0 ? "unlimited" : limits.maxNodes.toLocaleString()}`);
                 console.log(`    Max repos: ${limits.maxRepos === 0 ? "unlimited" : limits.maxRepos}`);
-                console.log(`    All tools: ${limits.allTools ? "yes" : "no (7/10)"}`);
-                if (limits.allTools) {
-                    console.log(`               (the MCP tool list shows 4 by default to keep the catalog small; every tool stays callable — VEXP_ALL_TOOLS=1 lists them all)`);
-                }
+                allToolsLines(limits.allTools).forEach((l, n) => console.log(`    ${n === 0 ? "" : " ".repeat(11)}${l}`));
                 if (limits.renewsAt) {
                     console.log(ltd
                         ? `    Renewal:   none — lifetime licence (token auto-refreshes, valid to ${limits.renewsAt.toLocaleDateString()})`

package/dist/daemon-upgrade.js

@@ -187,8 +187,13 @@ export function parseEngineVersion(stdout) {
     return last ? last : undefined;
 }
 /**
- * The folder `daemon-cmd` works on when run in `dir`: the nearest one with a
- * `.git` at or above it, else `dir` itself (find_repo_root in vexp-core).
+ * The folder `daemon-cmd` works on when run in `dir` (daemon_cmd_root in
+ * vexp-core): the nearest one with a `.git` at or above it, unless that one
+ * was never set up for vexp and a folder between it and `dir` was, which
+ * is then the nearest such folder; with no `.git` above, `dir` itself. Set
+ * up is the engine's is_workspace_marker: one of its consent files in the
+ * folder's .vexp/, and neither the home directory nor a filesystem root
+ * (forbidden_workspace_reason refuses both).
  */
 export function daemonCmdRoot(dir) {
     let start = path.resolve(dir);
@@ -198,10 +203,16 @@ export function daemonCmdRoot(dir) {
     catch {
         /* not there: the spelling given */
     }
+    const setUp = (d) => (process.env.VEXP_ALLOW_HOME_WORKSPACE === "1" ||
+        (upgradeAttemptKey(d) !== upgradeAttemptKey(vexpHome()) && path.dirname(d) !== d)) &&
+        ["manifest.json", "vexp.toml", "workspace.json", "index.db"].some((f) => fs.existsSync(path.join(d, ".vexp", f)));
+    const below = [];
     let current = start;
     for (;;) {
-        if (fs.existsSync(path.join(current, ".git")))
-            return current;
+        if (fs.existsSync(path.join(current, ".git"))) {
+            return setUp(current) ? current : (below.find(setUp) ?? current);
+        }
+        below.push(current);
         const parent = path.dirname(current);
         if (parent === current)
             return start;
@@ -215,8 +226,10 @@ export function daemonCmdRoot(dir) {
  *
  *  - the stop half reads `<dir>/.vexp/daemon.pid`; with none there it stops
  *    nothing, and the start half then races the daemon that is still up;
- *  - `daemon-cmd` works on the git root at or above its cwd, so for a
- *    workspace below one it would start a daemon on the folder above;
+ *  - `daemon-cmd` works on the git root at or above its cwd unless a folder
+ *    below an unset-up root was set up on its own (daemonCmdRoot), so for
+ *    any other workspace below one it would start a daemon on the folder
+ *    above;
  *  - the engine refuses to start on the home directory, so a daemon an older
  *    build left there would be stopped and not come back.
  */