allagents 0.19.1 → 0.20.1

package/dist/index.js

@@ -11424,7 +11424,8 @@ var init_workspace_config = __esm(() => {
     plugins: exports_external.array(PluginSourceSchema),
     clients: exports_external.array(ClientTypeSchema),
     vscode: VscodeConfigSchema.optional(),
-    syncMode: SyncModeSchema.optional()
+    syncMode: SyncModeSchema.optional(),
+    disabledSkills: exports_external.array(exports_external.string()).optional()
   });
 });
 
@@ -25006,7 +25007,10 @@ async function copySkills(pluginPath, workspacePath, client, options2 = {}) {
     await mkdir3(destDir, { recursive: true });
   }
   const entries = await readdir2(sourceDir, { withFileTypes: true });
-  const skillDirs = entries.filter((e) => e.isDirectory());
+  let skillDirs = entries.filter((e) => e.isDirectory());
+  if (skillNameMap) {
+    skillDirs = skillDirs.filter((e) => skillNameMap.has(e.name));
+  }
   const useSymlinks = syncMode === "symlink" && !isUniversalClient(client) && canonicalSkillsPath;
   const copyPromises = skillDirs.map(async (entry) => {
     const skillSourcePath = join6(sourceDir, entry.name);
@@ -25057,14 +25061,15 @@ async function copySkills(pluginPath, workspacePath, client, options2 = {}) {
   });
   return Promise.all(copyPromises);
 }
-async function collectPluginSkills(pluginPath, pluginSource) {
+async function collectPluginSkills(pluginPath, pluginSource, disabledSkills, pluginName) {
   const skillsDir = join6(pluginPath, "skills");
   if (!existsSync4(skillsDir)) {
     return [];
   }
   const entries = await readdir2(skillsDir, { withFileTypes: true });
   const skillDirs = entries.filter((e) => e.isDirectory());
-  return skillDirs.map((entry) => ({
+  const filteredDirs = disabledSkills && pluginName ? skillDirs.filter((e) => !disabledSkills.has(`${pluginName}:${e.name}`)) : skillDirs;
+  return filteredDirs.map((entry) => ({
     folderName: entry.name,
     skillPath: join6(skillsDir, entry.name),
     pluginPath,
@@ -25553,15 +25558,18 @@ __export(exports_user_workspace, {
   resolveGitHubIdentity: () => resolveGitHubIdentity,
   removeUserPluginsForMarketplace: () => removeUserPluginsForMarketplace,
   removeUserPlugin: () => removeUserPlugin,
+  removeUserDisabledSkill: () => removeUserDisabledSkill,
   isUserConfigPath: () => isUserConfigPath,
   hasUserPlugin: () => hasUserPlugin,
   getUserWorkspaceConfigPath: () => getUserWorkspaceConfigPath,
   getUserWorkspaceConfig: () => getUserWorkspaceConfig,
   getUserPluginsForMarketplace: () => getUserPluginsForMarketplace,
+  getUserDisabledSkills: () => getUserDisabledSkills,
   getInstalledUserPlugins: () => getInstalledUserPlugins,
   getInstalledProjectPlugins: () => getInstalledProjectPlugins,
   ensureUserWorkspace: () => ensureUserWorkspace,
-  addUserPlugin: () => addUserPlugin
+  addUserPlugin: () => addUserPlugin,
+  addUserDisabledSkill: () => addUserDisabledSkill
 });
 import { readFile as readFile6, writeFile as writeFile2, mkdir as mkdir4 } from "node:fs/promises";
 import { existsSync as existsSync6 } from "node:fs";
@@ -25741,7 +25749,54 @@ async function addPluginToUserConfig(plugin, configPath, autoRegistered) {
     }
     config.plugins.push(plugin);
     await writeFile2(configPath, dump(config, { lineWidth: -1 }), "utf-8");
-    return { success: true, ...autoRegistered && { autoRegistered } };
+    return { success: true, ...autoRegistered && { autoRegistered }, normalizedPlugin: plugin };
+  } catch (error) {
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : String(error)
+    };
+  }
+}
+async function getUserDisabledSkills() {
+  const config = await getUserWorkspaceConfig();
+  return config?.disabledSkills ?? [];
+}
+async function addUserDisabledSkill(skillKey) {
+  await ensureUserWorkspace();
+  const configPath = getUserWorkspaceConfigPath();
+  try {
+    const content = await readFile6(configPath, "utf-8");
+    const config = load(content);
+    const disabledSkills = config.disabledSkills ?? [];
+    if (disabledSkills.includes(skillKey)) {
+      return { success: false, error: `Skill '${skillKey}' is already disabled` };
+    }
+    config.disabledSkills = [...disabledSkills, skillKey];
+    await writeFile2(configPath, dump(config, { lineWidth: -1 }), "utf-8");
+    return { success: true };
+  } catch (error) {
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : String(error)
+    };
+  }
+}
+async function removeUserDisabledSkill(skillKey) {
+  await ensureUserWorkspace();
+  const configPath = getUserWorkspaceConfigPath();
+  try {
+    const content = await readFile6(configPath, "utf-8");
+    const config = load(content);
+    const disabledSkills = config.disabledSkills ?? [];
+    if (!disabledSkills.includes(skillKey)) {
+      return { success: false, error: `Skill '${skillKey}' is already enabled` };
+    }
+    config.disabledSkills = disabledSkills.filter((s) => s !== skillKey);
+    if (config.disabledSkills.length === 0) {
+      config.disabledSkills = undefined;
+    }
+    await writeFile2(configPath, dump(config, { lineWidth: -1 }), "utf-8");
+    return { success: true };
   } catch (error) {
     return {
       success: false,
@@ -25851,14 +25906,22 @@ async function saveRegistry(registry) {
   await writeFile3(registryPath, `${JSON.stringify(registry, null, 2)}
 `);
 }
-function parseMarketplaceSource(source) {
-  if (WELL_KNOWN_MARKETPLACES[source]) {
-    return {
-      type: "github",
-      location: WELL_KNOWN_MARKETPLACES[source],
-      name: source
-    };
+function getSourceLocationKey(source) {
+  if (source.type === "github") {
+    const { owner, repo } = parseLocation(source.location);
+    return `${owner}/${repo}`;
   }
+  return source.location;
+}
+function findBySourceLocation(registry, sourceLocation) {
+  for (const entry of Object.values(registry.marketplaces)) {
+    if (getSourceLocationKey(entry.source) === sourceLocation) {
+      return entry;
+    }
+  }
+  return null;
+}
+function parseMarketplaceSource(source) {
   if (source.startsWith("https://github.com/")) {
     const match = source.match(/^https:\/\/github\.com\/([^/]+)\/([^/]+?)(?:\.git)?(?:\/tree\/(.+))?$/);
     if (match) {
@@ -25902,7 +25965,7 @@ async function addMarketplace(source, customName, branch) {
     return {
       success: false,
       error: `Invalid marketplace source: ${source}
-  Use: GitHub URL, owner/repo, local path, or well-known name`
+  Use: GitHub URL, owner/repo, or local path`
     };
   }
   const effectiveBranch = branch || parsed.branch;
@@ -25930,6 +25993,11 @@ async function addMarketplace(source, customName, branch) {
       error: `Marketplace '${name}' already exists. Use 'update' to refresh it.`
     };
   }
+  const sourceLocation = parsed.type === "github" ? `${parseLocation(parsed.location).owner}/${parseLocation(parsed.location).repo}` : parsed.location;
+  const existingBySource = findBySourceLocation(registry, sourceLocation);
+  if (existingBySource) {
+    return { success: true, marketplace: existingBySource };
+  }
   let marketplacePath;
   if (parsed.type === "github") {
     marketplacePath = join9(getMarketplacesDir(), name);
@@ -26049,11 +26117,7 @@ async function findMarketplace(name, sourceLocation) {
     return registry.marketplaces[name];
   }
   if (sourceLocation) {
-    for (const entry of Object.values(registry.marketplaces)) {
-      if (entry.source.location === sourceLocation) {
-        return entry;
-      }
-    }
+    return findBySourceLocation(registry, sourceLocation);
   }
   return null;
 }
@@ -26286,6 +26350,7 @@ async function resolvePluginSpecWithAutoRegister(spec, options2 = {}) {
   const { plugin: pluginName, marketplaceName, owner, repo, subpath } = parsed;
   const sourceLocation = owner && repo ? `${owner}/${repo}` : undefined;
   let marketplace = await findMarketplace(marketplaceName, sourceLocation);
+  let didAutoRegister = false;
   if (!marketplace) {
     const sourceToRegister = owner && repo ? `${owner}/${repo}` : marketplaceName;
     const autoRegResult = await autoRegisterMarketplace(sourceToRegister);
@@ -26296,6 +26361,7 @@ async function resolvePluginSpecWithAutoRegister(spec, options2 = {}) {
       };
     }
     marketplace = await getMarketplace(autoRegResult.name ?? marketplaceName);
+    didAutoRegister = true;
   }
   if (!marketplace) {
     return {
@@ -26328,42 +26394,30 @@ async function resolvePluginSpecWithAutoRegister(spec, options2 = {}) {
   Expected at: ${join9(marketplace.path, expectedSubpath, pluginName)}`
     };
   }
+  const shouldReturnRegisteredAs = didAutoRegister || marketplace.name !== marketplaceName;
   return {
     success: true,
     path: resolved.path,
     pluginName: resolved.plugin,
-    ...marketplace.name !== marketplaceName && { registeredAs: marketplace.name }
+    ...shouldReturnRegisteredAs && { registeredAs: marketplace.name }
   };
 }
-async function autoRegisterMarketplace(name) {
-  const wellKnown = getWellKnownMarketplaces();
-  if (wellKnown[name]) {
-    console.log(`Auto-registering well-known marketplace: ${name}`);
-    const result = await addMarketplace(name);
-    if (!result.success) {
-      return { success: false, error: result.error || "Unknown error" };
-    }
-    return { success: true, name };
-  }
-  if (name.includes("/") && !name.includes("://")) {
-    const parts = name.split("/");
+async function autoRegisterMarketplace(source) {
+  if (source.includes("/") && !source.includes("://")) {
+    const parts = source.split("/");
     if (parts.length === 2 && parts[0] && parts[1]) {
-      console.log(`Auto-registering GitHub marketplace: ${name}`);
-      const result = await addMarketplace(name);
+      console.log(`Auto-registering GitHub marketplace: ${source}`);
+      const result = await addMarketplace(source);
       if (!result.success) {
         return { success: false, error: result.error || "Unknown error" };
       }
-      const registeredName = result.marketplace?.name ?? parts[1];
-      return { success: true, name: registeredName };
+      return { success: true, name: result.marketplace?.name ?? parts[1] };
     }
   }
   return {
     success: false,
-    error: `Marketplace '${name}' not found.
-  Options:
-  1. Use fully qualified name: plugin@owner/repo
-  2. Register first: allagents plugin marketplace add <source>
-  3. Well-known marketplaces: ${Object.keys(wellKnown).join(", ")}`
+    error: `Marketplace '${source}' not found.
+  Use fully qualified format: plugin@owner/repo`
   };
 }
 function isPluginSpec(spec) {
@@ -26373,8 +26427,35 @@ function isPluginSpec(spec) {
   }
   return true;
 }
-function getWellKnownMarketplaces() {
-  return { ...WELL_KNOWN_MARKETPLACES };
+function extractUniqueMarketplaceSources(plugins) {
+  const sources = new Set;
+  for (const plugin of plugins) {
+    if (!isPluginSpec(plugin))
+      continue;
+    const parsed = parsePluginSpec(plugin);
+    if (!parsed)
+      continue;
+    if (parsed.owner && parsed.repo) {
+      sources.add(`${parsed.owner}/${parsed.repo}`);
+    }
+  }
+  return Array.from(sources);
+}
+async function ensureMarketplacesRegistered(plugins) {
+  const sources = extractUniqueMarketplaceSources(plugins);
+  const results = [];
+  for (const source of sources) {
+    const parts = source.split("/");
+    const sourceLocation = source;
+    const existing = await findMarketplace(parts[1] ?? "", sourceLocation);
+    if (existing) {
+      results.push({ source, success: true, name: existing.name });
+      continue;
+    }
+    const result = await autoRegisterMarketplace(source);
+    results.push({ source, ...result });
+  }
+  return results;
 }
 async function getMarketplaceVersion(marketplacePath) {
   if (!existsSync7(marketplacePath)) {
@@ -26388,7 +26469,6 @@ async function getMarketplaceVersion(marketplacePath) {
     return null;
   }
 }
-var WELL_KNOWN_MARKETPLACES;
 var init_marketplace = __esm(() => {
   init_esm();
   init_git();
@@ -26396,9 +26476,6 @@ var init_marketplace = __esm(() => {
   init_plugin();
   init_plugin_path();
   init_constants();
-  WELL_KNOWN_MARKETPLACES = {
-    "claude-plugins-official": "anthropics/claude-plugins-official"
-  };
 });
 
 // src/core/workspace-modify.ts
@@ -26493,7 +26570,8 @@ async function addPluginToConfig(plugin, configPath, autoRegistered) {
     await writeFile4(configPath, newContent, "utf-8");
     return {
       success: true,
-      ...autoRegistered && { autoRegistered }
+      ...autoRegistered && { autoRegistered },
+      normalizedPlugin: plugin
     };
   } catch (error) {
     return {
@@ -26552,6 +26630,65 @@ async function removePlugin(plugin, workspacePath = process.cwd()) {
     };
   }
 }
+async function addDisabledSkill(skillKey, workspacePath = process.cwd()) {
+  const configPath = join10(workspacePath, CONFIG_DIR, WORKSPACE_CONFIG_FILE);
+  if (!existsSync8(configPath)) {
+    return {
+      success: false,
+      error: `${CONFIG_DIR}/${WORKSPACE_CONFIG_FILE} not found in ${workspacePath}`
+    };
+  }
+  try {
+    const content = await readFile8(configPath, "utf-8");
+    const config = load(content);
+    const disabledSkills = config.disabledSkills ?? [];
+    if (disabledSkills.includes(skillKey)) {
+      return {
+        success: false,
+        error: `Skill '${skillKey}' is already disabled`
+      };
+    }
+    config.disabledSkills = [...disabledSkills, skillKey];
+    await writeFile4(configPath, dump(config, { lineWidth: -1 }), "utf-8");
+    return { success: true };
+  } catch (error) {
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : String(error)
+    };
+  }
+}
+async function removeDisabledSkill(skillKey, workspacePath = process.cwd()) {
+  const configPath = join10(workspacePath, CONFIG_DIR, WORKSPACE_CONFIG_FILE);
+  if (!existsSync8(configPath)) {
+    return {
+      success: false,
+      error: `${CONFIG_DIR}/${WORKSPACE_CONFIG_FILE} not found in ${workspacePath}`
+    };
+  }
+  try {
+    const content = await readFile8(configPath, "utf-8");
+    const config = load(content);
+    const disabledSkills = config.disabledSkills ?? [];
+    if (!disabledSkills.includes(skillKey)) {
+      return {
+        success: false,
+        error: `Skill '${skillKey}' is already enabled`
+      };
+    }
+    config.disabledSkills = disabledSkills.filter((s) => s !== skillKey);
+    if (config.disabledSkills.length === 0) {
+      config.disabledSkills = undefined;
+    }
+    await writeFile4(configPath, dump(config, { lineWidth: -1 }), "utf-8");
+    return { success: true };
+  } catch (error) {
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : String(error)
+    };
+  }
+}
 var DEFAULT_PROJECT_CLIENTS;
 var init_workspace_modify = __esm(() => {
   init_js_yaml();
@@ -27345,11 +27482,11 @@ async function copyValidatedPlugin(validatedPlugin, workspacePath, clients, dryR
     copyResults
   };
 }
-async function collectAllSkills(validatedPlugins) {
+async function collectAllSkills(validatedPlugins, disabledSkills) {
   const allSkills = [];
   for (const plugin of validatedPlugins) {
     const pluginName = plugin.pluginName ?? await getPluginName(plugin.resolved);
-    const skills = await collectPluginSkills(plugin.resolved, plugin.plugin);
+    const skills = await collectPluginSkills(plugin.resolved, plugin.plugin, disabledSkills, pluginName);
     for (const skill of skills) {
       allSkills.push({
         folderName: skill.folderName,
@@ -27453,6 +27590,7 @@ async function syncWorkspace(workspacePath = process.cwd(), options2 = {}) {
       };
     }
   }
+  await ensureMarketplacesRegistered(config.plugins);
   const validatedPlugins = await validateAllPlugins(config.plugins, workspacePath, offline);
   let validatedWorkspaceSource = null;
   if (config.workspace?.source) {
@@ -27497,7 +27635,8 @@ ${failedValidations.map((v) => `  - ${v.plugin}: ${v.error}`).join(`
       partialSync: !!options2.clients
     });
   }
-  const allSkills = await collectAllSkills(validPlugins);
+  const disabledSkillsSet = new Set(config.disabledSkills ?? []);
+  const allSkills = await collectAllSkills(validPlugins, disabledSkillsSet);
   const pluginSkillMaps = buildPluginSkillNameMaps(allSkills);
   const syncMode = config.syncMode ?? "symlink";
   const pluginResults = await Promise.all(validPlugins.map((validatedPlugin) => {
@@ -27642,6 +27781,7 @@ async function syncUserWorkspace(options2 = {}) {
   }
   const clients = config.clients;
   const { offline = false, dryRun = false } = options2;
+  await ensureMarketplacesRegistered(config.plugins);
   const validatedPlugins = await validateAllPlugins(config.plugins, homeDir, offline);
   const failedValidations = validatedPlugins.filter((v) => !v.success);
   const validPlugins = validatedPlugins.filter((v) => v.success);
@@ -27664,7 +27804,8 @@ ${failedValidations.map((v) => `  - ${v.plugin}: ${v.error}`).join(`
   if (!dryRun) {
     await selectivePurgeWorkspace(homeDir, previousState, clients);
   }
-  const allSkills = await collectAllSkills(validPlugins);
+  const disabledSkillsSet = new Set(config.disabledSkills ?? []);
+  const allSkills = await collectAllSkills(validPlugins, disabledSkillsSet);
   const pluginSkillMaps = buildPluginSkillNameMaps(allSkills);
   const syncMode = config.syncMode ?? "symlink";
   const pluginResults = await Promise.all(validPlugins.map((vp) => {
@@ -28237,12 +28378,12 @@ var require_isexe = __commonJS((exports, module) => {
       if (typeof Promise !== "function") {
         throw new TypeError("callback not provided");
       }
-      return new Promise(function(resolve12, reject) {
+      return new Promise(function(resolve13, reject) {
         isexe(path, options2 || {}, function(er, is) {
           if (er) {
             reject(er);
           } else {
-            resolve12(is);
+            resolve13(is);
           }
         });
       });
@@ -28304,27 +28445,27 @@ var require_which = __commonJS((exports, module) => {
       opt = {};
     const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
     const found = [];
-    const step = (i2) => new Promise((resolve12, reject) => {
+    const step = (i2) => new Promise((resolve13, reject) => {
       if (i2 === pathEnv.length)
-        return opt.all && found.length ? resolve12(found) : reject(getNotFoundError(cmd));
+        return opt.all && found.length ? resolve13(found) : reject(getNotFoundError(cmd));
       const ppRaw = pathEnv[i2];
       const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
       const pCmd = path.join(pathPart, cmd);
       const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-      resolve12(subStep(p, i2, 0));
+      resolve13(subStep(p, i2, 0));
     });
-    const subStep = (p, i2, ii) => new Promise((resolve12, reject) => {
+    const subStep = (p, i2, ii) => new Promise((resolve13, reject) => {
       if (ii === pathExt.length)
-        return resolve12(step(i2 + 1));
+        return resolve13(step(i2 + 1));
       const ext = pathExt[ii];
       isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
         if (!er && is) {
           if (opt.all)
             found.push(p + ext);
           else
-            return resolve12(p + ext);
+            return resolve13(p + ext);
         }
-        return resolve12(subStep(p, i2, ii + 1));
+        return resolve13(subStep(p, i2, ii + 1));
       });
     });
     return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
@@ -28442,8 +28583,8 @@ var require_shebang_regex = __commonJS((exports, module) => {
 // node_modules/shebang-command/index.js
 var require_shebang_command = __commonJS((exports, module) => {
   var shebangRegex = require_shebang_regex();
-  module.exports = (string3 = "") => {
-    const match = string3.match(shebangRegex);
+  module.exports = (string4 = "") => {
+    const match = string4.match(shebangRegex);
     if (!match) {
       return null;
     }
@@ -28460,12 +28601,12 @@ var require_shebang_command = __commonJS((exports, module) => {
 var require_readShebang = __commonJS((exports, module) => {
   var fs = __require("fs");
   var shebangCommand = require_shebang_command();
-  function readShebang(command3) {
+  function readShebang(command4) {
     const size = 150;
     const buffer = Buffer.alloc(size);
     let fd;
     try {
-      fd = fs.openSync(command3, "r");
+      fd = fs.openSync(command4, "r");
       fs.readSync(fd, buffer, 0, size, 0);
       fs.closeSync(fd);
     } catch (e) {}
@@ -28511,7 +28652,7 @@ var require_parse5 = __commonJS((exports, module) => {
     }
     return parsed;
   }
-  function parse2(command3, args, options2) {
+  function parse2(command4, args, options2) {
     if (args && !Array.isArray(args)) {
       options2 = args;
       args = null;
@@ -28519,12 +28660,12 @@ var require_parse5 = __commonJS((exports, module) => {
     args = args ? args.slice(0) : [];
     options2 = Object.assign({}, options2);
     const parsed = {
-      command: command3,
+      command: command4,
       args,
       options: options2,
       file: undefined,
       original: {
-        command: command3,
+        command: command4,
         args
       }
     };
@@ -28585,14 +28726,14 @@ var require_cross_spawn = __commonJS((exports, module) => {
   var cp2 = __require("child_process");
   var parse2 = require_parse5();
   var enoent = require_enoent();
-  function spawn2(command3, args, options2) {
-    const parsed = parse2(command3, args, options2);
+  function spawn2(command4, args, options2) {
+    const parsed = parse2(command4, args, options2);
     const spawned = cp2.spawn(parsed.command, parsed.args, parsed.options);
     enoent.hookChildProcess(spawned, parsed);
     return spawned;
   }
-  function spawnSync(command3, args, options2) {
-    const parsed = parse2(command3, args, options2);
+  function spawnSync(command4, args, options2) {
+    const parsed = parse2(command4, args, options2);
     const result = cp2.spawnSync(parsed.command, parsed.args, parsed.options);
     result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
     return result;
@@ -29135,7 +29276,7 @@ var getErrorPrefix = ({ timedOut, timeout, errorCode, signal, signalDescription,
   error,
   signal,
   exitCode,
-  command: command3,
+  command: command4,
   escapedCommand,
   timedOut,
   isCanceled,
@@ -29147,7 +29288,7 @@ var getErrorPrefix = ({ timedOut, timeout, errorCode, signal, signalDescription,
   const signalDescription = signal === undefined ? undefined : signalsByName[signal].description;
   const errorCode = error && error.code;
   const prefix = getErrorPrefix({ timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled });
-  const execaMessage = `Command ${prefix}: ${command3}`;
+  const execaMessage = `Command ${prefix}: ${command4}`;
   const isError = Object.prototype.toString.call(error) === "[object Error]";
   const shortMessage = isError ? `${execaMessage}
 ${error.message}` : execaMessage;
@@ -29160,7 +29301,7 @@ ${error.message}` : execaMessage;
     error = new Error(message);
   }
   error.shortMessage = shortMessage;
-  error.command = command3;
+  error.command = command4;
   error.escapedCommand = escapedCommand;
   error.exitCode = exitCode;
   error.signal = signal;
@@ -29457,7 +29598,7 @@ var DEFAULT_FORCE_KILL_TIMEOUT, spawnedKill = (kill, signal = "SIGTERM", options
     return spawnedPromise;
   }
   let timeoutId;
-  const timeoutPromise = new Promise((resolve12, reject) => {
+  const timeoutPromise = new Promise((resolve13, reject) => {
     timeoutId = setTimeout(() => {
       timeoutKill(spawned, killSignal, reject);
     }, timeout);
@@ -29847,9 +29988,9 @@ var nativePromisePrototype, descriptors, mergePromise = (spawned, promise) => {
     const value = typeof promise === "function" ? (...args) => Reflect.apply(descriptor.value, promise(), args) : descriptor.value.bind(promise);
     Reflect.defineProperty(spawned, property, { ...descriptor, value });
   }
-}, getSpawnedPromise = (spawned) => new Promise((resolve12, reject) => {
+}, getSpawnedPromise = (spawned) => new Promise((resolve13, reject) => {
   spawned.on("exit", (exitCode, signal) => {
-    resolve12({ exitCode, signal });
+    resolve13({ exitCode, signal });
   });
   spawned.on("error", (error) => {
     reject(error);
@@ -29950,7 +30091,7 @@ import childProcess from "node:child_process";
 import process7 from "node:process";
 function execa(file, args, options2) {
   const parsed = handleArguments(file, args, options2);
-  const command3 = joinCommand(file, args);
+  const command4 = joinCommand(file, args);
   const escapedCommand = getEscapedCommand(file, args);
   logCommand(escapedCommand, parsed.options);
   validateTimeout(parsed.options);
@@ -29964,7 +30105,7 @@ function execa(file, args, options2) {
       stdout: "",
       stderr: "",
       all: "",
-      command: command3,
+      command: command4,
       escapedCommand,
       parsed,
       timedOut: false,
@@ -29993,7 +30134,7 @@ function execa(file, args, options2) {
         stdout,
         stderr,
         all,
-        command: command3,
+        command: command4,
         escapedCommand,
         parsed,
         timedOut,
@@ -30006,7 +30147,7 @@ function execa(file, args, options2) {
       throw returnedError;
     }
     return {
-      command: command3,
+      command: command4,
       escapedCommand,
       exitCode: 0,
       stdout,
@@ -30027,7 +30168,7 @@ function execa(file, args, options2) {
 }
 function execaSync(file, args, options2) {
   const parsed = handleArguments(file, args, options2);
-  const command3 = joinCommand(file, args);
+  const command4 = joinCommand(file, args);
   const escapedCommand = getEscapedCommand(file, args);
   logCommand(escapedCommand, parsed.options);
   const input = handleInputSync(parsed.options);
@@ -30040,7 +30181,7 @@ function execaSync(file, args, options2) {
       stdout: "",
       stderr: "",
       all: "",
-      command: command3,
+      command: command4,
       escapedCommand,
       parsed,
       timedOut: false,
@@ -30057,7 +30198,7 @@ function execaSync(file, args, options2) {
       error: result.error,
       signal: result.signal,
       exitCode: result.status,
-      command: command3,
+      command: command4,
       escapedCommand,
       parsed,
       timedOut: result.error && result.error.code === "ETIMEDOUT",
@@ -30070,7 +30211,7 @@ function execaSync(file, args, options2) {
     throw error;
   }
   return {
-    command: command3,
+    command: command4,
     escapedCommand,
     exitCode: 0,
     stdout,
@@ -30165,7 +30306,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "allagents",
-    version: "0.19.1",
+    version: "0.20.1",
     description: "CLI tool for managing multi-repo AI agent workspaces with plugin synchronization",
     type: "module",
     bin: {
@@ -30234,13 +30375,13 @@ var init_package = __esm(() => {
 });
 
 // src/cli/update-check.ts
-import { readFile as readFile13 } from "node:fs/promises";
-import { join as join19 } from "node:path";
+import { readFile as readFile14 } from "node:fs/promises";
+import { join as join20 } from "node:path";
 import { spawn as spawn2 } from "node:child_process";
 async function getCachedUpdateInfo(path3) {
-  const filePath = path3 ?? join19(getHomeDir(), CONFIG_DIR, CACHE_FILE);
+  const filePath = path3 ?? join20(getHomeDir(), CONFIG_DIR, CACHE_FILE);
   try {
-    const raw = await readFile13(filePath, "utf-8");
+    const raw = await readFile14(filePath, "utf-8");
     const data = JSON.parse(raw);
     if (typeof data.latestVersion === "string" && typeof data.lastCheckedAt === "string") {
       return data;
@@ -30276,8 +30417,8 @@ function buildNotice(currentVersion, latestVersion) {
   Run \`allagents self update\` to upgrade.`;
 }
 function backgroundUpdateCheck() {
-  const dir = join19(getHomeDir(), CONFIG_DIR);
-  const filePath = join19(dir, CACHE_FILE);
+  const dir = join20(getHomeDir(), CONFIG_DIR);
+  const filePath = join20(dir, CACHE_FILE);
   const script = `
     const https = require('https');
     const fs = require('fs');
@@ -30328,17 +30469,17 @@ var require_picocolors = __commonJS((exports, module) => {
   var env2 = p.env || {};
   var isColorSupported = !(!!env2.NO_COLOR || argv.includes("--no-color")) && (!!env2.FORCE_COLOR || argv.includes("--color") || p.platform === "win32" || (p.stdout || {}).isTTY && env2.TERM !== "dumb" || !!env2.CI);
   var formatter = (open, close, replace = open) => (input) => {
-    let string3 = "" + input, index = string3.indexOf(close, open.length);
-    return ~index ? open + replaceClose(string3, close, replace, index) + close : open + string3 + close;
+    let string4 = "" + input, index = string4.indexOf(close, open.length);
+    return ~index ? open + replaceClose(string4, close, replace, index) + close : open + string4 + close;
   };
-  var replaceClose = (string3, close, replace, index) => {
+  var replaceClose = (string4, close, replace, index) => {
     let result = "", cursor = 0;
     do {
-      result += string3.substring(cursor, index) + replace;
+      result += string4.substring(cursor, index) + replace;
       cursor = index + close.length;
-      index = string3.indexOf(close, cursor);
+      index = string4.indexOf(close, cursor);
     } while (~index);
-    return result + string3.substring(cursor);
+    return result + string4.substring(cursor);
   };
   var createColors = (enabled = isColorSupported) => {
     let f = enabled ? formatter : () => String;
@@ -32113,15 +32254,15 @@ class TuiCache {
 }
 
 // src/cli/tui/context.ts
-import { existsSync as existsSync17 } from "node:fs";
-import { join as join20 } from "node:path";
+import { existsSync as existsSync18 } from "node:fs";
+import { join as join21 } from "node:path";
 async function getTuiContext(cwd = process.cwd(), cache2) {
   const cachedContext = cache2?.getContext();
   if (cachedContext) {
     return cachedContext;
   }
-  const configPath = join20(cwd, CONFIG_DIR, WORKSPACE_CONFIG_FILE);
-  const hasWorkspace = existsSync17(configPath) && !isUserConfigPath(cwd);
+  const configPath = join21(cwd, CONFIG_DIR, WORKSPACE_CONFIG_FILE);
+  const hasWorkspace = existsSync18(configPath) && !isUserConfigPath(cwd);
   let projectPluginCount = 0;
   if (hasWorkspace) {
     try {
@@ -32878,7 +33019,7 @@ var init_wizard = __esm(() => {
 });
 
 // src/cli/index.ts
-var import_cmd_ts5 = __toESM(require_cjs(), 1);
+var import_cmd_ts6 = __toESM(require_cjs(), 1);
 
 // src/cli/help.ts
 var import_cmd_ts = __toESM(require_cjs(), 1);
@@ -33651,7 +33792,7 @@ init_marketplace();
 init_sync();
 init_workspace_modify();
 init_user_workspace();
-var import_cmd_ts3 = __toESM(require_cjs(), 1);
+var import_cmd_ts4 = __toESM(require_cjs(), 1);
 
 // src/cli/metadata/plugin.ts
 var marketplaceListMeta = {
@@ -33818,6 +33959,474 @@ var pluginUninstallMeta = {
   }
 };
 
+// src/cli/commands/plugin-skills.ts
+init_sync();
+init_workspace_modify();
+init_user_workspace();
+var import_cmd_ts3 = __toESM(require_cjs(), 1);
+
+// src/core/skills.ts
+init_js_yaml();
+init_constants();
+init_plugin();
+init_plugin_path();
+init_marketplace();
+import { existsSync as existsSync17 } from "node:fs";
+import { readFile as readFile13, readdir as readdir4 } from "node:fs/promises";
+import { join as join19, resolve as resolve12 } from "node:path";
+async function resolvePluginPath(pluginSource, workspacePath) {
+  if (isPluginSpec(pluginSource)) {
+    const resolved2 = await resolvePluginSpecWithAutoRegister(pluginSource);
+    return resolved2.success ? resolved2.path ?? null : null;
+  }
+  if (isGitHubUrl(pluginSource)) {
+    const parsed = parseGitHubUrl(pluginSource);
+    const result = await fetchPlugin(pluginSource, {
+      offline: true,
+      ...parsed?.branch && { branch: parsed.branch }
+    });
+    if (!result.success)
+      return null;
+    return parsed?.subpath ? join19(result.cachePath, parsed.subpath) : result.cachePath;
+  }
+  const resolved = resolve12(workspacePath, pluginSource);
+  return existsSync17(resolved) ? resolved : null;
+}
+async function getAllSkillsFromPlugins(workspacePath = process.cwd()) {
+  const configPath = join19(workspacePath, CONFIG_DIR, WORKSPACE_CONFIG_FILE);
+  if (!existsSync17(configPath)) {
+    return [];
+  }
+  const content = await readFile13(configPath, "utf-8");
+  const config = load(content);
+  const disabledSkills = new Set(config.disabledSkills ?? []);
+  const skills = [];
+  for (const pluginSource of config.plugins) {
+    const pluginPath = await resolvePluginPath(pluginSource, workspacePath);
+    if (!pluginPath)
+      continue;
+    const pluginName = await getPluginName(pluginPath);
+    const skillsDir = join19(pluginPath, "skills");
+    if (!existsSync17(skillsDir))
+      continue;
+    const entries = await readdir4(skillsDir, { withFileTypes: true });
+    const skillDirs = entries.filter((e) => e.isDirectory());
+    for (const entry of skillDirs) {
+      const skillKey = `${pluginName}:${entry.name}`;
+      skills.push({
+        name: entry.name,
+        pluginName,
+        pluginSource,
+        path: join19(skillsDir, entry.name),
+        disabled: disabledSkills.has(skillKey)
+      });
+    }
+  }
+  return skills;
+}
+async function findSkillByName(skillName, workspacePath = process.cwd()) {
+  const allSkills = await getAllSkillsFromPlugins(workspacePath);
+  return allSkills.filter((s) => s.name === skillName);
+}
+
+// src/cli/metadata/plugin-skills.ts
+var skillsListMeta = {
+  command: "plugin skills list",
+  description: "List all skills from installed plugins",
+  whenToUse: "To see available skills and their enabled/disabled status",
+  examples: [
+    "allagents plugin skills list",
+    "allagents plugin skills list --scope user"
+  ],
+  expectedOutput: "Lists skills grouped by plugin with enabled/disabled status",
+  options: [
+    { flag: "--scope", short: "-s", type: "string", description: 'Scope: "project" (default) or "user"' }
+  ],
+  outputSchema: {
+    skills: [{ name: "string", plugin: "string", disabled: "boolean" }]
+  }
+};
+var skillsRemoveMeta = {
+  command: "plugin skills remove",
+  description: "Disable a skill (exclude from sync)",
+  whenToUse: "To prevent a specific skill from being synced to your workspace",
+  examples: [
+    "allagents plugin skills remove brainstorming",
+    "allagents plugin skills remove brainstorming --plugin superpowers",
+    "allagents plugin skills remove brainstorming --scope user"
+  ],
+  expectedOutput: "Confirms skill was disabled and runs sync",
+  positionals: [
+    { name: "skill", type: "string", required: true, description: "Skill name to disable" }
+  ],
+  options: [
+    { flag: "--scope", short: "-s", type: "string", description: 'Scope: "project" (default) or "user"' },
+    { flag: "--plugin", short: "-p", type: "string", description: "Plugin name (required if skill exists in multiple plugins)" }
+  ],
+  outputSchema: {
+    skill: "string",
+    plugin: "string",
+    syncResult: { copied: "number", failed: "number" }
+  }
+};
+var skillsAddMeta = {
+  command: "plugin skills add",
+  description: "Re-enable a previously disabled skill",
+  whenToUse: "To re-enable a skill that was previously disabled",
+  examples: [
+    "allagents plugin skills add brainstorming",
+    "allagents plugin skills add brainstorming --plugin superpowers"
+  ],
+  expectedOutput: "Confirms skill was enabled and runs sync",
+  positionals: [
+    { name: "skill", type: "string", required: true, description: "Skill name to enable" }
+  ],
+  options: [
+    { flag: "--scope", short: "-s", type: "string", description: 'Scope: "project" (default) or "user"' },
+    { flag: "--plugin", short: "-p", type: "string", description: "Plugin name (required if skill exists in multiple plugins)" }
+  ],
+  outputSchema: {
+    skill: "string",
+    plugin: "string",
+    syncResult: { copied: "number", failed: "number" }
+  }
+};
+
+// src/cli/commands/plugin-skills.ts
+init_constants();
+function groupSkillsByPlugin(skills) {
+  const grouped = new Map;
+  for (const skill of skills) {
+    const existing = grouped.get(skill.pluginName);
+    if (existing) {
+      existing.skills.push({ name: skill.name, disabled: skill.disabled });
+    } else {
+      grouped.set(skill.pluginName, {
+        source: skill.pluginSource,
+        skills: [{ name: skill.name, disabled: skill.disabled }]
+      });
+    }
+  }
+  return grouped;
+}
+var listCmd = import_cmd_ts3.command({
+  name: "list",
+  description: buildDescription(skillsListMeta),
+  args: {
+    scope: import_cmd_ts3.option({
+      type: import_cmd_ts3.optional(import_cmd_ts3.string),
+      long: "scope",
+      short: "s",
+      description: 'Scope: "project" (default) or "user"'
+    })
+  },
+  handler: async ({ scope }) => {
+    try {
+      const isUser = scope === "user" || !scope && isUserConfigPath(process.cwd());
+      const workspacePath = isUser ? getHomeDir() : process.cwd();
+      const skills = await getAllSkillsFromPlugins(workspacePath);
+      if (isJsonMode()) {
+        jsonOutput({
+          success: true,
+          command: "plugin skills list",
+          data: {
+            scope: isUser ? "user" : "project",
+            skills: skills.map((s) => ({
+              name: s.name,
+              plugin: s.pluginName,
+              disabled: s.disabled
+            }))
+          }
+        });
+        return;
+      }
+      if (skills.length === 0) {
+        console.log("No skills found. Install a plugin first with:");
+        console.log("  allagents plugin install <plugin>");
+        return;
+      }
+      const grouped = groupSkillsByPlugin(skills);
+      for (const [pluginName, data] of grouped) {
+        console.log(`
+${pluginName} (${data.source}):`);
+        for (const skill of data.skills) {
+          const icon = skill.disabled ? "✗" : "✓";
+          const status = skill.disabled ? " (disabled)" : "";
+          console.log(`  ${icon} ${skill.name}${status}`);
+        }
+      }
+      console.log();
+    } catch (error) {
+      if (error instanceof Error) {
+        if (isJsonMode()) {
+          jsonOutput({ success: false, command: "plugin skills list", error: error.message });
+          process.exit(1);
+        }
+        console.error(`Error: ${error.message}`);
+        process.exit(1);
+      }
+      throw error;
+    }
+  }
+});
+var removeCmd = import_cmd_ts3.command({
+  name: "remove",
+  description: buildDescription(skillsRemoveMeta),
+  args: {
+    skill: import_cmd_ts3.positional({ type: import_cmd_ts3.string, displayName: "skill" }),
+    scope: import_cmd_ts3.option({
+      type: import_cmd_ts3.optional(import_cmd_ts3.string),
+      long: "scope",
+      short: "s",
+      description: 'Scope: "project" (default) or "user"'
+    }),
+    plugin: import_cmd_ts3.option({
+      type: import_cmd_ts3.optional(import_cmd_ts3.string),
+      long: "plugin",
+      short: "p",
+      description: "Plugin name (required if skill exists in multiple plugins)"
+    })
+  },
+  handler: async ({ skill, scope, plugin }) => {
+    try {
+      const isUser = scope === "user" || !scope && isUserConfigPath(process.cwd());
+      const workspacePath = isUser ? getHomeDir() : process.cwd();
+      const matches = await findSkillByName(skill, workspacePath);
+      if (matches.length === 0) {
+        const allSkills = await getAllSkillsFromPlugins(workspacePath);
+        const skillNames = [...new Set(allSkills.map((s) => s.name))].join(", ");
+        const error = `Skill '${skill}' not found in any installed plugin.
+
+Available skills: ${skillNames || "none"}`;
+        if (isJsonMode()) {
+          jsonOutput({ success: false, command: "plugin skills remove", error });
+          process.exit(1);
+        }
+        console.error(`Error: ${error}`);
+        process.exit(1);
+      }
+      let targetSkill = matches[0];
+      if (!targetSkill) {
+        throw new Error("Unexpected empty matches array");
+      }
+      if (matches.length > 1) {
+        if (!plugin) {
+          const pluginList = matches.map((m) => `  - ${m.pluginName} (${m.pluginSource})`).join(`
+`);
+          const error = `'${skill}' exists in multiple plugins:
+${pluginList}
+
+Use --plugin to specify: allagents plugin skills remove ${skill} --plugin <name>`;
+          if (isJsonMode()) {
+            jsonOutput({ success: false, command: "plugin skills remove", error });
+            process.exit(1);
+          }
+          console.error(`Error: ${error}`);
+          process.exit(1);
+        }
+        const filtered = matches.find((m) => m.pluginName === plugin);
+        if (!filtered) {
+          const error = `Plugin '${plugin}' not found. Installed plugins: ${matches.map((m) => m.pluginName).join(", ")}`;
+          if (isJsonMode()) {
+            jsonOutput({ success: false, command: "plugin skills remove", error });
+            process.exit(1);
+          }
+          console.error(`Error: ${error}`);
+          process.exit(1);
+        }
+        targetSkill = filtered;
+      }
+      if (targetSkill.disabled) {
+        const msg = `Skill '${skill}' is already disabled.`;
+        if (isJsonMode()) {
+          jsonOutput({ success: false, command: "plugin skills remove", error: msg });
+          process.exit(1);
+        }
+        console.log(msg);
+        return;
+      }
+      const skillKey = `${targetSkill.pluginName}:${skill}`;
+      const result = isUser ? await addUserDisabledSkill(skillKey) : await addDisabledSkill(skillKey, workspacePath);
+      if (!result.success) {
+        if (isJsonMode()) {
+          jsonOutput({ success: false, command: "plugin skills remove", error: result.error ?? "Unknown error" });
+          process.exit(1);
+        }
+        console.error(`Error: ${result.error}`);
+        process.exit(1);
+      }
+      if (!isJsonMode()) {
+        console.log(`✓ Disabled skill: ${skill} (${targetSkill.pluginName})`);
+        console.log(`
+Syncing workspace...
+`);
+      }
+      const syncResult = isUser ? await syncUserWorkspace() : await syncWorkspace(workspacePath);
+      if (isJsonMode()) {
+        jsonOutput({
+          success: syncResult.success,
+          command: "plugin skills remove",
+          data: {
+            skill,
+            plugin: targetSkill.pluginName,
+            syncResult: {
+              copied: syncResult.totalCopied,
+              failed: syncResult.totalFailed
+            }
+          }
+        });
+        if (!syncResult.success)
+          process.exit(1);
+        return;
+      }
+      console.log("Sync complete.");
+    } catch (error) {
+      if (error instanceof Error) {
+        if (isJsonMode()) {
+          jsonOutput({ success: false, command: "plugin skills remove", error: error.message });
+          process.exit(1);
+        }
+        console.error(`Error: ${error.message}`);
+        process.exit(1);
+      }
+      throw error;
+    }
+  }
+});
+var addCmd = import_cmd_ts3.command({
+  name: "add",
+  description: buildDescription(skillsAddMeta),
+  args: {
+    skill: import_cmd_ts3.positional({ type: import_cmd_ts3.string, displayName: "skill" }),
+    scope: import_cmd_ts3.option({
+      type: import_cmd_ts3.optional(import_cmd_ts3.string),
+      long: "scope",
+      short: "s",
+      description: 'Scope: "project" (default) or "user"'
+    }),
+    plugin: import_cmd_ts3.option({
+      type: import_cmd_ts3.optional(import_cmd_ts3.string),
+      long: "plugin",
+      short: "p",
+      description: "Plugin name (required if skill exists in multiple plugins)"
+    })
+  },
+  handler: async ({ skill, scope, plugin }) => {
+    try {
+      const isUser = scope === "user" || !scope && isUserConfigPath(process.cwd());
+      const workspacePath = isUser ? getHomeDir() : process.cwd();
+      const matches = await findSkillByName(skill, workspacePath);
+      if (matches.length === 0) {
+        const allSkills = await getAllSkillsFromPlugins(workspacePath);
+        const skillNames = [...new Set(allSkills.map((s) => s.name))].join(", ");
+        const error = `Skill '${skill}' not found in any installed plugin.
+
+Available skills: ${skillNames || "none"}`;
+        if (isJsonMode()) {
+          jsonOutput({ success: false, command: "plugin skills add", error });
+          process.exit(1);
+        }
+        console.error(`Error: ${error}`);
+        process.exit(1);
+      }
+      let targetSkill = matches[0];
+      if (!targetSkill) {
+        throw new Error("Unexpected empty matches array");
+      }
+      if (matches.length > 1) {
+        if (!plugin) {
+          const pluginList = matches.map((m) => `  - ${m.pluginName} (${m.pluginSource})`).join(`
+`);
+          const error = `'${skill}' exists in multiple plugins:
+${pluginList}
+
+Use --plugin to specify: allagents plugin skills add ${skill} --plugin <name>`;
+          if (isJsonMode()) {
+            jsonOutput({ success: false, command: "plugin skills add", error });
+            process.exit(1);
+          }
+          console.error(`Error: ${error}`);
+          process.exit(1);
+        }
+        const filtered = matches.find((m) => m.pluginName === plugin);
+        if (!filtered) {
+          const error = `Plugin '${plugin}' not found. Installed plugins: ${matches.map((m) => m.pluginName).join(", ")}`;
+          if (isJsonMode()) {
+            jsonOutput({ success: false, command: "plugin skills add", error });
+            process.exit(1);
+          }
+          console.error(`Error: ${error}`);
+          process.exit(1);
+        }
+        targetSkill = filtered;
+      }
+      if (!targetSkill.disabled) {
+        const msg = `Skill '${skill}' is already enabled.`;
+        if (isJsonMode()) {
+          jsonOutput({ success: false, command: "plugin skills add", error: msg });
+          process.exit(1);
+        }
+        console.log(msg);
+        return;
+      }
+      const skillKey = `${targetSkill.pluginName}:${skill}`;
+      const result = isUser ? await removeUserDisabledSkill(skillKey) : await removeDisabledSkill(skillKey, workspacePath);
+      if (!result.success) {
+        if (isJsonMode()) {
+          jsonOutput({ success: false, command: "plugin skills add", error: result.error ?? "Unknown error" });
+          process.exit(1);
+        }
+        console.error(`Error: ${result.error}`);
+        process.exit(1);
+      }
+      if (!isJsonMode()) {
+        console.log(`✓ Enabled skill: ${skill} (${targetSkill.pluginName})`);
+        console.log(`
+Syncing workspace...
+`);
+      }
+      const syncResult = isUser ? await syncUserWorkspace() : await syncWorkspace(workspacePath);
+      if (isJsonMode()) {
+        jsonOutput({
+          success: syncResult.success,
+          command: "plugin skills add",
+          data: {
+            skill,
+            plugin: targetSkill.pluginName,
+            syncResult: {
+              copied: syncResult.totalCopied,
+              failed: syncResult.totalFailed
+            }
+          }
+        });
+        if (!syncResult.success)
+          process.exit(1);
+        return;
+      }
+      console.log("Sync complete.");
+    } catch (error) {
+      if (error instanceof Error) {
+        if (isJsonMode()) {
+          jsonOutput({ success: false, command: "plugin skills add", error: error.message });
+          process.exit(1);
+        }
+        console.error(`Error: ${error.message}`);
+        process.exit(1);
+      }
+      throw error;
+    }
+  }
+});
+var skillsCmd = conciseSubcommands({
+  name: "skills",
+  description: "Manage individual skills from plugins",
+  cmds: {
+    list: listCmd,
+    remove: removeCmd,
+    add: addCmd
+  }
+});
+
 // src/cli/commands/plugin.ts
 function buildSyncData2(result) {
   return {
@@ -33937,7 +34546,7 @@ User sync complete:`);
   }
   return { ok: result.success && result.totalFailed === 0, syncData };
 }
-var marketplaceListCmd = import_cmd_ts3.command({
+var marketplaceListCmd = import_cmd_ts4.command({
   name: "list",
   description: buildDescription(marketplaceListMeta),
   args: {},
@@ -33958,11 +34567,9 @@ var marketplaceListCmd = import_cmd_ts3.command({
         console.log("Add a marketplace with:");
         console.log(`  allagents plugin marketplace add <source>
 `);
-        console.log("Well-known marketplaces:");
-        const wellKnown = getWellKnownMarketplaces();
-        for (const [name, repo] of Object.entries(wellKnown)) {
-          console.log(`  ${name} → ${repo}`);
-        }
+        console.log("Examples:");
+        console.log("  allagents plugin marketplace add owner/repo");
+        console.log("  allagents plugin marketplace add https://github.com/owner/repo");
         return;
       }
       console.log(`Registered marketplaces:
@@ -33990,13 +34597,13 @@ var marketplaceListCmd = import_cmd_ts3.command({
     }
   }
 });
-var marketplaceAddCmd = import_cmd_ts3.command({
+var marketplaceAddCmd = import_cmd_ts4.command({
   name: "add",
   description: buildDescription(marketplaceAddMeta),
   args: {
-    source: import_cmd_ts3.positional({ type: import_cmd_ts3.string, displayName: "source" }),
-    name: import_cmd_ts3.option({ type: import_cmd_ts3.optional(import_cmd_ts3.string), long: "name", short: "n", description: "Custom name for the marketplace" }),
-    branch: import_cmd_ts3.option({ type: import_cmd_ts3.optional(import_cmd_ts3.string), long: "branch", short: "b", description: "Branch to checkout after cloning" })
+    source: import_cmd_ts4.positional({ type: import_cmd_ts4.string, displayName: "source" }),
+    name: import_cmd_ts4.option({ type: import_cmd_ts4.optional(import_cmd_ts4.string), long: "name", short: "n", description: "Custom name for the marketplace" }),
+    branch: import_cmd_ts4.option({ type: import_cmd_ts4.optional(import_cmd_ts4.string), long: "branch", short: "b", description: "Branch to checkout after cloning" })
   },
   handler: async ({ source, name, branch }) => {
     try {
@@ -34041,11 +34648,11 @@ Error: ${result.error}`);
     }
   }
 });
-var marketplaceRemoveCmd = import_cmd_ts3.command({
+var marketplaceRemoveCmd = import_cmd_ts4.command({
   name: "remove",
   description: buildDescription(marketplaceRemoveMeta),
   args: {
-    name: import_cmd_ts3.positional({ type: import_cmd_ts3.string, displayName: "name" })
+    name: import_cmd_ts4.positional({ type: import_cmd_ts4.string, displayName: "name" })
   },
   handler: async ({ name }) => {
     try {
@@ -34089,11 +34696,11 @@ var marketplaceRemoveCmd = import_cmd_ts3.command({
     }
   }
 });
-var marketplaceUpdateCmd = import_cmd_ts3.command({
+var marketplaceUpdateCmd = import_cmd_ts4.command({
   name: "update",
   description: buildDescription(marketplaceUpdateMeta),
   args: {
-    name: import_cmd_ts3.positional({ type: import_cmd_ts3.optional(import_cmd_ts3.string), displayName: "name" })
+    name: import_cmd_ts4.positional({ type: import_cmd_ts4.optional(import_cmd_ts4.string), displayName: "name" })
   },
   handler: async ({ name }) => {
     try {
@@ -34159,11 +34766,11 @@ var marketplaceCmd = conciseSubcommands({
     update: marketplaceUpdateCmd
   }
 });
-var pluginListCmd = import_cmd_ts3.command({
+var pluginListCmd = import_cmd_ts4.command({
   name: "list",
   description: buildDescription(pluginListMeta),
   args: {
-    marketplace: import_cmd_ts3.positional({ type: import_cmd_ts3.optional(import_cmd_ts3.string), displayName: "marketplace" })
+    marketplace: import_cmd_ts4.positional({ type: import_cmd_ts4.optional(import_cmd_ts4.string), displayName: "marketplace" })
   },
   handler: async ({ marketplace }) => {
     try {
@@ -34195,11 +34802,25 @@ var pluginListCmd = import_cmd_ts3.command({
       const userPlugins = await getInstalledUserPlugins();
       const projectPlugins = await getInstalledProjectPlugins(process.cwd());
       const installedMap = new Map;
+      const repoToMarketplace = new Map;
+      for (const mp of marketplaces) {
+        if (mp.source.type === "github") {
+          const parts = mp.source.location.split("/");
+          if (parts.length >= 2 && parts[1]) {
+            repoToMarketplace.set(parts[1], mp.name);
+          }
+        }
+      }
+      const resolveMarketplaceName = (name) => {
+        return repoToMarketplace.get(name) ?? name;
+      };
       for (const p of userPlugins) {
-        installedMap.set(`${p.name}@${p.marketplace}`, p);
+        const mpName = resolveMarketplaceName(p.marketplace);
+        installedMap.set(`${p.name}@${mpName}`, p);
       }
       for (const p of projectPlugins) {
-        installedMap.set(`${p.name}@${p.marketplace}`, p);
+        const mpName = resolveMarketplaceName(p.marketplace);
+        installedMap.set(`${p.name}@${mpName}`, p);
       }
       const versionMap = new Map;
       for (const mp of toList) {
@@ -34299,11 +34920,11 @@ var pluginListCmd = import_cmd_ts3.command({
     }
   }
 });
-var pluginValidateCmd = import_cmd_ts3.command({
+var pluginValidateCmd = import_cmd_ts4.command({
   name: "validate",
   description: buildDescription(pluginValidateMeta),
   args: {
-    path: import_cmd_ts3.positional({ type: import_cmd_ts3.string, displayName: "path" })
+    path: import_cmd_ts4.positional({ type: import_cmd_ts4.string, displayName: "path" })
   },
   handler: async ({ path }) => {
     if (isJsonMode()) {
@@ -34318,12 +34939,12 @@ var pluginValidateCmd = import_cmd_ts3.command({
     console.log("(validation not yet implemented)");
   }
 });
-var pluginInstallCmd = import_cmd_ts3.command({
+var pluginInstallCmd = import_cmd_ts4.command({
   name: "install",
   description: buildDescription(pluginInstallMeta),
   args: {
-    plugin: import_cmd_ts3.positional({ type: import_cmd_ts3.string, displayName: "plugin" }),
-    scope: import_cmd_ts3.option({ type: import_cmd_ts3.optional(import_cmd_ts3.string), long: "scope", short: "s", description: 'Installation scope: "project" (default) or "user"' })
+    plugin: import_cmd_ts4.positional({ type: import_cmd_ts4.string, displayName: "plugin" }),
+    scope: import_cmd_ts4.option({ type: import_cmd_ts4.optional(import_cmd_ts4.string), long: "scope", short: "s", description: 'Installation scope: "project" (default) or "user"' })
   },
   handler: async ({ plugin, scope }) => {
     try {
@@ -34339,11 +34960,12 @@ var pluginInstallCmd = import_cmd_ts3.command({
       }
       if (isJsonMode()) {
         const { ok, syncData } = isUser ? await runUserSyncAndPrint() : await runSyncAndPrint();
+        const displayPlugin2 = result.normalizedPlugin ?? plugin;
         jsonOutput({
           success: ok,
           command: "plugin install",
           data: {
-            plugin,
+            plugin: displayPlugin2,
             scope: isUser ? "user" : "project",
             autoRegistered: result.autoRegistered ?? null,
             syncResult: syncData
@@ -34355,10 +34977,11 @@ var pluginInstallCmd = import_cmd_ts3.command({
         }
         return;
       }
+      const displayPlugin = result.normalizedPlugin ?? plugin;
       if (result.autoRegistered) {
         console.log(`✓ Auto-registered marketplace: ${result.autoRegistered}`);
       }
-      console.log(`✓ Installed plugin (${isUser ? "user" : "project"} scope): ${plugin}`);
+      console.log(`✓ Installed plugin (${isUser ? "user" : "project"} scope): ${displayPlugin}`);
       const { ok: syncOk } = isUser ? await runUserSyncAndPrint() : await runSyncAndPrint();
       if (!syncOk) {
         process.exit(1);
@@ -34376,13 +34999,13 @@ var pluginInstallCmd = import_cmd_ts3.command({
     }
   }
 });
-var pluginUninstallCmd = import_cmd_ts3.command({
+var pluginUninstallCmd = import_cmd_ts4.command({
   name: "uninstall",
   description: buildDescription(pluginUninstallMeta),
   aliases: ["remove"],
   args: {
-    plugin: import_cmd_ts3.positional({ type: import_cmd_ts3.string, displayName: "plugin" }),
-    scope: import_cmd_ts3.option({ type: import_cmd_ts3.optional(import_cmd_ts3.string), long: "scope", short: "s", description: 'Installation scope: "project" (default) or "user"' })
+    plugin: import_cmd_ts4.positional({ type: import_cmd_ts4.string, displayName: "plugin" }),
+    scope: import_cmd_ts4.option({ type: import_cmd_ts4.optional(import_cmd_ts4.string), long: "scope", short: "s", description: 'Installation scope: "project" (default) or "user"' })
   },
   handler: async ({ plugin, scope }) => {
     try {
@@ -34512,13 +35135,14 @@ var pluginCmd = conciseSubcommands({
     uninstall: pluginUninstallCmd,
     marketplace: marketplaceCmd,
     list: pluginListCmd,
-    validate: pluginValidateCmd
+    validate: pluginValidateCmd,
+    skills: skillsCmd
   }
 });
 
 // src/cli/commands/self.ts
 init_execa();
-var import_cmd_ts4 = __toESM(require_cjs(), 1);
+var import_cmd_ts5 = __toESM(require_cjs(), 1);
 
 // src/cli/metadata/self.ts
 var updateMeta = {
@@ -34556,12 +35180,12 @@ function detectPackageManager() {
 function getCurrentVersion() {
   return package_default.version;
 }
-var updateCmd = import_cmd_ts4.command({
+var updateCmd = import_cmd_ts5.command({
   name: "update",
   description: buildDescription(updateMeta),
   args: {
-    npm: import_cmd_ts4.flag({ long: "npm", description: "Force update using npm" }),
-    bun: import_cmd_ts4.flag({ long: "bun", description: "Force update using bun" })
+    npm: import_cmd_ts5.flag({ long: "npm", description: "Force update using npm" }),
+    bun: import_cmd_ts5.flag({ long: "bun", description: "Force update using bun" })
   },
   handler: async ({ npm, bun }) => {
     try {
@@ -34762,5 +35386,5 @@ if (agentHelp) {
   const { runWizard: runWizard2 } = await Promise.resolve().then(() => (init_wizard(), exports_wizard));
   await runWizard2();
 } else {
-  import_cmd_ts5.run(app, finalArgs);
+  import_cmd_ts6.run(app, finalArgs);
 }