@context-engine-bridge/context-engine-mcp-bridge 0.0.40 → 0.0.43

package/package.json

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

package/src/mcpServer.js

@@ -112,24 +112,21 @@ function _resolveAndContain(relPath, workspace) {
   return null;
 }
 
+const _PATH_FIELDS = ["host_path", "path", "rel_path"];
+
 function _extractPaths(obj, paths, workspace, depth = 0) {
   if (!obj || typeof obj !== "object" || depth > 20) return;
   if (Array.isArray(obj)) {
     for (const item of obj) _extractPaths(item, paths, workspace, depth + 1);
     return;
   }
-  let rawPath = null;
-  if (typeof obj.path === "string" && obj.path.length > 0) {
-    rawPath = obj.path;
-  } else if (typeof obj.rel_path === "string" && obj.rel_path.length > 0) {
-    rawPath = obj.rel_path;
-  }
-  if (rawPath) {
+  const candidates = _PATH_FIELDS.map(f => obj[f]).filter(v => typeof v === "string" && v.length > 0);
+  for (const rawPath of candidates) {
     if (workspace) {
       const contained = _resolveAndContain(rawPath, workspace);
-      if (contained) paths.add(contained);
+      if (contained) { paths.add(contained); break; }
     } else if (_isAbsolutePath(rawPath)) {
-      paths.add(rawPath);
+      paths.add(rawPath); break;
     }
   }
   for (const [key, val] of Object.entries(obj)) {
@@ -141,6 +138,8 @@ function _extractPaths(obj, paths, workspace, depth = 0) {
 function _callLspHandler(port, secret, operation, params) {
   const postData = JSON.stringify(params);
   return new Promise((resolve) => {
+    let settled = false;
+    const settle = (v) => { if (!settled) { settled = true; resolve(v); } };
     const req = http.request({
       hostname: "127.0.0.1",
       port: parseInt(port, 10),
@@ -154,18 +153,17 @@ function _callLspHandler(port, secret, operation, params) {
       timeout: 3000,
     }, (res) => {
       let data = "";
-      let exceeded = false;
       const MAX_RESP = 5 * 1024 * 1024;
-      res.on("error", () => {});
+      res.on("error", () => settle(null));
       res.on("data", chunk => {
-        if (exceeded) return;
+        if (settled) return;
         data += chunk;
-        if (data.length > MAX_RESP) { exceeded = true; req.destroy(); resolve(null); }
+        if (data.length > MAX_RESP) { req.destroy(); settle(null); }
       });
-      res.on("end", () => { if (!exceeded) { try { resolve(JSON.parse(data)); } catch { resolve(null); } } });
+      res.on("end", () => { if (!settled) { try { settle(JSON.parse(data)); } catch { settle(null); } } });
     });
-    req.on("error", () => resolve(null));
-    req.on("timeout", () => { req.destroy(); resolve(null); });
+    req.on("error", () => settle(null));
+    req.on("timeout", () => { req.destroy(); settle(null); });
     req.write(postData);
     req.end();
   });
@@ -188,8 +186,8 @@ async function _enrichWithLsp(result, lspConn, workspace) {
       return result;
     }
     const target = _lspTarget(parsed);
-    if (!target.ok) return result;
-    target._lsp_status = await _resolveLspStatus(target, lspConn, workspace);
+    if (!parsed.ok && !target.ok) return result;
+    parsed._lsp_status = await _resolveLspStatus(parsed, target, lspConn, workspace);
     textBlock.text = JSON.stringify(parsed);
     return result;
   } catch (err) {
@@ -199,7 +197,7 @@ async function _enrichWithLsp(result, lspConn, workspace) {
   }
 }
 
-async function _resolveLspStatus(target, lspConn, workspace) {
+async function _resolveLspStatus(dest, target, lspConn, workspace) {
   if (_lspCircuitOpen()) return "circuit_open";
   const paths = new Set();
   _extractPaths(target, paths, workspace);
@@ -211,7 +209,7 @@ async function _resolveLspStatus(target, lspConn, workspace) {
   }
   _lspCircuitRecordSuccess();
   if (!diag.ok || !diag.files || diag.total === 0) return "no_diagnostics";
-  target._lsp = { diagnostics: diag.files, total: diag.total };
+  dest._lsp = { diagnostics: diag.files, total: diag.total };
   return "ok";
 }
 
@@ -1073,9 +1071,20 @@ async function createBridgeServer(options) {
         description: "When true, auto-enrich results with live LSP diagnostics (errors/warnings) for files in the response. Zero extra tool calls needed.",
       };
       for (const tool of tools) {
-        if (_LSP_ENRICHABLE_TOOLS.has(tool.name) && tool.inputSchema?.properties) {
+        if (!_LSP_ENRICHABLE_TOOLS.has(tool.name)) continue;
+        if (tool.inputSchema?.properties) {
           tool.inputSchema = { ...tool.inputSchema, properties: { ...tool.inputSchema.properties, include_lsp: lspProp } };
         }
+        if (tool.outputSchema) {
+          tool.outputSchema = {
+            ...tool.outputSchema,
+            properties: {
+              ...(tool.outputSchema.properties || {}),
+              _lsp_status: { type: "string" },
+              _lsp: { type: "object" },
+            },
+          };
+        }
       }
 
       const pathProp = { type: "string", description: "Absolute file path" };
@@ -1239,7 +1248,7 @@ async function createBridgeServer(options) {
             let data = "";
             let exceeded = false;
             const MAX_RESP = 5 * 1024 * 1024;
-            res.on("error", () => {});
+            res.on("error", () => { if (!exceeded) resolve({ ok: false, error: "LSP response stream error" }); });
             res.on("data", chunk => {
               if (exceeded) return;
               data += chunk;
@@ -1303,8 +1312,7 @@ async function createBridgeServer(options) {
             const tb = Array.isArray(result?.content) && result.content.find(c => c.type === "text");
             if (tb?.text) {
               const p = JSON.parse(tb.text);
-              const t = _lspTarget(p);
-              t._lsp_status = "not_available";
+              p._lsp_status = "not_available";
               tb.text = JSON.stringify(p);
             }
           } catch (e) { debugLog("[ctxce] LSP not_available inject failed: " + String(e)); }