specmem-hardwicksoftware 3.7.2 → 3.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "specmem-hardwicksoftware",
-  "version": "3.7.2",
+  "version": "3.7.4",
   "type": "module",
   "description": "Persistent memory system for coding sessions - semantic search with pgvector, token compression, team coordination, file watching. Needs root: installs system-wide hooks, manages docker/PostgreSQL, writes global configs, handles screen sessions. justcalljon.pro",
   "main": "dist/index.js",

package/scripts/specmem-init.cjs

@@ -3596,7 +3596,8 @@ async function indexCodebase(projectPath, ui, embeddingResult) {
   // Revalidate socket path after failures (may have been restarted externally)
   async function revalidateSocket() {
     const projectSocketPath = path.join(projectPath, 'specmem', 'sockets', 'embeddings.sock');
-    const sharedSocketPath = path.join(os.homedir(), '.specmem', projectName.replace(/[^a-zA-Z0-9_-]/g, '_'), 'sockets', 'embeddings.sock');
+    const projDirName = path.basename(projectPath).replace(/[^a-zA-Z0-9_-]/g, '_');
+    const sharedSocketPath = path.join(os.homedir(), '.specmem', projDirName, 'sockets', 'embeddings.sock');
 
     // Check project socket first (preferred)
     if (fs.existsSync(projectSocketPath)) {
@@ -3609,7 +3610,7 @@ async function indexCodebase(projectPath, ui, embeddingResult) {
       }
     }
 
-    // Fallback to shared socket
+    // Fallback to shared socket (home dir)
     if (fs.existsSync(sharedSocketPath)) {
       activeSocketPath = sharedSocketPath;
       const healthy = await checkSocketHealth();
@@ -3620,6 +3621,70 @@ async function indexCodebase(projectPath, ui, embeddingResult) {
       }
     }
 
+    // Fallback to /tmp shared sockets
+    for (let i = 0; i < 5; i++) {
+      const tmpSocket = `/tmp/specmem-embed-${i}.sock`;
+      if (fs.existsSync(tmpSocket)) {
+        activeSocketPath = tmpSocket;
+        const healthy = await checkSocketHealth();
+        if (healthy) {
+          initLog(`Revalidated socket: using /tmp shared socket at ${tmpSocket}`);
+          consecutiveEmbeddingFailures = 0;
+          return true;
+        }
+      }
+    }
+
+    // AUTO-RESTART: If no socket found, try restarting the embedding server
+    initLog('Socket revalidation: no socket found, attempting auto-restart of embedding server...');
+    try {
+      const { spawn } = require('child_process');
+      const possiblePythonPaths = [
+        path.join(__dirname, '..', 'embedding-sandbox', 'frankenstein-embeddings.py'),
+        path.join(projectPath, 'embedding-sandbox', 'frankenstein-embeddings.py'),
+        '/opt/specmem/embedding-sandbox/frankenstein-embeddings.py'
+      ];
+      let embeddingScript = null;
+      for (const p of possiblePythonPaths) {
+        if (fs.existsSync(p)) { embeddingScript = p; break; }
+      }
+      if (embeddingScript) {
+        const socketsDir = path.join(projectPath, 'specmem', 'sockets');
+        if (!fs.existsSync(socketsDir)) fs.mkdirSync(socketsDir, { recursive: true });
+        // Clean stale socket
+        if (fs.existsSync(projectSocketPath)) {
+          try { fs.unlinkSync(projectSocketPath); } catch { /* ignore */ }
+        }
+        const pythonPath = getPythonPath();
+        const proc = spawn(pythonPath, [embeddingScript], {
+          cwd: path.dirname(embeddingScript),
+          env: { ...process.env, SPECMEM_SOCKET_PATH: projectSocketPath, SPECMEM_PROJECT_PATH: projectPath },
+          detached: true,
+          stdio: ['ignore', 'pipe', 'pipe']
+        });
+        proc.stdout.on('data', () => {});
+        proc.stderr.on('data', () => {});
+        proc.on('error', () => {});
+        proc.unref();
+        // Wait up to 15s for socket to appear
+        for (let i = 0; i < 30; i++) {
+          await new Promise(r => setTimeout(r, 500));
+          if (fs.existsSync(projectSocketPath)) {
+            activeSocketPath = projectSocketPath;
+            const healthy = await checkSocketHealth();
+            if (healthy) {
+              initLog(`Embedding server auto-restarted successfully, socket at ${projectSocketPath}`);
+              consecutiveEmbeddingFailures = 0;
+              return true;
+            }
+          }
+        }
+        initLog('Embedding server auto-restart: socket did not appear within 15s');
+      }
+    } catch (restartErr) {
+      initLog(`Embedding server auto-restart failed: ${restartErr.message || restartErr}`);
+    }
+
     initLog('Socket revalidation failed: no healthy socket found');
     return false;
   }
@@ -3666,8 +3731,20 @@ async function indexCodebase(projectPath, ui, embeddingResult) {
 
           client.setTimeout(TIMEOUTS.EMBEDDING_REQUEST * 2); // Longer timeout for batch
 
+          // HARD WALL-CLOCK TIMEOUT: Cannot be reset by data/heartbeats
+          // Prevents infinite hangs on large files where server keeps sending heartbeats
+          const HARD_TIMEOUT_MS = TIMEOUTS.EMBEDDING_REQUEST * 3; // 270s absolute max
+          const hardTimeout = setTimeout(() => {
+            if (!settled) {
+              settled = true;
+              if (!client.destroyed) client.destroy();
+              reject(new Error(`Hard wall-clock timeout after ${HARD_TIMEOUT_MS}ms - embedding took too long (heartbeats: ${heartbeatCount})`));
+            }
+          }, HARD_TIMEOUT_MS);
+
           // Cleanup helper to avoid leaked resources
           const cleanup = () => {
+            clearTimeout(hardTimeout);
             if (!client.destroyed) client.destroy();
           };
 
@@ -4188,6 +4265,16 @@ async function indexCodebase(projectPath, ui, embeddingResult) {
     setPhase('Embedding');
 
     let fileEmbeddings = [];
+    // FIX: If activeSocketPath is gone (socket died), try to revalidate before skipping
+    if (fileEmbedTexts.length > 0 && !activeSocketPath) {
+      initLog('No active socket for embedding phase - attempting revalidation...');
+      const revalidated = await revalidateSocket();
+      if (revalidated) {
+        initLog(`Socket revalidated successfully: ${activeSocketPath}`);
+      } else {
+        initLog('Socket revalidation failed - embeddings will be skipped for this batch');
+      }
+    }
     if (fileEmbedTexts.length > 0 && activeSocketPath) {
       try {
         ui.setSubStatus(`Generating ${fileEmbedTexts.length} embeddings in batch...`);