agentinit 1.17.0 → 1.17.2

package/dist/cli.js

@@ -17055,6 +17055,11 @@ __export(exports_pluginManager, {
       return PluginManager;
     }
   },
+  MultipleBundlePluginsError: () => {
+    {
+      return MultipleBundlePluginsError;
+    }
+  },
   MarketplacePluginNotFoundError: () => {
     {
       return MarketplacePluginNotFoundError;
@@ -17065,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;
@@ -17189,7 +17204,11 @@ class PluginManager {
     } catch {
       throw new Error(`Invalid .claude-plugin/marketplace.json in ${pluginDir}`);
     }
-    const entries = Array.isArray(manifest.plugins) ? manifest.plugins.filter((entry) => typeof entry?.name === "string" && typeof entry?.source === "string") : [];
+    const entries = Array.isArray(manifest.plugins) ? manifest.plugins.filter((entry) => typeof entry?.name === "string" && typeof entry?.source === "string").map((entry) => ({
+      name: entry.name,
+      source: entry.source,
+      ...typeof entry.description === "string" ? { description: entry.description } : {}
+    })) : [];
     if (entries.length === 0) {
       throw new Error(`No plugins declared in .claude-plugin/marketplace.json for ${pluginDir}`);
     }
@@ -17202,7 +17221,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;
     }
@@ -17279,6 +17298,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,
@@ -18118,7 +18140,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) {
@@ -18748,12 +18773,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) {
@@ -18817,6 +18843,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);
@@ -18824,7 +18853,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
@@ -19093,7 +19122,8 @@ class SkillsManager {
   }
   async addFromSource(source, projectPath, options2 = {}) {
     const context = this.takePreparedSourceContext(source, projectPath, options2.from) || await this.loadDiscoveredSkillsContext(source, projectPath, {
-      ...options2.from !== undefined ? { from: options2.from } : {}
+      ...options2.from !== undefined ? { from: options2.from } : {},
+      ...options2.pluginName !== undefined ? { pluginName: options2.pluginName } : {}
     });
     try {
       let skills2 = context.skills;
@@ -41199,6 +41229,7 @@ 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();
@@ -41210,29 +41241,73 @@ function registerSkillsCommand(program2) {
     const agentManager9 = new AgentManager;
     const skillsManager5 = new SkillsManager(agentManager9);
     if (options2.list) {
-      const spinner2 = ora("Discovering skills...").start();
+      const spinner = ora("Discovering skills...").start();
       try {
         const result = await skillsManager5.discoverFromSource(source, process.cwd(), {
           from: options2.from
         });
-        spinner2.stop();
+        spinner.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) {
+          spinner.stop();
+          const selected = await selectBundlePlugins(error, "list");
+          if (!selected) {
+            return;
+          }
+          for (const pluginName of selected) {
+            const retrySpinner = ora(`Discovering skills from ${pluginName}...`).start();
+            try {
+              const result = await skillsManager5.discoverFromSource(source, process.cwd(), {
+                from: options2.from,
+                pluginName
+              });
+              retrySpinner.stop();
+              displayDiscoveredSkills(result.skills, result.warnings);
+            } catch (retryError) {
+              retrySpinner.fail(`Failed to discover skills from ${pluginName}`);
+              logger.error(`Error: ${retryError instanceof Error ? retryError.message : "Unknown error"}`);
+            }
+          }
+        } else {
+          spinner.fail("Failed to discover skills");
+          logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
+        }
       }
       return;
     }
     const verifySpinner = ora("Verifying skill source...").start();
+    let selectedPluginNames;
     try {
       await skillsManager5.prepareSource(source, process.cwd(), {
         from: options2.from
       });
       verifySpinner.stop();
     } catch (error) {
-      verifySpinner.fail("Failed to verify skill source");
-      logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
-      return;
+      if (error instanceof MultipleBundlePluginsError && !options2.yes) {
+        verifySpinner.stop();
+        const selected = await selectBundlePlugins(error, "install");
+        if (!selected) {
+          return;
+        }
+        selectedPluginNames = selected;
+        const retrySpinner = ora("Verifying skill source...").start();
+        try {
+          await skillsManager5.prepareSource(source, process.cwd(), {
+            from: options2.from,
+            ...selectedPluginNames[0] ? { pluginName: selectedPluginNames[0] } : {}
+          });
+          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;
@@ -41252,21 +41327,31 @@ function registerSkillsCommand(program2) {
         targetGlobal = selection.global;
       }
     }
-    const buildInstallOptions = (fromOverride) => ({
-      ...fromOverride !== undefined ? { from: fromOverride } : options2.from !== undefined ? { from: options2.from } : {},
+    const buildInstallOptions = (pluginName) => ({
+      ...options2.from !== undefined ? { from: options2.from } : {},
       ...targetGlobal !== undefined ? { global: targetGlobal } : {},
       ...targetAgents !== undefined ? { agents: targetAgents } : {},
       ...options2.skill !== undefined ? { skills: options2.skill } : {},
       ...options2.copy !== undefined ? { copy: options2.copy } : {},
+      ...pluginName !== undefined ? { pluginName } : {},
       ...options2.yes !== undefined ? { yes: options2.yes } : {}
     });
-    const spinner = ora("Installing skills...").start();
-    try {
-      const result = await skillsManager5.addFromSource(source, process.cwd(), buildInstallOptions());
-      displayInstallResult(result, spinner, agentManager9, skillsManager5, source, { from: options2.from });
-    } catch (error) {
-      spinner.fail("Failed to install skills");
-      logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
+    const pluginsToInstall = selectedPluginNames || [undefined];
+    for (const pluginName of pluginsToInstall) {
+      const spinner = ora(pluginName ? `Installing skills from ${pluginName}...` : "Installing skills...").start();
+      try {
+        if (pluginName && pluginName !== selectedPluginNames?.[0]) {
+          await skillsManager5.prepareSource(source, process.cwd(), {
+            from: options2.from,
+            pluginName
+          });
+        }
+        const result = await skillsManager5.addFromSource(source, process.cwd(), buildInstallOptions(pluginName));
+        displayInstallResult(result, spinner, agentManager9, skillsManager5, source, { from: options2.from });
+      } catch (error) {
+        spinner.fail(pluginName ? `Failed to install skills from ${pluginName}` : "Failed to install skills");
+        logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
+      }
     }
   });
   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) => {
@@ -41345,6 +41430,26 @@ function registerSkillsCommand(program2) {
     }
   });
 }
+async function selectBundlePlugins(error, actionLabel) {
+  logger.info(dim("Press Space to select, then Enter to confirm."));
+  const response = await import_prompts2.default({
+    type: "multiselect",
+    name: "plugins",
+    message: `This repository contains multiple plugins. Select which to ${actionLabel}:`,
+    instructions: false,
+    min: 1,
+    choices: error.entries.map((entry) => ({
+      title: entry.name,
+      value: entry.name,
+      ...entry.description ? { description: entry.description } : {}
+    }))
+  });
+  if (!response.plugins || response.plugins.length === 0) {
+    logger.info("Cancelled.");
+    return null;
+  }
+  return response.plugins;
+}
 async function resolveInteractiveSkillTargets(skillsManager5, agentManager9, source, projectPath, options2) {
   let installGlobal = !!options2.global;
   if (!options2.global) {
@@ -42493,15 +42598,15 @@ 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();
+      const spinner = ora("Fetching plugin...").start();
       try {
-        const preview2 = await pluginManager2.inspectPlugin(source, {
+        const preview = await pluginManager3.inspectPlugin(source, {
           from: options2.from
         });
-        spinner2.stop();
-        const p = preview2.plugin;
+        spinner.stop();
+        const p = preview.plugin;
         console.log("");
         logger.info(`${bold(p.name)} ${dim(`v${p.version}`)} ${dim(`[${p.format} format]`)}`);
         if (p.description)
@@ -42522,35 +42627,110 @@ function registerPluginsCommand(program2) {
         if (p.skills.length === 0 && p.mcpServers.length === 0) {
           logger.info("  No portable components found (no skills or MCP servers).");
         }
-        renderPluginWarnings(preview2, process.cwd());
+        renderPluginWarnings(preview, process.cwd());
       } catch (error) {
-        spinner2.fail("Failed to fetch plugin");
-        logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
+        if (error instanceof MultipleBundlePluginsError) {
+          spinner.stop();
+          const selected = await selectBundlePlugins2(error, "preview");
+          if (!selected) {
+            return;
+          }
+          for (const pluginName of selected) {
+            const retrySpinner = ora(`Fetching plugin ${pluginName}...`).start();
+            try {
+              const preview = await pluginManager3.inspectPlugin(source, {
+                from: options2.from,
+                pluginName
+              });
+              retrySpinner.stop();
+              const p = preview.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(preview, process.cwd());
+            } catch (retryError) {
+              retrySpinner.fail(`Failed to fetch plugin ${pluginName}`);
+              logger.error(`Error: ${retryError instanceof Error ? retryError.message : "Unknown error"}`);
+            }
+          }
+        } else {
+          spinner.fail("Failed to fetch plugin");
+          logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
+        }
       }
       return;
     }
     let agentIds = options2.agent;
     let targetGlobal = options2.global;
-    let preview = null;
+    let selectionPreview = null;
     let previewRendered = false;
+    let selectedPluginNames;
     if (!agentIds && !options2.yes) {
       const previewSpinner = ora("Inspecting plugin...").start();
       try {
-        preview = await pluginManager2.preparePluginInstall(source, {
+        const preview = await pluginManager3.preparePluginInstall(source, {
           from: options2.from
         });
         previewSpinner.stop();
-        renderPluginWarnings(preview, process.cwd());
+        selectionPreview = buildPluginSelectionPreview([preview]);
+        renderPreparedPluginWarnings([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 selectBundlePlugins2(error, "install");
+          if (!selected) {
+            return;
+          }
+          selectedPluginNames = selected;
+          const retrySpinner = ora("Inspecting plugin...").start();
+          try {
+            const previewsByPlugin = new Map;
+            const previewOrder = selectedPluginNames.length > 1 ? [...selectedPluginNames.slice(1), selectedPluginNames[0]] : selectedPluginNames;
+            for (const pluginName of previewOrder) {
+              const preparedPreview = await pluginManager3.preparePluginInstall(source, {
+                from: options2.from,
+                pluginName
+              });
+              previewsByPlugin.set(pluginName, preparedPreview);
+            }
+            const previews = selectedPluginNames.map((pluginName) => previewsByPlugin.get(pluginName)).filter((value) => !!value);
+            retrySpinner.stop();
+            selectionPreview = buildPluginSelectionPreview(previews);
+            renderPreparedPluginWarnings(previews, 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, selectionPreview);
         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;
         }
@@ -42563,52 +42743,99 @@ function registerPluginsCommand(program2) {
         }
       }
     }
-    const spinner = ora("Installing plugin...").start();
-    try {
-      const result = await pluginManager2.installPlugin(source, process.cwd(), {
-        from: options2.from,
-        agents: agentIds,
-        global: targetGlobal,
-        copySkills: options2.copySkills,
-        yes: options2.yes
-      });
-      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) {
-        spinner.warn(`Plugin "${p.name}" has no portable components to install.`);
-        if (!previewRendered) {
-          renderPluginWarnings(result, process.cwd());
+    const pluginsToInstall = selectedPluginNames || [undefined];
+    for (const pluginName of pluginsToInstall) {
+      const spinner = ora(pluginName ? `Installing plugin ${pluginName}...` : "Installing plugin...").start();
+      try {
+        if (pluginName && pluginName !== selectedPluginNames?.[0]) {
+          await pluginManager3.preparePluginInstall(source, {
+            from: options2.from,
+            pluginName
+          });
         }
-        return;
-      }
-      spinner.succeed(`Installed plugin ${green(bold(p.name))} ${dim(`v${p.version}`)}`);
-      renderInstalledComponents(result, agentManager12, process.cwd());
-      if (result.skills.skipped.length > 0 || result.mcpServers.skipped.length > 0 || result.nativePlugins.skipped.length > 0) {
-        console.log("");
-        for (const s of result.skills.skipped) {
-          logger.debug(`Skipped skill ${s.name}: ${s.reason}`);
+        const result = await pluginManager3.installPlugin(source, process.cwd(), {
+          from: options2.from,
+          agents: agentIds,
+          global: targetGlobal,
+          copySkills: options2.copySkills,
+          yes: options2.yes,
+          ...pluginName ? { pluginName } : {}
+        });
+        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) {
+          spinner.warn(`Plugin "${p.name}" has no portable components to install.`);
+          if (!previewRendered) {
+            renderPluginWarnings(result, process.cwd());
+          }
+          continue;
         }
-        for (const s of result.mcpServers.skipped) {
-          logger.debug(`Skipped MCP ${s.name}: ${s.reason}`);
+        spinner.succeed(`Installed plugin ${green(bold(p.name))} ${dim(`v${p.version}`)}`);
+        renderInstalledComponents(result, agentManager12, process.cwd());
+        if (result.skills.skipped.length > 0 || result.mcpServers.skipped.length > 0 || result.nativePlugins.skipped.length > 0) {
+          console.log("");
+          for (const s of result.skills.skipped) {
+            logger.debug(`Skipped skill ${s.name}: ${s.reason}`);
+          }
+          for (const s of result.mcpServers.skipped) {
+            logger.debug(`Skipped MCP ${s.name}: ${s.reason}`);
+          }
+          for (const s of result.nativePlugins.skipped) {
+            logger.warn(`Skipped native plugin payload for ${s.agent}: ${s.reason}`);
+          }
         }
-        for (const s of result.nativePlugins.skipped) {
-          logger.warn(`Skipped native plugin payload for ${s.agent}: ${s.reason}`);
+        if (!previewRendered) {
+          renderPluginWarnings(result, process.cwd());
+        }
+        logger.success("Plugin installation complete.");
+      } catch (error) {
+        if (error instanceof MultipleBundlePluginsError && !options2.yes) {
+          spinner.stop();
+          const selected = await selectBundlePlugins2(error, "install");
+          if (!selected) {
+            return;
+          }
+          for (const selectedName of selected) {
+            const retrySpinner = ora(`Installing plugin ${selectedName}...`).start();
+            try {
+              const result = await pluginManager3.installPlugin(source, process.cwd(), {
+                from: options2.from,
+                agents: agentIds,
+                global: targetGlobal,
+                copySkills: options2.copySkills,
+                yes: options2.yes,
+                pluginName: selectedName
+              });
+              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());
+                continue;
+              }
+              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 ${selectedName}`);
+              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"}`);
         }
       }
-      if (!previewRendered) {
-        renderPluginWarnings(result, process.cwd());
-      }
-      logger.success("Plugin installation complete.");
-    } catch (error) {
-      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}`);
@@ -42619,7 +42846,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.");
@@ -42649,8 +42876,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
     });
@@ -42685,10 +42912,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
@@ -42710,6 +42937,26 @@ function registerPluginsCommand(program2) {
     }
   });
 }
+async function selectBundlePlugins2(error, actionLabel) {
+  logger.info(dim("Press Space to select, then Enter to confirm."));
+  const response = await import_prompts3.default({
+    type: "multiselect",
+    name: "plugins",
+    message: `This repository contains multiple plugins. Select which to ${actionLabel}:`,
+    instructions: false,
+    min: 1,
+    choices: error.entries.map((entry) => ({
+      title: entry.name,
+      value: entry.name,
+      ...entry.description ? { description: entry.description } : {}
+    }))
+  });
+  if (!response.plugins || response.plugins.length === 0) {
+    logger.info("Cancelled.");
+    return null;
+  }
+  return response.plugins;
+}
 var formatPathForDisplay = function(pathValue, projectPath) {
   if (pathValue.startsWith(`${projectPath}/`)) {
     return relative8(projectPath, pathValue) || ".";
@@ -42723,16 +42970,48 @@ var formatPathForDisplay = function(pathValue, projectPath) {
 var getAgentLabel = function(agentIds, agentManager12) {
   return agentIds.map((agentId) => agentManager12.getAgentById(agentId)?.name || agentId).join(", ");
 };
+var buildPluginSelectionPreview = function(previews) {
+  const nativeAgentIds = new Set;
+  const nativeFeatures = new Set;
+  const nativeInstallPaths = new Set;
+  for (const preview of previews) {
+    if (!preview.nativePreview) {
+      continue;
+    }
+    nativeAgentIds.add(preview.nativePreview.agent);
+    nativeInstallPaths.add(preview.nativePreview.installPath);
+    for (const feature of preview.nativePreview.features) {
+      nativeFeatures.add(feature);
+    }
+  }
+  return {
+    selectedCount: previews.length,
+    skillCount: previews.reduce((total, preview) => total + preview.plugin.skills.length, 0),
+    mcpServerCount: previews.reduce((total, preview) => total + preview.plugin.mcpServers.length, 0),
+    nativeAgentIds: [...nativeAgentIds],
+    nativeFeatures: [...nativeFeatures],
+    nativeInstallPaths: [...nativeInstallPaths]
+  };
+};
 var getPortableComponentSummary = function(preview) {
   const parts = [];
-  if (preview.plugin.skills.length > 0) {
-    parts.push(`${preview.plugin.skills.length} skill(s)`);
+  if (preview.skillCount > 0) {
+    parts.push(`${preview.skillCount} skill(s)`);
   }
-  if (preview.plugin.mcpServers.length > 0) {
-    parts.push(`${preview.plugin.mcpServers.length} MCP server(s)`);
+  if (preview.mcpServerCount > 0) {
+    parts.push(`${preview.mcpServerCount} MCP server(s)`);
   }
   return parts.length > 0 ? parts.join(", ") : "No portable components";
 };
+var renderPreparedPluginWarnings = function(previews, projectPath) {
+  for (const preview of previews) {
+    if (previews.length > 1) {
+      console.log("");
+      logger.info(`${bold(preview.plugin.name)} ${dim(`v${preview.plugin.version}`)}`);
+    }
+    renderPluginWarnings(preview, projectPath);
+  }
+};
 var getSourceWarnings = function(warnings) {
   const items = [];
   for (const warning of warnings) {
@@ -42975,33 +43254,37 @@ var shouldPreselectPluginGroup = function(group, installGlobal, preview) {
   if (group.kind === "canonical-shared") {
     return true;
   }
-  if (preview.nativePreview) {
-    return group.agents.some((agent) => agent.id === preview.nativePreview?.agent);
+  if (preview.nativeAgentIds.length > 0) {
+    return group.agents.some((agent) => preview.nativeAgentIds.includes(agent.id));
   }
   return false;
 };
 var getPluginGroupDescription = function(group, preview, projectPath) {
   const portableSummary = getPortableComponentSummary(preview);
-  if (!preview.nativePreview) {
+  if (preview.nativeAgentIds.length === 0) {
     return portableSummary;
   }
-  const containsClaudeCode = group.agents.some((agent) => agent.id === "claude");
+  const containsClaudeCode = group.agents.some((agent) => preview.nativeAgentIds.includes(agent.id));
   if (!containsClaudeCode) {
-    return `${portableSummary}. Skills will be installed here, but Claude-specific components will not be fully available for these agents.`;
+    return `${portableSummary}. Some selected plugins also include Claude-specific components that will not be fully available for these agents.`;
   }
-  const otherAgents = group.agents.filter((agent) => agent.id !== "claude").map((agent) => agent.name);
-  const installPath = formatPathForDisplay(preview.nativePreview.installPath, projectPath);
+  const otherAgents = group.agents.filter((agent) => !preview.nativeAgentIds.includes(agent.id)).map((agent) => agent.name);
+  const installPath = preview.nativeInstallPaths.length === 1 ? formatPathForDisplay(preview.nativeInstallPaths[0], projectPath) : `~/.claude/plugins (${preview.nativeInstallPaths.length} plugin-specific install paths)`;
+  const nativeSummary = preview.nativeFeatures.length > 0 ? ` Native components: ${preview.nativeFeatures.join(", ")}.` : "";
   if (otherAgents.length === 0) {
-    return `${portableSummary}. Full plugin support is available in Claude Code; the native plugin installs at ${installPath}.`;
+    return `${portableSummary}. Full plugin support is available in Claude Code; native components install at ${installPath}.${nativeSummary}`;
   }
   const otherAgentsLabel = otherAgents.join(", ");
   const shareVerb = otherAgents.length === 1 ? "shares" : "share";
   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.`;
+  return `${portableSummary}. Full plugin support is available in Claude Code; native components install at ${installPath}.${nativeSummary} ${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) {
+  if (!preview) {
+    return { aborted: true };
+  }
   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
   }));