agentinit 1.17.0 → 1.17.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.17.1](https://github.com/agentinit/agentinit/compare/v1.17.0...v1.17.1) (2026-04-02)
+
+
+### Bug Fixes
+
+* preserve multi-plugin bundle selection ([08e17d3](https://github.com/agentinit/agentinit/commit/08e17d3fd91049d22d846ffb54375f751f43b8b9))
+
 # [1.17.0](https://github.com/agentinit/agentinit/compare/v1.16.2...v1.17.0) (2026-04-02)
 
 

package/README.md

@@ -214,6 +214,8 @@ agentinit skills list --agent agents
 agentinit skills remove openai-docs
 ```
 
+If a GitHub or local Claude bundle contains multiple plugins, `agentinit skills add` prompts you to choose which bundled plugin to inspect or install. In non-interactive `--yes` mode, ambiguous multi-plugin bundles fail instead of prompting.
+
 Skills are installed into a canonical store by default (`.agents/skills/` for project, `~/.agents/skills/` for global), with agent-specific paths symlinked automatically. Bare skill names resolve from your configured default marketplace, falling back to the public catalog at `vercel-labs/agent-skills`. Use `./name` for local paths, `owner/repo` for GitHub repos, or `--from <marketplace>` for explicit marketplace sources.
 
 ### `agentinit plugins`
@@ -250,6 +252,8 @@ agentinit plugins remove code-review
 
 Bare plugin names resolve through your configured default marketplace. Built-in marketplaces include `claude` and `openai`; add custom ones with `agentinit config marketplaces add`. For Claude-format plugins, native bundles are installed into `~/.claude/plugins` alongside portable skill and MCP installs.
 
+If a GitHub or local Claude bundle contains multiple plugins, `agentinit plugins install` prompts you to choose which bundled plugin to inspect or install. In non-interactive `--yes` mode, ambiguous multi-plugin bundles fail instead of prompting.
+
 ### `agentinit config`
 
 Manage user-level marketplace and trust settings in `~/.agentinit/config.json`.

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;
@@ -17202,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;
     }
@@ -17279,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,
@@ -18118,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) {
@@ -18748,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) {
@@ -18817,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);
@@ -18824,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
@@ -19093,7 +19118,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 +41225,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();
@@ -41218,21 +41245,63 @@ 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) {
-      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 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;
@@ -41258,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();
@@ -41345,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) {
@@ -42493,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();
@@ -42524,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;
     }
@@ -42533,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;
         }
@@ -42565,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;
@@ -42602,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}`);
@@ -42619,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.");
@@ -42649,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
     });
@@ -42685,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
@@ -42710,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) || ".";
@@ -42999,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
   }));

package/dist/commands/plugins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugins.d.ts","sourceRoot":"","sources":["../../src/commands/plugins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4BpC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAkT7D"}
+{"version":3,"file":"plugins.d.ts","sourceRoot":"","sources":["../../src/commands/plugins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4BpC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA8Z7D"}