allagents 0.23.0 → 0.24.1

package/dist/index.js

@@ -11453,7 +11453,13 @@ var init_zod = __esm(() => {
 });
 
 // src/models/workspace-config.ts
-var RepositorySchema, WorkspaceFileSchema, WorkspaceSchema, PluginSourceSchema, ClientTypeSchema, VscodeConfigSchema, SyncModeSchema, WorkspaceConfigSchema;
+function getPluginSource(plugin) {
+  return typeof plugin === "string" ? plugin : plugin.source;
+}
+function getPluginClients(plugin) {
+  return typeof plugin === "string" ? undefined : plugin.clients;
+}
+var RepositorySchema, WorkspaceFileSchema, WorkspaceSchema, PluginSourceSchema, ClientTypeSchema, PluginEntrySchema, VscodeConfigSchema, SyncModeSchema, WorkspaceConfigSchema;
 var init_workspace_config = __esm(() => {
   init_zod();
   RepositorySchema = exports_external.object({
@@ -11497,7 +11503,15 @@ var init_workspace_config = __esm(() => {
     "openhands",
     "kiro",
     "replit",
-    "kimi"
+    "kimi",
+    "universal"
+  ]);
+  PluginEntrySchema = exports_external.union([
+    PluginSourceSchema,
+    exports_external.object({
+      source: PluginSourceSchema,
+      clients: exports_external.array(ClientTypeSchema).optional()
+    })
   ]);
   VscodeConfigSchema = exports_external.object({
     output: exports_external.string().optional()
@@ -11506,7 +11520,7 @@ var init_workspace_config = __esm(() => {
   WorkspaceConfigSchema = exports_external.object({
     workspace: WorkspaceSchema.optional(),
     repositories: exports_external.array(RepositorySchema),
-    plugins: exports_external.array(PluginSourceSchema),
+    plugins: exports_external.array(PluginEntrySchema),
     clients: exports_external.array(ClientTypeSchema),
     vscode: VscodeConfigSchema.optional(),
     syncMode: SyncModeSchema.optional(),
@@ -21386,7 +21400,7 @@ var init_glob_patterns = __esm(() => {
 
 // src/models/client-mapping.ts
 function isUniversalClient(client) {
-  return CLIENT_MAPPINGS[client].skillsPath === CANONICAL_SKILLS_PATH;
+  return client === "universal";
 }
 var CLIENT_MAPPINGS, CANONICAL_SKILLS_PATH = ".agents/skills/", USER_CLIENT_MAPPINGS;
 var init_client_mapping = __esm(() => {
@@ -21400,12 +21414,12 @@ var init_client_mapping = __esm(() => {
       hooksPath: ".claude/hooks/"
     },
     copilot: {
-      skillsPath: ".agents/skills/",
+      skillsPath: ".github/skills/",
       agentFile: "AGENTS.md",
       githubPath: ".github/"
     },
     codex: {
-      skillsPath: ".agents/skills/",
+      skillsPath: ".codex/skills/",
       agentFile: "AGENTS.md"
     },
     cursor: {
@@ -21414,11 +21428,11 @@ var init_client_mapping = __esm(() => {
     },
     opencode: {
       commandsPath: ".opencode/commands/",
-      skillsPath: ".agents/skills/",
+      skillsPath: ".opencode/skills/",
       agentFile: "AGENTS.md"
     },
     gemini: {
-      skillsPath: ".agents/skills/",
+      skillsPath: ".gemini/skills/",
       agentFile: "GEMINI.md",
       agentFileFallback: "AGENTS.md"
     },
@@ -21428,11 +21442,11 @@ var init_client_mapping = __esm(() => {
       hooksPath: ".factory/hooks/"
     },
     ampcode: {
-      skillsPath: ".agents/skills/",
+      skillsPath: ".ampcode/skills/",
       agentFile: "AGENTS.md"
     },
     vscode: {
-      skillsPath: ".agents/skills/",
+      skillsPath: ".github/skills/",
       agentFile: "AGENTS.md",
       githubPath: ".github/"
     },
@@ -21485,10 +21499,14 @@ var init_client_mapping = __esm(() => {
       agentFile: "AGENTS.md"
     },
     replit: {
-      skillsPath: ".agents/skills/",
+      skillsPath: ".replit/skills/",
       agentFile: "AGENTS.md"
     },
     kimi: {
+      skillsPath: ".kimi/skills/",
+      agentFile: "AGENTS.md"
+    },
+    universal: {
       skillsPath: ".agents/skills/",
       agentFile: "AGENTS.md"
     }
@@ -21503,12 +21521,12 @@ var init_client_mapping = __esm(() => {
       hooksPath: ".claude/hooks/"
     },
     copilot: {
-      skillsPath: ".agents/skills/",
+      skillsPath: ".copilot/skills/",
       agentFile: "AGENTS.md",
       githubPath: ".copilot/"
     },
     codex: {
-      skillsPath: ".agents/skills/",
+      skillsPath: ".codex/skills/",
       agentFile: "AGENTS.md"
     },
     cursor: {
@@ -21517,11 +21535,11 @@ var init_client_mapping = __esm(() => {
     },
     opencode: {
       commandsPath: ".opencode/commands/",
-      skillsPath: ".agents/skills/",
+      skillsPath: ".opencode/skills/",
       agentFile: "AGENTS.md"
     },
     gemini: {
-      skillsPath: ".agents/skills/",
+      skillsPath: ".gemini/skills/",
       agentFile: "GEMINI.md",
       agentFileFallback: "AGENTS.md"
     },
@@ -21531,11 +21549,11 @@ var init_client_mapping = __esm(() => {
       hooksPath: ".factory/hooks/"
     },
     ampcode: {
-      skillsPath: ".agents/skills/",
+      skillsPath: ".ampcode/skills/",
       agentFile: "AGENTS.md"
     },
     vscode: {
-      skillsPath: ".agents/skills/",
+      skillsPath: ".copilot/skills/",
       agentFile: "AGENTS.md",
       githubPath: ".copilot/"
     },
@@ -21588,10 +21606,14 @@ var init_client_mapping = __esm(() => {
       agentFile: "AGENTS.md"
     },
     replit: {
-      skillsPath: ".agents/skills/",
+      skillsPath: ".replit/skills/",
       agentFile: "AGENTS.md"
     },
     kimi: {
+      skillsPath: ".kimi/skills/",
+      agentFile: "AGENTS.md"
+    },
+    universal: {
       skillsPath: ".agents/skills/",
       agentFile: "AGENTS.md"
     }
@@ -26059,9 +26081,12 @@ async function hasUserPlugin(plugin) {
   const config = await getUserWorkspaceConfig();
   if (!config)
     return false;
-  if (config.plugins.indexOf(plugin) !== -1)
+  if (config.plugins.some((entry) => getPluginSource(entry) === plugin))
     return true;
-  return config.plugins.some((p) => p.startsWith(`${plugin}@`) || p === plugin);
+  return config.plugins.some((entry) => {
+    const source = getPluginSource(entry);
+    return source.startsWith(`${plugin}@`) || source === plugin;
+  });
 }
 async function removeUserPlugin(plugin) {
   await ensureUserWorkspace();
@@ -26069,9 +26094,12 @@ async function removeUserPlugin(plugin) {
   try {
     const content = await readFile6(configPath, "utf-8");
     const config = load(content);
-    let index = config.plugins.indexOf(plugin);
+    let index = config.plugins.findIndex((entry) => getPluginSource(entry) === plugin);
     if (index === -1) {
-      index = config.plugins.findIndex((p) => p.startsWith(`${plugin}@`) || p === plugin);
+      index = config.plugins.findIndex((entry) => {
+        const source = getPluginSource(entry);
+        return source.startsWith(`${plugin}@`) || source === plugin;
+      });
     }
     if (index === -1) {
       const identity = await resolveGitHubIdentity(plugin);
@@ -26080,7 +26108,7 @@ async function removeUserPlugin(plugin) {
           const p = config.plugins[i2];
           if (!p)
             continue;
-          const existing = await resolveGitHubIdentity(p);
+          const existing = await resolveGitHubIdentity(getPluginSource(p));
           if (existing === identity) {
             index = i2;
             break;
@@ -26094,7 +26122,7 @@ async function removeUserPlugin(plugin) {
         error: `Plugin not found in user config: ${plugin}`
       };
     }
-    const removedEntry = config.plugins[index];
+    const removedEntry = getPluginSource(config.plugins[index]);
     config.plugins.splice(index, 1);
     pruneDisabledSkillsForPlugin(config, removedEntry);
     await writeFile2(configPath, dump(config, { lineWidth: -1 }), "utf-8");
@@ -26110,8 +26138,8 @@ async function getUserPluginsForMarketplace(marketplaceName) {
   const config = await getUserWorkspaceConfig();
   if (!config)
     return [];
-  return config.plugins.filter((p) => {
-    const parsed = parsePluginSpec(p);
+  return config.plugins.map((entry) => getPluginSource(entry)).filter((source) => {
+    const parsed = parsePluginSpec(source);
     return parsed?.marketplaceName === marketplaceName;
   });
 }
@@ -26119,16 +26147,16 @@ async function removeUserPluginsForMarketplace(marketplaceName) {
   const config = await getUserWorkspaceConfig();
   if (!config)
     return [];
-  const matching = config.plugins.filter((p) => {
-    const parsed = parsePluginSpec(p);
+  const matching = config.plugins.filter((entry) => {
+    const parsed = parsePluginSpec(getPluginSource(entry));
     return parsed?.marketplaceName === marketplaceName;
   });
   if (matching.length === 0)
     return [];
   const configPath = getUserWorkspaceConfigPath();
-  config.plugins = config.plugins.filter((p) => !matching.includes(p));
+  config.plugins = config.plugins.filter((entry) => !matching.includes(entry));
   await writeFile2(configPath, dump(config, { lineWidth: -1 }), "utf-8");
-  return matching;
+  return matching.map((entry) => getPluginSource(entry));
 }
 async function resolveGitHubIdentity(pluginSource) {
   if (isGitHubUrl(pluginSource)) {
@@ -26157,7 +26185,7 @@ async function addPluginToUserConfig(plugin, configPath, autoRegistered) {
   try {
     const content = await readFile6(configPath, "utf-8");
     const config = load(content);
-    if (config.plugins.includes(plugin)) {
+    if (config.plugins.some((entry) => getPluginSource(entry) === plugin)) {
       return {
         success: false,
         error: `Plugin already exists in user config: ${plugin}`
@@ -26166,11 +26194,12 @@ async function addPluginToUserConfig(plugin, configPath, autoRegistered) {
     const newIdentity = await resolveGitHubIdentity(plugin);
     if (newIdentity) {
       for (const existing of config.plugins) {
-        const existingIdentity = await resolveGitHubIdentity(existing);
+        const existingSource = getPluginSource(existing);
+        const existingIdentity = await resolveGitHubIdentity(existingSource);
         if (existingIdentity === newIdentity) {
           return {
             success: false,
-            error: `Plugin duplicates existing entry '${existing}': both resolve to ${newIdentity}`
+            error: `Plugin duplicates existing entry '${existingSource}': both resolve to ${newIdentity}`
           };
         }
       }
@@ -26263,7 +26292,8 @@ async function getInstalledUserPlugins() {
   if (!config)
     return [];
   const result = [];
-  for (const plugin of config.plugins) {
+  for (const pluginEntry of config.plugins) {
+    const plugin = getPluginSource(pluginEntry);
     const parsed = parsePluginSpec(plugin);
     if (parsed) {
       result.push({
@@ -26286,7 +26316,8 @@ async function getInstalledProjectPlugins(workspacePath) {
     if (!config?.plugins)
       return [];
     const result = [];
-    for (const plugin of config.plugins) {
+    for (const pluginEntry of config.plugins) {
+      const plugin = getPluginSource(pluginEntry);
       const parsed = parsePluginSpec(plugin);
       if (parsed) {
         result.push({
@@ -26306,6 +26337,7 @@ var DEFAULT_USER_CLIENTS;
 var init_user_workspace = __esm(() => {
   init_js_yaml();
   init_constants();
+  init_workspace_config();
   init_marketplace_manifest_parser();
   init_plugin_path();
   init_marketplace();
@@ -27015,7 +27047,7 @@ async function addPluginToConfig(plugin, configPath, autoRegistered) {
   try {
     const content = await readFile8(configPath, "utf-8");
     const config = load(content);
-    if (config.plugins.includes(plugin)) {
+    if (config.plugins.some((entry) => getPluginSource(entry) === plugin)) {
       return {
         success: false,
         error: `Plugin already exists in .allagents/workspace.yaml: ${plugin}`
@@ -27043,10 +27075,13 @@ async function hasPlugin(plugin, workspacePath = process.cwd()) {
   try {
     const content = await readFile8(configPath, "utf-8");
     const config = load(content);
-    if (config.plugins.indexOf(plugin) !== -1)
+    if (config.plugins.some((entry) => getPluginSource(entry) === plugin))
       return true;
     if (!isPluginSpec(plugin)) {
-      return config.plugins.some((p) => p.startsWith(`${plugin}@`) || p === plugin);
+      return config.plugins.some((entry) => {
+        const source = getPluginSource(entry);
+        return source.startsWith(`${plugin}@`) || source === plugin;
+      });
     }
     return false;
   } catch {
@@ -27065,9 +27100,12 @@ async function removePlugin(plugin, workspacePath = process.cwd()) {
   try {
     const content = await readFile8(configPath, "utf-8");
     const config = load(content);
-    let index = config.plugins.indexOf(plugin);
+    let index = config.plugins.findIndex((entry) => getPluginSource(entry) === plugin);
     if (index === -1 && isPluginSpec(plugin) === false) {
-      index = config.plugins.findIndex((p) => p.startsWith(`${plugin}@`) || p === plugin);
+      index = config.plugins.findIndex((entry) => {
+        const source = getPluginSource(entry);
+        return source.startsWith(`${plugin}@`) || source === plugin;
+      });
     }
     if (index === -1) {
       return {
@@ -27075,7 +27113,7 @@ async function removePlugin(plugin, workspacePath = process.cwd()) {
         error: `Plugin not found in .allagents/workspace.yaml: ${plugin}`
       };
     }
-    const removedEntry = config.plugins[index];
+    const removedEntry = getPluginSource(config.plugins[index]);
     config.plugins.splice(index, 1);
     pruneDisabledSkillsForPlugin(config, removedEntry);
     const newContent = dump(config, { lineWidth: -1 });
@@ -27173,6 +27211,7 @@ var DEFAULT_PROJECT_CLIENTS;
 var init_workspace_modify = __esm(() => {
   init_js_yaml();
   init_constants();
+  init_workspace_config();
   init_plugin_path();
   init_marketplace();
   DEFAULT_PROJECT_CLIENTS = [
@@ -27837,6 +27876,9 @@ function mergeSyncResults(a, b) {
     ...mcpResult && { mcpResult }
   };
 }
+function collectSyncClients(workspaceClients, plans) {
+  return [...new Set([...workspaceClients, ...plans.flatMap((plan) => plan.clients)])];
+}
 async function selectivePurgeWorkspace(workspacePath, state, clients, options2) {
   if (!state) {
     return [];
@@ -28048,6 +28090,7 @@ async function validatePlugin(pluginSource, workspacePath, offline) {
         plugin: pluginSource,
         resolved: "",
         success: false,
+        clients: [],
         error: resolved.error || "Unknown error"
       };
     }
@@ -28055,6 +28098,7 @@ async function validatePlugin(pluginSource, workspacePath, offline) {
       plugin: pluginSource,
       resolved: resolved.path ?? "",
       success: true,
+      clients: [],
       ...resolved.pluginName && { pluginName: resolved.pluginName }
     };
   }
@@ -28069,6 +28113,7 @@ async function validatePlugin(pluginSource, workspacePath, offline) {
         plugin: pluginSource,
         resolved: "",
         success: false,
+        clients: [],
         ...fetchResult.error && { error: fetchResult.error }
       };
     }
@@ -28076,7 +28121,8 @@ async function validatePlugin(pluginSource, workspacePath, offline) {
     return {
       plugin: pluginSource,
       resolved: resolvedPath2,
-      success: true
+      success: true,
+      clients: []
     };
   }
   const resolvedPath = resolve9(workspacePath, pluginSource);
@@ -28085,36 +28131,39 @@ async function validatePlugin(pluginSource, workspacePath, offline) {
       plugin: pluginSource,
       resolved: resolvedPath,
       success: false,
+      clients: [],
       error: `Plugin not found at ${resolvedPath}`
     };
   }
   return {
     plugin: pluginSource,
     resolved: resolvedPath,
-    success: true
+    success: true,
+    clients: []
   };
 }
-async function validateAllPlugins(plugins, workspacePath, offline) {
-  return Promise.all(plugins.map((plugin) => validatePlugin(plugin, workspacePath, offline)));
+function buildPluginSyncPlans(plugins, workspaceClients, selectedClients) {
+  const selected = selectedClients ? new Set(selectedClients) : null;
+  return plugins.map((plugin) => {
+    const source = getPluginSource(plugin);
+    const configuredClients = getPluginClients(plugin) ?? workspaceClients;
+    const clients = selected ? configuredClients.filter((client) => selected.has(client)) : configuredClients;
+    return { source, clients };
+  });
+}
+async function validateAllPlugins(plans, workspacePath, offline) {
+  return Promise.all(plans.map(async ({ source, clients }) => {
+    const validated = await validatePlugin(source, workspacePath, offline);
+    return { ...validated, clients };
+  }));
 }
 async function copyValidatedPlugin(validatedPlugin, workspacePath, clients, dryRun, skillNameMap, clientMappings, syncMode = "symlink") {
   const copyResults = [];
   const mappings = clientMappings ?? CLIENT_MAPPINGS;
   const clientList = clients;
-  if (syncMode === "symlink") {
+  const hasUniversalClient = clientList.some((c) => isUniversalClient(c));
+  if (syncMode === "symlink" && hasUniversalClient) {
     const { representativeClients } = deduplicateClientsByPath(clientList, mappings);
-    const canonicalRepresentative = representativeClients.find((c) => mappings[c]?.skillsPath === CANONICAL_SKILLS_PATH);
-    const needsCanonicalCopy = !canonicalRepresentative;
-    const nonUniversalClients = clientList.filter((c) => !isUniversalClient(c));
-    if (needsCanonicalCopy && nonUniversalClients.length > 0) {
-      const canonicalResults = await copyPluginToWorkspace(validatedPlugin.resolved, workspacePath, "copilot", {
-        dryRun,
-        ...skillNameMap && { skillNameMap },
-        syncMode: "copy"
-      });
-      const skillResults = canonicalResults.filter((r) => r.destination.includes(CANONICAL_SKILLS_PATH) && r.action === "copied");
-      copyResults.push(...skillResults);
-    }
     for (const representative of representativeClients) {
       if (isUniversalClient(representative)) {
         const results = await copyPluginToWorkspace(validatedPlugin.resolved, workspacePath, representative, {
@@ -28247,9 +28296,15 @@ async function syncWorkspace(workspacePath = process.cwd(), options2 = {}) {
     };
   }
   const hasRepositories = (config.repositories?.length ?? 0) > 0;
-  const clients = options2.clients ? config.clients.filter((c) => options2.clients?.includes(c)) : config.clients;
+  const workspaceClients = options2.clients ? config.clients.filter((c) => options2.clients?.includes(c)) : config.clients;
   if (options2.clients) {
-    const invalidClients = options2.clients.filter((c) => !config.clients.includes(c));
+    const availableClients = new Set(config.clients);
+    for (const plugin of config.plugins) {
+      for (const client of getPluginClients(plugin) ?? []) {
+        availableClients.add(client);
+      }
+    }
+    const invalidClients = options2.clients.filter((c) => !availableClients.has(c));
     if (invalidClients.length > 0) {
       return {
         success: false,
@@ -28259,12 +28314,15 @@ async function syncWorkspace(workspacePath = process.cwd(), options2 = {}) {
         totalSkipped: 0,
         totalGenerated: 0,
         error: `Client(s) not configured in workspace.yaml: ${invalidClients.join(", ")}
-  Configured clients: ${config.clients.join(", ")}`
+  Configured clients: ${Array.from(availableClients).join(", ")}`
       };
     }
   }
-  await ensureMarketplacesRegistered(config.plugins);
-  const validatedPlugins = await validateAllPlugins(config.plugins, workspacePath, offline);
+  const selectedClients = options2.clients;
+  const pluginPlans = buildPluginSyncPlans(config.plugins, config.clients, selectedClients).filter((plan) => plan.clients.length > 0);
+  const syncClients = collectSyncClients(workspaceClients, pluginPlans);
+  await ensureMarketplacesRegistered(pluginPlans.map((plan) => plan.source));
+  const validatedPlugins = await validateAllPlugins(pluginPlans, workspacePath, offline);
   let validatedWorkspaceSource = null;
   if (config.workspace?.source) {
     const sourceBasePath = workspaceSourceBase ?? workspacePath;
@@ -28284,7 +28342,7 @@ async function syncWorkspace(workspacePath = process.cwd(), options2 = {}) {
   const failedValidations = validatedPlugins.filter((v) => !v.success);
   const validPlugins = validatedPlugins.filter((v) => v.success);
   const warnings = failedValidations.map((v) => `${v.plugin}: ${v.error} (skipped)`);
-  if (validPlugins.length === 0 && config.plugins.length > 0) {
+  if (validPlugins.length === 0 && pluginPlans.length > 0) {
     return {
       success: false,
       pluginResults: [],
@@ -28299,12 +28357,12 @@ ${failedValidations.map((v) => `  - ${v.plugin}: ${v.error}`).join(`
     };
   }
   const previousState = await loadSyncState(workspacePath);
-  const purgedPaths = previousState ? clients.map((client) => ({
+  const purgedPaths = previousState ? syncClients.map((client) => ({
     client,
     paths: getPreviouslySyncedFiles(previousState, client)
   })).filter((p) => p.paths.length > 0) : [];
   if (!dryRun) {
-    await selectivePurgeWorkspace(workspacePath, previousState, clients, {
+    await selectivePurgeWorkspace(workspacePath, previousState, syncClients, {
       partialSync: !!options2.clients
     });
   }
@@ -28314,7 +28372,7 @@ ${failedValidations.map((v) => `  - ${v.plugin}: ${v.error}`).join(`
   const syncMode = config.syncMode ?? "symlink";
   const pluginResults = await Promise.all(validPlugins.map((validatedPlugin) => {
     const skillNameMap = pluginSkillMaps.get(validatedPlugin.resolved);
-    return copyValidatedPlugin(validatedPlugin, workspacePath, clients, dryRun, skillNameMap, undefined, syncMode);
+    return copyValidatedPlugin(validatedPlugin, workspacePath, validatedPlugin.clients, dryRun, skillNameMap, undefined, syncMode);
   }));
   let workspaceFileResults = [];
   if (config.workspace) {
@@ -28362,7 +28420,7 @@ ${fileValidationErrors.map((e) => `  - ${e}`).join(`
       };
     }
     workspaceFileResults = await copyWorkspaceFiles(sourcePath, workspacePath, filesToCopy, { dryRun, githubCache, repositories: config.repositories });
-    if (hasRepositories && !dryRun && clients.includes("claude") && sourcePath) {
+    if (hasRepositories && !dryRun && syncClients.includes("claude") && sourcePath) {
       const claudePath = join15(workspacePath, "CLAUDE.md");
       const agentsPath = join15(workspacePath, "AGENTS.md");
       const claudeExistsInSource = existsSync12(join15(sourcePath, "CLAUDE.md"));
@@ -28374,7 +28432,7 @@ ${fileValidationErrors.map((e) => `  - ${e}`).join(`
   if (!config.workspace && !dryRun && !skipAgentFiles) {
     await updateAgentFiles(workspacePath);
   }
-  if (clients.includes("vscode") && !dryRun) {
+  if (syncClients.includes("vscode") && !dryRun) {
     generateVscodeWorkspaceFile(workspacePath, config);
   }
   let totalCopied = 0;
@@ -28418,10 +28476,10 @@ ${fileValidationErrors.map((e) => `  - ${e}`).join(`
       ...pluginResults.flatMap((r) => r.copyResults),
       ...workspaceFileResults
     ];
-    const syncedFiles = collectSyncedPaths(allCopyResults, workspacePath, clients);
+    const syncedFiles = collectSyncedPaths(allCopyResults, workspacePath, syncClients);
     if (options2.clients && previousState) {
       for (const [client, files] of Object.entries(previousState.files)) {
-        if (!clients.includes(client)) {
+        if (!syncClients.includes(client)) {
           syncedFiles[client] = files;
         }
       }
@@ -28452,14 +28510,16 @@ async function syncUserWorkspace(options2 = {}) {
       totalGenerated: 0
     };
   }
-  const clients = config.clients;
+  const workspaceClients = config.clients;
   const { offline = false, dryRun = false, force = false } = options2;
-  await ensureMarketplacesRegistered(config.plugins);
-  const validatedPlugins = await validateAllPlugins(config.plugins, homeDir, offline);
+  const pluginPlans = buildPluginSyncPlans(config.plugins, workspaceClients).filter((plan) => plan.clients.length > 0);
+  const syncClients = collectSyncClients(workspaceClients, pluginPlans);
+  await ensureMarketplacesRegistered(pluginPlans.map((plan) => plan.source));
+  const validatedPlugins = await validateAllPlugins(pluginPlans, homeDir, offline);
   const failedValidations = validatedPlugins.filter((v) => !v.success);
   const validPlugins = validatedPlugins.filter((v) => v.success);
   const warnings = failedValidations.map((v) => `${v.plugin}: ${v.error} (skipped)`);
-  if (validPlugins.length === 0 && config.plugins.length > 0) {
+  if (validPlugins.length === 0 && pluginPlans.length > 0) {
     return {
       success: false,
       pluginResults: [],
@@ -28475,7 +28535,7 @@ ${failedValidations.map((v) => `  - ${v.plugin}: ${v.error}`).join(`
   }
   const previousState = await loadSyncState(homeDir);
   if (!dryRun) {
-    await selectivePurgeWorkspace(homeDir, previousState, clients);
+    await selectivePurgeWorkspace(homeDir, previousState, syncClients);
   }
   const disabledSkillsSet = new Set(config.disabledSkills ?? []);
   const allSkills = await collectAllSkills(validPlugins, disabledSkillsSet);
@@ -28483,7 +28543,7 @@ ${failedValidations.map((v) => `  - ${v.plugin}: ${v.error}`).join(`
   const syncMode = config.syncMode ?? "symlink";
   const pluginResults = await Promise.all(validPlugins.map((vp) => {
     const skillNameMap = pluginSkillMaps.get(vp.resolved);
-    return copyValidatedPlugin(vp, homeDir, clients, dryRun, skillNameMap, USER_CLIENT_MAPPINGS, syncMode);
+    return copyValidatedPlugin(vp, homeDir, vp.clients, dryRun, skillNameMap, USER_CLIENT_MAPPINGS, syncMode);
   }));
   let totalCopied = 0;
   let totalFailed = 0;
@@ -28508,7 +28568,7 @@ ${failedValidations.map((v) => `  - ${v.plugin}: ${v.error}`).join(`
     }
   }
   let mcpResult;
-  if (clients.includes("vscode")) {
+  if (syncClients.includes("vscode")) {
     const trackedMcpServers = getPreviouslySyncedMcpServers(previousState, "vscode");
     mcpResult = syncVscodeMcpConfig(validPlugins, { dryRun, force, trackedServers: trackedMcpServers });
     if (mcpResult.warnings.length > 0) {
@@ -28517,7 +28577,7 @@ ${failedValidations.map((v) => `  - ${v.plugin}: ${v.error}`).join(`
   }
   if (!dryRun) {
     const allCopyResults = pluginResults.flatMap((r) => r.copyResults);
-    const syncedFiles = collectSyncedPaths(allCopyResults, homeDir, clients, USER_CLIENT_MAPPINGS);
+    const syncedFiles = collectSyncedPaths(allCopyResults, homeDir, syncClients, USER_CLIENT_MAPPINGS);
     await saveSyncState(homeDir, {
       files: syncedFiles,
       ...mcpResult && { mcpServers: { vscode: mcpResult.trackedServers } }
@@ -28538,6 +28598,7 @@ var import_json52, VSCODE_TEMPLATE_FILE = "template.code-workspace";
 var init_sync = __esm(() => {
   init_constants();
   init_workspace_parser();
+  init_workspace_config();
   init_plugin_path();
   init_plugin();
   init_transform();
@@ -28896,7 +28957,8 @@ async function getWorkspaceStatus(workspacePath = process.cwd()) {
   try {
     const config = await parseWorkspaceConfig(configPath);
     const plugins = [];
-    for (const pluginSource of config.plugins) {
+    for (const pluginEntry of config.plugins) {
+      const pluginSource = getPluginSource(pluginEntry);
       if (isPluginSpec(pluginSource)) {
         const status = await getMarketplacePluginStatus(pluginSource);
         plugins.push(status);
@@ -28948,7 +29010,8 @@ async function getUserPluginStatuses() {
   if (!config)
     return [];
   const statuses = [];
-  for (const pluginSource of config.plugins) {
+  for (const pluginEntry of config.plugins) {
+    const pluginSource = getPluginSource(pluginEntry);
     if (isPluginSpec(pluginSource)) {
       statuses.push(await getMarketplacePluginStatus(pluginSource));
     } else {
@@ -28970,6 +29033,7 @@ async function getMarketplacePluginStatus(spec) {
 var init_status2 = __esm(() => {
   init_constants();
   init_workspace_parser();
+  init_workspace_config();
   init_plugin_path();
   init_marketplace();
   init_user_workspace();
@@ -29069,7 +29133,8 @@ async function getAllSkillsFromPlugins(workspacePath = process.cwd()) {
   const config = load(content);
   const disabledSkills = new Set(config.disabledSkills ?? []);
   const skills = [];
-  for (const pluginSource of config.plugins) {
+  for (const pluginEntry of config.plugins) {
+    const pluginSource = getPluginSource(pluginEntry);
     const pluginPath = await resolvePluginPath(pluginSource, workspacePath);
     if (!pluginPath)
       continue;
@@ -29099,6 +29164,7 @@ async function findSkillByName(skillName, workspacePath = process.cwd()) {
 var init_skills = __esm(() => {
   init_js_yaml();
   init_constants();
+  init_workspace_config();
   init_plugin();
   init_plugin_path();
   init_marketplace();
@@ -29602,7 +29668,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "allagents",
-    version: "0.23.0",
+    version: "0.24.1",
     description: "CLI tool for managing multi-repo AI agent workspaces with plugin synchronization",
     type: "module",
     bin: {
@@ -29627,7 +29693,8 @@ var init_package = __esm(() => {
       check: "biome check src",
       "check:fix": "biome check --write src",
       prepare: "bun run build && (test -d .git && bunx prek install -t pre-push || true)",
-      release: "bun run scripts/release.ts"
+      release: "bun run scripts/release.ts",
+      "publish:next": "bun run build && bun publish --tag next"
     },
     keywords: [
       "cli",
@@ -32723,6 +32790,7 @@ init_js_yaml();
 init_constants();
 init_marketplace();
 init_user_workspace();
+init_workspace_config();
 import { readFile as readFile12, writeFile as writeFile8 } from "node:fs/promises";
 import { existsSync as existsSync16 } from "node:fs";
 import { join as join19 } from "node:path";
@@ -32738,33 +32806,36 @@ async function isOrphanedPlugin(pluginSpec) {
 async function prunePlugins(plugins) {
   const removed = [];
   const kept = [];
-  for (const plugin of plugins) {
+  const keptEntries = [];
+  for (const pluginEntry of plugins) {
+    const plugin = getPluginSource(pluginEntry);
     if (await isOrphanedPlugin(plugin)) {
       removed.push(plugin);
     } else {
       kept.push(plugin);
+      keptEntries.push(pluginEntry);
     }
   }
-  return { removed, kept };
+  return { removed, kept, keptEntries };
 }
 async function pruneOrphanedPlugins(workspacePath) {
-  let projectResult = { removed: [], kept: [] };
+  let projectResult = { removed: [], kept: [], keptEntries: [] };
   const projectConfigPath = join19(workspacePath, CONFIG_DIR, WORKSPACE_CONFIG_FILE);
   if (existsSync16(projectConfigPath) && !isUserConfigPath(workspacePath)) {
     const content = await readFile12(projectConfigPath, "utf-8");
     const config = load(content);
     projectResult = await prunePlugins(config.plugins);
     if (projectResult.removed.length > 0) {
-      config.plugins = projectResult.kept;
+      config.plugins = projectResult.keptEntries;
       await writeFile8(projectConfigPath, dump(config, { lineWidth: -1 }), "utf-8");
     }
   }
-  let userResult = { removed: [], kept: [] };
+  let userResult = { removed: [], kept: [], keptEntries: [] };
   const userConfig = await getUserWorkspaceConfig();
   if (userConfig) {
     userResult = await prunePlugins(userConfig.plugins);
     if (userResult.removed.length > 0) {
-      userConfig.plugins = userResult.kept;
+      userConfig.plugins = userResult.keptEntries;
       const userConfigPath = getUserWorkspaceConfigPath();
       await writeFile8(userConfigPath, dump(userConfig, { lineWidth: -1 }), "utf-8");
     }
@@ -34072,6 +34143,7 @@ var skillsCmd = conciseSubcommands({
 });
 
 // src/cli/commands/plugin.ts
+init_workspace_config();
 async function runSyncAndPrint(options2) {
   if (!isJsonMode()) {
     console.log(`
@@ -34806,7 +34878,8 @@ var pluginUpdateCmd = import_cmd_ts4.command({
         if (existsSync20(configPath)) {
           const content = await readFile14(configPath, "utf-8");
           const config = load2(content);
-          for (const p of config.plugins ?? []) {
+          for (const entry of config.plugins ?? []) {
+            const p = getPluginSource(entry);
             if (!pluginsToUpdate.includes(p)) {
               pluginsToUpdate.push(p);
             }
@@ -34816,7 +34889,8 @@ var pluginUpdateCmd = import_cmd_ts4.command({
       if (updateUser) {
         const userConfig = await getUserWorkspaceConfig();
         if (userConfig) {
-          for (const p of userConfig.plugins ?? []) {
+          for (const entry of userConfig.plugins ?? []) {
+            const p = getPluginSource(entry);
             if (!pluginsToUpdate.includes(p)) {
               pluginsToUpdate.push(p);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "allagents",
-  "version": "0.23.0",
+  "version": "0.24.1",
   "description": "CLI tool for managing multi-repo AI agent workspaces with plugin synchronization",
   "type": "module",
   "bin": {
@@ -25,7 +25,8 @@
     "check": "biome check src",
     "check:fix": "biome check --write src",
     "prepare": "bun run build && (test -d .git && bunx prek install -t pre-push || true)",
-    "release": "bun run scripts/release.ts"
+    "release": "bun run scripts/release.ts",
+    "publish:next": "bun run build && bun publish --tag next"
   },
   "keywords": [
     "cli",