@kwonye/mcpx 0.1.93 → 0.1.94

package/dist/{cli-kwyp9ywh.js → cli-n8vt375e.js}

@@ -1,9 +1,6 @@
-import {
-  saveConfig
-} from "./cli-np0wwh6m.js";
 import {
   ensureGatewayToken
-} from "./cli-8vxva0cb.js";
+} from "./cli-tk8bggg5.js";
 import {
   ensureDir,
   getManagedIndexPath,
@@ -75,10 +72,10 @@ function loadOwnership(targetDir) {
   }
 }
 function saveOwnership(targetDir, manifest) {
+  ensureDir(targetDir);
   fs2.writeFileSync(path2.join(targetDir, OWNERSHIP_MANIFEST), JSON.stringify(manifest, null, 2));
 }
 function recordOwned(targetDir, pluginId, paths) {
-  ensureDir(targetDir);
   const manifest = loadOwnership(targetDir);
   manifest.plugins[pluginId] = {
     pluginId,
@@ -114,16 +111,42 @@ function pruneAllPluginProjections(targetDir) {
     prunePluginProjections(targetDir, pluginId);
   }
 }
+function pruneUnlistedPlugins(targetDir, keepPluginIds) {
+  const manifest = loadOwnership(targetDir);
+  const keep = new Set(keepPluginIds);
+  for (const [pluginId] of Object.entries(manifest.plugins)) {
+    if (!keep.has(pluginId)) {
+      prunePluginProjections(targetDir, pluginId);
+    }
+  }
+}
 function nsName(pluginName, id) {
   return `${pluginName}__${id}`;
 }
+function isComponentApproved(plugin, component) {
+  const approval = plugin.approvals?.[component];
+  if (approval === false)
+    return false;
+  if (approval === true)
+    return true;
+  if (component === "hooks")
+    return false;
+  if (component === "mcpServers")
+    return plugin.components.mcpServers;
+  return plugin.components[component] ?? false;
+}
 function syncClaude(plugins) {
   const targetBase = path2.join(homeDir(), ".claude", "skills");
   const projectedDirs = [];
   const unsupported = [];
+  const skippedUnapproved = [];
   for (const plugin of plugins) {
     if (!plugin.enabled)
       continue;
+    if (!isComponentApproved(plugin, "skills")) {
+      skippedUnapproved.push(`${plugin.pluginName}:skills`);
+      continue;
+    }
     const targetDir = path2.join(targetBase, plugin.pluginName);
     ensureDir(targetDir);
     const mcpJsonSrc = path2.join(plugin.pluginRoot, ".mcp.json");
@@ -156,18 +179,20 @@ function syncCodex(plugins) {
   const projectedDirs = [];
   const unsupported = ["hooks", "agents"];
   for (const plugin of plugins) {
-    if (!plugin.enabled || !plugin.components.skills)
+    if (!plugin.enabled)
       continue;
-    ensureDir(targetBase);
-    const owned = [];
-    for (const skill of plugin.skills) {
-      const targetDir = path2.join(targetBase, nsName(plugin.pluginName, skill.id));
-      ensureDir(targetDir);
-      copyFileOrDir(skill.path, path2.join(targetDir, "SKILL.md"));
-      owned.push(nsName(plugin.pluginName, skill.id));
-      projectedDirs.push(targetDir);
+    if (plugin.components.skills && isComponentApproved(plugin, "skills")) {
+      ensureDir(targetBase);
+      const owned = [];
+      for (const skill of plugin.skills) {
+        const targetDir = path2.join(targetBase, nsName(plugin.pluginName, skill.id));
+        ensureDir(targetDir);
+        copyFileOrDir(skill.path, path2.join(targetDir, "SKILL.md"));
+        owned.push(nsName(plugin.pluginName, skill.id));
+        projectedDirs.push(targetDir);
+      }
+      recordOwned(targetBase, plugin.pluginId, owned);
     }
-    recordOwned(targetBase, plugin.pluginId, owned);
   }
   return {
     clientId: "codex",
@@ -186,7 +211,7 @@ function syncCursor(plugins) {
   for (const plugin of plugins) {
     if (!plugin.enabled)
       continue;
-    if (plugin.components.skills) {
+    if (plugin.components.skills && isComponentApproved(plugin, "skills")) {
       ensureDir(skillsBase);
       for (const skill of plugin.skills) {
         const targetDir = path2.join(skillsBase, nsName(plugin.pluginName, skill.id));
@@ -196,7 +221,7 @@ function syncCursor(plugins) {
         projectedDirs.push(targetDir);
       }
     }
-    if (plugin.components.commands) {
+    if (plugin.components.commands && isComponentApproved(plugin, "commands")) {
       ensureDir(commandsBase);
       for (const cmd of plugin.commands) {
         const targetPath = path2.join(commandsBase, `${nsName(plugin.pluginName, cmd.id)}.md`);
@@ -222,18 +247,20 @@ function syncVsCode(plugins) {
   const projectedDirs = [];
   const unsupported = ["hooks", "agents"];
   for (const plugin of plugins) {
-    if (!plugin.enabled || !plugin.components.skills)
+    if (!plugin.enabled)
       continue;
-    ensureDir(skillsBase);
-    const owned = [];
-    for (const skill of plugin.skills) {
-      const targetDir = path2.join(skillsBase, nsName(plugin.pluginName, skill.id));
-      ensureDir(targetDir);
-      copyFileOrDir(skill.path, path2.join(targetDir, "SKILL.md"));
-      owned.push(nsName(plugin.pluginName, skill.id));
-      projectedDirs.push(targetDir);
+    if (plugin.components.skills && isComponentApproved(plugin, "skills")) {
+      ensureDir(skillsBase);
+      const owned = [];
+      for (const skill of plugin.skills) {
+        const targetDir = path2.join(skillsBase, nsName(plugin.pluginName, skill.id));
+        ensureDir(targetDir);
+        copyFileOrDir(skill.path, path2.join(targetDir, "SKILL.md"));
+        owned.push(nsName(plugin.pluginName, skill.id));
+        projectedDirs.push(targetDir);
+      }
+      recordOwned(skillsBase, plugin.pluginId, owned);
     }
-    recordOwned(skillsBase, plugin.pluginId, owned);
   }
   return {
     clientId: "vscode",
@@ -242,117 +269,146 @@ function syncVsCode(plugins) {
     unsupported
   };
 }
-function syncKiro(plugins) {
-  const skillsBase = path2.join(homeDir(), ".kiro", "skills");
+function syncQwen(plugins) {
+  const targetBase = path2.join(homeDir(), ".qwen", "skills");
   const projectedDirs = [];
   const unsupported = ["hooks", "agents", "commands"];
   for (const plugin of plugins) {
-    if (!plugin.enabled || !plugin.components.skills)
+    if (!plugin.enabled)
       continue;
-    ensureDir(skillsBase);
-    const owned = [];
-    for (const skill of plugin.skills) {
-      const targetPath = path2.join(skillsBase, `${nsName(plugin.pluginName, skill.id)}.md`);
-      copyFileOrDir(skill.path, targetPath);
-      owned.push(`${nsName(plugin.pluginName, skill.id)}.md`);
-      projectedDirs.push(targetPath);
+    if (plugin.components.skills && isComponentApproved(plugin, "skills")) {
+      ensureDir(targetBase);
+      const owned = [];
+      for (const skill of plugin.skills) {
+        const targetDir = path2.join(targetBase, nsName(plugin.pluginName, skill.id));
+        ensureDir(targetDir);
+        copyFileOrDir(skill.path, path2.join(targetDir, "SKILL.md"));
+        owned.push(nsName(plugin.pluginName, skill.id));
+        projectedDirs.push(targetDir);
+      }
+      recordOwned(targetBase, plugin.pluginId, owned);
     }
-    recordOwned(skillsBase, plugin.pluginId, owned);
   }
   return {
-    clientId: "kiro",
+    clientId: "qwen",
     status: "SYNCED",
     projectedDirs,
     unsupported
   };
 }
-function syncQwen(plugins) {
-  const skillsBase = path2.join(homeDir(), ".qwen", "skills");
-  const commandsBase = path2.join(homeDir(), ".qwen", "commands");
+function syncCline(plugins) {
+  const targetBase = path2.join(homeDir(), ".config", "cline", "skills");
   const projectedDirs = [];
-  const unsupported = ["hooks", "agents"];
-  const ownedSkills = [];
-  const ownedCommands = [];
+  const unsupported = ["hooks", "agents", "commands"];
   for (const plugin of plugins) {
     if (!plugin.enabled)
       continue;
-    if (plugin.components.skills) {
-      ensureDir(skillsBase);
+    if (plugin.components.skills && isComponentApproved(plugin, "skills")) {
+      ensureDir(targetBase);
+      const owned = [];
       for (const skill of plugin.skills) {
-        const targetPath = path2.join(skillsBase, `${nsName(plugin.pluginName, skill.id)}.md`);
-        copyFileOrDir(skill.path, targetPath);
-        ownedSkills.push(`${nsName(plugin.pluginName, skill.id)}.md`);
-        projectedDirs.push(targetPath);
+        const targetDir = path2.join(targetBase, nsName(plugin.pluginName, skill.id));
+        ensureDir(targetDir);
+        copyFileOrDir(skill.path, path2.join(targetDir, "SKILL.md"));
+        owned.push(nsName(plugin.pluginName, skill.id));
+        projectedDirs.push(targetDir);
       }
+      recordOwned(targetBase, plugin.pluginId, owned);
     }
-    if (plugin.components.commands) {
-      ensureDir(commandsBase);
-      for (const cmd of plugin.commands) {
-        const targetPath = path2.join(commandsBase, `${nsName(plugin.pluginName, cmd.id)}.md`);
-        copyFileOrDir(cmd.path, targetPath);
-        ownedCommands.push(`${nsName(plugin.pluginName, cmd.id)}.md`);
-        projectedDirs.push(targetPath);
+  }
+  return {
+    clientId: "cline",
+    status: "SYNCED",
+    projectedDirs,
+    unsupported
+  };
+}
+function syncKiro(plugins) {
+  const targetBase = path2.join(homeDir(), ".kiro", "skills");
+  const projectedDirs = [];
+  const unsupported = ["hooks", "agents", "commands"];
+  for (const plugin of plugins) {
+    if (!plugin.enabled)
+      continue;
+    if (plugin.components.skills && isComponentApproved(plugin, "skills")) {
+      ensureDir(targetBase);
+      const owned = [];
+      for (const skill of plugin.skills) {
+        const targetDir = path2.join(targetBase, nsName(plugin.pluginName, skill.id));
+        ensureDir(targetDir);
+        copyFileOrDir(skill.path, path2.join(targetDir, "SKILL.md"));
+        owned.push(nsName(plugin.pluginName, skill.id));
+        projectedDirs.push(targetDir);
       }
+      recordOwned(targetBase, plugin.pluginId, owned);
     }
-    if (ownedSkills.length > 0)
-      recordOwned(skillsBase, plugin.pluginId, ownedSkills);
-    if (ownedCommands.length > 0)
-      recordOwned(commandsBase, plugin.pluginId, ownedCommands);
   }
   return {
-    clientId: "qwen",
+    clientId: "kiro",
     status: "SYNCED",
     projectedDirs,
     unsupported
   };
 }
-var CLIENT_SYNCERS = {
-  claude: syncClaude,
-  "claude-desktop": syncClaudeDesktop,
-  codex: syncCodex,
-  cursor: syncCursor,
-  vscode: syncVsCode,
-  kiro: syncKiro,
-  qwen: syncQwen
-};
 function syncPluginsToClient(clientId, plugins) {
-  const syncer = CLIENT_SYNCERS[clientId];
-  if (!syncer) {
-    return {
-      clientId,
-      status: "SKIPPED",
-      projectedDirs: [],
-      unsupported: ["mcpServers", "skills", "hooks", "agents", "commands"],
-      error: `No plugin sync implementation for ${clientId}`
-    };
+  const syncMap = {
+    claude: syncClaude,
+    "claude-desktop": syncClaudeDesktop,
+    codex: syncCodex,
+    cursor: syncCursor,
+    vscode: syncVsCode,
+    qwen: syncQwen,
+    cline: syncCline,
+    kiro: syncKiro
+  };
+  const syncFn = syncMap[clientId];
+  if (!syncFn) {
+    return { clientId, status: "SKIPPED", projectedDirs: [], unsupported: [] };
+  }
+  const targetBaseMap = {
+    claude: path2.join(homeDir(), ".claude", "skills"),
+    "claude-desktop": "",
+    codex: path2.join(homeDir(), ".codex", "skills"),
+    cursor: path2.join(homeDir(), ".cursor"),
+    vscode: path2.join(homeDir(), ".copilot", "skills"),
+    qwen: path2.join(homeDir(), ".qwen", "skills"),
+    cline: path2.join(homeDir(), ".config", "cline", "skills"),
+    kiro: path2.join(homeDir(), ".kiro", "skills")
+  };
+  const target = targetBaseMap[clientId];
+  if (target) {
+    const enabledIds = plugins.filter((p) => p.enabled).map((p) => p.pluginId);
+    pruneUnlistedPlugins(target, enabledIds);
   }
-  return syncer(plugins);
+  return syncFn(plugins);
 }
 function copyPluginDir(src, dest, exclude = []) {
+  const excludeSet = new Set(exclude);
   ensureDir(dest);
   const entries = fs2.readdirSync(src, { withFileTypes: true });
   for (const entry of entries) {
-    if (exclude.includes(entry.name))
-      continue;
-    if (entry.name.startsWith(".") && entry.name !== ".claude-plugin")
+    if (excludeSet.has(entry.name))
       continue;
     const srcPath = path2.join(src, entry.name);
     const destPath = path2.join(dest, entry.name);
     if (entry.isDirectory()) {
       copyPluginDir(srcPath, destPath, exclude);
-    } else {
-      fs2.mkdirSync(path2.dirname(destPath), { recursive: true });
-      fs2.copyFileSync(srcPath, destPath);
+    } else if (entry.isFile()) {
+      try {
+        fs2.copyFileSync(srcPath, destPath);
+      } catch {}
     }
   }
 }
 function copyFileOrDir(src, dest) {
-  ensureDir(path2.dirname(dest));
-  if (fs2.statSync(src).isDirectory()) {
-    copyPluginDir(src, dest);
-  } else {
-    fs2.copyFileSync(src, dest);
-  }
+  try {
+    ensureDir(path2.dirname(dest));
+    if (fs2.statSync(src).isDirectory()) {
+      copyPluginDir(src, dest);
+    } else {
+      fs2.copyFileSync(src, dest);
+    }
+  } catch {}
 }
 
 // src/adapters/claude.ts
@@ -475,17 +531,21 @@ function removeSourceEntries(entries, names) {
     delete entries[name];
   }
 }
-function syncDisabledMcpServersArray(raw, managedNames, managedEntries) {
-  const existingDisabled = (raw.disabledMcpServers ?? []).filter((name) => !managedNames.includes(name));
-  const disabledManaged = managedEntries.filter((entry) => !entry.enabled).map((entry) => entry.name);
-  raw.disabledMcpServers = [...existingDisabled, ...disabledManaged];
+function purgeManagedFromDisabledArray(raw, managedNames) {
+  const existingDisabled = raw.disabledMcpServers ?? [];
+  raw.disabledMcpServers = existingDisabled.filter((name) => !managedNames.includes(name));
+  if (Array.isArray(raw.disabledMcpServers) && raw.disabledMcpServers.length === 0) {
+    delete raw.disabledMcpServers;
+  }
 }
-function syncMcpExcludedArray(raw, managedNames, managedEntries) {
+function purgeManagedFromExcludedArray(raw, managedNames) {
   const mcp = raw.mcp ?? {};
-  const existingExcluded = (mcp.excluded ?? []).filter((name) => !managedNames.includes(name));
-  const disabledManaged = managedEntries.filter((entry) => !entry.enabled).map((entry) => entry.name);
-  mcp.excluded = [...existingExcluded, ...disabledManaged];
-  raw.mcp = mcp;
+  const existingExcluded = mcp.excluded ?? [];
+  mcp.excluded = existingExcluded.filter((name) => !managedNames.includes(name));
+  if (Array.isArray(mcp.excluded) && mcp.excluded.length === 0) {
+    delete mcp.excluded;
+  }
+  raw.mcp = Object.keys(mcp).length > 0 ? mcp : undefined;
 }
 
 // src/adapters/claude.ts
@@ -619,7 +679,7 @@ class ClaudeAdapter {
         topLevelServers[name] = entry;
       }
       raw.mcpServers = topLevelServers;
-      syncDisabledMcpServersArray(raw, managedNames, options.managedEntries);
+      purgeManagedFromDisabledArray(raw, managedNames);
       const scopeByNormalizedPath = new Map;
       for (const scope of options.projectScopes ?? []) {
         scopeByNormalizedPath.set(normalizeProjectKey(scope.path), scope.disabledServerNames);
@@ -883,8 +943,7 @@ class CodexAdapter {
       const mcpServers = doc.mcp_servers ?? {};
       removeSourceEntries(mcpServers, options.sourceEntriesToRemove);
       const managedNames = options.managedEntries.map((entry) => entry.name);
-      const serverEntries = Object.fromEntries(options.managedEntries.map((entry) => [entry.name, {
-        enabled: entry.enabled,
+      const serverEntries = Object.fromEntries(options.managedEntries.filter((entry) => entry.enabled).map((entry) => [entry.name, {
         url: entry.url,
         http_headers: entry.headers
       }]));
@@ -1162,11 +1221,10 @@ class ClineAdapter {
       };
       removeSourceEntries(servers, options.sourceEntriesToRemove);
       const managedNames = options.managedEntries.map((entry) => entry.name);
-      const serverEntries = Object.fromEntries(options.managedEntries.map((entry) => [entry.name, {
+      const serverEntries = Object.fromEntries(options.managedEntries.filter((entry) => entry.enabled).map((entry) => [entry.name, {
         type: "streamableHttp",
         url: entry.url,
-        headers: entry.headers,
-        disabled: !entry.enabled
+        headers: entry.headers
       }]));
       for (const name of managedNames) {
         const conflict = ensureManagedEntryWritable(options.managedIndex, this.id, name, servers[name]);
@@ -1286,10 +1344,9 @@ class KiroAdapter {
       };
       removeSourceEntries(servers, options.sourceEntriesToRemove);
       const managedNames = options.managedEntries.map((entry) => entry.name);
-      const serverEntries = Object.fromEntries(options.managedEntries.map((entry) => [entry.name, {
+      const serverEntries = Object.fromEntries(options.managedEntries.filter((entry) => entry.enabled).map((entry) => [entry.name, {
         url: entry.url,
-        headers: entry.headers,
-        disabled: !entry.enabled
+        headers: entry.headers
       }]));
       for (const name of managedNames) {
         const conflict = ensureManagedEntryWritable(options.managedIndex, this.id, name, servers[name]);
@@ -1431,11 +1488,10 @@ class OpenCodeAdapter {
       };
       removeSourceEntries(mcp, options.sourceEntriesToRemove);
       const managedNames = options.managedEntries.map((entry) => entry.name);
-      const serverEntries = Object.fromEntries(options.managedEntries.map((entry) => [entry.name, {
+      const serverEntries = Object.fromEntries(options.managedEntries.filter((entry) => entry.enabled).map((entry) => [entry.name, {
         type: "remote",
         url: entry.url,
-        headers: entry.headers,
-        enabled: entry.enabled
+        headers: entry.headers
       }]));
       for (const name of managedNames) {
         const conflict = ensureManagedEntryWritable(options.managedIndex, this.id, name, mcp[name]);
@@ -1581,9 +1637,9 @@ class VsCodeAdapter {
         servers
       };
       writeJsonAtomic(configPath, next);
-      setManagedEntries(options.managedIndex, this.id, configPath, Object.fromEntries(options.managedEntries.map((entry) => [
+      setManagedEntries(options.managedIndex, this.id, configPath, Object.fromEntries(enabledEntries.map((entry) => [
         entry.name,
-        JSON.stringify({ type: "http", url: entry.url, headers: entry.headers, enabled: entry.enabled })
+        JSON.stringify({ type: "http", url: entry.url, headers: entry.headers })
       ])));
       return okResult(this.id, configPath);
     } catch (error) {
@@ -1714,7 +1770,7 @@ class QwenAdapter {
         topLevelServers[name] = entry;
       }
       raw.mcpServers = topLevelServers;
-      syncMcpExcludedArray(raw, managedNames, options.managedEntries);
+      purgeManagedFromExcludedArray(raw, managedNames);
       writeJsonAtomic(configPath, raw);
       setManagedEntries(options.managedIndex, this.id, configPath, Object.fromEntries(options.managedEntries.map((entry) => [
         entry.name,
@@ -1795,33 +1851,28 @@ function buildProjectScopes(config) {
   });
 }
 function buildManagedEntries(config, gatewayUrl, localToken) {
-  const entries = Object.entries(config.servers);
-  return entries.map(([name, spec]) => ({
+  return Object.entries(config.servers).map(([name, spec]) => ({
     name: `${name} (mcpx)`,
     url: `${gatewayUrl}?upstream=${encodeURIComponent(name)}`,
-    headers: {
-      Authorization: `Bearer ${localToken}`
-    },
+    headers: { Authorization: `Bearer ${localToken}` },
     enabled: isServerEnabled(spec)
   }));
 }
 function isClientInternalServerCommand(candidate) {
   return candidate.spec.transport === "stdio" && /\.app\/Contents\//.test(candidate.spec.command ?? "");
 }
-function syncAllClients(config, secrets, targetClients) {
+function getFilteredAdapters(targetClients) {
   const adapters = getAdapters();
-  const managedIndexPath = getManagedIndexPath();
-  const managedIndex = loadManagedIndex(managedIndexPath);
-  const filteredAdapters = targetClients && targetClients.length > 0 ? adapters.filter((adapter) => targetClients.includes(adapter.id)) : adapters;
-  const imports = {
-    imported: [],
-    duplicates: [],
-    skipped: [],
-    conflicts: [],
-    errors: []
-  };
+  if (targetClients && targetClients.length > 0) {
+    return adapters.filter((a) => targetClients.includes(a.id));
+  }
+  return adapters;
+}
+function runImportPhase(adapters, config, managedIndex) {
+  const imports = { imported: [], duplicates: [], skipped: [], conflicts: [], errors: [] };
   const sourceEntriesToRemove = new Map;
-  for (const adapter of filteredAdapters) {
+  const phaseErrors = [];
+  for (const adapter of adapters) {
     try {
       const scan = adapter.scanForImports(config, managedIndex);
       imports.skipped.push(...scan.skipped);
@@ -1848,7 +1899,7 @@ function syncAllClients(config, secrets, targetClients) {
           if (!sourceEntriesToRemove.has(candidate.clientId)) {
             sourceEntriesToRemove.set(candidate.clientId, new Set);
           }
-          sourceEntriesToRemove.get(candidate.clientId)?.add(candidate.sourceEntryName);
+          sourceEntriesToRemove.get(candidate.clientId).add(candidate.sourceEntryName);
           continue;
         }
         if (serverSpecsEqual(existing, candidate.spec)) {
@@ -1861,7 +1912,7 @@ function syncAllClients(config, secrets, targetClients) {
           if (!sourceEntriesToRemove.has(candidate.clientId)) {
             sourceEntriesToRemove.set(candidate.clientId, new Set);
           }
-          sourceEntriesToRemove.get(candidate.clientId)?.add(candidate.sourceEntryName);
+          sourceEntriesToRemove.get(candidate.clientId).add(candidate.sourceEntryName);
           continue;
         }
         imports.conflicts.push({
@@ -1878,13 +1929,111 @@ function syncAllClients(config, secrets, targetClients) {
         configPath: adapter.detectConfigPath() ?? undefined,
         message: error instanceof Error ? error.message : String(error)
       });
+      phaseErrors.push({
+        clientId: adapter.id,
+        phase: "import",
+        message: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  return { imports, sourceEntriesToRemove, phaseErrors };
+}
+function runSkillsPhase(adapters, skills) {
+  const phaseErrors = [];
+  for (const adapter of adapters) {
+    if (adapter.syncSkills) {
+      try {
+        adapter.syncSkills(skills);
+      } catch (error) {
+        phaseErrors.push({
+          clientId: adapter.id,
+          phase: "skills",
+          message: error instanceof Error ? error.message : String(error)
+        });
+      }
+    }
+  }
+  return phaseErrors;
+}
+function runPluginsPhase(adapters, pluginInputs) {
+  const pluginResults = [];
+  const phaseErrors = [];
+  for (const adapter of adapters) {
+    if (adapter.syncPlugins) {
+      try {
+        const result = adapter.syncPlugins(pluginInputs);
+        if (result)
+          pluginResults.push(result);
+      } catch (error) {
+        phaseErrors.push({
+          clientId: adapter.id,
+          phase: "plugins",
+          message: error instanceof Error ? error.message : String(error)
+        });
+      }
+    }
+  }
+  return { pluginResults, phaseErrors };
+}
+function runGatewayPhase(adapters, config, managedEntries, managedIndex, managedIndexPath, sourceEntriesToRemove, projectScopes) {
+  const results = [];
+  const phaseErrors = [];
+  for (const adapter of adapters) {
+    if (!adapter.supportsHttp()) {
+      results.push({
+        clientId: adapter.id,
+        status: "UNSUPPORTED_HTTP",
+        message: "Client adapter does not support MCP over HTTP."
+      });
+      continue;
+    }
+    try {
+      const result = adapter.syncGateway(config, {
+        managedEntries,
+        managedIndex,
+        managedIndexPath,
+        sourceEntriesToRemove: Array.from(sourceEntriesToRemove.get(adapter.id) ?? []),
+        projectScopes
+      });
+      results.push(result);
+    } catch (error) {
+      results.push({
+        clientId: adapter.id,
+        status: "ERROR",
+        message: error instanceof Error ? error.message : String(error)
+      });
+      phaseErrors.push({
+        clientId: adapter.id,
+        phase: "gateway",
+        message: error instanceof Error ? error.message : String(error)
+      });
     }
   }
+  return { results, phaseErrors };
+}
+function syncAllClients(config, secrets, options) {
+  const opts = Array.isArray(options) ? { targetClients: options, importScan: false } : { importScan: false, ...options };
+  const managedIndexPath = getManagedIndexPath();
+  const managedIndex = loadManagedIndex(managedIndexPath);
+  const adapters = getFilteredAdapters(opts.targetClients);
+  const allPhaseErrors = [];
+  let imports = { imported: [], duplicates: [], skipped: [], conflicts: [], errors: [] };
+  let sourceEntriesToRemove = new Map;
+  if (opts.importScan) {
+    const importResult = runImportPhase(adapters, config, managedIndex);
+    imports = importResult.imports;
+    sourceEntriesToRemove = importResult.sourceEntriesToRemove;
+    allPhaseErrors.push(...importResult.phaseErrors ?? []);
+  }
   const localToken = ensureGatewayToken(config, secrets);
   const gatewayUrl = getGatewayUrl(config);
   const managedEntries = buildManagedEntries(config, gatewayUrl, localToken);
+  const gatewayResult = runGatewayPhase(adapters, config, managedEntries, managedIndex, managedIndexPath, sourceEntriesToRemove, buildProjectScopes(config));
+  const results = gatewayResult.results;
+  allPhaseErrors.push(...gatewayResult.phaseErrors ?? []);
   const skills = listSkills();
-  const results = [];
+  const skillsErrors = runSkillsPhase(adapters, skills);
+  allPhaseErrors.push(...skillsErrors ?? []);
   const pluginInputs = Object.values(config.plugins ?? {}).map((p) => ({
     pluginId: p.id,
     pluginName: p.name,
@@ -1898,51 +2047,36 @@ function syncAllClients(config, secrets, targetClients) {
     agents: p.discovered.agents,
     hooks: p.discovered.hooks
   }));
-  for (const adapter of filteredAdapters) {
-    if (adapter.syncSkills) {
-      try {
-        adapter.syncSkills(skills);
-      } catch (error) {}
-    }
-    if (adapter.syncPlugins && pluginInputs.length > 0) {
-      try {
-        adapter.syncPlugins(pluginInputs);
-      } catch (error) {}
-    }
-    if (!adapter.supportsHttp()) {
-      results.push({
-        clientId: adapter.id,
-        status: "UNSUPPORTED_HTTP",
-        message: "Client adapter does not support MCP over HTTP."
-      });
-      continue;
-    }
-    const result = adapter.syncGateway(config, {
-      managedEntries,
-      managedIndex,
-      managedIndexPath,
-      sourceEntriesToRemove: Array.from(sourceEntriesToRemove.get(adapter.id) ?? []),
-      projectScopes: buildProjectScopes(config)
-    });
-    results.push(result);
-  }
+  const pluginResult = runPluginsPhase(adapters, pluginInputs);
+  const pluginResults = pluginResult.pluginResults;
+  allPhaseErrors.push(...pluginResult.phaseErrors ?? []);
+  saveManagedIndex(managedIndex, managedIndexPath);
+  const clientStates = {};
   for (const result of results) {
-    config.clients[result.clientId] = {
+    clientStates[result.clientId] = {
       status: result.status,
       configPath: result.configPath,
       message: result.message,
       lastSyncAt: new Date().toISOString()
     };
   }
-  saveManagedIndex(managedIndex, managedIndexPath);
-  saveConfig(config);
-  const hasErrors = results.some((result) => result.status === "ERROR") || imports.conflicts.length > 0 || imports.errors.length > 0;
+  const hasErrors = results.some((r) => r.status === "ERROR") || imports.conflicts.length > 0 || imports.errors.length > 0;
   return {
     gatewayUrl,
     imports,
     results,
-    hasErrors
+    hasErrors,
+    clientStates,
+    phaseErrors: allPhaseErrors.length > 0 ? allPhaseErrors : undefined,
+    pluginResults: pluginResults.length > 0 ? pluginResults : undefined
   };
 }
+function persistSyncState(summary, config) {
+  if (!summary.clientStates)
+    return;
+  for (const [clientId, state] of Object.entries(summary.clientStates)) {
+    config.clients[clientId] = state;
+  }
+}
 
-export { listSkills, getSkill, saveSkill, deleteSkill, prunePluginProjections, pruneAllPluginProjections, syncPluginsToClient, getAdapters, loadManagedIndex, getGatewayUrl, syncAllClients };
+export { listSkills, getSkill, saveSkill, deleteSkill, prunePluginProjections, pruneAllPluginProjections, syncPluginsToClient, getAdapters, loadManagedIndex, getGatewayUrl, syncAllClients, persistSyncState };