@kwonye/mcpx 0.1.93 → 0.1.95

package/dist/{cli-qvkpwy9w.js → cli-njtbb11m.js}

@@ -1,14 +1,14 @@
 import {
+  persistSyncState,
   syncAllClients
-} from "./cli-kwyp9ywh.js";
+} from "./cli-wxw1t3rr.js";
 import {
   loadConfig,
-  loadMergedConfig,
   saveConfig
-} from "./cli-np0wwh6m.js";
+} from "./cli-v27bt25d.js";
 import {
   SecretsManager
-} from "./cli-8vxva0cb.js";
+} from "./cli-tk8bggg5.js";
 import {
   ensureDir,
   getConfigPath,
@@ -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 {
@@ -691,11 +698,18 @@ class PluginManager {
     if (config.plugins[pluginId]) {
       throw new Error(`Plugin ${pluginId} is already installed`);
     }
+    const serverNames = info.components.mcpServers.map((s) => `${pluginName}__${s.id}`);
+    for (const existing of Object.values(config.plugins)) {
+      for (const sn of serverNames) {
+        if (existing.serverNames.includes(sn)) {
+          throw new Error(`Server name collision: "${sn}" is already claimed by plugin "${existing.name}". Use --name to specify a different plugin name.`);
+        }
+      }
+    }
     const dataDir = path5.join(getPluginDataRoot(), pluginId);
     ensureDir(dataDir);
     const enabled = options?.enabled ?? true;
     const discovered = info.components;
-    const serverNames = discovered.mcpServers.map((s) => `${pluginName}__${s.id}`);
     const plugin = {
       id: pluginId,
       name: pluginName,
@@ -727,17 +741,17 @@ 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
       };
     }
     saveConfig(config, this.configPath);
     this.lifecycle.initData(pluginId);
-    const mergedConfig = loadMergedConfig(this.configPath);
-    syncAllClients(mergedConfig, this.secrets);
+    const syncConfig = loadConfig(this.configPath);
+    const summary = syncAllClients(syncConfig, this.secrets);
+    persistSyncState(summary, syncConfig);
+    saveConfig(syncConfig, this.configPath);
     return plugin;
   }
   async updatePlugin(pluginId) {
@@ -762,18 +776,18 @@ 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
       };
     }
     current.approvals = {};
     config.plugins[pluginId] = current;
     saveConfig(config, this.configPath);
-    const mergedConfig = loadMergedConfig(this.configPath);
-    syncAllClients(mergedConfig, this.secrets);
+    const syncConfig = loadConfig(this.configPath);
+    const summary = syncAllClients(syncConfig, this.secrets);
+    persistSyncState(summary, syncConfig);
+    saveConfig(syncConfig, this.configPath);
     return current;
   }
   async uninstallPlugin(pluginId, keepData = false) {
@@ -791,8 +805,10 @@ class PluginManager {
     if (!keepData) {
       await this.lifecycle.removeData(pluginId);
     }
-    const mergedConfig = loadMergedConfig(this.configPath);
-    syncAllClients(mergedConfig, this.secrets);
+    const syncConfig = loadConfig(this.configPath);
+    const summary = syncAllClients(syncConfig, this.secrets);
+    persistSyncState(summary, syncConfig);
+    saveConfig(syncConfig, this.configPath);
   }
   async enablePlugin(pluginId) {
     const config = loadConfig(this.configPath);
@@ -803,8 +819,10 @@ class PluginManager {
       throw new Error(`Plugin ${pluginId} not found`);
     plugin.enabled = true;
     saveConfig(config, this.configPath);
-    const mergedConfig = loadMergedConfig(this.configPath);
-    syncAllClients(mergedConfig, this.secrets);
+    const syncConfig = loadConfig(this.configPath);
+    const summary = syncAllClients(syncConfig, this.secrets);
+    persistSyncState(summary, syncConfig);
+    saveConfig(syncConfig, this.configPath);
   }
   async disablePlugin(pluginId) {
     const config = loadConfig(this.configPath);
@@ -815,8 +833,10 @@ class PluginManager {
       throw new Error(`Plugin ${pluginId} not found`);
     plugin.enabled = false;
     saveConfig(config, this.configPath);
-    const mergedConfig = loadMergedConfig(this.configPath);
-    syncAllClients(mergedConfig, this.secrets);
+    const syncConfig = loadConfig(this.configPath);
+    const summary = syncAllClients(syncConfig, this.secrets);
+    persistSyncState(summary, syncConfig);
+    saveConfig(syncConfig, this.configPath);
   }
   async approveComponent(pluginId, component) {
     const config = loadConfig(this.configPath);
@@ -836,8 +856,10 @@ class PluginManager {
       }
     }
     saveConfig(config, this.configPath);
-    const mergedConfig = loadMergedConfig(this.configPath);
-    syncAllClients(mergedConfig, this.secrets);
+    const syncConfig = loadConfig(this.configPath);
+    const summary = syncAllClients(syncConfig, this.secrets);
+    persistSyncState(summary, syncConfig);
+    saveConfig(syncConfig, this.configPath);
   }
   async getPluginStatus(pluginId) {
     const config = loadConfig(this.configPath);
@@ -865,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 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(name, component) {
+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;
 }
@@ -896,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-8vxva0cb.js → cli-tk8bggg5.js}

@@ -32,6 +32,13 @@ function removeServer(config, name, force = false) {
     throw new Error(`Server "${name}" does not exist.`);
   }
   delete config.servers[name];
+  if (config.projects) {
+    for (const project of Object.values(config.projects)) {
+      if (project.disabledServers) {
+        project.disabledServers = project.disabledServers.filter((s) => s !== name);
+      }
+    }
+  }
 }
 function updateServer(config, name, spec) {
   validateServerName(name);
@@ -66,14 +73,18 @@ function ensureGatewayToken(config, secrets) {
   try {
     const fileValue = fs.readFileSync(tokenPath, "utf8").trim();
     if (fileValue) {
-      secrets.setSecret(secretName, fileValue);
       return fileValue;
     }
   } catch {}
+  const storeValue = secrets.getSecret(secretName);
+  if (storeValue) {
+    ensureParentDir(tokenPath);
+    fs.writeFileSync(tokenPath, storeValue, { mode: 384 });
+    return storeValue;
+  }
   const token = crypto.randomBytes(32).toString("base64url");
   ensureParentDir(tokenPath);
   fs.writeFileSync(tokenPath, token, { mode: 384 });
-  secrets.setSecret(secretName, token);
   return token;
 }
 function rotateGatewayToken(config, secrets) {
@@ -82,7 +93,7 @@ function rotateGatewayToken(config, secrets) {
   const tokenPath = getGatewayTokenPath(secretName);
   ensureParentDir(tokenPath);
   fs.writeFileSync(tokenPath, token, { mode: 384 });
-  secrets.setSecret(secretName, token);
+  secrets.removeSecret(secretName);
   return token;
 }
 function registerProject(globalConfig, projectPath, name) {
@@ -111,20 +122,82 @@ function setProjectServerEnabled(globalConfig, projectPath, serverName, enabled)
   if (!project) {
     throw new Error(`Project "${resolvedPath}" is not registered.`);
   }
+  const serverSpec = globalConfig.servers[serverName];
+  if (!serverSpec) {
+    throw new Error(`Server "${serverName}" does not exist.`);
+  }
   if (!project.disabledServers) {
     project.disabledServers = [];
   }
   if (enabled) {
     project.disabledServers = project.disabledServers.filter((s) => s !== serverName);
-    const serverSpec = globalConfig.servers[serverName];
-    if (serverSpec && !isServerEnabled(serverSpec)) {
-      globalConfig.servers[serverName] = { ...serverSpec, enabled: true };
+    if (!isServerEnabled(serverSpec)) {
+      return { effective: false, reason: "globally_disabled" };
     }
   } else {
     if (!project.disabledServers.includes(serverName)) {
       project.disabledServers.push(serverName);
     }
   }
+  return { effective: true };
+}
+
+// src/core/errors.ts
+class UpstreamError extends Error {
+  code;
+  upstream;
+  status;
+  wwwAuthenticate;
+  constructor(upstream, code, message, options) {
+    super(message);
+    this.name = "UpstreamError";
+    this.code = code;
+    this.upstream = upstream;
+    this.status = options?.status;
+    this.wwwAuthenticate = options?.wwwAuthenticate;
+  }
+}
+
+class SecretNotFoundError extends Error {
+  code = "secret_missing";
+  secretName;
+  constructor(secretName) {
+    super(`Secret not found: ${secretName}. Run: mcpx secret set ${secretName}`);
+    this.name = "SecretNotFoundError";
+    this.secretName = secretName;
+  }
+}
+var TIMEOUT_RE = /timed out after \d+ms/;
+var UNREACHABLE_PATTERNS = [
+  /fetch failed/i,
+  /ECONNREFUSED/,
+  /ENOTFOUND/,
+  /EAI_AGAIN/,
+  /socket hang up/,
+  /ENOENT/,
+  /connect econnrefused/i
+];
+function classifyUpstreamError(upstream, error, wwwAuthenticate) {
+  if (error instanceof UpstreamError)
+    return error;
+  if (error instanceof SecretNotFoundError) {
+    return new UpstreamError(upstream, "secret_missing", error.message);
+  }
+  const message = error instanceof Error ? error.message : String(error);
+  const maybeHttpError = error;
+  if (maybeHttpError?.code && (maybeHttpError.code === 401 || maybeHttpError.code === 403)) {
+    return new UpstreamError(upstream, "auth_required", message, {
+      status: maybeHttpError.code,
+      wwwAuthenticate
+    });
+  }
+  if (TIMEOUT_RE.test(message)) {
+    return new UpstreamError(upstream, "timeout", message);
+  }
+  if (UNREACHABLE_PATTERNS.some((p) => p.test(message))) {
+    return new UpstreamError(upstream, "unreachable", message);
+  }
+  return new UpstreamError(upstream, "upstream_error", message);
 }
 
 // src/core/secrets.ts
@@ -240,7 +313,7 @@ class SecretsManager {
       return value;
     const secret = this.getSecret(secretName);
     if (!secret)
-      throw new Error(`Secret not found: ${secretName}`);
+      throw new SecretNotFoundError(secretName);
     return secret;
   }
   rotateLocalToken(secretName = "local_gateway_token") {
@@ -260,4 +333,4 @@ function readSecretValueFromStdin() {
   return content;
 }
 
-export { SecretsManager, readSecretValueFromStdin, validateServerName, addServer, removeServer, updateServer, setServerEnabled, getGatewayTokenSecretName, ensureGatewayToken, rotateGatewayToken, registerProject, unregisterProject, setProjectServerEnabled };
+export { UpstreamError, SecretNotFoundError, classifyUpstreamError, SecretsManager, readSecretValueFromStdin, validateServerName, addServer, removeServer, updateServer, setServerEnabled, getGatewayTokenSecretName, ensureGatewayToken, rotateGatewayToken, registerProject, unregisterProject, setProjectServerEnabled };