Merge remote-tracking branch 'upstream/main' into revision-guard-draft-flow

Author: NssGourav

.codacy.yml

@@ -7,5 +7,9 @@
   },
   "devDependencies": {
     "jest": "^29.7.0"
+  },
+  "overrides": {
+    "js-yaml": "^4.2.0",
+    "@babel/core": "^7.29.6"
   }
 }

.github/scripts/package-lock.json

@@ -178,12 +178,11 @@ async function syncLabel(github, owner, repo, pr, dryRun) {
     (name) => ALL_QUEUE_LABEL_NAMES.includes(name) && name !== correctLabel.name
   );
 
-  const isHuman = pr.user && pr.user.type !== 'Bot';
-  const needsCommunityReview = isHuman && !currentLabels.includes(COMMUNITY_REVIEW.name);
+  const needsCommunityReview = !currentLabels.includes(COMMUNITY_REVIEW.name);
 
   // Check if the correct labels are already present AND there are no stale labels to remove
   if (currentLabels.includes(correctLabel.name) && staleLabels.length === 0 && !needsCommunityReview) {
-    console.log(`    ✓ Already has "${correctLabel.name}"${isHuman ? ` and "${COMMUNITY_REVIEW.name}"` : ''}. No change needed.`);
+    console.log(`    ✓ Already has "${correctLabel.name}" and "${COMMUNITY_REVIEW.name}". No change needed.`);
     return false;
   }
 

.github/scripts/package.json

@@ -113,7 +113,7 @@ const unitTests = [
     name: 'syncLabel: already correct, no stale → returns false',
     test: async () => {
       const mock = createMockGithub({ roles: {}, reviews: [] });
-      const changed = await syncLabel(mock, 'o', 'r', { number: 1, labels: [{ name: 'queue:junior-committer' }], head: { sha: '123' }, user: { type: 'Bot' } }, false);
+      const changed = await syncLabel(mock, 'o', 'r', { number: 1, labels: [{ name: 'queue:junior-committer' }, { name: COMMUNITY_REVIEW.name }], head: { sha: '123' }, user: { type: 'Bot' } }, false);
       return changed === false && mock.calls.labelsAdded.length === 0;
     },
   },
@@ -152,13 +152,13 @@ const unitTests = [
     },
   },
   {
-    name: 'syncLabel: bot PR does NOT receive community review label',
+    name: 'syncLabel: bot PR receives community review label if missing',
     test: async () => {
       const mock = createMockGithub({ roles: {}, reviews: [] });
       const pr = { number: 1, labels: [{ name: 'queue:junior-committer' }], head: { sha: '123' }, user: { type: 'Bot' } };
       const changed = await syncLabel(mock, 'o', 'r', pr, false);
-      // Already has junior-committer, and being a Bot means it shouldn't add community review
-      return changed === false && mock.calls.labelsAdded.length === 0;
+      // Already has junior-committer; missing COMMUNITY_REVIEW should be added for bot PRs too
+      return changed === true && mock.calls.labelsAdded.includes(COMMUNITY_REVIEW.name);
     },
   },
   {

.github/scripts/review-sync/helpers/labels.js

@@ -51,7 +51,7 @@ jobs:
           echo "::notice::Skipping: event=${{ github.event_name }}, action=${{ github.event.action }}, has_advanced_label=${{ contains(github.event.issue.labels.*.name, 'skill: advanced') }}"
       - name: Checkout scripts
         if: steps.should_run.outputs.value == 'true'
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           sparse-checkout: |
             .github/scripts

.github/scripts/review-sync/tests/test-labels.js

@@ -17,7 +17,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
 
       - name: Check Assignment Count
         env:

.github/workflows/bot-advanced-check.yml

@@ -28,7 +28,7 @@ jobs:
                   egress-policy: audit
 
             - name: Checkout repository
-              uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+              uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
             - name: Run Beginner /assign handler
               uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 #v9.0.0

.github/workflows/bot-assignment-check.yml

@@ -28,7 +28,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 #v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #v7.0.0
 
       - name: Trigger CodeRabbit Plan
         env:

.github/workflows/bot-beginner-assign-on-comment.yml

@@ -29,7 +29,7 @@ jobs:
                   egress-policy: audit
 
             - name: Checkout repository
-              uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+              uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
             - name: Run GFI /assign handler
               uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 #v9.0.0