@context-engine-bridge/context-engine-mcp-bridge 0.0.70 → 0.0.71

package/package.json

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

package/src/mcpServer.js

@@ -1868,8 +1868,10 @@ function _isBatchTool(name) {
 }
 
 function _unwrapSearchEnvelope(obj) {
-  if (obj && obj.result && typeof obj.result === "object" && obj.result.ok !== undefined) {
-    return obj.result;
+  if (obj && obj.result && typeof obj.result === "object") {
+    if (obj.result.ok !== undefined || Array.isArray(obj.result.results) || Array.isArray(obj.result.results_json)) {
+      return obj.result;
+    }
   }
   return obj;
 }
@@ -1883,7 +1885,8 @@ function _getResultsArray(obj) {
 function _mergeResults(primaryText, additionalTexts) {
   try {
     const primary = JSON.parse(primaryText);
-    if (!primary || !primary.ok) return primaryText;
+    const _primaryHasData = primary && (primary.ok || Array.isArray(primary.results) || (primary.result && Array.isArray(primary.result.results)));
+    if (!_primaryHasData) return primaryText;
 
     const pInner = _unwrapSearchEnvelope(primary);
 
@@ -1892,7 +1895,8 @@ function _mergeResults(primaryText, additionalTexts) {
     for (const addText of additionalTexts) {
       try {
         const additional = JSON.parse(addText);
-        if (!additional || !additional.ok) {
+        const _addHasData = additional && (additional.ok || Array.isArray(additional.results) || (additional.result && Array.isArray(additional.result.results)));
+        if (!_addHasData) {
           _perCall.push({ ok: false, error: additional?.error || "not ok" });
           continue;
         }
@@ -1979,37 +1983,44 @@ function _mergeResults(primaryText, additionalTexts) {
 function _mergeBatchResults(primaryText, additionalTexts) {
   try {
     const primary = JSON.parse(primaryText);
-    if (!primary || !primary.ok || !Array.isArray(primary.results)) return primaryText;
+    if (!primary || !primary.ok) return primaryText;
+    const pBatch = Array.isArray(primary.results) ? primary.results : Array.isArray(primary.batch_results) ? primary.batch_results : null;
+    if (!pBatch) return primaryText;
 
     for (const addText of additionalTexts) {
       try {
         const additional = JSON.parse(addText);
-        if (!additional || !additional.ok || !Array.isArray(additional.results)) continue;
+        if (!additional || !additional.ok) continue;
+        const aBatch = Array.isArray(additional.results) ? additional.results : Array.isArray(additional.batch_results) ? additional.batch_results : null;
+        if (!aBatch) continue;
 
-        for (let i = 0; i < primary.results.length && i < additional.results.length; i++) {
-          const pItem = primary.results[i];
-          const aItem = additional.results[i];
+        for (let i = 0; i < pBatch.length && i < aBatch.length; i++) {
+          const pItem = pBatch[i];
+          const aItem = aBatch[i];
           if (!pItem || !aItem) continue;
 
           const pInner = pItem.result || pItem;
           const aInner = aItem.result || aItem;
 
-          if (Array.isArray(pInner.results) && Array.isArray(aInner.results)) {
+          const pResults = Array.isArray(pInner.results) ? pInner.results : Array.isArray(pInner.results_json) ? pInner.results_json : null;
+          const aResults = Array.isArray(aInner.results) ? aInner.results : Array.isArray(aInner.results_json) ? aInner.results_json : null;
+
+          if (pResults && aResults) {
             const existingPaths = new Set(
-              pInner.results.map(r => `${r.path || ""}:${r.start_line || 0}:${r.symbol || ""}`)
+              pResults.map(r => `${r.path || ""}:${r.start_line || 0}:${r.symbol || ""}`)
             );
-            for (const r of aInner.results) {
+            for (const r of aResults) {
               const key = `${r.path || ""}:${r.start_line || 0}:${r.symbol || ""}`;
               if (!existingPaths.has(key)) {
-                pInner.results.push(r);
+                pResults.push(r);
                 existingPaths.add(key);
               }
             }
-            if (pInner.results.length > 1) {
-              pInner.results.sort((a, b) => (b.score || 0) - (a.score || 0));
+            if (pResults.length > 1) {
+              pResults.sort((a, b) => (b.score || 0) - (a.score || 0));
             }
-            if (typeof pInner.total === "number") pInner.total = pInner.results.length;
-            if (typeof pInner.count === "number") pInner.count = pInner.results.length;
+            if (typeof pInner.total === "number") pInner.total = pResults.length;
+            if (typeof pInner.count === "number") pInner.count = pResults.length;
           }
         }
       } catch (_) {}