neohive 6.1.3 → 6.2.0

package/dashboard.js

@@ -169,6 +169,7 @@ function readNeohiveDataDirFromMcpConfigs(projectRoot) {
 }
 
 function resolveDashboardDefaultDataDir() {
+  // 1. Explicit env var — highest priority
   let envData = process.env.NEOHIVE_DATA_DIR || process.env.NEOHIVE_DATA;
   if (envData && String(envData).trim()) {
     let s = String(envData).trim();
@@ -178,10 +179,10 @@ function resolveDashboardDefaultDataDir() {
     }
     return { path: path.resolve(s), source: 'environment' };
   }
-  const fromWalk = bestNeohiveAmongAncestors(process.cwd());
-  if (fromWalk) {
-    return { path: fromWalk, source: 'walk-up' };
-  }
+
+  // 2. Project MCP config — authoritative, written by `neohive init`
+  //    Check this BEFORE the directory walk so a stale ~/.neohive/ from
+  //    a previous session doesn't shadow the project's explicit config.
   let dir = path.resolve(process.cwd());
   const root = path.parse(dir).root;
   while (true) {
@@ -192,6 +193,14 @@ function resolveDashboardDefaultDataDir() {
     if (dir === root) break;
     dir = path.dirname(dir);
   }
+
+  // 3. Walk up looking for .neohive/ directories — best-effort fallback
+  const fromWalk = bestNeohiveAmongAncestors(process.cwd());
+  if (fromWalk) {
+    return { path: fromWalk, source: 'walk-up' };
+  }
+
+  // 4. cwd/.neohive — last resort
   return { path: path.join(process.cwd(), '.neohive'), source: 'cwd' };
 }
 

package/lib/resolve-server-data-dir.js

@@ -64,29 +64,49 @@ function readNeohiveDirFromUserCursorMcp() {
 
 /**
  * Neohive data directory for the MCP / CLI process.
- * Cursor often spawns MCP with cwd=user home and omits NEOHIVE_DATA_DIR in the child env.
- * We mirror dashboard resolution: walk ancestors of cwd for MCP configs, then package sibling,
- * then ~/.cursor/mcp.json with an absolute path, then cwd/.neohive.
+ *
+ * Resolution order:
+ * 1. NEOHIVE_DATA_DIR env var (set by `neohive init` in project .cursor/mcp.json)
+ * 2. Walk up from cwd looking for project MCP configs that define NEOHIVE_DATA_DIR
+ * 3. Sibling .neohive/ next to the package (for local dev)
+ * 4. User-level ~/.cursor/mcp.json (only if it has an absolute NEOHIVE_DATA_DIR)
+ * 5. cwd/.neohive (last resort)
+ *
+ * Cursor spawns MCP processes with cwd set to a fixed directory (often $HOME),
+ * NOT the project root. The only reliable way to identify the project is via
+ * NEOHIVE_DATA_DIR in the env. All other fallbacks are best-effort heuristics.
  *
  * @param {string} serverJsDir - __dirname of server.js (the agent-bridge folder)
  */
 function resolveDataDirForServer(serverJsDir) {
   const raw = process.env.NEOHIVE_DATA_DIR || process.env.NEOHIVE_DATA;
   if (raw != null && String(raw).trim() !== '') {
-    return path.resolve(String(raw).trim());
+    const val = String(raw).trim();
+    if (/\$\{workspaceFolder\}/i.test(val)) {
+      // Cursor user-level configs don't expand ${workspaceFolder}.
+      // Don't use this broken value — fall through to cwd/.neohive so the
+      // data stays isolated to wherever the process is running.
+      console.error('[neohive] NEOHIVE_DATA_DIR contains unexpanded ${workspaceFolder}: ' + val);
+      console.error('[neohive] Run "npx neohive init --cursor" in your project to fix this.');
+      return path.join(process.cwd(), '.neohive');
+    }
+    return path.resolve(val);
   }
 
+  // No env var at all — IDE didn't pass one. Walk up from cwd looking for a
+  // project MCP config that defines NEOHIVE_DATA_DIR (first match wins).
   const fromWalk = findDataDirByWalkingUpFrom(process.cwd());
   if (fromWalk) return fromWalk;
 
+  // Local dev only: server.js lives inside a project repo (e.g. agent-bridge/).
+  // Use the repo's .neohive/ — but ONLY if we aren't inside node_modules
+  // (npm-installed copies must never resolve to the package author's project).
   const parent = path.join(serverJsDir, '..');
-  if (fs.existsSync(path.join(parent, '.cursor', 'mcp.json'))) {
+  if (!serverJsDir.includes('node_modules') && fs.existsSync(path.join(parent, '.cursor', 'mcp.json'))) {
     return path.join(parent, '.neohive');
   }
-  if (fs.existsSync(path.join(serverJsDir, '.cursor', 'mcp.json'))) {
-    return path.join(serverJsDir, '.neohive');
-  }
 
+  // User-level ~/.cursor/mcp.json — only if it defines an absolute path
   const fromUser = readNeohiveDirFromUserCursorMcp();
   if (fromUser) return fromUser;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neohive",
-  "version": "6.1.3",
+  "version": "6.2.0",
   "description": "The MCP collaboration layer for AI CLI tools. Turn Claude Code, Gemini CLI, and Codex CLI into a team.",
   "main": "server.js",
   "bin": {