@context-engine-bridge/context-engine-mcp-bridge 0.0.66 → 0.0.69

package/package.json

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

package/src/mcpServer.js

@@ -1292,7 +1292,8 @@ async function createBridgeServer(options) {
         if (shouldFanOut) {
           const fanOutCallTimeoutMs = Math.min(timeoutMs, 10000);
           const fanOutDeadlineMs = Math.round(fanOutCallTimeoutMs * 0.8);
-          const fanOutPromises = additionalCollections.map(col => {
+          const allFanOutCollections = [defaultCollection || primaryCollection, ...additionalCollections].filter(Boolean);
+          const fanOutPromises = allFanOutCollections.map(col => {
             const colArgs = { ...args, collection: col, output_format: "json", compact: false };
             return targetClient.callTool(
               { name, arguments: colArgs },
@@ -1883,22 +1884,33 @@ function _mergeResults(primaryText, additionalTexts) {
     for (const addText of additionalTexts) {
       try {
         const additional = JSON.parse(addText);
-        if (!additional || !additional.ok) continue;
+        if (!additional || !additional.ok) {
+          primary._merge_skip = { ok: additional?.ok, keys: additional ? Object.keys(additional).slice(0, 10) : [] };
+          continue;
+        }
 
         const aInner = _unwrapSearchEnvelope(additional);
         const pResults = _getResultsArray(pInner);
         const aResults = _getResultsArray(aInner);
         if (pResults && aResults) {
+          primary._merge_branch = "both_arrays";
+          const beforeLen = pResults.length;
           const existingPaths = new Set(
             pResults.map(r => `${r.path || ""}:${r.start_line || 0}:${r.symbol || ""}`)
           );
+          let added = 0;
           for (const r of aResults) {
             const key = `${r.path || ""}:${r.start_line || 0}:${r.symbol || ""}`;
             if (!existingPaths.has(key)) {
               pResults.push(r);
               existingPaths.add(key);
+              added++;
             }
           }
+          primary._merge_added = added;
+          primary._merge_pre_sort = pResults.length;
+          primary._merge_before_len = beforeLen;
+          primary._merge_a_len = aResults.length;
           if (Array.isArray(pInner.results_json)) {
             pInner.results_json = pResults;
           } else if (Array.isArray(pInner.results)) {
@@ -1907,7 +1919,13 @@ function _mergeResults(primaryText, additionalTexts) {
             pInner.results_json = pResults;
           }
         } else if (!pResults && aResults) {
+          primary._merge_branch = "only_additional";
+          primary._merge_added = aResults.length;
           pInner.results_json = [...aResults];
+        } else {
+          primary._merge_branch = "no_merge";
+          primary._merge_p_type = pResults ? "array" : typeof pInner.results;
+          primary._merge_a_type = aResults ? "array" : typeof aInner.results;
         }
 
         if (typeof pInner.total === "number" && typeof aInner.total === "number") {
@@ -1918,41 +1936,35 @@ function _mergeResults(primaryText, additionalTexts) {
           const arr = _getResultsArray(pInner);
           pInner.count = Array.isArray(arr) ? arr.length : pInner.count + aInner.count;
         }
-      } catch (_) {}
+      } catch (mergeErr) {
+        primary._merge_error = String(mergeErr);
+      }
     }
 
     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 || (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;
+    if (typeof pInner.total === "number" && Array.isArray(resultsArr)) {
+      pInner.total = resultsArr.length;
+    }
+    if (typeof pInner.count === "number" && Array.isArray(resultsArr)) {
+      pInner.count = resultsArr.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;
+    const finalArr = _getResultsArray(pInner);
     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,
+      additional_count: additionalTexts.length,
+      merged_count: Array.isArray(finalArr) ? finalArr.length : 0,
+      branch: primary._merge_branch || "none",
+      added: primary._merge_added || 0,
     };
+    if (primary._merge_error) primary._fanout_debug.error = primary._merge_error;
+    if (primary._merge_skip) primary._fanout_debug.skip = primary._merge_skip;
+    delete primary._merge_branch; delete primary._merge_added; delete primary._merge_pre_sort;
+    delete primary._merge_before_len; delete primary._merge_a_len; delete primary._merge_error;
+    delete primary._merge_skip; delete primary._merge_p_type; delete primary._merge_a_type;
     return JSON.stringify(primary);
   } catch (_) {
     return primaryText;