Merge branch '4.x' into fix/mcp-zombie-mocha

Author: DavertMik

lib/command/run-workers.js

@@ -87,19 +87,5 @@ export default async function (workerCount, selectedRuns, options) {
     process.exitCode = 1
   } finally {
     await workers.teardownAll()
-    
-    // Force exit if event loop doesn't clear naturally
-    // This is needed because worker threads may leave handles open
-    // even after proper cleanup, preventing natural process termination
-    if (!options.noExit) {
-      // Use beforeExit to ensure we run after all other exit handlers
-      // have set the correct exit code
-      process.once('beforeExit', (code) => {
-        // Give cleanup a moment to complete, then force exit with the correct code
-        setTimeout(() => {
-          process.exit(code || process.exitCode || 0)
-        }, 100)
-      })
-    }
   }
 }

lib/command/run.js

@@ -1,8 +1,7 @@
-import { getConfig, printError, getTestRoot, createOutputDir } from './utils.js'
+import { getConfig, printError, getTestRoot, createOutputDir, autoExit } from './utils.js'
 import Config from '../config.js'
 import store from '../store.js'
 import Codecept from '../codecept.js'
-import container from '../container.js'
 
 export default async function (test, options) {
   // registering options globally to use in config
@@ -43,19 +42,6 @@ export default async function (test, options) {
     process.exitCode = 1
   } finally {
     await codecept.teardown()
-
-    // Schedule a delayed exit to prevent process hanging due to browser helper event loops
-    // Only needed for Playwright/Puppeteer which keep the event loop alive
-    // Wait 1 second to allow final cleanup and output to complete
-    if (!process.env.CODECEPT_DISABLE_AUTO_EXIT) {
-      const helpers = container.helpers()
-      const hasBrowserHelper = helpers && (helpers.Playwright || helpers.Puppeteer || helpers.WebDriver)
-      
-      if (hasBrowserHelper) {
-        setTimeout(() => {
-          process.exit(process.exitCode || 0)
-        }, 1000).unref()
-      }
-    }
+    await autoExit()
   }
 }

lib/command/utils.js

@@ -107,6 +107,20 @@ export const createOutputDir = (config, testRoot) => {
   }
 }
 
+export async function autoExit() {
+  const timeout = parseInt(process.env.CODECEPT_AUTO_EXIT_TIMEOUT, 10)
+  if (timeout === 0) return
+  const exitTimeout = timeout || 2000
+
+  const { default: container } = await import('../container.js')
+  const helpers = container.helpers()
+  if (!helpers || !Object.values(helpers).some(h => typeof h._cleanup === 'function')) return
+
+  const { default: recorder } = await import('../recorder.js')
+  await Promise.race([recorder.promise(), new Promise(resolve => setTimeout(resolve, exitTimeout))])
+  process.exit(process.exitCode || 0)
+}
+
 export const findConfigFile = testsPath => {
   const extensions = ['js', 'ts']
   for (const ext of extensions) {

lib/plugin/retryFailedStep.js

@@ -1,7 +1,10 @@
+import debugModule from 'debug'
 import event from '../event.js'
 import recorder from '../recorder.js'
 import store from '../store.js'
 
+const debug = debugModule('codeceptjs:retryFailedStep')
+
 const defaultConfig = {
   retries: 3,
   defaultIgnoredSteps: ['amOnPage', 'wait*', 'send*', 'execute*', 'run*', 'have*'],
@@ -147,9 +150,7 @@ export default function (config) {
     test.opts.conditionalRetries = config.retries
     test.opts.stepRetryPriority = stepRetryPriority
 
-    if (process.env.DEBUG_RETRY_PLUGIN) {
-      console.log('[retryFailedStep] applying retries =', config.retries, 'for test', test.title)
-    }
+    debug('applying retries = %d for test %s', config.retries, test.title)
     recorder.retry(config)
   })
 

lib/workers.js

@@ -547,10 +547,11 @@ class Workers extends EventEmitter {
     if (this.isPoolMode) {
       this.activeWorkers.set(worker, { available: true, workerIndex: null })
     }
-    
+
     // Track last activity time to detect hanging workers
     let lastActivity = Date.now()
     let currentTest = null
+    let autoTerminated = false
     const workerTimeout = process.env.CODECEPT_WORKER_TIMEOUT ? ms(process.env.CODECEPT_WORKER_TIMEOUT) : ms('5m')
 
     const timeoutChecker = setInterval(() => {
@@ -611,6 +612,13 @@ class Workers extends EventEmitter {
             })
           }
 
+          const exitTimeout = parseInt(process.env.CODECEPT_AUTO_EXIT_TIMEOUT, 10)
+          if (exitTimeout === 0) break
+          setTimeout(() => {
+            autoTerminated = true
+            worker.terminate()
+          }, exitTimeout || 2000)
+
           break
         case event.suite.before:
           {
@@ -741,8 +749,8 @@ class Workers extends EventEmitter {
     worker.on('exit', (code) => {
       clearInterval(timeoutChecker)
       this.closedWorkers += 1
-      
-      if (code !== 0) {
+
+      if (code !== 0 && !autoTerminated) {
         console.error(`[Main] Worker exited with code ${code}`)
         if (currentTest) {
           console.error(`[Main] Last test running: ${currentTest}`)