fix: fix engine and reporter problems

Author: boneskull

package.json

@@ -175,9 +175,6 @@
     }
   },
   "lint-staged": {
-    "package.json": [
-      "npm pkg fix"
-    ],
     "*.{ts,cts,js,cjs,yml,json5}": [
       "eslint --fix",
       "prettier --write",

src/cli/commands/init.ts

@@ -43,39 +43,39 @@ const PROJECT_TEMPLATES = {
   advanced: {
     configOptions: {
       iterations: 1000,
-      outputDir: './benchmark-results',
-      pattern: 'benchmarks/**/*.bench.{js,ts}',
+      outputDir: '.modestbench',
+      pattern: 'bench/**/*.bench.{js,ts}',
       reporters: ['human', 'json'],
       time: 10000,
       warmup: 50,
     },
     description: 'Feature-rich setup with multiple reporters and configuration',
-    directories: ['benchmarks', 'benchmark-results'],
+    directories: ['bench', '.modestbench'],
     name: 'Advanced Project',
   },
   basic: {
     configOptions: {
       iterations: 100,
-      pattern: 'benchmarks/**/*.bench.{js,ts}',
+      pattern: 'bench/**/*.bench.{js,ts}',
       reporters: ['human'],
       time: 5000,
     },
     description: 'Simple benchmark setup for small projects',
-    directories: ['benchmarks'],
+    directories: ['bench'],
     name: 'Basic Project',
   },
   library: {
     configOptions: {
       bail: false,
       iterations: 5000,
-      outputDir: './benchmark-results',
-      pattern: 'benchmarks/**/*.bench.{js,ts}',
+      outputDir: '.modestbench',
+      pattern: 'bench/**/*.bench.{js,ts}',
       reporters: ['human', 'json'],
       time: 15000,
       warmup: 100,
     },
     description: 'Optimized for library performance testing',
-    directories: ['benchmarks', 'benchmarks/suites', 'benchmark-results'],
+    directories: ['bench', 'bench/suites', '.modestbench'],
     name: 'Library Project',
   },
 } as const;
@@ -316,7 +316,7 @@ export const handleInitCommand = async (
         console.log('  1. Run example benchmarks: modestbench run');
       } else {
         console.log(
-          '  1. Create your first benchmark file in the benchmarks/ directory',
+          '  1. Create your first benchmark file in the bench/ directory',
         );
       }
       console.log('  2. Customize configuration in your config file');
@@ -385,7 +385,7 @@ modestbench run
 
 Run specific benchmarks:
 \`\`\`bash
-modestbench run "benchmarks/array-*.bench.js"
+modestbench run "bench/array-*.bench.js"
 \`\`\`
 
 View benchmark history:
@@ -399,7 +399,7 @@ See \`modestbench.config.*\` for benchmark configuration options.
 
 ## Writing Benchmarks
 
-Create new benchmark files in the \`benchmarks/\` directory. See the examples for the expected format.
+Create new benchmark files in the \`bench/\` directory. See the examples for the expected format.
 `;
 
   try {
@@ -549,7 +549,7 @@ const createDirectories = async (
  * Create example benchmark files
  */
 const createExampleBenchmarks = async (cwd: string): Promise<void> => {
-  const benchmarksDir = resolve(cwd, 'benchmarks');
+  const benchmarksDir = resolve(cwd, 'bench');
 
   for (const [name, example] of Object.entries(EXAMPLE_BENCHMARKS)) {
     const filePath = join(benchmarksDir, example.filename);

src/cli/commands/run.ts

@@ -71,15 +71,8 @@ export const handleRunCommand = async (
   context: CliContext,
   options: RunOptions,
 ): Promise<number> => {
-  // Check if JSON reporter is being used (need quiet output for clean JSON)
-  // Only force quiet mode if json is used AND no output directory is specified
-  // (i.e., outputting to stdout where we need clean JSON)
-  const isUsingJsonReporter = options.reporters?.includes('json') ?? false;
-  const shouldBeQuiet =
-    options.quiet || (isUsingJsonReporter && !options.outputDir);
   const verbose = options.verbose ?? false;
-  // CLI messages on stderr should only be suppressed by explicit --quiet, not JSON-forced quiet
-  const showCliMessages = verbose && !options.quiet;
+  let shouldBeQuiet = options.quiet ?? false; // Will be updated after config loads
 
   try {
     // Validate --output-file usage
@@ -95,11 +88,17 @@ export const handleRunCommand = async (
     }
 
     // Step 1: Load and merge configuration
-    if (showCliMessages) {
-      console.error('Loading configuration...');
-    }
     const config = await loadConfiguration(context, options);
 
+    // Check if JSON reporter is being used (need quiet output for clean JSON)
+    // Only force quiet mode if json is used AND no output directory is specified
+    // (i.e., outputting to stdout where we need clean JSON)
+    const isUsingJsonReporter = config.reporters?.includes('json') ?? false;
+    const hasOutputDir = !!(options.outputDir || config.outputDir);
+    shouldBeQuiet = options.quiet || (isUsingJsonReporter && !hasOutputDir);
+    // CLI messages on stderr should only be suppressed by explicit --quiet, not JSON-forced quiet
+    const showCliMessages = verbose && !options.quiet;
+
     // Step 2: Configure reporters
     if (showCliMessages) {
       console.error('Setting up reporters...');
@@ -109,7 +108,7 @@ export const handleRunCommand = async (
       config,
       verbose,
       showCliMessages,
-      options.quiet ?? false,
+      shouldBeQuiet,
       options.outputDir,
       options.outputFile,
       options.progress,
@@ -377,11 +376,13 @@ const setupReporters = (
     // Dedupe requested reporters
     const requestedReporters = [...new Set(config.reporters || ['human'])];
 
-    // Only use file output if --output was explicitly provided
-    // Use the explicit output dir if provided, otherwise check config
+    // Use output directory from CLI flag, config file, or undefined
+    // CLI flag takes precedence over config file
     const outputDir = explicitOutputDir
       ? resolve(explicitOutputDir)
-      : undefined;
+      : config.outputDir
+        ? resolve(config.outputDir)
+        : undefined;
 
     // Built-in reporter names for error messages
     const builtInReporters = ['human', 'json', 'csv', 'simple'];

src/core/engine.ts

@@ -652,7 +652,7 @@ export abstract class ModestBenchEngine implements BenchmarkEngine {
           benchmarkDef.suites,
         )) {
           // Use shared filtering logic
-          const { anyTaskMatches, suiteMatches } =
+          const { anyTaskMatches, suiteMatches, tasksToRun } =
             this.getFilteredTasksForSuite(
               suiteData,
               fileTags,
@@ -665,6 +665,15 @@ export abstract class ModestBenchEngine implements BenchmarkEngine {
             continue;
           }
 
+          // Emit suite init with task names for pre-calculation
+          const taskNames = tasksToRun.map(([name]) => name);
+          await this.callReporters(
+            reporters,
+            'onSuiteInit',
+            suiteName,
+            taskNames,
+          );
+
           await this.callReporters(reporters, 'onSuiteStart', suiteName);
           const suiteResult = await this.executeBenchmarkSuite(
             suiteName,
@@ -768,6 +777,12 @@ export abstract class ModestBenchEngine implements BenchmarkEngine {
         }
       }
 
+      // Merge suite-level config with global config
+      // Suite-level config takes precedence over global config
+      const mergedConfig = suiteData.config
+        ? { ...config, ...suiteData.config }
+        : config;
+
       try {
         // Process each task that passed filtering
         for (const [taskName, taskData] of tasksToRun) {
@@ -776,13 +791,14 @@ export abstract class ModestBenchEngine implements BenchmarkEngine {
           // Mark task as in-progress (shows as 0.5 progress for current task)
           const currentState = this.progressManager.getState();
           this.progressManager.update({
+            currentTask: taskName,
             tasksCompleted: currentState.tasksCompleted + 0.5,
           });
 
           const taskResult = await this.executeBenchmarkTask(
             taskName,
             taskData,
-            config,
+            mergedConfig,
             reporters,
             signal,
           );