agentinit 1.16.2 → 1.17.1

package/dist/cli.js

@@ -16945,6 +16945,13 @@ var init_marketplaceRegistry = __esm(() => {
   CUSTOM_MARKETPLACE_CACHE_TTL_MS = 3600000;
 });
 
+// dist/types/skills.js
+var SHARED_SKILLS_TARGET_ID, SHARED_SKILLS_TARGET_NAME;
+var init_skills = __esm(() => {
+  SHARED_SKILLS_TARGET_ID = "agents";
+  SHARED_SKILLS_TARGET_NAME = "AGENTS.md ecosystem";
+});
+
 // dist/core/mcpFilter.js
 class MCPFilter {
   static filterForAgent(agent, servers) {
@@ -17048,6 +17055,11 @@ __export(exports_pluginManager, {
       return PluginManager;
     }
   },
+  MultipleBundlePluginsError: () => {
+    {
+      return MultipleBundlePluginsError;
+    }
+  },
   MarketplacePluginNotFoundError: () => {
     {
       return MarketplacePluginNotFoundError;
@@ -17058,6 +17070,16 @@ import {resolve as resolve7, join as join4, basename as basename2, relative as r
 import {promises as fs22} from "fs";
 import {homedir as homedir4} from "os";
 
+class MultipleBundlePluginsError extends Error {
+  entries;
+  constructor(pluginDir, entries) {
+    const names = entries.map((e) => e.name).join(", ");
+    super(`Repository "${pluginDir}" is a Claude marketplace bundle with multiple plugins. Select one of: ${names}.`);
+    this.name = "MultipleBundlePluginsError";
+    this.entries = entries;
+  }
+}
+
 class MarketplacePluginNotFoundError extends Error {
   pluginName;
   marketplaceId;
@@ -17195,7 +17217,7 @@ class PluginManager {
       const candidates = new Set([source.pluginName, source.repo].filter((value) => !!value).flatMap((value) => [value, basename2(value)]));
       const matched = entries.find((entry) => candidates.has(entry.name) || candidates.has(basename2(entry.source)));
       if (!matched) {
-        throw new Error(`Repository "${pluginDir}" is a Claude marketplace bundle with multiple plugins. Select one of: ${entries.map((entry) => entry.name).join(", ")}.`);
+        throw new MultipleBundlePluginsError(pluginDir, entries);
       }
       selectedEntry = matched;
     }
@@ -17272,6 +17294,9 @@ class PluginManager {
         throw new Error(`Local path not found: ${pluginDir}`);
       }
     }
+    if (options2.pluginName) {
+      effectiveSource = { ...effectiveSource, pluginName: options2.pluginName };
+    }
     return {
       plugin: await this.loadPluginFromDirectory(pluginDir, effectiveSource, resolutionWarnings),
       effectiveSource,
@@ -18111,7 +18136,10 @@ ${body.trim()}
     };
   }
   async installPlugin(source, projectPath, options2 = {}) {
-    const context = this.takePreparedInstallContext(source, options2.from) || await this.loadPluginContext(source, { from: options2.from });
+    const context = this.takePreparedInstallContext(source, options2.from) || await this.loadPluginContext(source, {
+      from: options2.from,
+      ...options2.pluginName ? { pluginName: options2.pluginName } : {}
+    });
     try {
       const plugin = context.plugin;
       if (options2.list) {
@@ -18526,6 +18554,7 @@ import {promisify} from "util";
 
 class SkillsManager {
   agentManager;
+  preparedSourceContexts = new Map;
   constructor(agentManager3) {
     this.agentManager = agentManager3 || new AgentManager;
   }
@@ -18668,7 +18697,7 @@ class SkillsManager {
     }
   }
   async discoverSkills(repoPath) {
-    const skills = [];
+    const skills2 = [];
     const seen = new Set;
     for (const searchDir of SKILL_SEARCH_DIRS) {
       const fullDir = resolve8(repoPath, searchDir);
@@ -18679,7 +18708,7 @@ class SkillsManager {
         const parsed = await this.parseSkillMd(directSkillMd);
         if (parsed && !seen.has(parsed.name)) {
           seen.add(parsed.name);
-          skills.push({ ...parsed, path: resolve8(fullDir) });
+          skills2.push({ ...parsed, path: resolve8(fullDir) });
         }
       }
       const directSkillMdLower = join5(fullDir, "skill.md");
@@ -18687,7 +18716,7 @@ class SkillsManager {
         const parsed = await this.parseSkillMd(directSkillMdLower);
         if (parsed && !seen.has(parsed.name)) {
           seen.add(parsed.name);
-          skills.push({ ...parsed, path: resolve8(fullDir) });
+          skills2.push({ ...parsed, path: resolve8(fullDir) });
         }
       }
       if (!await isDirectory(fullDir))
@@ -18705,11 +18734,11 @@ class SkillsManager {
         const parsed = await this.parseSkillMd(skillFile);
         if (parsed && !seen.has(parsed.name)) {
           seen.add(parsed.name);
-          skills.push({ ...parsed, path: entryPath });
+          skills2.push({ ...parsed, path: entryPath });
         }
       }
     }
-    return skills;
+    return skills2;
   }
   async cloneRepo(url) {
     const tempDir = await fs24.mkdtemp(join5(tmpdir(), "agentinit-skills-"));
@@ -18740,12 +18769,13 @@ class SkillsManager {
     const marketplaceHints = marketplaces.length > 0 ? ` If you meant a marketplace skill, use "${marketplaces[0]}/${normalizedSource}" or "--from ${marketplaces[0]}".` : "";
     return new Error(`Local path not found: ${resolvedPath}. If you meant a local path, prefix it with "./".${marketplaceHints}`);
   }
-  async discoverMarketplaceSkills(source, projectPath) {
+  async discoverMarketplaceSkills(source, projectPath, pluginName) {
     const { PluginManager: PluginManager2 } = await Promise.resolve().then(() => (init_pluginManager(), exports_pluginManager));
     const pluginManager = new PluginManager2(this.agentManager);
     const result = await pluginManager.installPlugin(source.pluginName || this.getMarketplaceSourceId(source), projectPath, {
       from: source.marketplace,
-      list: true
+      list: true,
+      ...pluginName ? { pluginName } : {}
     });
     const warnings = [...result.warnings];
     if (result.plugin.mcpServers.length > 0) {
@@ -18809,6 +18839,9 @@ class SkillsManager {
   async loadDiscoveredSkillsContext(source, projectPath, options2 = {}) {
     const request = this.resolveSourceRequest(source, options2);
     const resolved = request.source;
+    if (options2.pluginName && resolved.type !== "marketplace") {
+      resolved.pluginName = options2.pluginName;
+    }
     let tempDir = null;
     const cleanup = async () => {
       await this.cleanupTempDir(tempDir);
@@ -18816,7 +18849,7 @@ class SkillsManager {
     };
     try {
       if (resolved.type === "marketplace") {
-        const discovered = await this.discoverMarketplaceSkills(resolved, projectPath);
+        const discovered = await this.discoverMarketplaceSkills(resolved, projectPath, options2.pluginName);
         return {
           ...discovered,
           cleanup
@@ -18836,24 +18869,24 @@ class SkillsManager {
         }
       }
       const discoveryRoot = await this.resolveDiscoveryRoot(repoPath, resolved, source);
-      let skills = await this.discoverSkills(discoveryRoot);
+      let skills2 = await this.discoverSkills(discoveryRoot);
       let pluginWarnings = [];
-      if (skills.length === 0) {
+      if (skills2.length === 0) {
         const pluginBackedSkills = await this.discoverPortablePluginSkills(discoveryRoot, source, resolved, projectPath);
         if (pluginBackedSkills) {
-          skills = pluginBackedSkills.skills;
+          skills2 = pluginBackedSkills.skills;
           pluginWarnings = pluginBackedSkills.warnings;
         }
       }
       if (request.implicitSkills.length > 0) {
         const names = new Set(request.implicitSkills.map((skill) => skill.toLowerCase()));
-        skills = skills.filter((skill) => names.has(skill.name.toLowerCase()));
+        skills2 = skills2.filter((skill) => names.has(skill.name.toLowerCase()));
       }
       const warnings = [
         ...pluginWarnings,
         ...request.implicitSkills.length > 0 ? [`Resolved "${source}" from the default skills catalog ${DEFAULT_SKILLS_CATALOG.owner}/${DEFAULT_SKILLS_CATALOG.repo}. Use "./${source}" for a local path.`] : []
       ];
-      return { skills, warnings, cleanup };
+      return { skills: skills2, warnings, cleanup };
     } catch (error) {
       await cleanup();
       throw error;
@@ -18870,6 +18903,37 @@ class SkillsManager {
       await context.cleanup();
     }
   }
+  getPreparedSourceKey(source, projectPath, from) {
+    return `${projectPath}\n${from || ""}\n${source}`;
+  }
+  async storePreparedSourceContext(source, projectPath, from, context) {
+    const key = this.getPreparedSourceKey(source, projectPath, from);
+    const existing = this.preparedSourceContexts.get(key);
+    this.preparedSourceContexts.set(key, context);
+    if (existing && existing !== context) {
+      await existing.cleanup();
+    }
+  }
+  takePreparedSourceContext(source, projectPath, from) {
+    const key = this.getPreparedSourceKey(source, projectPath, from);
+    const existing = this.preparedSourceContexts.get(key) || null;
+    if (existing) {
+      this.preparedSourceContexts.delete(key);
+    }
+    return existing;
+  }
+  async prepareSource(source, projectPath, options2 = {}) {
+    const context = await this.loadDiscoveredSkillsContext(source, projectPath, options2);
+    await this.storePreparedSourceContext(source, projectPath, options2.from, context);
+    return {
+      skills: context.skills,
+      warnings: context.warnings
+    };
+  }
+  async discardPreparedSource(source, projectPath, options2 = {}) {
+    const context = this.takePreparedSourceContext(source, projectPath, options2.from);
+    await context?.cleanup();
+  }
   async getTargetAgents(projectPath, options2) {
     if (options2.agents && options2.agents.length > 0) {
       const agents = [];
@@ -18997,6 +19061,27 @@ class SkillsManager {
     }
     return plan;
   }
+  async installSkillToCanonicalStore(skillPath, skillName, projectPath, options2 = {}) {
+    const plan = this.getCanonicalInstallPlan(skillName, projectPath, options2);
+    await this.cleanAndCreateDirectory(plan.path);
+    await this.copyDir(skillPath, plan.path);
+    return plan;
+  }
+  async installSkillFromContentToCanonicalStore(skillName, skillContent, projectPath, options2 = {}) {
+    const plan = this.getCanonicalInstallPlan(skillName, projectPath, options2);
+    await this.cleanAndCreateDirectory(plan.path);
+    await fs24.writeFile(join5(plan.path, "SKILL.md"), skillContent, "utf8");
+    return plan;
+  }
+  getCanonicalInstallPlan(skillName, projectPath, options2 = {}) {
+    const normalizedSkillName = this.normalizeSkillName(skillName);
+    const canonicalPath = this.resolveInstallPath(this.getCanonicalSkillsDir(projectPath, options2.global ?? false), normalizedSkillName);
+    return {
+      path: canonicalPath,
+      canonicalPath,
+      mode: "symlink"
+    };
+  }
   normalizeSkillName(skillName) {
     const normalized = skillName.trim();
     if (!normalized) {
@@ -19032,45 +19117,60 @@ class SkillsManager {
     await fs24.cp(src, dest, { recursive: true, dereference: true });
   }
   async addFromSource(source, projectPath, options2 = {}) {
-    const context = await this.loadDiscoveredSkillsContext(source, projectPath, {
-      ...options2.from !== undefined ? { from: options2.from } : {}
+    const context = this.takePreparedSourceContext(source, projectPath, options2.from) || await this.loadDiscoveredSkillsContext(source, projectPath, {
+      ...options2.from !== undefined ? { from: options2.from } : {},
+      ...options2.pluginName !== undefined ? { pluginName: options2.pluginName } : {}
     });
     try {
-      let skills = context.skills;
-      if (skills.length === 0) {
+      let skills2 = context.skills;
+      if (skills2.length === 0) {
         return { installed: [], skipped: [], warnings: context.warnings };
       }
       if (options2.skills && options2.skills.length > 0) {
         const names = new Set(options2.skills.map((skill) => skill.toLowerCase()));
-        skills = skills.filter((skill) => names.has(skill.name.toLowerCase()));
+        skills2 = skills2.filter((skill) => names.has(skill.name.toLowerCase()));
       }
+      const installToSharedStore = options2.agents?.includes(SHARED_SKILLS_TARGET_ID) ?? false;
       const agents = await this.getTargetAgents(projectPath, options2);
-      if (agents.length === 0) {
+      if (agents.length === 0 && !installToSharedStore) {
         return {
           installed: [],
-          skipped: skills.map((skill) => ({ skill, reason: "No target agents found" })),
+          skipped: skills2.map((skill) => ({ skill, reason: "No target agents found" })),
           warnings: context.warnings
         };
       }
       const result = { installed: [], skipped: [], warnings: context.warnings };
       const installableAgents = [];
+      if (installToSharedStore) {
+        for (const skill of skills2) {
+          try {
+            const installOptions = {
+              ...options2.global !== undefined ? { global: options2.global } : {}
+            };
+            const installed = skill.generatedContent ? await this.installSkillFromContentToCanonicalStore(skill.name, skill.generatedContent, projectPath, installOptions) : await this.installSkillToCanonicalStore(skill.path, skill.name, projectPath, installOptions);
+            result.installed.push({ skill, agent: SHARED_SKILLS_TARGET_ID, ...installed });
+          } catch (error) {
+            result.skipped.push({ skill, reason: error.message });
+          }
+        }
+      }
       for (const agent of agents) {
         if (!agent.supportsSkills()) {
-          for (const skill of skills) {
+          for (const skill of skills2) {
             result.skipped.push({ skill, reason: `${agent.name} does not support skills` });
           }
           continue;
         }
         const skillsDir = agent.getSkillsDir(projectPath, options2.global);
         if (!skillsDir) {
-          for (const skill of skills) {
+          for (const skill of skills2) {
             result.skipped.push({ skill, reason: `No skills directory for ${agent.name}` });
           }
           continue;
         }
         installableAgents.push(agent);
       }
-      for (const skill of skills) {
+      for (const skill of skills2) {
         for (const agent of installableAgents) {
           try {
             const installOptions = {
@@ -19149,6 +19249,43 @@ class SkillsManager {
         }
       }
     }
+    const includeSharedTarget = !options2.agents || options2.agents.includes(SHARED_SKILLS_TARGET_ID);
+    if (includeSharedTarget) {
+      const scopes = options2.global ? ["global"] : ["project", "global"];
+      const referencedCanonicalPaths = new Set(installed.map((entry) => entry.canonicalPath).filter((value) => !!value).map((value) => resolve8(value)));
+      for (const scope of scopes) {
+        const canonicalDir = this.getCanonicalSkillsDir(projectPath, scope === "global");
+        if (!await fileExists(canonicalDir))
+          continue;
+        const entries = await listFiles(canonicalDir);
+        for (const entry of entries) {
+          const entryPath = join5(canonicalDir, entry);
+          if (!await isDirectory(entryPath))
+            continue;
+          const resolvedEntryPath = resolve8(entryPath);
+          if (referencedCanonicalPaths.has(resolvedEntryPath))
+            continue;
+          const skillMdPath = join5(entryPath, "SKILL.md");
+          const skillMdPathLower = join5(entryPath, "skill.md");
+          const skillFile = await fileExists(skillMdPath) ? skillMdPath : await fileExists(skillMdPathLower) ? skillMdPathLower : null;
+          if (!skillFile)
+            continue;
+          const parsed = await this.parseSkillMd(skillFile);
+          if (!parsed)
+            continue;
+          installed.push({
+            name: parsed.name,
+            description: parsed.description,
+            path: entryPath,
+            canonicalPath: resolvedEntryPath,
+            agent: SHARED_SKILLS_TARGET_ID,
+            scope,
+            isSymlink: false,
+            mode: "symlink"
+          });
+        }
+      }
+    }
     return installed;
   }
   async remove(skillNames, projectPath, options2 = {}) {
@@ -19159,11 +19296,19 @@ class SkillsManager {
     const skipped = [];
     const namesLower = new Set(skillNames.map((n) => n.toLowerCase()));
     const targetAgentIds = new Set(agents.map((agent) => agent.id));
+    if (options2.agents?.includes(SHARED_SKILLS_TARGET_ID) || options2.agents === undefined) {
+      targetAgentIds.add(SHARED_SKILLS_TARGET_ID);
+    }
     const installed = await this.listInstalledForAgents(projectPath, allAgents, options2);
-    const scopedInstalled = installed.filter((entry) => options2.global ? entry.scope === "global" : entry.scope === "project");
+    const sharedTargetInstalled = options2.agents?.includes(SHARED_SKILLS_TARGET_ID) ? await this.listInstalledForAgents(projectPath, [], options2) : [];
+    const installedEntries = Array.from(new Map([...installed, ...sharedTargetInstalled].map((entry) => [
+      `${entry.agent}:${entry.scope}:${entry.path}:${entry.name}`,
+      entry
+    ])).values());
+    const scopedInstalled = installedEntries.filter((entry) => options2.global ? entry.scope === "global" : entry.scope === "project");
     const targetedEntries = scopedInstalled.filter((entry) => targetAgentIds.has(entry.agent) && namesLower.has(entry.name.toLowerCase()));
     const targetedKeys = new Set(targetedEntries.map((entry) => `${entry.agent}:${entry.scope}:${entry.path}:${entry.name}`));
-    const remainingEntries = installed.filter((entry) => !targetedKeys.has(`${entry.agent}:${entry.scope}:${entry.path}:${entry.name}`));
+    const remainingEntries = installedEntries.filter((entry) => !targetedKeys.has(`${entry.agent}:${entry.scope}:${entry.path}:${entry.name}`));
     const removedPaths = new Set;
     const removedCanonicalPaths = new Set;
     for (const entry of targetedEntries) {
@@ -19223,6 +19368,7 @@ var init_skillsManager = __esm(() => {
   init_fs();
   init_agentManager();
   init_marketplaceRegistry();
+  init_skills();
   execFileAsync = promisify(execFile);
   DEFAULT_SKILLS_CATALOG = {
     owner: "vercel-labs",
@@ -39992,7 +40138,7 @@ init_fs();
 import {dirname as dirname8, join as join9} from "path";
 async function discoverProjectSkills(projectPath, skillsManager4) {
   const sources = [];
-  const skills = new Map;
+  const skills2 = new Map;
   for (const sourceDir of PROJECT_SKILL_SOURCE_DIRS) {
     const absoluteSourceDir = join9(projectPath, sourceDir);
     if (!await fileExists(absoluteSourceDir)) {
@@ -40002,23 +40148,23 @@ async function discoverProjectSkills(projectPath, skillsManager4) {
     const discovered = await skillsManager4.discoverSkills(absoluteSourceDir);
     for (const skill of discovered) {
       const key = skill.name.toLowerCase();
-      if (!skills.has(key)) {
-        skills.set(key, skill);
+      if (!skills2.has(key)) {
+        skills2.set(key, skill);
       }
     }
   }
   return {
     sources,
-    skills: [...skills.values()]
+    skills: [...skills2.values()]
   };
 }
 async function applyProjectSkills(projectPath, targetAgentIds, managedState2, options2 = {}) {
   const agentManager6 = new AgentManager;
   const skillsManager4 = new SkillsManager(agentManager6);
-  const { sources, skills } = await discoverProjectSkills(projectPath, skillsManager4);
+  const { sources, skills: skills2 } = await discoverProjectSkills(projectPath, skillsManager4);
   const installed = [];
   const skipped = [];
-  if (skills.length === 0) {
+  if (skills2.length === 0) {
     return {
       discovered: 0,
       sources,
@@ -40029,22 +40175,22 @@ async function applyProjectSkills(projectPath, targetAgentIds, managedState2, op
   const targetAgents = targetAgentIds.map((id) => agentManager6.getAgentById(id)).filter((agent) => !!agent);
   if (targetAgents.length === 0) {
     return {
-      discovered: skills.length,
+      discovered: skills2.length,
       sources,
       installed,
-      skipped: skills.map((skill) => ({ skill, reason: "No target agents found" }))
+      skipped: skills2.map((skill) => ({ skill, reason: "No target agents found" }))
     };
   }
   for (const agent of targetAgents) {
     if (!agent.supportsSkills()) {
-      for (const skill of skills) {
+      for (const skill of skills2) {
         skipped.push({ skill, reason: `${agent.name} does not support skills` });
       }
       continue;
     }
     const skillsDir = agent.getSkillsDir(projectPath, false);
     if (!skillsDir) {
-      for (const skill of skills) {
+      for (const skill of skills2) {
         skipped.push({ skill, reason: `No skills directory for ${agent.name}` });
       }
       continue;
@@ -40055,7 +40201,7 @@ async function applyProjectSkills(projectPath, targetAgentIds, managedState2, op
       continue;
     if (!agent.getSkillsDir(projectPath, false))
       continue;
-    for (const skill of skills) {
+    for (const skill of skills2) {
       try {
         const installOptions = {
           ...options2.copy !== undefined ? { copy: options2.copy } : {}
@@ -40079,7 +40225,7 @@ async function applyProjectSkills(projectPath, targetAgentIds, managedState2, op
     }
   }
   return {
-    discovered: skills.length,
+    discovered: skills2.length,
     sources,
     installed,
     skipped
@@ -41079,12 +41225,14 @@ var import_prompts2 = __toESM(require_prompts3(), 1);
 import {homedir as homedir6} from "os";
 import {relative as relative7, resolve as resolve12} from "path";
 init_skillsManager();
+init_pluginManager();
 init_marketplaceRegistry();
 init_agentManager();
+init_skills();
 function registerSkillsCommand(program2) {
   const marketplaceHelp = getMarketplaceIds().join(", ");
-  const skills = program2.command("skills").description("Manage agent skills");
-  skills.command("add <source>").description("Add skills from a marketplace, GitHub repo, or local path").option("--from <marketplace>", `Marketplace source override (available: ${marketplaceHelp})`).option("-g, --global", "Install skills globally").option("-a, --agent <agents...>", "Target specific agent(s)").option("-s, --skill <names...>", "Install only specific skills by name").option("-l, --list", "List available skills from the source without installing").option("--copy", "Copy skill files instead of symlinking").option("-y, --yes", "Skip prompts and auto-detect project-configured agents only").action(async (source, options2) => {
+  const skills3 = program2.command("skills").description("Manage agent skills");
+  skills3.command("add <source>").description("Add skills from a marketplace, GitHub repo, or local path").option("--from <marketplace>", `Marketplace source override (available: ${marketplaceHelp})`).option("-g, --global", "Install skills globally").option("-a, --agent <agents...>", "Target specific agent(s)").option("-s, --skill <names...>", "Install only specific skills by name").option("-l, --list", "List available skills from the source without installing").option("--copy", "Copy skill files instead of symlinking").option("-y, --yes", "Skip prompts and auto-detect project-configured agents only").action(async (source, options2) => {
     logger.titleBox("AgentInit  Skills");
     const agentManager9 = new AgentManager;
     const skillsManager5 = new SkillsManager(agentManager9);
@@ -41097,11 +41245,64 @@ function registerSkillsCommand(program2) {
         spinner2.stop();
         displayDiscoveredSkills(result.skills, result.warnings);
       } catch (error) {
-        spinner2.fail("Failed to discover skills");
-        logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
+        if (error instanceof MultipleBundlePluginsError) {
+          spinner2.stop();
+          const selected = await selectBundlePlugin(error, "list");
+          if (!selected) {
+            return;
+          }
+          const retrySpinner = ora("Discovering skills...").start();
+          try {
+            const result = await skillsManager5.discoverFromSource(source, process.cwd(), {
+              from: options2.from,
+              pluginName: selected
+            });
+            retrySpinner.stop();
+            displayDiscoveredSkills(result.skills, result.warnings);
+          } catch (retryError) {
+            retrySpinner.fail("Failed to discover skills");
+            logger.error(`Error: ${retryError instanceof Error ? retryError.message : "Unknown error"}`);
+          }
+        } else {
+          spinner2.fail("Failed to discover skills");
+          logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
+        }
       }
       return;
     }
+    const verifySpinner = ora("Verifying skill source...").start();
+    let selectedPluginName;
+    try {
+      await skillsManager5.prepareSource(source, process.cwd(), {
+        from: options2.from
+      });
+      verifySpinner.stop();
+    } catch (error) {
+      if (error instanceof MultipleBundlePluginsError && !options2.yes) {
+        verifySpinner.stop();
+        const selected = await selectBundlePlugin(error, "install");
+        if (!selected) {
+          return;
+        }
+        selectedPluginName = selected;
+        const retrySpinner = ora("Verifying skill source...").start();
+        try {
+          await skillsManager5.prepareSource(source, process.cwd(), {
+            from: options2.from,
+            pluginName: selectedPluginName
+          });
+          retrySpinner.stop();
+        } catch (retryError) {
+          retrySpinner.fail("Failed to verify skill source");
+          logger.error(`Error: ${retryError instanceof Error ? retryError.message : "Unknown error"}`);
+          return;
+        }
+      } else {
+        verifySpinner.fail("Failed to verify skill source");
+        logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
+        return;
+      }
+    }
     let targetAgents = options2.agent;
     let targetGlobal = options2.global;
     if (!targetAgents && !options2.yes) {
@@ -41110,6 +41311,9 @@ function registerSkillsCommand(program2) {
         global: options2.global
       });
       if (selection?.aborted) {
+        await skillsManager5.discardPreparedSource(source, process.cwd(), {
+          from: options2.from
+        });
         return;
       }
       if (selection?.agents && selection.agents.length > 0) {
@@ -41123,6 +41327,7 @@ function registerSkillsCommand(program2) {
       ...targetAgents !== undefined ? { agents: targetAgents } : {},
       ...options2.skill !== undefined ? { skills: options2.skill } : {},
       ...options2.copy !== undefined ? { copy: options2.copy } : {},
+      ...selectedPluginName !== undefined ? { pluginName: selectedPluginName } : {},
       ...options2.yes !== undefined ? { yes: options2.yes } : {}
     });
     const spinner = ora("Installing skills...").start();
@@ -41134,7 +41339,7 @@ function registerSkillsCommand(program2) {
       logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
     }
   });
-  skills.command("list").alias("ls").description("List installed skills").option("-g, --global", "List only global skills").option("-a, --agent <agents...>", "Filter by specific agent(s)").action(async (options2) => {
+  skills3.command("list").alias("ls").description("List installed skills").option("-g, --global", "List only global skills").option("-a, --agent <agents...>", "Filter by specific agent(s)").action(async (options2) => {
     logger.titleBox("AgentInit  Skills");
     const agentManager9 = new AgentManager;
     const skillsManager5 = new SkillsManager(agentManager9);
@@ -41163,7 +41368,7 @@ function registerSkillsCommand(program2) {
       if (skill.mode === "symlink") {
         existing.mode = "symlink";
       }
-      existing.agents.add(agentManager9.getAgentById(skill.agent)?.name || skill.agent);
+      existing.agents.add(formatSkillTargetName(agentManager9, skill.agent));
       bySkill.set(key, existing);
     }
     for (const skill of bySkill.values()) {
@@ -41174,7 +41379,7 @@ function registerSkillsCommand(program2) {
       logger.info(`    Agents: ${[...skill.agents].join(", ")}`);
     }
   });
-  skills.command("remove [names...]").alias("rm").description("Remove installed skills by name").option("-g, --global", "Remove from global scope").option("-a, --agent <agents...>", "Target specific agent(s)").option("-y, --yes", "Skip confirmation prompts").action(async (names, options2) => {
+  skills3.command("remove [names...]").alias("rm").description("Remove installed skills by name").option("-g, --global", "Remove from global scope").option("-a, --agent <agents...>", "Target specific agent(s)").option("-y, --yes", "Skip confirmation prompts").action(async (names, options2) => {
     logger.titleBox("AgentInit  Skills");
     if (!names || names.length === 0) {
       if (!options2.yes) {
@@ -41210,6 +41415,22 @@ function registerSkillsCommand(program2) {
     }
   });
 }
+async function selectBundlePlugin(error, actionLabel) {
+  const response = await import_prompts2.default({
+    type: "select",
+    name: "plugin",
+    message: `This repository contains multiple plugins. Select one to ${actionLabel}:`,
+    choices: error.entries.map((entry) => ({
+      title: entry.name,
+      value: entry.name
+    }))
+  });
+  if (!response.plugin) {
+    logger.info("Cancelled.");
+    return null;
+  }
+  return response.plugin;
+}
 async function resolveInteractiveSkillTargets(skillsManager5, agentManager9, source, projectPath, options2) {
   let installGlobal = !!options2.global;
   if (!options2.global) {
@@ -41258,9 +41479,9 @@ async function resolveInteractiveSkillTargets(skillsManager5, agentManager9, sou
     instructions: false,
     min: 1,
     choices: availableGroups.map((group) => ({
-      title: `${group.displayDir} -> ${group.agentNames.join(", ")}${formatCompatibleAgents(group)}`,
+      title: formatSkillGroupTitle(group),
       ...group.description ? { description: group.description } : {},
-      value: group.agents.map((agent) => agent.id),
+      value: group.kind === "canonical-shared" ? [SHARED_SKILLS_TARGET_ID] : group.agents.map((agent) => agent.id),
       selected: shouldPreselectSkillGroup(group, installGlobal, detectedGroups.length > 0, recommendedAgentId)
     }))
   });
@@ -41309,15 +41530,23 @@ var buildSkillGroups = function(agents, projectPath, global3) {
     existing.push(agent);
     dirToAgents.set(skillsDir, existing);
   }
-  return Array.from(dirToAgents.entries()).map(([dir, groupedAgents]) => ({
-    dir,
-    displayDir: formatSkillsDir(projectPath, dir),
-    agents: groupedAgents,
-    agentNames: groupedAgents.map((agent) => agent.name),
-    compatibleAgents: [],
-    compatibleAgentNames: [],
-    kind: "native"
-  }));
+  return Array.from(dirToAgents.entries()).map(([dir, groupedAgents]) => {
+    const canonicalShared = resolve12(dir) === getCanonicalSkillsDirForScope(projectPath, !!global3) && groupedAgents.every((agent) => agent.getProjectSkillsStandard() === "agents");
+    return {
+      dir,
+      displayDir: formatSkillsDir(projectPath, dir),
+      agents: groupedAgents,
+      agentNames: groupedAgents.map((agent) => agent.name),
+      compatibleAgents: [],
+      compatibleAgentNames: [],
+      ...canonicalShared ? {
+        description: `Install only into the shared AGENTS.md store. Compatible tools: ${groupedAgents.map((agent) => agent.name).join(", ")}.`,
+        kind: "canonical-shared"
+      } : {
+        kind: "native"
+      }
+    };
+  });
 };
 var prependCanonicalGlobalGroup = function(agentManager9, projectPath, groups) {
   const canonicalDir = getCanonicalGlobalSkillsDir();
@@ -41332,7 +41561,7 @@ var prependCanonicalGlobalGroup = function(agentManager9, projectPath, groups) {
     return [
       {
         ...existingCanonical,
-        description: existingCanonical.description || "Canonical shared skills store for the open AGENTS.md ecosystem.",
+        description: existingCanonical.description || `Install only into the shared AGENTS.md store. Compatible tools: ${existingCanonical.agentNames.join(", ")}.`,
         kind: "canonical-shared"
       },
       ...remaining
@@ -41346,7 +41575,7 @@ var prependCanonicalGlobalGroup = function(agentManager9, projectPath, groups) {
       agentNames: sharedAgents.map((agent) => agent.name),
       compatibleAgents: [],
       compatibleAgentNames: [],
-      description: "Canonical shared skills store for the open AGENTS.md ecosystem.",
+      description: `Install only into the shared AGENTS.md store. Compatible tools: ${sharedAgents.map((agent) => agent.name).join(", ")}.`,
       kind: "canonical-shared"
     },
     ...groups.map((group) => {
@@ -41384,12 +41613,15 @@ var formatPromptPath = function(path) {
 var getCanonicalGlobalSkillsDir = function() {
   return resolve12(homedir6(), ".agents/skills");
 };
+var getCanonicalSkillsDirForScope = function(projectPath, global3) {
+  return global3 ? getCanonicalGlobalSkillsDir() : resolve12(projectPath, ".agents/skills");
+};
 var getCanonicalGlobalSkillsDisplayPath = function() {
   return formatPromptPath(getCanonicalGlobalSkillsDir());
 };
 var describeGlobalSkillGroup = function(group) {
   if (group.kind === "canonical-shared") {
-    return group.description;
+    return group.description || `Install only into the shared AGENTS.md store. Compatible tools: ${group.agentNames.join(", ")}.`;
   }
   if (group.agents.every((agent) => agent.getProjectSkillsStandard() === "agents")) {
     return `Native agent directory linked to ${getCanonicalGlobalSkillsDisplayPath()} when symlinks are used.`;
@@ -41399,6 +41631,18 @@ var describeGlobalSkillGroup = function(group) {
   }
   return;
 };
+var formatSkillGroupTitle = function(group) {
+  if (group.kind === "canonical-shared") {
+    return `${group.displayDir} -> ${SHARED_SKILLS_TARGET_NAME}`;
+  }
+  return `${group.displayDir} -> ${group.agentNames.join(", ")}${formatCompatibleAgents(group)}`;
+};
+var formatSkillTargetName = function(agentManager9, agentId) {
+  if (agentId === SHARED_SKILLS_TARGET_ID) {
+    return SHARED_SKILLS_TARGET_NAME;
+  }
+  return agentManager9.getAgentById(agentId)?.name || agentId;
+};
 var shouldPreselectSkillGroup = function(group, installGlobal, hasDetectedGroups, recommendedAgentId) {
   const includesRecommendedAgent = !!recommendedAgentId && group.agents.some((agent) => agent.id === recommendedAgentId);
   if (!installGlobal) {
@@ -41451,18 +41695,18 @@ var buildSkillsAddCommand = function(source, from, extraArgs) {
   args.push(...extraArgs);
   return args.join(" ");
 };
-var displayDiscoveredSkills = function(skills, warnings) {
-  if (skills.length === 0) {
+var displayDiscoveredSkills = function(skills3, warnings) {
+  if (skills3.length === 0) {
     logger.info("No skills found in the source.");
     for (const warning of warnings) {
       logger.warn(warning);
     }
     return;
   }
-  logger.info(`Found ${green(String(skills.length))} skill(s):\n`);
+  logger.info(`Found ${green(String(skills3.length))} skill(s):\n`);
   logger.info("  Name                Description");
   logger.info("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
-  for (const skill of skills) {
+  for (const skill of skills3) {
     const name = skill.name.padEnd(18);
     logger.info(`  ${green(name)}  ${skill.description}`);
   }
@@ -41503,7 +41747,7 @@ var displayInstallResult = function(result, spinner, agentManager9, skillsManage
       agents: new Set,
       skills: new Set
     };
-    existing.agents.add(agentManager9.getAgentById(item.agent)?.name || item.agent);
+    existing.agents.add(formatSkillTargetName(agentManager9, item.agent));
     existing.skills.add(item.skill.name);
     byPath.set(path, existing);
   }
@@ -42335,11 +42579,11 @@ function registerPluginsCommand(program2) {
   plugins.command("install <source>").description("Install a plugin from <marketplace>/<name>, a GitHub repo, or a local path").option("--from <marketplace>", `Marketplace source override (available: ${marketplaceHelp})`).option("-a, --agent <agents...>", "Target specific agent(s)").option("-g, --global", "Install globally").option("--copy-skills", "Copy plugin skills instead of using canonical symlink installs").option("-l, --list", "Preview plugin contents without installing").option("-y, --yes", "Skip confirmation prompts, auto-detect project-configured agents").action(async (source, options2) => {
     logger.titleBox("AgentInit  Plugins");
     const agentManager12 = new AgentManager;
-    const pluginManager2 = new PluginManager(agentManager12);
+    const pluginManager3 = new PluginManager(agentManager12);
     if (options2.list) {
       const spinner2 = ora("Fetching plugin...").start();
       try {
-        const preview2 = await pluginManager2.inspectPlugin(source, {
+        const preview2 = await pluginManager3.inspectPlugin(source, {
           from: options2.from
         });
         spinner2.stop();
@@ -42366,8 +42610,49 @@ function registerPluginsCommand(program2) {
         }
         renderPluginWarnings(preview2, process.cwd());
       } catch (error) {
-        spinner2.fail("Failed to fetch plugin");
-        logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
+        if (error instanceof MultipleBundlePluginsError) {
+          spinner2.stop();
+          const selected = await selectBundlePlugin2(error, "preview");
+          if (!selected) {
+            return;
+          }
+          const retrySpinner = ora("Fetching plugin...").start();
+          try {
+            const preview2 = await pluginManager3.inspectPlugin(source, {
+              from: options2.from,
+              pluginName: selected
+            });
+            retrySpinner.stop();
+            const p = preview2.plugin;
+            console.log("");
+            logger.info(`${bold(p.name)} ${dim(`v${p.version}`)} ${dim(`[${p.format} format]`)}`);
+            if (p.description)
+              logger.info(`  ${p.description}`);
+            console.log("");
+            if (p.skills.length > 0) {
+              logger.info(`  ${green("Skills")} (${p.skills.length}):`);
+              for (const skill of p.skills) {
+                logger.info(`    ${green(skill.name)} - ${skill.description}`);
+              }
+            }
+            if (p.mcpServers.length > 0) {
+              logger.info(`  ${cyan("MCP Servers")} (${p.mcpServers.length}):`);
+              for (const mcp of p.mcpServers) {
+                logger.info(`    ${cyan(mcp.name)} [${mcp.type}]`);
+              }
+            }
+            if (p.skills.length === 0 && p.mcpServers.length === 0) {
+              logger.info("  No portable components found (no skills or MCP servers).");
+            }
+            renderPluginWarnings(preview2, process.cwd());
+          } catch (retryError) {
+            retrySpinner.fail("Failed to fetch plugin");
+            logger.error(`Error: ${retryError instanceof Error ? retryError.message : "Unknown error"}`);
+          }
+        } else {
+          spinner2.fail("Failed to fetch plugin");
+          logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
+        }
       }
       return;
     }
@@ -42375,24 +42660,48 @@ function registerPluginsCommand(program2) {
     let targetGlobal = options2.global;
     let preview = null;
     let previewRendered = false;
+    let selectedPluginName;
     if (!agentIds && !options2.yes) {
       const previewSpinner = ora("Inspecting plugin...").start();
       try {
-        preview = await pluginManager2.preparePluginInstall(source, {
+        preview = await pluginManager3.preparePluginInstall(source, {
           from: options2.from
         });
         previewSpinner.stop();
         renderPluginWarnings(preview, process.cwd());
         previewRendered = true;
       } catch (error) {
-        previewSpinner.fail("Failed to inspect plugin");
-        logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
-        return;
+        if (error instanceof MultipleBundlePluginsError) {
+          previewSpinner.stop();
+          const selected = await selectBundlePlugin2(error, "install");
+          if (!selected) {
+            return;
+          }
+          selectedPluginName = selected;
+          const retrySpinner = ora("Inspecting plugin...").start();
+          try {
+            preview = await pluginManager3.preparePluginInstall(source, {
+              from: options2.from,
+              pluginName: selectedPluginName
+            });
+            retrySpinner.stop();
+            renderPluginWarnings(preview, process.cwd());
+            previewRendered = true;
+          } catch (retryError) {
+            retrySpinner.fail("Failed to inspect plugin");
+            logger.error(`Error: ${retryError instanceof Error ? retryError.message : "Unknown error"}`);
+            return;
+          }
+        } else {
+          previewSpinner.fail("Failed to inspect plugin");
+          logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
+          return;
+        }
       }
       try {
-        const selection = await interactiveAgentSelect(pluginManager2, agentManager12, process.cwd(), targetGlobal, preview);
+        const selection = await interactiveAgentSelect(pluginManager3, agentManager12, process.cwd(), targetGlobal, preview);
         if (!selection || selection.aborted || !selection.agents || selection.agents.length === 0) {
-          await pluginManager2.discardPreparedPlugin(source, { from: options2.from });
+          await pluginManager3.discardPreparedPlugin(source, { from: options2.from });
           logger.info("No agents selected. Aborting.");
           return;
         }
@@ -42407,12 +42716,13 @@ function registerPluginsCommand(program2) {
     }
     const spinner = ora("Installing plugin...").start();
     try {
-      const result = await pluginManager2.installPlugin(source, process.cwd(), {
+      const result = await pluginManager3.installPlugin(source, process.cwd(), {
         from: options2.from,
         agents: agentIds,
         global: targetGlobal,
         copySkills: options2.copySkills,
-        yes: options2.yes
+        yes: options2.yes,
+        ...selectedPluginName ? { pluginName: selectedPluginName } : {}
       });
       const p = result.plugin;
       const totalSkills = result.skills.installed.length;
@@ -42444,13 +42754,48 @@ function registerPluginsCommand(program2) {
       }
       logger.success("Plugin installation complete.");
     } catch (error) {
-      spinner.fail("Failed to install plugin");
-      logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
+      if (error instanceof MultipleBundlePluginsError && !options2.yes) {
+        spinner.stop();
+        const selected = await selectBundlePlugin2(error, "install");
+        if (!selected) {
+          return;
+        }
+        const retrySpinner = ora("Installing plugin...").start();
+        try {
+          const result = await pluginManager3.installPlugin(source, process.cwd(), {
+            from: options2.from,
+            agents: agentIds,
+            global: targetGlobal,
+            copySkills: options2.copySkills,
+            yes: options2.yes,
+            pluginName: selected
+          });
+          const p = result.plugin;
+          const totalSkills = result.skills.installed.length;
+          const totalMcp = result.mcpServers.applied.length;
+          const totalNative = result.nativePlugins.installed.length;
+          if (totalSkills === 0 && totalMcp === 0 && totalNative === 0) {
+            retrySpinner.warn(`Plugin "${p.name}" has no portable components to install.`);
+            renderPluginWarnings(result, process.cwd());
+            return;
+          }
+          retrySpinner.succeed(`Installed plugin ${green(bold(p.name))} ${dim(`v${p.version}`)}`);
+          renderInstalledComponents(result, agentManager12, process.cwd());
+          renderPluginWarnings(result, process.cwd());
+          logger.success("Plugin installation complete.");
+        } catch (retryError) {
+          retrySpinner.fail("Failed to install plugin");
+          logger.error(`Error: ${retryError instanceof Error ? retryError.message : "Unknown error"}`);
+        }
+      } else {
+        spinner.fail("Failed to install plugin");
+        logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
+      }
     }
   });
   plugins.command("search [query]").description("Search marketplace plugins").option("--from <marketplace>", `Which marketplace to search (available: ${marketplaceHelp})`).option("--category <category>", `Filter by marketplace category (examples: ${marketplaceCategoryHelp})`).action(async (query, options2) => {
     logger.titleBox("AgentInit  Plugin Search");
-    const pluginManager2 = new PluginManager;
+    const pluginManager3 = new PluginManager;
     const registryId = options2.from || getConfiguredDefaultMarketplaceId();
     if (!registryId) {
       logger.info(`Please specify a marketplace with --from <marketplace>. Available: ${marketplaceHelp}`);
@@ -42461,7 +42806,7 @@ function registerPluginsCommand(program2) {
     }
     const spinner = ora(`Fetching ${registryId} marketplace...`).start();
     try {
-      const results = await pluginManager2.listMarketplacePlugins(registryId, query, options2.category);
+      const results = await pluginManager3.listMarketplacePlugins(registryId, query, options2.category);
       spinner.stop();
       if (results.length === 0) {
         logger.info(query ? `No plugins matching "${query}".` : "No plugins found.");
@@ -42491,8 +42836,8 @@ function registerPluginsCommand(program2) {
   });
   plugins.command("list").alias("ls").description("List installed plugins").option("-a, --agent <agents...>", "Filter by specific agent(s)").option("-g, --global", "List global plugins").action(async (options2) => {
     logger.titleBox("AgentInit  Installed Plugins");
-    const pluginManager2 = new PluginManager;
-    const installed = await pluginManager2.listPlugins(process.cwd(), {
+    const pluginManager3 = new PluginManager;
+    const installed = await pluginManager3.listPlugins(process.cwd(), {
       global: options2.global,
       agents: options2.agent
     });
@@ -42527,10 +42872,10 @@ function registerPluginsCommand(program2) {
   });
   plugins.command("remove <name>").alias("rm").description("Remove an installed plugin").option("-a, --agent <agents...>", "Target specific agent(s)").option("-g, --global", "Remove from global scope").option("-y, --yes", "Skip confirmation prompts").action(async (name, options2) => {
     logger.titleBox("AgentInit  Remove Plugin");
-    const pluginManager2 = new PluginManager;
+    const pluginManager3 = new PluginManager;
     const spinner = ora(`Removing plugin "${name}"...`).start();
     try {
-      const result = await pluginManager2.removePlugin(name, process.cwd(), {
+      const result = await pluginManager3.removePlugin(name, process.cwd(), {
         global: options2.global,
         agents: options2.agent,
         yes: options2.yes
@@ -42552,6 +42897,22 @@ function registerPluginsCommand(program2) {
     }
   });
 }
+async function selectBundlePlugin2(error, actionLabel) {
+  const response = await import_prompts3.default({
+    type: "select",
+    name: "plugin",
+    message: `This repository contains multiple plugins. Select one to ${actionLabel}:`,
+    choices: error.entries.map((entry) => ({
+      title: entry.name,
+      value: entry.name
+    }))
+  });
+  if (!response.plugin) {
+    logger.info("Cancelled.");
+    return null;
+  }
+  return response.plugin;
+}
 var formatPathForDisplay = function(pathValue, projectPath) {
   if (pathValue.startsWith(`${projectPath}/`)) {
     return relative8(projectPath, pathValue) || ".";
@@ -42841,9 +43202,9 @@ var getPluginGroupDescription = function(group, preview, projectPath) {
   const receiveVerb = otherAgents.length === 1 ? "receives" : "receive";
   return `${portableSummary}. Full plugin support is available in Claude Code; the native plugin installs at ${installPath}. ${otherAgentsLabel} ${shareVerb} this skills directory but only ${receiveVerb} the installed skills.`;
 };
-async function interactiveAgentSelect(pluginManager2, agentManager12, projectPath, global3, preview) {
+async function interactiveAgentSelect(pluginManager3, agentManager12, projectPath, global3, preview) {
   let installGlobal = !!global3;
-  let groups = installGlobal ? buildGlobalPluginGroups(agentManager12, projectPath) : (await pluginManager2.groupAgentsBySkillsDir(projectPath, false)).map((group) => ({
+  let groups = installGlobal ? buildGlobalPluginGroups(agentManager12, projectPath) : (await pluginManager3.groupAgentsBySkillsDir(projectPath, false)).map((group) => ({
     ...group,
     displayDir: group.dir
   }));