magector 2.2.1 → 2.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "magector",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "Semantic code search for Magento 2 — index, search, MCP server",
   "type": "module",
   "main": "src/mcp-server.js",
@@ -39,10 +39,10 @@
     "ruvector": "^0.1.96"
   },
   "optionalDependencies": {
-    "@magector/cli-darwin-arm64": "2.2.1",
-    "@magector/cli-linux-x64": "2.2.1",
-    "@magector/cli-linux-arm64": "2.2.1",
-    "@magector/cli-win32-x64": "2.2.1"
+    "@magector/cli-darwin-arm64": "2.2.3",
+    "@magector/cli-linux-x64": "2.2.3",
+    "@magector/cli-linux-arm64": "2.2.3",
+    "@magector/cli-win32-x64": "2.2.3"
   },
   "keywords": [
     "magento",

package/src/mcp-server.js

@@ -166,12 +166,19 @@ function tryAcquirePrimaryLock() {
         return false; // another instance is alive and primary
       }
     } catch { /* holder is dead, take over */ }
-    // Stale lock — reclaim
+    // Stale lock — reclaim. Use random jitter to avoid thundering herd
+    // when multiple instances detect stale lock simultaneously.
+    const jitterMs = Math.floor(Math.random() * 200) + 50;
+    const start = Date.now();
+    while (Date.now() - start < jitterMs) { /* busy-wait for sub-second jitter */ }
     try { unlinkSync(PRIMARY_LOCK_PATH); } catch {}
     try {
       const fd = openSync(PRIMARY_LOCK_PATH, fsConstants.O_WRONLY | fsConstants.O_CREAT | fsConstants.O_EXCL);
       writeFileSync(fd, String(process.pid));
       closeSync(fd);
+      // Double-check: re-read to confirm we actually own it (no TOCTOU race)
+      const check = readFileSync(PRIMARY_LOCK_PATH, 'utf-8').trim();
+      if (check !== String(process.pid)) return false;
       return true;
     } catch {
       return false; // another instance beat us
@@ -566,6 +573,14 @@ let serveReadyPromise = null;
 let serveReadyResolve = null;
 
 function startServeProcess() {
+  // Guard: if a live serve process already exists (e.g. started by another
+  // instance that won the lock race), reuse it instead of spawning a duplicate.
+  const existingPid = getExistingServePid();
+  if (existingPid) {
+    logToFile('INFO', `Reusing existing serve process (PID ${existingPid}) — skipping spawn`);
+    return;
+  }
+
   serveReadyPromise = new Promise((resolve) => { serveReadyResolve = resolve; });
   try {
     const args = [
@@ -3525,6 +3540,17 @@ process.on('SIGTERM', () => { cleanup('SIGTERM'); process.exit(0); });
 process.on('SIGINT', () => { cleanup('SIGINT'); process.exit(0); });
 process.on('SIGHUP', () => { cleanup('SIGHUP'); process.exit(0); });
 
+// Exit when parent (Claude Code) closes stdin — prevents orphaned processes
+process.stdin.on('end', () => {
+  logToFile('INFO', 'stdin closed (parent disconnected) — shutting down');
+  cleanup('stdin end');
+  process.exit(0);
+});
+process.stdin.on('error', () => {
+  cleanup('stdin error');
+  process.exit(0);
+});
+
 main().catch((err) => {
   logToFile('FATAL', `Startup failed: ${err.message}\n${err.stack}`);
   console.error(err);