magector 2.1.1 → 2.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "magector",
-  "version": "2.1.1",
+  "version": "2.1.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.1.1",
-    "@magector/cli-linux-x64": "2.1.1",
-    "@magector/cli-linux-arm64": "2.1.1",
-    "@magector/cli-win32-x64": "2.1.1"
+    "@magector/cli-darwin-arm64": "2.1.3",
+    "@magector/cli-linux-x64": "2.1.3",
+    "@magector/cli-linux-arm64": "2.1.3",
+    "@magector/cli-win32-x64": "2.1.3"
   },
   "keywords": [
     "magento",

package/src/mcp-server.js

@@ -121,8 +121,14 @@ function extractJson(stdout) {
   }
   // Fallback: try parsing the entire output (handles multi-line JSON)
   // Strip lines that look like tracing (start with ANSI escape or timestamp bracket)
+  // Also skip non-JSON prefix lines (e.g. "setting number of points 50000" from HNSW)
+  const logLineRe = /^\s*(\x1b\[|\[[\d\-T:.Z]+)/;
+  const jsonStartRe = /^\s*[\[{"\-0-9tfn]/;
+  let startIdx = lines.findIndex(l => l.trim() && !logLineRe.test(l) && jsonStartRe.test(l));
+  if (startIdx < 0) startIdx = 0;
   const cleaned = lines
-    .filter(l => !l.match(/^\s*(\x1b\[|\[[\d\-T:.Z]+)/) && l.trim())
+    .slice(startIdx)
+    .filter(l => !logLineRe.test(l) && l.trim())
     .join('\n')
     .trim();
   if (cleaned) {
@@ -135,6 +141,7 @@ function extractJson(stdout) {
 // Track the serve process PID to clean up orphans on restart.
 
 const PID_PATH = path.join(config.magentoRoot, '.magector', 'serve.pid');
+const REINDEX_PID_PATH = path.join(config.magentoRoot, '.magector', 'reindex.pid');
 
 /**
  * Write the serve process PID to disk so future instances can clean up orphans.
@@ -147,6 +154,32 @@ function removePidFile() {
   try { if (existsSync(PID_PATH)) unlinkSync(PID_PATH); } catch {}
 }
 
+function writeReindexPidFile(pid) {
+  try { writeFileSync(REINDEX_PID_PATH, String(pid)); } catch {}
+}
+
+function removeReindexPidFile() {
+  try { if (existsSync(REINDEX_PID_PATH)) unlinkSync(REINDEX_PID_PATH); } catch {}
+}
+
+/**
+ * Check if another reindex process is already running (from another MCP instance).
+ * Returns the PID if alive, null otherwise.
+ */
+function getRunningReindexPid() {
+  try {
+    if (!existsSync(REINDEX_PID_PATH)) return null;
+    const pid = parseInt(readFileSync(REINDEX_PID_PATH, 'utf-8').trim(), 10);
+    if (!pid || isNaN(pid)) return null;
+    process.kill(pid, 0); // signal 0 = existence check
+    return pid;
+  } catch {
+    // Process doesn't exist or PID file unreadable — clean up
+    removeReindexPidFile();
+    return null;
+  }
+}
+
 /**
  * Kill any stale serve process from a previous MCP server instance.
  * This handles the common case where the MCP server was killed without
@@ -223,6 +256,27 @@ function checkDbFormat() {
  */
 function startBackgroundReindex() {
   if (reindexInProgress) return;
+
+  // Check if another MCP instance is already running a reindex
+  const existingPid = getRunningReindexPid();
+  if (existingPid) {
+    logToFile('INFO', `Reindex already running in another process (PID ${existingPid}) — skipping`);
+    console.error(`Reindex already running (PID ${existingPid}) — skipping`);
+    reindexInProgress = true; // mark locally so tools know
+    // Poll the external process and react when it finishes
+    const pollInterval = setInterval(() => {
+      if (!getRunningReindexPid()) {
+        clearInterval(pollInterval);
+        reindexInProgress = false;
+        logToFile('INFO', 'External reindex finished. Restarting serve process.');
+        if (serveProcess) serveProcess.kill();
+        searchCache.clear();
+        startServeProcess();
+      }
+    }, 10000);
+    return;
+  }
+
   if (!config.magentoRoot || !existsSync(config.magentoRoot)) {
     const msg = 'Cannot auto-reindex: MAGENTO_ROOT not set or not found';
     console.error(msg);
@@ -263,6 +317,9 @@ function startBackgroundReindex() {
     env: rustEnv,
   });
 
+  // Write PID file so other MCP instances know a reindex is running
+  writeReindexPidFile(reindexProcess.pid);
+
   reindexProcess.stdout.on('data', (d) => {
     const text = d.toString().replace(/\x1b\[[0-9;]*m/g, '').trim();
     if (text) logToFile('INDEX', text);
@@ -275,6 +332,7 @@ function startBackgroundReindex() {
   reindexProcess.on('exit', (code) => {
     reindexInProgress = false;
     reindexProcess = null;
+    removeReindexPidFile();
     if (code === 0) {
       // Atomic swap: old → .bak, new → current
       try {
@@ -305,6 +363,7 @@ function startBackgroundReindex() {
   reindexProcess.on('error', (err) => {
     reindexInProgress = false;
     reindexProcess = null;
+    removeReindexPidFile();
     logToFile('ERR', `Background re-index error: ${err.message}`);
     console.error(`Background re-index error: ${err.message}`);
   });
@@ -500,7 +559,8 @@ async function rustSearchAsync(query, limit = 10) {
   const cacheKey = `${query}|${limit}`;
   if (searchCache.has(cacheKey)) {
     logToFile('CACHE', `HIT: "${query}" (limit=${limit})`);
-    return searchCache.get(cacheKey);
+    const cached = searchCache.get(cacheKey);
+    return Array.isArray(cached) ? cached : [];
   }
 
   // Wait for serve process if it's starting up but not yet ready
@@ -513,7 +573,7 @@ async function rustSearchAsync(query, limit = 10) {
   if (serveProcess && serveReady) {
     try {
       const resp = await serveQuery('search', { query, limit });
-      if (resp.ok && resp.data) {
+      if (resp.ok && Array.isArray(resp.data)) {
         cacheSet(cacheKey, resp.data);
         return resp.data;
       }
@@ -524,7 +584,13 @@ async function rustSearchAsync(query, limit = 10) {
 
   // Fallback: cold-start execFileSync
   logToFile('INFO', `Using execFileSync fallback for search: "${query}"`);
-  return rustSearchSync(query, limit);
+  try {
+    const result = rustSearchSync(query, limit);
+    return Array.isArray(result) ? result : [];
+  } catch (err) {
+    logToFile('WARN', `execFileSync fallback failed: ${err.message}`);
+    return [];
+  }
 }
 
 function rustSearchSync(query, limit = 10) {
@@ -3189,6 +3255,7 @@ function cleanup(reason) {
     reindexProcess = null;
   }
   removePidFile();
+  removeReindexPidFile();
 }
 
 process.on('exit', () => cleanup('process exit'));