vexp-cli 3.2.4 → 3.2.5

package/dist/agent-config.js

@@ -11,6 +11,7 @@ import * as path from "path";
 import * as os from "os";
 import { spawnSync } from "child_process";
 import * as crypto from "crypto";
+import { canonicalWorkspaceRoot } from "./socket-path.js";
 import { VEXP_GUARD_HOOK, VEXP_OPENCODE_GUARD, VEXP_CURSOR_GUARD, vexpHintHookScript, vexpSearchHookScript, vexpHintHookCmdScript, vexpStopGateHookScript, vexpSessionContextHookScript, vexpOpencodeHintPlugin, vexpOpencodeCompressPlugin, bakeEditHintHook, bakeReadHintHook, bakeBashCapHook } from "./hook-template.js";
 // ---------------------------------------------------------------------------
 // Constants
@@ -39,7 +40,9 @@ const CANONICAL_VEXP_TOML_SECTION_RE = /\n?\[mcp_servers\.vexp(?:\.[a-z_]+)?\][\
  * MUST stay in lockstep with that function.
  */
 function workspaceHash(workspaceRoot) {
-    const input = workspaceRoot.toLowerCase();
+    // The route hash must name the row the daemon registers: its canonical
+    // root, which on a mapped drive is the share, not the drive letter.
+    const input = canonicalWorkspaceRoot(workspaceRoot).toLowerCase();
     let hash = BigInt("0xcbf29ce484222325");
     const prime = BigInt("0x100000001b3");
     const mask = BigInt("0xffffffffffffffff");

package/dist/doctor.js

@@ -11,6 +11,7 @@ import { CLI_VERSION } from "./version.js";
 import { parentPid } from "./mcp-supervisor.js";
 import { slowMountNotice } from "./slow-mount.js";
 import { vexpHome, isStateHome } from "./state-home.js";
+import { canonicalWorkspaceRoot } from "./socket-path.js";
 // `vexp doctor` — audit the vexp MCP/daemon state WITHOUT connecting to a daemon.
 // Surfaces the failure modes behind the Codex drift report: stale daemons.json
 // entries, wrong-workspace resolution, mixed Codex transport (url+stdio),
@@ -292,7 +293,7 @@ export function vsCodeMcpVerdict(cfg, wsRoot, exists = (p) => fs.existsSync(p))
     if (script && !exists(script))
         return { level: WARN, message: `.vscode/mcp.json vexp server bundle is missing: ${script} (an editor upgrade removed the old extension folder?) — re-run 'vexp setup'` };
     const pinned = typeof vexp.env?.VEXP_WORKSPACE === "string" ? vexp.env.VEXP_WORKSPACE : undefined;
-    if (pinned && path.resolve(pinned).toLowerCase() !== path.resolve(wsRoot).toLowerCase()) {
+    if (pinned && !samePath(pinned, wsRoot)) {
         return { level: WARN, message: `.vscode/mcp.json vexp server is pinned to ${pinned}, but this workspace is ${wsRoot} — re-run 'vexp setup' here` };
     }
     return { level: OK, message: `.vscode/mcp.json vexp server: ${command} ${script ?? args.join(" ")}` };
@@ -314,8 +315,9 @@ export function codexHookSpawnSpec(cmdLine, platform = process.platform, comspec
     return { file: "sh", args: ["-c", cmdLine], windowsVerbatimArguments: false };
 }
 function samePath(a, b) {
-    // The daemon registry lower-cases Windows roots; compare accordingly.
-    return path.resolve(a).toLowerCase() === path.resolve(b).toLowerCase();
+    // The daemon registry lower-cases Windows roots and spells a mapped drive
+    // as its share; compare accordingly.
+    return canonicalWorkspaceRoot(path.resolve(a)).toLowerCase() === canonicalWorkspaceRoot(path.resolve(b)).toLowerCase();
 }
 /**
  * A connected repo of a multi-repo workspace has no daemon of its own: the
@@ -633,7 +635,7 @@ async function doctorChecks(onWorkspace) {
     // disagrees with this directory's natural target.
     if (ws.source === "VEXP_WORKSPACE") {
         const discovered = discoverWorkspaceRoot(process.cwd());
-        if (discovered.toLowerCase() !== ws.root.toLowerCase()) {
+        if (!samePath(discovered, ws.root)) {
             line(WARN, `global VEXP_WORKSPACE env var pins this session to ${ws.root}, but this directory's natural target is ${discovered} → agents here get [] / wrong-repo results. Unset the VEXP_WORKSPACE OS/shell env var for per-session targeting.`);
         }
     }
@@ -776,7 +778,7 @@ async function doctorChecks(onWorkspace) {
                 line(BAD, `${root} is your home directory — never a workspace (its .vexp is vexp's state dir). A daemon here indexes everything under home. Run: vexp forget "${root}"   (stops it, drops this row, deletes only its index files — licence, config and registry stay)`);
             }
         }
-        const inReg = entries.some(([r]) => r.toLowerCase() === ws.root.toLowerCase());
+        const inReg = entries.some(([r]) => samePath(r, ws.root));
         if (!inReg)
             line(WARN, `current workspace (${ws.root}) is NOT registered — a child here could mis-route`);
         // Multi-daemon + global pin: catches the case the section-1 check misses

package/dist/forget.js

@@ -1,6 +1,7 @@
 import * as fs from "fs";
 import * as path from "path";
 import { vexpHome } from "./state-home.js";
+import { canonicalWorkspaceRoot } from "./socket-path.js";
 /**
  * `vexp forget`: the pieces that make a workspace stay forgotten.
  *
@@ -85,7 +86,8 @@ function registryFile() {
  *  socket (a connected repo mapped to this workspace's socket is dangling
  *  once the workspace is gone). Windows keys are lowercased by the daemon. */
 export function registryRowsWithout(reg, target, targetSocket) {
-    const canon = (p) => (process.platform === "win32" ? path.resolve(p).toLowerCase() : path.resolve(p));
+    // A mapped drive is registered as its share; canonicalize before comparing.
+    const canon = (p) => (process.platform === "win32" ? canonicalWorkspaceRoot(path.resolve(p)).toLowerCase() : path.resolve(p));
     const t = canon(target);
     const kept = {};
     const dropped = [];

package/dist/serve.js

@@ -6,6 +6,7 @@ import { spawn } from "child_process";
 import { getBinaryPath, binaryEnv } from "./binary.js";
 import { ensureMcpHttpServer } from "./mcp-supervisor.js";
 import { isStateHome } from "./state-home.js";
+import { canonicalWorkspaceRoot } from "./socket-path.js";
 const HEALTH_INTERVAL_MS = 60_000;
 const DEFAULT_MCP_PORT = 7821;
 function registryPath() {
@@ -241,7 +242,7 @@ async function resurrectAll() {
     // rewrite here would otherwise immortalize the phantom twin.
     const seenKeys = new Set();
     for (const [ws, sock] of Object.entries(reg)) {
-        const canonical = process.platform === "win32" ? ws.toLowerCase() : ws;
+        const canonical = process.platform === "win32" ? canonicalWorkspaceRoot(ws).toLowerCase() : ws;
         if (seenKeys.has(canonical)) {
             appendLog(`registry prune: ${ws} (case-variant duplicate)`);
             continue;
@@ -299,7 +300,7 @@ async function resurrectAll() {
  * report what it could not find, never delete what it does not own.
  */
 export async function survivingRegistryRows(before, resurrected, alive, log = () => { }) {
-    const canonical = (ws) => (process.platform === "win32" ? ws.toLowerCase() : ws);
+    const canonical = (ws) => (process.platform === "win32" ? canonicalWorkspaceRoot(ws).toLowerCase() : ws);
     const out = { ...resurrected };
     const kept = new Set(Object.keys(out).map(canonical));
     for (const [ws, sock] of Object.entries(before)) {

package/dist/socket-path.js

@@ -1,3 +1,4 @@
+import * as fs from "fs";
 import * as path from "path";
 /**
  * Where the daemon listens for a given workspace root.
@@ -18,7 +19,7 @@ import * as path from "path";
  */
 export function socketPathFor(workspaceRoot) {
     if (process.platform === "win32") {
-        return `\\\\.\\pipe\\vexp-${fnvHash(workspaceRoot.toLowerCase()).slice(0, 8)}`;
+        return `\\\\.\\pipe\\vexp-${fnvHash(canonicalWorkspaceRoot(workspaceRoot).toLowerCase()).slice(0, 8)}`;
     }
     const candidate = path.join(workspaceRoot, ".vexp", "daemon.sock");
     // macOS/BSD sockaddr_un caps the path at 104 bytes; vexp-core falls back to
@@ -27,6 +28,29 @@ export function socketPathFor(workspaceRoot) {
         return candidate;
     return `/tmp/vexp-${fnvHash(workspaceRoot).slice(0, 12)}.sock`;
 }
+/**
+ * The workspace root as the daemon spells it. vexp-core canonicalizes the
+ * root before deriving the pipe name and the daemons.json key, and on
+ * Windows a folder on a mapped drive canonicalizes to its share:
+ * `X:\proj` becomes `\\server\share\proj`. Every hash computed from the
+ * drive-letter spelling named a pipe the daemon never bound, so `vexp
+ * status` on a share reported the daemon as down and started a second one,
+ * and the MCP bridge could not reach it (field report, Samba share from
+ * Windows 11, 2026-09-20). Node's native realpath resolves the same way; a
+ * local path only gets its case corrected, which the lowercase hash never
+ * saw. Falls back to the spelling given when the folder cannot be resolved
+ * (a stale registry row, a path that is not there yet).
+ */
+export function canonicalWorkspaceRoot(root) {
+    if (process.platform !== "win32")
+        return root;
+    try {
+        return fs.realpathSync.native(root);
+    }
+    catch {
+        return root;
+    }
+}
 /** Longest `<root>/.vexp/daemon.sock` vexp binds in place; past it the socket lives in /tmp. */
 export const UNIX_SOCKET_PATH_LIMIT = 100;
 /**