@kwonye/mcpx 0.1.94 → 0.1.95

package/dist/{cli-9fmn9y72.js → cli-njtbb11m.js}

@@ -1,11 +1,11 @@
 import {
   persistSyncState,
   syncAllClients
-} from "./cli-n8vt375e.js";
+} from "./cli-wxw1t3rr.js";
 import {
   loadConfig,
   saveConfig
-} from "./cli-csfsg1yf.js";
+} from "./cli-v27bt25d.js";
 import {
   SecretsManager
 } from "./cli-tk8bggg5.js";
@@ -468,6 +468,10 @@ var HOOKS_JSON_REL = path4.join("hooks", "hooks.json");
 var SKILLS_DIR = "skills";
 var COMMANDS_DIR = "commands";
 var AGENTS_DIR = "agents";
+function sanitizeComponentId(id) {
+  const stripped = id.replace(/[\/\\]/g, "_").replace(/^\.+/, "");
+  return stripped.length > 0 ? stripped : "unnamed";
+}
 function readManifest(pluginRoot) {
   const manifestPath = path4.join(pluginRoot, PLUGIN_JSON_REL);
   if (!fs4.existsSync(manifestPath)) {
@@ -528,7 +532,7 @@ function discoverSkills(pluginRoot) {
           const content = fs4.readFileSync(skillPath, "utf8");
           const { frontmatter } = parseFrontmatter(content);
           results.push({
-            id: frontmatter.name ?? path4.basename(entry.name, ".md"),
+            id: sanitizeComponentId(frontmatter.name ?? path4.basename(entry.name, ".md")),
             type: "skills",
             path: skillPath,
             description: frontmatter.description
@@ -541,7 +545,7 @@ function discoverSkills(pluginRoot) {
         const content = fs4.readFileSync(skillMdPath, "utf8");
         const { frontmatter } = parseFrontmatter(content);
         results.push({
-          id: frontmatter.name ?? entry.name,
+          id: sanitizeComponentId(frontmatter.name ?? entry.name),
           type: "skills",
           path: skillMdPath,
           description: frontmatter.description
@@ -564,7 +568,7 @@ function discoverCommands(pluginRoot) {
         const content = fs4.readFileSync(cmdPath, "utf8");
         const { frontmatter } = parseFrontmatter(content);
         results.push({
-          id: frontmatter.name ?? path4.basename(entry.name, ".md"),
+          id: sanitizeComponentId(frontmatter.name ?? path4.basename(entry.name, ".md")),
           type: "commands",
           path: cmdPath,
           description: frontmatter.description
@@ -587,7 +591,7 @@ function discoverAgents(pluginRoot) {
         const content = fs4.readFileSync(agentPath, "utf8");
         const { frontmatter } = parseFrontmatter(content);
         results.push({
-          id: frontmatter.name ?? path4.basename(entry.name, ".md"),
+          id: sanitizeComponentId(frontmatter.name ?? path4.basename(entry.name, ".md")),
           type: "agents",
           path: agentPath,
           description: frontmatter.description
@@ -644,6 +648,9 @@ function discoverComponents(pluginRoot) {
 function hasManifest(pluginRoot) {
   return fs4.existsSync(path4.join(pluginRoot, PLUGIN_JSON_REL));
 }
+function resolvePluginVars(value, pluginRoot, dataDir) {
+  return value.replace(/\$\{CLAUDE_PLUGIN_ROOT\}/g, pluginRoot).replace(/\$\{DATA\}/g, dataDir).replace(/\$\{CLAUDE_PROJECT_DIR\}/g, pluginRoot);
+}
 
 // src/core/plugin-manager.ts
 class PluginManager {
@@ -734,10 +741,8 @@ class PluginManager {
       const approved = plugin.approvals?.mcpServers !== false;
       config.servers[nsName] = {
         transport: "stdio",
-        command: mcp.command,
-        args: mcp.args,
-        env: mcp.env,
-        cwd: mcp.cwd || plugin.root,
+        command: "npx",
+        args: ["-y", "@kwonye/mcpx@latest", "plugin-host", pluginId, mcp.id],
         enabled: enabled && approved
       };
     }
@@ -771,10 +776,8 @@ class PluginManager {
       const nsName = `${pluginName}__${mcp.id}`;
       config.servers[nsName] = {
         transport: "stdio",
-        command: mcp.command,
-        args: mcp.args,
-        env: mcp.env,
-        cwd: mcp.cwd || current.root,
+        command: "npx",
+        args: ["-y", "@kwonye/mcpx@latest", "plugin-host", pluginId, mcp.id],
         enabled: current.enabled && approved
       };
     }
@@ -884,30 +887,62 @@ async function installPlugin(source, options) {
   const manager = new PluginManager;
   return manager.installPlugin(source, options);
 }
-async function updatePlugin(name) {
+async function updatePlugin(nameOrId) {
   const manager = new PluginManager;
-  return manager.updatePlugin(name);
+  const config = loadConfig(manager["configPath"]);
+  const id = resolvePluginId(config, nameOrId);
+  return manager.updatePlugin(id);
 }
-async function uninstallPlugin(name, keepData) {
+async function uninstallPlugin(nameOrId, keepData) {
   const manager = new PluginManager;
-  await manager.uninstallPlugin(name, keepData);
+  const config = loadConfig(manager["configPath"]);
+  const id = resolvePluginId(config, nameOrId);
+  await manager.uninstallPlugin(id, keepData);
 }
-async function enablePlugin(name) {
+async function enablePlugin(nameOrId) {
   const manager = new PluginManager;
-  await manager.enablePlugin(name);
+  const config = loadConfig(manager["configPath"]);
+  const id = resolvePluginId(config, nameOrId);
+  await manager.enablePlugin(id);
 }
-async function disablePlugin(name) {
+async function disablePlugin(nameOrId) {
   const manager = new PluginManager;
-  await manager.disablePlugin(name);
+  const config = loadConfig(manager["configPath"]);
+  const id = resolvePluginId(config, nameOrId);
+  await manager.disablePlugin(id);
 }
-async function approvePluginComponent(name, component) {
+async function setPluginProjectOverride(nameOrId, projectPath, override) {
+  const config = loadConfig();
+  const id = resolvePluginId(config, nameOrId);
+  const plugin = config.plugins?.[id];
+  if (!plugin)
+    throw new Error(`Plugin ${id} not found`);
+  if (!config.projects?.[projectPath]) {
+    throw new Error(`Project "${projectPath}" is not registered. Run "mcpx project init" there first.`);
+  }
+  if (!plugin.projectOverrides)
+    plugin.projectOverrides = {};
+  plugin.projectOverrides[projectPath] = { ...plugin.projectOverrides[projectPath], ...override };
+  saveConfig(config);
+  const secrets = new SecretsManager;
+  const syncConfig = loadConfig();
+  const summary = syncAllClients(syncConfig, secrets);
+  persistSyncState(summary, syncConfig);
+  saveConfig(syncConfig);
+}
+async function approvePluginComponent(nameOrId, component) {
   const manager = new PluginManager;
-  await manager.approveComponent(name, component);
+  const config = loadConfig(manager["configPath"]);
+  const id = resolvePluginId(config, nameOrId);
+  await manager.approveComponent(id, component);
 }
-async function getPluginStatus(name) {
+async function getPluginStatus(nameOrId) {
   const manager = new PluginManager;
-  if (name)
-    return manager.getPluginStatus(name);
+  if (nameOrId) {
+    const config = loadConfig(manager["configPath"]);
+    const id = resolvePluginId(config, nameOrId);
+    return manager.getPluginStatus(id);
+  }
   const plugins = await manager.listPlugins();
   return plugins[0] || null;
 }
@@ -915,9 +950,50 @@ async function listPlugins() {
   const manager = new PluginManager;
   return manager.listPlugins();
 }
+function resolvePluginId(config, nameOrId) {
+  const plugins = config.plugins ?? {};
+  if (plugins[nameOrId])
+    return nameOrId;
+  const matches = Object.keys(plugins).filter((id) => plugins[id].name === nameOrId);
+  if (matches.length === 1)
+    return matches[0];
+  if (matches.length === 0) {
+    throw new Error(`Plugin "${nameOrId}" not found. Available: ${Object.values(plugins).map((p) => `${p.name} (${p.id})`).join(", ") || "none"}`);
+  }
+  throw new Error(`Multiple plugins match "${nameOrId}": ${matches.join(", ")}. Use the full id (<name>@<sha8>).`);
+}
+async function pluginConfigSet(nameOrId, key, value, projectPath) {
+  const manager = new PluginManager;
+  const config = loadConfig(manager["configPath"]);
+  const id = resolvePluginId(config, nameOrId);
+  const plugin = config.plugins?.[id];
+  if (!plugin)
+    throw new Error(`Plugin ${id} not found`);
+  if (projectPath) {
+    if (!plugin.projectOverrides)
+      plugin.projectOverrides = {};
+    if (!plugin.projectOverrides[projectPath])
+      plugin.projectOverrides[projectPath] = {};
+    if (!plugin.projectOverrides[projectPath].config)
+      plugin.projectOverrides[projectPath].config = {};
+    plugin.projectOverrides[projectPath].config[key] = value;
+  } else {
+    if (!plugin.config)
+      plugin.config = {};
+    plugin.config[key] = value;
+  }
+  saveConfig(config, manager["configPath"]);
+}
+async function pluginSync() {
+  const config = loadConfig();
+  const secrets = new SecretsManager;
+  const summary = syncAllClients(config, secrets);
+  persistSyncState(summary, config);
+  saveConfig(config);
+}
 async function preparePlugin(name) {
   const manager = new PluginManager;
   await manager.preparePlugin(name);
 }
 
-export { PluginCache, PluginDataManager, PluginLifecycle, parseSource, readManifest, discoverComponents, hasManifest, PluginManager, inspectPlugin, installPlugin, updatePlugin, uninstallPlugin, enablePlugin, disablePlugin, approvePluginComponent, getPluginStatus, listPlugins, preparePlugin };
+export { PluginCache, PluginDataManager, PluginLifecycle, parseSource, readManifest, discoverComponents, hasManifest, resolvePluginVars, PluginManager, inspectPlugin, installPlugin, updatePlugin, uninstallPlugin, enablePlugin, disablePlugin, setPluginProjectOverride, approvePluginComponent, getPluginStatus, listPlugins, resolvePluginId, pluginConfigSet, pluginSync, preparePlugin };

package/dist/{cli-csfsg1yf.js → cli-v27bt25d.js}

@@ -94,6 +94,12 @@ function parseCliAddCommand(command) {
   if (parts[0] === "code" && parts[1] === "--add-mcp") {
     return parseVSCodeAdd(parts[2]);
   }
+  if (parts[0] === "openclaw" && parts[1] === "mcp" && parts[2] === "add") {
+    return parseOpenClawAdd(parts.slice(3));
+  }
+  if (parts[0] === "hermes" && parts[1] === "mcp" && parts[2] === "add") {
+    return parseHermesAdd(parts.slice(3));
+  }
   if (parts[0] === "add") {
     return parseStandardAdd(parts.slice(1));
   }
@@ -211,6 +217,48 @@ function parseVSCodeAdd(jsonPayload) {
   }
   throw new Error("JSON payload must include 'url' or 'command'");
 }
+function parseOpenClawAdd(args) {
+  const header = [];
+  const env = [];
+  let cwd;
+  const values = [];
+  for (let i = 0;i < args.length; i++) {
+    const arg = args[i];
+    if (arg === "--header") {
+      header.push(args[++i]);
+    } else if (arg === "--env") {
+      env.push(args[++i]);
+    } else if (arg === "--cwd" || arg === "--workingDirectory") {
+      cwd = args[++i];
+    } else if (arg === "--arg") {
+      values.push(args[++i]);
+    } else if (arg === "--transport" || arg === "--auth" || arg === "--scope") {
+      i++;
+    } else {
+      values.push(arg);
+    }
+  }
+  return buildServerSpec(values, { header, env, cwd });
+}
+function parseHermesAdd(args) {
+  const env = [];
+  const values = [];
+  for (let i = 0;i < args.length; i++) {
+    const arg = args[i];
+    if (arg === "--env") {
+      env.push(args[++i]);
+    } else if (arg === "--args") {
+      while (i + 1 < args.length && !args[i + 1].startsWith("--")) {
+        values.push(args[++i]);
+      }
+    } else if (arg === "--auth") {
+      i++;
+    } else {
+      values.push(arg);
+    }
+  }
+  return buildServerSpec(values, { header: [], env });
+}
 function buildServerSpec(values, options) {
   if (values.length < 2) {
     throw new Error("Usage: add [--transport auto|http|stdio] <name> <url|command> [args...]");
@@ -482,7 +530,7 @@ function loadConfig(configPath = getConfigPath()) {
   }
   const clientEntries = {};
   for (const [key, value] of Object.entries(parsed.data.clients)) {
-    if (["claude", "claude-desktop", "codex", "cursor", "cline", "opencode", "kiro", "vscode", "qwen"].includes(key)) {
+    if (["claude", "claude-desktop", "codex", "cursor", "cline", "opencode", "kiro", "vscode", "qwen", "openclaw", "hermes"].includes(key)) {
       clientEntries[key] = value;
     }
   }
@@ -574,25 +622,49 @@ function migrateProjectServers(config, projectPath) {
 }
 function resolveActiveConfig(options = {}) {
   const globalPath = getConfigPath();
-  const config = loadConfig(globalPath);
+  const globalConfig = loadConfig(globalPath);
   if (!options.global) {
     const projectConfigPath = findProjectConfigPath();
-    if (options.local || projectConfigPath) {
+    if (options.local) {
       const projectPath = projectConfigPath ? path.dirname(projectConfigPath) : process.cwd();
+      const localPath = path.join(projectPath, ".mcpx.json");
+      const projectConfig = loadProjectConfig(localPath);
+      const mergedConfig = {
+        ...globalConfig,
+        servers: { ...globalConfig.servers, ...projectConfig.servers }
+      };
+      return {
+        type: "project",
+        configPath: localPath,
+        projectPath,
+        config: mergedConfig,
+        save: () => {
+          const localServers = {};
+          for (const [name, spec] of Object.entries(mergedConfig.servers)) {
+            if (!(name in globalConfig.servers)) {
+              localServers[name] = spec;
+            }
+          }
+          saveProjectConfig({ ...projectConfig, servers: localServers }, localPath);
+        }
+      };
+    }
+    if (projectConfigPath) {
+      const projectPath = path.dirname(projectConfigPath);
       return {
         type: "project",
         configPath: globalPath,
         projectPath,
-        config,
-        save: () => saveConfig(config, globalPath)
+        config: globalConfig,
+        save: () => saveConfig(globalConfig, globalPath)
       };
     }
   }
   return {
     type: "global",
     configPath: globalPath,
-    config,
-    save: () => saveConfig(config, globalPath)
+    config: globalConfig,
+    save: () => saveConfig(globalConfig, globalPath)
   };
 }