neohive 6.0.0 → 6.0.3

package/lib/compact.js

@@ -62,7 +62,8 @@ function autoCompact() {
     const messages = lines.map(l => { try { return JSON.parse(l); } catch { return null; } }).filter(Boolean);
 
     const agents = getAgents();
-    const aliveAgentNames = Object.keys(agents).filter(n => isPidAlive(agents[n].pid, agents[n].last_activity));
+    const allAgentNames = Object.keys(agents);
+    const retentionMs = (parseInt(process.env.NEOHIVE_RETENTION_HOURS) || 24) * 3600000;
     const allConsumed = new Set();
     const perAgentConsumed = {};
     if (fs.existsSync(DATA_DIR)) {
@@ -80,7 +81,9 @@ function autoCompact() {
 
     const active = messages.filter(m => {
       if (m.to === '__group__') {
-        return !aliveAgentNames.every(n => n === m.from || (perAgentConsumed[n] && perAgentConsumed[n].has(m.id)));
+        const msgTime = new Date(m.timestamp).getTime();
+        if (msgTime < Date.now() - retentionMs) return false;
+        return !allAgentNames.every(n => n === m.from || (perAgentConsumed[n] && perAgentConsumed[n].has(m.id)));
       }
       if (!allConsumed.has(m.id)) return true;
       return false;

package/lib/config.js

@@ -2,9 +2,10 @@
 
 const fs = require('fs');
 const path = require('path');
+const { resolveDataDirForServer } = require('./resolve-server-data-dir');
 
-// Data dir lives in the project where the CLI runs, not where the package is installed
-const DATA_DIR = process.env.NEOHIVE_DATA_DIR || path.join(process.cwd(), '.neohive');
+// Same rules as server.js: env, else repo .cursor/mcp.json sibling, else cwd/.neohive
+const DATA_DIR = resolveDataDirForServer(path.join(__dirname, '..'));
 
 // File paths for all shared data
 const MESSAGES_FILE = path.join(DATA_DIR, 'messages.jsonl');
@@ -35,7 +36,7 @@ const CHANNELS_FILE_PATH = path.join(DATA_DIR, 'channels.json');
 // Constants
 const MAX_CONTENT_BYTES = 1000000; // 1 MB max message size
 const CURRENT_DATA_VERSION = 1;
-const RESERVED_NAMES = ['__system__', '__all__', '__open__', '__close__', 'system', 'dashboard', 'Dashboard'];
+const RESERVED_NAMES = ['__system__', '__all__', '__open__', '__close__', '__user__', 'system', 'dashboard', 'Dashboard'];
 
 // Config helpers
 function getConfig() {

package/lib/file-io.js

@@ -107,7 +107,7 @@ function lockAgentsFile() {
   while (Date.now() - start < maxWait) {
     try { fs.writeFileSync(AGENTS_LOCK, String(process.pid), { flag: 'wx' }); return true; }
     catch {}
-    const wait = Date.now(); while (Date.now() - wait < backoff) {}
+    try { Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, backoff); } catch {}
     backoff = Math.min(backoff * 2, 500);
   }
   try { fs.unlinkSync(AGENTS_LOCK); } catch {}
@@ -123,7 +123,7 @@ function lockConfigFile() {
   while (Date.now() - start < maxWait) {
     try { fs.writeFileSync(CONFIG_LOCK, String(process.pid), { flag: 'wx' }); return true; }
     catch {}
-    const wait = Date.now(); while (Date.now() - wait < 50) {}
+    try { Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 50); } catch {}
   }
   try { fs.unlinkSync(CONFIG_LOCK); } catch {}
   try { fs.writeFileSync(CONFIG_LOCK, String(process.pid), { flag: 'wx' }); return true; } catch {}
@@ -139,7 +139,7 @@ function withFileLock(filePath, fn) {
   while (Date.now() - start < maxWait) {
     try { fs.writeFileSync(lockPath, String(process.pid), { flag: 'wx' }); break; }
     catch {}
-    const wait = Date.now(); while (Date.now() - wait < backoff) {}
+    try { Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, backoff); } catch {}
     backoff = Math.min(backoff * 2, 500);
     if (Date.now() - start >= maxWait) {
       try {

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

@@ -0,0 +1,96 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+function normalizeNeohiveDataDirString(raw, workspaceRoot) {
+  if (raw == null || typeof raw !== 'string') return null;
+  let d = raw.trim();
+  if (!d) return null;
+  d = d.replace(/\$\{workspaceFolder\}/gi, workspaceRoot);
+  return path.isAbsolute(d) ? path.resolve(d) : path.resolve(workspaceRoot, d);
+}
+
+/** Same candidate files as dashboard.js readNeohiveDataDirFromMcpConfigs */
+function readNeohiveDataDirFromMcpConfigs(projectRoot) {
+  const candidates = [
+    path.join(projectRoot, '.cursor', 'mcp.json'),
+    path.join(projectRoot, '.mcp.json'),
+    path.join(projectRoot, '.gemini', 'settings.json'),
+  ];
+  for (const filePath of candidates) {
+    if (!fs.existsSync(filePath)) continue;
+    try {
+      const j = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+      const nh = j.mcpServers && j.mcpServers.neohive;
+      const raw = nh && nh.env && nh.env.NEOHIVE_DATA_DIR;
+      const out = normalizeNeohiveDataDirString(raw, projectRoot);
+      if (out) return out;
+    } catch {
+      /* ignore */
+    }
+  }
+  return null;
+}
+
+function findDataDirByWalkingUpFrom(startDir) {
+  let dir = path.resolve(startDir);
+  const root = path.parse(dir).root;
+  for (let depth = 0; depth < 32 && dir !== root; depth++) {
+    const fromMcp = readNeohiveDataDirFromMcpConfigs(dir);
+    if (fromMcp) return fromMcp;
+    dir = path.dirname(dir);
+  }
+  return null;
+}
+
+/** User-level Cursor MCP may define neohive with an absolute data dir */
+function readNeohiveDirFromUserCursorMcp() {
+  const userMcp = path.join(os.homedir(), '.cursor', 'mcp.json');
+  if (!fs.existsSync(userMcp)) return null;
+  try {
+    const j = JSON.parse(fs.readFileSync(userMcp, 'utf8'));
+    const nh = j.mcpServers && j.mcpServers.neohive;
+    const raw = nh && nh.env && nh.env.NEOHIVE_DATA_DIR;
+    if (raw == null || typeof raw !== 'string') return null;
+    const d = raw.trim();
+    if (!d || /\$\{workspaceFolder\}/i.test(d)) return null;
+    return path.resolve(d);
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * 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.
+ *
+ * @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 fromWalk = findDataDirByWalkingUpFrom(process.cwd());
+  if (fromWalk) return fromWalk;
+
+  const parent = path.join(serverJsDir, '..');
+  if (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');
+  }
+
+  const fromUser = readNeohiveDirFromUserCursorMcp();
+  if (fromUser) return fromUser;
+
+  return path.join(process.cwd(), '.neohive');
+}
+
+module.exports = { resolveDataDirForServer };

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "neohive",
-  "version": "6.0.0",
+  "version": "6.0.3",
   "description": "The MCP collaboration layer for AI CLI tools. Turn Claude Code, Gemini CLI, and Codex CLI into a team.",
   "main": "server.js",
   "bin": {
-    "neohive": "./cli.js"
+    "neohive": "cli.js"
   },
   "scripts": {
     "start": "node server.js",