@phnx-labs/agents-cli 1.20.4 → 1.20.5

package/dist/commands/mcp.js

@@ -1,7 +1,8 @@
 import chalk from 'chalk';
 import ora from 'ora';
 import { checkbox } from '@inquirer/prompts';
-import { AGENTS, MCP_CAPABLE_AGENTS, getAllCliStates, resolveAgentName, formatAgentError, registerMcpToTargets, unregisterMcpFromTargets, listInstalledMcpsWithScope, parseMcpConfig, getMcpConfigPathForHome, agentLabel, } from '../lib/agents.js';
+import { capableAgents, isCapable } from '../lib/capabilities.js';
+import { AGENTS, getAllCliStates, resolveAgentName, formatAgentError, registerMcpToTargets, unregisterMcpFromTargets, listInstalledMcpsWithScope, parseMcpConfig, getMcpConfigPathForHome, agentLabel, } from '../lib/agents.js';
 import { readManifest, writeManifest, createDefaultManifest } from '../lib/manifest.js';
 import { listMcpServerConfigs, discoverMcpConfigsFromRepo, installMcpConfigCentrally, } from '../lib/mcp.js';
 import { cloneRepo } from '../lib/git.js';
@@ -36,7 +37,7 @@ function parseMcpAgentTargets(value) {
     const targets = [];
     for (const t of rawTargets) {
         if (t === 'all' || t === 'all@all') {
-            for (const a of MCP_CAPABLE_AGENTS) {
+            for (const a of capableAgents('mcp')) {
                 if (listInstalledVersions(a).length > 0) {
                     targets.push(`${a}@all`);
                 }
@@ -57,8 +58,8 @@ function parseMcpAgentTargets(value) {
             throw new Error(`Missing version in --agents entry '${target}'. Use agent@x.y.z, agent@default, or agent@all.`);
         }
         const agentId = resolveAgentName(agentToken);
-        if (!agentId || !MCP_CAPABLE_AGENTS.includes(agentId)) {
-            throw new Error(formatAgentError(agentToken, MCP_CAPABLE_AGENTS));
+        if (!agentId || !isCapable(agentId, 'mcp')) {
+            throw new Error(formatAgentError(agentToken, capableAgents('mcp')));
         }
         if (!versionToken) {
             if (!agents.includes(agentId)) {
@@ -154,7 +155,7 @@ When to use:
             const resolved = resolveAgentName(parts[0]);
             if (!resolved) {
                 spinner.stop();
-                console.log(chalk.red(formatAgentError(parts[0], MCP_CAPABLE_AGENTS)));
+                console.log(chalk.red(formatAgentError(parts[0], capableAgents('mcp'))));
                 process.exit(1);
             }
             filterAgent = resolved;
@@ -178,7 +179,7 @@ When to use:
     mcpCmd
         .command('add <name> [command_or_url...]')
         .description('Add an MCP server to the manifest (run "agents mcp register" afterward to apply)')
-        .option('-a, --agents <list>', 'Targets: claude, codex@0.116.0', MCP_CAPABLE_AGENTS.join(','))
+        .option('-a, --agents <list>', 'Targets: claude, codex@0.116.0', capableAgents('mcp').join(','))
         .option('-s, --scope <scope>', 'user (global) or project (repo-specific)', 'user')
         .option('-t, --transport <type>', 'stdio (default) or http', 'stdio')
         .option('--names <list>', 'When source is a repo: MCP server names to install (comma-separated)')
@@ -254,7 +255,7 @@ Examples:
         manifest.mcp = manifest.mcp || {};
         // Pre-flight: prompt-and-install any requested agent@version that isn't
         // installed yet, before parseMcpAgentTargets validates the selector.
-        const okInstall = await ensureAgentVersionsInstalled(options.agents, MCP_CAPABLE_AGENTS, { yes: options.yes });
+        const okInstall = await ensureAgentVersionsInstalled(options.agents, capableAgents('mcp'), { yes: options.yes });
         if (!okInstall) {
             console.log(chalk.gray('Cancelled.'));
             return;
@@ -313,7 +314,7 @@ Examples:
         const cwd = process.cwd();
         const cliStates = await getAllCliStates();
         const mcpTargetMap = new Map();
-        for (const agentId of MCP_CAPABLE_AGENTS) {
+        for (const agentId of capableAgents('mcp')) {
             if (!cliStates[agentId]?.installed && listInstalledVersions(agentId).length === 0)
                 continue;
             for (const version of listInstalledVersions(agentId)) {
@@ -383,7 +384,7 @@ Examples:
             // If --agents was specified, filter targets
             let availableTargets = mcpInfo.targets;
             if (options?.agents) {
-                const requestedTargets = resolveInstalledAgentTargets(options.agents, MCP_CAPABLE_AGENTS);
+                const requestedTargets = resolveInstalledAgentTargets(options.agents, capableAgents('mcp'));
                 const requested = new Set();
                 for (const aid of requestedTargets.directAgents) {
                     for (const ver of listInstalledVersions(aid)) {
@@ -458,7 +459,7 @@ Examples:
         const cliStates = await getAllCliStates();
         // Gather all unique MCPs across agents
         const mcpMap = new Map();
-        for (const agentId of MCP_CAPABLE_AGENTS) {
+        for (const agentId of capableAgents('mcp')) {
             if (!cliStates[agentId]?.installed)
                 continue;
             const mcps = listInstalledMcpsWithScope(agentId, cwd, { home: getEffectiveHome(agentId) });
@@ -562,7 +563,7 @@ Examples:
             console.log(`\n  ${chalk.cyan(mcpName)}:`);
             let targets;
             if (options.agents) {
-                const resolved = await resolveInstalledAgentTargetsAutoInstalling(options.agents, MCP_CAPABLE_AGENTS, { yes: options.yes });
+                const resolved = await resolveInstalledAgentTargetsAutoInstalling(options.agents, capableAgents('mcp'), { yes: options.yes });
                 if (!resolved) {
                     console.log(chalk.gray('  Cancelled.'));
                     continue;
@@ -570,7 +571,7 @@ Examples:
                 targets = resolved;
             }
             else {
-                targets = resolveConfiguredAgentTargets(config.agents, config.agentVersions, MCP_CAPABLE_AGENTS);
+                targets = resolveConfiguredAgentTargets(config.agents, config.agentVersions, capableAgents('mcp'));
             }
             const results = await registerMcpToTargets(targets, mcpName, commandOrUrl, config.scope || 'user', transport, { headers: config.headers });
             for (const result of results) {
@@ -639,10 +640,10 @@ async function installMcpsFromRepoSource(source, options) {
     // Agent/version selection — same default as the non-repo form: every
     // MCP-capable agent. Routes through resolveAgentTargetsAutoInstalling so
     // a typo'd `claude@2.1.999` prompts to install (and --yes auto-installs).
-    const agentsValue = options.agents ?? MCP_CAPABLE_AGENTS.join(',');
+    const agentsValue = options.agents ?? capableAgents('mcp').join(',');
     let targets;
     try {
-        const resolved = await resolveAgentTargetsAutoInstalling(agentsValue, MCP_CAPABLE_AGENTS, { yes: options.yes });
+        const resolved = await resolveAgentTargetsAutoInstalling(agentsValue, capableAgents('mcp'), { yes: options.yes });
         if (!resolved) {
             console.log(chalk.gray('\nCancelled.'));
             return;
@@ -672,9 +673,9 @@ async function installMcpsFromRepoSource(source, options) {
 /** Enumerate (agent, version) pairs that support MCP and have a version home. */
 function iterMcpCapableVersions(filter) {
     const out = [];
-    const agents = filter?.agent ? [filter.agent] : MCP_CAPABLE_AGENTS;
+    const agents = filter?.agent ? [filter.agent] : capableAgents('mcp');
     for (const agent of agents) {
-        if (!MCP_CAPABLE_AGENTS.includes(agent))
+        if (!isCapable(agent, 'mcp'))
             continue;
         const versions = listInstalledVersions(agent);
         for (const version of versions) {

package/dist/commands/models.js

@@ -116,7 +116,7 @@ function printCatalog(agent, version, isDefault, options) {
     const src = locateModelSource(agent, version);
     if (!src) {
         console.log(chalk.yellow(`  Could not locate model source for ${agent}@${version}.`));
-        console.log(chalk.gray(`  Expected the agent's CLI bundle or native binary under ~/.agents-system/versions/${agent}/${version}/.`));
+        console.log(chalk.gray(`  Expected the agent's CLI bundle or native binary under ~/.agents/.history/versions/${agent}/${version}/.`));
         return;
     }
     const catalog = getModelCatalog(agent, version);

package/dist/commands/packages.js

@@ -7,7 +7,8 @@
  */
 import chalk from 'chalk';
 import ora from 'ora';
-import { AGENTS, ALL_AGENT_IDS, MCP_CAPABLE_AGENTS, getAllCliStates, agentLabel, } from '../lib/agents.js';
+import { AGENTS, ALL_AGENT_IDS, getAllCliStates, agentLabel, } from '../lib/agents.js';
+import { capableAgents } from '../lib/capabilities.js';
 import { DEFAULT_REGISTRIES } from '../lib/types.js';
 import { getRegistries, setRegistry, removeRegistry, search as searchRegistries, resolvePackage, validatedNpmSpec, validatedPyPISpec, } from '../lib/registry.js';
 import { cloneRepo } from '../lib/git.js';
@@ -110,6 +111,7 @@ export function registerPackagesCommands(program) {
             }
             console.log();
         }
+        console.log(chalk.gray("  See also: agents plugins marketplaces — plugin marketplaces (managed via 'agents repo')"));
     });
     registryCmd
         .command('add <type> <name> <url>')
@@ -410,10 +412,10 @@ When to use:
                     process.exit(1);
                 }
                 const cliStates = await getAllCliStates();
-                const installedAgents = MCP_CAPABLE_AGENTS.filter((id) => cliStates[id]?.installed || listInstalledVersions(id).length > 0);
+                const installedAgents = capableAgents('mcp').filter((id) => cliStates[id]?.installed || listInstalledVersions(id).length > 0);
                 let targets;
                 if (options.agents) {
-                    const resolved = await resolveInstalledAgentTargetsAutoInstalling(options.agents, MCP_CAPABLE_AGENTS, { yes: options.yes });
+                    const resolved = await resolveInstalledAgentTargetsAutoInstalling(options.agents, capableAgents('mcp'), { yes: options.yes });
                     if (!resolved) {
                         console.log(chalk.gray('Cancelled.'));
                         return;
@@ -421,7 +423,7 @@ When to use:
                     targets = resolved;
                 }
                 else {
-                    targets = resolveConfiguredAgentTargets(installedAgents, undefined, MCP_CAPABLE_AGENTS);
+                    targets = resolveConfiguredAgentTargets(installedAgents, undefined, capableAgents('mcp'));
                 }
                 if (targets.selectedAgents.length === 0) {
                     console.log(chalk.yellow('\nNo MCP-capable agents installed.'));

package/dist/commands/permissions.js

@@ -6,7 +6,8 @@ import * as path from 'path';
 import { confirm, checkbox } from '@inquirer/prompts';
 import { AGENTS, resolveAgentName, formatAgentError, agentLabel, } from '../lib/agents.js';
 import { cloneRepo } from '../lib/git.js';
-import { PERMISSIONS_CAPABLE_AGENTS, listInstalledPermissions, discoverPermissionsFromRepo, installPermissionSet, removePermissionSet, applyPermissionsToVersion, readAgentPermissions, exportPermissionsFromPath, getDefaultPermissionSet, computePermissionsDiff, mergePermissionSets, saveDefaultPermissionSet, containsBroadGrants, } from '../lib/permissions.js';
+import { capableAgents, isCapable } from '../lib/capabilities.js';
+import { listInstalledPermissions, discoverPermissionsFromRepo, installPermissionSet, removePermissionSet, applyPermissionsToVersion, readAgentPermissions, exportPermissionsFromPath, getDefaultPermissionSet, computePermissionsDiff, mergePermissionSets, saveDefaultPermissionSet, containsBroadGrants, } from '../lib/permissions.js';
 import { listInstalledVersions, getGlobalDefault, getVersionHomePath, promptAgentVersionSelection, resolveVersionAlias, } from '../lib/versions.js';
 import { recordVersionResources } from '../lib/state.js';
 import { isPromptCancelled, isInteractiveTerminal, parseCommaSeparatedList, printWithPager, requireInteractiveSelection, resolveAgentTargetsAutoInstalling, } from './utils.js';
@@ -112,11 +113,11 @@ When to use:
             const agentName = parts[0];
             const agentId = resolveAgentName(agentName);
             if (!agentId) {
-                console.log(chalk.red(formatAgentError(agentName, PERMISSIONS_CAPABLE_AGENTS)));
+                console.log(chalk.red(formatAgentError(agentName, capableAgents('allowlist'))));
                 process.exit(1);
             }
             const requestedVersion = resolveVersionAlias(agentId, parts[1]) ?? null;
-            if (!PERMISSIONS_CAPABLE_AGENTS.includes(agentId)) {
+            if (!isCapable(agentId, 'allowlist')) {
                 console.log(chalk.yellow(`${AGENTS[agentId].name} does not support fine-grained permissions`));
                 return;
             }
@@ -279,7 +280,7 @@ Examples:
                 let selectedAgents;
                 let versionSelections;
                 if (options.agents) {
-                    const result = await resolveAgentTargetsAutoInstalling(options.agents, PERMISSIONS_CAPABLE_AGENTS, {
+                    const result = await resolveAgentTargetsAutoInstalling(options.agents, capableAgents('allowlist'), {
                         yes: options.yes,
                         allVersions: options.all,
                     });
@@ -291,7 +292,7 @@ Examples:
                     versionSelections = result.versionSelections;
                 }
                 else if (options.all) {
-                    selectedAgents = [...PERMISSIONS_CAPABLE_AGENTS];
+                    selectedAgents = [...capableAgents('allowlist')];
                     versionSelections = new Map();
                     for (const agentId of selectedAgents) {
                         const versions = listInstalledVersions(agentId);
@@ -301,7 +302,7 @@ Examples:
                     }
                 }
                 else {
-                    const result = await promptAgentVersionSelection(PERMISSIONS_CAPABLE_AGENTS, { skipPrompts: options.yes });
+                    const result = await promptAgentVersionSelection(capableAgents('allowlist'), { skipPrompts: options.yes });
                     selectedAgents = result.selectedAgents;
                     versionSelections = result.versionSelections;
                 }
@@ -417,7 +418,7 @@ Examples:
                 let selectedAgents;
                 let versionSelections;
                 if (options.agents) {
-                    const result = await resolveAgentTargetsAutoInstalling(options.agents, PERMISSIONS_CAPABLE_AGENTS, {
+                    const result = await resolveAgentTargetsAutoInstalling(options.agents, capableAgents('allowlist'), {
                         yes: options.yes,
                         allVersions: options.all,
                     });
@@ -429,7 +430,7 @@ Examples:
                     versionSelections = result.versionSelections;
                 }
                 else if (options.all) {
-                    selectedAgents = [...PERMISSIONS_CAPABLE_AGENTS];
+                    selectedAgents = [...capableAgents('allowlist')];
                     versionSelections = new Map();
                     for (const agentId of selectedAgents) {
                         const versions = listInstalledVersions(agentId);
@@ -444,7 +445,7 @@ Examples:
                         default: true,
                     });
                     if (applyNow) {
-                        const result = await promptAgentVersionSelection(PERMISSIONS_CAPABLE_AGENTS, { skipPrompts: false });
+                        const result = await promptAgentVersionSelection(capableAgents('allowlist'), { skipPrompts: false });
                         selectedAgents = result.selectedAgents;
                         versionSelections = result.versionSelections;
                     }
@@ -547,7 +548,7 @@ Examples:
                 let selectedAgents;
                 let versionSelections;
                 if (options.agents) {
-                    const result = await resolveAgentTargetsAutoInstalling(options.agents, PERMISSIONS_CAPABLE_AGENTS, {
+                    const result = await resolveAgentTargetsAutoInstalling(options.agents, capableAgents('allowlist'), {
                         yes: options.yes,
                         allVersions: options.all,
                     });
@@ -559,7 +560,7 @@ Examples:
                     versionSelections = result.versionSelections;
                 }
                 else if (options.all) {
-                    selectedAgents = [...PERMISSIONS_CAPABLE_AGENTS];
+                    selectedAgents = [...capableAgents('allowlist')];
                     versionSelections = new Map();
                     for (const agentId of selectedAgents) {
                         const versions = listInstalledVersions(agentId);
@@ -574,7 +575,7 @@ Examples:
                         default: true,
                     });
                     if (applyNow) {
-                        const result = await promptAgentVersionSelection(PERMISSIONS_CAPABLE_AGENTS, { skipPrompts: false });
+                        const result = await promptAgentVersionSelection(capableAgents('allowlist'), { skipPrompts: false });
                         selectedAgents = result.selectedAgents;
                         versionSelections = result.versionSelections;
                     }

package/dist/commands/plugins.d.ts

@@ -10,3 +10,16 @@ import { type PluginCapabilities } from '../lib/plugins.js';
 export declare function shouldRefusePluginInstall(capabilities: PluginCapabilities, allowExecSurfaces: boolean): boolean;
 /** Register the `agents plugins` command tree. */
 export declare function registerPluginsCommands(program: Command): void;
+interface MarketplaceRow {
+    name: string;
+    source: string;
+    plugins: number;
+    enabled: number;
+}
+/**
+ * Build one row per discovered marketplace. `plugins` counts plugin manifests
+ * under the marketplace's source pluginsRoot; `enabled` counts entries in the
+ * default Claude version's settings.json#enabledPlugins keyed on @<marketplace>.
+ */
+export declare function collectMarketplaceRows(): MarketplaceRow[];
+export {};

package/dist/commands/plugins.js

@@ -9,7 +9,8 @@ import * as fs from 'fs';
 import * as path from 'path';
 import chalk from 'chalk';
 import { input } from '@inquirer/prompts';
-import { PLUGINS_CAPABLE_AGENTS, agentLabel } from '../lib/agents.js';
+import { agentLabel } from '../lib/agents.js';
+import { capableAgents, isCapable } from '../lib/capabilities.js';
 import { discoverPlugins, getPlugin, pluginSupportsAgent, removePluginFromVersion, isPluginSynced, installPlugin, updatePlugin, loadUserConfig, saveUserConfig, checkPluginDependencies, hasPluginExecSurfaces, inspectPluginCapabilities, pluginCapabilityLabels, parseInstallSpec, syncPluginToVersion, } from '../lib/plugins.js';
 import { listInstalledVersions, syncResourcesToVersion, getGlobalDefault, getVersionHomePath, } from '../lib/versions.js';
 import { isPromptCancelled, isInteractiveTerminal, requireDestructiveArg, requireInteractiveSelection, promptRemovalTargets, } from './utils.js';
@@ -17,6 +18,7 @@ import { itemPicker } from '../lib/picker.js';
 import { showResourceList, buildTargetsSection, } from './resource-view.js';
 import { getPluginsDir } from '../lib/state.js';
 import { safeJoin } from '../lib/paths.js';
+import { discoverMarketplaces } from '../lib/plugin-marketplace.js';
 /** Replace the home directory prefix with ~ for display. */
 function formatPath(p) {
     const home = process.env.HOME || '';
@@ -66,6 +68,7 @@ When to use:
             resourcePlural: 'plugins',
             resourceSingular: 'plugin',
             extraLabel: 'Version',
+            extra2Label: 'Marketplace',
             rows: buildPluginRows(plugins),
             emptyMessage: 'No plugins in ~/.agents/plugins/.',
             centralPath: getPluginsDir(),
@@ -78,6 +81,42 @@ When to use:
         .command('list')
         .description('Show plugins in a table with sync status across agent versions')
         .action(runList);
+    // agents plugins marketplaces
+    const marketplacesCmd = pluginsCmd
+        .command('marketplaces')
+        .description('List plugin marketplaces — one per DotAgents repo with a plugins/ directory')
+        .option('--json', 'Emit machine-readable JSON')
+        .action((options) => {
+        const rows = collectMarketplaceRows();
+        if (options.json) {
+            console.log(JSON.stringify(rows, null, 2));
+            return;
+        }
+        if (rows.length === 0) {
+            console.log(chalk.gray('No plugin marketplaces found.'));
+            console.log(chalk.gray('Add one with: agents repo add <path|gh:user/repo>'));
+            return;
+        }
+        const nameW = Math.max(12, ...rows.map((r) => r.name.length));
+        const srcW = Math.max(20, ...rows.map((r) => formatPath(r.source).length));
+        console.log();
+        console.log(`  ${chalk.bold(padCol('NAME', nameW))}  ${chalk.bold(padCol('SOURCE', srcW))}  ${chalk.bold(padCol('PLUGINS', 7))}  ${chalk.bold('ENABLED')}`);
+        for (const r of rows) {
+            console.log(`  ${chalk.cyan(padCol(r.name, nameW))}  ${chalk.gray(padCol(formatPath(r.source), srcW))}  ${padCol(String(r.plugins), 7)}  ${r.enabled}`);
+        }
+        console.log();
+        console.log(chalk.gray(`${rows.length} marketplace(s) — manage via 'agents repo'.`));
+    });
+    // Redirect add/remove/etc. on marketplaces to repo commands.
+    const marketplaceRedirect = (verb) => () => {
+        console.log(chalk.gray(`Use 'agents repo ${verb === 'add' ? 'add' : verb} <path|gh:user/repo>' to ${verb} a marketplace (one repo = one marketplace).`));
+    };
+    for (const verb of ['add', 'remove', 'enable', 'disable', 'install', 'rm']) {
+        marketplacesCmd
+            .command(`${verb} [target]`)
+            .description(`Redirects to 'agents repo ${verb}' — marketplaces follow repos`)
+            .action(marketplaceRedirect(verb));
+    }
     // agents plugins info [name]
     pluginsCmd
         .command('info [name]')
@@ -145,7 +184,7 @@ Examples:
         console.log(`  ${plugin.manifest.description}`);
         console.log(`  ${chalk.gray(`Version: ${plugin.manifest.version}`)}`);
         console.log(`  ${chalk.gray(`Path: ${formatPath(plugin.root)}`)}`);
-        const agents = PLUGINS_CAPABLE_AGENTS
+        const agents = capableAgents('plugins')
             .filter(a => pluginSupportsAgent(plugin, a))
             .map(a => agentLabel(a));
         console.log(`  ${chalk.gray(`Agents: ${agents.join(', ')}`)}`);
@@ -210,7 +249,7 @@ Examples:
         // Show installation status per agent version
         console.log(chalk.bold('\n  Installation Status'));
         let anyInstalled = false;
-        for (const agentId of PLUGINS_CAPABLE_AGENTS) {
+        for (const agentId of capableAgents('plugins')) {
             if (!pluginSupportsAgent(plugin, agentId))
                 continue;
             const versions = listInstalledVersions(agentId);
@@ -259,7 +298,7 @@ Examples:
         let targetAgents;
         if (agentArg) {
             const agentId = agentArg;
-            if (!PLUGINS_CAPABLE_AGENTS.includes(agentId)) {
+            if (!isCapable(agentId, 'plugins')) {
                 console.log(chalk.red(`Agent '${agentArg}' does not support plugins`));
                 process.exit(1);
             }
@@ -270,7 +309,7 @@ Examples:
             targetAgents = [agentId];
         }
         else {
-            targetAgents = PLUGINS_CAPABLE_AGENTS.filter(a => pluginSupportsAgent(plugin, a));
+            targetAgents = capableAgents('plugins').filter(a => pluginSupportsAgent(plugin, a));
         }
         const allowExec = options.allowExecSurfaces === true;
         for (const agentId of targetAgents) {
@@ -327,7 +366,7 @@ Examples:
         }
         // Build list of targets that have this plugin synced
         const availableTargets = [];
-        for (const agentId of PLUGINS_CAPABLE_AGENTS) {
+        for (const agentId of capableAgents('plugins')) {
             if (plugin && !pluginSupportsAgent(plugin, agentId))
                 continue;
             const versions = listInstalledVersions(agentId);
@@ -476,7 +515,7 @@ Examples:
         // Sync to all supported installed versions
         console.log();
         let synced = 0;
-        for (const agentId of PLUGINS_CAPABLE_AGENTS) {
+        for (const agentId of capableAgents('plugins')) {
             if (!pluginSupportsAgent(plugin, agentId))
                 continue;
             const versions = listInstalledVersions(agentId);
@@ -530,7 +569,7 @@ Examples:
             }
             console.log(chalk.green('done'));
             // Re-sync to all supported installed versions
-            for (const agentId of PLUGINS_CAPABLE_AGENTS) {
+            for (const agentId of capableAgents('plugins')) {
                 if (!pluginSupportsAgent(plugin, agentId))
                     continue;
                 const versions = listInstalledVersions(agentId);
@@ -578,19 +617,68 @@ async function promptUserConfig(manifest, existingConfig = {}) {
     }
     return result;
 }
+function padCol(s, w) {
+    const raw = s.replace(/\x1b\[[0-9;]*m/g, '');
+    if (raw.length >= w)
+        return s;
+    return s + ' '.repeat(w - raw.length);
+}
+/**
+ * Build one row per discovered marketplace. `plugins` counts plugin manifests
+ * under the marketplace's source pluginsRoot; `enabled` counts entries in the
+ * default Claude version's settings.json#enabledPlugins keyed on @<marketplace>.
+ */
+export function collectMarketplaceRows() {
+    const marketplaces = discoverMarketplaces();
+    const rows = [];
+    // Find the default Claude version (if any) and read its enabledPlugins map.
+    const claudeDefault = isCapable('claude', 'plugins') ? getGlobalDefault('claude') : null;
+    let enabledMap = {};
+    if (claudeDefault) {
+        const versionHome = getVersionHomePath('claude', claudeDefault);
+        const settingsPath = path.join(versionHome, '.claude', 'settings.json');
+        if (fs.existsSync(settingsPath)) {
+            try {
+                const parsed = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
+                enabledMap = parsed.enabledPlugins ?? {};
+            }
+            catch { /* ignore parse errors */ }
+        }
+    }
+    for (const m of marketplaces) {
+        let pluginCount = 0;
+        try {
+            for (const entry of fs.readdirSync(m.pluginsRoot, { withFileTypes: true })) {
+                if (entry.name.startsWith('.'))
+                    continue;
+                const root = path.join(m.pluginsRoot, entry.name);
+                const manifestFile = path.join(root, '.claude-plugin', 'plugin.json');
+                if (fs.existsSync(manifestFile))
+                    pluginCount++;
+            }
+        }
+        catch { /* ignore unreadable dir */ }
+        const suffix = `@${m.name}`;
+        const enabled = Object.entries(enabledMap)
+            .filter(([key, val]) => val === true && key.endsWith(suffix))
+            .length;
+        rows.push({ name: m.name, source: m.pluginsRoot, plugins: pluginCount, enabled });
+    }
+    return rows;
+}
 /** Convert discovered plugins into rows suitable for the resource list view. */
 function buildPluginRows(plugins) {
     const rows = [];
     // Cache version lists per agent once.
     const versionsByAgent = new Map();
     const defaultsByAgent = new Map();
-    for (const agent of PLUGINS_CAPABLE_AGENTS) {
+    for (const agent of capableAgents('plugins')) {
         versionsByAgent.set(agent, listInstalledVersions(agent));
         defaultsByAgent.set(agent, getGlobalDefault(agent));
     }
     for (const plugin of plugins) {
         const targets = [];
-        for (const agent of PLUGINS_CAPABLE_AGENTS) {
+        for (const agent of capableAgents('plugins')) {
             if (!pluginSupportsAgent(plugin, agent))
                 continue;
             for (const version of versionsByAgent.get(agent) || []) {
@@ -608,6 +696,7 @@ function buildPluginRows(plugins) {
             name: plugin.name,
             description: plugin.manifest.description,
             extra: plugin.manifest.version ? `v${plugin.manifest.version}` : '-',
+            extra2: plugin.marketplace ?? '-',
             targets,
             buildDetail: () => formatPluginDetail(plugin, targets),
         });
@@ -631,7 +720,7 @@ function formatPluginDetail(plugin, targets) {
     if (plugin.manifest.description) {
         lines.push(chalk.gray(plugin.manifest.description));
     }
-    const supported = PLUGINS_CAPABLE_AGENTS
+    const supported = capableAgents('plugins')
         .filter((a) => pluginSupportsAgent(plugin, a))
         .map((a) => agentLabel(a));
     if (supported.length > 0) {

package/dist/commands/prune.js

@@ -48,8 +48,9 @@ function collectOrphans(types, all) {
     if (types.includes('commands')) {
         for (const { agent, version } of scopePairs(iterCommandsCapableVersions(), all)) {
             const diff = diffVersionCommands(agent, version);
-            if (diff.orphans.length > 0) {
-                groups.push({ type: 'commands', agent, version, orphans: diff.orphans });
+            const removable = [...diff.orphans, ...diff.toRemove];
+            if (removable.length > 0) {
+                groups.push({ type: 'commands', agent, version, orphans: removable });
             }
         }
     }

package/dist/commands/pull.d.ts

@@ -1,10 +1,17 @@
 /**
- * Config pull command.
+ * Removed `agents pull` command.
  *
- * Registers the `agents pull` command which clones or updates the
- * system ~/.agents-system/ git repo and syncs CLI versions, MCP servers,
- * resources, and hooks to installed agent versions.
+ * `agents pull` was a god-command bundling git fetch+ff with local
+ * materialization (install CLIs, register MCP, sync resources, register hooks,
+ * etc.). It is replaced by the explicit split:
+ *
+ *   - `agents repo pull <alias>`     — git fetch+ff on system / user / extra
+ *   - `agents repo refresh [agent]`  — re-materialize installed version homes
+ *   - `agents setup`                 — first-time bootstrap
+ *
+ * The command is kept registered so old muscle-memory invocations get a clear
+ * redirect instead of an "unknown command" error.
  */
 import type { Command } from 'commander';
-/** Register the `agents pull` command. */
+/** Register the deprecated `agents pull` command as a hard-error redirect. */
 export declare function registerPullCommand(program: Command): void;