vexp-mcp 2.0.31 → 2.0.32

package/dist/daemon-client.js

@@ -420,8 +420,20 @@ function discoverWorkspaceRoot() {
     }
     return cwd;
 }
+/** Emit a stderr warning at most once per distinct message. The resolvers below
+ *  run on every connect; without this guard a misconfig would spam the MCP log.
+ *  stderr is safe — stdout carries the JSON-RPC protocol, stderr is for logs. */
+const _warnedOnce = new Set();
+function warnOnce(msg) {
+    if (_warnedOnce.has(msg))
+        return;
+    _warnedOnce.add(msg);
+    console.error(msg);
+}
 /**
- * Resolve the workspace root for daemon spawn / socket targeting.
+ * Decide the workspace root AND which signal chose it. Single source of truth
+ * for {@link resolveWorkspaceRoot} and {@link resolveTargeting} so they cannot
+ * drift.
  *
  * Precedence:
  *   1. `explicit` — an HTTP per-workspace client's pinned root
@@ -432,12 +444,36 @@ function discoverWorkspaceRoot() {
  *      user-scope ~/.claude.json MCP entry is shared (and intentionally no longer
  *      pins VEXP_WORKSPACE — see agent-config.ts:configureClaudeCodeGlobal).
  *   4. cwd walk-up ({@link discoverWorkspaceRoot})
+ *
+ * EXCEPTION: a *global/stale* `VEXP_WORKSPACE` must not silently override the
+ * per-session `CLAUDE_PROJECT_DIR`. When both are set and DISAGREE, the
+ * per-session signal wins (and we warn once) — otherwise every parallel agent
+ * session is pinned to one repo's daemon and cross-repo get_skeleton /
+ * run_pipeline return []/wrong-repo results. A deliberate single-project pin
+ * (VEXP_WORKSPACE set, no CLAUDE_PROJECT_DIR — e.g. Codex, the CLI, VS Code)
+ * is unaffected.
  */
+function resolveWorkspaceWithSource(explicit) {
+    if (explicit)
+        return { root: explicit, source: "VEXP_WORKSPACE" };
+    const vw = process.env["VEXP_WORKSPACE"];
+    const cpd = process.env["CLAUDE_PROJECT_DIR"];
+    if (vw && cpd && path.resolve(vw).toLowerCase() !== path.resolve(cpd).toLowerCase()) {
+        warnOnce(`[vexp-mcp] VEXP_WORKSPACE=${vw} disagrees with this session's ` +
+            `CLAUDE_PROJECT_DIR=${cpd}; using CLAUDE_PROJECT_DIR for per-session ` +
+            `targeting. Unset the global VEXP_WORKSPACE env var to silence this.`);
+        return { root: cpd, source: "CLAUDE_PROJECT_DIR" };
+    }
+    if (vw)
+        return { root: vw, source: "VEXP_WORKSPACE" };
+    if (cpd)
+        return { root: cpd, source: "CLAUDE_PROJECT_DIR" };
+    return { root: discoverWorkspaceRoot(), source: "cwd-discovery" };
+}
+/** @see resolveWorkspaceWithSource for the precedence (and the VEXP_WORKSPACE /
+ *  CLAUDE_PROJECT_DIR divergence rule). */
 export function resolveWorkspaceRoot(explicit) {
-    return (explicit ??
-        process.env["VEXP_WORKSPACE"] ??
-        process.env["CLAUDE_PROJECT_DIR"] ??
-        discoverWorkspaceRoot());
+    return resolveWorkspaceWithSource(explicit).root;
 }
 /**
  * Read `~/.vexp/daemons.json` and pick the best entry for the given workspace.
@@ -529,20 +565,9 @@ function pickFromDaemonRegistry(workspaceHint) {
 export function resolveTargeting() {
     // Which signal gives us the workspace root? (Reported even when VEXP_SOCKET
     // overrides the socket, so the diagnostics still show the intended project.)
-    let source;
-    let workspaceRoot;
-    if (process.env["VEXP_WORKSPACE"]) {
-        workspaceRoot = process.env["VEXP_WORKSPACE"];
-        source = "VEXP_WORKSPACE";
-    }
-    else if (process.env["CLAUDE_PROJECT_DIR"]) {
-        workspaceRoot = process.env["CLAUDE_PROJECT_DIR"];
-        source = "CLAUDE_PROJECT_DIR";
-    }
-    else {
-        workspaceRoot = discoverWorkspaceRoot();
-        source = "cwd-discovery";
-    }
+    // Shared with resolveWorkspaceRoot — including the VEXP_WORKSPACE /
+    // CLAUDE_PROJECT_DIR divergence rule.
+    const { root: workspaceRoot, source } = resolveWorkspaceWithSource();
     const explicit = process.env["VEXP_SOCKET"];
     if (explicit) {
         return { socket: explicit, source, socketOrigin: "explicit", workspaceRoot };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vexp-mcp",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "description": "vexp MCP server — AI context tools for coding agents",
   "type": "module",
   "main": "dist/index.js",