Base pre-ci:affected on origin/main and warn when local main has drifted

Author: dmerand

bin/ci-gates.js

@@ -11,15 +11,19 @@
 //   affected — faster command for `pnpm pre-ci:affected` (defaults to `command`)
 //   affectedWhen: 'codegen' — in affected mode, run only when the diff plausibly
 //     changes generated output; otherwise skip with a reminder.
+//
+// Affected commands base on `origin/main` (not the local `main` that nx's
+// defaultBase would use), matching the codegen/vitest change detection so all of
+// pre-ci:affected reasons about the same diff.
 
 export const CI_GATES = [
   // --- gates a contributor can reproduce locally before pushing ---
   // Ordered as pre-ci should run them: build precedes the oclif codegen check,
   // and the graphql check precedes the oclif check (their whole-repo `git status`
   // asserts otherwise cross-contaminate in a single working tree).
-  {job: 'type-check', kind: 'pre-ci', command: 'pnpm type-check', affected: 'pnpm type-check:affected'},
-  {job: 'lint', kind: 'pre-ci', command: 'pnpm lint', affected: 'pnpm lint:affected'},
-  {job: 'bundle', kind: 'pre-ci', command: 'pnpm build', affected: 'pnpm build:affected'},
+  {job: 'type-check', kind: 'pre-ci', command: 'pnpm type-check', affected: 'pnpm exec nx affected --target=type-check --base=origin/main'},
+  {job: 'lint', kind: 'pre-ci', command: 'pnpm lint', affected: 'pnpm exec nx affected --target=lint --base=origin/main'},
+  {job: 'bundle', kind: 'pre-ci', command: 'pnpm build', affected: 'pnpm exec nx affected --target=build --base=origin/main'},
   {job: 'knip', kind: 'pre-ci', command: 'pnpm knip'},
   {job: 'graphql-schema', kind: 'pre-ci', command: 'pnpm codegen:check:graphql', affectedWhen: 'codegen'},
   {job: 'oclif-checks', kind: 'pre-ci', command: 'pnpm codegen:check:oclif', affectedWhen: 'codegen'},

bin/pre-ci.js

@@ -49,9 +49,27 @@ function touchesGeneratedOutput(files) {
   )
 }
 
+// Affected mode bases on origin/main. Warn if the local main has drifted from it,
+// since that usually means origin/main is stale and the affected set may be off.
+function localMainDriftWarning() {
+  try {
+    const local = execSync('git rev-parse main', {encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore']}).trim()
+    const remote = execSync('git rev-parse origin/main', {encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore']}).trim()
+    if (local !== remote) {
+      return 'Local `main` differs from `origin/main` (affected mode bases on `origin/main`). Run `git fetch origin main` if the affected set looks off.'
+    }
+  } catch {
+    // No local `main` ref (e.g. a fresh worktree) — nothing to compare.
+  }
+  return null
+}
+
 const diff = affected ? changedFiles() : null
 const codegenRelevant = affected ? touchesGeneratedOutput(diff) : true
 
+const driftWarning = affected ? localMainDriftWarning() : null
+if (driftWarning) process.stdout.write(`\n⚠ ${driftWarning}\n`)
+
 const steps = [{label: 'CI gate manifest in sync', command: 'pnpm check-ci-gates'}]
 const skipped = []
 for (const gate of PRE_CI_GATES) {