@context-engine-bridge/context-engine-mcp-bridge 0.0.59 → 0.0.62

package/package.json

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

package/src/mcpServer.js

@@ -1859,55 +1859,89 @@ function _isBatchTool(name) {
   return name && name.startsWith("batch_");
 }
 
+function _unwrapSearchEnvelope(obj) {
+  if (obj && obj.result && typeof obj.result === "object" && obj.result.ok !== undefined) {
+    return obj.result;
+  }
+  return obj;
+}
+
+function _getResultsArray(obj) {
+  if (Array.isArray(obj.results)) return obj.results;
+  if (Array.isArray(obj.results_json)) return obj.results_json;
+  return null;
+}
+
 function _mergeResults(primaryText, additionalTexts) {
   try {
     const primary = JSON.parse(primaryText);
     if (!primary || !primary.ok) return primaryText;
 
+    const pInner = _unwrapSearchEnvelope(primary);
+
     for (const addText of additionalTexts) {
       try {
         const additional = JSON.parse(addText);
         if (!additional || !additional.ok) continue;
 
-        if (Array.isArray(primary.results) && Array.isArray(additional.results)) {
+        const aInner = _unwrapSearchEnvelope(additional);
+        const pResults = _getResultsArray(pInner);
+        const aResults = _getResultsArray(aInner);
+        if (pResults && aResults) {
           const existingPaths = new Set(
-            primary.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 additional.results) {
+          for (const r of aResults) {
             const key = `${r.path || ""}:${r.start_line || 0}:${r.symbol || ""}`;
             if (!existingPaths.has(key)) {
-              primary.results.push(r);
+              pResults.push(r);
               existingPaths.add(key);
             }
           }
+          if (Array.isArray(pInner.results_json)) {
+            pInner.results_json = pResults;
+          } else if (Array.isArray(pInner.results)) {
+            pInner.results = pResults;
+          } else {
+            pInner.results_json = pResults;
+          }
         }
 
-        if (typeof primary.total === "number" && typeof additional.total === "number") {
-          primary.total = primary.results ? primary.results.length : primary.total + additional.total;
+        if (typeof pInner.total === "number" && typeof aInner.total === "number") {
+          const arr = _getResultsArray(pInner);
+          pInner.total = Array.isArray(arr) ? arr.length : pInner.total + aInner.total;
         }
-        if (typeof primary.count === "number" && typeof additional.count === "number") {
-          primary.count = primary.results ? primary.results.length : primary.count + additional.count;
+        if (typeof pInner.count === "number" && typeof aInner.count === "number") {
+          const arr = _getResultsArray(pInner);
+          pInner.count = Array.isArray(arr) ? arr.length : pInner.count + aInner.count;
         }
       } catch (_) {}
     }
 
-    if (Array.isArray(primary.results) && primary.results.length > 1) {
-      primary.results.sort((a, b) => (b.score || 0) - (a.score || 0));
+    const resultsArr = _getResultsArray(pInner);
+    if (Array.isArray(resultsArr) && resultsArr.length > 1) {
+      resultsArr.sort((a, b) => (b.score || 0) - (a.score || 0));
     }
 
-    const originalLimit = primary._original_limit;
-    if (originalLimit && Array.isArray(primary.results) && primary.results.length > originalLimit) {
-      primary.results = primary.results.slice(0, originalLimit);
-      if (typeof primary.total === "number") primary.total = primary.results.length;
-      if (typeof primary.count === "number") primary.count = primary.results.length;
+    const originalLimit = primary._original_limit || (pInner._original_limit);
+    if (originalLimit && Array.isArray(resultsArr) && resultsArr.length > originalLimit) {
+      const sliced = resultsArr.slice(0, originalLimit);
+      if (Array.isArray(pInner.results_json)) {
+        pInner.results_json = sliced;
+      } else {
+        pInner.results = sliced;
+      }
+      if (typeof pInner.total === "number") pInner.total = sliced.length;
+      if (typeof pInner.count === "number") pInner.count = sliced.length;
     }
 
     primary._cross_collection = true;
     primary._fanout_debug = {
       additional_texts_count: additionalTexts.length,
       additional_ok_count: additionalTexts.filter(t => { try { return JSON.parse(t).ok; } catch(_) { return false; } }).length,
-      final_results_count: Array.isArray(primary.results) ? primary.results.length : 0,
+      final_results_count: Array.isArray(resultsArr) ? resultsArr.length : 0,
       original_limit: originalLimit || null,
+      envelope: pInner !== primary,
     };
     return JSON.stringify(primary);
   } catch (_) {