dd-trace 6.8.0 → 6.9.0

package/ci/test-optimization-validation/manifest-scaffold.js

@@ -4,9 +4,12 @@ const fs = require('node:fs')
 const path = require('node:path')
 
 const { runDiagnosis } = require('../diagnose')
+const { BLOCKER_CATEGORIES } = require('./blocker-category')
 const cucumber = require('./framework-adapters/cucumber')
 const cypress = require('./framework-adapters/cypress')
 const playwright = require('./framework-adapters/playwright')
+const vitest = require('./framework-adapters/vitest')
+const { isProjectBuildArtifactPath } = require('./project-build-artifact')
 const {
   GENERATED_SCENARIOS,
   getGeneratedRetryStatePath,
@@ -15,6 +18,7 @@ const {
 const { validateManifest } = require('./manifest-schema')
 const {
   getProjectNodeRunner,
+  getRunnerConfigurationContract,
   getRunnerContract,
   getRunnerSearchRoots,
 } = require('./runner-contract')
@@ -54,7 +58,7 @@ const CONFIG_PATTERNS = {
   jest: /^(?:jest|config-jest)\.config\.(?:[cm]?[jt]s|json)$/,
   mocha: /^\.mocharc\.(?:json|ya?ml|[cm]?js)$/,
   playwright: playwright.CONFIG_PATTERN,
-  vitest: /^(?:vite|vitest)\.config\.[cm]?[jt]s$/,
+  vitest: /^(?:vite\.config|vitest\.(?:config|workspace))\.[cm]?[jt]s$/,
 }
 const JS_CONFIG_EXTENSIONS = ['js', 'cjs', 'mjs', 'ts', 'cts', 'mts']
 const IMPLICIT_CONFIG_FILENAMES = {
@@ -72,14 +76,20 @@ const IMPLICIT_CONFIG_FILENAMES = {
   vitest: JS_CONFIG_EXTENSIONS.flatMap(extension => [
     `vite.config.${extension}`,
     `vitest.config.${extension}`,
+    `vitest.workspace.${extension}`,
   ]),
 }
 const TEST_FILE_PATTERN = /^.+[._-](?:test|spec)\.[cm]?[jt]sx?$/
 const BARE_TEST_FILE_PATTERN = /^test\.[cm]?[jt]sx?$/
 const TYPE_ONLY_TEST_PATTERN = /\.(?:test|spec)-d\.[cm]?tsx?$|\.d\.[cm]?ts$/i
-const TYPE_ONLY_DIRECTORY_PATTERN = /(?:^|\/)(?:type[-_]?tests?|typetests?|test-dts?)(?:\/|$)/i
+const TYPE_ONLY_DIRECTORY_PATTERN = /(?:^|\/)(?:type[-_]?tests?|test-dts?)(?:\/|$)/i
 const LOCAL_SOCKET_PATTERN =
-  /(?:\bcreateServer\s*\(|\.listen\s*\(|\b(?:localhost|127\.0\.0\.1)\b|\bcy\.(?:visit|request)\s*\()/
+  /\bcreateServer\s*\(|\.listen\s*\(|\b(?:localhost|127\.0\.0\.1|supertest)\b|\bcy\.(?:visit|request)\s*\(/
+const IMPORT_SPECIFIER_PATTERN = /(?:from\s+|require\s*\(\s*|import\s*\(\s*)(['"])([^'"]+)\1/g
+const CUCUMBER_BROWSER_SUPPORT_DIRECTORY_PATTERN =
+  /(?:^|\/)(?:features?|helpers?|step_definitions|steps?|support)(?:\/|$)/i
+const CUCUMBER_BROWSER_DRIVER_PATTERN =
+  /(?:from\s+|(?:import|require)\s*\(\s*)['"](?:@playwright\/test|nightwatch|playwright(?:-core)?|puppeteer(?:-core)?|selenium-webdriver|webdriverio)['"]/
 const CYPRESS_LOCAL_ORIGIN_PATTERN =
   /\bcy\.(?:visit|request)\s*\([\s\S]{0,512}\b(?:https?:\/\/)?(?:localhost|127\.0\.0\.1)(?=[:/'"`\s}])/i
 
@@ -121,7 +131,11 @@ function createManifestScaffold ({ root, frameworks = new Set() }) {
     ciDiscovery,
     frameworks: [
       ...eligible.map(detection => buildFramework(repositoryRoot, detection, ciDiscovery)),
-      ...detectedOnly.map(detection => buildDetectedOnlyFramework(repositoryRoot, detection, ciDiscovery)),
+      ...detectedOnly.map(detection => {
+        return detection.supportedVersion && SUPPORTED_FRAMEWORKS.has(detection.id)
+          ? buildFramework(repositoryRoot, detection, ciDiscovery)
+          : buildDetectedOnlyFramework(repositoryRoot, detection, ciDiscovery)
+      }),
       ...unsupported.map(detection => buildUnsupportedFramework(repositoryRoot, detection, ciDiscovery)),
     ],
     omitted: [],
@@ -144,7 +158,15 @@ function createManifestScaffold ({ root, frameworks = new Set() }) {
  */
 function buildFramework (repositoryRoot, detection, ciDiscovery) {
   const framework = detection.id
-  const packageJson = getDetectionPackageJson(repositoryRoot, detection.commandLocation)
+  const packageJson = getFrameworkPackageJson(repositoryRoot, detection)
+  if (!packageJson) {
+    return buildDetectedOnlyFramework(
+      repositoryRoot,
+      detection,
+      ciDiscovery,
+      `The package that owns ${detection.name} could not be identified from the bounded detection evidence.`
+    )
+  }
   const projectRoot = path.dirname(packageJson.path)
   const base = getFrameworkBase({
     ciDiscovery,
@@ -158,16 +180,32 @@ function buildFramework (repositoryRoot, detection, ciDiscovery) {
   if (!SUPPORTED_FRAMEWORKS.has(framework)) {
     return {
       ...base,
+      blockerCategory: BLOCKER_CATEGORIES.VALIDATOR_LIMITATION,
       status: 'unsupported_by_validator',
       notes: [`${detection.name} is supported by dd-trace, but this validator has no direct-runner adapter.`],
     }
   }
 
+  if (framework === 'cucumber' && !cucumber.supportsConfigIsolation(base.frameworkVersion)) {
+    return {
+      ...base,
+      blockerCategory: BLOCKER_CATEGORIES.VALIDATOR_LIMITATION,
+      status: 'requires_manual_setup',
+      notes: [
+        `${detection.name} ${base.frameworkVersion || 'with an unknown version'} is supported by dd-trace, but its ` +
+          'CLI cannot bypass customer profiles with a validator-owned config. Live validation is unavailable because ' +
+          'changing the working directory or loading the profile dynamically would weaken isolation. The static CI ' +
+          'audit can still run.',
+      ],
+    }
+  }
+
   const projectRunner = getProjectNodeRunner(detection.command, projectRoot, repositoryRoot)
   const runner = projectRunner || resolveRunner(framework, projectRoot, repositoryRoot)
   if (!runner) {
     return {
       ...base,
+      blockerCategory: BLOCKER_CATEGORIES.PROJECT_SETUP_REQUIRED,
       status: 'requires_manual_setup',
       notes: [
         `${detection.name} is detected, but its repository-contained executable is unavailable. Install this ` +
@@ -176,10 +214,13 @@ function buildFramework (repositoryRoot, detection, ciDiscovery) {
     }
   }
 
-  const runnerContract = getRunnerContract(framework, detection.command, projectRoot, repositoryRoot)
+  const projectFiles = collectProjectFiles(projectRoot)
+  const commandRoots = getRunnerSearchRoots(framework, detection.command, projectRoot, repositoryRoot)
+  let runnerContract = getRunnerContract(framework, detection.command, projectRoot, repositoryRoot)
   if (runnerContract.error) {
     return {
       ...base,
+      blockerCategory: BLOCKER_CATEGORIES.VALIDATOR_LIMITATION,
       status: 'requires_manual_setup',
       notes: [
         `${detection.name} runner configuration was not retained because ${runnerContract.error}. ` +
@@ -187,23 +228,91 @@ function buildFramework (repositoryRoot, detection, ciDiscovery) {
       ],
     }
   }
-  const commandRoots = getRunnerSearchRoots(framework, detection.command, projectRoot, repositoryRoot)
-  const representativeRoot = commandRoots[0] || findPreferredRepresentativeRoot(projectRoot, repositoryRoot)
+  const implicitConfigFiles = [...new Set([
+    ...getImplicitConfigFiles(framework, projectRoot, repositoryRoot),
+    ...(framework === 'vitest' && commandRoots[0]
+      ? getImplicitConfigFiles(framework, commandRoots[0], repositoryRoot)
+      : []),
+  ])]
+  if (framework === 'cucumber') {
+    const expanded = cucumber.expandProfiles({
+      configFiles: [...new Set([...runnerContract.inputFiles, ...implicitConfigFiles])],
+      projectFiles,
+      projectRoot,
+      runnerArgs: runnerContract.runnerArgs,
+    })
+    if (expanded.error) {
+      return {
+        ...base,
+        blockerCategory: BLOCKER_CATEGORIES.VALIDATOR_LIMITATION,
+        status: 'requires_manual_setup',
+        notes: [
+          `${detection.name} runner configuration was not retained because ${expanded.error}. ` +
+            'Use a literal Cucumber profile or a direct command with bounded support-code options, then create a ' +
+            'fresh plan.',
+        ],
+      }
+    }
+    const expandedContract = getRunnerConfigurationContract(
+      framework,
+      expanded.runnerArgs,
+      runnerContract.environment,
+      projectRoot,
+      repositoryRoot
+    )
+    if (expandedContract.error) {
+      return {
+        ...base,
+        blockerCategory: BLOCKER_CATEGORIES.VALIDATOR_LIMITATION,
+        status: 'requires_manual_setup',
+        notes: [
+          `${detection.name} profile configuration was not retained because ${expandedContract.error}. ` +
+            'Use repository-contained support-code inputs, then create a fresh plan.',
+        ],
+      }
+    }
+    runnerContract = {
+      ...expandedContract,
+      omittedOptions: runnerContract.omittedOptions,
+    }
+  }
+  const vitestProject = framework === 'vitest'
+    ? vitest.bindLiteralProject({
+      configFiles: [...new Set([...runnerContract.inputFiles, ...implicitConfigFiles])],
+      projectFiles,
+      projectRoot,
+      runnerArgs: runnerContract.runnerArgs,
+    })
+    : undefined
+  if (vitestProject?.error) {
+    return {
+      ...base,
+      blockerCategory: BLOCKER_CATEGORIES.VALIDATOR_LIMITATION,
+      status: 'requires_manual_setup',
+      notes: [
+        `${detection.name} runner configuration was not retained because ${vitestProject.error}. ` +
+          'Use one literal, uniquely named Vitest project with static configuration, then create a fresh plan.',
+      ],
+    }
+  }
+  const representativeRoot = vitestProject?.root ||
+    commandRoots[0] ||
+    findPreferredRepresentativeRoot(projectRoot, repositoryRoot)
   const representativePackage = readJson(path.join(representativeRoot, 'package.json')) || packageJson.json
-  const projectFiles = collectProjectFiles(projectRoot)
-  const candidateFiles = representativeRoot === projectRoot
-    ? projectFiles
-    : collectProjectFiles(representativeRoot)
-  const candidate = selectRepresentativeTest(
+  const candidateFiles = vitestProject?.files ||
+    (representativeRoot === projectRoot ? projectFiles : collectProjectFiles(representativeRoot))
+  const candidates = selectRepresentativeTests(
     candidateFiles,
     framework,
     representativeRoot,
     representativePackage.name,
-    commandRoots.length > 0
+    commandRoots.length > 0 || vitestProject !== undefined
   )
+  const candidate = candidates[0]
   if (!candidate) {
     return {
       ...base,
+      blockerCategory: BLOCKER_CATEGORIES.VALIDATOR_LIMITATION,
       status: 'requires_manual_setup',
       notes: [
         `No single ${detection.name} test file could be selected confidently. Choose a normal framework-owned ` +
@@ -214,6 +323,7 @@ function buildFramework (repositoryRoot, detection, ciDiscovery) {
   if (candidate.requiresExternalService) {
     return {
       ...base,
+      blockerCategory: BLOCKER_CATEGORIES.PROJECT_SETUP_REQUIRED,
       status: 'requires_manual_setup',
       notes: [
         `No self-contained ${detection.name} spec could be selected. The available spec accesses a localhost ` +
@@ -223,14 +333,23 @@ function buildFramework (repositoryRoot, detection, ciDiscovery) {
     }
   }
 
-  const generatedTestStrategy = buildGeneratedTestStrategy({
+  const plannedGeneratedTestStrategy = buildGeneratedTestStrategy({
     framework,
-    projectRoot,
+    projectRoot: vitestProject?.root || projectRoot,
     representative: candidate.path,
   })
+  const generatedTestStrategy = vitestProject &&
+    !vitest.supportsGeneratedFiles(vitestProject, plannedGeneratedTestStrategy)
+    ? {
+        reason: 'The selected Vitest project include or exclude patterns do not collect ' +
+          'validator-generated test files.',
+        status: 'not_possible',
+      }
+    : plannedGeneratedTestStrategy
   const configFiles = [...new Set([
     ...runnerContract.inputFiles,
-    ...getImplicitConfigFiles(framework, projectRoot, repositoryRoot),
+    ...(vitestProject?.configFile ? [vitestProject.configFile] : []),
+    ...implicitConfigFiles,
     ...(representativeRoot === projectRoot
       ? []
       : getImplicitConfigFiles(framework, representativeRoot, repositoryRoot)),
@@ -239,6 +358,7 @@ function buildFramework (repositoryRoot, detection, ciDiscovery) {
   if (configFiles.length > 20) {
     return {
       ...base,
+      blockerCategory: BLOCKER_CATEGORIES.VALIDATOR_LIMITATION,
       status: 'requires_manual_setup',
       notes: [
         `${detection.name} loads more configuration files than the validator can approval-bind safely. ` +
@@ -247,13 +367,38 @@ function buildFramework (repositoryRoot, detection, ciDiscovery) {
     }
   }
   const runnerDescription = projectRunner ? 'repository test wrapper' : `installed ${framework} runner`
+  const runnerConfigurationNote = detection.command
+    ? 'The validator retained only allowlisted runner configuration from the detected package script.'
+    : 'The validator uses the installed runner with repository-contained configuration files; the unresolved ' +
+      'package wrapper is not executed.'
+  const cucumberBrowserRequired = framework === 'cucumber' &&
+    hasCucumberBrowserSupport(candidateFiles, runnerContract.inputFiles, representativeRoot)
   const browserRequired = framework === 'cypress' ||
     framework === 'playwright' ||
+    cucumberBrowserRequired ||
     (framework === 'vitest' && runnerContract.runnerArgs.includes('--browser'))
+  const fallbackCandidates = candidates
+    .slice(1)
+    .filter(candidate => hasGeneratedTestContract(
+      candidate.path,
+      framework,
+      vitestProject?.root || projectRoot,
+      plannedGeneratedTestStrategy
+    ))
+  const fallbackTests = fallbackCandidates
+    .map(candidate => ({
+      buildArtifactRequired: candidate.requiresBuildArtifact,
+      localSocketRequired: candidate.requiresLocalSocket,
+      testFile: candidate.path,
+    }))
+  const allCandidatesRequireLocalSocket =
+    [candidate, ...fallbackCandidates].every(candidate => candidate.requiresLocalSocket)
 
   return {
     ...base,
+    allCandidatesRequireLocalSocket,
     browserRequired,
+    buildArtifactRequired: candidate.requiresBuildArtifact,
     language: /\.[cm]?tsx?$/.test(candidate.path) ? 'typescript' : 'javascript',
     localSocketRequired: candidate.requiresLocalSocket,
     status: 'runnable',
@@ -272,6 +417,7 @@ function buildFramework (repositoryRoot, detection, ciDiscovery) {
       runnerArgs: runnerContract.runnerArgs,
       selectorScope: projectRunner ? 'instrumented_event_identity' : 'bounded_direct_runner',
       testFile: candidate.path,
+      ...(fallbackTests.length > 0 ? { fallbackTests } : {}),
       timeoutMs: browserRequired ? 300_000 : 180_000,
     },
     preflight: { status: 'pending' },
@@ -280,7 +426,7 @@ function buildFramework (repositoryRoot, detection, ciDiscovery) {
       `Basic Reporting will invoke the ${runnerDescription} ` +
         'directly for ' +
         `${path.relative(repositoryRoot, candidate.path)}.`,
-      'The validator retained only allowlisted runner configuration from the detected package script.',
+      runnerConfigurationNote,
       ...(projectRunner
         ? [
             'Basic Reporting will remain incomplete unless captured test events identify only the approved ' +
@@ -289,8 +435,20 @@ function buildFramework (repositoryRoot, detection, ciDiscovery) {
         : []),
       ...(candidate.requiresLocalSocket
         ? [
-            'The selected test appears to require localhost. A restricted sandbox may leave local validation ' +
-              'incomplete.',
+            `${allCandidatesRequireLocalSocket ? 'Every approved candidate appears' : 'The selected test appears'} ` +
+              'to require localhost. A restricted execution environment may leave local validation incomplete.',
+          ]
+        : []),
+      ...(candidate.requiresBuildArtifact
+        ? [
+            'The selected test appears to load a build or dist artifact. Complete the project\'s normal build before ' +
+              'validation if that artifact is not already present.',
+          ]
+        : []),
+      ...(cucumberBrowserRequired
+        ? [
+            'The selected Cucumber support code imports a browser driver. The approved validation command may launch ' +
+              'the project browser.',
           ]
         : []),
     ],
@@ -299,15 +457,17 @@ function buildFramework (repositoryRoot, detection, ciDiscovery) {
 
 function getImplicitConfigFiles (framework, projectRoot, repositoryRoot) {
   const files = []
-  for (const basename of IMPLICIT_CONFIG_FILENAMES[framework] || []) {
-    const filename = path.join(projectRoot, basename)
-    try {
-      const stat = fs.lstatSync(filename)
-      const physical = fs.realpathSync(filename)
-      if (stat.isFile() && !stat.isSymbolicLink() &&
-        fs.statSync(physical).isFile() &&
-        isPathInside(fs.realpathSync(repositoryRoot), physical)) files.push(physical)
-    } catch {}
+  if (IMPLICIT_CONFIG_FILENAMES[framework]) {
+    for (const basename of IMPLICIT_CONFIG_FILENAMES[framework]) {
+      const filename = path.join(projectRoot, basename)
+      try {
+        const stat = fs.lstatSync(filename)
+        const physical = fs.realpathSync(filename)
+        if (stat.isFile() && !stat.isSymbolicLink() &&
+          fs.statSync(physical).isFile() &&
+          isPathInside(fs.realpathSync(repositoryRoot), physical)) files.push(physical)
+      } catch {}
+    }
   }
   return files
 }
@@ -318,14 +478,17 @@ function getImplicitConfigFiles (framework, projectRoot, repositoryRoot) {
  * @param {string} repositoryRoot repository root
  * @param {object} detection supported framework detection
  * @param {object} ciDiscovery bounded CI discovery result
+ * @param {string} [blockerNote] precise reason live validation is unavailable
  * @returns {object} framework manifest entry
  */
-function buildDetectedOnlyFramework (repositoryRoot, detection, ciDiscovery) {
-  const packageJson = getDetectionPackageJson(repositoryRoot, detection.locations?.[0])
+function buildDetectedOnlyFramework (repositoryRoot, detection, ciDiscovery, blockerNote) {
+  const packageJson = getDetectionPackageJson(repositoryRoot, getDetectionPackageLocation(detection))
   const projectRoot = path.dirname(packageJson.path)
   const version = detection.supportedVersion?.version ||
     detection.versionDetections?.[0]?.version ||
     detection.versionDetections?.[0]?.rawVersion
+  const unsupportedVersion = !detection.supportedVersion &&
+    (detection.versionDetections?.[0]?.version || detection.versionDetections?.[0]?.rawVersion)
   return {
     ...getFrameworkBase({
       ciDiscovery,
@@ -335,11 +498,18 @@ function buildDetectedOnlyFramework (repositoryRoot, detection, ciDiscovery) {
       projectRoot,
       repositoryRoot,
     }),
+    blockerCategory: unsupportedVersion
+      ? BLOCKER_CATEGORIES.UNSUPPORTED_VERSION
+      : BLOCKER_CATEGORIES.VALIDATOR_LIMITATION,
     status: 'detected_not_runnable',
     notes: [
-      detection.supportedVersion
-        ? `A supported ${detection.name} installation was detected, but no project-local validation target was found.`
-        : `${detection.name} was detected, but no supported installed version was confirmed.`,
+      blockerNote || (unsupportedVersion
+        ? `${detection.name} ${unsupportedVersion} was detected, but live validation requires ` +
+          `${detection.supportedRange}. Upgrade ${detection.name} through the project's normal dependency workflow ` +
+          'before creating a fresh validation plan.'
+        : detection.supportedVersion
+          ? `A supported ${detection.name} installation was detected, but no project-local validation target was found.`
+          : `${detection.name} was detected, but no supported installed version was confirmed.`),
     ],
   }
 }
@@ -365,6 +535,7 @@ function buildUnsupportedFramework (repositoryRoot, detection, ciDiscovery) {
       projectRoot,
       repositoryRoot,
     }),
+    blockerCategory: BLOCKER_CATEGORIES.VALIDATOR_LIMITATION,
     status: 'unsupported_by_validator',
     notes: [`${detection.name} is not supported by this Test Optimization validator.`],
   }
@@ -498,17 +669,29 @@ function buildGeneratedTestStrategy ({ framework, projectRoot, representative })
   }
 }
 
+function hasGeneratedTestContract (representative, framework, projectRoot, strategy) {
+  const convention = getGeneratedTestConvention(framework, representative, projectRoot)
+  return convention.fileExtension === strategy.fileExtension &&
+    convention.testDirectory === strategy.testDirectory &&
+    getModuleSystem(representative, projectRoot) === strategy.moduleSystem
+}
+
 /**
- * Selects one representative framework-owned test file.
+ * Selects up to three representative framework-owned test files.
  *
  * @param {string[]} files bounded project files
  * @param {string} framework framework name
  * @param {string} projectRoot project root
  * @param {string} packageName project package name
- * @param {boolean} allowDirectoryConvention whether a literal runner selector chose this root
- * @returns {{path: string, requiresExternalService: boolean, requiresLocalSocket: boolean}|undefined} selected test
+ * @param {boolean} allowDirectoryConvention whether a literal runner selector owns this root
+ * @returns {Array<{
+ *   path: string,
+ *   requiresBuildArtifact: boolean,
+ *   requiresExternalService: boolean,
+ *   requiresLocalSocket: boolean
+ * }>} selected tests
  */
-function selectRepresentativeTest (files, framework, projectRoot, packageName, allowDirectoryConvention) {
+function selectRepresentativeTests (files, framework, projectRoot, packageName, allowDirectoryConvention) {
   const candidates = []
   for (const filename of files) {
     const source = readText(filename)
@@ -520,18 +703,39 @@ function selectRepresentativeTest (files, framework, projectRoot, packageName, a
       : getStaticTestCount(source) === 0) continue
     if (!hasFrameworkOwnership(filename, source, framework, packageName)) continue
     candidates.push({
+      explicitFilename: TEST_FILE_PATTERN.test(path.basename(filename)),
       path: filename,
       rank: getTestRank(filename, source, projectRoot),
+      requiresBuildArtifact: requiresProjectBuildArtifact(source, projectRoot, path.dirname(filename)),
       requiresExternalService: framework === 'cypress' && CYPRESS_LOCAL_ORIGIN_PATTERN.test(source),
       requiresLocalSocket: LOCAL_SOCKET_PATTERN.test(source),
     })
   }
   candidates.sort((left, right) => {
     return Number(left.requiresExternalService) - Number(right.requiresExternalService) ||
+      Number(right.explicitFilename) - Number(left.explicitFilename) ||
       left.rank - right.rank ||
       left.path.localeCompare(right.path)
   })
-  return candidates[0]
+  return candidates.slice(0, 3)
+}
+
+function requiresProjectBuildArtifact (source, projectRoot, sourceDirectory) {
+  for (const match of source.matchAll(IMPORT_SPECIFIER_PATTERN)) {
+    if (isProjectBuildArtifactPath(match[2], projectRoot, sourceDirectory)) return true
+  }
+  return false
+}
+
+function hasCucumberBrowserSupport (files, retainedInputs, projectRoot) {
+  const retained = new Set(retainedInputs)
+  for (const filename of new Set([...files, ...retained])) {
+    const relative = path.relative(projectRoot, filename).replaceAll('\\', '/')
+    if (!retained.has(filename) && !CUCUMBER_BROWSER_SUPPORT_DIRECTORY_PATTERN.test(relative)) continue
+    const source = readText(filename)
+    if (source !== undefined && CUCUMBER_BROWSER_DRIVER_PATTERN.test(source)) return true
+  }
+  return false
 }
 
 /**
@@ -541,7 +745,7 @@ function selectRepresentativeTest (files, framework, projectRoot, packageName, a
  * @param {string} source candidate source
  * @param {string} framework framework name
  * @param {string} projectRoot project root
- * @param {boolean} allowDirectoryConvention whether a literal runner selector chose this root
+ * @param {boolean} allowDirectoryConvention whether a literal runner selector owns this root
  * @returns {boolean} whether the file is a candidate
  */
 function isTestFile (filename, source, framework, projectRoot, allowDirectoryConvention) {
@@ -561,7 +765,7 @@ function isTestFile (filename, source, framework, projectRoot, allowDirectoryCon
     return ['__tests__', 'spec', 'test', 'tests'].includes(directory)
   })
   if (BARE_TEST_FILE_PATTERN.test(basename)) {
-    return inTestDirectory || hasExplicitFrameworkImport(source, framework)
+    return (allowDirectoryConvention && inTestDirectory) || hasExplicitFrameworkImport(source, framework)
   }
   return allowDirectoryConvention && inTestDirectory && /\.[cm]?[jt]sx?$/.test(basename)
 }
@@ -597,14 +801,14 @@ function hasExplicitFrameworkImport (source, framework) {
  */
 function hasFrameworkOwnership (filename, source, framework, packageName) {
   const normalized = filename.replaceAll('\\', '/').toLowerCase()
-  if (framework === 'cucumber') return /^\s*(?:Feature|Rule):/m.test(source)
+  if (framework === 'cucumber') return /^[ \t]*(?:Feature|Rule):/m.test(source)
   if (framework === 'cypress') return /\.cy\./.test(filename) || normalized.includes('/cypress/')
   if (framework === 'playwright') {
     return /@playwright\/test/.test(source) || normalized.includes('/playwright/') ||
       normalized.includes('/e2e/')
   }
-  if (framework === 'vitest') return /\bvitest\b/.test(source) || /\b(?:describe|it|test)\s*\(/.test(source)
-  if (framework === 'jest') return /\bjest\b/.test(source) || /\b(?:describe|it|test)\s*\(/.test(source)
+  if (framework === 'vitest') return /\bvitest\b/.test(source) || getStaticTestCount(source) > 0
+  if (framework === 'jest') return /\bjest\b/.test(source) || getStaticTestCount(source) > 0
   if (framework === 'mocha') {
     return /\bmocha\b/.test(source) || /\bdescribe\s*\(/.test(source) ||
       packageName === 'mocha'
@@ -643,7 +847,7 @@ function getTestRank (filename, source, projectRoot) {
   let rank = relative.split('/').length
   if (/(?:^|\/)(?:test|tests|__tests__|spec)\//.test(relative)) rank -= 20
   if (/(?:^|[._/-])unit(?:[._/-]|$)/.test(relative)) rank -= 15
-  if (/(?:e2e|integration|acceptance|browser|conformance|fixtures?)/.test(relative)) rank += 20
+  if (/e2e|integration|acceptance|browser|conformance|fixtures?/.test(relative)) rank += 20
   if (LOCAL_SOCKET_PATTERN.test(source)) rank += 30
   rank += Math.min(getStaticTestCount(source), 50)
   return rank
@@ -656,9 +860,12 @@ function getTestRank (filename, source, projectRoot) {
  * @returns {number} approximate test declaration count
  */
 function getStaticTestCount (source) {
-  return [...source.matchAll(/\b(?:it|test)((?:\.[A-Za-z]+)*)\s*\(/g)]
+  const direct = [...source.matchAll(/\b(?:it|test)((?:\.[A-Za-z]+)*)\s*\(\s*(['"`])/g)]
     .filter(match => !/\.(?:skip|todo)\b/.test(match[1]))
-    .length
+  const parameterized = [...source.matchAll(
+    /\b(?:it|test)((?:\.[A-Za-z]+)*)\.each\s*(?:\([^()]*\)|`(?:\\[\s\S]|[^\\`])*`)((?:\.[A-Za-z]+)*)\s*\(\s*(['"`])/g
+  )].filter(match => !/\.(?:skip|todo)\b/.test(`${match[1]}${match[2]}`))
+  return direct.length + parameterized.length
 }
 
 /**
@@ -823,9 +1030,9 @@ function getTestExtension (framework, representative) {
   if (framework === 'cucumber') return '.feature'
   if (framework === 'cypress') return cypress.getTestExtension(representative)
   if (framework === 'playwright') return playwright.getTestExtension(representative)
-  const match = /((?:[.-](?:test|spec))\.[cm]?[jt]sx?)$/.exec(representative)
+  const match = /([.-](?:test|spec)\.[cm]?[jt]sx?)$/.exec(representative)
   if (match) return match[1]
-  const moduleExtension = /\.((?:[cm]js|[cm]ts))$/.exec(representative)?.[1]
+  const moduleExtension = /\.([cm]js|[cm]ts)$/.exec(representative)?.[1]
   return moduleExtension ? `.test.${moduleExtension}` : '.test.js'
 }
 
@@ -899,7 +1106,7 @@ function rankCiReviewTargets (files) {
  */
 function getCiRank (filename) {
   const value = filename.toLowerCase()
-  if (/(?:test|ci|build|unit|integration)/.test(value)) return 0
+  if (/test|ci|build|unit|integration/.test(value)) return 0
   return 10
 }
 
@@ -922,6 +1129,49 @@ function getDetectionPackageJson (repositoryRoot, location) {
   }
 }
 
+function getFrameworkPackageJson (repositoryRoot, detection) {
+  const preciseLocation = detection.commandLocation ||
+    detection.supportedVersion?.relativePath ||
+    detection.eligibleCommand?.relativePath ||
+    detection.versionLocation
+  if (preciseLocation) return findOwningPackageJson(repositoryRoot, preciseLocation)
+
+  const owners = new Map()
+  if (detection.locations) {
+    for (const location of detection.locations) {
+      const owner = findOwningPackageJson(repositoryRoot, location)
+      if (owner) owners.set(owner.path, owner)
+    }
+  }
+  if (owners.size === 1) return [...owners.values()][0]
+}
+
+function findOwningPackageJson (repositoryRoot, location) {
+  let candidate = path.resolve(repositoryRoot, location)
+  if (!isPathInside(repositoryRoot, candidate)) return
+  try {
+    if (!fs.statSync(candidate).isDirectory()) candidate = path.dirname(candidate)
+  } catch {
+    candidate = path.dirname(candidate)
+  }
+
+  while (isPathInside(repositoryRoot, candidate)) {
+    const packageJson = path.join(candidate, 'package.json')
+    const json = readJson(packageJson)
+    if (json) return { json, path: packageJson }
+    if (candidate === repositoryRoot) return
+    candidate = path.dirname(candidate)
+  }
+}
+
+function getDetectionPackageLocation (detection) {
+  return detection.commandLocation ||
+    detection.supportedVersion?.relativePath ||
+    detection.eligibleCommand?.relativePath ||
+    detection.versionLocation ||
+    detection.locations?.[0]
+}
+
 /**
  * Safely reads a bounded directory.
  *