Main-side companion of #16533 (merged into release/v3.8.52). Validated against origin/main: tests/unit/build/release-green-complexity-outcomes.test.ts 22/22, eslint clean on the changed files, changelog-integrity green.