agentinit 1.17.1 → 1.18.0

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,CA8Z7D"}
+{"version":3,"file":"plugins.d.ts","sourceRoot":"","sources":["../../src/commands/plugins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsCpC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA2b7D"}

package/dist/commands/plugins.js

@@ -4,6 +4,7 @@ import { homedir } from 'os';
 import { dirname, relative, resolve } from 'path';
 import { green, dim, bold, cyan, yellow, orange } from '../utils/colors.js';
 import { logger } from '../utils/logger.js';
+import { promptMultiselect, selectBundlePlugins } from '../utils/promptUtils.js';
 import { MultipleBundlePluginsError, PluginManager } from '../core/pluginManager.js';
 import { AgentManager } from '../core/agentManager.js';
 import { getConfiguredDefaultMarketplaceId, getMarketplaceCategories } from '../core/marketplaceRegistry.js';
@@ -21,6 +22,7 @@ export function registerPluginsCommand(program) {
         .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('--all', 'Select all bundled plugins when the source contains multiple plugins')
         .option('-l, --list', 'Preview plugin contents without installing')
         .option('-y, --yes', 'Skip confirmation prompts, auto-detect project-configured agents')
         .action(async (source, options) => {
@@ -61,43 +63,45 @@ export function registerPluginsCommand(program) {
             catch (error) {
                 if (error instanceof MultipleBundlePluginsError) {
                     spinner.stop();
-                    const selected = await selectBundlePlugin(error, 'preview');
+                    const selected = await selectBundlePlugins(error.entries, 'preview', { selectAll: options.all });
                     if (!selected) {
                         return;
                     }
-                    const retrySpinner = ora('Fetching plugin...').start();
-                    try {
-                        const preview = await pluginManager.inspectPlugin(source, {
-                            from: options.from,
-                            pluginName: selected,
-                        });
-                        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}`);
+                    for (const pluginName of selected) {
+                        const retrySpinner = ora(`Fetching plugin ${pluginName}...`).start();
+                        try {
+                            const preview = await pluginManager.inspectPlugin(source, {
+                                from: options.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.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());
                         }
-                        if (p.skills.length === 0 && p.mcpServers.length === 0) {
-                            logger.info('  No portable components found (no skills or MCP servers).');
+                        catch (retryError) {
+                            retrySpinner.fail(`Failed to fetch plugin ${pluginName}`);
+                            logger.error(`Error: ${retryError instanceof Error ? retryError.message : 'Unknown error'}`);
                         }
-                        renderPluginWarnings(preview, process.cwd());
-                    }
-                    catch (retryError) {
-                        retrySpinner.fail('Failed to fetch plugin');
-                        logger.error(`Error: ${retryError instanceof Error ? retryError.message : 'Unknown error'}`);
                     }
                 }
                 else {
@@ -110,35 +114,47 @@ export function registerPluginsCommand(program) {
         // Interactive agent selection if not --yes and not --agent
         let agentIds = options.agent;
         let targetGlobal = options.global;
-        let preview = null;
+        let selectionPreview = null;
         let previewRendered = false;
-        let selectedPluginName;
+        let selectedPluginNames;
         if (!agentIds && !options.yes) {
             const previewSpinner = ora('Inspecting plugin...').start();
             try {
-                preview = await pluginManager.preparePluginInstall(source, {
+                const preview = await pluginManager.preparePluginInstall(source, {
                     from: options.from,
                 });
                 previewSpinner.stop();
-                renderPluginWarnings(preview, process.cwd());
+                selectionPreview = buildPluginSelectionPreview([preview]);
+                renderPreparedPluginWarnings([preview], process.cwd());
                 previewRendered = true;
             }
             catch (error) {
                 if (error instanceof MultipleBundlePluginsError) {
                     previewSpinner.stop();
-                    const selected = await selectBundlePlugin(error, 'install');
+                    const selected = await selectBundlePlugins(error.entries, 'install', { selectAll: options.all });
                     if (!selected) {
                         return;
                     }
-                    selectedPluginName = selected;
+                    selectedPluginNames = selected;
                     const retrySpinner = ora('Inspecting plugin...').start();
                     try {
-                        preview = await pluginManager.preparePluginInstall(source, {
-                            from: options.from,
-                            pluginName: selectedPluginName,
-                        });
+                        const previewsByPlugin = new Map();
+                        const previewOrder = selectedPluginNames.length > 1
+                            ? [...selectedPluginNames.slice(1), selectedPluginNames[0]]
+                            : selectedPluginNames;
+                        for (const pluginName of previewOrder) {
+                            const preparedPreview = await pluginManager.preparePluginInstall(source, {
+                                from: options.from,
+                                pluginName,
+                            });
+                            previewsByPlugin.set(pluginName, preparedPreview);
+                        }
+                        const previews = selectedPluginNames
+                            .map(pluginName => previewsByPlugin.get(pluginName))
+                            .filter((value) => !!value);
                         retrySpinner.stop();
-                        renderPluginWarnings(preview, process.cwd());
+                        selectionPreview = buildPluginSelectionPreview(previews);
+                        renderPreparedPluginWarnings(previews, process.cwd());
                         previewRendered = true;
                     }
                     catch (retryError) {
@@ -154,7 +170,7 @@ export function registerPluginsCommand(program) {
                 }
             }
             try {
-                const selection = await interactiveAgentSelect(pluginManager, agentManager, process.cwd(), targetGlobal, preview);
+                const selection = await interactiveAgentSelect(pluginManager, agentManager, process.cwd(), targetGlobal, selectionPreview);
                 if (!selection || selection.aborted || !selection.agents || selection.agents.length === 0) {
                     await pluginManager.discardPreparedPlugin(source, { from: options.from });
                     logger.info('No agents selected. Aborting.');
@@ -172,87 +188,98 @@ export function registerPluginsCommand(program) {
             }
         }
         // Install
-        const spinner = ora('Installing plugin...').start();
-        try {
-            const result = await pluginManager.installPlugin(source, process.cwd(), {
-                from: options.from,
-                agents: agentIds,
-                global: targetGlobal,
-                copySkills: options.copySkills,
-                yes: options.yes,
-                ...(selectedPluginName ? { pluginName: selectedPluginName } : {}),
-            });
-            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 pluginManager.preparePluginInstall(source, {
+                        from: options.from,
+                        pluginName,
+                    });
                 }
-                return;
-            }
-            spinner.succeed(`Installed plugin ${green(bold(p.name))} ${dim(`v${p.version}`)}`);
-            renderInstalledComponents(result, agentManager, process.cwd());
-            // Skipped
-            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 pluginManager.installPlugin(source, process.cwd(), {
+                    from: options.from,
+                    agents: agentIds,
+                    global: targetGlobal,
+                    copySkills: options.copySkills,
+                    yes: options.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, agentManager, process.cwd());
+                // Skipped
+                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.');
             }
-            if (!previewRendered) {
-                renderPluginWarnings(result, process.cwd());
-            }
-            logger.success('Plugin installation complete.');
-        }
-        catch (error) {
-            if (error instanceof MultipleBundlePluginsError && !options.yes) {
-                spinner.stop();
-                const selected = await selectBundlePlugin(error, 'install');
-                if (!selected) {
-                    return;
-                }
-                const retrySpinner = ora('Installing plugin...').start();
-                try {
-                    const result = await pluginManager.installPlugin(source, process.cwd(), {
-                        from: options.from,
-                        agents: agentIds,
-                        global: targetGlobal,
-                        copySkills: options.copySkills,
-                        yes: options.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());
+            catch (error) {
+                if (error instanceof MultipleBundlePluginsError && (options.all || !options.yes)) {
+                    spinner.stop();
+                    const selected = await selectBundlePlugins(error.entries, 'install', { selectAll: options.all });
+                    if (!selected) {
                         return;
                     }
-                    retrySpinner.succeed(`Installed plugin ${green(bold(p.name))} ${dim(`v${p.version}`)}`);
-                    renderInstalledComponents(result, agentManager, process.cwd());
-                    renderPluginWarnings(result, process.cwd());
-                    logger.success('Plugin installation complete.');
+                    for (const selectedName of selected) {
+                        const retrySpinner = ora(`Installing plugin ${selectedName}...`).start();
+                        try {
+                            const result = await pluginManager.installPlugin(source, process.cwd(), {
+                                from: options.from,
+                                agents: agentIds,
+                                global: targetGlobal,
+                                copySkills: options.copySkills,
+                                yes: options.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, agentManager, 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'}`);
+                        }
+                    }
                 }
-                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'}`);
                 }
             }
-            else {
-                spinner.fail('Failed to install plugin');
-                logger.error(`Error: ${error instanceof Error ? error.message : 'Unknown error'}`);
-            }
         }
     });
     // --- plugins search [query] ---
@@ -383,22 +410,6 @@ export function registerPluginsCommand(program) {
         }
     });
 }
-async function selectBundlePlugin(error, actionLabel) {
-    const response = await prompts({
-        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;
-}
 function formatPathForDisplay(pathValue, projectPath) {
     if (pathValue.startsWith(`${projectPath}/`)) {
         return relative(projectPath, pathValue) || '.';
@@ -414,16 +425,48 @@ function getAgentLabel(agentIds, agentManager) {
         .map(agentId => agentManager.getAgentById(agentId)?.name || agentId)
         .join(', ');
 }
+function buildPluginSelectionPreview(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],
+    };
+}
 function getPortableComponentSummary(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';
 }
+function renderPreparedPluginWarnings(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);
+    }
+}
 function getSourceWarnings(warnings) {
     const items = [];
     for (const warning of warnings) {
@@ -691,36 +734,44 @@ function shouldPreselectPluginGroup(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;
 }
 function getPluginGroupDescription(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')
+        .filter(agent => !preview.nativeAgentIds.includes(agent.id))
         .map(agent => agent.name);
-    const installPath = formatPathForDisplay(preview.nativePreview.installPath, projectPath);
+    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.`;
 }
 /**
  * Interactive agent selection grouped by shared skills directory
  */
 async function interactiveAgentSelect(pluginManager, agentManager, projectPath, global, preview) {
+    if (!preview) {
+        return { aborted: true };
+    }
     let installGlobal = !!global;
     let groups = installGlobal
         ? buildGlobalPluginGroups(agentManager, projectPath)
@@ -756,13 +807,11 @@ async function interactiveAgentSelect(pluginManager, agentManager, projectPath,
         logger.warn('No supported agents expose a skills directory.');
         return { aborted: true };
     }
-    const response = await prompts({
-        type: 'multiselect',
+    const response = await promptMultiselect({
         name: 'groups',
         message: installGlobal
             ? 'Select which global agents should receive this plugin:'
             : 'Select which agents should receive this plugin:',
-        instructions: false,
         min: 1,
         choices: groups.map(group => {
             const compatible = group.compatibleAgentNames.length > 0