@swarmify/agents-cli 1.5.21 → 1.5.23

package/dist/index.js

@@ -18,8 +18,8 @@ function isPromptCancelled(err) {
 }
 import { AGENTS, ALL_AGENT_IDS, MCP_CAPABLE_AGENTS, SKILLS_CAPABLE_AGENTS, HOOKS_CAPABLE_AGENTS, getAllCliStates, getCliVersion, isMcpRegistered, registerMcp, unregisterMcp, listInstalledMcpsWithScope, promoteMcpToUser, } from './lib/agents.js';
 import { readManifest, writeManifest, createDefaultManifest, MANIFEST_FILENAME, } from './lib/manifest.js';
-import { readState, getRepoLocalPath, getScope, setScope, removeScope, getScopesByPriority, getScopePriority, } from './lib/state.js';
-import { SCOPE_PRIORITIES, DEFAULT_SYSTEM_REPO } from './lib/types.js';
+import { readMeta, getRepoLocalPath, getRepo, setRepo, removeRepo, getReposByPriority, getRepoPriority, } from './lib/state.js';
+import { REPO_PRIORITIES, DEFAULT_SYSTEM_REPO } from './lib/types.js';
 import { cloneRepo, parseSource, getGitHubUsername, getRemoteUrl, setRemoteUrl, checkGitHubRepoExists, commitAndPush, hasUncommittedChanges, } from './lib/git.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';
@@ -31,48 +31,47 @@ import { parseAgentSpec, installVersion, removeVersion, removeAllVersions, listI
 import { createShim, removeShim, shimExists, isShimsInPath, getPathSetupInstructions, getShimsDir, } from './lib/shims.js';
 const program = new Command();
 /**
- * Ensure at least one scope is configured.
- * If not, automatically initialize the system scope from DEFAULT_SYSTEM_REPO.
- * Returns the highest priority scope's source.
+ * Ensure at least one repo is configured.
+ * If not, automatically initialize the system repo from DEFAULT_SYSTEM_REPO.
+ * Returns the highest priority repo's source.
  */
-async function ensureSource(scopeName) {
-    const meta = readState();
-    // If specific scope requested, check if it exists
-    if (scopeName) {
-        const scope = meta.scopes[scopeName];
-        if (scope?.source) {
-            return scope.source;
-        }
-        throw new Error(`Scope '${scopeName}' not configured. Run: agents repo add <source> --scope ${scopeName}`);
-    }
-    // Check if any scope is configured
-    const scopes = getScopesByPriority();
-    if (scopes.length > 0) {
-        // Return highest priority scope's source
-        return scopes[scopes.length - 1].config.source;
-    }
-    // No scopes configured - initialize system scope
-    console.log(chalk.gray(`No repo configured. Initializing system scope from ${DEFAULT_SYSTEM_REPO}...`));
+async function ensureSource(repoName) {
+    const meta = readMeta();
+    // If specific repo requested, check if it exists
+    if (repoName) {
+        const repo = meta.repos[repoName];
+        if (repo?.source) {
+            return repo.source;
+        }
+        throw new Error(`Repo '${repoName}' not configured. Run: agents repo add <source> --name ${repoName}`);
+    }
+    // Check if any repo is configured
+    const repos = getReposByPriority();
+    if (repos.length > 0) {
+        return repos[repos.length - 1].config.source;
+    }
+    // No repos configured - initialize system repo
+    console.log(chalk.gray(`No repo configured. Initializing from ${DEFAULT_SYSTEM_REPO}...`));
     const parsed = parseSource(DEFAULT_SYSTEM_REPO);
     const { commit } = await cloneRepo(DEFAULT_SYSTEM_REPO);
-    setScope('system', {
+    setRepo('system', {
         source: DEFAULT_SYSTEM_REPO,
         branch: parsed.ref || 'main',
         commit,
         lastSync: new Date().toISOString(),
-        priority: SCOPE_PRIORITIES.system,
+        priority: REPO_PRIORITIES.system,
         readonly: true,
     });
     return DEFAULT_SYSTEM_REPO;
 }
 /**
- * Get repo local path for a scope.
+ * Get local path for a named repo.
  */
-function getScopeLocalPath(scopeName) {
-    const scope = getScope(scopeName);
-    if (!scope)
+function getRepoPath(repoName) {
+    const repo = getRepo(repoName);
+    if (!repo)
         return null;
-    return getRepoLocalPath(scope.source);
+    return getRepoLocalPath(repo.source);
 }
 program
     .name('agents')
@@ -104,7 +103,6 @@ Agents
   remove <agent>[@version]        Remove agent CLI
   use <agent>@<version>           Set default version
   list                            List installed versions
-  upgrade [agent]                 Upgrade to latest
 
 Resources
   instructions                    Manage CLAUDE.md, GEMINI.md, etc.
@@ -177,7 +175,7 @@ async function checkForUpdates() {
 // Run update check before command runs
 program.hook('preAction', async () => {
     const args = process.argv.slice(2);
-    const skipCommands = ['upgrade', '--version', '-V', '--help', '-h'];
+    const skipCommands = ['--version', '-V', '--help', '-h'];
     if (args.length === 0 || skipCommands.includes(args[0])) {
         return;
     }
@@ -237,7 +235,7 @@ program
         agent: AGENTS[agentId],
         instructions: listInstalledInstructionsWithScope(agentId, cwd),
     }));
-    const scopes = filterAgentId ? [] : getScopesByPriority();
+    const scopes = filterAgentId ? [] : getReposByPriority();
     spinner.stop();
     // Helper to format MCP with version
     const formatMcp = (m, color) => {
@@ -395,39 +393,39 @@ program
             }
         }
     }
-    const scopeName = options.scope;
-    const meta = readState();
-    const existingScope = meta.scopes[scopeName];
+    const repoName = options.scope;
+    const meta = readMeta();
+    const existingRepo = meta.repos[repoName];
     // Try: 1) provided source, 2) existing scope source, 3) fall back to system scope
-    targetSource = targetSource || existingScope?.source;
-    let effectiveScope = scopeName;
-    if (!targetSource && scopeName === 'user') {
-        const systemScope = meta.scopes['system'];
+    targetSource = targetSource || existingRepo?.source;
+    let effectiveRepo = repoName;
+    if (!targetSource && repoName === 'user') {
+        const systemScope = meta.repos['system'];
         if (systemScope?.source) {
             targetSource = systemScope.source;
-            effectiveScope = 'system';
+            effectiveRepo = 'system';
             console.log(chalk.gray(`No user scope configured, using system scope: ${targetSource}\n`));
         }
     }
     if (!targetSource) {
-        if (scopeName === 'user' && Object.keys(meta.scopes).length === 0) {
+        if (repoName === 'user' && Object.keys(meta.repos).length === 0) {
             console.log(chalk.gray(`First run detected. Initializing from ${DEFAULT_SYSTEM_REPO}...\n`));
             targetSource = DEFAULT_SYSTEM_REPO;
-            effectiveScope = 'system';
+            effectiveRepo = 'system';
         }
         else {
-            console.log(chalk.red(`No source specified for scope '${scopeName}'.`));
-            const scopeHint = scopeName === 'user' ? '' : ` --scope ${scopeName}`;
+            console.log(chalk.red(`No source specified for scope '${repoName}'.`));
+            const scopeHint = repoName === 'user' ? '' : ` --scope ${repoName}`;
             console.log(chalk.gray(`  Usage: agents pull <source>${scopeHint}`));
             console.log(chalk.gray('  Example: agents pull gh:username/.agents'));
             process.exit(1);
         }
     }
-    const targetScopeConfig = meta.scopes[effectiveScope];
-    const isReadonly = targetScopeConfig?.readonly || effectiveScope === 'system';
-    const isUserScope = effectiveScope === 'user';
+    const targetRepoConfig = meta.repos[effectiveRepo];
+    const isReadonly = targetRepoConfig?.readonly || effectiveRepo === 'system';
+    const isUserScope = effectiveRepo === 'user';
     const parsed = parseSource(targetSource);
-    const spinner = ora(`Syncing from ${effectiveScope} scope...`).start();
+    const spinner = ora(`Syncing from ${effectiveRepo} scope...`).start();
     try {
         const { localPath, commit, isNew } = await cloneRepo(targetSource);
         spinner.succeed(isNew ? 'Repository cloned' : 'Repository updated');
@@ -1034,18 +1032,17 @@ program
             }
         }
         // Sync CLI versions (user scope only)
-        if (isUserScope && !options.skipClis && manifest?.clis) {
+        if (isUserScope && !options.skipClis && manifest?.agents) {
             const cliSpinner = ora('Checking CLI versions...').start();
             const cliUpdates = [];
-            for (const [agentIdStr, cliConfig] of Object.entries(manifest.clis)) {
+            for (const [agentIdStr, targetVersion] of Object.entries(manifest.agents)) {
                 const agentId = agentIdStr;
                 if (agentFilter && agentId !== agentFilter)
                     continue;
                 const agent = AGENTS[agentId];
-                if (!agent || !cliConfig.package)
+                if (!agent || !targetVersion)
                     continue;
                 const currentVersion = await getCliVersion(agentId);
-                const targetVersion = cliConfig.version;
                 if (currentVersion === targetVersion)
                     continue;
                 if (targetVersion === 'latest' && currentVersion)
@@ -1054,7 +1051,7 @@ program
             }
             if (cliUpdates.length > 0) {
                 cliSpinner.info('CLI version differences detected');
-                console.log(chalk.gray('  Run `agents cli upgrade` to update CLIs'));
+                console.log(chalk.gray('  Run `agents add <agent>@latest` to update'));
                 for (const update of cliUpdates) {
                     console.log(chalk.gray(`    ${update}`));
                 }
@@ -1065,8 +1062,8 @@ program
         }
         // Update scope config
         if (!isReadonly) {
-            const priority = getScopePriority(effectiveScope);
-            setScope(effectiveScope, {
+            const priority = getRepoPriority(effectiveRepo);
+            setRepo(effectiveRepo, {
                 source: targetSource,
                 branch: parsed.ref || 'main',
                 commit,
@@ -1075,7 +1072,7 @@ program
                 readonly: false,
             });
         }
-        console.log(chalk.green(`\nSync complete from ${effectiveScope} scope`));
+        console.log(chalk.green(`\nSync complete from ${effectiveRepo} scope`));
     }
     catch (err) {
         if (isPromptCancelled(err)) {
@@ -1098,15 +1095,15 @@ program
     .option('-m, --message <msg>', 'Commit message', 'Update agent configuration')
     .action(async (options) => {
     try {
-        const scopeName = options.scope;
-        const scope = getScope(scopeName);
+        const repoName = options.scope;
+        const scope = getRepo(repoName);
         if (!scope) {
-            console.log(chalk.red(`Scope '${scopeName}' not configured.`));
+            console.log(chalk.red(`Scope '${repoName}' not configured.`));
             console.log(chalk.gray('  Run: agents pull'));
             process.exit(1);
         }
         if (scope.readonly) {
-            console.log(chalk.red(`Scope '${scopeName}' is readonly. Cannot push.`));
+            console.log(chalk.red(`Scope '${repoName}' is readonly. Cannot push.`));
             process.exit(1);
         }
         const localPath = getRepoLocalPath(scope.source);
@@ -1118,11 +1115,8 @@ program
             const agent = AGENTS[agentId];
             const cli = cliStates[agentId];
             if (cli?.installed && cli.version) {
-                manifest.clis = manifest.clis || {};
-                manifest.clis[agentId] = {
-                    package: agent.npmPackage,
-                    version: cli.version,
-                };
+                manifest.agents = manifest.agents || {};
+                manifest.agents[agentId] = cli.version;
                 console.log(`  ${chalk.green('+')} ${agent.name} @ ${cli.version}`);
                 exported++;
             }
@@ -1854,8 +1848,8 @@ instructionsCmd
     .description('Diff installed instructions against repo')
     .action(async (agentArg) => {
     const cwd = process.cwd();
-    const meta = readState();
-    const scopes = getScopesByPriority();
+    const meta = readMeta();
+    const scopes = getReposByPriority();
     if (scopes.length === 0) {
         console.log(chalk.yellow('No repo configured. Run: agents repo add <source>'));
         return;
@@ -1864,7 +1858,7 @@ instructionsCmd
         ? [resolveAgentName(agentArg)].filter(Boolean)
         : ALL_AGENT_IDS;
     const diff = await import('diff');
-    for (const { name: scopeName, config } of scopes) {
+    for (const { name: repoName, config } of scopes) {
         const localPath = getRepoLocalPath(config.source);
         const repoInstructions = discoverInstructionsFromRepo(localPath);
         for (const agentId of agents) {
@@ -2208,11 +2202,8 @@ program
             const manifest = fs.existsSync(projectManifestPath)
                 ? readManifest(process.cwd()) || createDefaultManifest()
                 : createDefaultManifest();
-            manifest.clis = manifest.clis || {};
-            manifest.clis[agent] = {
-                package: agentConfig.npmPackage,
-                version: version === 'latest' ? (await getInstalledVersionForAgent(agent, version)) : version,
-            };
+            manifest.agents = manifest.agents || {};
+            manifest.agents[agent] = version === 'latest' ? (await getInstalledVersionForAgent(agent, version)) : version;
             writeManifest(process.cwd(), manifest);
             console.log(chalk.green(`  Pinned ${agentConfig.name}@${version} in .agents/agents.yaml`));
         }
@@ -2275,8 +2266,8 @@ program
             const projectManifestPath = path.join(process.cwd(), '.agents', 'agents.yaml');
             if (fs.existsSync(projectManifestPath)) {
                 const manifest = readManifest(process.cwd());
-                if (manifest?.clis?.[agent]) {
-                    delete manifest.clis[agent];
+                if (manifest?.agents?.[agent]) {
+                    delete manifest.agents[agent];
                     writeManifest(process.cwd(), manifest);
                     console.log(chalk.gray(`  Removed from .agents/agents.yaml`));
                 }
@@ -2297,17 +2288,27 @@ program
     }
     const { agent, version } = parsed;
     const agentConfig = AGENTS[agent];
+    let selectedVersion = version;
     if (!spec.includes('@') || version === 'latest') {
-        console.log(chalk.red('Please specify a version: agents use <agent>@<version>'));
+        // Interactive version picker
         const versions = listInstalledVersions(agent);
-        if (versions.length > 0) {
-            console.log(chalk.gray(`Installed versions: ${versions.join(', ')}`));
+        if (versions.length === 0) {
+            console.log(chalk.red(`No versions of ${agentConfig.name} installed`));
+            console.log(chalk.gray(`Run: agents add ${agent}@latest`));
+            return;
         }
-        return;
+        const globalDefault = getGlobalDefault(agent);
+        selectedVersion = await select({
+            message: `Select ${agentConfig.name} version:`,
+            choices: versions.map((v) => ({
+                name: v === globalDefault ? `${v} (current default)` : v,
+                value: v,
+            })),
+        });
     }
-    if (!isVersionInstalled(agent, version)) {
-        console.log(chalk.red(`${agentConfig.name}@${version} not installed`));
-        console.log(chalk.gray(`Run: agents add ${agent}@${version}`));
+    if (!isVersionInstalled(agent, selectedVersion)) {
+        console.log(chalk.red(`${agentConfig.name}@${selectedVersion} not installed`));
+        console.log(chalk.gray(`Run: agents add ${agent}@${selectedVersion}`));
         return;
     }
     if (options.project) {
@@ -2320,25 +2321,24 @@ program
         const manifest = fs.existsSync(projectManifestPath)
             ? readManifest(process.cwd()) || createDefaultManifest()
             : createDefaultManifest();
-        manifest.clis = manifest.clis || {};
-        manifest.clis[agent] = {
-            package: agentConfig.npmPackage,
-            version,
-        };
+        manifest.agents = manifest.agents || {};
+        manifest.agents[agent] = selectedVersion;
         writeManifest(process.cwd(), manifest);
-        console.log(chalk.green(`Set ${agentConfig.name}@${version} for this project`));
+        console.log(chalk.green(`Set ${agentConfig.name}@${selectedVersion} for this project`));
     }
     else {
         // Set global default
-        setGlobalDefault(agent, version);
-        console.log(chalk.green(`Set ${agentConfig.name}@${version} as global default`));
+        setGlobalDefault(agent, selectedVersion);
+        console.log(chalk.green(`Set ${agentConfig.name}@${selectedVersion} as global default`));
     }
 });
 program
     .command('list [agent]')
     .description('List installed agent CLI versions')
     .action(async (agentArg) => {
+    const spinner = ora('Checking installed agents...').start();
     const cliStates = await getAllCliStates();
+    spinner.stop();
     // Resolve agent filter
     let filterAgentId;
     if (agentArg) {
@@ -2431,53 +2431,12 @@ function getProjectVersionFromCwd(agent) {
     }
     try {
         const manifest = readManifest(process.cwd());
-        return manifest?.clis?.[agent]?.version || null;
+        return manifest?.agents?.[agent] || null;
     }
     catch {
         return null;
     }
 }
-program
-    .command('upgrade [agent]')
-    .description('Upgrade agent CLI versions')
-    .option('-p, --project', 'Upgrade to version in project manifest')
-    .action(async (agent, options) => {
-    const agentsToUpgrade = agent
-        ? [agent.toLowerCase()]
-        : ALL_AGENT_IDS.filter((id) => listInstalledVersions(id).length > 0);
-    if (agentsToUpgrade.length === 0) {
-        console.log(chalk.yellow('No agent CLIs installed. Run: agents add <agent>@<version>'));
-        return;
-    }
-    for (const agentId of agentsToUpgrade) {
-        const agentConfig = AGENTS[agentId];
-        if (!agentConfig) {
-            console.log(chalk.red(`Unknown agent: ${agentId}`));
-            continue;
-        }
-        // Determine target version
-        let targetVersion = 'latest';
-        if (options.project) {
-            const projectVersion = getProjectVersionFromCwd(agentId);
-            if (projectVersion) {
-                targetVersion = projectVersion;
-            }
-        }
-        const spinner = ora(`Upgrading ${agentConfig.name} to ${targetVersion}...`).start();
-        const result = await installVersion(agentId, targetVersion, (msg) => {
-            spinner.text = msg;
-        });
-        if (result.success) {
-            spinner.succeed(`Upgraded ${agentConfig.name} to ${result.installedVersion}`);
-            // Update global default to new version
-            setGlobalDefault(agentId, result.installedVersion);
-        }
-        else {
-            spinner.fail(`Failed to upgrade ${agentConfig.name}`);
-            console.error(chalk.gray(result.error || 'Unknown error'));
-        }
-    }
-});
 // =============================================================================
 // REPO COMMANDS
 // =============================================================================
@@ -2488,7 +2447,7 @@ repoCmd
     .command('list')
     .description('List configured scopes')
     .action(() => {
-    const scopes = getScopesByPriority();
+    const scopes = getReposByPriority();
     if (scopes.length === 0) {
         console.log(chalk.yellow('No scopes configured.'));
         console.log(chalk.gray('  Run: agents repo add <source>'));
@@ -2514,11 +2473,11 @@ repoCmd
     .option('-s, --scope <scope>', 'Target scope', 'user')
     .option('-y, --yes', 'Skip confirmation prompts')
     .action(async (source, options) => {
-    const scopeName = options.scope;
-    const existingScope = getScope(scopeName);
-    if (existingScope && !options.yes) {
+    const repoName = options.scope;
+    const existingRepo = getRepo(repoName);
+    if (existingRepo && !options.yes) {
         const shouldOverwrite = await confirm({
-            message: `Scope '${scopeName}' already exists (${existingScope.source}). Overwrite?`,
+            message: `Scope '${repoName}' already exists (${existingRepo.source}). Overwrite?`,
             default: false,
         });
         if (!shouldOverwrite) {
@@ -2526,26 +2485,26 @@ repoCmd
             return;
         }
     }
-    if (existingScope?.readonly && !options.yes) {
-        console.log(chalk.red(`Scope '${scopeName}' is readonly. Cannot overwrite.`));
+    if (existingRepo?.readonly && !options.yes) {
+        console.log(chalk.red(`Scope '${repoName}' is readonly. Cannot overwrite.`));
         return;
     }
     const parsed = parseSource(source);
-    const spinner = ora(`Cloning repository for ${scopeName} scope...`).start();
+    const spinner = ora(`Cloning repository for ${repoName} scope...`).start();
     try {
         const { commit, isNew } = await cloneRepo(source);
         spinner.succeed(isNew ? 'Repository cloned' : 'Repository updated');
-        const priority = getScopePriority(scopeName);
-        setScope(scopeName, {
+        const priority = getRepoPriority(repoName);
+        setRepo(repoName, {
             source,
             branch: parsed.ref || 'main',
             commit,
             lastSync: new Date().toISOString(),
             priority,
-            readonly: scopeName === 'system',
+            readonly: repoName === 'system',
         });
-        console.log(chalk.green(`\nAdded scope '${scopeName}' with priority ${priority}`));
-        const scopeHint = scopeName === 'user' ? '' : ` --scope ${scopeName}`;
+        console.log(chalk.green(`\nAdded scope '${repoName}' with priority ${priority}`));
+        const scopeHint = repoName === 'user' ? '' : ` --scope ${repoName}`;
         console.log(chalk.gray(`  Run: agents pull${scopeHint} to sync commands`));
     }
     catch (err) {
@@ -2558,19 +2517,19 @@ repoCmd
     .command('remove <scope>')
     .description('Remove a scope')
     .option('-y, --yes', 'Skip confirmation prompts')
-    .action(async (scopeName, options) => {
-    const existingScope = getScope(scopeName);
-    if (!existingScope) {
-        console.log(chalk.yellow(`Scope '${scopeName}' not found.`));
+    .action(async (repoName, options) => {
+    const existingRepo = getRepo(repoName);
+    if (!existingRepo) {
+        console.log(chalk.yellow(`Scope '${repoName}' not found.`));
         return;
     }
-    if (existingScope.readonly) {
-        console.log(chalk.red(`Scope '${scopeName}' is readonly. Cannot remove.`));
+    if (existingRepo.readonly) {
+        console.log(chalk.red(`Scope '${repoName}' is readonly. Cannot remove.`));
         return;
     }
     if (!options.yes) {
         const shouldRemove = await confirm({
-            message: `Remove scope '${scopeName}' (${existingScope.source})?`,
+            message: `Remove scope '${repoName}' (${existingRepo.source})?`,
             default: false,
         });
         if (!shouldRemove) {
@@ -2578,12 +2537,12 @@ repoCmd
             return;
         }
     }
-    const removed = removeScope(scopeName);
+    const removed = removeRepo(repoName);
     if (removed) {
-        console.log(chalk.green(`Removed scope '${scopeName}'`));
+        console.log(chalk.green(`Removed scope '${repoName}'`));
     }
     else {
-        console.log(chalk.yellow(`Failed to remove scope '${scopeName}'`));
+        console.log(chalk.yellow(`Failed to remove scope '${repoName}'`));
     }
 });
 // =============================================================================