@dotsetlabs/bellwether 2.0.0 → 2.1.0

package/dist/cli/commands/check.js

@@ -27,7 +27,8 @@ import * as output from '../output.js';
 import { extractServerContextFromArgs } from '../utils/server-context.js';
 import { configureLogger } from '../../logging/logger.js';
 import { buildInterviewInsights } from '../../interview/insights.js';
-import { EXIT_CODES, SEVERITY_TO_EXIT_CODE, PATHS, SECURITY_TESTING, CHECK_SAMPLING, WORKFLOW, REPORT_SCHEMAS, PERCENTAGE_CONVERSION, } from '../../constants.js';
+import { EXIT_CODES, SEVERITY_TO_EXIT_CODE, PATHS, SECURITY_TESTING, CHECK_SAMPLING, WORKFLOW, REPORT_SCHEMAS, PERCENTAGE_CONVERSION, MCP, } from '../../constants.js';
+import { getFeatureFlags, getExcludedFeatureNames } from '../../protocol/index.js';
 export const checkCommand = new Command('check')
     .description('Check MCP server schema and detect drift (free, fast, deterministic)')
     .allowUnknownOption() // Allow server flags like -y for npx to pass through
@@ -177,6 +178,7 @@ export const checkCommand = new Command('check')
         debug: logLevel === 'debug',
         transport,
     });
+    let pendingExitCode;
     try {
         // Connect to MCP server
         output.info('Connecting to MCP server...');
@@ -197,6 +199,7 @@ export const checkCommand = new Command('check')
         output.info('Discovering capabilities...');
         const discovery = await discover(mcpClient, transport === 'stdio' ? serverCommand : (remoteUrl ?? serverCommand), transport === 'stdio' ? args : []);
         const resourceCount = discovery.resources?.length ?? 0;
+        const resourceTemplateCount = discovery.resourceTemplates?.length ?? 0;
         const discoveryParts = [
             `${discovery.tools.length} tools`,
             `${discovery.prompts.length} prompts`,
@@ -204,11 +207,34 @@ export const checkCommand = new Command('check')
         if (resourceCount > 0) {
             discoveryParts.push(`${resourceCount} resources`);
         }
+        if (resourceTemplateCount > 0) {
+            discoveryParts.push(`${resourceTemplateCount} resource templates`);
+        }
         output.info(`Found ${discoveryParts.join(', ')}\n`);
+        // Show server instructions if provided
+        if (discovery.instructions) {
+            output.info(`Server instructions: ${discovery.instructions}\n`);
+        }
+        // Show protocol version context
+        const features = getFeatureFlags(discovery.protocolVersion);
+        if (discovery.protocolVersion !== MCP.PROTOCOL_VERSION) {
+            output.info(`Protocol Version: ${discovery.protocolVersion} (bellwether supports up to ${MCP.PROTOCOL_VERSION})`);
+            const excluded = getExcludedFeatureNames(discovery.protocolVersion);
+            if (excluded.length > 0) {
+                output.info(`  Version-gated features excluded: ${excluded.join(', ')}`);
+            }
+        }
+        // Show new capabilities (completions, tasks) — gated by protocol version
+        if (discovery.capabilities.completions && features.completions) {
+            output.info('Server supports: Completions (autocomplete)');
+        }
+        if (discovery.capabilities.tasks && features.tasks) {
+            output.info('Server supports: Tasks');
+        }
         // Output discovery warnings (Issue D: anomaly detection)
         if (discovery.warnings && discovery.warnings.length > 0) {
             for (const warning of discovery.warnings) {
-                output.warn(`⚠ ${warning.message}`);
+                output.warn(`[warn] ${warning.message}`);
             }
             output.newline();
         }
@@ -217,7 +243,7 @@ export const checkCommand = new Command('check')
             output.warn('Transport errors during discovery:');
             for (const err of discovery.transportErrors.slice(0, 3)) {
                 const typeLabel = err.category.replace(/_/g, ' ');
-                output.warn(`  ✗ ${typeLabel}: ${err.message.substring(0, 100)}`);
+                output.warn(`  [fail] ${typeLabel}: ${err.message.substring(0, 100)}`);
             }
             if (discovery.transportErrors.length > 3) {
                 output.warn(`  ... and ${discovery.transportErrors.length - 3} more`);
@@ -327,6 +353,7 @@ export const checkCommand = new Command('check')
             externalServices: config.check.externalServices,
             assertions: config.check.assertions,
             rateLimit: config.check.rateLimit,
+            testFixtures: config.check.testFixtures,
         });
         // Log sampling configuration
         if (minSamples > CHECK_SAMPLING.DEFAULT_MIN_SAMPLES) {
@@ -403,7 +430,7 @@ export const checkCommand = new Command('check')
         if (result.scenarioResults && result.scenarioResults.length > 0) {
             const passed = result.scenarioResults.filter((r) => r.passed).length;
             const failed = result.scenarioResults.length - passed;
-            const statusIcon = failed === 0 ? '\u2713' : '\u2717';
+            const statusIcon = failed === 0 ? '[PASS]' : '[FAIL]';
             output.info(`\nCustom scenarios: ${passed}/${result.scenarioResults.length} passed ${statusIcon}`);
             if (failed > 0) {
                 output.info('\nFailed scenarios:');
@@ -599,7 +626,7 @@ export const checkCommand = new Command('check')
                 try {
                     const workflowResult = await workflowExecutor.execute(workflow);
                     workflowResults.push(workflowResult);
-                    const statusIcon = workflowResult.success ? '\u2713' : '\u2717';
+                    const statusIcon = workflowResult.success ? '[PASS]' : '[FAIL]';
                     const stepsInfo = `${workflowResult.steps.filter((s) => s.success).length}/${workflow.steps.length} steps`;
                     if (workflowResult.success) {
                         output.success(`  ${statusIcon} ${workflow.name} (${stepsInfo}) - ${workflowResult.durationMs}ms`);
@@ -615,7 +642,7 @@ export const checkCommand = new Command('check')
                     }
                 }
                 catch (error) {
-                    output.error(`  \u2717 ${workflow.name} - Error: ${error instanceof Error ? error.message : error}`);
+                    output.error(`  [FAIL] ${workflow.name} - Error: ${error instanceof Error ? error.message : error}`);
                 }
             }
             // Workflow summary
@@ -881,35 +908,40 @@ export const checkCommand = new Command('check')
             else if (!options.acceptDrift) {
                 // Check if diff meets failure threshold based on severity config
                 const shouldFail = shouldFailOnDiff(diff, severityConfig.failOnSeverity);
-                const exitCode = SEVERITY_TO_EXIT_CODE[diff.severity] ?? EXIT_CODES.CLEAN;
+                const driftExitCode = SEVERITY_TO_EXIT_CODE[diff.severity] ?? EXIT_CODES.CLEAN;
                 if (diff.severity === 'breaking') {
                     output.error('\nBreaking changes detected!');
                     output.error('Use --accept-drift to accept these changes as intentional.');
                     if (failOnDrift || shouldFail) {
-                        process.exit(exitCode);
+                        pendingExitCode = driftExitCode;
+                        return;
                     }
                 }
                 else if (diff.severity === 'warning') {
                     output.warn('\nWarning-level changes detected.');
                     output.warn('Use --accept-drift to accept these changes as intentional.');
                     if (failOnDrift || shouldFail) {
-                        process.exit(exitCode);
+                        pendingExitCode = driftExitCode;
+                        return;
                     }
                 }
                 else if (diff.severity === 'info') {
                     output.info('\nInfo-level changes detected (non-breaking).');
                     if (shouldFail) {
-                        process.exit(exitCode);
+                        pendingExitCode = driftExitCode;
+                        return;
                     }
                 }
                 // Exit with appropriate code based on severity
                 // This provides semantic exit codes for CI/CD even when not failing
-                process.exit(exitCode);
+                pendingExitCode = driftExitCode;
+                return;
             }
         }
         if (config.check.assertions.strict && (result.metadata.assertions?.failed ?? 0) > 0) {
             output.error('\nAssertion failures detected and check.assertions.strict is enabled.');
-            process.exit(EXIT_CODES.ERROR);
+            pendingExitCode = EXIT_CODES.BREAKING;
+            return;
         }
     }
     catch (error) {
@@ -931,10 +963,18 @@ export const checkCommand = new Command('check')
             output.error('  - The server command was not found');
             output.error('  - Check that the command is installed and in PATH');
         }
-        process.exit(EXIT_CODES.ERROR);
+        pendingExitCode = EXIT_CODES.ERROR;
     }
     finally {
-        await mcpClient.disconnect();
+        try {
+            await mcpClient.disconnect();
+        }
+        catch {
+            /* ignore cleanup errors */
+        }
+        if (pendingExitCode !== undefined) {
+            process.exit(pendingExitCode);
+        }
     }
 });
 /**

package/dist/cli/commands/discover.js

@@ -60,7 +60,7 @@ async function discoverAction(command, args, options) {
         if (result.warnings && result.warnings.length > 0) {
             output.newline();
             for (const warning of result.warnings) {
-                output.warn(`⚠ ${warning.message}`);
+                output.warn(`[warn] ${warning.message}`);
             }
         }
         // Output transport errors from discovery
@@ -69,7 +69,7 @@ async function discoverAction(command, args, options) {
             output.warn('Transport errors during discovery:');
             for (const err of result.transportErrors.slice(0, 3)) {
                 const typeLabel = err.category.replace(/_/g, ' ');
-                output.warn(`  ✗ ${typeLabel}: ${err.message.substring(0, 100)}`);
+                output.warn(`  [fail] ${typeLabel}: ${err.message.substring(0, 100)}`);
             }
             if (result.transportErrors.length > 3) {
                 output.warn(`  ... and ${result.transportErrors.length - 3} more`);

package/dist/cli/commands/explore.js

@@ -17,7 +17,8 @@ import { loadConfig, ConfigNotFoundError, parseCommandString, } from '../../conf
 import { validateConfigForExplore } from '../../config/validator.js';
 import { CostTracker, estimateInterviewCost, estimateInterviewTime, formatCostAndTimeEstimate, suggestOptimizations, formatOptimizationSuggestions, } from '../../cost/index.js';
 import { getMetricsCollector, resetMetricsCollector } from '../../metrics/collector.js';
-import { EXIT_CODES, WORKFLOW, PATHS, REPORT_SCHEMAS } from '../../constants.js';
+import { EXIT_CODES, WORKFLOW, PATHS, REPORT_SCHEMAS, MCP } from '../../constants.js';
+import { getExcludedFeatureNames } from '../../protocol/index.js';
 import { FallbackLLMClient } from '../../llm/fallback.js';
 import { getGlobalCache, resetGlobalCache } from '../../cache/response-cache.js';
 import { InterviewProgressBar, formatExploreBanner } from '../utils/progress.js';
@@ -159,6 +160,20 @@ export const exploreCommand = new Command('explore')
         output.error('  - Ollama: No API key needed (ensure Ollama is running)');
         process.exit(EXIT_CODES.ERROR);
     }
+    let pendingExitCode;
+    // Handle SIGINT/SIGTERM for graceful shutdown
+    const signalCleanup = async () => {
+        output.info('\n\nInterrupted. Cleaning up...');
+        try {
+            await mcpClient.disconnect();
+        }
+        catch {
+            /* ignore cleanup errors */
+        }
+        process.exit(EXIT_CODES.ERROR);
+    };
+    process.on('SIGINT', signalCleanup);
+    process.on('SIGTERM', signalCleanup);
     try {
         // Connect to MCP server
         output.info('Connecting to MCP server...');
@@ -183,6 +198,14 @@ export const exploreCommand = new Command('explore')
             discoveryParts.push(`${resourceCount} resources`);
         }
         output.info(`Found ${discoveryParts.join(', ')}\n`);
+        // Show protocol version context
+        if (discovery.protocolVersion !== MCP.PROTOCOL_VERSION) {
+            output.info(`Protocol Version: ${discovery.protocolVersion} (bellwether supports up to ${MCP.PROTOCOL_VERSION})`);
+            const excluded = getExcludedFeatureNames(discovery.protocolVersion);
+            if (excluded.length > 0) {
+                output.info(`  Version-gated features excluded: ${excluded.join(', ')}`);
+            }
+        }
         // Update metrics
         metricsCollector.updateInterviewCounters({
             toolsDiscovered: discovery.tools.length,
@@ -423,7 +446,7 @@ export const exploreCommand = new Command('explore')
         if (result.scenarioResults && result.scenarioResults.length > 0) {
             const passed = result.scenarioResults.filter((r) => r.passed).length;
             const failed = result.scenarioResults.length - passed;
-            const statusIcon = failed === 0 ? '\u2713' : '\u2717';
+            const statusIcon = failed === 0 ? '[PASS]' : '[FAIL]';
             output.info(`\nCustom scenarios: ${passed}/${result.scenarioResults.length} passed ${statusIcon}`);
             if (failed > 0) {
                 output.info('\nFailed scenarios:');
@@ -441,7 +464,7 @@ export const exploreCommand = new Command('explore')
         if (result.workflowResults && result.workflowResults.length > 0) {
             const successful = result.workflowResults.filter((wr) => wr.success).length;
             const failed = result.workflowResults.length - successful;
-            const statusIcon = failed === 0 ? '\u2713' : '\u2717';
+            const statusIcon = failed === 0 ? '[PASS]' : '[FAIL]';
             output.info(`\nWorkflows: ${successful}/${result.workflowResults.length} passed ${statusIcon}`);
             if (failed > 0) {
                 output.info('\nFailed workflows:');
@@ -477,11 +500,21 @@ export const exploreCommand = new Command('explore')
             output.error('  - Missing or invalid API key');
             output.error('  - Run "bellwether auth" to configure API keys');
         }
-        process.exit(EXIT_CODES.ERROR);
+        pendingExitCode = EXIT_CODES.ERROR;
     }
     finally {
+        process.removeListener('SIGINT', signalCleanup);
+        process.removeListener('SIGTERM', signalCleanup);
         restoreLogLevel();
-        await mcpClient.disconnect();
+        try {
+            await mcpClient.disconnect();
+        }
+        catch {
+            /* ignore cleanup errors */
+        }
+        if (pendingExitCode !== undefined) {
+            process.exit(pendingExitCode);
+        }
     }
 });
 //# sourceMappingURL=explore.js.map

package/dist/cli/commands/golden.js

@@ -17,8 +17,7 @@ import { getGoldenStorePath, saveGoldenOutput, createGoldenOutput, listGoldenOut
 import * as output from '../output.js';
 import { EXIT_CODES, PATHS } from '../../constants.js';
 import { formatDateISO } from '../../utils/index.js';
-export const goldenCommand = new Command('golden')
-    .description('Manage golden outputs for tool validation');
+export const goldenCommand = new Command('golden').description('Manage golden outputs for tool validation');
 // Save command
 goldenCommand
     .command('save')
@@ -56,12 +55,8 @@ goldenCommand
     }
     const argsJson = options.args ?? config.golden.defaultArgs;
     const mode = options.mode ?? config.golden.mode;
-    const normalizeTimestamps = options.normalizeTimestamps === false
-        ? false
-        : config.golden.normalizeTimestamps;
-    const normalizeUuids = options.normalizeUuids === false
-        ? false
-        : config.golden.normalizeUuids;
+    const normalizeTimestamps = options.normalizeTimestamps === false ? false : config.golden.normalizeTimestamps;
+    const normalizeUuids = options.normalizeUuids === false ? false : config.golden.normalizeUuids;
     // Parse tool arguments
     let toolArgs;
     try {
@@ -100,10 +95,10 @@ goldenCommand
         await mcpClient.connect(serverCommand, args, config.server.env);
         // Discover tools
         const discovery = await discover(mcpClient, serverCommand, args);
-        const tool = discovery.tools.find(t => t.name === options.tool);
+        const tool = discovery.tools.find((t) => t.name === options.tool);
         if (!tool) {
             output.error(`Tool not found: ${options.tool}`);
-            output.info(`Available tools: ${discovery.tools.map(t => t.name).join(', ')}`);
+            output.info(`Available tools: ${discovery.tools.map((t) => t.name).join(', ')}`);
             process.exit(EXIT_CODES.ERROR);
         }
         // Call the tool
@@ -111,7 +106,7 @@ goldenCommand
         const response = await mcpClient.callTool(options.tool, toolArgs);
         if (response.isError) {
             output.error('Tool returned an error:');
-            const textContent = response.content.find(c => c.type === 'text');
+            const textContent = response.content.find((c) => c.type === 'text');
             if (textContent && 'text' in textContent) {
                 output.error(String(textContent.text));
             }
@@ -192,7 +187,7 @@ goldenCommand
     }
     const goldens = listGoldenOutputs(storePath);
     const filteredGoldens = options.tool
-        ? goldens.filter(g => g.toolName === options.tool)
+        ? goldens.filter((g) => g.toolName === options.tool)
         : goldens;
     if (filteredGoldens.length === 0) {
         if (options.tool) {
@@ -222,14 +217,14 @@ goldenCommand
                 const response = await mcpClient.callTool(golden.toolName, golden.inputArgs);
                 const result = compareWithGolden(golden, response);
                 results.push(result);
-                const icon = result.passed ? '\u2713' : '\u2717';
+                const icon = result.passed ? '[PASS]' : '[FAIL]';
                 if (result.passed) {
                     output.success(`  ${icon} ${result.summary}`);
                 }
                 else {
                     output.error(`  ${icon} ${result.summary}`);
-                    if (result.differences.filter(d => !d.allowed).length <= 5) {
-                        for (const diff of result.differences.filter(d => !d.allowed)) {
+                    if (result.differences.filter((d) => !d.allowed).length <= 5) {
+                        for (const diff of result.differences.filter((d) => !d.allowed)) {
                             output.warn(`    - ${diff.description} at ${diff.path}`);
                         }
                     }
@@ -242,22 +237,24 @@ goldenCommand
                     severity: 'breaking',
                     mode: golden.tolerance.mode,
                     goldenCapturedAt: golden.capturedAt,
-                    differences: [{
+                    differences: [
+                        {
                             type: 'changed',
                             path: '$',
                             expected: 'successful response',
                             actual: `error: ${error instanceof Error ? error.message : String(error)}`,
                             allowed: false,
                             description: 'Tool call failed',
-                        }],
+                        },
+                    ],
                     summary: `Tool call failed: ${error instanceof Error ? error.message : String(error)}`,
                 });
-                output.error(`  \u2717 Tool call failed: ${error instanceof Error ? error.message : String(error)}`);
+                output.error(`  [FAIL] Tool call failed: ${error instanceof Error ? error.message : String(error)}`);
             }
         }
         output.newline();
         // Summary
-        const passed = results.filter(r => r.passed).length;
+        const passed = results.filter((r) => r.passed).length;
         const failed = results.length - passed;
         if (format === 'json') {
             output.info(JSON.stringify(results, null, 2));
@@ -372,13 +369,13 @@ function formatResultsMarkdown(results) {
     lines.push('| Tool | Status | Mode | Differences |');
     lines.push('|------|--------|------|-------------|');
     for (const result of results) {
-        const status = result.passed ? '✓ Match' : `✗ ${result.severity}`;
-        const diffCount = result.differences.filter(d => !d.allowed).length;
+        const status = result.passed ? 'Match' : `${result.severity}`;
+        const diffCount = result.differences.filter((d) => !d.allowed).length;
         lines.push(`| \`${result.toolName}\` | ${status} | ${result.mode} | ${diffCount} |`);
     }
     lines.push('');
     // Details for failed comparisons
-    const failed = results.filter(r => !r.passed);
+    const failed = results.filter((r) => !r.passed);
     if (failed.length > 0) {
         lines.push('### Drift Details');
         lines.push('');
@@ -390,7 +387,7 @@ function formatResultsMarkdown(results) {
             lines.push(`**Severity:** ${result.severity}`);
             lines.push('');
             lines.push('**Changes:**');
-            for (const diff of result.differences.filter(d => !d.allowed)) {
+            for (const diff of result.differences.filter((d) => !d.allowed)) {
                 lines.push(`- ${diff.description}`);
                 if (diff.expected !== undefined) {
                     lines.push(`  - Expected: \`${String(diff.expected)}\``);

package/dist/cli/commands/init.js

@@ -17,12 +17,7 @@ import * as output from '../output.js';
  * Returns an array of variable names found.
  */
 function detectEnvVars(cwd) {
-    const envExampleFiles = [
-        '.env.example',
-        '.env.sample',
-        'env.example',
-        'env.sample',
-    ];
+    const envExampleFiles = ['.env.example', '.env.sample', 'env.example', 'env.sample'];
     for (const filename of envExampleFiles) {
         const filepath = join(cwd, filename);
         if (existsSync(filepath)) {
@@ -129,7 +124,15 @@ export const initCommand = new Command('init')
         });
     }
     // Write config file
-    writeFileSync(configPath, content);
+    try {
+        writeFileSync(configPath, content);
+    }
+    catch (error) {
+        output.error(`Failed to write config file: ${error instanceof Error ? error.message : String(error)}`);
+        output.error(`  Path: ${configPath}`);
+        output.error('  Check that the directory exists and you have write permissions.');
+        return;
+    }
     // Show success message
     output.success(`Created: ${configPath}`);
     output.newline();

package/dist/cli/commands/registry.js

@@ -3,7 +3,7 @@
  */
 import { Command } from 'commander';
 import chalk from 'chalk';
-import { RegistryClient, generateRunCommand, } from '../../registry/index.js';
+import { RegistryClient, generateRunCommand } from '../../registry/index.js';
 import { EXIT_CODES } from '../../constants.js';
 import { loadConfig, ConfigNotFoundError } from '../../config/loader.js';
 import * as output from '../output.js';
@@ -108,7 +108,7 @@ function isLikelyEnvVar(name) {
         /auth/i,
         /^[A-Z][A-Z0-9_]+$/, // ALL_CAPS_PATTERN
     ];
-    return envPatterns.some(pattern => pattern.test(name));
+    return envPatterns.some((pattern) => pattern.test(name));
 }
 /**
  * Extract likely environment variable name from argument.
@@ -160,36 +160,38 @@ function analyzeServerRequirements(entry) {
         // Only look at the actual server name part (after last /) to avoid false matches
         // e.g., "io.github.user/postgres" should match "postgres", not "github"
         const fullName = entry.server.name.toLowerCase();
-        const serverNamePart = fullName.includes('/') ? fullName.split('/').pop() || fullName : fullName;
+        const serverNamePart = fullName.includes('/')
+            ? fullName.split('/').pop() || fullName
+            : fullName;
         const serviceEnvVars = {
-            'openai': ['OPENAI_API_KEY'],
-            'anthropic': ['ANTHROPIC_API_KEY'],
-            'github': ['GITHUB_TOKEN', 'GITHUB_PERSONAL_ACCESS_TOKEN'],
-            'gitlab': ['GITLAB_TOKEN', 'GITLAB_PERSONAL_ACCESS_TOKEN'],
-            'slack': ['SLACK_TOKEN', 'SLACK_BOT_TOKEN'],
-            'discord': ['DISCORD_TOKEN', 'DISCORD_BOT_TOKEN'],
-            'postgres': ['DATABASE_URL', 'POSTGRES_CONNECTION_STRING'],
-            'mysql': ['DATABASE_URL', 'MYSQL_CONNECTION_STRING'],
-            'redis': ['REDIS_URL'],
-            'mongodb': ['MONGODB_URI'],
-            'aws': ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'],
-            'azure': ['AZURE_SUBSCRIPTION_ID', 'AZURE_CLIENT_ID'],
-            'gcp': ['GOOGLE_APPLICATION_CREDENTIALS'],
-            'google': ['GOOGLE_API_KEY'],
-            'stripe': ['STRIPE_API_KEY'],
-            'twilio': ['TWILIO_ACCOUNT_SID', 'TWILIO_AUTH_TOKEN'],
-            'sendgrid': ['SENDGRID_API_KEY'],
-            'mailgun': ['MAILGUN_API_KEY'],
-            'firebase': ['FIREBASE_PROJECT_ID'],
-            'supabase': ['SUPABASE_URL', 'SUPABASE_KEY'],
-            'notion': ['NOTION_API_KEY'],
-            'airtable': ['AIRTABLE_API_KEY'],
-            'letta': ['LETTA_API_KEY'],
-            'brave': ['BRAVE_API_KEY'],
-            'puppeteer': [],
-            'playwright': [],
-            'filesystem': [],
-            'everything': [],
+            openai: ['OPENAI_API_KEY'],
+            anthropic: ['ANTHROPIC_API_KEY'],
+            github: ['GITHUB_TOKEN', 'GITHUB_PERSONAL_ACCESS_TOKEN'],
+            gitlab: ['GITLAB_TOKEN', 'GITLAB_PERSONAL_ACCESS_TOKEN'],
+            slack: ['SLACK_TOKEN', 'SLACK_BOT_TOKEN'],
+            discord: ['DISCORD_TOKEN', 'DISCORD_BOT_TOKEN'],
+            postgres: ['DATABASE_URL', 'POSTGRES_CONNECTION_STRING'],
+            mysql: ['DATABASE_URL', 'MYSQL_CONNECTION_STRING'],
+            redis: ['REDIS_URL'],
+            mongodb: ['MONGODB_URI'],
+            aws: ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'],
+            azure: ['AZURE_SUBSCRIPTION_ID', 'AZURE_CLIENT_ID'],
+            gcp: ['GOOGLE_APPLICATION_CREDENTIALS'],
+            google: ['GOOGLE_API_KEY'],
+            stripe: ['STRIPE_API_KEY'],
+            twilio: ['TWILIO_ACCOUNT_SID', 'TWILIO_AUTH_TOKEN'],
+            sendgrid: ['SENDGRID_API_KEY'],
+            mailgun: ['MAILGUN_API_KEY'],
+            firebase: ['FIREBASE_PROJECT_ID'],
+            supabase: ['SUPABASE_URL', 'SUPABASE_KEY'],
+            notion: ['NOTION_API_KEY'],
+            airtable: ['AIRTABLE_API_KEY'],
+            letta: ['LETTA_API_KEY'],
+            brave: ['BRAVE_API_KEY'],
+            puppeteer: [],
+            playwright: [],
+            filesystem: [],
+            everything: [],
             'sequential-thinking': [],
         };
         for (const [service, vars] of Object.entries(serviceEnvVars)) {
@@ -225,10 +227,10 @@ function displayServer(entry) {
         nameLine += chalk.gray(` v${server.version}`);
     }
     if (meta?.status === 'active') {
-        nameLine += chalk.green(' ✓');
+        nameLine += chalk.green(' [active]');
     }
     if (requirements.needsSetup) {
-        nameLine += chalk.yellow(' ⚙'); // Setup required indicator
+        nameLine += chalk.yellow(' [setup required]');
     }
     output.info(nameLine);
     // Description
@@ -265,12 +267,12 @@ function displayServer(entry) {
         if (requirements.envVars.length > 0) {
             output.info(chalk.yellow('  Environment:'));
             for (const envVar of requirements.envVars) {
-                const isSet = process.env[envVar] ? chalk.green('✓') : chalk.red('✗');
+                const isSet = process.env[envVar] ? chalk.green('set') : chalk.red('missing');
                 output.info(chalk.yellow(`    ${isSet} ${envVar}`));
             }
         }
         // Setup hints (new)
-        if (requirements.setupHints.length > 0 && requirements.envVars.some(v => !process.env[v])) {
+        if (requirements.setupHints.length > 0 && requirements.envVars.some((v) => !process.env[v])) {
             output.info(chalk.gray('  Setup:'));
             for (const hint of requirements.setupHints) {
                 output.info(chalk.gray(`    → ${hint}`));

package/dist/cli/commands/watch.js

@@ -99,7 +99,7 @@ export const watchCommand = new Command('watch')
                     sessionId: remoteSessionId || undefined,
                 });
             }
-            const discovery = await discover(mcpClient, transport === 'stdio' ? serverCommand : remoteUrl ?? serverCommand, transport === 'stdio' ? args : []);
+            const discovery = await discover(mcpClient, transport === 'stdio' ? serverCommand : (remoteUrl ?? serverCommand), transport === 'stdio' ? args : []);
             output.info(`Found ${discovery.tools.length} tools`);
             if (discovery.tools.length === 0) {
                 output.info('No tools found. Skipping.');
@@ -190,7 +190,7 @@ export const watchCommand = new Command('watch')
                         walkDir(fullPath);
                     }
                     else if (entry.isFile()) {
-                        if (extensions.some(ext => entry.name.endsWith(ext))) {
+                        if (extensions.some((ext) => entry.name.endsWith(ext))) {
                             const stat = statSync(fullPath);
                             const modTime = stat.mtimeMs;
                             const lastMod = fileModTimes.get(fullPath);
@@ -250,14 +250,14 @@ export const watchCommand = new Command('watch')
     }, interval);
     // Handle exit
     const cleanup = () => {
+        // Remove signal handlers first to prevent re-entry
+        process.removeListener('SIGINT', cleanup);
+        process.removeListener('SIGTERM', cleanup);
         output.info('\n\nExiting watch mode.');
         if (currentInterval) {
             clearInterval(currentInterval);
             currentInterval = null;
         }
-        // Remove signal handlers to prevent accumulation
-        process.removeListener('SIGINT', cleanup);
-        process.removeListener('SIGTERM', cleanup);
         process.exit(EXIT_CODES.CLEAN);
     };
     process.on('SIGINT', cleanup);

package/dist/cli/output/terminal-reporter.js

@@ -22,21 +22,21 @@ export function formatToolResultLine(summary) {
 }
 export function buildCheckSummary(result) {
     const toolProfiles = result.toolProfiles;
-    const skipped = toolProfiles.filter(p => p.skipped).map(p => p.name);
-    const mocked = toolProfiles.filter(p => p.mocked).map(p => p.name);
-    const issueTools = toolProfiles.filter(profileHasIssues).map(p => p.name);
-    const fullyTested = toolProfiles.filter(p => !p.skipped && !p.mocked).length;
+    const skipped = toolProfiles.filter((p) => p.skipped).map((p) => p.name);
+    const mocked = toolProfiles.filter((p) => p.mocked).map((p) => p.name);
+    const issueTools = toolProfiles.filter(profileHasIssues).map((p) => p.name);
+    const fullyTested = toolProfiles.filter((p) => !p.skipped && !p.mocked).length;
     const lines = [];
     lines.push('Summary:');
-    lines.push(`✓ ${fullyTested} tools fully tested`);
+    lines.push(`[PASS] ${fullyTested} tools fully tested`);
     if (skipped.length > 0) {
-        lines.push(`⚠ ${skipped.length} tools skipped`);
+        lines.push(`[WARN] ${skipped.length} tools skipped`);
     }
     if (mocked.length > 0) {
-        lines.push(`⚠ ${mocked.length} tools mocked`);
+        lines.push(`[WARN] ${mocked.length} tools mocked`);
     }
     if (issueTools.length > 0) {
-        lines.push(`✗ ${issueTools.length} tools have issues`);
+        lines.push(`[FAIL] ${issueTools.length} tools have issues`);
     }
     const nextSteps = [];
     const externalServices = result.metadata.externalServices;
@@ -64,7 +64,7 @@ export function colorizeConfidence(label, _level) {
     return label;
 }
 export function profileHasIssues(profile) {
-    return profile.interactions.some(i => !i.mocked && i.outcomeAssessment && !i.outcomeAssessment.correct);
+    return profile.interactions.some((i) => !i.mocked && i.outcomeAssessment && !i.outcomeAssessment.correct);
 }
 function resolveStatusSymbol(summary) {
     if (summary.skipped) {

package/dist/cli/output.d.ts

@@ -193,7 +193,7 @@ export interface DiffSummary {
     behaviorChanges: number;
 }
 /**
- * Get the icon for a severity level.
+ * Get the label for a severity level.
  */
 export declare function getSeverityIcon(severity: string): string;
 /**