@swarmify/agents-cli 1.5.16 → 1.5.18

package/dist/index.js

@@ -20,7 +20,7 @@ import { AGENTS, ALL_AGENT_IDS, MCP_CAPABLE_AGENTS, SKILLS_CAPABLE_AGENTS, HOOKS
 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 { cloneRepo, parseSource } from './lib/git.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';
 import { discoverSkillsFromRepo, installSkill, uninstallSkill, listInstalledSkillsWithScope, promoteSkillToUser, getSkillInfo, getSkillRules, skillExists, skillContentMatches, } from './lib/skills.js';
@@ -1041,106 +1041,147 @@ program
 // =============================================================================
 program
     .command('push')
-    .description('Export local configuration to .agents repo for manual commit')
+    .description('Push local configuration to your .agents repo on GitHub')
     .option('-s, --scope <scope>', 'Target scope (default: user)', 'user')
-    .option('--export-only', 'Only export, do not update manifest')
+    .option('--export-only', 'Only export to local repo, do not push to GitHub')
+    .option('-m, --message <msg>', 'Commit message', 'Update agent configuration')
     .action(async (options) => {
-    const scopeName = options.scope;
-    const scope = getScope(scopeName);
-    if (!scope) {
-        console.log(chalk.red(`Scope '${scopeName}' not configured.`));
-        const scopeHint = scopeName === 'user' ? '' : ` --scope ${scopeName}`;
-        console.log(chalk.gray(`  Run: agents repo add <source>${scopeHint}`));
-        process.exit(1);
-    }
-    if (scope.readonly) {
-        console.log(chalk.red(`Scope '${scopeName}' is readonly. Cannot push.`));
-        process.exit(1);
-    }
-    const localPath = getRepoLocalPath(scope.source);
-    const manifest = readManifest(localPath) || createDefaultManifest();
-    console.log(chalk.bold('\nExporting local configuration...\n'));
-    const cliStates = await getAllCliStates();
-    let exported = 0;
-    for (const agentId of ALL_AGENT_IDS) {
-        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,
-            };
-            console.log(`  ${chalk.green('+')} ${agent.name} @ ${cli.version}`);
-            exported++;
+    try {
+        const scopeName = options.scope;
+        const scope = getScope(scopeName);
+        if (!scope) {
+            console.log(chalk.red(`Scope '${scopeName}' not configured.`));
+            console.log(chalk.gray('  Run: agents pull'));
+            process.exit(1);
         }
-    }
-    // Export MCP servers from installed agents
-    console.log();
-    let mcpExported = 0;
-    const mcpByName = new Map();
-    for (const agentId of MCP_CAPABLE_AGENTS) {
-        if (!cliStates[agentId]?.installed)
-            continue;
-        const mcps = listInstalledMcpsWithScope(agentId);
-        for (const mcp of mcps) {
-            if (mcp.scope !== 'user')
-                continue; // Only export user-scoped MCPs
-            const existing = mcpByName.get(mcp.name);
-            if (existing) {
-                if (!existing.agents.includes(agentId)) {
-                    existing.agents.push(agentId);
+        if (scope.readonly) {
+            console.log(chalk.red(`Scope '${scopeName}' is readonly. Cannot push.`));
+            process.exit(1);
+        }
+        const localPath = getRepoLocalPath(scope.source);
+        const manifest = readManifest(localPath) || createDefaultManifest();
+        console.log(chalk.bold('\nExporting local configuration...\n'));
+        const cliStates = await getAllCliStates();
+        let exported = 0;
+        for (const agentId of ALL_AGENT_IDS) {
+            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,
+                };
+                console.log(`  ${chalk.green('+')} ${agent.name} @ ${cli.version}`);
+                exported++;
+            }
+        }
+        // Export MCP servers from installed agents
+        console.log();
+        let mcpExported = 0;
+        const mcpByName = new Map();
+        for (const agentId of MCP_CAPABLE_AGENTS) {
+            if (!cliStates[agentId]?.installed)
+                continue;
+            const mcps = listInstalledMcpsWithScope(agentId);
+            for (const mcp of mcps) {
+                if (mcp.scope !== 'user')
+                    continue; // Only export user-scoped MCPs
+                const existing = mcpByName.get(mcp.name);
+                if (existing) {
+                    if (!existing.agents.includes(agentId)) {
+                        existing.agents.push(agentId);
+                    }
+                }
+                else {
+                    mcpByName.set(mcp.name, {
+                        command: mcp.command || '',
+                        agents: [agentId],
+                    });
                 }
-            }
-            else {
-                mcpByName.set(mcp.name, {
-                    command: mcp.command || '',
-                    agents: [agentId],
-                });
             }
         }
-    }
-    if (mcpByName.size > 0) {
-        manifest.mcp = manifest.mcp || {};
-        for (const [name, config] of mcpByName) {
-            manifest.mcp[name] = {
-                command: config.command,
-                transport: 'stdio',
-                agents: config.agents,
-                scope: 'user',
-            };
-            console.log(`  ${chalk.green('+')} MCP: ${name} (${config.agents.map(id => AGENTS[id].name).join(', ')})`);
-            mcpExported++;
+        if (mcpByName.size > 0) {
+            manifest.mcp = manifest.mcp || {};
+            for (const [name, config] of mcpByName) {
+                manifest.mcp[name] = {
+                    command: config.command,
+                    transport: 'stdio',
+                    agents: config.agents,
+                    scope: 'user',
+                };
+                console.log(`  ${chalk.green('+')} MCP: ${name} (${config.agents.map((id) => AGENTS[id].name).join(', ')})`);
+                mcpExported++;
+            }
         }
-    }
-    if (!options.exportOnly) {
         writeManifest(localPath, manifest);
         console.log(chalk.bold(`\nUpdated ${MANIFEST_FILENAME}`));
+        if (options.exportOnly) {
+            console.log(chalk.bold('\nExport complete. Changes saved locally.'));
+            console.log(chalk.gray(`  Path: ${localPath}`));
+            return;
+        }
+        // Check if there are changes to push
+        const hasChanges = await hasUncommittedChanges(localPath);
+        if (!hasChanges) {
+            console.log(chalk.green('\nNo changes to push.'));
+            return;
+        }
+        // Get GitHub username
+        const spinner = ora('Checking GitHub authentication...').start();
+        const username = await getGitHubUsername();
+        if (!username) {
+            spinner.fail('GitHub CLI not authenticated');
+            console.log(chalk.yellow('\nTo push changes, authenticate with GitHub:'));
+            console.log(chalk.gray('  gh auth login'));
+            console.log(chalk.gray('\nOr push manually:'));
+            console.log(chalk.gray(`  cd ${localPath}`));
+            console.log(chalk.gray('  git add -A && git commit -m "Update" && git push'));
+            return;
+        }
+        spinner.text = 'Checking remote configuration...';
+        // Check if remote is set to user's repo
+        const currentRemote = await getRemoteUrl(localPath);
+        const userRepoUrl = `https://github.com/${username}/.agents.git`;
+        const isUserRepo = currentRemote?.includes(`${username}/.agents`);
+        if (!isUserRepo) {
+            // Check if user's repo exists on GitHub
+            spinner.text = `Checking if ${username}/.agents exists...`;
+            const repoExists = await checkGitHubRepoExists(username, '.agents');
+            if (!repoExists) {
+                spinner.fail(`Repository ${username}/.agents does not exist`);
+                console.log(chalk.yellow('\nCreate your .agents repo on GitHub:'));
+                console.log(chalk.cyan(`  gh repo create .agents --public --description "My agent configurations"`));
+                console.log(chalk.gray('\nThen run: agents push'));
+                return;
+            }
+            // Update remote to user's repo
+            spinner.text = `Switching remote to ${username}/.agents...`;
+            await setRemoteUrl(localPath, userRepoUrl);
+        }
+        // Commit and push
+        spinner.text = 'Pushing changes...';
+        const result = await commitAndPush(localPath, options.message);
+        if (result.success) {
+            spinner.succeed(`Pushed to ${username}/.agents`);
+            console.log(chalk.green(`\nView: https://github.com/${username}/.agents`));
+        }
+        else {
+            spinner.fail('Failed to push');
+            console.log(chalk.red(result.error || 'Unknown error'));
+            if (result.error?.includes('rejected')) {
+                console.log(chalk.yellow('\nTry pulling first: agents pull'));
+            }
+        }
+    }
+    catch (err) {
+        if (isPromptCancelled(err)) {
+            console.log(chalk.yellow('\nCancelled'));
+            process.exit(0);
+        }
+        console.error(chalk.red(err.message));
+        process.exit(1);
     }
-    console.log(chalk.bold('\nNext steps:'));
-    console.log(chalk.gray(`  cd ${localPath}`));
-    console.log(chalk.gray('  git add -A'));
-    console.log(chalk.gray('  git commit -m "Update agent configuration"'));
-    console.log(chalk.gray('  git push'));
-    console.log();
-});
-// =============================================================================
-// SYNC COMMAND
-// =============================================================================
-program
-    .command('sync [source]')
-    .description('Bidirectional sync with remote .agents repo')
-    .option('-y, --yes', 'Skip interactive prompts')
-    .option('-f, --force', 'Overwrite local changes')
-    .action(async (source, options) => {
-    const args = ['pull'];
-    if (source)
-        args.push(source);
-    if (options.yes)
-        args.push('-y');
-    if (options.force)
-        args.push('-f');
-    await program.commands.find((c) => c.name() === 'pull')?.parseAsync(args, { from: 'user' });
 });
 // =============================================================================
 // COMMANDS COMMANDS
@@ -2448,37 +2489,6 @@ repoCmd
         console.log(chalk.yellow(`Failed to remove scope '${scopeName}'`));
     }
 });
-repoCmd
-    .command('sync [scope]')
-    .description('Sync a specific scope or all scopes')
-    .option('-y, --yes', 'Skip confirmation prompts')
-    .action(async (scopeName, options) => {
-    const scopes = scopeName ? [{ name: scopeName, config: getScope(scopeName) }].filter(s => s.config) : getScopesByPriority();
-    if (scopes.length === 0) {
-        console.log(chalk.yellow('No scopes to sync.'));
-        return;
-    }
-    for (const { name, config } of scopes) {
-        if (!config)
-            continue;
-        console.log(chalk.bold(`\nSyncing scope: ${name}`));
-        const spinner = ora('Updating repository...').start();
-        try {
-            const { commit } = await cloneRepo(config.source);
-            spinner.succeed('Repository updated');
-            setScope(name, {
-                ...config,
-                commit,
-                lastSync: new Date().toISOString(),
-            });
-        }
-        catch (err) {
-            spinner.fail(`Failed to sync ${name}`);
-            console.error(chalk.gray(err.message));
-        }
-    }
-    console.log(chalk.green('\nSync complete.'));
-});
 // =============================================================================
 // REGISTRY COMMANDS
 // =============================================================================