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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@context-engine-bridge/context-engine-mcp-bridge",
-  "version": "0.0.69",
+  "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

@@ -717,12 +717,12 @@ async function createBridgeServer(options) {
   const explicitCollection = options.collection;
 
   const config = loadConfig(workspace);
+  const configCollection = config && typeof config.default_collection === "string"
+    ? config.default_collection : null;
   const defaultCollection =
     explicitCollection && typeof explicitCollection === "string"
       ? explicitCollection
-      : config && typeof config.default_collection === "string"
-        ? config.default_collection
-        : null;
+      : configCollection;
   const defaultMode =
     config && typeof config.default_mode === "string" ? config.default_mode : null;
   const defaultUnder =
@@ -1262,6 +1262,10 @@ async function createBridgeServer(options) {
       debugLog(`[ctxce] Fan-out: ${name} across ${additionalCollections.length} additional collection(s): ${additionalCollections.join(", ")}`);
     }
 
+    if (shouldFanOut && args && typeof args === "object") {
+      args = { ...args, output_format: "json", compact: false };
+    }
+
     const timeoutMs = getBridgeToolTimeoutMs();
     const maxAttempts = getBridgeRetryAttempts();
     const retryDelayMs = getBridgeRetryDelayMs();
@@ -1292,11 +1296,13 @@ async function createBridgeServer(options) {
         if (shouldFanOut) {
           const fanOutCallTimeoutMs = Math.min(timeoutMs, 10000);
           const fanOutDeadlineMs = Math.round(fanOutCallTimeoutMs * 0.8);
-          const allFanOutCollections = [defaultCollection || primaryCollection, ...additionalCollections].filter(Boolean);
+          const allFanOutCollections = [...additionalCollections].filter(Boolean);
           const fanOutPromises = allFanOutCollections.map(col => {
-            const colArgs = { ...args, collection: col, output_format: "json", compact: false };
+            const fanOutToolName = (name === "search" || name === "context_search") ? "repo_search" : name;
+            const { session: _s, ...argsNoSession } = (args && typeof args === "object") ? args : {};
+            const colArgs = { ...argsNoSession, collection: col, output_format: "json", compact: false };
             return targetClient.callTool(
-              { name, arguments: colArgs },
+              { name: fanOutToolName, arguments: colArgs },
               undefined,
               { timeout: fanOutCallTimeoutMs },
             ).catch(err => {
@@ -1862,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;
 }
@@ -1877,15 +1885,19 @@ 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);
 
+    const _perCall = [];
+    let _totalAdded = 0;
     for (const addText of additionalTexts) {
       try {
         const additional = JSON.parse(addText);
-        if (!additional || !additional.ok) {
-          primary._merge_skip = { ok: additional?.ok, keys: additional ? Object.keys(additional).slice(0, 10) : [] };
+        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;
         }
 
@@ -1907,10 +1919,8 @@ function _mergeResults(primaryText, additionalTexts) {
               added++;
             }
           }
-          primary._merge_added = added;
-          primary._merge_pre_sort = pResults.length;
-          primary._merge_before_len = beforeLen;
-          primary._merge_a_len = aResults.length;
+          _totalAdded += added;
+          _perCall.push({ ok: true, a_len: aResults.length, added, before: beforeLen, after: pResults.length });
           if (Array.isArray(pInner.results_json)) {
             pInner.results_json = pResults;
           } else if (Array.isArray(pInner.results)) {
@@ -1920,12 +1930,12 @@ function _mergeResults(primaryText, additionalTexts) {
           }
         } else if (!pResults && aResults) {
           primary._merge_branch = "only_additional";
-          primary._merge_added = aResults.length;
+          _totalAdded += aResults.length;
+          _perCall.push({ ok: true, a_len: aResults.length, added: aResults.length, branch: "only_additional" });
           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;
+          _perCall.push({ ok: true, branch: "no_merge", p_type: pResults ? "array" : typeof pInner.results, a_type: aResults ? "array" : typeof aInner.results });
         }
 
         if (typeof pInner.total === "number" && typeof aInner.total === "number") {
@@ -1957,11 +1967,10 @@ function _mergeResults(primaryText, additionalTexts) {
     primary._fanout_debug = {
       additional_count: additionalTexts.length,
       merged_count: Array.isArray(finalArr) ? finalArr.length : 0,
-      branch: primary._merge_branch || "none",
-      added: primary._merge_added || 0,
+      total_added: _totalAdded,
+      per_call: _perCall,
     };
     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;
@@ -1974,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 (_) {}