@vibe-validate/cli 0.14.1 → 0.14.3

package/dist/commands/doctor.js

@@ -10,10 +10,11 @@
  *
  * @packageDocumentation
  */
-import { existsSync, readFileSync } from 'fs';
-import { execSync } from 'child_process';
+import { existsSync, readFileSync } from 'node:fs';
+import { execSync } from 'node:child_process';
 import { stringify as stringifyYaml } from 'yaml';
 import { loadConfig, findConfigPath, loadConfigWithErrors } from '../utils/config-loader.js';
+import { formatDoctorConfigError } from '../utils/config-error-reporter.js';
 import { checkSync, ciConfigToWorkflowOptions } from './generate-workflow.js';
 import { getMainBranch, getRemoteOrigin } from '@vibe-validate/config';
 import { formatTemplateList } from '../utils/template-discovery.js';
@@ -26,28 +27,24 @@ const DEPRECATED_STATE_FILE = '.vibe-validate-state.yaml';
 function checkNodeVersion() {
     try {
         const version = execSync('node --version', { encoding: 'utf8' }).trim();
-        const majorVersion = parseInt(version.replace('v', '').split('.')[0]);
-        if (majorVersion >= 20) {
-            return {
-                name: 'Node.js version',
-                passed: true,
-                message: `${version} (meets requirement: >=20.0.0)`,
-            };
-        }
-        else {
-            return {
-                name: 'Node.js version',
-                passed: false,
-                message: `${version} is too old. Node.js 20+ required.`,
-                suggestion: 'Upgrade Node.js: https://nodejs.org/ or use nvm',
-            };
-        }
+        const majorVersion = Number.parseInt(version.replace('v', '').split('.')[0]);
+        return majorVersion >= 20 ? {
+            name: 'Node.js version',
+            passed: true,
+            message: `${version} (meets requirement: >=20.0.0)`,
+        } : {
+            name: 'Node.js version',
+            passed: false,
+            message: `${version} is too old. Node.js 20+ required.`,
+            suggestion: 'Upgrade Node.js: https://nodejs.org/ or use nvm',
+        };
     }
-    catch (_error) {
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
         return {
             name: 'Node.js version',
             passed: false,
-            message: 'Failed to detect Node.js version',
+            message: `Failed to detect Node.js version: ${errorMessage}`,
             suggestion: 'Install Node.js: https://nodejs.org/',
         };
     }
@@ -64,11 +61,12 @@ function checkGitInstalled() {
             message: version,
         };
     }
-    catch (_error) {
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
         return {
             name: 'Git installed',
             passed: false,
-            message: 'Git is not installed',
+            message: `Git is not installed: ${errorMessage}`,
             suggestion: 'Install Git: https://git-scm.com/',
         };
     }
@@ -85,11 +83,12 @@ function checkGitRepository() {
             message: 'Current directory is a git repository',
         };
     }
-    catch (_error) {
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
         return {
             name: 'Git repository',
             passed: false,
-            message: 'Current directory is not a git repository',
+            message: `Current directory is not a git repository: ${errorMessage}`,
             suggestion: 'Run: git init',
         };
     }
@@ -99,21 +98,16 @@ function checkGitRepository() {
  */
 function checkConfigFile() {
     const yamlConfig = 'vibe-validate.config.yaml';
-    if (existsSync(yamlConfig)) {
-        return {
-            name: 'Configuration file',
-            passed: true,
-            message: `Found: ${yamlConfig}`,
-        };
-    }
-    else {
-        return {
-            name: 'Configuration file',
-            passed: false,
-            message: 'Configuration file not found',
-            suggestion: 'Run: npx vibe-validate init',
-        };
-    }
+    return existsSync(yamlConfig) ? {
+        name: 'Configuration file',
+        passed: true,
+        message: `Found: ${yamlConfig}`,
+    } : {
+        name: 'Configuration file',
+        passed: false,
+        message: 'Configuration file not found',
+        suggestion: 'Run: npx vibe-validate init',
+    };
 }
 /**
  * Check if configuration is valid
@@ -126,24 +120,23 @@ async function checkConfigValid(config, configWithErrors) {
         if (!config) {
             // Check if we have detailed error information
             if (configWithErrors?.errors && configWithErrors.filePath) {
+                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- Need to filter empty strings, not just null/undefined
                 const fileName = configWithErrors.filePath.split('/').pop() || 'vibe-validate.config.yaml';
-                const errorList = configWithErrors.errors.slice(0, 5); // Show first 5 errors
-                const errorMessages = errorList.map(err => `     • ${err}`).join('\n');
+                const { message, suggestion } = formatDoctorConfigError({
+                    fileName,
+                    errors: configWithErrors.errors
+                });
                 return {
                     name: 'Configuration valid',
                     passed: false,
-                    message: `Found ${fileName} but it contains validation errors:\n${errorMessages}`,
-                    suggestion: [
-                        'Fix validation errors shown above',
-                        'See configuration docs: https://github.com/jdutton/vibe-validate/blob/main/docs/configuration-reference.md',
-                        'JSON Schema for IDE validation: https://raw.githubusercontent.com/jdutton/vibe-validate/main/packages/config/vibe-validate.schema.json',
-                        'Example YAML configs: https://github.com/jdutton/vibe-validate/tree/main/config-templates'
-                    ].join('\n   '),
+                    message,
+                    suggestion,
                 };
             }
             // Fallback: try to find config file path
             const configPath = findConfigPath();
             if (configPath) {
+                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- Need to filter empty strings, not just null/undefined
                 const fileName = configPath.split('/').pop() || 'vibe-validate.config.yaml';
                 return {
                     name: 'Configuration valid',
@@ -153,7 +146,7 @@ async function checkConfigValid(config, configWithErrors) {
                         `Fix syntax/validation errors in ${fileName}`,
                         'See configuration docs: https://github.com/jdutton/vibe-validate/blob/main/docs/configuration-reference.md',
                         'JSON Schema for IDE validation: https://raw.githubusercontent.com/jdutton/vibe-validate/main/packages/config/vibe-validate.schema.json',
-                        'Example YAML configs: https://github.com/jdutton/vibe-validate/tree/main/config-templates'
+                        'Example YAML configs: https://github.com/jdutton/vibe-validate/tree/main/packages/cli/config-templates'
                     ].join('\n   '),
                 };
             }
@@ -166,7 +159,7 @@ async function checkConfigValid(config, configWithErrors) {
                     message: 'No configuration file found',
                     suggestion: [
                         'Copy a config template from GitHub:',
-                        'https://github.com/jdutton/vibe-validate/tree/main/config-templates',
+                        'https://github.com/jdutton/vibe-validate/tree/main/packages/cli/config-templates',
                         '',
                         'Available templates:',
                         ...templateList.map(line => line),
@@ -187,11 +180,11 @@ async function checkConfigValid(config, configWithErrors) {
             message: `Loaded successfully (${config.validation.phases.length} phases)`,
         };
     }
-    catch (_error) {
+    catch (error) {
         return {
             name: 'Configuration valid',
             passed: false,
-            message: `Invalid configuration: ${_error instanceof Error ? _error.message : String(_error)}`,
+            message: `Invalid configuration: ${error instanceof Error ? error.message : String(error)}`,
             suggestion: 'Check syntax in vibe-validate.config.yaml',
         };
     }
@@ -210,7 +203,7 @@ async function checkPackageManager(config) {
             };
         }
         // Detect package manager from config commands
-        const firstCommand = config.validation.phases[0]?.steps[0]?.command || '';
+        const firstCommand = config.validation.phases[0]?.steps[0]?.command ?? '';
         const pm = firstCommand.startsWith('pnpm ') ? 'pnpm' : 'npm';
         try {
             const version = execSync(`${pm} --version`, { encoding: 'utf8' }).trim();
@@ -220,22 +213,24 @@ async function checkPackageManager(config) {
                 message: `${pm} ${version} is available`,
             };
         }
-        catch (_error) {
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
             return {
                 name: 'Package manager',
                 passed: false,
-                message: `${pm} not found (required by config commands)`,
+                message: `${pm} not found (required by config commands): ${errorMessage}`,
                 suggestion: pm === 'pnpm'
                     ? 'Install pnpm: npm install -g pnpm'
                     : 'npm should be installed with Node.js',
             };
         }
     }
-    catch (_error) {
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
         return {
             name: 'Package manager',
             passed: true,
-            message: 'Skipped (config check failed)',
+            message: `Skipped (config check failed): ${errorMessage}`,
         };
     }
 }
@@ -262,27 +257,22 @@ async function checkWorkflowSync(config) {
         // Use CI config from vibe-validate config
         const generateOptions = ciConfigToWorkflowOptions(config);
         const { inSync, diff } = checkSync(config, generateOptions);
-        if (inSync) {
-            return {
-                name: 'GitHub Actions workflow',
-                passed: true,
-                message: 'Workflow is in sync with config',
-            };
-        }
-        else {
-            return {
-                name: 'GitHub Actions workflow',
-                passed: false,
-                message: `Workflow is out of sync: ${diff || 'differs from config'}`,
-                suggestion: 'Manual: npx vibe-validate generate-workflow\n   💡 Or run: vibe-validate init --setup-workflow',
-            };
-        }
+        return inSync ? {
+            name: 'GitHub Actions workflow',
+            passed: true,
+            message: 'Workflow is in sync with config',
+        } : {
+            name: 'GitHub Actions workflow',
+            passed: false,
+            message: `Workflow is out of sync: ${diff ?? 'differs from config'}`,
+            suggestion: 'Manual: npx vibe-validate generate-workflow\n   💡 Or run: vibe-validate init --setup-workflow',
+        };
     }
-    catch (_error) {
+    catch (error) {
         return {
             name: 'GitHub Actions workflow',
             passed: false,
-            message: `Failed to check workflow sync: ${_error instanceof Error ? _error.message : String(_error)}`,
+            message: `Failed to check workflow sync: ${error instanceof Error ? error.message : String(error)}`,
             suggestion: 'Verify workflow file syntax',
         };
     }
@@ -336,11 +326,12 @@ async function checkPreCommitHook(config) {
             };
         }
     }
-    catch (_error) {
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
         return {
             name: 'Pre-commit hook',
             passed: false,
-            message: 'Pre-commit hook exists but unreadable',
+            message: `Pre-commit hook exists but unreadable: ${errorMessage}`,
             suggestion: 'Fix file permissions or set hooks.preCommit.enabled=false',
         };
     }
@@ -398,20 +389,22 @@ async function checkVersion() {
                 };
             }
         }
-        catch (_npmError) {
+        catch (npmError) {
             // npm registry unavailable - not a critical error
+            const errorMessage = npmError instanceof Error ? npmError.message : String(npmError);
             return {
                 name: 'vibe-validate version',
                 passed: true,
-                message: `Current version: ${currentVersion} (unable to check for updates)`,
+                message: `Current version: ${currentVersion} (unable to check for updates: ${errorMessage})`,
             };
         }
     }
-    catch (_error) {
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
         return {
             name: 'vibe-validate version',
             passed: true,
-            message: 'Unable to determine version',
+            message: `Unable to determine version: ${errorMessage}`,
         };
     }
 }
@@ -420,6 +413,7 @@ async function checkVersion() {
  */
 function checkGitignoreStateFile() {
     const gitignorePath = '.gitignore';
+    // eslint-disable-next-line sonarjs/deprecation -- Intentionally checking deprecated file location for migration guidance
     const stateFileName = DEPRECATED_STATE_FILE;
     // Check if .gitignore exists
     if (!existsSync(gitignorePath)) {
@@ -436,7 +430,9 @@ function checkGitignoreStateFile() {
             return {
                 name: 'Gitignore state file (deprecated)',
                 passed: false,
+                // eslint-disable-next-line sonarjs/deprecation -- Intentionally checking deprecated file location for migration guidance
                 message: `${DEPRECATED_STATE_FILE} in .gitignore (deprecated - can be removed)`,
+                // eslint-disable-next-line sonarjs/deprecation -- Intentionally checking deprecated file location for migration guidance
                 suggestion: `Remove from .gitignore: sed -i.bak '/${DEPRECATED_STATE_FILE}/d' .gitignore && rm .gitignore.bak\n   ℹ️  Validation now uses git notes instead of state file`,
             };
         }
@@ -448,11 +444,12 @@ function checkGitignoreStateFile() {
             };
         }
     }
-    catch (_error) {
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
         return {
             name: 'Gitignore state file',
             passed: false,
-            message: '.gitignore exists but is unreadable',
+            message: `.gitignore exists but is unreadable: ${errorMessage}`,
             suggestion: 'Fix file permissions: chmod 644 .gitignore',
         };
     }
@@ -461,13 +458,16 @@ function checkGitignoreStateFile() {
  * Check if deprecated validation state file exists
  */
 function checkValidationState() {
+    // eslint-disable-next-line sonarjs/deprecation -- Intentionally checking deprecated file location for migration guidance
     const statePath = DEPRECATED_STATE_FILE;
     // Check if deprecated state file exists
     if (existsSync(statePath)) {
         return {
             name: 'Validation state (deprecated)',
             passed: false,
+            // eslint-disable-next-line sonarjs/deprecation -- Intentionally checking deprecated file location for migration guidance
             message: `${DEPRECATED_STATE_FILE} found (deprecated file - safe to remove)`,
+            // eslint-disable-next-line sonarjs/deprecation -- Intentionally checking deprecated file location for migration guidance
             suggestion: `Remove deprecated state file: rm ${DEPRECATED_STATE_FILE}\n   ℹ️  Validation now uses git notes for improved caching`,
         };
     }
@@ -500,12 +500,13 @@ async function checkHistoryHealth() {
             suggestion: 'Prune old history: vibe-validate history prune --older-than "90 days"',
         };
     }
-    catch (_error) {
+    catch (error) {
         // Git notes not available or other error - not critical
+        const errorMessage = error instanceof Error ? error.message : String(error);
         return {
             name: 'Validation history',
             passed: true,
-            message: 'History unavailable (not in git repo or no validation runs yet)',
+            message: `History unavailable (not in git repo or no validation runs yet): ${errorMessage}`,
         };
     }
 }
@@ -532,8 +533,9 @@ async function checkMainBranch(config) {
                 message: `Branch '${mainBranch}' exists locally`,
             };
         }
-        catch (_localError) {
+        catch (localError) {
             // Local branch doesn't exist, check for remote branch
+            const localErrorMsg = localError instanceof Error ? localError.message : String(localError);
             try {
                 execSync(`git rev-parse --verify ${remoteOrigin}/${mainBranch}`, { stdio: 'pipe' });
                 return {
@@ -542,21 +544,23 @@ async function checkMainBranch(config) {
                     message: `Branch '${mainBranch}' exists on remote '${remoteOrigin}' (fetch-depth: 0 required in CI)`,
                 };
             }
-            catch (_remoteError) {
+            catch (remoteError) {
+                const remoteErrorMsg = remoteError instanceof Error ? remoteError.message : String(remoteError);
                 return {
                     name: 'Git main branch',
                     passed: false,
-                    message: `Configured main branch '${mainBranch}' does not exist locally or on remote '${remoteOrigin}'`,
+                    message: `Configured main branch '${mainBranch}' does not exist locally (${localErrorMsg}) or on remote '${remoteOrigin}' (${remoteErrorMsg})`,
                     suggestion: `Create branch: git checkout -b ${mainBranch} OR update config to use existing branch (e.g., 'master', 'develop')`,
                 };
             }
         }
     }
-    catch (_error) {
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
         return {
             name: 'Git main branch',
             passed: true,
-            message: 'Skipped (config or git error)',
+            message: `Skipped (config or git error): ${errorMessage}`,
         };
     }
 }
@@ -595,20 +599,22 @@ async function checkRemoteOrigin(config) {
                 };
             }
         }
-        catch (_error) {
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
             return {
                 name: 'Git remote origin',
                 passed: false,
-                message: 'Failed to list git remotes',
+                message: `Failed to list git remotes: ${errorMessage}`,
                 suggestion: 'Verify git repository is initialized',
             };
         }
     }
-    catch (_error) {
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
         return {
             name: 'Git remote origin',
             passed: true,
-            message: 'Skipped (config or git error)',
+            message: `Skipped (config or git error): ${errorMessage}`,
         };
     }
 }
@@ -647,20 +653,64 @@ async function checkRemoteMainBranch(config) {
                 message: `Branch '${mainBranch}' exists on remote '${remoteOrigin}'`,
             };
         }
-        catch (_error) {
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
             return {
                 name: 'Git remote main branch',
                 passed: false,
-                message: `Branch '${mainBranch}' does not exist on remote '${remoteOrigin}'`,
+                message: `Branch '${mainBranch}' does not exist on remote '${remoteOrigin}': ${errorMessage}`,
                 suggestion: `Push branch: git push ${remoteOrigin} ${mainBranch} OR update config to match remote branch name`,
             };
         }
     }
-    catch (_error) {
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
         return {
             name: 'Git remote main branch',
             passed: true,
-            message: 'Skipped (config or git error)',
+            message: `Skipped (config or git error): ${errorMessage}`,
+        };
+    }
+}
+/**
+ * Get tool version by trying multiple version flag variants
+ */
+function getToolVersion(toolName) {
+    try {
+        return execSync(`${toolName} version`, { encoding: 'utf8', stdio: 'pipe' }).trim();
+    }
+    catch (versionError) {
+        console.debug(`${toolName} version failed: ${versionError instanceof Error ? versionError.message : String(versionError)}`);
+        return execSync(`${toolName} --version`, { encoding: 'utf8', stdio: 'pipe' }).trim();
+    }
+}
+/**
+ * Check if scanning tool is available
+ */
+function checkScanningToolAvailable(toolName) {
+    try {
+        const version = getToolVersion(toolName);
+        return {
+            name: 'Pre-commit secret scanning',
+            passed: true,
+            message: `Secret scanning enabled with ${toolName} ${version}`,
+        };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        const isCI = process.env.CI === 'true' || process.env.CI === '1';
+        if (isCI) {
+            return {
+                name: 'Pre-commit secret scanning',
+                passed: true,
+                message: `Secret scanning enabled (pre-commit only, not needed in CI)`,
+            };
+        }
+        return {
+            name: 'Pre-commit secret scanning',
+            passed: true,
+            message: `Secret scanning enabled but '${toolName}' not found: ${errorMessage}`,
+            suggestion: `Install ${toolName}:\n   • gitleaks: brew install gitleaks\n   • Or disable: set hooks.preCommit.secretScanning.enabled=false in config`,
         };
     }
 }
@@ -677,7 +727,6 @@ async function checkSecretScanning(config) {
             };
         }
         const secretScanning = config.hooks?.preCommit?.secretScanning;
-        // If not configured at all, recommend enabling it
         if (!secretScanning) {
             return {
                 name: 'Pre-commit secret scanning',
@@ -686,7 +735,6 @@ async function checkSecretScanning(config) {
                 suggestion: 'Recommended: Enable secret scanning to prevent credential leaks\n   • Add to config: hooks.preCommit.secretScanning.enabled=true\n   • scanCommand: "gitleaks protect --staged --verbose"\n   • Install gitleaks: brew install gitleaks',
             };
         }
-        // If explicitly disabled, acknowledge user choice
         if (secretScanning.enabled === false) {
             return {
                 name: 'Pre-commit secret scanning',
@@ -694,58 +742,23 @@ async function checkSecretScanning(config) {
                 message: 'Secret scanning disabled in config (user preference)',
             };
         }
-        // If enabled, check if tool is available
-        if (secretScanning.scanCommand) {
-            // Extract tool name (first word of command)
-            const toolName = secretScanning.scanCommand.split(' ')[0];
-            try {
-                // Try to get tool version
-                let version;
-                try {
-                    version = execSync(`${toolName} version`, { encoding: 'utf8', stdio: 'pipe' }).trim();
-                }
-                catch (_versionError) {
-                    // Try --version flag
-                    version = execSync(`${toolName} --version`, { encoding: 'utf8', stdio: 'pipe' }).trim();
-                }
-                return {
-                    name: 'Pre-commit secret scanning',
-                    passed: true,
-                    message: `Secret scanning enabled with ${toolName} ${version}`,
-                };
-            }
-            catch (_error) {
-                // Tool not found
-                // In CI, this is expected (secret scanning is pre-commit only, not needed in CI)
-                const isCI = process.env.CI === 'true' || process.env.CI === '1';
-                if (isCI) {
-                    return {
-                        name: 'Pre-commit secret scanning',
-                        passed: true,
-                        message: `Secret scanning enabled (pre-commit only, not needed in CI)`,
-                    };
-                }
-                return {
-                    name: 'Pre-commit secret scanning',
-                    passed: true, // Advisory only, never fails
-                    message: `Secret scanning enabled but '${toolName}' not found`,
-                    suggestion: `Install ${toolName}:\n   • gitleaks: brew install gitleaks\n   • Or disable: set hooks.preCommit.secretScanning.enabled=false in config`,
-                };
-            }
+        if (!secretScanning.scanCommand) {
+            return {
+                name: 'Pre-commit secret scanning',
+                passed: true,
+                message: 'Secret scanning enabled but no scanCommand configured',
+                suggestion: 'Add hooks.preCommit.secretScanning.scanCommand to config',
+            };
         }
-        // Enabled but no scanCommand (should be caught by schema validation)
-        return {
-            name: 'Pre-commit secret scanning',
-            passed: true,
-            message: 'Secret scanning enabled but no scanCommand configured',
-            suggestion: 'Add hooks.preCommit.secretScanning.scanCommand to config',
-        };
+        const toolName = secretScanning.scanCommand.split(' ')[0];
+        return checkScanningToolAvailable(toolName);
     }
-    catch (_error) {
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
         return {
             name: 'Pre-commit secret scanning',
             passed: true,
-            message: 'Skipped (config or execution error)',
+            message: `Skipped (config or execution error): ${errorMessage}`,
         };
     }
 }
@@ -762,8 +775,10 @@ export async function runDoctor(options = {}) {
         config = await loadConfig();
         configWithErrors = await loadConfigWithErrors();
     }
-    catch (_error) {
+    catch (error) {
         // Config load error will be caught by checkConfigValid
+        // Intentionally suppressing error here as it will be reported by checkConfigValid
+        console.debug(`Config load failed: ${error instanceof Error ? error.message : String(error)}`);
         config = null;
         configWithErrors = { config: null, errors: null, filePath: null };
     }
@@ -803,6 +818,61 @@ export async function runDoctor(options = {}) {
         passedChecks,
     };
 }
+/**
+ * Output doctor results in YAML format
+ */
+async function outputDoctorYaml(result) {
+    // Small delay to ensure stderr is flushed
+    await new Promise(resolve => setTimeout(resolve, 10));
+    // RFC 4627 separator
+    process.stdout.write('---\n');
+    // Write pure YAML
+    process.stdout.write(stringifyYaml(result));
+    // CRITICAL: Wait for stdout to flush before exiting
+    await new Promise(resolve => {
+        if (process.stdout.write('')) {
+            resolve();
+        }
+        else {
+            process.stdout.once('drain', resolve);
+        }
+    });
+}
+/**
+ * Display doctor results in human-friendly format
+ */
+function displayDoctorResults(result) {
+    console.log('🩺 vibe-validate Doctor\n');
+    const modeMessage = result.verboseMode
+        ? 'Running diagnostic checks (verbose mode)...\n'
+        : 'Running diagnostic checks...\n';
+    console.log(modeMessage);
+    // Print each check
+    for (const check of result.checks) {
+        const icon = check.passed ? '✅' : '❌';
+        console.log(`${icon} ${check.name}`);
+        console.log(`   ${check.message}`);
+        if (check.suggestion) {
+            console.log(`   💡 ${check.suggestion}`);
+        }
+        console.log('');
+    }
+    // Summary
+    console.log(`📊 Results: ${result.passedChecks}/${result.totalChecks} checks passed\n`);
+    if (result.allPassed) {
+        console.log('✨ All checks passed! Your vibe-validate setup looks healthy.');
+        if (!result.verboseMode) {
+            console.log('   (Use --verbose to see all checks)');
+        }
+    }
+    else {
+        console.log('⚠️  Some checks failed. See suggestions above to fix.');
+        if (!result.verboseMode) {
+            console.log('   (Use --verbose to see all checks including passing ones)');
+        }
+        process.exit(1);
+    }
+}
 /**
  * Main command handler for Commander.js
  */
@@ -817,62 +887,15 @@ export function doctorCommand(program) {
         try {
             const result = await runDoctor({ verbose });
             if (options.yaml) {
-                // YAML mode: Output structured result to stdout
-                // Small delay to ensure stderr is flushed
-                await new Promise(resolve => setTimeout(resolve, 10));
-                // RFC 4627 separator
-                process.stdout.write('---\n');
-                // Write pure YAML
-                process.stdout.write(stringifyYaml(result));
-                // CRITICAL: Wait for stdout to flush before exiting
-                await new Promise(resolve => {
-                    if (process.stdout.write('')) {
-                        resolve();
-                    }
-                    else {
-                        process.stdout.once('drain', resolve);
-                    }
-                });
+                await outputDoctorYaml(result);
             }
             else {
-                // Human-friendly output
-                console.log('🩺 vibe-validate Doctor\n');
-                if (result.verboseMode) {
-                    console.log('Running diagnostic checks (verbose mode)...\n');
-                }
-                else {
-                    console.log('Running diagnostic checks...\n');
-                }
-                // Print each check
-                for (const check of result.checks) {
-                    const icon = check.passed ? '✅' : '❌';
-                    console.log(`${icon} ${check.name}`);
-                    console.log(`   ${check.message}`);
-                    if (check.suggestion) {
-                        console.log(`   💡 ${check.suggestion}`);
-                    }
-                    console.log('');
-                }
-                // Summary
-                console.log(`📊 Results: ${result.passedChecks}/${result.totalChecks} checks passed\n`);
-                if (result.allPassed) {
-                    console.log('✨ All checks passed! Your vibe-validate setup looks healthy.');
-                    if (!result.verboseMode) {
-                        console.log('   (Use --verbose to see all checks)');
-                    }
-                }
-                else {
-                    console.log('⚠️  Some checks failed. See suggestions above to fix.');
-                    if (!result.verboseMode) {
-                        console.log('   (Use --verbose to see all checks including passing ones)');
-                    }
-                    process.exit(1);
-                }
+                displayDoctorResults(result);
             }
         }
-        catch (_error) {
+        catch (error) {
             console.error('❌ Doctor check failed:');
-            console.error(_error instanceof Error ? _error.message : String(_error));
+            console.error(error instanceof Error ? error.message : String(error));
             process.exit(1);
         }
     });