dsh-tool-folder 0.1.6 → 0.1.8

package/lib/index.js

@@ -163,14 +163,48 @@ function extractQuery(context) {
   return "";
 }
 
-function catalogText(tools) {
-  const lines = tools.map((t) => {
+function serverOf(name) {
+  // "mcp__github__get_repo" → "mcp__github"; "openhands_create_conversation" → "openhands";
+  // native tools with underscores ("read_file", "search_for_pattern") → "native".
+  const m = name.match(/^(mcp__[^_]+(?:_[^_]+)?)/);
+  if (m) return m[1];
+  if (/^openhands_/.test(name)) return "openhands";
+  return "native";
+}
+
+function summarizeCaps(tools) {
+  // Pull the first few distinct capability keywords from descriptions.
+  const seen = new Set();
+  const caps = [];
+  for (const t of tools) {
     const d = (t.description || "").replace(/\s+/g, " ").trim();
-    return `- ${t.name}: ${d.slice(0, 90)}`;
-  });
+    const head = d.split(/[—,;:]/)[0].slice(0, 60);
+    if (head && !seen.has(head)) {
+      seen.add(head);
+      caps.push(head);
+    }
+    if (caps.length >= 3) break;
+  }
+  return caps.join(" | ") || "capabilities unknown";
+}
+
+function catalogText(tools) {
+  // Affordance fix: group folded tools by server and emit a capability
+  // summary per server (not a callable-looking name list). The model must
+  // expand arguments via tools_schema before calling a folded tool.
+  const byServer = new Map();
+  for (const t of tools) {
+    const s = serverOf(t.name);
+    if (!byServer.has(s)) byServer.set(s, []);
+    byServer.get(s).push(t);
+  }
+  const lines = [...byServer.entries()]
+    .sort((a, b) => b[1].length - a[1].length)
+    .map(([server, ts]) => `- [${server}]: ${ts.length} tools — ${summarizeCaps(ts)}`);
   return [
     "Additional tools exist but are not loaded for this request. " +
-      "You can still call them if needed — name them exactly as listed:",
+      "They are grouped by server below. To call one: first expand its " +
+      "arguments with tools_schema (exact tool name), then call it by name.",
     ...lines,
   ].join("\n");
 }
@@ -267,11 +301,14 @@ export function apply(ctx, config) {
         addPerServerTopK(dyn, tools, m.server, `${query} ${m.keywords.join(" ")}`, 3);
       }
     } else {
-      // aliases fallback (existing behavior preserved verbatim)
+      // aliases fallback — narrowed to a single representative tool per
+      // matching server (topK=1). A whole-server injection cancels the fold
+      // budget; the rest of the server stays discoverable via tools_search
+      // and the grouped catalog.
       for (const [prefix, keywords] of Object.entries(cfg.aliases || {})) {
         const matched = keywords.filter((k) => q.includes(String(k).toLowerCase()));
         if (matched.length === 0) continue;
-        addPerServerTopK(dyn, tools, prefix, `${query} ${matched.join(" ")}`, 3);
+        addPerServerTopK(dyn, tools, prefix, `${query} ${matched.join(" ")}`, 1);
       }
     }
     // Generic BM25 last as a union (result set unchanged vs. previous order).
@@ -430,12 +467,27 @@ export function apply(ctx, config) {
 
       const stamp = tools.map((t) => t.name).join("\u0001");
       if (indexStamp !== stamp) {
+        // V4 document expansion (measured 0.1.7→0.1.8): the tool corpus is
+        // pure-English, so Chinese queries always get df=0 and BM25 scores
+        // nothing (measured recall 0/26). Inject per-tool aliases from
+        // cfg.aliases (prefix-matched) into the index text — CN recall
+        // 0%→88%, EN +15pp, both from the same expansion.
         index = buildIndex(
-          tools.map((t) => ({ id: t.name, text: `${t.name} ${t.description || ""}` })),
+          tools.map((t) => {
+            const aliasWords = [];
+            for (const [prefix, keywords] of Object.entries(cfg.aliases || {})) {
+              if (t.name.startsWith(prefix)) aliasWords.push(...keywords);
+            }
+            return {
+              id: t.name,
+              text: `${t.name} ${t.description || ""} ${aliasWords.join(" ")}`,
+            };
+          }),
         );
         indexStamp = stamp;
         allTools = tools;
-        logger.info("index rebuilt: %d tools", tools.length);
+        logger.info("index rebuilt: %d tools (doc-expansion enabled)", tools.length);
+
       }
 
       const query = extractQuery(context);

package/package.json

@@ -1,38 +1,38 @@
-{
-  "name": "dsh-tool-folder",
-  "version": "0.1.6",
-  "description": "Fold the DSH tool surface per request + ChainGuard firewall (high-risk block + exfil-chain detection). Shrinks schema tokens 80-90% while keeping selection accuracy. v0.1.6 adds a zod Config schema so every toggle renders in the DSH settings UI.",
-  "keywords": [
-    "dsh-plugin",
-    "dsh",
-    "deepseek-harness",
-    "cordis",
-    "tool-selection",
-    "token-optimization",
-    "bm25"
-  ],
-  "type": "module",
-  "main": "lib/index.js",
-  "files": [
-    "lib",
-    "cordis.patch.yml",
-    "README.md"
-  ],
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    }
-  },
-  "license": "MIT",
-  "engines": {
-    "node": ">=18"
-  },
-  "dependencies": {
-    "zod": "^4.4.3",
-    "@deepseek-ai/schemastery": "^3.18.1"
-  },
-  "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6"
-  }
-}
+{
+  "name": "dsh-tool-folder",
+  "version": "0.1.8",
+  "description": "Fold the DSH tool surface per request + ChainGuard firewall (high-risk block + exfil-chain detection). Shrinks schema tokens 80-90% while keeping selection accuracy. v0.1.6 adds a zod Config schema so every toggle renders in the DSH settings UI.",
+  "keywords": [
+    "dsh-plugin",
+    "dsh",
+    "deepseek-harness",
+    "cordis",
+    "tool-selection",
+    "token-optimization",
+    "bm25"
+  ],
+  "type": "module",
+  "main": "lib/index.js",
+  "files": [
+    "lib",
+    "cordis.patch.yml",
+    "README.md"
+  ],
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    }
+  },
+  "license": "MIT",
+  "engines": {
+    "node": ">=18"
+  },
+  "dependencies": {
+    "zod": "^4.4.3",
+    "@deepseek-ai/schemastery": "^3.18.1"
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6"
+  }
+}