@swarmify/agents-cli 1.5.6 → 1.5.8

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);
                 }
@@ -133,14 +135,11 @@ program.hook('preAction', async () => {
 program
     .command('status [agent]')
     .description('Show sync status, CLI versions, installed commands and MCP servers')
-    .action((agentFilter) => {
-    const state = readState();
-    const cliStates = getAllCliStates();
-    const cwd = process.cwd();
+    .action(async (agentFilter) => {
+    const spinner = ora({ text: 'Loading...', isSilent: !process.stdout.isTTY }).start();
     // Resolve agent filter to AgentId
     let filterAgentId;
     if (agentFilter) {
-        // Map common names to AgentId
         const agentMap = {
             claude: 'claude',
             'claude-code': 'claude',
@@ -151,11 +150,14 @@ program
         };
         filterAgentId = agentMap[agentFilter.toLowerCase()];
         if (!filterAgentId) {
+            spinner.stop();
             console.log(chalk.red(`Unknown agent: ${agentFilter}`));
             console.log(chalk.gray(`Valid agents: claude, codex, gemini, cursor, opencode`));
             process.exit(1);
         }
     }
+    const cwd = process.cwd();
+    const cliStates = await getAllCliStates();
     const agentsToShow = filterAgentId ? [filterAgentId] : ALL_AGENT_IDS;
     const skillAgentsToShow = filterAgentId
         ? SKILLS_CAPABLE_AGENTS.filter((id) => id === filterAgentId)
@@ -163,6 +165,22 @@ program
     const mcpAgentsToShow = filterAgentId
         ? MCP_CAPABLE_AGENTS.filter((id) => id === filterAgentId)
         : MCP_CAPABLE_AGENTS;
+    // Collect all data while spinner is active
+    const commandsData = agentsToShow.map((agentId) => ({
+        agent: AGENTS[agentId],
+        commands: listInstalledCommandsWithScope(agentId, cwd),
+    }));
+    const skillsData = skillAgentsToShow.map((agentId) => ({
+        agent: AGENTS[agentId],
+        skills: listInstalledSkillsWithScope(agentId, cwd),
+    }));
+    const installedMcpAgents = mcpAgentsToShow.filter((agentId) => cliStates[agentId]?.installed);
+    const mcpsData = installedMcpAgents.map((agentId) => ({
+        agent: AGENTS[agentId],
+        mcps: listInstalledMcpsWithScope(agentId, cwd),
+    }));
+    const scopes = filterAgentId ? [] : getScopesByPriority();
+    spinner.stop();
     // Helper to format MCP with version
     const formatMcp = (m, color) => {
         return m.version ? color(`${m.name}@${m.version}`) : color(m.name);
@@ -177,9 +195,7 @@ program
         console.log(`  ${agent.name.padEnd(14)} ${status}`);
     }
     console.log(chalk.bold('\nInstalled Commands\n'));
-    for (const agentId of agentsToShow) {
-        const agent = AGENTS[agentId];
-        const commands = listInstalledCommandsWithScope(agentId, cwd);
+    for (const { agent, commands } of commandsData) {
         const userCommands = commands.filter((c) => c.scope === 'user');
         const projectCommands = commands.filter((c) => c.scope === 'project');
         if (commands.length === 0) {
@@ -195,11 +211,9 @@ program
             }
         }
     }
-    if (skillAgentsToShow.length > 0) {
+    if (skillsData.length > 0) {
         console.log(chalk.bold('\nInstalled Skills\n'));
-        for (const agentId of skillAgentsToShow) {
-            const agent = AGENTS[agentId];
-            const skills = listInstalledSkillsWithScope(agentId, cwd);
+        for (const { agent, skills } of skillsData) {
             const userSkills = skills.filter((s) => s.scope === 'user');
             const projectSkills = skills.filter((s) => s.scope === 'project');
             if (skills.length === 0) {
@@ -216,13 +230,9 @@ program
             }
         }
     }
-    if (mcpAgentsToShow.length > 0) {
+    if (mcpsData.length > 0) {
         console.log(chalk.bold('\nInstalled MCP Servers\n'));
-        for (const agentId of mcpAgentsToShow) {
-            const agent = AGENTS[agentId];
-            if (!isCliInstalled(agentId))
-                continue;
-            const mcps = listInstalledMcpsWithScope(agentId, cwd);
+        for (const { agent, mcps } of mcpsData) {
             const userMcps = mcps.filter((m) => m.scope === 'user');
             const projectMcps = mcps.filter((m) => m.scope === 'project');
             if (mcps.length === 0) {
@@ -241,7 +251,6 @@ program
     }
     // Only show scopes when not filtering by agent
     if (!filterAgentId) {
-        const scopes = getScopesByPriority();
         if (scopes.length > 0) {
             console.log(chalk.bold('\nConfigured Scopes\n'));
             for (const { name, config } of scopes) {
@@ -258,7 +267,6 @@ program
             console.log(chalk.gray('  Run: agents repo add <source>'));
         }
     }
-    console.log();
 });
 // =============================================================================
 // PULL COMMAND
@@ -357,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
@@ -367,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) => ({
@@ -378,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;
@@ -386,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) => {
@@ -394,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)
@@ -425,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 });
                 }
@@ -486,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: [] };
@@ -518,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) {
@@ -663,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++;
                 }
@@ -691,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;
@@ -758,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];
@@ -813,18 +892,20 @@ commandsCmd
     .description('List installed commands')
     .option('-a, --agent <agent>', 'Filter by agent')
     .option('-s, --scope <scope>', 'Filter by scope: user, project, or all', 'all')
-    .action((options) => {
-    console.log(chalk.bold('Installed Commands\n'));
+    .action(async (options) => {
+    const spinner = ora({ text: 'Loading...', isSilent: !process.stdout.isTTY }).start();
     const cwd = process.cwd();
     const agents = options.agent
         ? [options.agent]
         : ALL_AGENT_IDS;
-    for (const agentId of agents) {
-        const agent = AGENTS[agentId];
-        let commands = listInstalledCommandsWithScope(agentId, cwd);
-        if (options.scope !== 'all') {
-            commands = commands.filter((c) => c.scope === options.scope);
-        }
+    // Collect all data while spinner is active
+    const agentCommands = agents.map((agentId) => ({
+        agent: AGENTS[agentId],
+        commands: listInstalledCommandsWithScope(agentId, cwd).filter((c) => options.scope === 'all' || c.scope === options.scope),
+    }));
+    spinner.stop();
+    console.log(chalk.bold('Installed Commands\n'));
+    for (const { agent, commands } of agentCommands) {
         if (commands.length === 0) {
             console.log(`  ${chalk.bold(agent.name)}: ${chalk.gray('none')}`);
         }
@@ -863,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) {
@@ -909,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) {
@@ -940,23 +1023,27 @@ hooksCmd
     .description('List installed hooks')
     .option('-a, --agent <agent>', 'Filter by agent')
     .option('-s, --scope <scope>', 'Filter by scope: user, project, or all', 'all')
-    .action((options) => {
-    console.log(chalk.bold('Installed Hooks\n'));
+    .action(async (options) => {
+    const spinner = ora({ text: 'Loading...', isSilent: !process.stdout.isTTY }).start();
     const cwd = process.cwd();
     const agents = options.agent
         ? [options.agent]
         : Array.from(HOOKS_CAPABLE_AGENTS);
-    for (const agentId of agents) {
-        const agent = AGENTS[agentId];
-        if (!agent.supportsHooks) {
+    // Collect all data while spinner is active
+    const agentHooks = agents.map((agentId) => ({
+        agent: AGENTS[agentId],
+        hooks: AGENTS[agentId].supportsHooks
+            ? listInstalledHooksWithScope(agentId, cwd).filter((h) => options.scope === 'all' || h.scope === options.scope)
+            : null,
+    }));
+    spinner.stop();
+    console.log(chalk.bold('Installed Hooks\n'));
+    for (const { agent, hooks } of agentHooks) {
+        if (hooks === null) {
             console.log(`  ${chalk.bold(agent.name)}: ${chalk.gray('hooks not supported')}`);
             console.log();
             continue;
         }
-        let hooks = listInstalledHooksWithScope(agentId, cwd);
-        if (options.scope !== 'all') {
-            hooks = hooks.filter((h) => h.scope === options.scope);
-        }
         if (hooks.length === 0) {
             console.log(`  ${chalk.bold(agent.name)}: ${chalk.gray('none')}`);
         }
@@ -1104,23 +1191,27 @@ skillsCmd
     .description('List installed Agent Skills')
     .option('-a, --agent <agent>', 'Filter by agent')
     .option('-s, --scope <scope>', 'Filter by scope: user, project, or all', 'all')
-    .action((options) => {
-    console.log(chalk.bold('Installed Agent Skills\n'));
+    .action(async (options) => {
+    const spinner = ora({ text: 'Loading...', isSilent: !process.stdout.isTTY }).start();
     const cwd = process.cwd();
     const agents = options.agent
         ? [options.agent]
         : SKILLS_CAPABLE_AGENTS;
-    for (const agentId of agents) {
-        const agent = AGENTS[agentId];
-        if (!agent.capabilities.skills) {
+    // Collect all data while spinner is active
+    const agentSkills = agents.map((agentId) => ({
+        agent: AGENTS[agentId],
+        skills: AGENTS[agentId].capabilities.skills
+            ? listInstalledSkillsWithScope(agentId, cwd).filter((s) => options.scope === 'all' || s.scope === options.scope)
+            : null,
+    }));
+    spinner.stop();
+    console.log(chalk.bold('Installed Agent Skills\n'));
+    for (const { agent, skills } of agentSkills) {
+        if (skills === null) {
             console.log(`  ${chalk.bold(agent.name)}: ${chalk.gray('skills not supported')}`);
             console.log();
             continue;
         }
-        let skills = listInstalledSkillsWithScope(agentId, cwd);
-        if (options.scope !== 'all') {
-            skills = skills.filter((s) => s.scope === options.scope);
-        }
         if (skills.length === 0) {
             console.log(`  ${chalk.bold(agent.name)}: ${chalk.gray('none')}`);
         }
@@ -1168,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),
@@ -1345,26 +1437,38 @@ mcpCmd
     .description('List MCP servers and registration status')
     .option('-a, --agent <agent>', 'Filter by agent')
     .option('-s, --scope <scope>', 'Filter by scope: user, project, or all', 'all')
-    .action((options) => {
-    console.log(chalk.bold('MCP Servers\n'));
+    .action(async (options) => {
+    const spinner = ora({ text: 'Loading...', isSilent: !process.stdout.isTTY }).start();
     const cwd = process.cwd();
     const agents = options.agent
         ? [options.agent]
         : MCP_CAPABLE_AGENTS;
-    for (const agentId of 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) {
-            console.log(`  ${chalk.bold(agent.name)}: ${chalk.gray('mcp not supported')}`);
-            console.log();
-            continue;
+            return { agent, mcps: null };
+        }
+        if (!cliStates[agentId]?.installed) {
+            return { agent, mcps: null, notInstalled: true };
         }
-        if (!isCliInstalled(agentId)) {
+        return {
+            agent,
+            mcps: listInstalledMcpsWithScope(agentId, cwd).filter((m) => options.scope === 'all' || m.scope === options.scope),
+        };
+    });
+    spinner.stop();
+    console.log(chalk.bold('MCP Servers\n'));
+    for (const { agent, mcps, notInstalled } of agentMcps) {
+        if (mcps === null && notInstalled) {
             console.log(`  ${chalk.bold(agent.name)}: ${chalk.gray('CLI not installed')}`);
             continue;
         }
-        let mcps = listInstalledMcpsWithScope(agentId, cwd);
-        if (options.scope !== 'all') {
-            mcps = mcps.filter((m) => m.scope === options.scope);
+        if (mcps === null) {
+            console.log(`  ${chalk.bold(agent.name)}: ${chalk.gray('mcp not supported')}`);
+            console.log();
+            continue;
         }
         if (mcps.length === 0) {
             console.log(`  ${chalk.bold(agent.name)}: ${chalk.gray('none')}`);
@@ -1447,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++;
@@ -1481,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) {
@@ -1489,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}`);
                 }
@@ -1508,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++;
@@ -1544,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) {
@@ -1560,7 +1667,6 @@ cliCmd
             console.log(`  ${agent.name.padEnd(14)} ${chalk.gray('not installed')}`);
         }
     }
-    console.log();
 });
 cliCmd
     .command('add <agent>')
@@ -1583,10 +1689,12 @@ cliCmd
             console.log(chalk.yellow(`${agentConfig.name} has no npm package. Install manually.`));
         }
         else {
-            const { execSync } = await import('child_process');
+            const { exec } = await import('child_process');
+            const { promisify } = await import('util');
+            const execAsync = promisify(exec);
             const spinner = ora(`Installing ${agentConfig.name}@${version}...`).start();
             try {
-                execSync(`npm install -g ${pkg}@${version}`, { stdio: 'pipe' });
+                await execAsync(`npm install -g ${pkg}@${version}`);
                 spinner.succeed(`Installed ${agentConfig.name}@${version}`);
             }
             catch (err) {
@@ -1626,14 +1734,16 @@ cliCmd
         if (!pkg) {
             console.log(chalk.yellow(`${agentConfig.name} has no npm package.`));
         }
-        else if (!isCliInstalled(agentId)) {
+        else if (!(await isCliInstalled(agentId))) {
             console.log(chalk.gray(`${agentConfig.name} is not installed`));
         }
         else {
-            const { execSync } = await import('child_process');
+            const { exec } = await import('child_process');
+            const { promisify } = await import('util');
+            const execAsync = promisify(exec);
             const spinner = ora(`Uninstalling ${agentConfig.name}...`).start();
             try {
-                execSync(`npm uninstall -g ${pkg}`, { stdio: 'pipe' });
+                await execAsync(`npm uninstall -g ${pkg}`);
                 spinner.succeed(`Uninstalled ${agentConfig.name}`);
             }
             catch (err) {
@@ -1669,7 +1779,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) {
@@ -1681,7 +1793,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) {
@@ -2096,18 +2208,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}`);
                 }
@@ -2142,13 +2255,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) {
@@ -2210,7 +2324,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 {
@@ -2237,8 +2353,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);