agent-comm-hub 0.9.0 → 0.10.0

package/lib/setup.js

@@ -11,6 +11,16 @@ import { existsSync, readdirSync, accessSync, readFileSync, constants as fsConst
 import { homedir } from "node:os";
 import { dirname, join, sep } from "node:path";
 import { fileURLToPath } from "node:url";
+var CREDENTIAL_FILES = [
+  "~/.claude.json",
+  "~/.dsh/.credentials.yaml",
+  "~/.dsh/settings.yaml",
+  "~/.codex/auth.json",
+  "~/.qwen/mcp-oauth-tokens.json"
+];
+function configsForPlatform(agent, platform) {
+  return agent.configs.filter((config) => config.os === void 0 || config.os.includes(platform));
+}
 function registryFile() {
   return join(dirname(fileURLToPath(import.meta.url)), "..", "agents", "registry.json");
 }
@@ -25,6 +35,9 @@ function expandConfigFile(file, home) {
   const suffix = expanded.slice(star + 1);
   const base = prefix.slice(0, prefix.lastIndexOf(sep));
   if (!existsSync(base)) return [];
+  if (suffix.startsWith(sep) === false) {
+    return readdirSync(base, { withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(suffix)).map((entry) => join(base, entry.name));
+  }
   return readdirSync(base, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => join(base, entry.name, suffix));
 }
 function validateRegistry(registry) {
@@ -38,6 +51,17 @@ function validateRegistry(registry) {
     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 (agent.probePaths !== void 0) {
+      if (!Array.isArray(agent.probePaths)) throw new Error(`registry: ${agent.id}: probePaths must be an array`);
+      for (const probePath of agent.probePaths) {
+        if (typeof probePath !== "string" || !probePath.startsWith("~/")) {
+          throw new Error(`registry: ${agent.id}: probePath must be '~'-relative`);
+        }
+        if (probePath.split("/").includes("..")) {
+          throw new Error(`registry: ${agent.id}: probePath must not contain '..'`);
+        }
+      }
+    }
     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("~/")) {
@@ -49,14 +73,23 @@ function validateRegistry(registry) {
       if (config.file.split("*").length > 2) {
         throw new Error(`registry: ${agent.id}: at most one '*' segment allowed`);
       }
-      if (!["json", "toml", "dsh"].includes(config.strategy)) {
+      if (!["json", "toml", "dsh", "yaml-array"].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.os !== void 0 && (!Array.isArray(config.os) || config.os.length === 0 || config.os.some((entry) => !["win32", "darwin", "linux"].includes(entry)))) {
+        throw new Error(`registry: ${agent.id}: invalid config os list`);
       }
-      if (config.strategy !== "json" && config.entry !== null) {
-        throw new Error(`registry: ${agent.id}: only json strategy may carry an entry`);
+      if (CREDENTIAL_FILES.includes(config.file)) {
+        throw new Error(
+          `registry: ${agent.id}: ${config.file} holds credentials and must never be written \u2014 point the record at a separate MCP config file, or leave the agent manual (AGENTS.md invariant 6)`
+        );
+      }
+      const keyed = config.strategy === "json" || config.strategy === "yaml-array";
+      if (keyed && (typeof config.section !== "string" || config.entry === null)) {
+        throw new Error(`registry: ${agent.id}: ${config.strategy} strategy needs a section and an entry`);
+      }
+      if (!keyed && config.entry !== null) {
+        throw new Error(`registry: ${agent.id}: only json/yaml-array strategy may carry an entry`);
       }
     }
     if (agent.skill !== null && (typeof agent.skill !== "string" || !agent.skill.startsWith("~/"))) {
@@ -152,21 +185,25 @@ function discover(registry, options = {}) {
   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 config of configsForPlatform(agent, platform)) {
       for (const file of expandConfigFile(config.file, home)) {
-        if (existsSync(file)) {
-          configFiles.push(file);
-          if (source === "none") source = "config";
-        }
+        if (existsSync(file)) configFiles.push(file);
       }
     }
-    if (source === "none" && agent.probe.some((command) => commandOnPath(command, pathEnv, pathext, platform))) {
+    let installed = false;
+    if (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)))) {
+      installed = true;
+    } else if (npmNames !== null && (agent.probe.some((command) => npmNames.includes(command)) || (agent.npm ?? []).some((name) => npmNames.includes(name)))) {
       source = "npm";
+      installed = true;
+    } else if ((agent.probePaths ?? []).some((probePath) => existsSync(expandHome(probePath, home)))) {
+      source = "probe-path";
+      installed = true;
     }
-    return { id: agent.id, source, configFiles, present: source !== "none" };
+    const configOnly = !installed && configFiles.length > 0;
+    if (!installed && configOnly) source = "config";
+    return { id: agent.id, source, configFiles, present: installed, configOnly };
   });
 }
 
@@ -210,6 +247,19 @@ function resolveSection(doc, section) {
   }
   return node;
 }
+function sameJson(a, b) {
+  if (a === b) return true;
+  if (typeof a !== "object" || typeof b !== "object" || a === null || b === null) return false;
+  if (Array.isArray(a) !== Array.isArray(b)) return false;
+  if (Array.isArray(a) && Array.isArray(b)) {
+    return a.length === b.length && a.every((item, index) => sameJson(item, b[index]));
+  }
+  const left = a;
+  const right = b;
+  const leftKeys = Object.keys(left);
+  if (leftKeys.length !== Object.keys(right).length) return false;
+  return leftKeys.every((key) => Object.prototype.hasOwnProperty.call(right, key) && sameJson(left[key], right[key]));
+}
 async function mergeJsonServer(file, section, entry, opts) {
   if (!existsSync2(file)) return "skipped";
   const doc = await readJson(file);
@@ -223,10 +273,7 @@ async function mergeJsonServer(file, section, entry, opts) {
     await writeJsonNoBom(file, doc);
     return "removed";
   }
-  if (has) {
-    const existing = servers[opts.serverName];
-    if (existing?.url === opts.url) return "unchanged";
-  }
+  if (has && sameJson(servers[opts.serverName], entry)) return "unchanged";
   servers[opts.serverName] = entry;
   await backup(file);
   await writeJsonNoBom(file, doc);
@@ -237,19 +284,25 @@ async function mergeTomlSection(file, opts) {
   const text = await readFile(file, "utf8");
   const marker = `[mcp_servers.${opts.serverName}]`;
   const markerRe = new RegExp(`^\\[mcp_servers\\.${escapeRegExp(opts.serverName)}\\]`, "m");
+  const sectionRe = new RegExp(`^\\[mcp_servers\\.${escapeRegExp(opts.serverName)}\\][^\\r\\n]*(\\r?\\n(?!\\[).*)*(\\r?\\n)?`, "m");
   if (opts.remove) {
     if (!markerRe.test(text)) return "absent";
-    const cleaned = text.replace(new RegExp(`^\\[mcp_servers\\.${escapeRegExp(opts.serverName)}\\][^\\r\\n]*(\\r?\\n(?!\\[).*)*(\\r?\\n)?`, "m"), "");
+    const cleaned = text.replace(sectionRe, "");
     await backup(file);
     await writeFile(file, cleaned, "utf8");
     return "removed";
   }
-  if (markerRe.test(text)) return "unchanged";
   const block = `
 ${marker}
 type = "streamable-http"
 url = "${opts.url}"
 `;
+  if (markerRe.test(text)) {
+    if (text.includes(block.trimStart())) return "unchanged";
+    await backup(file);
+    await writeFile(file, text.replace(sectionRe, "").trimEnd() + block, "utf8");
+    return "changed";
+  }
   await backup(file);
   await writeFile(file, text.trimEnd() + block, "utf8");
   return "changed";
@@ -312,6 +365,82 @@ async function mergeDshPatch(file, opts) {
   await writeFile(file, withoutHubEntries().trimEnd() + dshPatchBlock(opts.url, opts.serverName), "utf8");
   return "changed";
 }
+async function mergeYamlArrayServer(file, opts) {
+  if (!existsSync2(file)) return "skipped";
+  const text = await readFile(file, "utf8");
+  const lines = text.split("\n");
+  const keyIndex = lines.findIndex((line) => /^mcpServers:\s*(#.*)?$/.test(line));
+  const inlineKey = lines.findIndex((line) => /^mcpServers:\s*\S/.test(line));
+  if (keyIndex === -1) {
+    if (inlineKey !== -1) return "unrecognized";
+  }
+  const blockEnd = (from) => {
+    for (let i = from + 1; i < lines.length; i++) {
+      const line = lines[i];
+      if (line.trim() === "" || line.startsWith("#")) continue;
+      if (!/^\s/.test(line)) return i;
+    }
+    return lines.length;
+  };
+  const items = (from, to2) => {
+    const starts = [];
+    for (let i = from; i < to2; i++) {
+      if (/^\s*-\s/.test(lines[i])) starts.push(i);
+    }
+    return starts.map((start, k) => ({ start, end: k + 1 < starts.length ? starts[k + 1] : to2 }));
+  };
+  const isOurs = (item) => lines.slice(item.start, item.end).some((line) => new RegExp(`^\\s*-?\\s*name:\\s*${opts.serverName}\\s*$`).test(line));
+  if (keyIndex === -1) {
+    if (opts.remove) return "absent";
+    await backup(file);
+    const block = `mcpServers:
+${yamlArrayItem(opts.serverName, opts.url, opts.entry, "  ")}`;
+    await writeFile(file, `${text.replace(/\n*$/, "")}
+${block}
+`, "utf8");
+    return "changed";
+  }
+  const to = blockEnd(keyIndex);
+  const ours = items(keyIndex + 1, to).filter(isOurs);
+  const all = items(keyIndex + 1, to);
+  const bodyLines = lines.slice(keyIndex + 1, to).filter((line) => line.trim() !== "" && !line.trim().startsWith("#"));
+  if (all.length === 0 && bodyLines.length > 0) return "unrecognized";
+  const indent = ours.length > 0 ? lines[ours[0].start].match(/^(\s*)/)?.[1] ?? "  " : all.length > 0 ? lines[all[0].start].match(/^(\s*)/)?.[1] ?? "  " : "  ";
+  if (opts.remove) {
+    if (ours.length === 0) return "absent";
+    await backup(file);
+    const out2 = lines.slice();
+    for (const item of ours.reverse()) out2.splice(item.start, item.end - item.start);
+    await writeFile(file, out2.join("\n"), "utf8");
+    return "removed";
+  }
+  const wanted = yamlArrayItem(opts.serverName, opts.url, opts.entry, indent);
+  if (ours.length === 1 && lines.slice(ours[0].start, ours[0].end).join("\n").trimEnd() === wanted.trimEnd()) {
+    return "unchanged";
+  }
+  await backup(file);
+  const out = lines.slice();
+  const first = ours[0]?.start ?? to;
+  for (const item of ours.reverse()) out.splice(item.start, item.end - item.start);
+  const insertAt = ours.length > 0 ? first : to;
+  out.splice(insertAt, 0, ...wanted.replace(/\n$/, "").split("\n"));
+  await writeFile(file, out.join("\n"), "utf8");
+  return "changed";
+}
+function yamlArrayItem(serverName, url, entry, indent) {
+  const substituted = substitute(entry, { url, serverName });
+  const keys = Object.entries(substituted);
+  const inner = `${indent}  `;
+  const head = `${indent}- name: ${serverName}
+`;
+  return head + keys.map(([key, value]) => `${inner}${key}: ${yamlScalar(value)}
+`).join("");
+}
+function yamlScalar(value) {
+  if (typeof value === "number" || typeof value === "boolean") return String(value);
+  const text = String(value ?? "");
+  return /^[A-Za-z0-9._/:@-]+$/.test(text) ? text : JSON.stringify(text);
+}
 async function syncSkill(skillDir, skillSrc, remove, log) {
   if (remove) {
     if (existsSync2(skillDir)) {
@@ -351,13 +480,14 @@ async function runSetup(options = {}) {
   const skillSrc = options.skillSrc ?? defaultSkillSrc();
   const remove = options.remove === true;
   const log = options.log ?? ((message) => console.log(message));
-  const summary = { done: [], unchanged: [], skipped: [], errors: [] };
+  const summary = { done: [], unchanged: [], skipped: [], refused: [], errors: [] };
   const record = (status, label, file) => {
     if (status === "changed" || status === "removed") summary.done.push(`${label}: ${file}`);
     else if (status === "unchanged" || status === "absent") summary.unchanged.push(`${label}: ${file}`);
     else if (status === "skipped") summary.skipped.push(`${label}: ${file}`);
+    else if (status === "unrecognized") summary.refused.push(`${label}: ${file}`);
   };
-  const registry = loadRegistry();
+  const registry = loadRegistry(options.registryFile);
   const found = discover(registry, { homeDir: home, pathEnv: options.pathEnv, noNpm: options.noNpm === true });
   const only = options.agent;
   let targetAgents = [];
@@ -370,16 +500,43 @@ async function runSetup(options = {}) {
       log(`configure only: ${only}`);
     }
   } else {
-    targetAgents = found.filter((agent) => agent.present).map((agent) => registry.agents.find((entry) => entry.id === agent.id));
+    const installed = found.filter((agent) => agent.present);
+    targetAgents = installed.map((agent) => registry.agents.find((entry) => entry.id === agent.id));
+    const configOnly = found.filter((agent) => agent.configOnly);
+    if (options.force === true) {
+      for (const agent of configOnly) {
+        const entry = registry.agents.find((candidate) => candidate.id === agent.id);
+        if (entry !== void 0 && !targetAgents.includes(entry)) targetAgents.push(entry);
+      }
+    } else if (configOnly.length > 0) {
+      for (const agent of configOnly) {
+        summary.skipped.push(`${agent.id}: config-only (${agent.configFiles[0]}) \u2014 agent not installed; use --force or --agent ${agent.id}`);
+      }
+      log(`skipped (config-only, agent not installed): ${configOnly.map((agent) => agent.id).join(", ")} \u2014 use --force to configure anyway`);
+    }
     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 config of configsForPlatform(agent, process.platform)) {
       const nameFor = config.serverName ?? agent.serverName ?? serverName;
       for (const file of expandConfigFile(config.file, home)) {
         try {
-          const status = config.strategy === "json" ? await mergeJsonServer(file, config.section, substitute(config.entry, { url, serverName: nameFor }), { serverName: nameFor, url, remove }) : config.strategy === "toml" ? await mergeTomlSection(file, { serverName: nameFor, url, remove }) : await mergeDshPatch(file, { serverName: nameFor, url, remove });
+          let status;
+          switch (config.strategy) {
+            case "json":
+              status = await mergeJsonServer(file, config.section, substitute(config.entry, { url, serverName: nameFor }), { serverName: nameFor, url, remove });
+              break;
+            case "toml":
+              status = await mergeTomlSection(file, { serverName: nameFor, url, remove });
+              break;
+            case "yaml-array":
+              status = await mergeYamlArrayServer(file, { serverName: nameFor, url, remove, entry: config.entry ?? {} });
+              break;
+            case "dsh":
+              status = await mergeDshPatch(file, { serverName: nameFor, url, remove });
+              break;
+          }
           record(status, agent.id, file);
         } catch (error) {
           summary.errors.push(`${agent.id}: ${file} \u2014 ${error.message}`);
@@ -388,7 +545,8 @@ async function runSetup(options = {}) {
       }
     }
   }
-  const skillDirs = [join2(home, ".agents", "skills", serverName)];
+  const skillDirs = [];
+  if (targetAgents.length > 0 || remove) skillDirs.push(join2(home, ".agents", "skills", serverName));
   for (const agent of targetAgents) {
     if (agent.skill !== null) skillDirs.push(join2(expandHome(agent.skill, home), serverName));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-comm-hub",
-  "version": "0.9.0",
+  "version": "0.10.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",