@context-engine-bridge/context-engine-mcp-bridge 0.0.51 → 0.0.53

package/package.json

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

package/src/mcpServer.js

@@ -71,11 +71,6 @@ function _tryReadConnFile(connPath, now) {
 }
 
 function _readLspConnection(workspace) {
-  const envPort = process.env.CTXCE_LSP_PORT;
-  if (envPort && _isValidPort(envPort)) {
-    return { port: envPort, secret: process.env.CTXCE_LSP_SECRET || "" };
-  }
-
   const now = Date.now();
   const cacheKey = workspace || "";
   if (_lspConnCache.value !== undefined && (now - _lspConnCache.ts) < LSP_CONN_CACHE_TTL && _lspConnCache.key === cacheKey) {
@@ -91,6 +86,13 @@ function _readLspConnection(workspace) {
     result = _tryReadConnFile(path.join(os.homedir(), ".ctxce", "lsp-connection.json"), now);
   }
 
+  if (!result) {
+    const envPort = process.env.CTXCE_LSP_PORT;
+    if (envPort && _isValidPort(envPort)) {
+      result = { port: envPort, secret: process.env.CTXCE_LSP_SECRET || "" };
+    }
+  }
+
   _lspConnCache = { value: result, ts: now, key: cacheKey };
   return result;
 }
@@ -190,6 +192,13 @@ async function _enrichWithLsp(result, lspConn, workspace) {
     const dest = target !== parsed ? target : parsed;
     dest._lsp_status = await _resolveLspStatus(dest, target, lspConn, workspace);
     textBlock.text = JSON.stringify(parsed);
+    if (result.structuredContent && typeof result.structuredContent === "object") {
+      const sc = result.structuredContent;
+      const scTarget = _lspTarget(sc);
+      const scDest = scTarget !== sc ? scTarget : sc;
+      scDest._lsp_status = dest._lsp_status;
+      if (dest._lsp) scDest._lsp = dest._lsp;
+    }
     return result;
   } catch (err) {
     debugLog("[ctxce] LSP enrichment failed: " + String(err));
@@ -1310,25 +1319,29 @@ async function createBridgeServer(options) {
           undefined,
           { timeout: timeoutMs },
         );
-        const finalResult = maybeRemapToolResult(name, result, workspace);
         const lspConn = includeLsp && _readLspConnection(workspace);
         if (includeLsp) {
           debugLog("[ctxce] LSP gate: tool=" + name + " lsp=" + (lspConn ? "port:" + lspConn.port : "null"));
         }
         if (lspConn) {
-          return await _enrichWithLsp(finalResult, lspConn, workspace);
+          result = await _enrichWithLsp(result, lspConn, workspace);
         } else if (includeLsp) {
           try {
-            const tb = Array.isArray(finalResult?.content) && finalResult.content.find(c => c.type === "text");
+            const tb = Array.isArray(result?.content) && result.content.find(c => c.type === "text");
             if (tb?.text) {
               const p = JSON.parse(tb.text);
               const d = _lspTarget(p);
               (d !== p ? d : p)._lsp_status = "not_available";
               tb.text = JSON.stringify(p);
+              if (result.structuredContent && typeof result.structuredContent === "object") {
+                const sc = result.structuredContent;
+                const scD = _lspTarget(sc);
+                (scD !== sc ? scD : sc)._lsp_status = "not_available";
+              }
             }
           } catch (e) { debugLog("[ctxce] LSP not_available inject failed: " + String(e)); }
         }
-        return finalResult;
+        return maybeRemapToolResult(name, result, workspace);
       } catch (err) {
         lastError = err;