@kwonye/mcpx 0.1.95 → 0.1.97

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

@@ -1,14 +1,14 @@
 import {
+  mutateConfig,
   persistSyncState,
   syncAllClients
-} from "./cli-wxw1t3rr.js";
+} from "./cli-vy81xjm0.js";
 import {
-  loadConfig,
-  saveConfig
-} from "./cli-v27bt25d.js";
+  loadConfig
+} from "./cli-g4w6k655.js";
 import {
   SecretsManager
-} from "./cli-tk8bggg5.js";
+} from "./cli-remv48t3.js";
 import {
   ensureDir,
   getConfigPath,
@@ -226,7 +226,9 @@ function computeTreeHash(dir) {
   const crypto = __require("node:crypto");
   const hash = crypto.createHash("sha256");
   for (const entry of entries) {
-    if (entry.name.startsWith("."))
+    if (entry.name.startsWith(".git"))
+      continue;
+    if (entry.name === ".DS_Store")
       continue;
     if (entry.isDirectory()) {
       hash.update(entry.name);
@@ -244,6 +246,8 @@ function copyDirSync(src, dest) {
   for (const entry of entries) {
     if (entry.name.startsWith(".git"))
       continue;
+    if (entry.name === ".DS_Store")
+      continue;
     const srcPath = path.join(src, entry.name);
     const destPath = path.join(dest, entry.name);
     if (entry.isDirectory()) {
@@ -692,24 +696,11 @@ class PluginManager {
     const info = await this.inspectSource(sourceStr);
     const pluginName = options?.name || info.manifest?.name || path5.basename(info.root);
     const pluginId = `${pluginName}@${info.sha.slice(0, 8)}`;
-    const config = loadConfig(this.configPath);
-    if (!config.plugins)
-      config.plugins = {};
-    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,
@@ -734,132 +725,168 @@ class PluginManager {
       projectedClients: [],
       approvals: options?.approvals || {}
     };
-    config.plugins[pluginId] = plugin;
-    saveConfig(config, this.configPath);
-    for (const mcp of discovered.mcpServers) {
-      const nsName = `${pluginName}__${mcp.id}`;
-      const approved = plugin.approvals?.mcpServers !== false;
-      config.servers[nsName] = {
-        transport: "stdio",
-        command: "npx",
-        args: ["-y", "@kwonye/mcpx@latest", "plugin-host", pluginId, mcp.id],
-        enabled: enabled && approved
-      };
-    }
-    saveConfig(config, this.configPath);
+    await mutateConfig((config) => {
+      if (!config.plugins)
+        config.plugins = {};
+      if (config.plugins[pluginId]) {
+        throw new Error(`Plugin ${pluginId} is already installed`);
+      }
+      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.`);
+          }
+        }
+      }
+      for (const sn of serverNames) {
+        if (config.servers?.[sn]) {
+          throw new Error(`Server name collision: "${sn}" is already registered as a server. Remove that server or use --name to choose a different plugin name.`);
+        }
+      }
+      config.plugins[pluginId] = plugin;
+      for (const mcp of discovered.mcpServers) {
+        const nsName = `${pluginName}__${mcp.id}`;
+        const approved = plugin.approvals?.mcpServers !== false;
+        config.servers[nsName] = {
+          transport: "stdio",
+          command: "npx",
+          args: ["-y", "@kwonye/mcpx@latest", "plugin-host", pluginId, mcp.id],
+          enabled: enabled && approved
+        };
+      }
+    }, this.configPath);
     this.lifecycle.initData(pluginId);
     const syncConfig = loadConfig(this.configPath);
     const summary = syncAllClients(syncConfig, this.secrets);
-    persistSyncState(summary, syncConfig);
-    saveConfig(syncConfig, this.configPath);
+    await mutateConfig((freshConfig) => {
+      persistSyncState(summary, freshConfig);
+    }, this.configPath);
     return plugin;
   }
   async updatePlugin(pluginId) {
-    const config = loadConfig(this.configPath);
-    if (!config.plugins)
-      throw new Error(`Plugin ${pluginId} not found`);
-    const current = config.plugins[pluginId];
-    if (!current)
-      throw new Error(`Plugin ${pluginId} not found`);
-    const info = await this.inspectSource(current.source);
-    const pluginName = info.manifest?.name || current.name;
-    for (const oldName of current.serverNames) {
-      delete config.servers[oldName];
-    }
-    current.version = info.manifest?.version || current.version;
-    current.resolvedSha = info.sha;
-    current.root = info.root;
-    current.discovered = info.components;
-    current.serverNames = info.components.mcpServers.map((s) => `${pluginName}__${s.id}`);
-    const approved = current.approvals?.mcpServers !== false;
-    for (const mcp of info.components.mcpServers) {
-      const nsName = `${pluginName}__${mcp.id}`;
-      config.servers[nsName] = {
-        transport: "stdio",
-        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);
+    let currentPlugin;
+    let info;
+    await mutateConfig((config) => {
+      if (!config.plugins)
+        throw new Error(`Plugin ${pluginId} not found`);
+      const current = config.plugins[pluginId];
+      if (!current)
+        throw new Error(`Plugin ${pluginId} not found`);
+      currentPlugin = current;
+    }, this.configPath);
+    const source = currentPlugin.source;
+    info = await this.inspectSource(source);
+    const pluginName = info.manifest?.name || currentPlugin.name;
+    let updatedPlugin;
+    await mutateConfig((config) => {
+      if (!config.plugins)
+        throw new Error(`Plugin ${pluginId} not found`);
+      const current = config.plugins[pluginId];
+      if (!current)
+        throw new Error(`Plugin ${pluginId} not found`);
+      for (const oldName of current.serverNames) {
+        delete config.servers[oldName];
+      }
+      current.version = info.manifest?.version || current.version;
+      current.resolvedSha = info.sha;
+      current.root = info.root;
+      current.discovered = info.components;
+      current.serverNames = info.components.mcpServers.map((s) => `${pluginName}__${s.id}`);
+      const approved = current.approvals?.mcpServers !== false;
+      for (const mcp of info.components.mcpServers) {
+        const nsName = `${pluginName}__${mcp.id}`;
+        config.servers[nsName] = {
+          transport: "stdio",
+          command: "npx",
+          args: ["-y", "@kwonye/mcpx@latest", "plugin-host", pluginId, mcp.id],
+          enabled: current.enabled && approved
+        };
+      }
+      current.approvals = {};
+      config.plugins[pluginId] = current;
+      updatedPlugin = current;
+    }, this.configPath);
     const syncConfig = loadConfig(this.configPath);
     const summary = syncAllClients(syncConfig, this.secrets);
-    persistSyncState(summary, syncConfig);
-    saveConfig(syncConfig, this.configPath);
-    return current;
+    await mutateConfig((freshConfig) => {
+      persistSyncState(summary, freshConfig);
+    }, this.configPath);
+    return updatedPlugin;
   }
   async uninstallPlugin(pluginId, keepData = false) {
-    const config = loadConfig(this.configPath);
-    if (!config.plugins)
-      throw new Error(`Plugin ${pluginId} not found`);
-    const plugin = config.plugins[pluginId];
-    if (!plugin)
-      throw new Error(`Plugin ${pluginId} not found`);
-    for (const name of plugin.serverNames) {
-      delete config.servers[name];
-    }
-    delete config.plugins[pluginId];
-    saveConfig(config, this.configPath);
+    await mutateConfig((config) => {
+      if (!config.plugins)
+        throw new Error(`Plugin ${pluginId} not found`);
+      const plugin = config.plugins[pluginId];
+      if (!plugin)
+        throw new Error(`Plugin ${pluginId} not found`);
+      for (const name of plugin.serverNames) {
+        delete config.servers[name];
+      }
+      delete config.plugins[pluginId];
+    }, this.configPath);
     if (!keepData) {
       await this.lifecycle.removeData(pluginId);
     }
     const syncConfig = loadConfig(this.configPath);
     const summary = syncAllClients(syncConfig, this.secrets);
-    persistSyncState(summary, syncConfig);
-    saveConfig(syncConfig, this.configPath);
+    await mutateConfig((freshConfig) => {
+      persistSyncState(summary, freshConfig);
+    }, this.configPath);
   }
   async enablePlugin(pluginId) {
-    const config = loadConfig(this.configPath);
-    if (!config.plugins)
-      throw new Error(`Plugin ${pluginId} not found`);
-    const plugin = config.plugins[pluginId];
-    if (!plugin)
-      throw new Error(`Plugin ${pluginId} not found`);
-    plugin.enabled = true;
-    saveConfig(config, this.configPath);
+    await mutateConfig((config) => {
+      if (!config.plugins)
+        throw new Error(`Plugin ${pluginId} not found`);
+      const plugin = config.plugins[pluginId];
+      if (!plugin)
+        throw new Error(`Plugin ${pluginId} not found`);
+      plugin.enabled = true;
+    }, this.configPath);
     const syncConfig = loadConfig(this.configPath);
     const summary = syncAllClients(syncConfig, this.secrets);
-    persistSyncState(summary, syncConfig);
-    saveConfig(syncConfig, this.configPath);
+    await mutateConfig((freshConfig) => {
+      persistSyncState(summary, freshConfig);
+    }, this.configPath);
   }
   async disablePlugin(pluginId) {
-    const config = loadConfig(this.configPath);
-    if (!config.plugins)
-      throw new Error(`Plugin ${pluginId} not found`);
-    const plugin = config.plugins[pluginId];
-    if (!plugin)
-      throw new Error(`Plugin ${pluginId} not found`);
-    plugin.enabled = false;
-    saveConfig(config, this.configPath);
+    await mutateConfig((config) => {
+      if (!config.plugins)
+        throw new Error(`Plugin ${pluginId} not found`);
+      const plugin = config.plugins[pluginId];
+      if (!plugin)
+        throw new Error(`Plugin ${pluginId} not found`);
+      plugin.enabled = false;
+    }, this.configPath);
     const syncConfig = loadConfig(this.configPath);
     const summary = syncAllClients(syncConfig, this.secrets);
-    persistSyncState(summary, syncConfig);
-    saveConfig(syncConfig, this.configPath);
+    await mutateConfig((freshConfig) => {
+      persistSyncState(summary, freshConfig);
+    }, this.configPath);
   }
   async approveComponent(pluginId, component) {
-    const config = loadConfig(this.configPath);
-    if (!config.plugins)
-      throw new Error(`Plugin ${pluginId} not found`);
-    const plugin = config.plugins[pluginId];
-    if (!plugin)
-      throw new Error(`Plugin ${pluginId} not found`);
-    if (!plugin.approvals)
-      plugin.approvals = {};
-    plugin.approvals[component] = true;
-    if (component === "mcpServers") {
-      for (const name of plugin.serverNames) {
-        if (config.servers[name]) {
-          config.servers[name].enabled = plugin.enabled;
+    await mutateConfig((config) => {
+      if (!config.plugins)
+        throw new Error(`Plugin ${pluginId} not found`);
+      const plugin = config.plugins[pluginId];
+      if (!plugin)
+        throw new Error(`Plugin ${pluginId} not found`);
+      if (!plugin.approvals)
+        plugin.approvals = {};
+      plugin.approvals[component] = true;
+      if (component === "mcpServers") {
+        for (const name of plugin.serverNames) {
+          if (config.servers[name]) {
+            config.servers[name].enabled = plugin.enabled;
+          }
         }
       }
-    }
-    saveConfig(config, this.configPath);
+    }, this.configPath);
     const syncConfig = loadConfig(this.configPath);
     const summary = syncAllClients(syncConfig, this.secrets);
-    persistSyncState(summary, syncConfig);
-    saveConfig(syncConfig, this.configPath);
+    await mutateConfig((freshConfig) => {
+      persistSyncState(summary, freshConfig);
+    }, this.configPath);
   }
   async getPluginStatus(pluginId) {
     const config = loadConfig(this.configPath);
@@ -912,23 +939,24 @@ async function disablePlugin(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);
+  await mutateConfig((config) => {
+    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 };
+  });
   const secrets = new SecretsManager;
   const syncConfig = loadConfig();
   const summary = syncAllClients(syncConfig, secrets);
-  persistSyncState(summary, syncConfig);
-  saveConfig(syncConfig);
+  await mutateConfig((freshConfig) => {
+    persistSyncState(summary, freshConfig);
+  });
 }
 async function approvePluginComponent(nameOrId, component) {
   const manager = new PluginManager;
@@ -964,32 +992,34 @@ function resolvePluginId(config, nameOrId) {
 }
 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"]);
+  const configPath = manager["configPath"];
+  await mutateConfig((config) => {
+    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;
+    }
+  }, configPath);
 }
 async function pluginSync() {
   const config = loadConfig();
   const secrets = new SecretsManager;
   const summary = syncAllClients(config, secrets);
-  persistSyncState(summary, config);
-  saveConfig(config);
+  await mutateConfig((freshConfig) => {
+    persistSyncState(summary, freshConfig);
+  });
 }
 async function preparePlugin(name) {
   const manager = new PluginManager;