@context-engine-bridge/context-engine-mcp-bridge 0.0.60 → 0.0.63

package/package.json

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

package/src/mcpServer.js

@@ -1859,22 +1859,35 @@ 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;
 
-        const pResults = Array.isArray(primary.results) ? primary.results : (Array.isArray(primary.results_json) ? primary.results_json : null);
-        const aResults = Array.isArray(additional.results) ? additional.results : (Array.isArray(additional.results_json) ? additional.results_json : null);
+        const aInner = _unwrapSearchEnvelope(additional);
+        const pResults = _getResultsArray(pInner);
+        const aResults = _getResultsArray(aInner);
         if (pResults && aResults) {
-          if (!Array.isArray(primary.results)) {
-            primary.results_json = pResults;
-          }
           const existingPaths = new Set(
             pResults.map(r => `${r.path || ""}:${r.start_line || 0}:${r.symbol || ""}`)
           );
@@ -1885,46 +1898,57 @@ function _mergeResults(primaryText, additionalTexts) {
               existingPaths.add(key);
             }
           }
-          if (!Array.isArray(primary.results)) {
-            primary.results_json = pResults;
+          if (Array.isArray(pInner.results_json)) {
+            pInner.results_json = pResults;
+          } else if (Array.isArray(pInner.results)) {
+            pInner.results = pResults;
           } else {
-            primary.results = pResults;
+            pInner.results_json = pResults;
           }
         }
 
-        const mergedArr = Array.isArray(primary.results) ? primary.results : primary.results_json;
-        if (typeof primary.total === "number" && typeof additional.total === "number") {
-          primary.total = Array.isArray(mergedArr) ? mergedArr.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 = Array.isArray(mergedArr) ? mergedArr.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 (_) {}
     }
 
-    const resultsArr = Array.isArray(primary.results) ? primary.results : primary.results_json;
+    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;
+    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(primary.results)) {
-        primary.results = sliced;
+      if (Array.isArray(pInner.results_json)) {
+        pInner.results_json = sliced;
       } else {
-        primary.results_json = sliced;
+        pInner.results = sliced;
       }
-      if (typeof primary.total === "number") primary.total = sliced.length;
-      if (typeof primary.count === "number") primary.count = sliced.length;
+      if (typeof pInner.total === "number") pInner.total = sliced.length;
+      if (typeof pInner.count === "number") pInner.count = sliced.length;
     }
 
     primary._cross_collection = true;
+    const _aFirst = additionalTexts.length > 0 ? (() => { try { const a = JSON.parse(additionalTexts[0]); const ai = _unwrapSearchEnvelope(a); return { keys: Object.keys(ai), results_type: typeof ai.results, results_json_type: typeof ai.results_json, results_is_array: Array.isArray(ai.results), results_json_is_array: Array.isArray(ai.results_json) }; } catch(_) { return "parse_error"; } })() : null;
     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(resultsArr) ? resultsArr.length : 0,
       original_limit: originalLimit || null,
+      envelope: pInner !== primary,
+      p_inner_keys: Object.keys(pInner),
+      p_results_type: typeof pInner.results,
+      p_results_json_type: typeof pInner.results_json,
+      p_results_is_array: Array.isArray(pInner.results),
+      p_results_json_is_array: Array.isArray(pInner.results_json),
+      a_first: _aFirst,
     };
     return JSON.stringify(primary);
   } catch (_) {