agent-comm-hub 0.2.0 → 0.4.0

package/lib/setup.js

@@ -1,13 +1,177 @@
 // src/setup.ts
 import { copyFile, mkdir, readFile, writeFile } from "node:fs/promises";
-import { existsSync } from "node:fs";
+import { existsSync as existsSync2 } from "node:fs";
+import { homedir as homedir2 } from "node:os";
+import { dirname as dirname2, join as join2 } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+
+// src/discover.ts
+import { execFileSync } from "node:child_process";
+import { existsSync, readdirSync, accessSync, readFileSync, constants as fsConstants } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, join } from "node:path";
+import { dirname, join, sep } from "node:path";
 import { fileURLToPath } from "node:url";
+function registryFile() {
+  return join(dirname(fileURLToPath(import.meta.url)), "..", "agents", "registry.json");
+}
+function expandHome(file, home) {
+  return file.startsWith("~/") ? join(home, file.slice(2)) : file;
+}
+function expandConfigFile(file, home) {
+  const expanded = expandHome(file, home);
+  const star = expanded.indexOf("*");
+  if (star < 0) return [expanded];
+  const prefix = expanded.slice(0, star);
+  const suffix = expanded.slice(star + 1);
+  const base = prefix.slice(0, prefix.lastIndexOf(sep));
+  if (!existsSync(base)) return [];
+  return readdirSync(base, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => join(base, entry.name, suffix));
+}
+function validateRegistry(registry) {
+  if (!Array.isArray(registry.agents)) throw new Error('registry: missing "agents" array');
+  const ids = /* @__PURE__ */ new Set();
+  for (const agent of registry.agents) {
+    if (typeof agent.id !== "string" || !/^[a-z0-9][a-z0-9-]*$/.test(agent.id)) {
+      throw new Error(`registry: bad agent id ${JSON.stringify(agent.id)}`);
+    }
+    if (ids.has(agent.id)) throw new Error(`registry: duplicate agent id '${agent.id}'`);
+    ids.add(agent.id);
+    if (!Array.isArray(agent.probe)) throw new Error(`registry: ${agent.id}: probe must be an array`);
+    if (agent.npm !== void 0 && !Array.isArray(agent.npm)) throw new Error(`registry: ${agent.id}: npm must be an array`);
+    if (!Array.isArray(agent.configs)) throw new Error(`registry: ${agent.id}: configs must be an array`);
+    for (const config of agent.configs) {
+      if (typeof config.file !== "string" || !config.file.startsWith("~/")) {
+        throw new Error(`registry: ${agent.id}: config file must be '~'-relative`);
+      }
+      if (config.file.split("/").includes("..")) {
+        throw new Error(`registry: ${agent.id}: config file must not contain '..'`);
+      }
+      if (config.file.split("*").length > 2) {
+        throw new Error(`registry: ${agent.id}: at most one '*' segment allowed`);
+      }
+      if (!["json", "toml", "dsh"].includes(config.strategy)) {
+        throw new Error(`registry: ${agent.id}: unknown strategy '${config.strategy}'`);
+      }
+      if (config.strategy === "json" && (typeof config.section !== "string" || config.entry === null)) {
+        throw new Error(`registry: ${agent.id}: json strategy needs a section and an entry`);
+      }
+      if (config.strategy !== "json" && config.entry !== null) {
+        throw new Error(`registry: ${agent.id}: only json strategy may carry an entry`);
+      }
+    }
+    if (agent.skill !== null && (typeof agent.skill !== "string" || !agent.skill.startsWith("~/"))) {
+      throw new Error(`registry: ${agent.id}: skill must be '~'-relative or null`);
+    }
+    if (agent.os !== void 0 && (!Array.isArray(agent.os) || agent.os.some((os) => !["win32", "darwin", "linux"].includes(os)))) {
+      throw new Error(`registry: ${agent.id}: invalid os list`);
+    }
+  }
+}
+function loadRegistry(file = registryFile()) {
+  const registry = JSON.parse(readFileSync(file, "utf8"));
+  validateRegistry(registry);
+  return registry;
+}
+function commandOnPath(command, pathEnv, pathext, platform) {
+  const dirs = pathEnv.split(platform === "win32" ? ";" : ":");
+  const extensions = platform === "win32" ? ["", ...(pathext || ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean)] : [""];
+  for (const dir of dirs) {
+    const base = dir === "" ? "." : dir;
+    for (const ext of extensions) {
+      const candidate = join(base, command + ext);
+      try {
+        accessSync(candidate, fsConstants.X_OK);
+        return true;
+      } catch {
+      }
+    }
+  }
+  return false;
+}
+function readNpmNames(root) {
+  const names = [];
+  for (const entry of readdirSync(root, { withFileTypes: true })) {
+    if (!entry.isDirectory()) continue;
+    if (entry.name.startsWith("@")) {
+      const scopeDir = join(root, entry.name);
+      for (const sub of readdirSync(scopeDir, { withFileTypes: true })) {
+        if (sub.isDirectory()) names.push(sub.name);
+      }
+    } else {
+      names.push(entry.name);
+    }
+  }
+  return names;
+}
+function npmGlobalRoot(platform) {
+  try {
+    const out = execFileSync(platform === "win32" ? "npm.cmd" : "npm", ["root", "-g"], { encoding: "utf8", windowsHide: true }).trim();
+    return out || null;
+  } catch {
+    return null;
+  }
+}
+function npmFallbackRoots(home, platform) {
+  if (platform === "win32") {
+    const appData = process.env.APPDATA ?? join(home, "AppData", "Roaming");
+    return [join(appData, "npm", "node_modules")];
+  }
+  return [
+    "/usr/local/lib/node_modules",
+    "/usr/lib/node_modules",
+    ...existsSync(join(home, ".nvm", "versions", "node")) ? readdirSync(join(home, ".nvm", "versions", "node")).map((dir) => join(home, ".nvm", "versions", "node", dir, "lib", "node_modules")) : []
+  ];
+}
+function discover(registry, options = {}) {
+  const home = options.homeDir ?? homedir();
+  const platform = options.platform ?? process.platform;
+  const pathEnv = options.pathEnv ?? process.env.PATH ?? "";
+  const pathext = options.pathext ?? process.env.PATHEXT ?? "";
+  let npmNames = null;
+  if (!options.noNpm) {
+    if (options.npmRoot !== void 0 && options.npmRoot !== null) {
+      npmNames = existsSync(options.npmRoot) ? readNpmNames(options.npmRoot) : [];
+    } else if (options.npmRoot !== null) {
+      const root = npmGlobalRoot(platform);
+      if (root && existsSync(root)) {
+        npmNames = readNpmNames(root);
+      } else {
+        npmNames = [];
+        for (const fallback of npmFallbackRoots(home, platform)) {
+          if (existsSync(fallback)) {
+            npmNames = readNpmNames(fallback);
+            break;
+          }
+        }
+      }
+    }
+  }
+  return registry.agents.filter((agent) => agent.os === void 0 || agent.os.includes(platform)).map((agent) => {
+    let source = "none";
+    const configFiles = [];
+    for (const config of agent.configs) {
+      for (const file of expandConfigFile(config.file, home)) {
+        if (existsSync(file)) {
+          configFiles.push(file);
+          if (source === "none") source = "config";
+        }
+      }
+    }
+    if (source === "none" && agent.probe.some((command) => commandOnPath(command, pathEnv, pathext, platform))) {
+      source = "path";
+    }
+    if (source === "none" && npmNames !== null && (agent.probe.some((command) => npmNames.includes(command)) || (agent.npm ?? []).some((name) => npmNames.includes(name)))) {
+      source = "npm";
+    }
+    return { id: agent.id, source, configFiles, present: source !== "none" };
+  });
+}
+
+// src/setup.ts
 var DEFAULT_URL = "http://127.0.0.1:18764/mcp";
 var DEFAULT_SERVER = "agent-hub";
 function defaultSkillSrc() {
-  return join(dirname(fileURLToPath(import.meta.url)), "..", "agents", "SKILL.md");
+  return join2(dirname2(fileURLToPath2(import.meta.url)), "..", "agents", "SKILL.md");
 }
 function stamp() {
   const now = /* @__PURE__ */ new Date();
@@ -15,7 +179,7 @@ function stamp() {
   return `${now.getFullYear()}${pad(now.getMonth() + 1)}${pad(now.getDate())}-${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}`;
 }
 async function readJson(file) {
-  if (!existsSync(file)) return null;
+  if (!existsSync2(file)) return null;
   try {
     return JSON.parse(await readFile(file, "utf8"));
   } catch (error) {
@@ -23,7 +187,7 @@ async function readJson(file) {
   }
 }
 async function writeJsonNoBom(file, doc) {
-  await mkdir(dirname(file), { recursive: true });
+  await mkdir(dirname2(file), { recursive: true });
   await writeFile(file, JSON.stringify(doc, null, 2) + "\n", "utf8");
 }
 async function backup(file) {
@@ -44,7 +208,7 @@ function resolveSection(doc, section) {
   return node;
 }
 async function mergeJsonServer(file, section, entry, opts) {
-  if (!existsSync(file)) return "skipped";
+  if (!existsSync2(file)) return "skipped";
   const doc = await readJson(file);
   if (doc === null) return "skipped";
   const servers = resolveSection(doc, section);
@@ -66,7 +230,7 @@ async function mergeJsonServer(file, section, entry, opts) {
   return "changed";
 }
 async function mergeTomlSection(file, opts) {
-  if (!existsSync(file)) return "skipped";
+  if (!existsSync2(file)) return "skipped";
   const text = await readFile(file, "utf8");
   const marker = `[mcp_servers.${opts.serverName}]`;
   const markerRe = new RegExp(`^\\[mcp_servers\\.${escapeRegExp(opts.serverName)}\\]`, "m");
@@ -90,31 +254,104 @@ url = "${opts.url}"
 function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
+var DSH_PATCH_MARKER = "# \u2500\u2500 agent-comm-hub 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'
+      config:
+        serverName: ${serverName}
+        transport: streamable-http
+        url: ${url}
+`;
+}
+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;
+      }
+    }
+    let end = lines.length;
+    if (entryStart >= 0) {
+      for (let i = entryStart + 1; i < lines.length; i++) {
+        if (/^- /.test(lines[i])) {
+          end = i;
+          break;
+        }
+      }
+    }
+    let start = markerLine;
+    while (start > 0 && lines[start - 1].trim() === "") start--;
+    return { start, end };
+  };
+  const withoutBlock = () => {
+    const { start, end } = blockRange();
+    return lines.slice(0, start).concat(lines.slice(end)).join("\n");
+  };
+  if (opts.remove) {
+    if (!hasBlock) return "absent";
+    const cleaned = withoutBlock();
+    await backup(file);
+    await writeFile(file, cleaned, "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";
+  }
+  await backup(file);
+  await writeFile(file, text.trimEnd() + dshPatchBlock(opts.url, opts.serverName), "utf8");
+  return "changed";
+}
 async function syncSkill(skillDir, skillSrc, remove, log) {
   if (remove) {
-    if (existsSync(skillDir)) {
-      await mkdir(dirname(skillDir), { recursive: true });
+    if (existsSync2(skillDir)) {
+      await mkdir(dirname2(skillDir), { recursive: true });
       await rmRecursive(skillDir);
       log(`  skill removed: ${skillDir}`);
     }
     return;
   }
-  if (!existsSync(skillSrc)) {
+  if (!existsSync2(skillSrc)) {
     log(`  SKILL.md source missing: ${skillSrc} (skipped)`);
     return;
   }
   await mkdir(skillDir, { recursive: true });
-  await copyFile(skillSrc, join(skillDir, "SKILL.md"));
-  log(`  skill -> ${join(skillDir, "SKILL.md")}`);
+  await copyFile(skillSrc, join2(skillDir, "SKILL.md"));
+  log(`  skill -> ${join2(skillDir, "SKILL.md")}`);
 }
 async function rmRecursive(dir) {
   const { rm } = await import("node:fs/promises");
   await rm(dir, { recursive: true, force: true });
 }
+function substitute(entry, values) {
+  const out = {};
+  for (const [key, value] of Object.entries(entry)) {
+    if (typeof value === "string") {
+      out[key] = value.replaceAll("{url}", values.url).replaceAll("{serverName}", values.serverName);
+    } else {
+      out[key] = value;
+    }
+  }
+  return out;
+}
 async function runSetup(options = {}) {
   const url = options.url ?? DEFAULT_URL;
   const serverName = options.serverName ?? DEFAULT_SERVER;
-  const home = options.homeDir ?? homedir();
+  const home = options.homeDir ?? homedir2();
   const skillSrc = options.skillSrc ?? defaultSkillSrc();
   const remove = options.remove === true;
   const log = options.log ?? ((message) => console.log(message));
@@ -124,43 +361,40 @@ async function runSetup(options = {}) {
     else if (status === "unchanged" || status === "absent") summary.unchanged.push(`${label}: ${file}`);
     else if (status === "skipped") summary.skipped.push(`${label}: ${file}`);
   };
-  const jsonTargets = [
-    { label: "mcode", file: join(home, ".minimax", "mcp.json"), section: "mcpServers", entry: { url, type: "streamable-http", enabled: true, configured: true, timeout: 12e4, description: "agent-comm-hub: talk to every other agent connected to the hub." } },
-    { label: "mcode", file: join(home, ".minimax", "mcp", "mcp.json"), section: "mcpServers", entry: { url, type: "streamable-http", enabled: true, configured: true, timeout: 12e4, description: "agent-comm-hub: talk to every other agent connected to the hub." } },
-    { label: "opencode", file: join(home, ".config", "opencode", "opencode.json"), section: "mcp", entry: { type: "remote", url, enabled: true } },
-    { label: "kimi-code", file: join(home, ".kimi-code", "mcp.json"), section: "mcpServers", entry: { transport: "http", url, startupTimeoutMs: 3e4, toolTimeoutMs: 12e4 } },
-    { label: "gemini-cli", file: join(home, ".gemini", "settings.json"), section: "mcpServers", entry: { type: "http", url } },
-    { label: "zcode", file: join(home, ".zcode", "cli", "config.json"), section: "mcp.servers", entry: { type: "remote", url, enabled: true } }
-  ];
-  for (const target of jsonTargets) {
-    try {
-      const status = await mergeJsonServer(target.file, target.section, target.entry, { serverName, url, remove });
-      record(status, target.label, target.file);
-    } catch (error) {
-      summary.errors.push(`${target.label}: ${target.file} \u2014 ${error.message}`);
-      log(`  ${target.label}: SKIPPED \u2014 ${error.message}`);
+  const registry = loadRegistry();
+  const found = discover(registry, { homeDir: home, pathEnv: options.pathEnv, noNpm: options.noNpm === true });
+  const only = options.agent;
+  let targetAgents = [];
+  if (only !== void 0) {
+    const match = registry.agents.find((agent) => agent.id === only);
+    if (match === void 0) {
+      log(`agent '${only}' is not in the registry (see agents/registry.json)`);
+    } else {
+      targetAgents = [match];
+      log(`configure only: ${only}`);
     }
+  } else {
+    targetAgents = found.filter((agent) => agent.present).map((agent) => registry.agents.find((entry) => entry.id === agent.id));
+    const present = targetAgents.map((agent) => agent.id);
+    log(`discovered: ${present.length > 0 ? present.join(", ") : "none"}`);
+  }
+  for (const agent of targetAgents) {
+    for (const config of agent.configs) {
+      for (const file of expandConfigFile(config.file, home)) {
+        try {
+          const status = config.strategy === "json" ? await mergeJsonServer(file, config.section, substitute(config.entry, { url, serverName }), { serverName, url, remove }) : config.strategy === "toml" ? await mergeTomlSection(file, { serverName, url, remove }) : await mergeDshPatch(file, { serverName, url, remove });
+          record(status, agent.id, file);
+        } catch (error) {
+          summary.errors.push(`${agent.id}: ${file} \u2014 ${error.message}`);
+          log(`  ${agent.id}: SKIPPED \u2014 ${error.message}`);
+        }
+      }
+    }
+  }
+  const skillDirs = [join2(home, ".agents", "skills", serverName)];
+  for (const agent of targetAgents) {
+    if (agent.skill !== null) skillDirs.push(join2(expandHome(agent.skill, home), serverName));
   }
-  const codexFile = join(home, ".codex", "config.toml");
-  try {
-    const status = await mergeTomlSection(codexFile, { serverName, url, remove });
-    record(status, "codex", codexFile);
-  } catch (error) {
-    summary.errors.push(`codex: ${codexFile} \u2014 ${error.message}`);
-    log(`  codex: SKIPPED \u2014 ${error.message}`);
-  }
-  const skillDirs = [
-    join(home, ".agents", "skills", serverName),
-    // cross-agent standard
-    join(home, ".minimax", "skills", serverName),
-    join(home, ".config", "opencode", "skills", serverName),
-    join(home, ".kimi-code", "skills", serverName),
-    join(home, ".gemini", "skills", serverName),
-    join(home, ".codex", "skills", serverName),
-    join(home, ".zcode", "skills", serverName),
-    join(home, ".claude", "skills", serverName)
-    // config is manual; skill still useful
-  ];
   for (const dir of skillDirs) {
     try {
       await syncSkill(dir, skillSrc, remove, log);
@@ -169,8 +403,8 @@ async function runSetup(options = {}) {
       log(`  skill ${dir}: SKIPPED \u2014 ${error.message}`);
     }
   }
-  if (remove) log("done. Manual targets (see agents/README.md): Claude Code (.mcp.json), DSH (cordis.patch.yml).");
-  else log("done. Manual targets (see agents/README.md): Claude Code (.mcp.json), DSH (cordis.patch.yml). Restart agent sessions to pick up the MCP server.");
+  if (remove) log("done. Manual target (see agents/README.md): Claude Code (.mcp.json).");
+  else log("done. Manual target (see agents/README.md): Claude Code (.mcp.json). Restart agent sessions (and the dsh profile) to pick up the MCP server.");
   return summary;
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-comm-hub",
-  "version": "0.2.0",
+  "version": "0.4.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",
@@ -36,9 +36,9 @@
   },
   "scripts": {
     "build": "esbuild src/cli.ts --bundle --platform=node --format=esm --outfile=lib/cli.js && esbuild src/index.ts --bundle --platform=node --format=esm --outfile=lib/index.js && esbuild src/setup.ts --bundle --platform=node --format=esm --outfile=lib/setup.js",
-    "build:test": "esbuild test/entry.ts --bundle --platform=node --format=esm --outfile=test/entry.mjs && esbuild test/setup-entry.ts --bundle --platform=node --format=esm --outfile=test/setup-entry.mjs && esbuild test/ops-entry.ts --bundle --platform=node --format=esm --outfile=test/ops-entry.mjs",
+    "build:test": "esbuild test/entry.ts --bundle --platform=node --format=esm --outfile=test/entry.mjs && esbuild test/setup-entry.ts --bundle --platform=node --format=esm --outfile=test/setup-entry.mjs && esbuild test/ops-entry.ts --bundle --platform=node --format=esm --outfile=test/ops-entry.mjs && esbuild test/herdr-entry.ts --bundle --platform=node --format=esm --outfile=test/herdr-entry.mjs && esbuild test/discover-entry.ts --bundle --platform=node --format=esm --outfile=test/discover-entry.mjs",
     "typecheck": "tsc --noEmit",
-    "test": "pnpm run build:test && node test/smoke.mjs && node test/setup.mjs && node test/ops.mjs",
+    "test": "pnpm run build:test && node test/smoke.mjs && node test/setup.mjs && node test/ops.mjs && node test/herdr.mjs && node test/discover.mjs",
     "pack": "pnpm run build && pnpm pack",
     "prepublishOnly": "pnpm run test && pnpm run build",
     "prepare": "pnpm run build"