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

package/package.json

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

package/src/mcpServer.js

@@ -1257,8 +1257,9 @@ async function createBridgeServer(options) {
       : [];
     const shouldFanOut = additionalCollections.length > 0 && indexerClient;
 
+    debugLog(`[ctxce] Fan-out check: tool=${name}, inFanoutSet=${_FANOUT_TOOLS.has(name)}, workspace=${workspace}, hint=${fanOutCollectionHint}, additional=[${additionalCollections.join(",")}], shouldFanOut=${shouldFanOut}`);
     if (shouldFanOut) {
-      debugLog(`[ctxce] Fan-out: ${name} across ${additionalCollections.length} additional collection(s)`);
+      debugLog(`[ctxce] Fan-out: ${name} across ${additionalCollections.length} additional collection(s): ${additionalCollections.join(", ")}`);
     }
 
     const timeoutMs = getBridgeToolTimeoutMs();
@@ -1868,40 +1869,63 @@ function _mergeResults(primaryText, additionalTexts) {
         const additional = JSON.parse(addText);
         if (!additional || !additional.ok) continue;
 
-        if (Array.isArray(primary.results) && Array.isArray(additional.results)) {
+        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);
+        if (pResults && aResults) {
+          if (!Array.isArray(primary.results)) {
+            primary.results_json = pResults;
+          }
           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(primary.results)) {
+            primary.results_json = pResults;
+          } else {
+            primary.results = pResults;
+          }
         }
 
+        const mergedArr = Array.isArray(primary.results) ? primary.results : primary.results_json;
         if (typeof primary.total === "number" && typeof additional.total === "number") {
-          primary.total = primary.results ? primary.results.length : primary.total + additional.total;
+          primary.total = Array.isArray(mergedArr) ? mergedArr.length : primary.total + additional.total;
         }
         if (typeof primary.count === "number" && typeof additional.count === "number") {
-          primary.count = primary.results ? primary.results.length : primary.count + additional.count;
+          primary.count = Array.isArray(mergedArr) ? mergedArr.length : primary.count + additional.count;
         }
       } catch (_) {}
     }
 
-    if (Array.isArray(primary.results) && primary.results.length > 1) {
-      primary.results.sort((a, b) => (b.score || 0) - (a.score || 0));
+    const resultsArr = Array.isArray(primary.results) ? primary.results : primary.results_json;
+    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;
+    if (originalLimit && Array.isArray(resultsArr) && resultsArr.length > originalLimit) {
+      const sliced = resultsArr.slice(0, originalLimit);
+      if (Array.isArray(primary.results)) {
+        primary.results = sliced;
+      } else {
+        primary.results_json = sliced;
+      }
+      if (typeof primary.total === "number") primary.total = sliced.length;
+      if (typeof primary.count === "number") primary.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(resultsArr) ? resultsArr.length : 0,
+      original_limit: originalLimit || null,
+    };
     return JSON.stringify(primary);
   } catch (_) {
     return primaryText;