agent-comm-hub 0.5.0 → 0.7.0

package/lib/setup.js

@@ -255,12 +255,13 @@ function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 var DSH_PATCH_MARKER = "# \u2500\u2500 agent-comm-hub MCP client";
+var DSH_PLUGIN_NAME = "@deepseek-ai/dsh-mcp-client";
 function dshPatchBlock(url, serverName) {
   return `
 ${DSH_PATCH_MARKER} (installed by \`agent-comm-hub setup\`; undo with \`setup --remove\`) \u2500
 - insert:
     - id: ${serverName}
-      name: '@deepseek-ai/dsh-mcp-client'
+      name: '${DSH_PLUGIN_NAME}'
       config:
         serverName: ${serverName}
         transport: streamable-http
@@ -271,49 +272,41 @@ async function mergeDshPatch(file, opts) {
   if (!existsSync2(file)) return "skipped";
   const text = await readFile(file, "utf8");
   const lines = text.split("\n");
-  const markerLine = lines.findIndex((line) => line.includes(DSH_PATCH_MARKER));
-  const hasBlock = markerLine >= 0;
-  const blockRange = () => {
-    let entryStart = -1;
-    for (let i = markerLine + 1; i < lines.length; i++) {
-      if (/^- /.test(lines[i])) {
-        entryStart = i;
-        break;
-      }
+  const hubEntryRanges = () => {
+    const tops = [];
+    for (let i = 0; i < lines.length; i++) {
+      if (/^- /.test(lines[i])) tops.push(i);
     }
-    let end = lines.length;
-    if (entryStart >= 0) {
-      for (let i = entryStart + 1; i < lines.length; i++) {
-        if (/^- /.test(lines[i])) {
-          end = i;
-          break;
-        }
-      }
+    const ranges2 = [];
+    for (let k = 0; k < tops.length; k++) {
+      const end = k + 1 < tops.length ? tops[k + 1] : lines.length;
+      if (!lines.slice(tops[k], end).some((line) => line.includes(DSH_PLUGIN_NAME))) continue;
+      let start = tops[k];
+      while (start > 0 && lines[start - 1].trim() === "") start--;
+      if (start > 0 && lines[start - 1].includes(DSH_PATCH_MARKER)) start--;
+      ranges2.push({ start, end });
     }
-    let start = markerLine;
-    while (start > 0 && lines[start - 1].trim() === "") start--;
-    return { start, end };
+    return ranges2;
   };
-  const withoutBlock = () => {
-    const { start, end } = blockRange();
-    return lines.slice(0, start).concat(lines.slice(end)).join("\n");
+  const withoutHubEntries = () => {
+    let out = lines;
+    for (const range of hubEntryRanges().reverse()) {
+      out = out.slice(0, range.start).concat(out.slice(range.end));
+    }
+    return out.join("\n");
   };
   if (opts.remove) {
-    if (!hasBlock) return "absent";
-    const cleaned = withoutBlock();
+    if (hubEntryRanges().length === 0) return "absent";
     await backup(file);
-    await writeFile(file, cleaned, "utf8");
+    await writeFile(file, withoutHubEntries(), "utf8");
     return "removed";
   }
-  if (hasBlock) {
-    if (lines.some((line) => line.includes(`url: ${opts.url}`))) return "unchanged";
-    const replaced = withoutBlock();
-    await backup(file);
-    await writeFile(file, replaced.trimEnd() + dshPatchBlock(opts.url, opts.serverName), "utf8");
-    return "changed";
+  const ranges = hubEntryRanges();
+  if (ranges.length === 1 && lines.slice(ranges[0].start, ranges[0].end).some((line) => line.includes(`url: ${opts.url}`))) {
+    return "unchanged";
   }
   await backup(file);
-  await writeFile(file, text.trimEnd() + dshPatchBlock(opts.url, opts.serverName), "utf8");
+  await writeFile(file, withoutHubEntries().trimEnd() + dshPatchBlock(opts.url, opts.serverName), "utf8");
   return "changed";
 }
 async function syncSkill(skillDir, skillSrc, remove, log) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-comm-hub",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "Generic multi-peer MCP hub: any MCP-capable agent (MiniMax Code, Claude Code, opencode, Codex, Gemini CLI, DSH, ...) connects to one local streamable-http endpoint and they chat, delegate tasks, and acknowledge in real time",
   "keywords": [
     "mcp",