@dotcontext/cli 0.8.2 → 0.9.1

package/dist/index.js

@@ -45,17 +45,11 @@ const splashScreen_1 = require("./utils/splashScreen");
 const themedPrompt_1 = require("./utils/themedPrompt");
 const cliUI_1 = require("./utils/cliUI");
 const versionChecker_1 = require("./utils/versionChecker");
+const processShutdown_1 = require("./utils/processShutdown");
 const i18n_1 = require("./utils/i18n");
-const syncService_1 = require("./services/sync/syncService");
-const import_1 = require("./services/import");
-const mcp_1 = require("./services/mcp");
-const state_1 = require("./services/state");
-const workflow_1 = require("./services/workflow");
-const export_1 = require("./services/export");
-const report_1 = require("./services/report");
-const quickSync_1 = require("./services/quickSync");
-const reverseSync_1 = require("./services/reverseSync");
-const workflow_2 = require("./workflow");
+const cli_1 = require("./cli");
+const mcp_1 = require("./mcp");
+const harness_1 = require("./harness");
 const prompts_1 = require("./utils/prompts");
 const version_1 = require("./version");
 const rawArgs = process.argv.slice(2);
@@ -79,17 +73,17 @@ const localeLabelKeys = {
 };
 const program = new commander_1.Command();
 const ui = new cliUI_1.CLIInterface(t);
-const syncService = new syncService_1.SyncService({
+const syncService = new cli_1.SyncService({
     ui,
     t,
     version: version_1.VERSION
 });
-const importRulesService = new import_1.ImportRulesService({
+const importRulesService = new cli_1.ImportRulesService({
     ui,
     t,
     version: version_1.VERSION
 });
-const importAgentsService = new import_1.ImportAgentsService({
+const importAgentsService = new cli_1.ImportAgentsService({
     ui,
     t,
     version: version_1.VERSION
@@ -112,47 +106,33 @@ function scheduleVersionCheck(force = false) {
     }
     return versionCheckPromise;
 }
-function buildMcpToolChoices(supportedTools, detectedTools) {
-    const detectedSet = new Set(detectedTools);
-    const orderedTools = [
-        ...supportedTools.filter(tool => detectedSet.has(tool.id)),
-        ...supportedTools.filter(tool => !detectedSet.has(tool.id)),
-    ];
-    return [
-        {
-            name: t('commands.mcpInstall.allDetected'),
-            value: 'all',
-        },
-        ...orderedTools.map(tool => ({
-            name: detectedSet.has(tool.id)
-                ? `${tool.displayName} (${t('labels.detected')})`
-                : tool.displayName,
-            value: tool.id,
-        })),
-    ];
-}
 program.hook('preAction', () => {
     void scheduleVersionCheck();
 });
-program
-    .command('sync-agents')
-    .description(t('commands.sync.description'))
-    .option('-s, --source <dir>', t('commands.sync.options.source'), './.context/agents')
-    .option('-t, --target <paths...>', t('commands.sync.options.target'))
-    .option('-m, --mode <type>', t('commands.sync.options.mode'), 'symlink')
-    .option('-p, --preset <name>', t('commands.sync.options.preset'))
-    .option('--force', t('commands.sync.options.force'))
-    .option('--dry-run', t('commands.sync.options.dryRun'))
-    .option('-v, --verbose', t('commands.sync.options.verbose'))
-    .action(async (options) => {
-    try {
-        await syncService.run(options);
-    }
-    catch (error) {
-        ui.displayError(t('errors.sync.failed'), error);
-        process.exit(1);
-    }
-});
+function registerSyncCommand(parent, name, hidden = false) {
+    const command = parent
+        .command(name, hidden ? { hidden: true } : {})
+        .description(t('commands.sync.description'))
+        .option('-s, --source <dir>', t('commands.sync.options.source'), './.context/agents')
+        .option('-t, --target <paths...>', t('commands.sync.options.target'))
+        .option('-m, --mode <type>', t('commands.sync.options.mode'), 'symlink')
+        .option('-p, --preset <name>', t('commands.sync.options.preset'))
+        .option('--force', t('commands.sync.options.force'))
+        .option('--dry-run', t('commands.sync.options.dryRun'))
+        .option('-v, --verbose', t('commands.sync.options.verbose'))
+        .action(async (options) => {
+        try {
+            await syncService.run(options);
+        }
+        catch (error) {
+            ui.displayError(t('errors.sync.failed'), error);
+            process.exit(1);
+        }
+    });
+    return command;
+}
+registerSyncCommand(program, 'sync');
+registerSyncCommand(program, 'sync-agents', true);
 program
     .command('import-rules')
     .description(t('commands.importRules.description'))
@@ -222,7 +202,7 @@ program
     .option('-v, --verbose', 'Verbose output')
     .action(async (repoPath, options) => {
     try {
-        const service = new reverseSync_1.ReverseQuickSyncService({ ui, t, version: version_1.VERSION });
+        const service = new cli_1.ReverseQuickSyncService({ ui, t, version: version_1.VERSION });
         await service.run(repoPath, {
             dryRun: options.dryRun,
             force: options.force,
@@ -251,14 +231,13 @@ program
             repoPath: options.repoPath,
             verbose: options.verbose
         });
-        // Handle graceful shutdown
-        process.on('SIGINT', async () => {
-            await server.stop();
-            process.exit(0);
-        });
-        process.on('SIGTERM', async () => {
-            await server.stop();
-            process.exit(0);
+        (0, processShutdown_1.registerProcessShutdown)(server, {
+            onError: (error) => {
+                if (options.verbose) {
+                    process.stderr.write(`[mcp] Shutdown error: ${error}\n`);
+                }
+            },
+            exit: (code) => process.exit(code),
         });
     }
     catch (error) {
@@ -278,24 +257,16 @@ program
     .option('-v, --verbose', t('commands.mcpInstall.options.verbose'))
     .action(async (tool, options) => {
     try {
-        const mcpInstallService = new mcp_1.MCPInstallService({ ui, t, version: version_1.VERSION });
-        // If no tool specified and not in CI, show interactive prompt
-        if (!tool && process.stdin.isTTY) {
-            const supportedTools = mcpInstallService.getSupportedTools();
-            const detectedTools = await mcpInstallService.detectInstalledTools();
-            const choices = buildMcpToolChoices(supportedTools, detectedTools);
-            const { selectedTool } = await inquirer_1.default.prompt([
-                {
-                    type: 'list',
-                    name: 'selectedTool',
-                    message: t('commands.mcpInstall.selectTool'),
-                    choices,
-                },
-            ]);
-            tool = selectedTool;
-        }
+        const mcpInstallService = new cli_1.MCPInstallService({ ui, t, version: version_1.VERSION });
+        const selectedTool = await (0, cli_1.resolveMcpInstallToolSelection)({
+            selectedTool: tool,
+            isInteractive: Boolean(process.stdin.isTTY),
+            service: mcpInstallService,
+            t,
+            promptTool: ({ message, choices }) => (0, themedPrompt_1.themedSelect)({ message, choices }),
+        });
         const result = await mcpInstallService.run({
-            tool,
+            tool: selectedTool,
             global: options.local ? false : options.global,
             dryRun: options.dryRun,
             verbose: options.verbose,
@@ -310,162 +281,167 @@ program
         process.exit(1);
     }
 });
-program
-    .command('preview-splash')
-    .description(t('commands.previewSplash.description'))
-    .option('--title <title>', t('commands.previewSplash.options.title'))
-    .option('--directory <path>', t('commands.previewSplash.options.directory'), process.cwd())
-    .action(async (options) => {
-    try {
-        await renderStartupSplash(options.directory, options.title);
-    }
-    catch (error) {
-        ui.displayError(t('errors.cli.executionFailed'), error);
-        process.exit(1);
-    }
-});
-// Export Rules Command
-program
-    .command('export-rules')
-    .description(t('commands.export.description'))
-    .argument('[repo-path]', 'Repository path', process.cwd())
-    .option('-s, --source <dir>', t('commands.export.options.source'), '.context/docs')
-    .option('-t, --targets <paths...>', t('commands.export.options.targets'))
-    .option('--preset <name>', t('commands.export.options.preset'))
-    .option('--force', t('commands.export.options.force'))
-    .option('--dry-run', t('commands.export.options.dryRun'))
-    .option('-v, --verbose', t('commands.fill.options.verbose'))
-    .action(async (repoPath, options) => {
-    try {
-        const exportService = new export_1.ExportRulesService({
-            ui,
-            t,
-            version: version_1.VERSION,
-        });
-        await exportService.run(repoPath, {
-            source: options.source,
-            targets: options.targets,
-            preset: options.preset,
-            force: options.force,
-            dryRun: options.dryRun,
-            verbose: options.verbose,
-        });
-    }
-    catch (error) {
-        ui.displayError(t('errors.cli.executionFailed'), error);
-        process.exit(1);
-    }
-});
-// Report Command
-program
-    .command('report')
-    .description(t('commands.report.description'))
-    .argument('[repo-path]', 'Repository path', process.cwd())
-    .option('-f, --format <format>', t('commands.report.options.format'), 'console')
-    .option('-o, --output <path>', t('commands.report.options.output'))
-    .option('--include-stack', t('commands.report.options.includeStack'))
-    .option('-v, --verbose', t('commands.fill.options.verbose'))
-    .action(async (repoPath, options) => {
-    try {
-        const reportService = new report_1.ReportService({
-            ui,
-            t,
-            version: version_1.VERSION,
-        });
-        const report = await reportService.generate(repoPath, {
-            format: options.format,
-            output: options.output,
-            includeStack: options.includeStack,
-            verbose: options.verbose,
-        });
-        await reportService.output(report, options);
-    }
-    catch (error) {
-        ui.displayError(t('errors.cli.executionFailed'), error);
-        process.exit(1);
-    }
-});
-// Skill Commands
-const skillCommand = program
-    .command('skill')
-    .description(t('commands.skill.description'));
-skillCommand
-    .command('list')
-    .description(t('commands.skill.list.description'))
-    .argument('[repo-path]', 'Repository path', process.cwd())
-    .option('--json', 'Output as JSON')
-    .action(async (repoPath, options) => {
-    try {
-        const { createSkillRegistry } = await Promise.resolve().then(() => __importStar(require('./workflow/skills')));
-        const registry = createSkillRegistry(repoPath);
-        const discovered = await registry.discoverAll();
-        if (options.json) {
-            console.log(JSON.stringify({
-                builtIn: discovered.builtIn.map(s => s.slug),
-                custom: discovered.custom.map(s => s.slug),
-                total: discovered.all.length,
-            }, null, 2));
-            return;
+function registerPreviewSplashCommand(parent, hidden = false) {
+    const command = parent
+        .command('preview-splash', hidden ? { hidden: true } : {})
+        .description(t('commands.previewSplash.description'))
+        .option('--title <title>', t('commands.previewSplash.options.title'))
+        .option('--directory <path>', t('commands.previewSplash.options.directory'), process.cwd())
+        .action(async (options) => {
+        try {
+            await renderStartupSplash(options.directory, options.title);
         }
-        console.log('\nBuilt-in Skills:');
-        for (const skill of discovered.builtIn) {
-            const projectSkill = discovered.all.find(s => s.slug === skill.slug && s.path.includes('.context'));
-            const status = projectSkill ? '[project]' : '[available]';
-            console.log(`  ${skill.slug} ${status}`);
-            console.log(`    ${skill.metadata.description}`);
+        catch (error) {
+            ui.displayError(t('errors.cli.executionFailed'), error);
+            process.exit(1);
+        }
+    });
+    return command;
+}
+function registerExportRulesCommand(parent, hidden = false) {
+    const command = parent
+        .command('export-rules', hidden ? { hidden: true } : {})
+        .description(t('commands.export.description'))
+        .argument('[repo-path]', 'Repository path', process.cwd())
+        .option('-s, --source <dir>', t('commands.export.options.source'), '.context/docs')
+        .option('-t, --targets <paths...>', t('commands.export.options.targets'))
+        .option('--preset <name>', t('commands.export.options.preset'))
+        .option('--force', t('commands.export.options.force'))
+        .option('--dry-run', t('commands.export.options.dryRun'))
+        .option('-v, --verbose', t('commands.fill.options.verbose'))
+        .action(async (repoPath, options) => {
+        try {
+            const exportService = new cli_1.ExportRulesService({
+                ui,
+                t,
+                version: version_1.VERSION,
+            });
+            await exportService.run(repoPath, {
+                source: options.source,
+                targets: options.targets,
+                preset: options.preset,
+                force: options.force,
+                dryRun: options.dryRun,
+                verbose: options.verbose,
+            });
+        }
+        catch (error) {
+            ui.displayError(t('errors.cli.executionFailed'), error);
+            process.exit(1);
+        }
+    });
+    return command;
+}
+function registerReportCommand(parent, hidden = false) {
+    const command = parent
+        .command('report', hidden ? { hidden: true } : {})
+        .description(t('commands.report.description'))
+        .argument('[repo-path]', 'Repository path', process.cwd())
+        .option('-f, --format <format>', t('commands.report.options.format'), 'console')
+        .option('-o, --output <path>', t('commands.report.options.output'))
+        .option('--include-stack', t('commands.report.options.includeStack'))
+        .option('-v, --verbose', t('commands.fill.options.verbose'))
+        .action(async (repoPath, options) => {
+        try {
+            const reportService = new cli_1.ReportService({
+                ui,
+                t,
+                version: version_1.VERSION,
+            });
+            const report = await reportService.generate(repoPath, {
+                format: options.format,
+                output: options.output,
+                includeStack: options.includeStack,
+                verbose: options.verbose,
+            });
+            await reportService.output(report, options);
+        }
+        catch (error) {
+            ui.displayError(t('errors.cli.executionFailed'), error);
+            process.exit(1);
         }
-        if (discovered.custom.length > 0) {
-            console.log('\nCustom Skills:');
-            for (const skill of discovered.custom) {
-                console.log(`  ${skill.slug}`);
+    });
+    return command;
+}
+function registerSkillCommands(parent, hidden = false) {
+    const skillCommand = parent
+        .command('skill', hidden ? { hidden: true } : {})
+        .description(t('commands.skill.description'));
+    skillCommand
+        .command('list')
+        .description(t('commands.skill.list.description'))
+        .argument('[repo-path]', 'Repository path', process.cwd())
+        .option('--json', 'Output as JSON')
+        .action(async (repoPath, options) => {
+        try {
+            const { createSkillRegistry } = await Promise.resolve().then(() => __importStar(require('./workflow/skills')));
+            const registry = createSkillRegistry(repoPath);
+            const discovered = await registry.discoverAll();
+            if (options.json) {
+                console.log(JSON.stringify({
+                    builtIn: discovered.builtIn.map(s => s.slug),
+                    custom: discovered.custom.map(s => s.slug),
+                    total: discovered.all.length,
+                }, null, 2));
+                return;
+            }
+            console.log('\nBuilt-in Skills:');
+            for (const skill of discovered.builtIn) {
+                const projectSkill = discovered.all.find(s => s.slug === skill.slug && s.path.includes('.context'));
+                const status = projectSkill ? '[project]' : '[available]';
+                console.log(`  ${skill.slug} ${status}`);
                 console.log(`    ${skill.metadata.description}`);
             }
+            if (discovered.custom.length > 0) {
+                console.log('\nCustom Skills:');
+                for (const skill of discovered.custom) {
+                    console.log(`  ${skill.slug}`);
+                    console.log(`    ${skill.metadata.description}`);
+                }
+            }
+            console.log(`\nTotal: ${discovered.all.length} skills (${discovered.builtIn.length} built-in, ${discovered.custom.length} custom)`);
         }
-        console.log(`\nTotal: ${discovered.all.length} skills (${discovered.builtIn.length} built-in, ${discovered.custom.length} custom)`);
-    }
-    catch (error) {
-        ui.displayError('Failed to list skills', error);
-        process.exit(1);
-    }
-});
-skillCommand
-    .command('export')
-    .description(t('commands.skill.export.description'))
-    .argument('[repo-path]', 'Repository path', process.cwd())
-    .option('-p, --preset <preset>', 'Export preset: claude, gemini, codex, all', 'all')
-    .option('-f, --force', 'Overwrite existing files')
-    .option('--include-builtin', 'Include built-in skills even if not scaffolded')
-    .option('--dry-run', 'Preview changes without writing')
-    .action(async (repoPath, options) => {
-    try {
-        const { SkillExportService } = await Promise.resolve().then(() => __importStar(require('./services/export/skillExportService')));
-        const exportService = new SkillExportService({
-            ui,
-            t,
-            version: version_1.VERSION,
-        });
-        const result = await exportService.run(repoPath, {
-            preset: options.preset,
-            force: options.force,
-            includeBuiltIn: options.includeBuiltin,
-            dryRun: options.dryRun,
-        });
-        if (options.dryRun) {
-            ui.displayInfo('Dry run', 'No files were written');
+        catch (error) {
+            ui.displayError('Failed to list skills', error);
+            process.exit(1);
         }
-        else {
-            ui.displaySuccess(`Exported ${result.skillsExported.length} skills to ${result.targets.length} targets`);
+    });
+    skillCommand
+        .command('export')
+        .description(t('commands.skill.export.description'))
+        .argument('[repo-path]', 'Repository path', process.cwd())
+        .option('-p, --preset <preset>', 'Export preset, for example: claude, github, windsurf, codex, antigravity, all', 'all')
+        .option('-f, --force', 'Overwrite existing files')
+        .option('--include-builtin', 'Include built-in skills even if not scaffolded')
+        .option('--dry-run', 'Preview changes without writing')
+        .action(async (repoPath, options) => {
+        try {
+            const { SkillExportService } = await Promise.resolve().then(() => __importStar(require('./services/export/skillExportService')));
+            const exportService = new SkillExportService({
+                ui,
+                t,
+                version: version_1.VERSION,
+            });
+            const result = await exportService.run(repoPath, {
+                preset: options.preset,
+                force: options.force,
+                includeBuiltIn: options.includeBuiltin,
+                dryRun: options.dryRun,
+            });
+            if (options.dryRun) {
+                ui.displayInfo('Dry run', 'No files were written');
+            }
+            else {
+                ui.displaySuccess(`Exported ${result.skillsExported.length} skills to ${result.targets.length} targets`);
+            }
         }
-    }
-    catch (error) {
-        ui.displayError('Failed to export skills', error);
-        process.exit(1);
-    }
-});
-// PREVC Workflow Commands
-const workflowCommand = program
-    .command('workflow')
-    .description('PREVC workflow management (Planning, Review, Execution, Validation, Confirmation)');
+        catch (error) {
+            ui.displayError('Failed to export skills', error);
+            process.exit(1);
+        }
+    });
+    return skillCommand;
+}
 // Helper to create workflow service dependencies
 const getWorkflowDeps = () => ({
     ui: {
@@ -474,147 +450,165 @@ const getWorkflowDeps = () => ({
         displayInfo: (title, detail) => ui.displayInfo(title, detail || '')
     }
 });
-workflowCommand
-    .command('init <name>')
-    .description('Initialize a new PREVC workflow')
-    .option('-d, --description <text>', 'Project description for scale detection')
-    .option('-s, --scale <scale>', 'Project scale: QUICK, SMALL, MEDIUM, LARGE')
-    .option('-r, --repo-path <path>', 'Repository path', process.cwd())
-    .action(async (name, options) => {
-    try {
-        const workflowService = new workflow_1.WorkflowService(options.repoPath, getWorkflowDeps());
-        const status = await workflowService.init({
-            name,
-            description: options.description,
-            scale: options.scale
-        });
-        ui.displaySuccess(`Workflow PREVC initialized: ${name}`);
-        ui.displayInfo('Scale', (0, workflow_2.getScaleName)(status.project.scale));
-        ui.displayInfo('Current Phase', `${status.project.current_phase} - ${workflow_2.PHASE_NAMES_PT[status.project.current_phase]}`);
-    }
-    catch (error) {
-        ui.displayError('Failed to initialize workflow', error);
-        process.exit(1);
-    }
-});
-workflowCommand
-    .command('status')
-    .description('Show current workflow status')
-    .option('-r, --repo-path <path>', 'Repository path', process.cwd())
-    .action(async (options) => {
-    try {
-        const workflowService = new workflow_1.WorkflowService(options.repoPath, getWorkflowDeps());
-        if (!await workflowService.hasWorkflow()) {
-            ui.displayError('No workflow found. Run "workflow init <name>" first.');
+function registerWorkflowCommands(parent, hidden = false) {
+    const workflowCommand = parent
+        .command('workflow', hidden ? { hidden: true } : {})
+        .description('PREVC workflow management (Planning, Review, Execution, Validation, Confirmation)');
+    workflowCommand
+        .command('init <name>')
+        .description('Initialize a new PREVC workflow')
+        .option('-d, --description <text>', 'Project description for scale detection')
+        .option('-s, --scale <scale>', 'Project scale: QUICK, SMALL, MEDIUM, LARGE')
+        .option('-r, --repo-path <path>', 'Repository path', process.cwd())
+        .action(async (name, options) => {
+        try {
+            const workflowService = new harness_1.WorkflowService(options.repoPath, getWorkflowDeps());
+            const status = await workflowService.init({
+                name,
+                description: options.description,
+                scale: options.scale
+            });
+            ui.displaySuccess(`Workflow PREVC initialized: ${name}`);
+            ui.displayInfo('Scale', (0, harness_1.getScaleName)(status.project.scale));
+            ui.displayInfo('Current Phase', `${status.project.current_phase} - ${harness_1.PHASE_NAMES_PT[status.project.current_phase]}`);
+        }
+        catch (error) {
+            ui.displayError('Failed to initialize workflow', error);
             process.exit(1);
         }
-        const formattedStatus = await workflowService.getFormattedStatus();
-        console.log(formattedStatus);
-        const actions = await workflowService.getRecommendedActions();
-        if (actions.length > 0) {
-            console.log('\nRecommended actions:');
-            actions.forEach((action, i) => console.log(`  ${i + 1}. ${action}`));
+    });
+    workflowCommand
+        .command('status')
+        .description('Show current workflow status')
+        .option('-r, --repo-path <path>', 'Repository path', process.cwd())
+        .action(async (options) => {
+        try {
+            const workflowService = new harness_1.WorkflowService(options.repoPath, getWorkflowDeps());
+            if (!await workflowService.hasWorkflow()) {
+                ui.displayError('No workflow found. Run "workflow init <name>" first.');
+                process.exit(1);
+            }
+            const formattedStatus = await workflowService.getFormattedStatus();
+            console.log(formattedStatus);
+            const actions = await workflowService.getRecommendedActions();
+            if (actions.length > 0) {
+                console.log('\nRecommended actions:');
+                actions.forEach((action, i) => console.log(`  ${i + 1}. ${action}`));
+            }
         }
-    }
-    catch (error) {
-        ui.displayError('Failed to get workflow status', error);
-        process.exit(1);
-    }
-});
-workflowCommand
-    .command('advance')
-    .description('Complete current phase and advance to next')
-    .option('-r, --repo-path <path>', 'Repository path', process.cwd())
-    .option('-o, --outputs <files...>', 'Output files generated in current phase')
-    .action(async (options) => {
-    try {
-        const workflowService = new workflow_1.WorkflowService(options.repoPath, getWorkflowDeps());
-        if (!await workflowService.hasWorkflow()) {
-            ui.displayError('No workflow found. Run "workflow init <name>" first.');
+        catch (error) {
+            ui.displayError('Failed to get workflow status', error);
             process.exit(1);
         }
-        const nextPhase = await workflowService.advance(options.outputs);
-        if (nextPhase) {
-            ui.displaySuccess(`Advanced to phase: ${nextPhase} - ${workflow_2.PHASE_NAMES_PT[nextPhase]}`);
-        }
-        else {
-            ui.displaySuccess('Workflow completed!');
+    });
+    workflowCommand
+        .command('advance')
+        .description('Complete current phase and advance to next')
+        .option('-r, --repo-path <path>', 'Repository path', process.cwd())
+        .option('-o, --outputs <files...>', 'Output files generated in current phase')
+        .action(async (options) => {
+        try {
+            const workflowService = new harness_1.WorkflowService(options.repoPath, getWorkflowDeps());
+            if (!await workflowService.hasWorkflow()) {
+                ui.displayError('No workflow found. Run "workflow init <name>" first.');
+                process.exit(1);
+            }
+            const nextPhase = await workflowService.advance(options.outputs);
+            if (nextPhase) {
+                ui.displaySuccess(`Advanced to phase: ${nextPhase} - ${harness_1.PHASE_NAMES_PT[nextPhase]}`);
+            }
+            else {
+                ui.displaySuccess('Workflow completed!');
+            }
         }
-    }
-    catch (error) {
-        ui.displayError('Failed to advance workflow', error);
-        process.exit(1);
-    }
-});
-workflowCommand
-    .command('handoff <from> <to>')
-    .description('Perform handoff between roles')
-    .option('-r, --repo-path <path>', 'Repository path', process.cwd())
-    .option('-a, --artifacts <files...>', 'Artifacts to hand off')
-    .action(async (from, to, options) => {
-    try {
-        const workflowService = new workflow_1.WorkflowService(options.repoPath, getWorkflowDeps());
-        if (!await workflowService.hasWorkflow()) {
-            ui.displayError('No workflow found. Run "workflow init <name>" first.');
+        catch (error) {
+            ui.displayError('Failed to advance workflow', error);
             process.exit(1);
         }
-        await workflowService.handoff(from, to, options.artifacts || []);
-        ui.displaySuccess(`Handoff: ${workflow_2.ROLE_DISPLAY_NAMES[from]} → ${workflow_2.ROLE_DISPLAY_NAMES[to]}`);
-    }
-    catch (error) {
-        ui.displayError('Failed to perform handoff', error);
-        process.exit(1);
-    }
-});
-workflowCommand
-    .command('collaborate <topic>')
-    .description('Start a collaboration session between roles')
-    .option('-r, --repo-path <path>', 'Repository path', process.cwd())
-    .option('-p, --participants <roles...>', 'Participating roles')
-    .action(async (topic, options) => {
-    try {
-        const workflowService = new workflow_1.WorkflowService(options.repoPath, getWorkflowDeps());
-        const session = await workflowService.startCollaboration(topic, options.participants);
-        ui.displaySuccess(`Collaboration started: ${topic}`);
-        ui.displayInfo('Session ID', session.getId());
-        ui.displayInfo('Participants', session.getParticipantNames().join(', '));
-        console.log('\nUse MCP tools to contribute and synthesize the collaboration.');
-    }
-    catch (error) {
-        ui.displayError('Failed to start collaboration', error);
-        process.exit(1);
-    }
-});
-workflowCommand
-    .command('role <action> <role>')
-    .description('Manage role status (start/complete)')
-    .option('-r, --repo-path <path>', 'Repository path', process.cwd())
-    .option('-o, --outputs <files...>', 'Output files (for complete action)')
-    .action(async (action, role, options) => {
-    try {
-        const workflowService = new workflow_1.WorkflowService(options.repoPath, getWorkflowDeps());
-        if (!await workflowService.hasWorkflow()) {
-            ui.displayError('No workflow found. Run "workflow init <name>" first.');
+    });
+    workflowCommand
+        .command('handoff <from> <to>')
+        .description('Perform handoff between roles')
+        .option('-r, --repo-path <path>', 'Repository path', process.cwd())
+        .option('-a, --artifacts <files...>', 'Artifacts to hand off')
+        .action(async (from, to, options) => {
+        try {
+            const workflowService = new harness_1.WorkflowService(options.repoPath, getWorkflowDeps());
+            if (!await workflowService.hasWorkflow()) {
+                ui.displayError('No workflow found. Run "workflow init <name>" first.');
+                process.exit(1);
+            }
+            await workflowService.handoff(from, to, options.artifacts || []);
+            ui.displaySuccess(`Handoff: ${harness_1.ROLE_DISPLAY_NAMES[from]} → ${harness_1.ROLE_DISPLAY_NAMES[to]}`);
+        }
+        catch (error) {
+            ui.displayError('Failed to perform handoff', error);
             process.exit(1);
         }
-        if (action === 'start') {
-            await workflowService.startRole(role);
-            ui.displaySuccess(`Started role: ${workflow_2.ROLE_DISPLAY_NAMES[role]}`);
+    });
+    workflowCommand
+        .command('collaborate <topic>')
+        .description('Start a collaboration session between roles')
+        .option('-r, --repo-path <path>', 'Repository path', process.cwd())
+        .option('-p, --participants <roles...>', 'Participating roles')
+        .action(async (topic, options) => {
+        try {
+            const workflowService = new harness_1.WorkflowService(options.repoPath, getWorkflowDeps());
+            const session = await workflowService.startCollaboration(topic, options.participants);
+            ui.displaySuccess(`Collaboration started: ${topic}`);
+            ui.displayInfo('Session ID', session.getId());
+            ui.displayInfo('Participants', session.getParticipantNames().join(', '));
+            console.log('\nUse MCP tools to contribute and synthesize the collaboration.');
         }
-        else if (action === 'complete') {
-            await workflowService.completeRole(role, options.outputs || []);
-            ui.displaySuccess(`Completed role: ${workflow_2.ROLE_DISPLAY_NAMES[role]}`);
+        catch (error) {
+            ui.displayError('Failed to start collaboration', error);
+            process.exit(1);
         }
-        else {
-            ui.displayError(`Unknown action: ${action}. Use 'start' or 'complete'.`);
+    });
+    workflowCommand
+        .command('role <action> <role>')
+        .description('Manage role status (start/complete)')
+        .option('-r, --repo-path <path>', 'Repository path', process.cwd())
+        .option('-o, --outputs <files...>', 'Output files (for complete action)')
+        .action(async (action, role, options) => {
+        try {
+            const workflowService = new harness_1.WorkflowService(options.repoPath, getWorkflowDeps());
+            if (!await workflowService.hasWorkflow()) {
+                ui.displayError('No workflow found. Run "workflow init <name>" first.');
+                process.exit(1);
+            }
+            if (action === 'start') {
+                await workflowService.startRole(role);
+                ui.displaySuccess(`Started role: ${harness_1.ROLE_DISPLAY_NAMES[role]}`);
+            }
+            else if (action === 'complete') {
+                await workflowService.completeRole(role, options.outputs || []);
+                ui.displaySuccess(`Completed role: ${harness_1.ROLE_DISPLAY_NAMES[role]}`);
+            }
+            else {
+                ui.displayError(`Unknown action: ${action}. Use 'start' or 'complete'.`);
+                process.exit(1);
+            }
+        }
+        catch (error) {
+            ui.displayError('Failed to manage role', error);
             process.exit(1);
         }
-    }
-    catch (error) {
-        ui.displayError('Failed to manage role', error);
-        process.exit(1);
-    }
-});
+    });
+    return workflowCommand;
+}
+const adminCommand = program
+    .command('admin')
+    .description('Advanced and low-level commands that are not part of the primary sync-focused CLI surface');
+registerExportRulesCommand(program);
+registerReportCommand(adminCommand);
+registerReportCommand(program, true);
+registerSkillCommands(adminCommand);
+registerSkillCommands(program, true);
+registerWorkflowCommands(adminCommand);
+registerWorkflowCommands(program, true);
+registerPreviewSplashCommand(adminCommand);
+registerPreviewSplashCommand(program, true);
 async function selectLocale() {
     const locale = await (0, themedPrompt_1.themedSelect)({
         message: t('prompts.language.select'),
@@ -630,7 +624,7 @@ async function selectLocale() {
 }
 async function runInteractive() {
     const projectPath = process.cwd();
-    const detector = new state_1.StateDetector({ projectPath });
+    const detector = new cli_1.StateDetector({ projectPath });
     const result = await detector.detect();
     // Detect smart defaults for display
     const defaults = await (0, prompts_1.detectSmartDefaults)(projectPath);
@@ -663,7 +657,7 @@ async function runInteractive() {
     }
     else {
         // Get quick stats only when we have context
-        const quickSyncService = new quickSync_1.QuickSyncService({
+        const quickSyncService = new cli_1.QuickSyncService({
             ui,
             t,
             version: version_1.VERSION,
@@ -713,7 +707,7 @@ async function runInteractive() {
 async function runFullMenu() {
     let exitRequested = false;
     while (!exitRequested) {
-        const detector = new state_1.StateDetector({ projectPath: process.cwd() });
+        const detector = new cli_1.StateDetector({ projectPath: process.cwd() });
         const state = await detector.detect();
         const isUnfilled = state.state === 'unfilled';
         const choices = isUnfilled
@@ -774,16 +768,13 @@ async function displayPendingFiles(contextDir) {
     console.log();
 }
 async function runMcpInstall() {
-    const mcpInstallService = new mcp_1.MCPInstallService({ ui, t, version: version_1.VERSION });
-    const supportedTools = mcpInstallService.getSupportedTools();
-    const detectedTools = await mcpInstallService.detectInstalledTools();
-    const mcpChoices = buildMcpToolChoices(supportedTools, detectedTools);
-    const { selectedTool } = await inquirer_1.default.prompt([{
-            type: 'list',
-            name: 'selectedTool',
-            message: t('commands.mcpInstall.selectTool'),
-            choices: mcpChoices,
-        }]);
+    const mcpInstallService = new cli_1.MCPInstallService({ ui, t, version: version_1.VERSION });
+    const selectedTool = await (0, cli_1.resolveMcpInstallToolSelection)({
+        isInteractive: true,
+        service: mcpInstallService,
+        t,
+        promptTool: ({ message, choices }) => (0, themedPrompt_1.themedSelect)({ message, choices }),
+    });
     const mcpResult = await mcpInstallService.run({
         tool: selectedTool,
         global: true,
@@ -896,8 +887,8 @@ async function runQuickSync() {
             skipSkills: false,
             skipDocs: false,
             agentTargets: ['claude', 'github'],
-            skillTargets: ['claude', 'gemini', 'codex'],
-            docTargets: ['cursor', 'claude', 'agents'],
+            skillTargets: ['claude', 'github', 'windsurf', 'codex', 'antigravity'],
+            docTargets: ['cursor', 'claude', 'github', 'gemini', 'agents'],
             force: false,
             dryRun: false,
             verbose: false,
@@ -950,8 +941,11 @@ async function runQuickSync() {
                     message: t('prompts.quickSync.selectSkillTargets'),
                     choices: [
                         { name: '.claude/skills (Claude Code)', value: 'claude', checked: true },
-                        { name: '.gemini/skills (Gemini CLI)', value: 'gemini', checked: true },
-                        { name: '.codex/skills (Codex CLI)', value: 'codex', checked: true },
+                        { name: '.github/skills (GitHub Copilot)', value: 'github', checked: true },
+                        { name: '.windsurf/skills (Windsurf)', value: 'windsurf', checked: true },
+                        { name: '.codex/skills (Codex compatibility)', value: 'codex', checked: true },
+                        { name: '.agents/workflows (Google Antigravity)', value: 'antigravity', checked: true },
+                        { name: '.gemini/skills (Gemini compatibility)', value: 'gemini', checked: false },
                     ],
                 },
             ]);
@@ -964,10 +958,12 @@ async function runQuickSync() {
                     name: 'targets',
                     message: t('prompts.quickSync.selectDocTargets'),
                     choices: [
-                        { name: '.cursorrules (Cursor AI)', value: 'cursor', checked: true },
+                        { name: '.cursor/rules (Cursor AI)', value: 'cursor', checked: true },
                         { name: 'CLAUDE.md (Claude Code)', value: 'claude', checked: true },
+                        { name: '.github/copilot-instructions.md (GitHub Copilot)', value: 'github', checked: true },
+                        { name: 'GEMINI.md (Gemini CLI)', value: 'gemini', checked: true },
                         { name: 'AGENTS.md (Universal)', value: 'agents', checked: true },
-                        { name: '.windsurfrules (Windsurf)', value: 'windsurf', checked: false },
+                        { name: '.windsurf/rules (Windsurf)', value: 'windsurf', checked: false },
                         { name: '.clinerules (Cline)', value: 'cline', checked: false },
                         { name: 'CONVENTIONS.md (Aider)', value: 'aider', checked: false },
                     ],
@@ -987,7 +983,7 @@ async function runQuickSync() {
             verbose: false,
         };
     }
-    const quickSyncService = new quickSync_1.QuickSyncService({
+    const quickSyncService = new cli_1.QuickSyncService({
         ui,
         t,
         version: version_1.VERSION,
@@ -1001,7 +997,7 @@ async function runQuickSync() {
 async function runReverseSync() {
     const projectPath = process.cwd();
     // Create service
-    const reverseSyncService = new reverseSync_1.ReverseQuickSyncService({
+    const reverseSyncService = new cli_1.ReverseQuickSyncService({
         ui,
         t,
         version: version_1.VERSION,
@@ -1161,10 +1157,6 @@ function handleGracefulExit() {
     ui.displaySuccess(t('success.interactive.goodbye'));
     process.exit(0);
 }
-// Handle SIGINT (Ctrl+C) at process level
-process.on('SIGINT', () => {
-    handleGracefulExit();
-});
 if (require.main === module) {
     main().catch(error => {
         if (isUserInterrupt(error)) {