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

package/package.json

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

package/src/mcpServer.js

@@ -1262,10 +1262,6 @@ 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();
@@ -1336,9 +1332,7 @@ async function createBridgeServer(options) {
               }
               const mergeFn = _isBatchTool(name) ? _mergeBatchResults : _mergeResults;
               primaryTb.text = mergeFn(primaryTb.text, additionalTexts);
-              if (result.structuredContent) {
-                try { result.structuredContent = JSON.parse(primaryTb.text); } catch (_) {}
-              }
+              delete result.structuredContent;
             }
           }
         }
@@ -1882,6 +1876,29 @@ function _getResultsArray(obj) {
   return null;
 }
 
+function _parseToonResults(toonStr) {
+  if (typeof toonStr !== "string") return null;
+  try {
+    const lines = toonStr.split("\n");
+    const results = [];
+    for (let i = 1; i < lines.length; i++) {
+      const line = lines[i].trim();
+      if (!line) continue;
+      const parts = line.split(",");
+      if (parts.length < 4) continue;
+      const clean = s => (s || "").replace(/^["'\s]+|["'\s]+$/g, "");
+      results.push({
+        score: parseFloat(parts[0]) || 0,
+        path: clean(parts[1]),
+        symbol: clean(parts[2]),
+        start_line: parseInt(parts[3], 10) || 0,
+        end_line: parseInt(parts[4], 10) || 0,
+      });
+    }
+    return results.length > 0 ? results : null;
+  } catch (_) { return null; }
+}
+
 function _mergeResults(primaryText, additionalTexts) {
   try {
     const primary = JSON.parse(primaryText);
@@ -1929,10 +1946,25 @@ function _mergeResults(primaryText, additionalTexts) {
             pInner.results_json = pResults;
           }
         } else if (!pResults && aResults) {
-          primary._merge_branch = "only_additional";
-          _totalAdded += aResults.length;
-          _perCall.push({ ok: true, a_len: aResults.length, added: aResults.length, branch: "only_additional" });
-          pInner.results_json = [...aResults];
+          const parsedToon = _parseToonResults(pInner.results);
+          if (parsedToon) {
+            primary._merge_branch = "toon_parsed";
+            const existingPaths = new Set(parsedToon.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)) { parsedToon.push(r); existingPaths.add(key); added++; }
+            }
+            parsedToon.sort((a, b) => (b.score || 0) - (a.score || 0));
+            _totalAdded += added;
+            _perCall.push({ ok: true, a_len: aResults.length, added, branch: "toon_parsed", before: parsedToon.length - added, after: parsedToon.length });
+            pInner.results_json = parsedToon;
+          } else {
+            primary._merge_branch = "only_additional";
+            _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";
           _perCall.push({ ok: true, branch: "no_merge", p_type: pResults ? "array" : typeof pInner.results, a_type: aResults ? "array" : typeof aInner.results });
@@ -2002,9 +2034,13 @@ function _mergeBatchResults(primaryText, additionalTexts) {
           const pInner = pItem.result || pItem;
           const aInner = aItem.result || aItem;
 
-          const pResults = Array.isArray(pInner.results) ? pInner.results : Array.isArray(pInner.results_json) ? pInner.results_json : null;
+          let 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 && typeof pInner.results === "string") {
+            pResults = _parseToonResults(pInner.results);
+          }
+
           if (pResults && aResults) {
             const existingPaths = new Set(
               pResults.map(r => `${r.path || ""}:${r.start_line || 0}:${r.symbol || ""}`)
@@ -2019,8 +2055,11 @@ function _mergeBatchResults(primaryText, additionalTexts) {
             if (pResults.length > 1) {
               pResults.sort((a, b) => (b.score || 0) - (a.score || 0));
             }
+            pInner.results_json = pResults;
             if (typeof pInner.total === "number") pInner.total = pResults.length;
             if (typeof pInner.count === "number") pInner.count = pResults.length;
+          } else if (!pResults && aResults) {
+            pInner.results_json = [...aResults];
           }
         }
       } catch (_) {}