@context-engine-bridge/context-engine-mcp-bridge 0.0.34 → 0.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@context-engine-bridge/context-engine-mcp-bridge",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "description": "Context Engine MCP bridge (http/stdio proxy combining indexer + memory servers)",
   "bin": {
     "ctxce": "bin/ctxce.js",

package/src/mcpServer.js

@@ -118,21 +118,19 @@ function _extractPaths(obj, paths, workspace, depth = 0) {
     for (const item of obj) _extractPaths(item, paths, workspace, depth + 1);
     return;
   }
+  let rawPath = null;
   if (typeof obj.path === "string" && obj.path.length > 0) {
-    if (_isAbsolutePath(obj.path)) {
-      if (workspace) {
-        const contained = _resolveAndContain(obj.path, workspace);
-        if (contained) paths.add(contained);
-      } else {
-        paths.add(obj.path);
-      }
-    } else if (workspace) {
-      const contained = _resolveAndContain(obj.path, workspace);
+    rawPath = obj.path;
+  } else if (typeof obj.rel_path === "string" && obj.rel_path.length > 0) {
+    rawPath = obj.rel_path;
+  }
+  if (rawPath) {
+    if (workspace) {
+      const contained = _resolveAndContain(rawPath, workspace);
       if (contained) paths.add(contained);
+    } else if (_isAbsolutePath(rawPath)) {
+      paths.add(rawPath);
     }
-  } else if (typeof obj.rel_path === "string" && obj.rel_path.length > 0 && workspace) {
-    const contained = _resolveAndContain(obj.rel_path, workspace);
-    if (contained) paths.add(contained);
   }
   for (const [key, val] of Object.entries(obj)) {
     if (key === "__proto__" || key === "constructor" || key === "prototype") continue;
@@ -173,37 +171,25 @@ function _callLspHandler(port, secret, operation, params) {
   });
 }
 
+function _lspTarget(parsed) {
+  const r = parsed.result;
+  return r && typeof r === "object" && !Array.isArray(r) ? r : parsed;
+}
+
 async function _enrichWithLsp(result, lspConn, workspace) {
   try {
+    debugLog("[ctxce] LSP enrich: workspace=" + workspace + " port=" + lspConn?.port);
     if (!Array.isArray(result?.content)) return result;
     const textBlock = result.content.find(c => c.type === "text");
     if (!textBlock?.text) return result;
     let parsed;
-    try { parsed = JSON.parse(textBlock.text); } catch { return result; }
-    if (!parsed.ok) return result;
-    if (_lspCircuitOpen()) {
-      parsed._lsp_status = "circuit_open";
-    } else {
-      const paths = new Set();
-      _extractPaths(parsed, paths, workspace);
-      if (paths.size === 0) {
-        parsed._lsp_status = "no_paths";
-      } else {
-        const diag = await _callLspHandler(lspConn.port, lspConn.secret, "diagnostics_recent", { paths: [...paths] });
-        if (!diag) {
-          _lspCircuitRecordFailure();
-          parsed._lsp_status = "connection_failed";
-        } else {
-          _lspCircuitRecordSuccess();
-          if (!diag.ok || !diag.files || diag.total === 0) {
-            parsed._lsp_status = "no_diagnostics";
-          } else {
-            parsed._lsp = { diagnostics: diag.files, total: diag.total };
-            parsed._lsp_status = "ok";
-          }
-        }
-      }
+    try { parsed = JSON.parse(textBlock.text); } catch (e) {
+      debugLog("[ctxce] LSP enrich: JSON parse failed: " + String(e));
+      return result;
     }
+    if (!parsed.ok) return result;
+    const target = _lspTarget(parsed);
+    target._lsp_status = await _resolveLspStatus(target, lspConn, workspace);
     textBlock.text = JSON.stringify(parsed);
     return result;
   } catch (err) {
@@ -213,6 +199,22 @@ async function _enrichWithLsp(result, lspConn, workspace) {
   }
 }
 
+async function _resolveLspStatus(target, lspConn, workspace) {
+  if (_lspCircuitOpen()) return "circuit_open";
+  const paths = new Set();
+  _extractPaths(target, paths, workspace);
+  if (paths.size === 0) return "no_paths";
+  const diag = await _callLspHandler(lspConn.port, lspConn.secret, "diagnostics_recent", { paths: [...paths] });
+  if (!diag) {
+    _lspCircuitRecordFailure();
+    return "connection_failed";
+  }
+  _lspCircuitRecordSuccess();
+  if (!diag.ok || !diag.files || diag.total === 0) return "no_diagnostics";
+  target._lsp = { diagnostics: diag.files, total: diag.total };
+  return "ok";
+}
+
 function debugLog(message) {
   try {
     const text = typeof message === "string" ? message : String(message);
@@ -661,10 +663,8 @@ function _resolveWorkspace(providedWorkspace) {
   const wsRoot = path.join(os.homedir(), ".ctxce", "workspaces");
   try {
     const dirs = fs.readdirSync(wsRoot).slice(0, MAX_WS_SCAN);
-    let bestLspMatch = null;
-    let bestLspTs = 0;
-    let bestMetaMatch = null;
-    let bestMetaTs = 0;
+    let bestMatch = null;
+    let bestTs = 0;
     for (const dir of dirs) {
       if (dir === "." || dir === ".." || dir.includes("/") || dir.includes("\0")) continue;
       const dirPath = path.join(wsRoot, dir);
@@ -682,35 +682,22 @@ function _resolveWorkspace(providedWorkspace) {
           if (conn.pid && conn.port && _isValidPort(conn.port)) {
             try {
               process.kill(conn.pid, 0);
-              if (conn.created_at && (now - conn.created_at) > LSP_CONN_MAX_AGE) {
-              } else {
+              const notExpired = !conn.created_at || (now - conn.created_at) <= LSP_CONN_MAX_AGE;
+              if (notExpired) {
                 const connTs = typeof conn.created_at === "number" ? conn.created_at : 0;
-                if (connTs > bestLspTs) {
-                  bestLspTs = connTs;
-                  bestLspMatch = wp;
+                if (connTs > bestTs) {
+                  bestTs = connTs;
+                  bestMatch = wp;
                 }
               }
             } catch (_) {}
           }
         } catch (_) {}
-        const updatedAt = typeof meta.updated_at === "number"
-          ? meta.updated_at
-          : typeof meta.updated_at === "string"
-            ? new Date(meta.updated_at).getTime() || 0
-            : 0;
-        if (updatedAt > bestMetaTs) {
-          bestMetaTs = updatedAt;
-          bestMetaMatch = wp;
-        }
       } catch (_) {}
     }
-    if (bestLspMatch) {
+    if (bestMatch) {
       debugLog("[ctxce] Resolved workspace from active LSP connection");
-      return bestLspMatch;
-    }
-    if (bestMetaMatch) {
-      debugLog("[ctxce] Resolved workspace from most recent meta.json");
-      return bestMetaMatch;
+      return bestMatch;
     }
   } catch (_) {}
 
@@ -1173,11 +1160,14 @@ async function createBridgeServer(options) {
     let args = params.arguments;
 
     let includeLsp = false;
-    if (args && typeof args === "object" && args.include_lsp === true && _LSP_ENRICHABLE_TOOLS.has(name)) {
-      includeLsp = true;
+    const rawLsp = args && typeof args === "object" ? args.include_lsp : undefined;
+    if (rawLsp !== undefined) {
       const { include_lsp: _stripped, ...rest } = args;
       args = rest;
     }
+    if ((rawLsp === true || rawLsp === "true" || rawLsp === 1 || rawLsp === "1") && _LSP_ENRICHABLE_TOOLS.has(name)) {
+      includeLsp = true;
+    }
 
     debugLog(`[ctxce] tools/call: ${name || "<no-name>"}`);
 
@@ -1304,7 +1294,22 @@ async function createBridgeServer(options) {
         );
         let finalResult = maybeRemapToolResult(name, result, workspace);
         const lspConn = includeLsp && _readLspConnection(workspace);
-        if (lspConn) finalResult = await _enrichWithLsp(finalResult, lspConn, workspace);
+        if (includeLsp) {
+          debugLog("[ctxce] LSP gate: tool=" + name + " lsp=" + (lspConn ? "port:" + lspConn.port : "null"));
+        }
+        if (lspConn) {
+          finalResult = await _enrichWithLsp(finalResult, lspConn, workspace);
+        } else if (includeLsp) {
+          try {
+            const tb = Array.isArray(finalResult?.content) && finalResult.content.find(c => c.type === "text");
+            if (tb?.text) {
+              const p = JSON.parse(tb.text);
+              const t = _lspTarget(p);
+              t._lsp_status = "not_available";
+              tb.text = JSON.stringify(p);
+            }
+          } catch (e) { debugLog("[ctxce] LSP not_available inject failed: " + String(e)); }
+        }
         return finalResult;
       } catch (err) {
         lastError = err;