fix(ci): restore affected selection coverage

Author: ScriptedAlchemy

tools/scripts/ci-is-affected.mjs

@@ -5,6 +5,19 @@ import yargs from 'yargs';
 
 const SCRIPT_DIR = dirname(fileURLToPath(import.meta.url));
 const ROOT = resolve(SCRIPT_DIR, '../..');
+const GLOBAL_E2E_INPUT_PATTERNS = [
+  'package.json',
+  'tools/scripts/ci-is-affected.mjs',
+  'tools/scripts/e2e-process-utils.mjs',
+  'tools/scripts/run-manifest-e2e.mjs',
+  'tools/scripts/run-modern-e2e.mjs',
+  'tools/scripts/run-metro-e2e.mjs',
+  'tools/scripts/run-next-e2e.mjs',
+  'tools/scripts/run-node-e2e.mjs',
+  'tools/scripts/run-router-e2e.mjs',
+  'tools/scripts/run-runtime-e2e.mjs',
+  'scripts/ensure-playwright.js',
+];
 
 const argv = yargs(process.argv.slice(2))
   .option('appName', {
@@ -47,6 +60,24 @@ if (base === head) {
   process.exit(0);
 }
 
+const changedFiles = listChangedFiles(base, head);
+
+if (!changedFiles) {
+  console.warn(
+    `Unable to resolve changed files for base=${base} head=${head}. Running e2e by default.`,
+  );
+  process.exit(0);
+}
+
+const changedGlobalE2EInputs = changedFiles.filter(isGlobalE2EInput);
+
+if (changedGlobalE2EInputs.length > 0) {
+  console.log(
+    `Detected shared e2e harness changes (${changedGlobalE2EInputs.join(', ')}). Running e2e CI.`,
+  );
+  process.exit(0);
+}
+
 const turboResult = spawnSync(
   'pnpm',
   ['exec', 'turbo', 'ls', '--affected', '--output=json'],
@@ -165,6 +196,36 @@ function resolveHead(requestedHead) {
   return null;
 }
 
+function listChangedFiles(baseRef, headRef) {
+  const result = spawnSync(
+    'git',
+    ['diff', '--name-only', '--diff-filter=ACMR', baseRef, headRef],
+    {
+      cwd: ROOT,
+      stdio: 'pipe',
+      encoding: 'utf-8',
+      maxBuffer: 1024 * 1024 * 8,
+    },
+  );
+
+  if (result.status !== 0) {
+    return null;
+  }
+
+  return result.stdout
+    .split('\n')
+    .map((entry) => entry.trim())
+    .filter(Boolean);
+}
+
+function isGlobalE2EInput(relativePath) {
+  return GLOBAL_E2E_INPUT_PATTERNS.some(
+    (pattern) =>
+      relativePath === pattern ||
+      (pattern.endsWith('/') && relativePath.startsWith(pattern)),
+  );
+}
+
 function expandRefCandidates(ref) {
   if (!ref || !ref.trim()) {
     return [];

tools/scripts/run-affected-package-tests.mjs

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { spawnSync } from 'node:child_process';
+import { readFileSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -77,8 +78,12 @@ function parseBaseArg(argv) {
 }
 
 function resolveBaseRef(preferredRef) {
+  const headCommit = resolveGitCommit('HEAD');
   if (hasGitRef(preferredRef)) {
-    return preferredRef;
+    const preferredCommit = resolveGitCommit(preferredRef);
+    if (!headCommit || preferredCommit !== headCommit) {
+      return preferredRef;
+    }
   }
 
   const refs = [];
@@ -96,9 +101,22 @@ function resolveBaseRef(preferredRef) {
 
   for (const ref of refs) {
     if (hasGitRef(ref)) {
-      return ref;
+      const candidateCommit = resolveGitCommit(ref);
+      if (!headCommit || candidateCommit !== headCommit) {
+        return ref;
+      }
+    }
+  }
+
+  for (const ref of getPreviousCommitCandidates()) {
+    if (hasGitRef(ref)) {
+      const candidateCommit = resolveGitCommit(ref);
+      if (!headCommit || candidateCommit !== headCommit) {
+        return ref;
+      }
     }
   }
+
   return null;
 }
 
@@ -117,6 +135,28 @@ function hasGitRef(ref) {
   return result.status === 0;
 }
 
+function resolveGitCommit(ref) {
+  if (!ref) {
+    return null;
+  }
+
+  const result = spawnSync(
+    'git',
+    ['rev-parse', '--verify', '--quiet', `${ref}^{commit}`],
+    {
+      cwd: ROOT,
+      stdio: 'pipe',
+      encoding: 'utf-8',
+    },
+  );
+
+  if (result.status !== 0) {
+    return null;
+  }
+
+  return result.stdout.trim() || null;
+}
+
 function getChangedFiles(baseRef, headRef) {
   const result = spawnSync('git', ['diff', '--name-only', baseRef, headRef], {
     cwd: ROOT,
@@ -187,11 +227,37 @@ function isGlobalPackageTestImpactPath(changedFilePath) {
     changedFilePath === 'pnpm-workspace.yaml' ||
     changedFilePath === 'turbo.json' ||
     changedFilePath === 'tsconfig.base.json' ||
+    changedFilePath.startsWith('scripts/') ||
+    changedFilePath.startsWith('tools/scripts/') ||
     /^jest\.(?:preset|config)\.[cm]?[jt]s$/.test(changedFilePath) ||
     /^babel\.config\.(?:json|[cm]?[jt]s)$/.test(changedFilePath)
   );
 }
 
+function getPreviousCommitCandidates() {
+  const refs = new Set();
+
+  if (process.env.GITHUB_EVENT_BEFORE) {
+    refs.add(process.env.GITHUB_EVENT_BEFORE);
+  }
+
+  const eventPath = process.env.GITHUB_EVENT_PATH;
+  if (eventPath) {
+    try {
+      const payload = JSON.parse(readFileSync(eventPath, 'utf-8'));
+      if (typeof payload?.before === 'string' && payload.before) {
+        refs.add(payload.before);
+      }
+    } catch {
+      // Ignore invalid GitHub event payloads.
+    }
+  }
+
+  refs.add('HEAD~1');
+
+  return Array.from(refs);
+}
+
 function getWorkspacePackages() {
   const result = spawnSync(
     'pnpm',