agent-comm-hub 0.3.0 → 0.4.0

package/README.md

@@ -84,6 +84,7 @@ Task Scheduler on Windows) — or the built-in one-shot auto-start:
 ```bash
 agent-comm-hub service install    # Windows: HKCU Run + hidden launcher (no admin)
                                   # Linux:   systemd --user unit, enabled
+                                  # macOS:   launchd LaunchAgent
 agent-comm-hub service uninstall  # undo
 agent-comm-hub status             # is the hub up? who is online?
 ```
@@ -98,13 +99,19 @@ itself).
 agent-comm-hub setup
 # or: agents/install-all.ps1 (PowerShell equivalent)
 # undo: agent-comm-hub setup --remove
+# list what is installed (no changes): agent-comm-hub discover
+# configure a single agent:           agent-comm-hub setup --agent codex
 ```
 
-`setup` incrementally merges the `agent-hub` MCP entry into every installed
-agent's own config (mcode, opencode, Kimi Code, Gemini CLI, Codex, zcode, DSH)
-and installs the English skill into `~/.agents/skills/` (the cross-agent
-standard) plus each agent's private skills dir. Only the `agent-hub` key is
-touched, every file is backed up first, and re-running is a no-op. Claude Code
+`setup` **discovers** which agents are installed on this machine (PATH
+commands, config paths, npm global packages — no shell, cross-platform) and
+merges the `agent-hub` MCP entry into each one's config (mcode, opencode, Kimi
+Code, Gemini CLI, Codex, zcode, DSH, claude-desktop on macOS), plus the English
+skill into `~/.agents/skills/` (the cross-agent standard) and each agent's
+private skills dir. Which agents are supported is declared in
+[`agents/registry.json`](agents/registry.json) — adding a new agent is one
+registry record, no code change. Only the `agent-hub` key is touched, every
+file is backed up first, and re-running is a no-op. Claude Code's MCP config
 stays manual (see below).
 
 **Registration is automatic**: once an agent session starts, the MCP handshake

package/README.zh.md

@@ -82,6 +82,7 @@ agent-comm-hub
 ```bash
 agent-comm-hub service install    # Windows：HKCU Run + 隐藏启动器（无需管理员）
                                   # Linux：systemd --user 单元并启用
+                                  # macOS：launchd LaunchAgent
 agent-comm-hub service uninstall  # 撤销
 agent-comm-hub status             # hub 是否在跑？谁在线？
 ```
@@ -94,12 +95,18 @@ agent-comm-hub status             # hub 是否在跑？谁在线？
 agent-comm-hub setup
 # 或 PowerShell 版：agents/install-all.ps1
 # 卸载：agent-comm-hub setup --remove
+# 查看本机装了什么（只读）：agent-comm-hub discover
+# 只配置某一个：agent-comm-hub setup --agent codex
 ```
 
-`setup` 会把 `agent-hub` 的 MCP 条目**增量合并**进每个已安装 agent 的配置
-（mcode / opencode / kimi-code / gemini / codex / zcode），并把英文 SKILL 装到
-`~/.agents/skills/`（跨 agent 标准位置）+ 各 agent 私有技能目录。只动
-`agent-hub` 这一个键、每个文件先备份、幂等可重跑。Claude Code 与 DSH 手动（见下）。
+`setup` 会**自动发现**本机安装了哪些 agent（PATH 命令 / 配置文件路径 /
+npm 全局包，纯 Node 无 shell、跨平台），并把 `agent-hub` 的 MCP 条目
+**增量合并**进每个已安装 agent 的配置（mcode / opencode / kimi-code /
+gemini / codex / zcode / DSH，macOS 上还有 claude-desktop），英文 SKILL 装到
+`~/.agents/skills/`（跨 agent 标准位置）+ 各 agent 私有技能目录。支持哪些
+agent 由 [`agents/registry.json`](agents/registry.json) 声明——新增 agent
+只需加一条注册表记录，不改代码。只动 `agent-hub` 这一个键、每个文件先备份、
+幂等可重跑。Claude Code 的 MCP 配置手动（见下）。
 
 **注册全自动**：agent 会话一启动，MCP 握手即完成注册（客户端名 = peer id），无需任何手动操作。可选：`bridge_register("工具名:项目名")` 换可读 id。
 

package/agents/registry.json

@@ -0,0 +1,201 @@
+{
+  "$schema": "docs/agent-registry.schema.json",
+  "agents": [
+    {
+      "id": "mcode",
+      "probe": [],
+      "configs": [
+        {
+          "file": "~/.minimax/mcp.json",
+          "section": "mcpServers",
+          "strategy": "json",
+          "entry": {
+            "url": "{url}",
+            "type": "streamable-http",
+            "enabled": true,
+            "configured": true,
+            "timeout": 120000,
+            "description": "agent-comm-hub: talk to every other agent connected to the hub."
+          }
+        },
+        {
+          "file": "~/.minimax/mcp/mcp.json",
+          "section": "mcpServers",
+          "strategy": "json",
+          "entry": {
+            "url": "{url}",
+            "type": "streamable-http",
+            "enabled": true,
+            "configured": true,
+            "timeout": 120000,
+            "description": "agent-comm-hub: talk to every other agent connected to the hub."
+          }
+        }
+      ],
+      "skill": "~/.minimax/skills",
+      "os": ["win32", "darwin", "linux"]
+    },
+    {
+      "id": "opencode",
+      "probe": ["opencode"],
+      "npm": ["cli"],
+      "configs": [
+        {
+          "file": "~/.config/opencode/opencode.json",
+          "section": "mcp",
+          "strategy": "json",
+          "entry": { "type": "remote", "url": "{url}", "enabled": true }
+        }
+      ],
+      "skill": "~/.config/opencode/skills",
+      "os": ["win32", "darwin", "linux"]
+    },
+    {
+      "id": "kimi-code",
+      "probe": ["kimi"],
+      "configs": [
+        {
+          "file": "~/.kimi-code/mcp.json",
+          "section": "mcpServers",
+          "strategy": "json",
+          "entry": { "transport": "http", "url": "{url}", "startupTimeoutMs": 30000, "toolTimeoutMs": 120000 }
+        }
+      ],
+      "skill": "~/.kimi-code/skills",
+      "os": ["win32", "darwin", "linux"]
+    },
+    {
+      "id": "gemini-cli",
+      "probe": ["gemini"],
+      "configs": [
+        {
+          "file": "~/.gemini/settings.json",
+          "section": "mcpServers",
+          "strategy": "json",
+          "entry": { "type": "http", "url": "{url}" }
+        }
+      ],
+      "skill": "~/.gemini/skills",
+      "os": ["win32", "darwin", "linux"]
+    },
+    {
+      "id": "codex",
+      "probe": ["codex"],
+      "npm": ["codex"],
+      "configs": [
+        {
+          "file": "~/.codex/config.toml",
+          "section": null,
+          "strategy": "toml",
+          "entry": null
+        }
+      ],
+      "skill": "~/.codex/skills",
+      "os": ["win32", "darwin", "linux"]
+    },
+    {
+      "id": "zcode",
+      "probe": [],
+      "configs": [
+        {
+          "file": "~/.zcode/cli/config.json",
+          "section": "mcp.servers",
+          "strategy": "json",
+          "entry": { "type": "remote", "url": "{url}", "enabled": true }
+        }
+      ],
+      "skill": "~/.zcode/skills",
+      "os": ["win32", "darwin", "linux"]
+    },
+    {
+      "id": "dsh",
+      "probe": [],
+      "configs": [
+        {
+          "file": "~/.dsh/profiles/*/cordis.patch.yml",
+          "section": null,
+          "strategy": "dsh",
+          "entry": null
+        }
+      ],
+      "skill": "~/.dsh/skills",
+      "os": ["win32", "darwin", "linux"]
+    },
+    {
+      "id": "claude",
+      "probe": ["claude"],
+      "npm": ["claude-code"],
+      "configs": [],
+      "skill": "~/.claude/skills",
+      "os": ["win32", "darwin", "linux"]
+    },
+    {
+      "id": "qwen-code",
+      "probe": ["qwen"],
+      "npm": ["qwen-code"],
+      "configs": [
+        {
+          "file": "~/.qwen/settings.json",
+          "section": "mcpServers",
+          "strategy": "json",
+          "entry": { "httpUrl": "{url}" }
+        }
+      ],
+      "skill": null,
+      "os": ["win32", "darwin", "linux"]
+    },
+    {
+      "id": "pi",
+      "probe": ["pi"],
+      "npm": ["pi-coding-agent"],
+      "configs": [],
+      "skill": null,
+      "os": ["win32", "darwin", "linux"]
+    },
+    {
+      "id": "cursor",
+      "probe": ["cursor", "cursor-agent"],
+      "npm": ["cursor"],
+      "configs": [
+        {
+          "file": "~/.cursor/mcp.json",
+          "section": "mcpServers",
+          "strategy": "json",
+          "entry": { "url": "{url}" }
+        }
+      ],
+      "skill": null,
+      "os": ["win32", "darwin", "linux"]
+    },
+    {
+      "id": "qoder",
+      "probe": ["qoder"],
+      "npm": ["qoder"],
+      "configs": [],
+      "skill": null,
+      "os": ["win32", "darwin", "linux"]
+    },
+    {
+      "id": "codebuddy",
+      "probe": ["codebuddy"],
+      "npm": ["codebuddy"],
+      "configs": [],
+      "skill": null,
+      "os": ["win32", "darwin", "linux"]
+    },
+    {
+      "id": "claude-desktop",
+      "probe": [],
+      "configs": [
+        {
+          "file": "~/Library/Application Support/Claude/claude_desktop_config.json",
+          "section": "mcpServers",
+          "strategy": "json",
+          "entry": { "url": "{url}", "type": "streamable-http" }
+        }
+      ],
+      "skill": null,
+      "os": ["darwin"]
+    }
+  ]
+}

package/lib/cli.js

@@ -1334,7 +1334,7 @@ function readBody(req) {
 
 // src/index.ts
 var SERVER_NAME = "agent-comm-hub";
-var SERVER_VERSION = "0.3.0";
+var SERVER_VERSION = "0.4.0";
 var DEFAULT_HOST = "127.0.0.1";
 var DEFAULT_PORT = 18764;
 var DEFAULT_PATH = "/mcp";
@@ -1410,15 +1410,190 @@ function startHub(config = {}, log2 = console) {
 }
 
 // src/setup.ts
-import { copyFile, mkdir, readFile, readdir, writeFile } from "node:fs/promises";
-import { existsSync } from "node:fs";
+import { copyFile, mkdir, readFile, writeFile } from "node:fs/promises";
+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((os2) => !["win32", "darwin", "linux"].includes(os2)))) {
+      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" };
+  });
+}
+function runDiscover(options = {}) {
+  const log2 = options.log ?? ((message) => console.log(message));
+  const found = discover(loadRegistry(), options);
+  log2("discovered agents:");
+  for (const agent of found) {
+    const status = agent.present ? agent.source : "not installed";
+    const files = agent.configFiles.length > 0 ? ` \u2014 ${agent.configFiles.join(", ")}` : "";
+    log2(`  ${agent.id.padEnd(16)} ${status}${files}`);
+  }
+  return found;
+}
+
+// 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();
@@ -1426,7 +1601,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) {
@@ -1434,7 +1609,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) {
@@ -1455,7 +1630,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);
@@ -1477,7 +1652,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");
@@ -1515,7 +1690,7 @@ ${DSH_PATCH_MARKER} (installed by \`agent-comm-hub setup\`; undo with \`setup --
 `;
 }
 async function mergeDshPatch(file, opts) {
-  if (!existsSync(file)) return "skipped";
+  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));
@@ -1565,29 +1740,40 @@ async function mergeDshPatch(file, opts) {
 }
 async function syncSkill(skillDir, skillSrc, remove, log2) {
   if (remove) {
-    if (existsSync(skillDir)) {
-      await mkdir(dirname(skillDir), { recursive: true });
+    if (existsSync2(skillDir)) {
+      await mkdir(dirname2(skillDir), { recursive: true });
       await rmRecursive(skillDir);
       log2(`  skill removed: ${skillDir}`);
     }
     return;
   }
-  if (!existsSync(skillSrc)) {
+  if (!existsSync2(skillSrc)) {
     log2(`  SKILL.md source missing: ${skillSrc} (skipped)`);
     return;
   }
   await mkdir(skillDir, { recursive: true });
-  await copyFile(skillSrc, join(skillDir, "SKILL.md"));
-  log2(`  skill -> ${join(skillDir, "SKILL.md")}`);
+  await copyFile(skillSrc, join2(skillDir, "SKILL.md"));
+  log2(`  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 log2 = options.log ?? ((message) => console.log(message));
@@ -1597,65 +1783,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}`);
-      log2(`  ${target.label}: SKIPPED \u2014 ${error.message}`);
-    }
-  }
-  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}`);
-    log2(`  codex: SKIPPED \u2014 ${error.message}`);
-  }
-  const dshProfilesDir = join(home, ".dsh", "profiles");
-  if (existsSync(dshProfilesDir)) {
-    let entries = [];
-    try {
-      entries = await readdir(dshProfilesDir, { withFileTypes: true });
-    } catch (error) {
-      summary.errors.push(`dsh profiles scan \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) {
+      log2(`agent '${only}' is not in the registry (see agents/registry.json)`);
+    } else {
+      targetAgents = [match];
+      log2(`configure only: ${only}`);
     }
-    for (const entry of entries) {
-      if (!entry.isDirectory()) continue;
-      const patch = join(dshProfilesDir, entry.name, "cordis.patch.yml");
-      try {
-        const status = await mergeDshPatch(patch, { serverName, url, remove });
-        record(status, `dsh (${entry.name})`, patch);
-      } catch (error) {
-        summary.errors.push(`dsh (${entry.name}): ${patch} \u2014 ${error.message}`);
-        log2(`  dsh (${entry.name}): SKIPPED \u2014 ${error.message}`);
+  } else {
+    targetAgents = found.filter((agent) => agent.present).map((agent) => registry.agents.find((entry) => entry.id === agent.id));
+    const present2 = targetAgents.map((agent) => agent.id);
+    log2(`discovered: ${present2.length > 0 ? present2.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}`);
+          log2(`  ${agent.id}: 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
-    join(home, ".dsh", "skills", serverName)
-    // DSH skill (config auto-installed)
-  ];
+  const skillDirs = [join2(home, ".agents", "skills", serverName)];
+  for (const agent of targetAgents) {
+    if (agent.skill !== null) skillDirs.push(join2(expandHome(agent.skill, home), serverName));
+  }
   for (const dir of skillDirs) {
     try {
       await syncSkill(dir, skillSrc, remove, log2);
@@ -1670,12 +1831,12 @@ async function runSetup(options = {}) {
 }
 
 // src/ops.ts
-import { execFileSync } from "node:child_process";
+import { execFileSync as execFileSync2 } from "node:child_process";
 import { request } from "node:http";
-import { mkdirSync, readFileSync, rmSync, writeFileSync } 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";
+import { mkdirSync, readFileSync as readFileSync2, rmSync, writeFileSync } from "node:fs";
+import { homedir as homedir3 } from "node:os";
+import { dirname as dirname3, join as join3 } from "node:path";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 async function runStatus(options = {}) {
   const host = options.host ?? "127.0.0.1";
   const port = options.port ?? 18764;
@@ -1727,8 +1888,8 @@ async function runStatus(options = {}) {
 function runUpdate() {
   const messages = [];
   try {
-    const pkgFile = join2(dirname2(fileURLToPath2(import.meta.url)), "..", "package.json");
-    const before = JSON.parse(readFileSync(pkgFile, "utf8")).version ?? "?";
+    const pkgFile = join3(dirname3(fileURLToPath3(import.meta.url)), "..", "package.json");
+    const before = JSON.parse(readFileSync2(pkgFile, "utf8")).version ?? "?";
     messages.push(`current version: ${before}`);
     const script = [
       "import { execFileSync } from 'node:child_process'",
@@ -1744,7 +1905,7 @@ function runUpdate() {
       "if (after === before) console.log('already up to date (v' + after + ')')",
       "else console.log('updated: v' + before + ' -> v' + after)"
     ].join("\n");
-    const out = execFileSync(process.execPath, ["--input-type=module", "-e", script], { encoding: "utf8", windowsHide: true });
+    const out = execFileSync2(process.execPath, ["--input-type=module", "-e", script], { encoding: "utf8", windowsHide: true });
     messages.push(out.trim());
     messages.push("restart the hub (agent-comm-hub) to pick up the new version");
     return { ok: true, messages };
@@ -1753,14 +1914,14 @@ function runUpdate() {
   }
 }
 function cliPath() {
-  return fileURLToPath2(import.meta.url);
+  return fileURLToPath3(import.meta.url);
 }
 function nodeExe() {
   return process.execPath;
 }
 function run(command, args, dryRun) {
   if (dryRun) return `[dry-run] ${command} ${args.join(" ")}`;
-  return execFileSync(command, args, { encoding: "utf8", windowsHide: true }).trim();
+  return execFileSync2(command, args, { encoding: "utf8", windowsHide: true }).trim();
 }
 function runService(options) {
   const messages = [];
@@ -1768,11 +1929,12 @@ function runService(options) {
   const host = options.host ?? "127.0.0.1";
   const path2 = options.path ?? "/mcp";
   const dryRun = options.dryRun === true;
+  const platform = options.platform ?? process.platform;
   try {
-    if (process.platform === "win32") {
-      const appData = process.env.APPDATA ?? join2(homedir2(), "AppData", "Roaming");
-      const launcherDir = join2(appData, "agent-comm-hub");
-      const vbs = join2(launcherDir, "agent-comm-hub.vbs");
+    if (platform === "win32") {
+      const appData = process.env.APPDATA ?? join3(homedir3(), "AppData", "Roaming");
+      const launcherDir = join3(appData, "agent-comm-hub");
+      const vbs = join3(launcherDir, "agent-comm-hub.vbs");
       const runKey = "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run";
       const valueName = "agent-comm-hub";
       if (options.action === "install") {
@@ -1785,7 +1947,7 @@ function runService(options) {
         } else {
           mkdirSync(launcherDir, { recursive: true });
           writeFileSync(vbs, vbsContent);
-          execFileSync("reg", ["add", runKey, "/v", valueName, "/t", "REG_SZ", "/d", `wscript.exe "${vbs}"`, "/f"], { encoding: "utf8", windowsHide: true });
+          execFileSync2("reg", ["add", runKey, "/v", valueName, "/t", "REG_SZ", "/d", `wscript.exe "${vbs}"`, "/f"], { encoding: "utf8", windowsHide: true });
           messages.push(`auto-start registered: HKCU Run '${valueName}' -> hidden wscript launcher "${vbs}"`);
           messages.push(`start it now with: wscript.exe "${vbs}"`);
         }
@@ -1795,7 +1957,7 @@ function runService(options) {
           messages.push(`[dry-run] del ${vbs}`);
         } else {
           try {
-            execFileSync("reg", ["delete", runKey, "/v", valueName, "/f"], { encoding: "utf8", windowsHide: true });
+            execFileSync2("reg", ["delete", runKey, "/v", valueName, "/f"], { encoding: "utf8", windowsHide: true });
           } catch {
           }
           rmSync(launcherDir, { recursive: true, force: true });
@@ -1804,9 +1966,9 @@ function runService(options) {
       }
       return { ok: true, messages };
     }
-    if (process.platform === "linux") {
-      const unitDir = join2(homedir2(), ".config", "systemd", "user");
-      const unitFile = join2(unitDir, "agent-comm-hub.service");
+    if (platform === "linux") {
+      const unitDir = join3(homedir3(), ".config", "systemd", "user");
+      const unitFile = join3(unitDir, "agent-comm-hub.service");
       if (options.action === "install") {
         const unit = `[Unit]
 Description=agent-comm-hub (multi-peer MCP hub)
@@ -1841,7 +2003,72 @@ WantedBy=default.target
       }
       return { ok: true, messages };
     }
-    return { ok: false, messages: [`auto-start is not implemented for ${process.platform} \u2014 use pm2 or your platform's supervisor`] };
+    if (platform === "darwin") {
+      const launchAgentsDir = join3(homedir3(), "Library", "LaunchAgents");
+      const label = "com.agent-comm-hub";
+      const plist = join3(launchAgentsDir, `${label}.plist`);
+      const logFile = join3(homedir3(), "Library", "Logs", "agent-comm-hub.log");
+      const uid = typeof process.getuid === "function" ? process.getuid() : 0;
+      const plistContent = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>${label}</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>${nodeExe()}</string>
+    <string>${cliPath()}</string>
+    <string>--host</string><string>${host}</string>
+    <string>--port</string><string>${port}</string>
+    <string>--path</string><string>${path2}</string>
+  </array>
+  <key>RunAtLoad</key>
+  <true/>
+  <key>KeepAlive</key>
+  <true/>
+  <key>StandardOutPath</key>
+  <string>${logFile}</string>
+  <key>StandardErrorPath</key>
+  <string>${logFile}</string>
+</dict>
+</plist>
+`;
+      if (options.action === "install") {
+        if (dryRun) {
+          messages.push(`[dry-run] write ${plist}`);
+          messages.push(`[dry-run] launchctl bootstrap gui/${uid} ${plist}`);
+        } else {
+          mkdirSync(launchAgentsDir, { recursive: true });
+          writeFileSync(plist, plistContent);
+          try {
+            execFileSync2("launchctl", ["bootstrap", `gui/${uid}`, plist], { encoding: "utf8", windowsHide: true });
+          } catch {
+            execFileSync2("launchctl", ["load", "-w", plist], { encoding: "utf8", windowsHide: true });
+          }
+          messages.push(`auto-start registered: launchd LaunchAgent ${plist}`);
+          messages.push(`start it now with: launchctl bootstrap gui/${uid} ${plist}`);
+        }
+      } else {
+        if (dryRun) {
+          messages.push(`[dry-run] launchctl bootout gui/${uid}/${label}`);
+          messages.push(`[dry-run] rm ${plist}`);
+        } else {
+          try {
+            execFileSync2("launchctl", ["bootout", `gui/${uid}/${label}`], { encoding: "utf8", windowsHide: true });
+          } catch {
+            try {
+              execFileSync2("launchctl", ["unload", "-w", plist], { encoding: "utf8", windowsHide: true });
+            } catch {
+            }
+          }
+          rmSync(plist, { force: true });
+          messages.push("auto-start removed (launchd LaunchAgent)");
+        }
+      }
+      return { ok: true, messages };
+    }
+    return { ok: false, messages: [`auto-start is not implemented for ${platform} \u2014 use pm2 or your platform's supervisor`] };
   } catch (error) {
     return { ok: false, messages: [`${error.message}`] };
   }
@@ -1851,7 +2078,7 @@ WantedBy=default.target
 function parseArgs(argv) {
   const args = {};
   const numeric = /* @__PURE__ */ new Set(["--port", "--max-queue", "--history-limit", "--wait-timeout-ms", "--default-wait-ms", "--connected-window-ms", "--peer-idle-timeout-ms", "--herdr-timeout-ms"]);
-  const string = /* @__PURE__ */ new Set(["--host", "--path", "--url", "--server-name", "--herdr-bin"]);
+  const string = /* @__PURE__ */ new Set(["--host", "--path", "--url", "--server-name", "--agent", "--herdr-bin"]);
   for (let i = 0; i < argv.length; i++) {
     const flag = argv[i];
     if (flag === "--help" || flag === "-h" || flag === "--version" || flag === "-V") {
@@ -1887,10 +2114,13 @@ Usage:
                                            every installed agent (incremental,
                                            idempotent; --remove undoes)
   agent-comm-hub status [options]          show hub health + online peers
+  agent-comm-hub discover                  list installed agents (registry-
+                                           driven; no config changes)
   agent-comm-hub service install|uninstall [options]
                                            one-shot auto-start (Windows Run
                                            key + hidden VBS launcher, no admin;
-                                           Linux systemd; --dry-run prints)
+                                           Linux systemd, macOS launchd;
+                                           --dry-run prints)
   agent-comm-hub update                  self-update from the npm registry
                                            (files updated in place; restart
                                            the hub afterwards)
@@ -1912,6 +2142,7 @@ Hub options:
 Setup options:
   --url <url>              Hub endpoint to register (default http://127.0.0.1:18764/mcp)
   --server-name <name>     Config key (default agent-hub)
+  --agent <id>             Only configure one registry agent (e.g. codex)
   --remove                 Uninstall instead of install
 
   -h, --help               Show this help
@@ -1936,11 +2167,16 @@ try {
     await runSetup({
       url: args2["--url"],
       serverName: args2["--server-name"],
+      agent: args2["--agent"],
       remove: args2["--remove"] === true,
       log: (message) => log.info(message)
     });
     process.exit(0);
   }
+  if (command === "discover") {
+    runDiscover({ log: (message) => log.info(message) });
+    process.exit(0);
+  }
   if (command === "status") {
     const args2 = parseArgs(rest);
     const result = await runStatus({

package/lib/index.js

@@ -1337,7 +1337,7 @@ function readBody(req) {
 
 // src/index.ts
 var SERVER_NAME = "agent-comm-hub";
-var SERVER_VERSION = "0.3.0";
+var SERVER_VERSION = "0.4.0";
 var DEFAULT_HOST = "127.0.0.1";
 var DEFAULT_PORT = 18764;
 var DEFAULT_PATH = "/mcp";

package/lib/setup.js

@@ -1,13 +1,177 @@
 // src/setup.ts
-import { copyFile, mkdir, readFile, readdir, writeFile } from "node:fs/promises";
-import { existsSync } from "node:fs";
+import { copyFile, mkdir, readFile, writeFile } from "node:fs/promises";
+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");
@@ -104,7 +268,7 @@ ${DSH_PATCH_MARKER} (installed by \`agent-comm-hub setup\`; undo with \`setup --
 `;
 }
 async function mergeDshPatch(file, opts) {
-  if (!existsSync(file)) return "skipped";
+  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));
@@ -154,29 +318,40 @@ async function mergeDshPatch(file, opts) {
 }
 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));
@@ -186,65 +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"}`);
   }
-  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 dshProfilesDir = join(home, ".dsh", "profiles");
-  if (existsSync(dshProfilesDir)) {
-    let entries = [];
-    try {
-      entries = await readdir(dshProfilesDir, { withFileTypes: true });
-    } catch (error) {
-      summary.errors.push(`dsh profiles scan \u2014 ${error.message}`);
-    }
-    for (const entry of entries) {
-      if (!entry.isDirectory()) continue;
-      const patch = join(dshProfilesDir, entry.name, "cordis.patch.yml");
-      try {
-        const status = await mergeDshPatch(patch, { serverName, url, remove });
-        record(status, `dsh (${entry.name})`, patch);
-      } catch (error) {
-        summary.errors.push(`dsh (${entry.name}): ${patch} \u2014 ${error.message}`);
-        log(`  dsh (${entry.name}): SKIPPED \u2014 ${error.message}`);
+  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 = [
-    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
-    join(home, ".dsh", "skills", serverName)
-    // DSH skill (config auto-installed)
-  ];
+  const skillDirs = [join2(home, ".agents", "skills", serverName)];
+  for (const agent of targetAgents) {
+    if (agent.skill !== null) skillDirs.push(join2(expandHome(agent.skill, home), serverName));
+  }
   for (const dir of skillDirs) {
     try {
       await syncSkill(dir, skillSrc, remove, log);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-comm-hub",
-  "version": "0.3.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 && esbuild test/herdr-entry.ts --bundle --platform=node --format=esm --outfile=test/herdr-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 && node test/herdr.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"