@marktoflow/cli 2.0.3 → 2.0.4

package/dist/index.js

@@ -3,91 +3,49 @@
  * marktoflow CLI
  *
  * Agent automation framework with native MCP support.
+ * This file is the thin routing layer — all command logic lives in ./commands/.
  */
 import { Command } from 'commander';
-import chalk from 'chalk';
-import ora from 'ora';
-import { existsSync, mkdirSync, writeFileSync, readdirSync, statSync, readFileSync } from 'node:fs';
-import { join } from 'node:path';
-import { parseFile, WorkflowEngine, SDKRegistry, createSDKStepExecutor, StepStatus, WorkflowStatus, loadEnv, ToolRegistry, WorkflowBundle, Scheduler, TemplateRegistry, loadConfig, createCredentialManager, getAvailableBackends, EncryptionBackend, StateStore, } from '@marktoflow/core';
-import { registerIntegrations } from '@marktoflow/integrations';
+import { join, dirname } from 'node:path';
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { loadEnv } from '@marktoflow/core';
 import { workerCommand } from './worker.js';
 import { triggerCommand } from './trigger.js';
 import { serveCommand } from './serve.js';
+// Commands
+import { executeInit } from './commands/init.js';
 import { runWorkflowWizard, listTemplates } from './commands/new.js';
 import { runUpdateWizard, listAgents } from './commands/update.js';
-import { parse as parseYaml } from 'yaml';
-import { executeDryRun, displayDryRunSummary } from './commands/dry-run.js';
+import { executeRun } from './commands/run.js';
+import { executeWorkflowList } from './commands/workflow.js';
+import { executeAgentList, executeAgentInfo } from './commands/agent.js';
+import { executeToolsList } from './commands/tools.js';
+import { executeCredentialsList, executeCredentialsVerify } from './commands/credentials.js';
+import { executeScheduleList } from './commands/schedule.js';
+import { executeBundleList, executeBundleInfo, executeBundleValidate, executeBundleRun } from './commands/bundle.js';
+import { executeTemplateList } from './commands/template.js';
+import { executeConnect } from './commands/connect.js';
+import { executeDoctor } from './commands/doctor.js';
+import { executeGui } from './commands/gui.js';
 import { WorkflowDebugger, parseBreakpoints } from './commands/debug.js';
 import { executeTestConnection } from './commands/test-connection.js';
 import { executeHistory, executeHistoryDetail, executeReplay } from './commands/history.js';
-import { parseInputPairs, debugLogInputs, validateAndApplyDefaults, printMissingInputsError, overrideAgentInWorkflow, debugLogAgentOverride, overrideModelInWorkflow, detectAgents, detectAgent, getKnownAgentIds, } from './utils/index.js';
-const VERSION = '2.0.2';
+// Utils used by debug command
+import { parseInputPairs, validateAndApplyDefaults, printMissingInputsError, overrideAgentInWorkflow, overrideModelInWorkflow, getAgentSDKName, getAgentAuthConfig, } from './utils/index.js';
+import { parseFile, SDKRegistry, createSDKStepExecutor, loadConfig, } from '@marktoflow/core';
+import { registerIntegrations } from '@marktoflow/integrations';
+import { existsSync } from 'node:fs';
+import chalk from 'chalk';
+import ora from 'ora';
+// Read version from package.json
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const packageJsonPath = join(__dirname, '../package.json');
+const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
+const VERSION = packageJson.version;
 // Load environment variables from .env files on CLI startup
 loadEnv();
-function getConfig() {
-    return loadConfig(process.cwd());
-}
-function isBundle(path) {
-    try {
-        const stat = existsSync(path) ? statSync(path) : null;
-        if (!stat || !stat.isDirectory())
-            return false;
-        const entries = readdirSync(path);
-        return entries.some((name) => name.endsWith('.md') && name !== 'README.md');
-    }
-    catch {
-        return false;
-    }
-}
-/**
- * Map agent provider aliases to SDK names
- */
-function getAgentSDKName(provider) {
-    const providerMap = {
-        'claude': 'claude-agent',
-        'claude-agent': 'claude-agent',
-        'copilot': 'github-copilot',
-        'github-copilot': 'github-copilot',
-        'opencode': 'opencode',
-        'ollama': 'ollama',
-        'codex': 'codex',
-        'openai': 'openai',
-        'vllm': 'openai',
-        'openai-compatible': 'openai',
-    };
-    const normalized = provider.toLowerCase();
-    const sdkName = providerMap[normalized];
-    if (!sdkName) {
-        throw new Error(`Unknown agent provider: ${provider}. Available: ${Object.keys(providerMap).join(', ')}`);
-    }
-    return sdkName;
-}
-/**
- * Get default auth configuration for an agent provider
- */
-function getAgentAuthConfig(sdkName) {
-    const authConfigs = {
-        'claude-agent': {
-            api_key: '${ANTHROPIC_API_KEY}',
-        },
-        'github-copilot': {
-            token: '${GITHUB_TOKEN}',
-        },
-        'opencode': {},
-        'ollama': {
-            base_url: '${OLLAMA_BASE_URL:-http://localhost:11434}',
-        },
-        'codex': {
-            api_key: '${OPENAI_API_KEY}',
-        },
-        'openai': {
-            api_key: '${OPENAI_API_KEY}',
-            base_url: '${OPENAI_BASE_URL:-https://api.openai.com/v1}',
-        },
-    };
-    return authConfigs[sdkName] || {};
-}
 // ============================================================================
 // CLI Setup
 // ============================================================================
@@ -107,76 +65,7 @@ program
     .command('init')
     .description('Initialize a new marktoflow project')
     .option('-f, --force', 'Overwrite existing configuration')
-    .action(async (options) => {
-    const spinner = ora('Initializing marktoflow project...').start();
-    try {
-        const configDir = '.marktoflow';
-        const workflowsDir = join(configDir, 'workflows');
-        const credentialsDir = join(configDir, 'credentials');
-        if (existsSync(configDir) && !options.force) {
-            spinner.fail('Project already initialized. Use --force to reinitialize.');
-            return;
-        }
-        // Create directories
-        mkdirSync(workflowsDir, { recursive: true });
-        mkdirSync(credentialsDir, { recursive: true });
-        // Create example workflow
-        const exampleWorkflow = `---
-workflow:
-  id: hello-world
-  name: "Hello World"
-  version: "1.0.0"
-  description: "A simple example workflow"
-
-# Uncomment and configure to use Slack:
-# tools:
-#   slack:
-#     sdk: "@slack/web-api"
-#     auth:
-#       token: "\${SLACK_BOT_TOKEN}"
-
-steps:
-  - id: greet
-    action: core.log
-    inputs:
-      message: "Hello from marktoflow!"
----
-
-# Hello World Workflow
-
-This is a simple example workflow.
-
-## Step 1: Greet
-
-Outputs a greeting message.
-`;
-        writeFileSync(join(workflowsDir, 'hello-world.md'), exampleWorkflow);
-        // Create .gitignore for credentials
-        writeFileSync(join(credentialsDir, '.gitignore'), '# Ignore all credentials\n*\n!.gitignore\n');
-        spinner.succeed('Project initialized successfully!');
-        // Auto-detect agents
-        const agents = detectAgents();
-        const available = agents.filter((a) => a.available);
-        if (available.length > 0) {
-            console.log('\n' + chalk.bold('Detected agents:'));
-            for (const agent of available) {
-                const methodLabel = agent.method === 'cli' ? 'CLI' : agent.method === 'env' ? 'env' : 'server';
-                console.log(`  ${chalk.green('✓')} ${agent.name} (${methodLabel})`);
-            }
-        }
-        console.log('\n' + chalk.bold('Next steps:'));
-        console.log(`  1. Edit ${chalk.cyan('.marktoflow/workflows/hello-world.md')}`);
-        console.log(`  2. Run ${chalk.cyan('marktoflow run hello-world.md')}`);
-        console.log(`  3. Connect services: ${chalk.cyan('marktoflow connect slack')}`);
-        if (available.length === 0) {
-            console.log(`  4. Set up an AI agent: ${chalk.cyan('marktoflow agent list')}`);
-        }
-    }
-    catch (error) {
-        spinner.fail(`Initialization failed: ${error}`);
-        process.exit(1);
-    }
-});
+    .action(async (options) => executeInit(options));
 // --- new ---
 program
     .command('new')
@@ -224,314 +113,7 @@ program
     .option('-a, --agent <provider>', 'AI agent provider (claude-agent, openai, github-copilot, opencode, ollama, codex)')
     .option('-m, --model <name>', 'Model name to use (e.g., claude-sonnet-4, gpt-4, etc.)')
     .option('--dry-run', 'Parse workflow without executing')
-    .action(async (workflowPath, options) => {
-    const spinner = ora('Loading workflow...').start();
-    let stateStore;
-    try {
-        const config = getConfig();
-        const workflowsDir = config.workflows?.path ?? '.marktoflow/workflows';
-        // Resolve workflow path
-        let resolvedPath = workflowPath;
-        if (!existsSync(resolvedPath)) {
-            resolvedPath = join(workflowsDir, workflowPath);
-        }
-        if (!existsSync(resolvedPath)) {
-            spinner.fail(`Workflow not found: ${workflowPath}`);
-            process.exit(1);
-        }
-        // Parse workflow
-        const { workflow, warnings } = await parseFile(resolvedPath);
-        if (warnings.length > 0) {
-            spinner.warn('Workflow parsed with warnings:');
-            warnings.forEach((w) => console.log(chalk.yellow(`  - ${w}`)));
-        }
-        else {
-            spinner.succeed(`Loaded: ${workflow.metadata.name}`);
-        }
-        // Debug: Show workflow details
-        if (options.debug) {
-            console.log(chalk.gray('\n🐛 Debug: Workflow Details'));
-            console.log(chalk.gray(`  ID: ${workflow.metadata.id}`));
-            console.log(chalk.gray(`  Version: ${workflow.metadata.version}`));
-            console.log(chalk.gray(`  Steps: ${workflow.steps.length}`));
-            console.log(chalk.gray(`  Tools: ${Object.keys(workflow.tools).join(', ') || 'none'}`));
-            console.log(chalk.gray(`  Inputs Required: ${Object.keys(workflow.inputs || {}).join(', ') || 'none'}`));
-        }
-        // Parse inputs
-        const parsedInputs = parseInputPairs(options.input);
-        // Debug: Show parsed inputs
-        if (options.debug) {
-            debugLogInputs(parsedInputs);
-        }
-        // Validate required inputs and apply defaults
-        const validation = validateAndApplyDefaults(workflow, parsedInputs, { debug: options.debug });
-        if (!validation.valid) {
-            spinner.fail('Missing required inputs');
-            printMissingInputsError(workflow, validation.missingInputs, 'run', workflowPath);
-            process.exit(1);
-        }
-        const inputs = validation.inputs;
-        // Override AI agent if specified
-        if (options.agent) {
-            const sdkName = getAgentSDKName(options.agent);
-            const authConfig = getAgentAuthConfig(sdkName);
-            const result = overrideAgentInWorkflow(workflow, sdkName, authConfig, {
-                verbose: options.verbose,
-                debug: options.debug,
-            });
-            if (options.debug) {
-                debugLogAgentOverride(options.agent, sdkName, result.replacedCount, authConfig);
-            }
-        }
-        // Override model if specified
-        if (options.model) {
-            const result = overrideModelInWorkflow(workflow, options.model);
-            if (options.verbose || options.debug) {
-                if (result.overrideCount > 0) {
-                    console.log(chalk.cyan(`  Set model '${options.model}' for ${result.overrideCount} AI tool(s)`));
-                }
-            }
-            if (options.debug) {
-                console.log(chalk.gray('\n🐛 Debug: Model Override'));
-                console.log(chalk.gray(`  Model: ${options.model}`));
-                console.log(chalk.gray(`  Applied to ${result.overrideCount} AI tool(s)`));
-            }
-            if (result.overrideCount === 0 && (options.verbose || options.debug)) {
-                console.log(chalk.yellow(`  Warning: --model specified but no AI tools found in workflow`));
-            }
-        }
-        // Handle dry-run mode
-        if (options.dryRun) {
-            const dryRunResult = await executeDryRun(workflow, inputs, {
-                verbose: options.verbose,
-                showMockData: true,
-                showVariables: true,
-            });
-            displayDryRunSummary(dryRunResult, {
-                verbose: options.verbose,
-                showMockData: true,
-                showVariables: true,
-            });
-            return;
-        }
-        // Execute workflow
-        spinner.start('Executing workflow...');
-        // Debug: Show execution start
-        if (options.debug) {
-            console.log(chalk.gray('\n🐛 Debug: Starting Workflow Execution'));
-            console.log(chalk.gray(`  Workflow: ${workflow.metadata.name}`));
-            console.log(chalk.gray(`  Steps to execute: ${workflow.steps.length}`));
-        }
-        // Track which steps we've logged to avoid duplicate output on retries
-        const loggedSteps = new Set();
-        // Create StateStore for execution history
-        const stateDir = join(process.cwd(), '.marktoflow');
-        mkdirSync(stateDir, { recursive: true });
-        stateStore = new StateStore(join(stateDir, 'state.db'));
-        const engine = new WorkflowEngine({}, {
-            onStepStart: (step) => {
-                if (options.verbose || options.debug) {
-                    spinner.text = `Executing: ${step.id}`;
-                }
-                // Only log step start once (not on retries)
-                if (options.debug && !loggedSteps.has(step.id)) {
-                    console.log(chalk.gray(`\n🐛 Debug: Step Start - ${step.id}`));
-                    console.log(chalk.gray(`  Action: ${step.action || 'N/A'}`));
-                    if (step.inputs) {
-                        console.log(chalk.gray(`  Inputs: ${JSON.stringify(step.inputs, null, 2).split('\n').join('\n  ')}`));
-                    }
-                    loggedSteps.add(step.id);
-                }
-            },
-            onStepComplete: (step, result) => {
-                if (options.verbose || options.debug) {
-                    const icon = result.status === StepStatus.COMPLETED ? '✓' : '✗';
-                    console.log(`  ${icon} ${step.id}: ${result.status}`);
-                }
-                if (options.debug) {
-                    console.log(chalk.gray(`\n🐛 Debug: Step Complete - ${step.id}`));
-                    console.log(chalk.gray(`  Status: ${result.status}`));
-                    console.log(chalk.gray(`  Duration: ${result.duration}ms`));
-                    // Show output variable name if set
-                    if (step.outputVariable) {
-                        console.log(chalk.gray(`  Output Variable: ${step.outputVariable}`));
-                    }
-                    // Show full output in debug mode (not truncated)
-                    if (result.output !== undefined) {
-                        let outputStr;
-                        if (typeof result.output === 'string') {
-                            outputStr = result.output;
-                        }
-                        else {
-                            outputStr = JSON.stringify(result.output, null, 2);
-                        }
-                        // Split into lines and indent each line
-                        const lines = outputStr.split('\n');
-                        if (lines.length > 50) {
-                            // If output is very large (>50 lines), show first 40 and last 5 lines
-                            console.log(chalk.gray(`  Output (${lines.length} lines):`));
-                            lines.slice(0, 40).forEach(line => console.log(chalk.gray(`    ${line}`)));
-                            console.log(chalk.gray(`    ... (${lines.length - 45} lines omitted) ...`));
-                            lines.slice(-5).forEach(line => console.log(chalk.gray(`    ${line}`)));
-                        }
-                        else {
-                            console.log(chalk.gray(`  Output:`));
-                            lines.forEach(line => console.log(chalk.gray(`    ${line}`)));
-                        }
-                    }
-                    if (result.error) {
-                        console.log(chalk.red(`  Error: ${result.error}`));
-                    }
-                }
-            },
-        }, stateStore);
-        // Set workflow path for execution history
-        engine.workflowPath = resolvedPath;
-        const registry = new SDKRegistry();
-        registerIntegrations(registry);
-        registry.registerTools(workflow.tools);
-        // Debug: Show registered tools
-        if (options.debug) {
-            console.log(chalk.gray('\n🐛 Debug: SDK Registry'));
-            console.log(chalk.gray(`  Registered tools: ${Object.keys(workflow.tools).join(', ')}`));
-        }
-        const result = await engine.execute(workflow, inputs, registry, createSDKStepExecutor());
-        if (result.status === WorkflowStatus.COMPLETED) {
-            spinner.succeed(`Workflow completed in ${result.duration}ms`);
-        }
-        else {
-            spinner.fail(`Workflow failed: ${result.error}`);
-            // Debug: Show detailed error information
-            if (options.debug) {
-                console.log(chalk.red('\n🐛 Debug: Failure Details'));
-                console.log(chalk.red(`  Error: ${result.error}`));
-                // Find the failed step
-                const failedStep = result.stepResults.find(s => s.status === StepStatus.FAILED);
-                if (failedStep) {
-                    console.log(chalk.red(`  Failed Step: ${failedStep.stepId}`));
-                    console.log(chalk.red(`  Step Duration: ${failedStep.duration}ms`));
-                    if (failedStep.error) {
-                        console.log(chalk.red(`  Step Error: ${failedStep.error}`));
-                        // Extract detailed error information
-                        const errorObj = typeof failedStep.error === 'object' ? failedStep.error : null;
-                        if (errorObj) {
-                            // HTTP error details (Axios, fetch, etc.)
-                            if (errorObj.response) {
-                                console.log(chalk.red('\n  HTTP Error Details:'));
-                                console.log(chalk.red(`    Status: ${errorObj.response.status} ${errorObj.response.statusText || ''}`));
-                                if (errorObj.config?.url) {
-                                    console.log(chalk.red(`    URL: ${errorObj.config.method?.toUpperCase() || 'GET'} ${errorObj.config.url}`));
-                                }
-                                if (errorObj.response.data) {
-                                    console.log(chalk.red(`    Response Body:`));
-                                    try {
-                                        const responseStr = typeof errorObj.response.data === 'string'
-                                            ? errorObj.response.data
-                                            : JSON.stringify(errorObj.response.data, null, 2);
-                                        const lines = responseStr.split('\n').slice(0, 20); // First 20 lines
-                                        lines.forEach((line) => console.log(chalk.red(`      ${line}`)));
-                                        if (responseStr.split('\n').length > 20) {
-                                            console.log(chalk.red(`      ... (truncated)`));
-                                        }
-                                    }
-                                    catch {
-                                        console.log(chalk.red(`      [Unable to serialize response]`));
-                                    }
-                                }
-                                if (errorObj.response.headers) {
-                                    console.log(chalk.red(`    Response Headers:`));
-                                    const headers = errorObj.response.headers;
-                                    Object.keys(headers).slice(0, 10).forEach((key) => {
-                                        console.log(chalk.red(`      ${key}: ${headers[key]}`));
-                                    });
-                                }
-                            }
-                            // Request details
-                            if (errorObj.config && !errorObj.response) {
-                                console.log(chalk.red('\n  Request Details:'));
-                                if (errorObj.config.url) {
-                                    console.log(chalk.red(`    URL: ${errorObj.config.method?.toUpperCase() || 'GET'} ${errorObj.config.url}`));
-                                }
-                                if (errorObj.config.baseURL) {
-                                    console.log(chalk.red(`    Base URL: ${errorObj.config.baseURL}`));
-                                }
-                                if (errorObj.code) {
-                                    console.log(chalk.red(`    Error Code: ${errorObj.code}`));
-                                }
-                            }
-                            // Stack trace
-                            if (errorObj.stack) {
-                                console.log(chalk.red('\n  Stack Trace:'));
-                                const stack = errorObj.stack.split('\n').slice(0, 15); // First 15 lines
-                                stack.forEach((line) => console.log(chalk.red(`    ${line}`)));
-                                if (errorObj.stack.split('\n').length > 15) {
-                                    console.log(chalk.red(`    ... (truncated)`));
-                                }
-                            }
-                        }
-                    }
-                    if (failedStep.output) {
-                        console.log(chalk.red(`  Output: ${JSON.stringify(failedStep.output, null, 2)}`));
-                    }
-                }
-                // Show context from previous steps
-                console.log(chalk.yellow('\n🐛 Debug: Execution Context'));
-                console.log(chalk.yellow(`  Total steps executed: ${result.stepResults.length}`));
-                console.log(chalk.yellow(`  Steps before failure:`));
-                result.stepResults.slice(0, -1).forEach(stepResult => {
-                    console.log(chalk.yellow(`    - ${stepResult.stepId}: ${stepResult.status}`));
-                });
-            }
-            process.exit(1);
-        }
-        // Show summary
-        console.log('\n' + chalk.bold('Summary:'));
-        console.log(`  Status: ${result.status}`);
-        console.log(`  Duration: ${result.duration}ms`);
-        console.log(`  Steps: ${result.stepResults.length}`);
-        const completed = result.stepResults.filter((s) => s.status === StepStatus.COMPLETED).length;
-        const failed = result.stepResults.filter((s) => s.status === StepStatus.FAILED).length;
-        const skipped = result.stepResults.filter((s) => s.status === StepStatus.SKIPPED).length;
-        console.log(`  Completed: ${completed}, Failed: ${failed}, Skipped: ${skipped}`);
-        // Close StateStore and exit successfully to avoid hanging due to open SDK connections
-        stateStore.close();
-        process.exit(0);
-    }
-    catch (error) {
-        spinner.fail(`Execution failed: ${error}`);
-        // Debug: Show full error details with stack trace
-        if (options.debug) {
-            console.log(chalk.red('\n🐛 Debug: Unhandled Error Details'));
-            console.log(chalk.red(`  Error Type: ${error instanceof Error ? error.constructor.name : typeof error}`));
-            console.log(chalk.red(`  Error Message: ${error instanceof Error ? error.message : String(error)}`));
-            if (error instanceof Error && error.stack) {
-                console.log(chalk.red('\n  Stack Trace:'));
-                error.stack.split('\n').forEach(line => {
-                    console.log(chalk.red(`    ${line}`));
-                });
-            }
-            // Show error properties if available
-            if (error && typeof error === 'object') {
-                const errorObj = error;
-                const keys = Object.keys(errorObj).filter(k => k !== 'stack' && k !== 'message');
-                if (keys.length > 0) {
-                    console.log(chalk.red('\n  Additional Error Properties:'));
-                    keys.forEach(key => {
-                        try {
-                            console.log(chalk.red(`    ${key}: ${JSON.stringify(errorObj[key], null, 2)}`));
-                        }
-                        catch {
-                            console.log(chalk.red(`    ${key}: [Unable to serialize]`));
-                        }
-                    });
-                }
-            }
-        }
-        // Close StateStore if it was created
-        stateStore?.close();
-        process.exit(1);
-    }
-});
+    .action(async (workflowPath, options) => executeRun(workflowPath, options));
 // --- debug ---
 program
     .command('debug <workflow>')
@@ -544,9 +126,8 @@ program
     .action(async (workflowPath, options) => {
     const spinner = ora('Loading workflow for debugging...').start();
     try {
-        const config = getConfig();
+        const config = loadConfig(process.cwd());
         const workflowsDir = config.workflows?.path ?? '.marktoflow/workflows';
-        // Resolve workflow path
         let resolvedPath = workflowPath;
         if (!existsSync(resolvedPath)) {
             resolvedPath = join(workflowsDir, workflowPath);
@@ -555,7 +136,6 @@ program
             spinner.fail(`Workflow not found: ${workflowPath}`);
             process.exit(1);
         }
-        // Parse workflow
         const { workflow, warnings } = await parseFile(resolvedPath);
         if (warnings.length > 0) {
             spinner.warn('Workflow parsed with warnings:');
@@ -564,7 +144,6 @@ program
         else {
             spinner.succeed(`Loaded: ${workflow.metadata.name}`);
         }
-        // Parse and validate inputs
         const parsedInputs = parseInputPairs(options.input);
         const validation = validateAndApplyDefaults(workflow, parsedInputs);
         if (!validation.valid) {
@@ -573,28 +152,22 @@ program
             process.exit(1);
         }
         const inputs = validation.inputs;
-        // Override AI agent if specified
         if (options.agent) {
             const sdkName = getAgentSDKName(options.agent);
             const authConfig = getAgentAuthConfig(sdkName);
             overrideAgentInWorkflow(workflow, sdkName, authConfig);
         }
-        // Override model if specified
         if (options.model) {
             overrideModelInWorkflow(workflow, options.model);
         }
-        // Parse breakpoints
         const breakpoints = options.breakpoint ? parseBreakpoints(options.breakpoint) : [];
-        // Setup SDK registry and executor
         const registry = new SDKRegistry();
         registerIntegrations(registry);
         registry.registerTools(workflow.tools);
-        // Create debugger
         const workflowDebugger = new WorkflowDebugger(workflow, inputs, registry, createSDKStepExecutor(), {
             breakpoints,
             autoStart: options.autoStart,
         });
-        // Start debugging session
         await workflowDebugger.debug();
     }
     catch (error) {
@@ -608,108 +181,23 @@ program
     .description('Workflow management')
     .command('list')
     .description('List available workflows')
-    .action(async () => {
-    const workflowsDir = getConfig().workflows?.path ?? '.marktoflow/workflows';
-    if (!existsSync(workflowsDir)) {
-        console.log(chalk.yellow('No workflows found. Run `marktoflow init` first.'));
-        return;
-    }
-    const { readdirSync } = await import('node:fs');
-    const files = readdirSync(workflowsDir).filter((f) => f.endsWith('.md'));
-    if (files.length === 0) {
-        console.log(chalk.yellow('No workflows found.'));
-        return;
-    }
-    console.log(chalk.bold('Available Workflows:'));
-    for (const file of files) {
-        try {
-            const { workflow } = await parseFile(join(workflowsDir, file));
-            console.log(`  ${chalk.cyan(file)}: ${workflow.metadata.name}`);
-        }
-        catch {
-            console.log(`  ${chalk.red(file)}: (invalid)`);
-        }
-    }
-});
+    .action(async () => executeWorkflowList());
 // --- agent ---
 const agentCmd = program.command('agent').description('Agent management');
 agentCmd
     .command('list')
     .description('List available agents')
-    .action(() => {
-    const agents = detectAgents();
-    console.log(chalk.bold('Available Agents:\n'));
-    for (const agent of agents) {
-        if (agent.available) {
-            const methodLabel = agent.method === 'cli' ? 'CLI found' : agent.method === 'env' ? 'env var set' : 'server running';
-            console.log(`  ${chalk.cyan(agent.id)}  ${chalk.green('Available')} (${methodLabel})`);
-        }
-        else {
-            console.log(`  ${chalk.cyan(agent.id)}  ${chalk.yellow('Not configured')} — ${agent.configHint}`);
-        }
-    }
-    console.log(`\n  Config: ${chalk.dim('.marktoflow/agents/capabilities.yaml')}`);
-});
+    .action(() => executeAgentList());
 agentCmd
     .command('info <agent>')
     .description('Show agent information')
-    .action((agentId) => {
-    const detected = detectAgent(agentId);
-    if (!detected) {
-        const known = getKnownAgentIds();
-        console.log(chalk.red(`Unknown agent: ${agentId}`));
-        console.log(`Known agents: ${known.join(', ')}`);
-        process.exit(1);
-    }
-    console.log(chalk.bold(detected.name) + ` (${detected.id})\n`);
-    if (detected.available) {
-        const methodLabel = detected.method === 'cli' ? 'CLI found on PATH' : detected.method === 'env' ? 'Environment variable set' : 'Server running';
-        console.log(`  Status:  ${chalk.green('Available')}`);
-        console.log(`  Method:  ${methodLabel}`);
-    }
-    else {
-        console.log(`  Status:  ${chalk.yellow('Not configured')}`);
-        console.log(`  Setup:   ${detected.configHint}`);
-    }
-    // Show config file info if it exists
-    const capabilitiesPath = join('.marktoflow', 'agents', 'capabilities.yaml');
-    if (existsSync(capabilitiesPath)) {
-        const content = readFileSync(capabilitiesPath, 'utf8');
-        const data = parseYaml(content);
-        const fileInfo = data?.agents?.[agentId];
-        if (fileInfo) {
-            console.log(`\n  ${chalk.dim('From capabilities.yaml:')}`);
-            if (fileInfo.version)
-                console.log(`  Version:  ${fileInfo.version}`);
-            if (fileInfo.provider)
-                console.log(`  Provider: ${fileInfo.provider}`);
-        }
-    }
-});
+    .action((agentId) => executeAgentInfo(agentId));
 // --- tools ---
 const toolsCmd = program.command('tools').description('Tool management');
 toolsCmd
     .command('list')
     .description('List available tools')
-    .action(() => {
-    const registryPath = getConfig().tools?.registryPath ?? join('.marktoflow', 'tools', 'registry.yaml');
-    if (!existsSync(registryPath)) {
-        console.log(chalk.yellow("No tool registry found. Run 'marktoflow init' first."));
-        return;
-    }
-    const registry = new ToolRegistry(registryPath);
-    const tools = registry.listTools();
-    if (tools.length === 0) {
-        console.log(chalk.yellow('No tools registered.'));
-        return;
-    }
-    console.log(chalk.bold('Registered Tools:'));
-    for (const toolName of tools) {
-        const definition = registry.getDefinition(toolName);
-        const types = definition?.implementations.map((impl) => impl.type).join(', ') ?? '';
-        console.log(`  ${chalk.cyan(toolName)} ${types ? `(${types})` : ''}`);
-    }
-});
+    .action(() => executeToolsList());
 // --- credentials ---
 const credentialsCmd = program.command('credentials').description('Credential management');
 credentialsCmd
@@ -719,221 +207,44 @@ credentialsCmd
     .option('--backend <backend>', 'Encryption backend (aes-256-gcm, fernet, age, gpg)')
     .option('--tag <tag>', 'Filter by tag')
     .option('--show-expired', 'Include expired credentials')
-    .action((options) => {
-    try {
-        const stateDir = options.stateDir;
-        const backend = options.backend ?? undefined;
-        const manager = createCredentialManager({ stateDir, backend });
-        const credentials = manager.list(options.tag, options.showExpired);
-        if (credentials.length === 0) {
-            console.log(chalk.yellow('No credentials found.'));
-            return;
-        }
-        console.log(chalk.bold(`Credentials (${credentials.length}):\n`));
-        for (const cred of credentials) {
-            const expired = cred.expiresAt && cred.expiresAt < new Date();
-            const status = expired ? chalk.red(' [EXPIRED]') : '';
-            console.log(`  ${chalk.cyan(cred.name)}${status}`);
-            console.log(`    Type: ${cred.credentialType}`);
-            if (cred.description) {
-                console.log(`    Description: ${cred.description}`);
-            }
-            console.log(`    Created: ${cred.createdAt.toISOString()}`);
-            console.log(`    Updated: ${cred.updatedAt.toISOString()}`);
-            if (cred.expiresAt) {
-                console.log(`    Expires: ${cred.expiresAt.toISOString()}`);
-            }
-            if (cred.tags.length > 0) {
-                console.log(`    Tags: ${cred.tags.join(', ')}`);
-            }
-            console.log();
-        }
-    }
-    catch (error) {
-        console.log(chalk.red(`Failed to list credentials: ${error}`));
-        process.exit(1);
-    }
-});
+    .action((options) => executeCredentialsList(options));
 credentialsCmd
     .command('verify')
     .description('Verify credential encryption is working')
     .option('--state-dir <path>', 'State directory', join('.marktoflow', 'credentials'))
     .option('--backend <backend>', 'Encryption backend (aes-256-gcm, fernet, age, gpg)')
-    .action((options) => {
-    try {
-        const stateDir = options.stateDir;
-        const backend = options.backend ?? undefined;
-        console.log(chalk.bold('Credential Encryption Verification\n'));
-        // Show available backends
-        const backends = getAvailableBackends();
-        console.log(chalk.bold('Available backends:'));
-        for (const b of backends) {
-            const isDefault = b === EncryptionBackend.AES_256_GCM;
-            const marker = isDefault ? chalk.green(' (default)') : '';
-            const selected = (backend ?? EncryptionBackend.AES_256_GCM) === b ? chalk.cyan(' <-- selected') : '';
-            console.log(`  ${chalk.cyan(b)}${marker}${selected}`);
-        }
-        console.log();
-        // Test encrypt/decrypt round-trip
-        const manager = createCredentialManager({ stateDir, backend });
-        const testValue = `verify-test-${Date.now()}`;
-        const testName = `__verify_test_${Date.now()}`;
-        console.log('Testing encrypt/decrypt round-trip...');
-        manager.set({ name: testName, value: testValue, tags: ['__test'] });
-        const decrypted = manager.get(testName);
-        if (decrypted === testValue) {
-            console.log(chalk.green('  Round-trip: PASS'));
-        }
-        else {
-            console.log(chalk.red('  Round-trip: FAIL'));
-            console.log(chalk.red(`    Expected: ${testValue}`));
-            console.log(chalk.red(`    Got: ${decrypted}`));
-            process.exit(1);
-        }
-        // Verify stored value is encrypted (not plain text)
-        const raw = manager.get(testName, false);
-        if (raw !== testValue) {
-            console.log(chalk.green('  Encryption: PASS (stored value is encrypted)'));
-        }
-        else {
-            console.log(chalk.red('  Encryption: FAIL (stored value is plain text)'));
-            process.exit(1);
-        }
-        // Cleanup test credential
-        manager.delete(testName);
-        console.log(chalk.green('\n  All checks passed.'));
-        // Show credential count
-        const credentials = manager.list();
-        console.log(`\n  Stored credentials: ${credentials.length}`);
-    }
-    catch (error) {
-        console.log(chalk.red(`Verification failed: ${error}`));
-        process.exit(1);
-    }
-});
+    .action((options) => executeCredentialsVerify(options));
 // --- schedule ---
 const scheduleCmd = program.command('schedule').description('Scheduler management');
 scheduleCmd
     .command('list')
     .description('List scheduled workflows')
-    .action(() => {
-    const scheduler = new Scheduler();
-    const jobs = scheduler.listJobs();
-    if (jobs.length === 0) {
-        console.log(chalk.yellow('No scheduled workflows found.'));
-        console.log('Add schedule triggers to your workflows to enable scheduling.');
-        return;
-    }
-    console.log(chalk.bold('Scheduled Workflows:'));
-    for (const job of jobs) {
-        console.log(`  ${chalk.cyan(job.id)} ${job.workflowPath} (${job.schedule})`);
-    }
-});
+    .action(() => executeScheduleList());
 // --- bundle ---
 const bundleCmd = program.command('bundle').description('Workflow bundle commands');
 bundleCmd
     .command('list [path]')
     .description('List workflow bundles in a directory')
-    .action((path = '.') => {
-    if (!existsSync(path)) {
-        console.log(chalk.red(`Path not found: ${path}`));
-        process.exit(1);
-    }
-    const entries = readdirSync(path, { withFileTypes: true });
-    const bundles = [];
-    for (const entry of entries) {
-        if (!entry.isDirectory())
-            continue;
-        const fullPath = join(path, entry.name);
-        if (isBundle(fullPath))
-            bundles.push(fullPath);
-    }
-    if (bundles.length === 0) {
-        console.log(chalk.yellow(`No bundles found in ${path}`));
-        return;
-    }
-    console.log(chalk.bold('Bundles:'));
-    for (const bundlePath of bundles) {
-        console.log(`  ${chalk.cyan(bundlePath)}`);
-    }
-});
+    .action((path) => executeBundleList(path));
 bundleCmd
     .command('info <path>')
     .description('Show information about a workflow bundle')
-    .action(async (path) => {
-    if (!isBundle(path)) {
-        console.log(chalk.red(`Not a valid bundle: ${path}`));
-        process.exit(1);
-    }
-    const bundle = new WorkflowBundle(path);
-    const workflow = await bundle.loadWorkflow();
-    const tools = bundle.loadTools().listTools();
-    console.log(chalk.bold(`Bundle: ${bundle.name}`));
-    console.log(`  Workflow: ${workflow.metadata.name} (${workflow.metadata.id})`);
-    console.log(`  Steps: ${workflow.steps.length}`);
-    console.log(`  Tools: ${tools.length ? tools.join(', ') : 'none'}`);
-});
+    .action(async (path) => executeBundleInfo(path));
 bundleCmd
     .command('validate <path>')
     .description('Validate a workflow bundle')
-    .action(async (path) => {
-    if (!isBundle(path)) {
-        console.log(chalk.red(`Not a valid bundle: ${path}`));
-        process.exit(1);
-    }
-    try {
-        const bundle = new WorkflowBundle(path);
-        await bundle.loadWorkflow();
-        console.log(chalk.green(`Bundle '${bundle.name}' is valid.`));
-    }
-    catch (error) {
-        console.log(chalk.red(`Bundle validation failed: ${error}`));
-        process.exit(1);
-    }
-});
+    .action(async (path) => executeBundleValidate(path));
 bundleCmd
     .command('run <path>')
     .description('Run a workflow bundle')
     .option('-i, --input <key=value...>', 'Input parameters')
-    .action(async (path, options) => {
-    if (!isBundle(path)) {
-        console.log(chalk.red(`Not a valid bundle: ${path}`));
-        process.exit(1);
-    }
-    const bundle = new WorkflowBundle(path);
-    const workflow = await bundle.loadWorkflowWithBundleTools();
-    // Parse and validate inputs
-    const parsedInputs = parseInputPairs(options.input);
-    const validation = validateAndApplyDefaults(workflow, parsedInputs);
-    if (!validation.valid) {
-        printMissingInputsError(workflow, validation.missingInputs, 'bundle run', path);
-        process.exit(1);
-    }
-    const inputs = validation.inputs;
-    const engine = new WorkflowEngine();
-    const registry = new SDKRegistry();
-    registerIntegrations(registry);
-    registry.registerTools(workflow.tools);
-    const result = await engine.execute(workflow, inputs, registry, createSDKStepExecutor());
-    console.log(chalk.bold(`Bundle completed: ${result.status}`));
-});
+    .action(async (path, options) => executeBundleRun(path, options));
 // --- template ---
 const templateCmd = program.command('template').description('Workflow template commands');
 templateCmd
     .command('list')
     .description('List workflow templates')
-    .action(() => {
-    const registry = new TemplateRegistry();
-    const templates = registry.list();
-    if (!templates.length) {
-        console.log(chalk.yellow('No templates found.'));
-        return;
-    }
-    console.log(chalk.bold('Templates:'));
-    for (const template of templates) {
-        console.log(`  ${chalk.cyan(template.id)}: ${template.name}`);
-    }
-});
+    .action(() => executeTemplateList());
 // --- connect ---
 program
     .command('connect <service>')
@@ -942,262 +253,12 @@ program
     .option('--client-secret <secret>', 'OAuth client secret')
     .option('--tenant-id <tenant>', 'Microsoft tenant ID (for Outlook)')
     .option('--port <port>', 'Port for OAuth callback server (default: 8484)', '8484')
-    .action(async (service, options) => {
-    const serviceLower = service.toLowerCase();
-    console.log(chalk.bold(`Connecting ${service}...`));
-    // Services that support OAuth flow
-    if (serviceLower === 'gmail') {
-        const clientId = options.clientId ?? process.env.GOOGLE_CLIENT_ID;
-        const clientSecret = options.clientSecret ?? process.env.GOOGLE_CLIENT_SECRET;
-        const port = parseInt(options.port, 10);
-        if (!clientId || !clientSecret) {
-            console.log(chalk.yellow('\nGmail OAuth requires client credentials.'));
-            console.log('\nTo connect Gmail:');
-            console.log('  1. Go to https://console.cloud.google.com/');
-            console.log('  2. Create OAuth 2.0 credentials (Desktop app type)');
-            console.log('  3. Run: marktoflow connect gmail --client-id YOUR_ID --client-secret YOUR_SECRET');
-            console.log('\nOr set environment variables:');
-            console.log('  export GOOGLE_CLIENT_ID="your-client-id"');
-            console.log('  export GOOGLE_CLIENT_SECRET="your-client-secret"');
-            return;
-        }
-        try {
-            const { runGmailOAuth } = await import('./oauth.js');
-            const tokens = await runGmailOAuth({ clientId, clientSecret, port });
-            console.log(chalk.green('\nGmail connected successfully!'));
-            console.log(chalk.dim(`Access token expires: ${tokens.expires_at ? new Date(tokens.expires_at).toISOString() : 'unknown'}`));
-            console.log('\nYou can now use Gmail in your workflows:');
-            console.log(chalk.cyan(`  tools:
-    gmail:
-      sdk: "googleapis"
-      auth:
-        client_id: "\${GOOGLE_CLIENT_ID}"
-        client_secret: "\${GOOGLE_CLIENT_SECRET}"
-        redirect_uri: "http://localhost:${port}/callback"
-        refresh_token: "\${GMAIL_REFRESH_TOKEN}"`));
-            process.exit(0);
-        }
-        catch (error) {
-            console.log(chalk.red(`\nOAuth failed: ${error}`));
-            process.exit(1);
-        }
-    }
-    // Handle other Google services (Drive, Sheets, Calendar, Docs, Workspace)
-    if (serviceLower === 'google-drive' ||
-        serviceLower === 'drive' ||
-        serviceLower === 'google-sheets' ||
-        serviceLower === 'sheets' ||
-        serviceLower === 'google-calendar' ||
-        serviceLower === 'calendar' ||
-        serviceLower === 'google-docs' ||
-        serviceLower === 'docs' ||
-        serviceLower === 'google-workspace' ||
-        serviceLower === 'workspace') {
-        const clientId = options.clientId ?? process.env.GOOGLE_CLIENT_ID;
-        const clientSecret = options.clientSecret ?? process.env.GOOGLE_CLIENT_SECRET;
-        const port = parseInt(options.port, 10);
-        if (!clientId || !clientSecret) {
-            console.log(chalk.yellow('\nGoogle OAuth requires client credentials.'));
-            console.log('\nTo connect Google services:');
-            console.log('  1. Go to https://console.cloud.google.com/');
-            console.log('  2. Enable the API for your service (Drive, Sheets, etc.)');
-            console.log('  3. Create OAuth 2.0 credentials (Desktop app type)');
-            console.log(`  4. Run: marktoflow connect ${service} --client-id YOUR_ID --client-secret YOUR_SECRET`);
-            console.log('\nOr set environment variables:');
-            console.log('  export GOOGLE_CLIENT_ID="your-client-id"');
-            console.log('  export GOOGLE_CLIENT_SECRET="your-client-secret"');
-            return;
-        }
-        try {
-            const { runGoogleOAuth } = await import('./oauth.js');
-            const tokens = await runGoogleOAuth(serviceLower, { clientId, clientSecret, port });
-            console.log(chalk.dim(`Access token expires: ${tokens.expires_at ? new Date(tokens.expires_at).toISOString() : 'unknown'}`));
-            // Normalize service name for display
-            const normalizedService = serviceLower.startsWith('google-')
-                ? serviceLower
-                : `google-${serviceLower}`;
-            console.log('\nYou can now use this service in your workflows:');
-            console.log(chalk.cyan(`  tools:
-    ${serviceLower.replace('google-', '')}:
-      sdk: "${normalizedService}"
-      auth:
-        client_id: "\${GOOGLE_CLIENT_ID}"
-        client_secret: "\${GOOGLE_CLIENT_SECRET}"
-        redirect_uri: "http://localhost:${port}/callback"
-        refresh_token: "\${GOOGLE_REFRESH_TOKEN}"
-        access_token: "\${GOOGLE_ACCESS_TOKEN}"`));
-            process.exit(0);
-        }
-        catch (error) {
-            console.log(chalk.red(`\nOAuth failed: ${error}`));
-            process.exit(1);
-        }
-    }
-    if (serviceLower === 'outlook' || serviceLower === 'microsoft') {
-        const clientId = options.clientId ?? process.env.MICROSOFT_CLIENT_ID;
-        const clientSecret = options.clientSecret ?? process.env.MICROSOFT_CLIENT_SECRET;
-        const tenantId = options.tenantId ?? process.env.MICROSOFT_TENANT_ID;
-        const port = parseInt(options.port, 10);
-        if (!clientId) {
-            console.log(chalk.yellow('\nOutlook OAuth requires a client ID.'));
-            console.log('\nTo connect Outlook/Microsoft Graph:');
-            console.log('  1. Go to https://portal.azure.com/');
-            console.log('  2. Register an application in Azure AD');
-            console.log(`  3. Add redirect URI: http://localhost:${port}/callback`);
-            console.log('  4. Grant Mail.Read, Mail.Send, Calendars.ReadWrite permissions');
-            console.log('  5. Run: marktoflow connect outlook --client-id YOUR_ID');
-            console.log('\nOr set environment variables:');
-            console.log('  export MICROSOFT_CLIENT_ID="your-client-id"');
-            console.log('  export MICROSOFT_CLIENT_SECRET="your-client-secret"  # optional');
-            console.log('  export MICROSOFT_TENANT_ID="common"  # or your tenant ID');
-            return;
-        }
-        try {
-            const { runOutlookOAuth } = await import('./oauth.js');
-            const tokens = await runOutlookOAuth({ clientId, clientSecret, tenantId, port });
-            console.log(chalk.green('\nOutlook connected successfully!'));
-            console.log(chalk.dim(`Access token expires: ${tokens.expires_at ? new Date(tokens.expires_at).toISOString() : 'unknown'}`));
-            console.log('\nYou can now use Outlook in your workflows:');
-            console.log(chalk.cyan(`  tools:
-    outlook:
-      sdk: "@microsoft/microsoft-graph-client"
-      auth:
-        token: "\${OUTLOOK_ACCESS_TOKEN}"`));
-            process.exit(0);
-        }
-        catch (error) {
-            console.log(chalk.red(`\nOAuth failed: ${error}`));
-            process.exit(1);
-        }
-    }
-    // Other services - show manual setup instructions
-    console.log('\nManual setup required. Set environment variables:');
-    switch (serviceLower) {
-        case 'slack':
-            console.log(`  export SLACK_BOT_TOKEN="xoxb-your-token"`);
-            console.log(`  export SLACK_APP_TOKEN="xapp-your-token"`);
-            console.log(chalk.dim('\n  Get tokens from https://api.slack.com/apps'));
-            break;
-        case 'github':
-            console.log(`  export GITHUB_TOKEN="ghp_your-token"`);
-            console.log(chalk.dim('\n  Create token at https://github.com/settings/tokens'));
-            break;
-        case 'jira':
-            console.log(`  export JIRA_HOST="https://your-domain.atlassian.net"`);
-            console.log(`  export JIRA_EMAIL="your-email@example.com"`);
-            console.log(`  export JIRA_API_TOKEN="your-api-token"`);
-            console.log(chalk.dim('\n  Create token at https://id.atlassian.com/manage-profile/security/api-tokens'));
-            break;
-        case 'confluence':
-            console.log(`  export CONFLUENCE_HOST="https://your-domain.atlassian.net"`);
-            console.log(`  export CONFLUENCE_EMAIL="your-email@example.com"`);
-            console.log(`  export CONFLUENCE_API_TOKEN="your-api-token"`);
-            console.log(chalk.dim('\n  Create token at https://id.atlassian.com/manage-profile/security/api-tokens'));
-            break;
-        case 'linear':
-            console.log(`  export LINEAR_API_KEY="lin_api_your-key"`);
-            console.log(chalk.dim('\n  Create key at https://linear.app/settings/api'));
-            break;
-        case 'notion':
-            console.log(`  export NOTION_TOKEN="secret_your-token"`);
-            console.log(chalk.dim('\n  Create integration at https://www.notion.so/my-integrations'));
-            break;
-        case 'discord':
-            console.log(`  export DISCORD_BOT_TOKEN="your-bot-token"`);
-            console.log(chalk.dim('\n  Create bot at https://discord.com/developers/applications'));
-            break;
-        case 'airtable':
-            console.log(`  export AIRTABLE_TOKEN="pat_your-token"`);
-            console.log(`  export AIRTABLE_BASE_ID="appXXXXX"  # optional default base`);
-            console.log(chalk.dim('\n  Create token at https://airtable.com/create/tokens'));
-            break;
-        case 'anthropic':
-            console.log(`  export ANTHROPIC_API_KEY="sk-ant-your-key"`);
-            console.log(chalk.dim('\n  Get key at https://console.anthropic.com/'));
-            break;
-        case 'openai':
-            console.log(`  export OPENAI_API_KEY="sk-your-key"`);
-            console.log(chalk.dim('\n  Get key at https://platform.openai.com/api-keys'));
-            break;
-        default:
-            console.log(`  See documentation for ${service} configuration.`);
-            console.log('\n' + chalk.bold('Available services:'));
-            console.log('  Communication: slack, discord');
-            console.log('  Email: gmail, outlook');
-            console.log('  Google Workspace: google-drive, google-sheets, google-calendar, google-docs, google-workspace');
-            console.log('  Project management: jira, linear');
-            console.log('  Documentation: notion, confluence');
-            console.log('  Developer: github');
-            console.log('  Data: airtable');
-            console.log('  AI: anthropic, openai');
-    }
-});
+    .action(async (service, options) => executeConnect(service, options));
 // --- doctor ---
 program
     .command('doctor')
     .description('Check environment and configuration')
-    .action(async () => {
-    console.log(chalk.bold('marktoflow Doctor\n'));
-    // Node version
-    const nodeVersion = process.version;
-    const nodeMajor = parseInt(nodeVersion.slice(1).split('.')[0]);
-    if (nodeMajor >= 20) {
-        console.log(chalk.green('✓') + ` Node.js ${nodeVersion}`);
-    }
-    else {
-        console.log(chalk.red('✗') + ` Node.js ${nodeVersion} (requires >=20)`);
-    }
-    // Project initialized
-    if (existsSync('.marktoflow')) {
-        console.log(chalk.green('✓') + ' Project initialized');
-        // Count workflows
-        const workflowsDir = '.marktoflow/workflows';
-        if (existsSync(workflowsDir)) {
-            const { readdirSync } = await import('node:fs');
-            const workflows = readdirSync(workflowsDir).filter((f) => f.endsWith('.md'));
-            console.log(chalk.green('✓') + ` ${workflows.length} workflow(s) found`);
-        }
-    }
-    else {
-        console.log(chalk.yellow('○') + ' Project not initialized');
-    }
-    // Check for common environment variables
-    const envChecks = [
-        // Communication
-        ['SLACK_BOT_TOKEN', 'Slack'],
-        ['DISCORD_BOT_TOKEN', 'Discord'],
-        // Email
-        ['GOOGLE_CLIENT_ID', 'Gmail'],
-        ['MICROSOFT_CLIENT_ID', 'Outlook'],
-        // Project Management
-        ['JIRA_API_TOKEN', 'Jira'],
-        ['LINEAR_API_KEY', 'Linear'],
-        // Documentation
-        ['NOTION_TOKEN', 'Notion'],
-        ['CONFLUENCE_API_TOKEN', 'Confluence'],
-        // Developer
-        ['GITHUB_TOKEN', 'GitHub'],
-        // Data
-        ['AIRTABLE_TOKEN', 'Airtable'],
-        // AI
-        ['ANTHROPIC_API_KEY', 'Anthropic'],
-        ['OPENAI_API_KEY', 'OpenAI'],
-    ];
-    console.log('\n' + chalk.bold('Services:'));
-    let configuredCount = 0;
-    for (const [envVar, name] of envChecks) {
-        if (process.env[envVar]) {
-            console.log(chalk.green('✓') + ` ${name} configured`);
-            configuredCount++;
-        }
-        else {
-            console.log(chalk.dim('○') + ` ${name} not configured`);
-        }
-    }
-    if (configuredCount === 0) {
-        console.log(chalk.yellow('\n  Run `marktoflow connect <service>` to set up integrations'));
-    }
-});
+    .action(async () => executeDoctor());
 // --- test-connection ---
 program
     .command('test-connection [service]')
@@ -1243,59 +304,7 @@ program
     .option('-o, --open', 'Open browser automatically')
     .option('-w, --workflow <path>', 'Open specific workflow')
     .option('-d, --dir <path>', 'Workflow directory', '.')
-    .action(async (options) => {
-    const spinner = ora('Starting GUI server...').start();
-    try {
-        // Check if @marktoflow/gui is available
-        let guiModule;
-        let guiPackagePath;
-        try {
-            guiModule = await import('@marktoflow/gui');
-            // Find the GUI package location
-            const { createRequire } = await import('node:module');
-            const require = createRequire(import.meta.url);
-            guiPackagePath = require.resolve('@marktoflow/gui');
-        }
-        catch {
-            spinner.fail('@marktoflow/gui package not found');
-            console.log(chalk.yellow('\nTo use the GUI, install the gui package:'));
-            console.log(chalk.cyan('  npm install @marktoflow/gui@alpha'));
-            console.log('\nOr run from the monorepo:');
-            console.log(chalk.cyan('  pnpm --filter @marktoflow/gui dev'));
-            process.exit(1);
-        }
-        spinner.succeed(`GUI server starting on http://localhost:${options.port}`);
-        // Open browser if requested
-        if (options.open) {
-            const url = `http://localhost:${options.port}`;
-            const { exec } = await import('node:child_process');
-            const openCmd = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start' : 'xdg-open';
-            exec(`${openCmd} ${url}`);
-        }
-        console.log('\n' + chalk.bold('Marktoflow GUI'));
-        console.log(`  Server:    ${chalk.cyan(`http://localhost:${options.port}`)}`);
-        console.log(`  Workflows: ${chalk.cyan(options.dir)}`);
-        console.log('\n  Press ' + chalk.bold('Ctrl+C') + ' to stop\n');
-        // Find the static files directory
-        // guiPackagePath is .../node_modules/@marktoflow/gui/dist/server/index.js
-        // We need to go up to the package root: dist/server -> dist -> package root
-        const { dirname, join } = await import('node:path');
-        const guiPackageDir = dirname(dirname(dirname(guiPackagePath)));
-        const staticDir = join(guiPackageDir, 'dist', 'client');
-        // The GUI package will handle the server
-        if (guiModule.startServer) {
-            await guiModule.startServer({
-                port: parseInt(options.port, 10),
-                workflowDir: options.dir,
-                staticDir: staticDir,
-            });
-        }
-    }
-    catch (error) {
-        spinner.fail(`Failed to start GUI: ${error}`);
-        process.exit(1);
-    }
-});
+    .action(async (options) => executeGui(options));
 // --- version ---
 program
     .command('version')