magector 2.1.2 → 2.1.4

package/package.json

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

package/src/mcp-server.js

@@ -81,8 +81,8 @@ function logToFile(level, message) {
   }
 }
 
-// Initialize log file on startup
-try { writeFileSync(LOG_PATH, `[${new Date().toISOString()}] [INFO] Magector MCP server starting\n`); } catch {}
+// Initialize log on startup — append to preserve history across MCP restarts
+try { appendFileSync(LOG_PATH, `\n[${new Date().toISOString()}] [INFO] ════ Magector MCP server starting ════\n`); } catch {}
 
 // Log resolved configuration so the log file is self-contained for debugging
 logToFile('INFO', `Config: MAGENTO_ROOT=${config.magentoRoot}`);
@@ -141,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.
@@ -153,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
@@ -229,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);
@@ -269,18 +317,27 @@ function startBackgroundReindex() {
     env: rustEnv,
   });
 
-  reindexProcess.stdout.on('data', (d) => {
-    const text = d.toString().replace(/\x1b\[[0-9;]*m/g, '').trim();
+  // Write PID file so other MCP instances know a reindex is running
+  writeReindexPidFile(reindexProcess.pid);
+
+  // Log stdout/stderr line-by-line using readline to avoid buffering issues.
+  // Without this, Rust tracing output accumulates in pipe buffers and progress
+  // entries arrive in large chunks instead of in real time.
+  const indexStdout = createInterface({ input: reindexProcess.stdout });
+  const indexStderr = createInterface({ input: reindexProcess.stderr });
+  indexStdout.on('line', (line) => {
+    const text = line.replace(/\x1b\[[0-9;]*m/g, '').trim();
     if (text) logToFile('INDEX', text);
   });
-  reindexProcess.stderr.on('data', (d) => {
-    const text = d.toString().replace(/\x1b\[[0-9;]*m/g, '').trim();
+  indexStderr.on('line', (line) => {
+    const text = line.replace(/\x1b\[[0-9;]*m/g, '').trim();
     if (text) logToFile('INDEX', text);
   });
 
   reindexProcess.on('exit', (code) => {
     reindexInProgress = false;
     reindexProcess = null;
+    removeReindexPidFile();
     if (code === 0) {
       // Atomic swap: old → .bak, new → current
       try {
@@ -311,6 +368,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}`);
   });
@@ -3202,6 +3260,7 @@ function cleanup(reason) {
     reindexProcess = null;
   }
   removePidFile();
+  removeReindexPidFile();
 }
 
 process.on('exit', () => cleanup('process exit'));