dd-trace 6.17.0 → 6.19.0

package/packages/datadog-instrumentations/src/jest.js

@@ -58,6 +58,7 @@ const {
   addCoverageBackfillUntestedFiles,
   getCoverageBackfillFiles,
 } = require('./jest/coverage-backfill')
+const { getSessionError } = require('./jest/session-error')
 const {
   getChannelPromise,
   publishWithCompletion,
@@ -109,6 +110,10 @@ const CHILD_MESSAGE_CALL = 1
 const FLUSH_TIMEOUT = FINAL_FLUSH_TIMEOUT + FINAL_FLUSH_FALLBACK_DELAY + 5000
 const JEST_SESSION_STATE = Symbol.for('dd-trace:jest:session')
 const JEST_BAIL_REPORTER_PATH = require.resolve('./jest/bail-reporter')
+const JEST_CIRCUS_TEST_RUNNER_PATH = /(?:^|[\\/])jest-circus(?:[\\/]|$)/
+const UNSUPPORTED_JEST_TEST_RUNNER_WARNING =
+  'dd-trace Test Optimization supports jest-circus; another test runner was detected; ' +
+  'suite and test events may be incomplete.'
 const DD_JEST_HANDLE_TEST_EVENT_WRAPPED = Symbol('dd-trace:jest:handle-test-event-wrapped')
 const DD_JEST_HANDLE_TEST_EVENT_DATADOG = Symbol('dd-trace:jest:handle-test-event-datadog')
 const DD_JEST_CONCURRENT_TEST_ORIGINAL = Symbol('dd-trace:jest:concurrent-test-original')
@@ -248,6 +253,7 @@ const MINIMUM_JEST_TEST_SCHEDULER_VERSION = DD_MAJOR >= 6 ? '>=28.0.0' : '>=27.0
 const MINIMUM_JEST_COVERAGE_BACKFILL_VERSION = '>=28.0.0'
 const atrSuppressedErrors = new Map()
 let hasWarnedDeprecatedJestVersion = false
+let hasWarnedUnsupportedJestTestRunner = false
 let isJestCoverageBackfillSupported = false
 let hasFinishedTestSession = false
 let jestEachBind
@@ -322,6 +328,20 @@ function warnDeprecatedJestVersion (frameworkVersion) {
   )
 }
 
+/** @param {object[]} configs resolved Jest project configurations */
+function warnIfUnsupportedJestTestRunner (configs) {
+  if (hasWarnedUnsupportedJestTestRunner || !testSessionConfigurationCh.hasSubscribers) return
+
+  const usesUnsupportedTestRunner = getEnvironmentVariable('JEST_JASMINE') === '1' ||
+    configs.some(config => !JEST_CIRCUS_TEST_RUNNER_PATH.test(config.testRunner))
+
+  if (usesUnsupportedTestRunner) {
+    hasWarnedUnsupportedJestTestRunner = true
+    // eslint-disable-next-line no-console
+    console.warn(UNSUPPORTED_JEST_TEST_RUNNER_WARNING)
+  }
+}
+
 function getTestEnvironmentOptions (config) {
   if (config.projectConfig && config.projectConfig.testEnvironmentOptions) { // newer versions
     return config.projectConfig.testEnvironmentOptions
@@ -2720,13 +2740,6 @@ function applySkippedCoverageToJestCoverageMap (coverageMap, rootDir) {
   )
 }
 
-function getSessionFinishError (results) {
-  const numFailedTestSuites = results?.numFailedTestSuites || 0
-  const numFailedTests = results?.numFailedTests || 0
-
-  return new Error(`Failed test suites: ${numFailedTestSuites}. Failed tests: ${numFailedTests}`)
-}
-
 function getTestSessionCoveragePayload (results, fallbackRootDir) {
   const payload = {}
   if (!shouldReportCodeCoverageLinesPct()) return payload
@@ -2828,7 +2841,7 @@ function getTestSessionFinishPayload (status, error, extra = {}) {
 async function finishBailTestSession (results, fallbackRootDir) {
   await waitForTestSessionFinish(getTestSessionFinishPayload(
     'fail',
-    getSessionFinishError(results),
+    getSessionError(results),
     getTestSessionCoveragePayload(results, fallbackRootDir)
   ))
 }
@@ -3151,8 +3164,8 @@ function getCliWrapper (isNewJestVersion) {
 
       const {
         results: {
-          numFailedTestSuites,
           numFailedTests,
+          numPassedTests,
           numRuntimeErrorTestSuites = 0,
           numTotalTests,
           numTotalTestSuites,
@@ -3323,16 +3336,19 @@ function getCliWrapper (isNewJestVersion) {
 
       // Determine session status after EFD and quarantine checks have potentially modified success
       let status, error
-      const isExpectedEmptySession = numTotalTests === 0 && numTotalTestSuites === 0
+      const hasExecutedTests = numPassedTests > 0 || numFailedTests > 0 || numSuppressedQuarantinedTests > 0
+      const testSessionEmptyReason = result.results.success && !hasExecutedTests
+        ? (numTotalTests > 0 || isSuitesSkipped ? 'all_tests_skipped' : 'zero_tests')
+        : undefined
       if (result.results.success) {
-        status = isExpectedEmptySession ? 'skip' : 'pass'
+        status = testSessionEmptyReason ? 'skip' : 'pass'
       } else {
         status = 'fail'
-        error = new Error(`Failed test suites: ${numFailedTestSuites}. Failed tests: ${numFailedTests}`)
+        error = getSessionError(result.results)
       }
 
       await waitForTestSessionFinish(getTestSessionFinishPayload(status, error, {
-        isExpectedEmptySession: result.results.success && isExpectedEmptySession,
+        testSessionEmptyReason,
         ...getTestSessionCoveragePayload(result.results, result.globalConfig?.rootDir),
       }))
 
@@ -3625,6 +3641,7 @@ addHook({
 }, jestAdapterWrapper)
 
 function configureTestEnvironment (readConfigsResult) {
+  warnIfUnsupportedJestTestRunner(readConfigsResult.configs)
   repositoryRoot = getJestRepositoryRoot(readConfigsResult)
   isUserCodeCoverageEnabled = !!readConfigsResult.globalConfig.collectCoverage
   const isCodeCoverageEnabledBecauseOfUs = shouldCollectJestCoverageForTia() && !isUserCodeCoverageEnabled

package/packages/datadog-instrumentations/src/mocha/main.js

@@ -316,8 +316,8 @@ function getOnEndHandler (isParallel, onDone) {
     let status = 'pass'
     let error = frameworkError
     if (this.stats) {
-      status = this.stats.failures === 0 ? 'pass' : 'fail'
-      if (this.stats.tests === 0 && this.stats.failures === 0) {
+      status = this.stats.failures === 0 && this.failures === 0 ? 'pass' : 'fail'
+      if (this.stats.tests === this.stats.pending && status === 'pass') {
         status = 'skip'
       }
     } else if (this.failures !== 0) {
@@ -329,7 +329,9 @@ function getOnEndHandler (isParallel, onDone) {
     } else if (status === 'fail') {
       error = new Error(`Failed tests: ${this.failures}.`)
     }
-    const isExpectedEmptySession = arguments.length === 0 && status === 'skip'
+    const testSessionEmptyReason = status === 'skip'
+      ? (this.stats.pending > 0 || skippedSuites.length > 0 ? 'all_tests_skipped' : 'zero_tests')
+      : undefined
 
     testFileToSuiteCtx.clear()
 
@@ -373,7 +375,7 @@ function getOnEndHandler (isParallel, onDone) {
       isTestManagementEnabled: config.isTestManagementTestsEnabled,
       isParallel,
       isFrameworkError: arguments.length > 0,
-      isExpectedEmptySession,
+      testSessionEmptyReason,
     }, () => {
       try {
         onDone()
@@ -1022,7 +1024,7 @@ function getExecutionConfiguration (runner, isParallel, frameworkVersion, onFini
     config.isSuitesSkippingEnabled = config.isItrEnabled && libraryConfig.isSuitesSkippingEnabled
     config.isFlakyTestRetriesEnabled = libraryConfig.isFlakyTestRetriesEnabled
     config.flakyTestRetriesCount = libraryConfig.flakyTestRetriesCount
-    config.isDynamicAtrEnabled = libraryConfig.isDynamicAtrEnabled
+    config.isDynamicAtrEnabled = libraryConfig.isDynamicAtrEnabled && satisfies(frameworkVersion, '>=8.0.0')
     config.dynamicAtrBuckets = libraryConfig.dynamicAtrBuckets
     config.isDiEnabled = libraryConfig.isDiEnabled
     config.isTestDynamicInstrumentationEnabled = isTestDynamicInstrumentationEnabled

package/packages/datadog-instrumentations/src/mocha/utils.js

@@ -54,7 +54,7 @@ const testsQuarantined = new Set()
 const testsStatuses = new Map()
 const efdRetryCountByTestFullName = new Map()
 const efdSlowAbortedTests = new Set()
-const dynamicAtrRetryCountByTestFullName = new Map()
+let dynamicAtrRetryCountByTest = new WeakMap()
 const attemptToFixExecutions = new Map()
 const isMochaWorker = !!getEnvironmentVariable('MOCHA_WORKER_ID')
 
@@ -343,7 +343,7 @@ function resetRunState (rootSuite) {
   testsStatuses.clear()
   efdRetryCountByTestFullName.clear()
   efdSlowAbortedTests.clear()
-  dynamicAtrRetryCountByTestFullName.clear()
+  dynamicAtrRetryCountByTest = new WeakMap()
   attemptToFixExecutions.clear()
   loggedAttemptToFixTests.clear()
 
@@ -538,8 +538,7 @@ function runnableWrapper (RunnablePackage, libraryConfig) {
       if (libraryConfig.isDynamicAtrEnabled) {
         // Dynamic ATR: set the max possible retries initially.
         // The actual duration-based count is computed after the first attempt.
-        const testName = getTestFullName(test)
-        const dynamicCount = dynamicAtrRetryCountByTestFullName.get(testName)
+        const dynamicCount = dynamicAtrRetryCountByTest.get(test._retriedTest || test)
         if (dynamicCount === undefined) {
           const maxRetries = libraryConfig.dynamicAtrBuckets
             ? Math.max(...libraryConfig.dynamicAtrBuckets)
@@ -723,12 +722,14 @@ function getTestFinishInfo (test, status, config, error) {
   }
 
   // Dynamic ATR: after the first attempt, compute the duration-based retry budget.
+  // Mocha's native retry clones point to the original test, independently of duplicate titles.
+  const originalTest = test._retriedTest || test
   if (
     config.isDynamicAtrEnabled &&
     config.isFlakyTestRetriesEnabled &&
     !test._ddIsAttemptToFix &&
     !test._ddIsEfdRetry &&
-    !dynamicAtrRetryCountByTestFullName.has(testName) &&
+    !dynamicAtrRetryCountByTest.has(originalTest) &&
     test._currentRetry === 0
   ) {
     const duration = test.duration > 0 ? test.duration : performance.now() - test._ddStartTime
@@ -737,7 +738,7 @@ function getTestFinishInfo (test, status, config, error) {
       config.earlyFlakeDetectionRetryPolicy,
       config.dynamicAtrBuckets
     )
-    dynamicAtrRetryCountByTestFullName.set(testName, dynamicCount)
+    dynamicAtrRetryCountByTest.set(originalTest, dynamicCount)
   }
 
   if (testsStatuses.get(testName)) {
@@ -1094,13 +1095,12 @@ function getOnTestRetryHandler (config) {
       !test._ddIsAttemptToFix &&
       !isEarlyFlakeDetectionTest(test, config)
     if (isDynamicAtrTest && isFirstAttempt) {
-      const testName = getTestFullName(test)
       const dynamicCount = getDynamicAtrRetryCount(
         test.duration > 0 ? test.duration : performance.now() - test._ddStartTime,
         config.earlyFlakeDetectionRetryPolicy,
         config.dynamicAtrBuckets
       )
-      dynamicAtrRetryCountByTestFullName.set(testName, dynamicCount)
+      dynamicAtrRetryCountByTest.set(test._retriedTest || test, dynamicCount)
       // Mocha emits retry before its next attempt starts; narrow its ceiling here.
       test._retries = dynamicCount
     }

package/packages/datadog-instrumentations/src/playwright-reporter.js

@@ -206,16 +206,15 @@ class DatadogPlaywrightReporter {
   onExit () {}
 
   /**
-   * Reports errors emitted by Playwright while later reporters are finalizing.
+   * Reports global run errors as well as errors from later reporters during finalization.
    *
    * @param {unknown} error
    */
   onError (error) {
-    if (this.isFinalizing) {
-      reporterErrorCh.publish(error)
-    } else {
+    if (!this.isFinalizing) {
       this.fatalErrorCount += 1
     }
+    reporterErrorCh.publish(error)
   }
 
   /**

package/packages/datadog-instrumentations/src/playwright.js

@@ -69,13 +69,16 @@ const dispatcherCreateWorkerCh = tracingChannel('orchestrion:playwright:Dispatch
 const filterForShardCh = tracingChannel('orchestrion:playwright:filterForShard')
 const processHostStartRunnerCh = tracingChannel('orchestrion:playwright:ProcessHost_startRunner')
 const createRootSuiteCh = tracingChannel('orchestrion:playwright:createRootSuite')
+const lastRunTestIdCh = tracingChannel('orchestrion:playwright:lastRunTestId')
 const artifactsRecorderScreenshotPathCh =
   tracingChannel('orchestrion:playwright:ArtifactsRecorder_createScreenshotAttachmentPath')
 const snapshotRecorderScreenshotPathCh = tracingChannel('orchestrion:playwright:SnapshotRecorder_createAttachmentPath')
 const saveAutomaticVideoCh = tracingChannel('orchestrion:playwright:saveAutomaticVideo')
 const pageGotoCh = tracingChannel('orchestrion:playwright-core:Page_goto')
+const fullProjectInternalCh = tracingChannel('orchestrion:playwright:FullProjectInternal')
 
 const testToCtx = new WeakMap()
+const originalTestIdsByRetry = new WeakMap()
 const testSuiteToCtx = new Map()
 const testSuiteToTestStatuses = new Map()
 const testSuiteToErrors = new Map()
@@ -89,6 +92,8 @@ const isFailureScreenshotUploadEnabled =
   getValueFromEnvSources('DD_TEST_FAILURE_SCREENSHOTS_ENABLED') === true
 const isFailureVideoUploadEnabled =
   getValueFromEnvSources('DD_TEST_FAILURE_VIDEOS_ENABLED') === true
+const shouldEnableFailureScreenshots = getValueFromEnvSources('DD_TEST_FAILURE_SCREENSHOTS_ENABLED', true) === true
+const shouldEnableFailureVideos = getValueFromEnvSources('DD_TEST_FAILURE_VIDEOS_ENABLED', true) === true
 
 let applyRepeatEachIndex = null
 let reporterError
@@ -475,6 +480,7 @@ function deepCloneSuite (suite, filterTest, tags = [], configureCopiedTest) {
     } else {
       if (filterTest(entry)) {
         const copiedTest = entry._clone()
+        originalTestIdsByRetry.set(copiedTest, originalTestIdsByRetry.get(entry) ?? entry.id)
         if (configureCopiedTest) {
           configureCopiedTest(copiedTest, entry)
         }
@@ -915,6 +921,7 @@ function testEndHandler ({
   testDuration,
   testResultStatus,
   expectedStatus = test.expectedStatus,
+  hasNonRetriableError,
 }) {
   const {
     _requireFile: testSuiteAbsolutePath,
@@ -1053,6 +1060,8 @@ function testEndHandler ({
   if (isFlakyTestRetriesEnabled && !testProperties.attemptToFix && !test._ddIsEfdRetry &&
     !(test._ddIsNew || test._ddIsModified) &&
     atrRetryCount != null && atrRetryCount > 0 &&
+    // Serial suites can add skipped results before a test's first execution.
+    results.some((result, index) => index < results.length - 1 && result.status !== 'skipped') &&
     !willRetry && testResultStatus !== expectedStatus &&
     testStatuses.every(status => status === 'fail')) {
     test._ddHasFailedAllRetries = true
@@ -1087,6 +1096,8 @@ function testEndHandler ({
     if (testCtx) {
       testFinishCh.publish({
         testStatus,
+        isExpectedFailure: testResultStatus === 'failed' && expectedStatus === 'failed',
+        hasNonRetriableError,
         steps: testResult?.steps || [],
         isRetry: testResult?.retry > 0,
         error,
@@ -1278,7 +1289,7 @@ function onDispatcherCreateWorker (dispatcher, worker) {
       videos.push(attachment)
     }
   })
-  worker.on('testEnd', ({ testId, status, errors, annotations, duration, expectedStatus }) => {
+  worker.on('testEnd', ({ testId, status, errors, annotations, duration, expectedStatus, hasNonRetriableError }) => {
     const test = getTestByTestId(dispatcher, testId)
     if (!test) return
 
@@ -1300,6 +1311,7 @@ function onDispatcherCreateWorker (dispatcher, worker) {
         testDuration: duration,
         testResultStatus: status,
         expectedStatus,
+        hasNonRetriableError,
       }
     )
     const testResult = test.results.at(-1)
@@ -1406,6 +1418,8 @@ function dispatcherHook (dispatcherExport) {
             annotations: params.annotations,
             testStatus: STATUS_TO_TEST_STATUS[testResult.status],
             testResultStatus: testResult.status,
+            expectedStatus: params.expectedStatus,
+            hasNonRetriableError: params.hasNonRetriableError,
             error: testResult.error,
             isTimeout,
             shouldCreateTestSpan: true,
@@ -1431,7 +1445,7 @@ function dispatcherHookNew (dispatcherExport, runWrapper) {
 
 function runAllTestsWrapper (runAllTests, playwrightVersion) {
   // Config parameter is only available from >=1.55.0
-  return async function (config) {
+  return async function (config, options) {
     // A later run must not inherit ATR settings when configuration fails or the plugin is disabled.
     isFlakyTestRetriesEnabled = false
     flakyTestRetriesCount = 0
@@ -1682,14 +1696,30 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
     const finalStatus = hasReporterError
       ? 'fail'
       : (preventedToFail ? 'pass' : STATUS_TO_TEST_STATUS[sessionStatus])
-    const isExpectedEmptyShard = finalStatus === 'pass' &&
-      Boolean(playwrightConfig.shard) &&
+    const isTestDiscovery = finalStatus === 'pass' &&
+      Boolean(
+        config?.listOnly ||
+        config?.cliListOnly ||
+        runnerConfig.cliListOnly ||
+        runnerConfig._internal?.listOnly ||
+        options?.listMode
+      )
+    const isEmptyShard = Boolean(playwrightConfig.shard) &&
       hasTestsBeforeSharding &&
       !hasTestsAssignedToShard &&
       testsReportedInGenerateSummary.size === 0
+    const hasExecutedTests = [...testsToTestStatuses.values()].some(statuses =>
+      statuses.some(status => status !== 'skip')
+    )
+    const hasSkippedTests = testsToTestStatuses.size > 0 || testsReportedInGenerateSummary.size > 0
+    const testSessionEmptyReason = finalStatus === 'pass' && !hasExecutedTests
+      ? (isTestDiscovery
+          ? 'test_discovery'
+          : isEmptyShard ? 'zero_test_shard' : hasSkippedTests ? 'all_tests_skipped' : 'zero_tests')
+      : undefined
     await getChannelPromise(testSessionFinishCh, {
-      status: isExpectedEmptyShard ? 'skip' : finalStatus,
-      isExpectedEmptyShard,
+      status: testSessionEmptyReason ? 'skip' : finalStatus,
+      testSessionEmptyReason,
       error: finalizationError,
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
@@ -1857,6 +1887,27 @@ dispatcherRunCh.subscribe({
   },
 })
 
+fullProjectInternalCh.subscribe({
+  end ({ self, error }) {
+    if (error || !libraryConfigurationCh.hasSubscribers) return
+
+    // Workers reload the config, so apply capture settings as each project is resolved in either process.
+    const { project } = self
+    if (shouldEnableFailureScreenshots && !isFailureScreenshotCaptureEnabled([project])) {
+      const screenshot = project.use.screenshot
+      project.use.screenshot = typeof screenshot === 'object' && screenshot !== null
+        ? { ...screenshot, mode: 'only-on-failure' }
+        : 'only-on-failure'
+    }
+    if (shouldEnableFailureVideos && !isFailureVideoCaptureEnabled([project])) {
+      const video = project.use.video
+      project.use.video = typeof video === 'object' && video !== null
+        ? { ...video, mode: 'retain-on-failure' }
+        : 'retain-on-failure'
+    }
+  },
+})
+
 dispatcherCreateWorkerCh.subscribe({
   end (ctx) {
     onDispatcherCreateWorker(ctx.self, ctx.result)
@@ -1898,6 +1949,14 @@ pageGotoCh.subscribe({
   },
 })
 
+// Retry clones exist only after discovery, so persist their original IDs for --last-failed.
+lastRunTestIdCh.subscribe({
+  end (ctx) {
+    const originalId = originalTestIdsByRetry.get(ctx.arguments[0])
+    if (originalId !== undefined) ctx.result = originalId
+  },
+})
+
 reporterErrorCh.subscribe((error) => {
   recordReporterError(error)
 })
@@ -1968,6 +2027,12 @@ snapshotRecorderScreenshotPathCh.subscribe({ end: recordAutomaticFailureScreensh
 saveAutomaticVideoCh.subscribe({ start: recordAutomaticFailureVideoPath })
 
 if (DD_MAJOR < 6) { // <1.38.0 is only supported up to version 5
+  tracingChannel('orchestrion:@playwright/test:Multiplexer_onError').subscribe({
+    start (ctx) {
+      recordReporterError(ctx.arguments[0])
+    },
+  })
+
   addHook({
     name: '@playwright/test',
     file: 'lib/runner.js',
@@ -2656,6 +2721,8 @@ function instrumentWorkerMainMethods (workerMain) {
 
     await getChannelPromise(testFinishCh, {
       testStatus: STATUS_TO_TEST_STATUS[status],
+      isExpectedFailure: status === 'failed' && testInfo.expectedStatus === 'failed',
+      hasNonRetriableError: testInfo._hasNonRetriableError,
       retryTestId,
       deferFinalStatus: test._ddDeferFinalStatus,
       steps: steps.filter(step => step.testId === testId),

package/packages/datadog-instrumentations/src/undici.js

@@ -45,9 +45,13 @@ function wrapRequestUpgrade (Request) {
   const method = Request.prototype[methodName]
 
   // Orchestrion cannot leave fixed source byte-for-byte untouched after a conditional AST match.
-  if (typeof method !== 'function' ||
-      !requestSource.includes('channels.trailers.publish') ||
-      Function.prototype.toString.call(method).includes('channels.trailers.publish')) {
+  if (typeof method !== 'function' || !requestSource.includes('channels.trailers.publish')) {
+    return Request
+  }
+
+  const methodSource = Function.prototype.toString.call(method)
+  // Undici 6.29 delegates native upgrade completion to a private helper.
+  if (methodSource.includes('channels.trailers.publish') || methodSource.includes('#publishUpgradeTrailers')) {
     return Request
   }
 

package/packages/datadog-instrumentations/src/vitest-main.js

@@ -65,6 +65,9 @@ const workerProcesses = new WeakSet()
 const mainProcessSetupStates = new WeakMap()
 const coverageWrappedProviders = new WeakSet()
 const finishWrappedContexts = new WeakSet()
+const finishedSessionContexts = new WeakSet()
+const sessionWrappedPrototypes = new WeakSet()
+const emptyShardContexts = new WeakSet()
 const runFilesWrappedPrototypes = new WeakSet()
 const activeRunFilesContexts = new WeakSet()
 const runErrorsByContext = new WeakMap()
@@ -163,16 +166,6 @@ function getThreadsPoolWorkerExport (vitestPackage) {
   return findExportByName(vitestPackage, 'ThreadsPoolWorker')
 }
 
-function getSessionStatus (state) {
-  if (state.getCountOfFailedTests() > 0) {
-    return 'fail'
-  }
-  if (state.pathsSet.size === 0) {
-    return 'skip'
-  }
-  return 'pass'
-}
-
 function getTestFilepathsFromSpecifications (testSpecifications) {
   if (!Array.isArray(testSpecifications) || !testSpecifications.length) {
     return
@@ -1194,6 +1187,9 @@ function safeWorkspaceProject (ctx) {
 
 function getSortWrapper (sort, frameworkVersion) {
   return async function () {
+    if (this.ctx.config.shard && this.ctx.state.pathsSet.size > 0 && arguments[0].length === 0) {
+      emptyShardContexts.add(this.ctx)
+    }
     if (!activeRunFilesContexts.has(this.ctx)) {
       const testSpecifications = arguments[0]
       await ensureMainProcessSetup(this.ctx, frameworkVersion, testSpecifications)
@@ -1204,18 +1200,18 @@ function getSortWrapper (sort, frameworkVersion) {
 }
 
 function getFinishWrapper (exitOrClose) {
-  let isClosed = false
   return async function () {
-    if (isClosed) { // needed because exit calls close
+    if (finishedSessionContexts.has(this)) {
       return exitOrClose.apply(this, arguments)
     }
-    isClosed = true
 
     if (!testSessionFinishCh.hasSubscribers) {
       return exitOrClose.apply(this, arguments)
     }
+    finishedSessionContexts.add(this)
 
     const failedSuites = this.state.getFailedFilepaths()
+    const hasRunError = runErrorsByContext.has(this)
     const runError = runErrorsByContext.get(this)
     runErrorsByContext.delete(this)
     let error = runError
@@ -1223,19 +1219,30 @@ function getFinishWrapper (exitOrClose) {
       error = new Error(`Test suites failed: ${failedSuites.length}.`)
     }
 
+    // pathsSet contains candidates before sharding, including files that never run.
     const hasNoTestFiles = this.state.pathsSet.size === 0
-    const hasUnexpectedEmptySession = hasNoTestFiles && !areAllSuitesSkipped && !this.config.passWithNoTests
+    const isEmptyShard = emptyShardContexts.has(this)
+    const hasUnexpectedEmptySession = hasNoTestFiles && !isEmptyShard &&
+      !areAllSuitesSkipped && !this.config.passWithNoTests
     if (!error && hasUnexpectedEmptySession) {
       error = new Error('No test files were found.')
     }
-    const status = runError || hasUnexpectedEmptySession
-      ? 'fail'
-      : (areAllSuitesSkipped ? 'skip' : getSessionStatus(this.state))
-    const isExpectedEmptySession = !runError && !hasUnexpectedEmptySession &&
-      (areAllSuitesSkipped || hasNoTestFiles)
+    const tests = getTypeTasks(this.state.getFiles())
+    const hasExecutedTests = tests.some(test =>
+      test.mode !== 'skip' && test.mode !== 'todo' &&
+      test.result?.state !== 'skip' && test.result?.state !== 'todo'
+    )
+    const hasErrors = hasRunError || error ||
+      this.state.getCountOfFailedTests() > 0 || this.state.getUnhandledErrors().length > 0
+    const testSessionEmptyReason = !hasErrors && !hasExecutedTests
+      ? (isEmptyShard
+          ? 'zero_test_shard'
+          : tests.length > 0 || skippedSuites.length > 0 ? 'all_tests_skipped' : 'zero_tests')
+      : undefined
+    const status = hasErrors ? 'fail' : (testSessionEmptyReason ? 'skip' : 'pass')
     const flushPromise = getChannelPromise(testSessionFinishCh, {
       status,
-      isExpectedEmptySession,
+      testSessionEmptyReason,
       testCodeCoverageLinesTotal,
       error,
       isEarlyFlakeDetectionEnabled,
@@ -1391,12 +1398,46 @@ function markVitestWorkerEnv (ctx, testSpecifications, shouldSkipWorkerInit = fa
   config.env = getVitestWorkerEnv(config.env, shouldSkipWorkerInit)
 }
 
+/**
+ * Installs completion hooks before discovery, which can bypass runFiles entirely.
+ * @param {Function} Vitest
+ */
+function wrapVitestSession (Vitest) {
+  if (!Vitest?.prototype?.start || sessionWrappedPrototypes.has(Vitest.prototype)) return
+  sessionWrappedPrototypes.add(Vitest.prototype)
+
+  // Empty discovery bypasses runFiles. Vitest 1 exits directly after reporting coverage,
+  // so its finalization must be awaited before that process.exit rather than only in close.
+  // Hashed bundle names prevent Orchestrion's exact-file matching.
+  shimmer.wrap(Vitest.prototype, 'start', start => function () {
+    if (!testSessionFinishCh.hasSubscribers) return start.apply(this, arguments)
+    wrapSessionFinish(this)
+    return start.apply(this, arguments).then(undefined, error => {
+      if (error?.code !== 'VITEST_FILES_NOT_FOUND') runErrorsByContext.set(this, error)
+      throw error
+    })
+  })
+  shimmer.wrap(Vitest.prototype, 'reportCoverage', reportCoverage => function () {
+    const result = reportCoverage.apply(this, arguments)
+    if (!testSessionFinishCh.hasSubscribers || !isSessionStarted || this.config.watch ||
+      mainProcessSetupStates.has(this) || this.state.pathsSet.size > 0) {
+      return result
+    }
+    return result.then(value => {
+      const finish = getFinishWrapper(() => value)
+      return finish.call(this)
+    })
+  })
+}
+
 function wrapVitestRunFiles (Vitest, frameworkVersion) {
   if (!Vitest?.prototype?.runFiles || runFilesWrappedPrototypes.has(Vitest.prototype)) {
     return
   }
   runFilesWrappedPrototypes.add(Vitest.prototype)
 
+  wrapVitestSession(Vitest)
+
   shimmer.wrap(Vitest.prototype, 'runFiles', runFiles => async function (testSpecifications) {
     if (activeRunFilesContexts.has(this)) {
       return runFiles.apply(this, arguments)
@@ -1940,6 +1981,9 @@ function getWrappedOn (on) {
     if (event !== 'message') {
       return on.apply(this, arguments)
     }
+    // Reply through Vitest's pool worker, which owns its version-specific serialization.
+    // The listener's `this` is the underlying ChildProcess or Worker instead.
+    const worker = this
     // `arguments[1]` is the callback function, which
     // we modify to intercept our messages to not interfere
     // with vitest's own messages
@@ -1947,7 +1991,7 @@ function getWrappedOn (on) {
       if (message.type !== 'Buffer' && Array.isArray(message)) {
         const [interprocessCode, data] = message
         if (
-          handleEfdAdmissionMessage(this, interprocessCode, data) ||
+          handleEfdAdmissionMessage(worker, interprocessCode, data) ||
           handleWorkerReport(interprocessCode, data)
         ) {
           // If we execute the callback vitest crashes, as the message is not supported
@@ -2080,6 +2124,36 @@ addHook({
   return wrapTinyPool(TinyPool)
 })
 
+/**
+ * Older Vitest versions expose their core instance through the logger constructor.
+ * @param {Record<string, Function>} vitestPackage
+ */
+function wrapVitestLogger (vitestPackage) {
+  const logger = findExportByName(vitestPackage, 'Logger')
+  if (logger) {
+    // Hashed bundle names prevent Orchestrion's exact-file matching.
+    shimmer.wrap(vitestPackage, logger.key, Logger => class extends Logger {
+      constructor (...args) {
+        super(...args)
+        if (testSessionFinishCh.hasSubscribers) wrapVitestSession(args[0]?.constructor)
+      }
+    })
+  }
+  return vitestPackage
+}
+
+addHook({
+  name: 'vitest',
+  versions: ['>=1.6.0 <2.0.5'],
+  filePattern: 'dist/vendor/index.*',
+}, wrapVitestLogger)
+
+addHook({
+  name: 'vitest',
+  versions: ['>=2.0.5 <3.0.0'],
+  filePattern: 'dist/chunks/index.*',
+}, wrapVitestLogger)
+
 // There are multiple index* files across different versions of vitest,
 // so we check for the existence of BaseSequencer to determine if we are in the right file
 addHook({