agentsmesh 0.13.0 → 0.15.0

package/dist/index.js

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { stringify, parse } from 'yaml';
 import { access, readdir, readFile, realpath, stat, rm, mkdir, lstat, unlink, writeFile, rename } from 'fs/promises';
 import { join, basename, dirname, relative, win32, posix, resolve, extname } from 'path';
-import { constants, existsSync, realpathSync, statSync } from 'fs';
+import { constants, existsSync, realpathSync, statSync, readFileSync } from 'fs';
 import { parse as parse$1 } from 'smol-toml';
 import { Buffer } from 'buffer';
 import { homedir } from 'os';
@@ -1385,12 +1385,12 @@ function topLevelDotfilePrefixes(descriptor19) {
     ...layouts.flatMap((l) => l.managedOutputs?.dirs ?? []),
     ...layouts.flatMap((l) => l.managedOutputs?.files ?? [])
   ];
-  const out = /* @__PURE__ */ new Set();
+  const out2 = /* @__PURE__ */ new Set();
   for (const candidate of candidates) {
     const top = candidate.split("/")[0];
-    if (top && top.startsWith(".") && top.length > 1) out.add(`${top}/`);
+    if (top && top.startsWith(".") && top.length > 1) out2.add(`${top}/`);
   }
-  return out;
+  return out2;
 }
 function buildDefaultRootRelativePrefixes() {
   const set = /* @__PURE__ */ new Set([".agentsmesh/"]);
@@ -2133,12 +2133,12 @@ async function readExistingServers(path) {
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
   const raw = parsed.mcpServers;
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
-  const out = {};
+  const out2 = {};
   for (const [name, value] of Object.entries(raw)) {
     if (!value || typeof value !== "object" || Array.isArray(value)) continue;
-    out[name] = value;
+    out2[name] = value;
   }
-  return out;
+  return out2;
 }
 var init_mcp_merge = __esm({
   "src/targets/import/mcp-merge.ts"() {
@@ -2421,13 +2421,13 @@ function parseMcpJson(content) {
   if (!parsed || typeof parsed !== "object") return {};
   const raw = parsed.mcpServers;
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
-  const out = {};
+  const out2 = {};
   for (const [name, value] of Object.entries(raw)) {
     if (!value || typeof value !== "object" || Array.isArray(value)) continue;
     const server = value;
     const description = typeof server.description === "string" ? server.description : void 0;
     if (typeof server.command === "string") {
-      out[name] = {
+      out2[name] = {
         type: typeof server.type === "string" ? server.type : "stdio",
         command: server.command,
         args: toStringArray5(server.args),
@@ -2437,7 +2437,7 @@ function parseMcpJson(content) {
       continue;
     }
     if (typeof server.url === "string") {
-      out[name] = {
+      out2[name] = {
         type: typeof server.type === "string" ? server.type : "http",
         url: server.url,
         headers: toStringRecord(server.headers),
@@ -2446,7 +2446,7 @@ function parseMcpJson(content) {
       };
     }
   }
-  return out;
+  return out2;
 }
 async function runMcpJson(spec, sources, projectRoot, fromTool) {
   if (!spec.canonicalFilename) {
@@ -10737,18 +10737,18 @@ function generateRules11(canonical) {
   return outputs;
 }
 function toJunieMcpServer(server) {
-  const out = {};
-  if (server.description) out.description = server.description;
-  if (server.type !== "stdio") out.type = server.type;
+  const out2 = {};
+  if (server.description) out2.description = server.description;
+  if (server.type !== "stdio") out2.type = server.type;
   if (isStdioMcpServer(server)) {
-    out.command = server.command;
-    out.args = server.args;
+    out2.command = server.command;
+    out2.args = server.args;
   } else {
-    out.url = server.url;
-    if (Object.keys(server.headers).length > 0) out.headers = server.headers;
+    out2.url = server.url;
+    if (Object.keys(server.headers).length > 0) out2.headers = server.headers;
   }
-  if (Object.keys(server.env).length > 0) out.env = server.env;
-  return out;
+  if (Object.keys(server.env).length > 0) out2.env = server.env;
+  return out2;
 }
 function generateMcp7(canonical) {
   if (!canonical.mcp || Object.keys(canonical.mcp.mcpServers).length === 0) return [];
@@ -12217,11 +12217,11 @@ var init_generator17 = __esm({
 });
 function toStringRecord2(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return {};
-  const out = {};
+  const out2 = {};
   for (const [k, v] of Object.entries(value)) {
-    if (typeof v === "string") out[k] = v;
+    if (typeof v === "string") out2[k] = v;
   }
-  return out;
+  return out2;
 }
 function parseOpenCodeMcp(content) {
   let parsed;
@@ -12233,12 +12233,12 @@ function parseOpenCodeMcp(content) {
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
   const raw = parsed.mcp;
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
-  const out = {};
+  const out2 = {};
   for (const [name, value] of Object.entries(raw)) {
     if (!value || typeof value !== "object" || Array.isArray(value)) continue;
     const entry = value;
     if (typeof entry.url === "string") {
-      out[name] = {
+      out2[name] = {
         type: "url",
         url: entry.url,
         headers: toStringRecord2(entry.headers),
@@ -12252,7 +12252,7 @@ function parseOpenCodeMcp(content) {
       const command = cmdArr[0];
       if (command === void 0) continue;
       const args = cmdArr.slice(1);
-      out[name] = {
+      out2[name] = {
         type: "stdio",
         command,
         args,
@@ -12261,7 +12261,7 @@ function parseOpenCodeMcp(content) {
       };
     }
   }
-  return out;
+  return out2;
 }
 async function importMcp4(projectRoot, scope, results) {
   const configFile = scope === "global" ? OPENCODE_GLOBAL_CONFIG_FILE : OPENCODE_CONFIG_FILE;
@@ -15219,13 +15219,13 @@ function resolveGeneratedOutputPath(target19, path, scope) {
   resolvedPath = layout.rewriteGeneratedPath ? layout.rewriteGeneratedPath(path) : path;
   return resolvedPath;
 }
-async function emitGeneratedOutput(results, target19, out, projectRoot, scope, options) {
-  const resolvedPath = resolveGeneratedOutputPath(target19, out.path, scope);
+async function emitGeneratedOutput(results, target19, out2, projectRoot, scope, options) {
+  const resolvedPath = resolveGeneratedOutputPath(target19, out2.path, scope);
   if (resolvedPath === null) return null;
   const existing = await readFileSafe(join(projectRoot, resolvedPath));
   const pendingIdx = results.findIndex((r) => r.path === resolvedPath && r.target === target19);
   const pendingResult = pendingIdx >= 0 ? results[pendingIdx] : void 0;
-  const content = options?.mergeContent?.(existing, pendingResult, out.content, resolvedPath) ?? out.content;
+  const content = options?.mergeContent?.(existing, pendingResult, out2.content, resolvedPath) ?? out2.content;
   if (pendingIdx >= 0) {
     results.splice(pendingIdx, 1);
   }
@@ -15251,8 +15251,8 @@ async function generateFeature(results, targets, canonical, projectRoot, enabled
     const gen = getGen(target19);
     if (!gen) continue;
     const ctx = featureContext(target19, feature, scope);
-    for (const out of gen(canonical, ctx)) {
-      const resolvedPath = await emitGeneratedOutput(results, target19, out, projectRoot, scope);
+    for (const out2 of gen(canonical, ctx)) {
+      const resolvedPath = await emitGeneratedOutput(results, target19, out2, projectRoot, scope);
       if (resolvedPath === null) continue;
       const layout = getTargetLayout(target19, scope);
       if (layout?.mirrorGlobalPath) {
@@ -15263,9 +15263,9 @@ async function generateFeature(results, targets, canonical, projectRoot, enabled
           results.push({
             target: target19,
             path: mirrorPath,
-            content: out.content,
+            content: out2.content,
             currentContent: existingMirror ?? void 0,
-            status: computeStatus6(existingMirror, out.content)
+            status: computeStatus6(existingMirror, out2.content)
           });
         }
       }
@@ -15316,8 +15316,8 @@ async function generatePermissionsFeature(results, targets, canonical, projectRo
   for (const target19 of targets) {
     const gen = resolveTargetFeatureGenerator(target19, "permissions", void 0, scope) ?? getDescriptor(target19)?.generators.generatePermissions;
     if (!gen) continue;
-    for (const out of gen(canonical)) {
-      await emitGeneratedOutput(results, target19, out, projectRoot, scope, {
+    for (const out2 of gen(canonical)) {
+      await emitGeneratedOutput(results, target19, out2, projectRoot, scope, {
         mergeContent: (existing, pending, newContent, resolvedPath) => mergeOutputContent(target19, existing, pending, newContent, resolvedPath)
       });
     }
@@ -15334,8 +15334,8 @@ async function generateHooksFeature(results, targets, canonical, projectRoot, sc
     if (post) {
       outputs = [...await post(projectRoot, canonical, outputs)];
     }
-    for (const out of outputs) {
-      await emitGeneratedOutput(results, target19, out, projectRoot, scope, {
+    for (const out2 of outputs) {
+      await emitGeneratedOutput(results, target19, out2, projectRoot, scope, {
         mergeContent: (existing, pending, newContent, resolvedPath) => mergeOutputContent(target19, existing, pending, newContent, resolvedPath)
       });
     }
@@ -15348,8 +15348,8 @@ async function generateScopedSettingsFeature(results, targets, canonical, projec
     if (!emit) continue;
     const outputs = emit(canonical, scope);
     if (outputs.length === 0) continue;
-    for (const out of outputs) {
-      await emitGeneratedOutput(results, target19, out, projectRoot, scope, {
+    for (const out2 of outputs) {
+      await emitGeneratedOutput(results, target19, out2, projectRoot, scope, {
         mergeContent: (existing, pending, newContent, resolvedPath) => mergeOutputContent(target19, existing, pending, newContent, resolvedPath)
       });
     }
@@ -15479,6 +15479,11 @@ var C = {
   cyan: "\x1B[36m",
   reset: "\x1B[0m"
 };
+function out(text) {
+  {
+    process.stdout.write(text);
+  }
+}
 function noColor() {
   return process.env.NO_COLOR !== void 0 && process.env.NO_COLOR !== "";
 }
@@ -15491,7 +15496,7 @@ function pad(str, width) {
 }
 var logger = {
   info(msg) {
-    process.stdout.write(c(C.cyan, msg) + "\n");
+    out(c(C.cyan, msg) + "\n");
   },
   warn(msg) {
     process.stderr.write(c(C.yellow, "\u26A0 ") + msg + "\n");
@@ -15500,11 +15505,11 @@ var logger = {
     process.stderr.write(c(C.red, "\u2717 ") + msg + "\n");
   },
   success(msg) {
-    process.stdout.write(c(C.green, "\u2713 ") + msg + "\n");
+    out(c(C.green, "\u2713 ") + msg + "\n");
   },
   debug(msg) {
     if (process.env.AGENTSMESH_DEBUG === "1") {
-      process.stdout.write(c(C.cyan, "[debug] ") + msg + "\n");
+      out(c(C.cyan, "[debug] ") + msg + "\n");
     }
   },
   table(rows) {
@@ -15520,13 +15525,13 @@ var logger = {
       widths[j] = max;
     }
     const border = "+" + widths.map((w) => "-".repeat(w + 2)).join("+") + "+";
-    process.stdout.write(border + "\n");
+    out(border + "\n");
     for (let i = 0; i < rows.length; i++) {
       const row = rows[i];
       const line = "| " + row.map((cell, j) => pad(cell, widths[j])).join(" | ") + " |";
-      process.stdout.write(line + "\n");
+      out(line + "\n");
     }
-    process.stdout.write(border + "\n");
+    out(border + "\n");
   }
 };
 
@@ -16412,12 +16417,60 @@ function parseServer(raw) {
     env
   };
 }
+function stripJsonComments(text) {
+  let result = "";
+  let i = 0;
+  const len = text.length;
+  while (i < len) {
+    const ch = text[i];
+    if (ch === '"') {
+      result += ch;
+      i++;
+      while (i < len) {
+        const sc = text[i];
+        result += sc;
+        if (sc === "\\") {
+          i++;
+          if (i < len) {
+            result += text[i];
+          }
+        } else if (sc === '"') {
+          break;
+        }
+        i++;
+      }
+      i++;
+      continue;
+    }
+    if (ch === "/" && text[i + 1] === "*") {
+      i += 2;
+      while (i < len) {
+        if (text[i] === "*" && text[i + 1] === "/") {
+          i += 2;
+          break;
+        }
+        i++;
+      }
+      continue;
+    }
+    if (ch === "/" && text[i + 1] === "/") {
+      i += 2;
+      while (i < len && text[i] !== "\n") {
+        i++;
+      }
+      continue;
+    }
+    result += ch;
+    i++;
+  }
+  return result;
+}
 async function parseMcp(mcpPath) {
   const content = await readFileSafe(mcpPath);
   if (!content) return null;
   let parsed;
   try {
-    parsed = JSON.parse(content);
+    parsed = JSON.parse(stripJsonComments(content));
   } catch {
     return null;
   }
@@ -16619,14 +16672,14 @@ function mergeHooks(base, overlay) {
 }
 function mergeIgnore(base, overlay) {
   const seen = new Set(base);
-  const out = [...base];
+  const out2 = [...base];
   for (const p of overlay) {
     if (!seen.has(p)) {
       seen.add(p);
-      out.push(p);
+      out2.push(p);
     }
   }
-  return out;
+  return out2;
 }
 
 // src/config/resolve/native-format-detector.ts
@@ -17165,15 +17218,35 @@ async function loadCanonicalWithExtends(config, configDir, options = {}, canonic
 // src/plugins/load-plugin.ts
 init_target_descriptor_schema();
 init_registry();
+function resolveNpmSpecifier(source, projectRoot) {
+  const pkgDir = join(projectRoot, "node_modules", source);
+  const pkgJsonPath = join(pkgDir, "package.json");
+  if (!existsSync(pkgJsonPath)) {
+    throw new Error(`Cannot find package '${source}' in ${join(projectRoot, "node_modules")}`);
+  }
+  const pkgJson = JSON.parse(readFileSync(pkgJsonPath, "utf-8"));
+  const entry = (typeof pkgJson.exports === "string" ? pkgJson.exports : null) ?? (typeof pkgJson.main === "string" ? pkgJson.main : null) ?? "index.js";
+  const resolved = resolve(pkgDir, entry);
+  if (!existsSync(resolved)) {
+    throw new Error(`Package '${source}' entry '${entry}' does not exist at ${resolved}`);
+  }
+  return resolved;
+}
+function isLocalSource(source) {
+  return source.startsWith("file:") || source.startsWith("./") || source.startsWith("../") || source.startsWith("/") || // Windows absolute paths: `D:\foo`, `C:/bar`, etc. `node:path`'s `resolve()` produces
+  // these on win32, and they must not be misinterpreted as bare npm package names.
+  /^[A-Za-z]:[/\\]/.test(source);
+}
 async function importPluginModule(entry, projectRoot) {
   const { source } = entry;
   let importTarget;
-  if (source.startsWith("file:") || source.startsWith("./") || source.startsWith("../") || source.startsWith("/")) {
+  if (isLocalSource(source)) {
     const raw = source.startsWith("file:") ? fileURLToPath(source) : source;
     const resolved = resolve(projectRoot, raw);
     importTarget = pathToFileURL(resolved).href;
   } else {
-    importTarget = source;
+    const resolved = resolveNpmSpecifier(source, projectRoot);
+    importTarget = pathToFileURL(resolved).href;
   }
   const mod = await import(importTarget);
   return mod;
@@ -17337,13 +17410,13 @@ var PROBES = [
 ];
 function lintSilentFeatureDrops(input) {
   const enabled = new Set(input.enabledFeatures);
-  const out = [];
+  const out2 = [];
   for (const probe of PROBES) {
     if (!enabled.has(probe.featureFlag)) continue;
     if (!probe.hasContent(input.canonical)) continue;
     const cap2 = normalizeCapabilityValue(input.capabilities[probe.capabilityKey]);
     if (cap2.level !== "none") continue;
-    out.push(
+    out2.push(
       createWarning(
         probe.file,
         input.target,
@@ -17351,7 +17424,7 @@ function lintSilentFeatureDrops(input) {
       )
     );
   }
-  return out;
+  return out2;
 }
 
 // src/core/lint/shared/hook-script-references.ts
@@ -17366,14 +17439,14 @@ function lintHookScriptReferences(input) {
   if (input.hasScriptProjection) return [];
   const hooks = input.canonical.hooks;
   if (!hooks) return [];
-  const out = [];
+  const out2 = [];
   for (const entries of Object.values(hooks)) {
     if (!Array.isArray(entries)) continue;
     for (const entry of entries) {
       if (typeof entry?.command !== "string") continue;
       const token = extractScriptToken(entry.command);
       if (!token) continue;
-      out.push(
+      out2.push(
         createWarning(
           ".agentsmesh/hooks.yaml",
           input.target,
@@ -17382,19 +17455,19 @@ function lintHookScriptReferences(input) {
       );
     }
   }
-  return out;
+  return out2;
 }
 
 // src/core/lint/shared/rule-scope-inversion.ts
 init_helpers();
 function lintRuleScopeInversion(input) {
   if (input.preservesManualActivation) return [];
-  const out = [];
+  const out2 = [];
   for (const rule of input.canonical.rules) {
     if (rule.root) continue;
     if (rule.trigger !== "manual") continue;
     if (rule.targets.length > 0 && !rule.targets.includes(input.target)) continue;
-    out.push(
+    out2.push(
       createWarning(
         rule.source,
         input.target,
@@ -17402,7 +17475,7 @@ function lintRuleScopeInversion(input) {
       )
     );
   }
-  return out;
+  return out2;
 }
 
 // src/core/lint/linter.ts