magector 2.16.2 → 2.16.4

package/package.json

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

package/src/mcp-server.js

@@ -817,6 +817,8 @@ function startServeProcess() {
       // First line is ready signal
       if (parsed.ready) {
         serveReady = true;
+        // Clear stale cache entries — they may contain [] from when index was unavailable
+        searchCache.clear();
         logToFile('INFO', `Serve process ready (PID ${proc.pid})`);
         if (serveReadyResolve) { serveReadyResolve(true); serveReadyResolve = null; }
         // Now that serve is up, persist primary lock state to data.db
@@ -952,6 +954,7 @@ function tryConnectSocket() {
 
       isSocketClient = true;
       serveReady = true;
+      searchCache.clear(); // clear stale [] entries from before socket was available
       logToFile('INFO', 'Connected to existing serve process via socket proxy');
       resolve(true);
     });
@@ -997,6 +1000,15 @@ async function rustSearchAsync(query, limit = 10) {
     await Promise.race([serveReadyPromise, new Promise(r => setTimeout(() => r(false), 10000))]);
   }
 
+  // Secondary instance: retry socket if not connected (primary may have (re)started serve)
+  if (!serveProcess && !globalServeQuery) {
+    const reconnected = await tryConnectSocket();
+    if (reconnected) {
+      logToFile('INFO', 'rustSearchAsync: reconnected to serve socket');
+      searchCache.clear(); // clear stale empty results before using new serve
+    }
+  }
+
   // Try socket proxy (secondary instance) or local serve process (primary)
   const queryFn = globalServeQuery || ((serveProcess && serveReady) ? serveQuery : null);
   if (queryFn) {
@@ -4492,41 +4504,54 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
  * Returns null when not re-indexing.
  */
 function getReindexWarning() {
-  if (!reindexInProgress || !reindexStartTime) return null;
-  const elapsedSec = Math.round((Date.now() - reindexStartTime) / 1000);
-  const elapsedStr = elapsedSec >= 60
-    ? `${Math.floor(elapsedSec / 60)}m ${elapsedSec % 60}s`
-    : `${elapsedSec}s`;
-
-  let phaseStr, etaStr;
-  if (reindexPhase <= 0) {
-    phaseStr = 'initializing';
-    etaStr = 'est. ~40–70 min total';
-  } else if (reindexPhase === 1) {
-    const filesStr = reindexTotalFiles > 0 ? ` (${reindexTotalFiles.toLocaleString('en')} files)` : '';
-    phaseStr = `phase 1/3: AST parsing${filesStr}`;
-    etaStr = 'est. ~1–3 min for this phase, then ~40–60 min for embeddings';
-  } else if (reindexPhase === 2) {
-    const itemsStr = reindexItemsToEmbed > 0 ? ` (${reindexItemsToEmbed.toLocaleString('en')} items)` : '';
-    phaseStr = `phase 2/3: generating embeddings${itemsStr}`;
-    if (reindexPhase2Start && reindexItemsToEmbed > 0) {
-      // Empirical rate: ~87k items ≈ 45 min on 8-core ONNX. Scale linearly.
-      const estimatedTotalSec = Math.round((reindexItemsToEmbed / 87000) * 45 * 60);
-      const phase2Elapsed = (Date.now() - reindexPhase2Start) / 1000;
-      const remainingSec = Math.max(estimatedTotalSec - phase2Elapsed, 0);
-      etaStr = remainingSec > 60
-        ? `est. ~${Math.round(remainingSec / 60)} min remaining`
-        : 'almost done with embeddings';
+  // Primary instance: use in-memory state (accurate phase + ETA)
+  if (reindexInProgress && reindexStartTime) {
+    const elapsedSec = Math.round((Date.now() - reindexStartTime) / 1000);
+    const elapsedStr = elapsedSec >= 60
+      ? `${Math.floor(elapsedSec / 60)}m ${elapsedSec % 60}s`
+      : `${elapsedSec}s`;
+
+    let phaseStr, etaStr;
+    if (reindexPhase <= 0) {
+      phaseStr = 'initializing';
+      etaStr = 'est. ~40–70 min total';
+    } else if (reindexPhase === 1) {
+      const filesStr = reindexTotalFiles > 0 ? ` (${reindexTotalFiles.toLocaleString('en')} files)` : '';
+      phaseStr = `phase 1/3: AST parsing${filesStr}`;
+      etaStr = 'est. ~1–3 min for this phase, then ~40–60 min for embeddings';
+    } else if (reindexPhase === 2) {
+      const itemsStr = reindexItemsToEmbed > 0 ? ` (${reindexItemsToEmbed.toLocaleString('en')} items)` : '';
+      phaseStr = `phase 2/3: generating embeddings${itemsStr}`;
+      if (reindexPhase2Start && reindexItemsToEmbed > 0) {
+        // Empirical rate: ~87k items ≈ 45 min on 8-core ONNX. Scale linearly.
+        const estimatedTotalSec = Math.round((reindexItemsToEmbed / 87000) * 45 * 60);
+        const phase2Elapsed = (Date.now() - reindexPhase2Start) / 1000;
+        const remainingSec = Math.max(estimatedTotalSec - phase2Elapsed, 0);
+        etaStr = remainingSec > 60
+          ? `est. ~${Math.round(remainingSec / 60)} min remaining`
+          : 'almost done with embeddings';
+      } else {
+        etaStr = 'est. 30–60 min for this phase';
+      }
     } else {
-      etaStr = 'est. 30–60 min for this phase';
+      phaseStr = 'phase 3/3: building HNSW vector index';
+      etaStr = 'est. ~5–10 min remaining';
     }
-  } else {
-    phaseStr = 'phase 3/3: building HNSW vector index';
-    etaStr = 'est. ~5–10 min remaining';
+
+    return `> ⏳ **Re-indexing in progress** — ${elapsedStr} elapsed, ${phaseStr}. ${etaStr}.\n` +
+           `> Results below use the **previous index** — valid, but may miss recently added files.\n\n`;
   }
 
-  return `> ⏳ **Re-indexing in progress** — ${elapsedStr} elapsed, ${phaseStr}. ${etaStr}.\n` +
-         `> Results below use the **previous index** — valid, but may miss recently added files.\n\n`;
+  // Secondary instance: detect via PID file (no phase info available)
+  try {
+    const externalPid = getRunningReindexPid();
+    if (externalPid) {
+      return `> ⏳ **Re-indexing in progress** (PID ${externalPid}) — semantic search may return empty results until complete.\n` +
+             `> Grep and filesystem-based tools work normally. Check \`.magector/magector.log\` for progress.\n\n`;
+    }
+  } catch { /* ignore */ }
+
+  return null;
 }
 
 const _callToolHandler = async (request) => {