@swarmify/agents-cli 1.5.7 → 1.5.9

package/dist/index.js

@@ -21,9 +21,9 @@ import { readManifest, writeManifest, createDefaultManifest, MANIFEST_FILENAME,
 import { readState, ensureAgentsDir, getRepoLocalPath, getScope, setScope, removeScope, getScopesByPriority, getScopePriority, } from './lib/state.js';
 import { SCOPE_PRIORITIES, DEFAULT_SYSTEM_REPO } from './lib/types.js';
 import { cloneRepo, parseSource } from './lib/git.js';
-import { discoverCommands, resolveCommandSource, installCommand, uninstallCommand, listInstalledCommandsWithScope, promoteCommandToUser, commandExists, } from './lib/commands.js';
-import { discoverHooksFromRepo, installHooks, listInstalledHooksWithScope, promoteHookToUser, removeHook, hookExists, } from './lib/hooks.js';
-import { discoverSkillsFromRepo, installSkill, uninstallSkill, listInstalledSkillsWithScope, promoteSkillToUser, getSkillInfo, getSkillRules, skillExists, } from './lib/skills.js';
+import { discoverCommands, resolveCommandSource, installCommand, uninstallCommand, listInstalledCommandsWithScope, promoteCommandToUser, commandExists, commandContentMatches, } from './lib/commands.js';
+import { discoverHooksFromRepo, installHooks, listInstalledHooksWithScope, promoteHookToUser, removeHook, hookExists, hookContentMatches, getSourceHookEntry, } from './lib/hooks.js';
+import { discoverSkillsFromRepo, installSkill, uninstallSkill, listInstalledSkillsWithScope, promoteSkillToUser, getSkillInfo, getSkillRules, skillExists, skillContentMatches, } from './lib/skills.js';
 import { DEFAULT_REGISTRIES } from './lib/types.js';
 import { search as searchRegistries, getRegistries, setRegistry, removeRegistry, resolvePackage, } from './lib/registry.js';
 const program = new Command();
@@ -95,10 +95,12 @@ async function checkForUpdates() {
             });
             if (answer === 'now') {
                 // Run upgrade
-                const { execSync } = await import('child_process');
+                const { exec } = await import('child_process');
+                const { promisify } = await import('util');
+                const execAsync = promisify(exec);
                 const spinner = ora('Upgrading...').start();
                 try {
-                    execSync('npm install -g @swarmify/agents-cli@latest', { stdio: 'pipe' });
+                    await execAsync('npm install -g @swarmify/agents-cli@latest');
                     spinner.succeed(`Upgraded to ${latestVersion}`);
                     await showWhatsNew(VERSION, latestVersion);
                 }
@@ -155,7 +157,7 @@ program
         }
     }
     const cwd = process.cwd();
-    const cliStates = getAllCliStates();
+    const cliStates = await getAllCliStates();
     const agentsToShow = filterAgentId ? [filterAgentId] : ALL_AGENT_IDS;
     const skillAgentsToShow = filterAgentId
         ? SKILLS_CAPABLE_AGENTS.filter((id) => id === filterAgentId)
@@ -172,9 +174,8 @@ program
         agent: AGENTS[agentId],
         skills: listInstalledSkillsWithScope(agentId, cwd),
     }));
-    const mcpsData = mcpAgentsToShow
-        .filter((agentId) => isCliInstalled(agentId))
-        .map((agentId) => ({
+    const installedMcpAgents = mcpAgentsToShow.filter((agentId) => cliStates[agentId]?.installed);
+    const mcpsData = installedMcpAgents.map((agentId) => ({
         agent: AGENTS[agentId],
         mcps: listInstalledMcpsWithScope(agentId, cwd),
     }));
@@ -364,6 +365,7 @@ program
         const allSkills = discoverSkillsFromRepo(localPath);
         const discoveredHooks = discoverHooksFromRepo(localPath);
         // Determine which agents to sync
+        const cliStates = await getAllCliStates();
         let selectedAgents;
         if (agentFilter) {
             // Single agent filter
@@ -374,7 +376,7 @@ program
             selectedAgents = (manifest?.defaults?.agents || ['claude', 'codex', 'gemini']);
         }
         else {
-            const installedAgents = ALL_AGENT_IDS.filter((id) => isCliInstalled(id) || id === 'cursor');
+            const installedAgents = ALL_AGENT_IDS.filter((id) => cliStates[id]?.installed || id === 'cursor');
             selectedAgents = await checkbox({
                 message: 'Select agents to sync:',
                 choices: installedAgents.map((id) => ({
@@ -385,7 +387,7 @@ program
             });
         }
         // Filter agents to only installed ones (plus cursor which doesn't need CLI)
-        selectedAgents = selectedAgents.filter((id) => isCliInstalled(id) || id === 'cursor');
+        selectedAgents = selectedAgents.filter((id) => cliStates[id]?.installed || id === 'cursor');
         if (selectedAgents.length === 0) {
             console.log(chalk.yellow('\nNo agents selected or installed. Nothing to sync.'));
             return;
@@ -393,6 +395,7 @@ program
         // Build resource items with conflict detection
         const newItems = [];
         const existingItems = [];
+        const upToDateItems = [];
         // Process commands
         for (const command of allCommands) {
             const applicableAgents = selectedAgents.filter((agentId) => {
@@ -401,29 +404,55 @@ program
             });
             if (applicableAgents.length === 0)
                 continue;
-            const conflictingAgents = applicableAgents.filter((agentId) => commandExists(agentId, command.name));
             const newAgents = applicableAgents.filter((agentId) => !commandExists(agentId, command.name));
-            if (conflictingAgents.length > 0) {
-                existingItems.push({ type: 'command', name: command.name, agents: conflictingAgents, isNew: false });
-            }
+            const upToDateAgents = applicableAgents.filter((agentId) => {
+                if (!commandExists(agentId, command.name))
+                    return false;
+                const sourcePath = resolveCommandSource(localPath, command.name, agentId);
+                return sourcePath && commandContentMatches(agentId, command.name, sourcePath);
+            });
+            const conflictingAgents = applicableAgents.filter((agentId) => {
+                if (!commandExists(agentId, command.name))
+                    return false;
+                const sourcePath = resolveCommandSource(localPath, command.name, agentId);
+                return sourcePath && !commandContentMatches(agentId, command.name, sourcePath);
+            });
             if (newAgents.length > 0) {
                 newItems.push({ type: 'command', name: command.name, agents: newAgents, isNew: true });
             }
+            if (upToDateAgents.length > 0) {
+                upToDateItems.push({ type: 'command', name: command.name, agents: upToDateAgents, isNew: false });
+            }
+            if (conflictingAgents.length > 0) {
+                existingItems.push({ type: 'command', name: command.name, agents: conflictingAgents, isNew: false });
+            }
         }
         // Process skills
         const skillAgents = SKILLS_CAPABLE_AGENTS.filter((id) => selectedAgents.includes(id));
         for (const skill of allSkills) {
-            const conflictingAgents = skillAgents.filter((agentId) => skillExists(agentId, skill.name));
             const newAgents = skillAgents.filter((agentId) => !skillExists(agentId, skill.name));
-            if (conflictingAgents.length > 0) {
-                existingItems.push({ type: 'skill', name: skill.name, agents: conflictingAgents, isNew: false });
-            }
+            const upToDateAgents = skillAgents.filter((agentId) => {
+                if (!skillExists(agentId, skill.name))
+                    return false;
+                return skillContentMatches(agentId, skill.name, skill.path);
+            });
+            const conflictingAgents = skillAgents.filter((agentId) => {
+                if (!skillExists(agentId, skill.name))
+                    return false;
+                return !skillContentMatches(agentId, skill.name, skill.path);
+            });
             if (newAgents.length > 0) {
                 newItems.push({ type: 'skill', name: skill.name, agents: newAgents, isNew: true });
             }
+            if (upToDateAgents.length > 0) {
+                upToDateItems.push({ type: 'skill', name: skill.name, agents: upToDateAgents, isNew: false });
+            }
+            if (conflictingAgents.length > 0) {
+                existingItems.push({ type: 'skill', name: skill.name, agents: conflictingAgents, isNew: false });
+            }
         }
         // Process hooks
-        const hookAgents = selectedAgents.filter((id) => HOOKS_CAPABLE_AGENTS.includes(id) && isCliInstalled(id));
+        const hookAgents = selectedAgents.filter((id) => HOOKS_CAPABLE_AGENTS.includes(id) && cliStates[id]?.installed);
         const allHookNames = [
             ...discoveredHooks.shared,
             ...Object.entries(discoveredHooks.agentSpecific)
@@ -432,25 +461,43 @@ program
         ];
         const uniqueHookNames = [...new Set(allHookNames)];
         for (const hookName of uniqueHookNames) {
-            const conflictingAgents = hookAgents.filter((agentId) => hookExists(agentId, hookName));
             const newAgents = hookAgents.filter((agentId) => !hookExists(agentId, hookName));
-            if (conflictingAgents.length > 0) {
-                existingItems.push({ type: 'hook', name: hookName, agents: conflictingAgents, isNew: false });
-            }
+            const upToDateAgents = hookAgents.filter((agentId) => {
+                if (!hookExists(agentId, hookName))
+                    return false;
+                const sourceEntry = getSourceHookEntry(localPath, agentId, hookName);
+                return sourceEntry && hookContentMatches(agentId, hookName, sourceEntry);
+            });
+            const conflictingAgents = hookAgents.filter((agentId) => {
+                if (!hookExists(agentId, hookName))
+                    return false;
+                const sourceEntry = getSourceHookEntry(localPath, agentId, hookName);
+                return !sourceEntry || !hookContentMatches(agentId, hookName, sourceEntry);
+            });
             if (newAgents.length > 0) {
                 newItems.push({ type: 'hook', name: hookName, agents: newAgents, isNew: true });
             }
+            if (upToDateAgents.length > 0) {
+                upToDateItems.push({ type: 'hook', name: hookName, agents: upToDateAgents, isNew: false });
+            }
+            if (conflictingAgents.length > 0) {
+                existingItems.push({ type: 'hook', name: hookName, agents: conflictingAgents, isNew: false });
+            }
         }
-        // Process MCPs
+        // Process MCPs (no content comparison - just existence check)
         if (!options.skipMcp && manifest?.mcp) {
             for (const [name, config] of Object.entries(manifest.mcp)) {
                 if (config.transport === 'http' || !config.command)
                     continue;
-                const mcpAgents = config.agents.filter((agentId) => selectedAgents.includes(agentId) && isCliInstalled(agentId));
+                const mcpAgents = config.agents.filter((agentId) => selectedAgents.includes(agentId) && cliStates[agentId]?.installed);
                 if (mcpAgents.length === 0)
                     continue;
-                const conflictingAgents = mcpAgents.filter((agentId) => isMcpRegistered(agentId, name));
-                const newAgents = mcpAgents.filter((agentId) => !isMcpRegistered(agentId, name));
+                const registrationChecks = await Promise.all(mcpAgents.map(async (agentId) => ({
+                    agentId,
+                    isRegistered: await isMcpRegistered(agentId, name),
+                })));
+                const conflictingAgents = registrationChecks.filter((r) => r.isRegistered).map((r) => r.agentId);
+                const newAgents = registrationChecks.filter((r) => !r.isRegistered).map((r) => r.agentId);
                 if (conflictingAgents.length > 0) {
                     existingItems.push({ type: 'mcp', name, agents: conflictingAgents, isNew: false });
                 }
@@ -493,6 +540,31 @@ program
             }
             console.log();
         }
+        if (upToDateItems.length > 0) {
+            console.log(chalk.gray('  UP TO DATE (no changes):\n'));
+            const byType = { command: [], skill: [], hook: [], mcp: [] };
+            for (const item of upToDateItems)
+                byType[item.type].push(item);
+            if (byType.command.length > 0) {
+                console.log(`    Commands:`);
+                for (const item of byType.command) {
+                    console.log(`      ${chalk.dim(item.name.padEnd(20))} ${chalk.dim(formatAgentList(item.agents))}`);
+                }
+            }
+            if (byType.skill.length > 0) {
+                console.log(`    Skills:`);
+                for (const item of byType.skill) {
+                    console.log(`      ${chalk.dim(item.name.padEnd(20))} ${chalk.dim(formatAgentList(item.agents))}`);
+                }
+            }
+            if (byType.hook.length > 0) {
+                console.log(`    Hooks:`);
+                for (const item of byType.hook) {
+                    console.log(`      ${chalk.dim(item.name.padEnd(20))} ${chalk.dim(formatAgentList(item.agents))}`);
+                }
+            }
+            console.log();
+        }
         if (existingItems.length > 0) {
             console.log(chalk.yellow('  EXISTING (conflicts):\n'));
             const byType = { command: [], skill: [], hook: [], mcp: [] };
@@ -525,7 +597,7 @@ program
             console.log();
         }
         if (newItems.length === 0 && existingItems.length === 0) {
-            console.log(chalk.gray('  Nothing to sync.\n'));
+            console.log(chalk.gray('  Already up to date.\n'));
             return;
         }
         if (options.dryRun) {
@@ -670,9 +742,9 @@ program
                     continue;
                 for (const agentId of item.agents) {
                     if (!item.isNew) {
-                        unregisterMcp(agentId, item.name);
+                        await unregisterMcp(agentId, item.name);
                     }
-                    const result = registerMcp(agentId, item.name, config.command, config.scope);
+                    const result = await registerMcp(agentId, item.name, config.command, config.scope);
                     if (result.success)
                         installed.mcps++;
                 }
@@ -698,7 +770,7 @@ program
                 const agent = AGENTS[agentId];
                 if (!agent || !cliConfig.package)
                     continue;
-                const currentVersion = getCliVersion(agentId);
+                const currentVersion = await getCliVersion(agentId);
                 const targetVersion = cliConfig.version;
                 if (currentVersion === targetVersion)
                     continue;
@@ -765,7 +837,7 @@ program
     const localPath = getRepoLocalPath(scope.source);
     const manifest = readManifest(localPath) || createDefaultManifest();
     console.log(chalk.bold('\nExporting local configuration...\n'));
-    const cliStates = getAllCliStates();
+    const cliStates = await getAllCliStates();
     let exported = 0;
     for (const agentId of ALL_AGENT_IDS) {
         const agent = AGENTS[agentId];
@@ -872,10 +944,11 @@ commandsCmd
         const agents = options.agents
             ? options.agents.split(',')
             : ['claude', 'codex', 'gemini'];
+        const cliStates = await getAllCliStates();
         for (const command of commands) {
             console.log(`\n  ${chalk.cyan(command.name)}: ${command.description}`);
             for (const agentId of agents) {
-                if (!isCliInstalled(agentId) && agentId !== 'cursor')
+                if (!cliStates[agentId]?.installed && agentId !== 'cursor')
                     continue;
                 const sourcePath = resolveCommandSource(localPath, command.name, agentId);
                 if (sourcePath) {
@@ -918,14 +991,15 @@ commandsCmd
     .command('push <name>')
     .description('Save project-scoped command to user scope')
     .option('-a, --agents <list>', 'Comma-separated agents to push for')
-    .action((name, options) => {
+    .action(async (name, options) => {
     const cwd = process.cwd();
     const agents = options.agents
         ? options.agents.split(',')
         : ALL_AGENT_IDS;
+    const cliStates = await getAllCliStates();
     let pushed = 0;
     for (const agentId of agents) {
-        if (!isCliInstalled(agentId) && agentId !== 'cursor')
+        if (!cliStates[agentId]?.installed && agentId !== 'cursor')
             continue;
         const result = promoteCommandToUser(agentId, name, cwd);
         if (result.success) {
@@ -1185,11 +1259,12 @@ skillsCmd
                 console.log(`    ${chalk.gray(`${skill.ruleCount} rules`)}`);
             }
         }
+        const cliStates = await getAllCliStates();
         const agents = options.agents
             ? options.agents.split(',')
             : await checkbox({
                 message: 'Select agents to install skills to:',
-                choices: SKILLS_CAPABLE_AGENTS.filter((id) => isCliInstalled(id) || id === 'cursor').map((id) => ({
+                choices: SKILLS_CAPABLE_AGENTS.filter((id) => cliStates[id]?.installed || id === 'cursor').map((id) => ({
                     name: AGENTS[id].name,
                     value: id,
                     checked: ['claude', 'codex', 'gemini'].includes(id),
@@ -1368,12 +1443,14 @@ mcpCmd
     const agents = options.agent
         ? [options.agent]
         : MCP_CAPABLE_AGENTS;
+    // Collect all data while spinner is active
+    const cliStates = await getAllCliStates();
     const agentMcps = agents.map((agentId) => {
         const agent = AGENTS[agentId];
         if (!agent.capabilities.mcp) {
             return { agent, mcps: null };
         }
-        if (!isCliInstalled(agentId)) {
+        if (!cliStates[agentId]?.installed) {
             return { agent, mcps: null, notInstalled: true };
         }
         return {
@@ -1474,15 +1551,16 @@ mcpCmd
     .command('remove <name>')
     .description('Remove MCP server from agents')
     .option('-a, --agents <list>', 'Comma-separated agents')
-    .action((name, options) => {
+    .action(async (name, options) => {
     const agents = options.agents
         ? options.agents.split(',')
         : MCP_CAPABLE_AGENTS;
+    const cliStates = await getAllCliStates();
     let removed = 0;
     for (const agentId of agents) {
-        if (!isCliInstalled(agentId))
+        if (!cliStates[agentId]?.installed)
             continue;
-        const result = unregisterMcp(agentId, name);
+        const result = await unregisterMcp(agentId, name);
         if (result.success) {
             console.log(`  ${chalk.red('-')} ${AGENTS[agentId].name}`);
             removed++;
@@ -1508,6 +1586,7 @@ mcpCmd
             console.log(chalk.yellow('No MCP servers in manifest'));
             return;
         }
+        const cliStates = await getAllCliStates();
         for (const [mcpName, config] of Object.entries(manifest.mcp)) {
             // Skip HTTP transport MCPs for now (need different registration)
             if (config.transport === 'http' || !config.command) {
@@ -1516,9 +1595,9 @@ mcpCmd
             }
             console.log(`\n  ${chalk.cyan(mcpName)}:`);
             for (const agentId of config.agents) {
-                if (!isCliInstalled(agentId))
+                if (!cliStates[agentId]?.installed)
                     continue;
-                const result = registerMcp(agentId, mcpName, config.command, config.scope);
+                const result = await registerMcp(agentId, mcpName, config.command, config.scope);
                 if (result.success) {
                     console.log(`    ${chalk.green('+')} ${AGENTS[agentId].name}`);
                 }
@@ -1535,16 +1614,17 @@ mcpCmd
     .command('push <name>')
     .description('Save project-scoped MCP to user scope')
     .option('-a, --agents <list>', 'Comma-separated agents to push for')
-    .action((name, options) => {
+    .action(async (name, options) => {
     const cwd = process.cwd();
     const agents = options.agents
         ? options.agents.split(',')
         : MCP_CAPABLE_AGENTS;
+    const cliStates = await getAllCliStates();
     let pushed = 0;
     for (const agentId of agents) {
-        if (!isCliInstalled(agentId))
+        if (!cliStates[agentId]?.installed)
             continue;
-        const result = promoteMcpToUser(agentId, name, cwd);
+        const result = await promoteMcpToUser(agentId, name, cwd);
         if (result.success) {
             console.log(`  ${chalk.green('+')} ${AGENTS[agentId].name}`);
             pushed++;
@@ -1571,7 +1651,7 @@ cliCmd
     .description('List installed agent CLIs')
     .action(async () => {
     const spinner = ora('Checking installed CLIs...').start();
-    const states = getAllCliStates();
+    const states = await getAllCliStates();
     spinner.stop();
     console.log(chalk.bold('Agent CLIs\n'));
     for (const agentId of ALL_AGENT_IDS) {
@@ -1589,93 +1669,124 @@ cliCmd
     }
 });
 cliCmd
-    .command('add <agent>')
-    .description('Install agent CLI and add to manifest')
+    .command('add <agents...>')
+    .description('Install agent CLI(s)')
     .option('-v, --version <version>', 'Version to install', 'latest')
     .option('--manifest-only', 'Only add to manifest, do not install')
-    .action(async (agent, options) => {
-    const agentId = agent.toLowerCase();
-    if (!AGENTS[agentId]) {
-        console.log(chalk.red(`Unknown agent: ${agent}`));
-        console.log(chalk.gray(`Available: ${ALL_AGENT_IDS.join(', ')}`));
-        return;
+    .action(async (agents, options) => {
+    const validAgents = [];
+    for (const agent of agents) {
+        const agentId = agent.toLowerCase();
+        if (!AGENTS[agentId]) {
+            console.log(chalk.red(`Unknown agent: ${agent}`));
+            console.log(chalk.gray(`Available: ${ALL_AGENT_IDS.join(', ')}`));
+            return;
+        }
+        validAgents.push(agentId);
     }
-    const agentConfig = AGENTS[agentId];
-    const pkg = agentConfig.npmPackage;
+    const { exec } = await import('child_process');
+    const { promisify } = await import('util');
+    const execAsync = promisify(exec);
     const version = options.version;
-    // Install the CLI
-    if (!options.manifestOnly) {
-        if (!pkg) {
-            console.log(chalk.yellow(`${agentConfig.name} has no npm package. Install manually.`));
-        }
-        else {
-            const { execSync } = await import('child_process');
-            const spinner = ora(`Installing ${agentConfig.name}@${version}...`).start();
-            try {
-                execSync(`npm install -g ${pkg}@${version}`, { stdio: 'pipe' });
-                spinner.succeed(`Installed ${agentConfig.name}@${version}`);
+    for (const agentId of validAgents) {
+        const agentConfig = AGENTS[agentId];
+        const pkg = agentConfig.npmPackage;
+        if (!options.manifestOnly) {
+            if (!pkg) {
+                console.log(chalk.yellow(`${agentConfig.name} has no npm package. Install manually.`));
             }
-            catch (err) {
-                spinner.fail(`Failed to install ${agentConfig.name}`);
-                console.error(chalk.gray(err.message));
-                return;
+            else {
+                const spinner = ora(`Installing ${agentConfig.name}@${version}...`).start();
+                try {
+                    await execAsync(`npm install -g ${pkg}@${version}`);
+                    spinner.succeed(`Installed ${agentConfig.name}@${version}`);
+                }
+                catch (err) {
+                    spinner.fail(`Failed to install ${agentConfig.name}`);
+                    console.error(chalk.gray(err.message));
+                    continue;
+                }
             }
         }
     }
-    // Add to manifest
     const source = await ensureSource();
     const localPath = getRepoLocalPath(source);
     const manifest = readManifest(localPath) || createDefaultManifest();
     manifest.clis = manifest.clis || {};
-    manifest.clis[agentId] = {
-        package: pkg,
-        version: version,
-    };
+    for (const agentId of validAgents) {
+        const agentConfig = AGENTS[agentId];
+        manifest.clis[agentId] = {
+            package: agentConfig.npmPackage,
+            version: version,
+        };
+    }
     writeManifest(localPath, manifest);
-    console.log(chalk.green(`Added ${agentConfig.name} to manifest`));
+    if (validAgents.length === 1) {
+        console.log(chalk.green(`Added ${AGENTS[validAgents[0]].name} to manifest`));
+    }
+    else {
+        console.log(chalk.green(`Added ${validAgents.length} agents to manifest`));
+    }
 });
 cliCmd
-    .command('remove <agent>')
-    .description('Uninstall agent CLI and remove from manifest')
+    .command('remove <agents...>')
+    .description('Uninstall agent CLI(s)')
     .option('--manifest-only', 'Only remove from manifest, do not uninstall')
-    .action(async (agent, options) => {
-    const agentId = agent.toLowerCase();
-    if (!AGENTS[agentId]) {
-        console.log(chalk.red(`Unknown agent: ${agent}`));
-        console.log(chalk.gray(`Available: ${ALL_AGENT_IDS.join(', ')}`));
-        return;
-    }
-    const agentConfig = AGENTS[agentId];
-    const pkg = agentConfig.npmPackage;
-    // Uninstall the CLI
-    if (!options.manifestOnly) {
-        if (!pkg) {
-            console.log(chalk.yellow(`${agentConfig.name} has no npm package.`));
-        }
-        else if (!isCliInstalled(agentId)) {
-            console.log(chalk.gray(`${agentConfig.name} is not installed`));
+    .action(async (agents, options) => {
+    const validAgents = [];
+    for (const agent of agents) {
+        const agentId = agent.toLowerCase();
+        if (!AGENTS[agentId]) {
+            console.log(chalk.red(`Unknown agent: ${agent}`));
+            console.log(chalk.gray(`Available: ${ALL_AGENT_IDS.join(', ')}`));
+            return;
         }
-        else {
-            const { execSync } = await import('child_process');
-            const spinner = ora(`Uninstalling ${agentConfig.name}...`).start();
-            try {
-                execSync(`npm uninstall -g ${pkg}`, { stdio: 'pipe' });
-                spinner.succeed(`Uninstalled ${agentConfig.name}`);
+        validAgents.push(agentId);
+    }
+    const { exec } = await import('child_process');
+    const { promisify } = await import('util');
+    const execAsync = promisify(exec);
+    for (const agentId of validAgents) {
+        const agentConfig = AGENTS[agentId];
+        const pkg = agentConfig.npmPackage;
+        if (!options.manifestOnly) {
+            if (!pkg) {
+                console.log(chalk.yellow(`${agentConfig.name} has no npm package.`));
             }
-            catch (err) {
-                spinner.fail(`Failed to uninstall ${agentConfig.name}`);
-                console.error(chalk.gray(err.message));
+            else if (!(await isCliInstalled(agentId))) {
+                console.log(chalk.gray(`${agentConfig.name} is not installed`));
+            }
+            else {
+                const spinner = ora(`Uninstalling ${agentConfig.name}...`).start();
+                try {
+                    await execAsync(`npm uninstall -g ${pkg}`);
+                    spinner.succeed(`Uninstalled ${agentConfig.name}`);
+                }
+                catch (err) {
+                    spinner.fail(`Failed to uninstall ${agentConfig.name}`);
+                    console.error(chalk.gray(err.message));
+                }
             }
         }
     }
-    // Remove from manifest
     const source = await ensureSource();
     const localPath = getRepoLocalPath(source);
     const manifest = readManifest(localPath);
-    if (manifest?.clis?.[agentId]) {
-        delete manifest.clis[agentId];
+    let removed = 0;
+    for (const agentId of validAgents) {
+        if (manifest?.clis?.[agentId]) {
+            delete manifest.clis[agentId];
+            removed++;
+        }
+    }
+    if (removed > 0 && manifest) {
         writeManifest(localPath, manifest);
-        console.log(chalk.green(`Removed ${agentConfig.name} from manifest`));
+        if (removed === 1) {
+            console.log(chalk.green(`Removed ${AGENTS[validAgents[0]].name} from manifest`));
+        }
+        else {
+            console.log(chalk.green(`Removed ${removed} agents from manifest`));
+        }
     }
 });
 cliCmd
@@ -1695,7 +1806,9 @@ cliCmd
         console.log(chalk.yellow('No CLIs to upgrade. Add CLIs to manifest or use --latest'));
         return;
     }
-    const { execSync } = await import('child_process');
+    const { exec } = await import('child_process');
+    const { promisify } = await import('util');
+    const execAsync = promisify(exec);
     for (const agentId of agentsToUpgrade) {
         const agentConfig = AGENTS[agentId];
         if (!agentConfig) {
@@ -1707,7 +1820,7 @@ cliCmd
         const pkg = cliConfig?.package || agentConfig.npmPackage;
         const spinner = ora(`Upgrading ${agentConfig.name} to ${version}...`).start();
         try {
-            execSync(`npm install -g ${pkg}@${version}`, { stdio: 'pipe' });
+            await execAsync(`npm install -g ${pkg}@${version}`);
             spinner.succeed(`${agentConfig.name} upgraded to ${version}`);
         }
         catch (err) {
@@ -2122,18 +2235,19 @@ program
             else {
                 command = pkg.name || pkg.registry_name;
             }
+            const cliStates = await getAllCliStates();
             const agents = options.agents
                 ? options.agents.split(',')
-                : MCP_CAPABLE_AGENTS.filter((id) => isCliInstalled(id));
+                : MCP_CAPABLE_AGENTS.filter((id) => cliStates[id]?.installed);
             if (agents.length === 0) {
                 console.log(chalk.yellow('\nNo MCP-capable agents installed.'));
                 process.exit(1);
             }
             console.log(chalk.bold('\nInstalling to agents...'));
             for (const agentId of agents) {
-                if (!isCliInstalled(agentId))
+                if (!cliStates[agentId]?.installed)
                     continue;
-                const result = registerMcp(agentId, entry.name, command, 'user');
+                const result = await registerMcp(agentId, entry.name, command, 'user');
                 if (result.success) {
                     console.log(`  ${chalk.green('+')} ${AGENTS[agentId].name}`);
                 }
@@ -2168,13 +2282,14 @@ program
             const agents = options.agents
                 ? options.agents.split(',')
                 : ['claude', 'codex', 'gemini'];
+            const gitCliStates = await getAllCliStates();
             // Install commands
             if (hasCommands) {
                 console.log(chalk.bold('\nInstalling commands...'));
                 let installed = 0;
                 for (const command of commands) {
                     for (const agentId of agents) {
-                        if (!isCliInstalled(agentId) && agentId !== 'cursor')
+                        if (!gitCliStates[agentId]?.installed && agentId !== 'cursor')
                             continue;
                         const sourcePath = resolveCommandSource(localPath, command.name, agentId);
                         if (sourcePath) {
@@ -2236,7 +2351,9 @@ program
         }
         spinner.text = `Upgrading to ${latestVersion}...`;
         // Detect package manager
-        const { execSync } = await import('child_process');
+        const { execSync, exec } = await import('child_process');
+        const { promisify } = await import('util');
+        const execAsync = promisify(exec);
         let cmd;
         // Check if installed globally via npm, bun, or other
         try {
@@ -2263,8 +2380,8 @@ program
                 cmd = 'npm install -g @swarmify/agents-cli@latest';
             }
         }
-        // Run silently (suppress npm/bun output)
-        execSync(cmd, { stdio: 'pipe' });
+        // Run silently (suppress npm/bun output) - use async to allow spinner to animate
+        await execAsync(cmd);
         spinner.succeed(`Upgraded to ${latestVersion}`);
         // Show what's new from changelog
         await showWhatsNew(currentVersion, latestVersion);