fix: retrigger CodeRabbit on labeled event for unlocked+approved issues

- Switch bot-coderabbit-plan-trigger.yml trigger from 'assigned' back to
  'labeled' so CodeRabbit fires when a skill label is added to an issue
  that is already approved and unlocked (fallback path)
- Add 'approved' label guard to the job condition to prevent triggering
  on locked/unapproved issues
- Move getLatestIssue() helper before logSummary() for clarity; no logic
  change — already called in main() to refresh locked status after unlock

Primary path: approved-issues.yml unlocks the issue then calls the
script (handles skill label present at approval time).
Fallback path: this workflow fires on 'labeled' when skill label arrives
after approval (issue already unlocked).

Signed-off-by: Anshul Kushwaha <137977998+sudo-anshul@users.noreply.github.com>

Author: sudo-anshul

.github/scripts/coderabbit_plan_trigger.js

@@ -80,6 +80,30 @@ async function hasExistingCodeRabbitPlan(github, owner, repo, issueNumber) {
   }
 }
 
+async function getLatestIssue(github, owner, repo, issue) {
+  if (!issue?.number) return issue;
+
+  try {
+    const { data } = await github.rest.issues.get({
+      owner,
+      repo,
+      issue_number: issue.number,
+    });
+
+    return data || issue;
+  } catch (error) {
+    console.log('Failed to refresh issue state; falling back to event payload:', {
+      message: error?.message,
+      status: error?.status,
+      owner,
+      repo,
+      issueNumber: issue?.number,
+    });
+
+    return issue;
+  }
+}
+
 function logSummary(owner, repo, issue) {
   console.log('=== Summary ===');
   console.log(`Repository: ${owner}/${repo}`);
@@ -92,10 +116,14 @@ function logSummary(owner, repo, issue) {
 async function main({ github, context }) {
   try {
     const { owner, repo } = context.repo;
-    const { issue, label } = context.payload;
+    const { issue: eventIssue, label } = context.payload;
 
     // Validations
-    if (!issue?.number) return console.log('No issue in payload');
+    if (!eventIssue?.number) return console.log('No issue in payload');
+
+    // Refresh issue state to avoid stale payload fields (e.g., locked status)
+    // when this script is invoked after earlier workflow steps mutate the issue.
+    const issue = await getLatestIssue(github, owner, repo, eventIssue);
 
     if (issue.locked) {
       return console.log(`Issue #${issue.number} is locked. CodeRabbit plan trigger will be deferred until the issue is approved and unlocked.`);

.github/workflows/bot-coderabbit-plan-trigger.yml

@@ -1,5 +1,6 @@
-# Triggers CodeRabbit's plan feature for difficulty-labeled issues.
-# It runs when a difficulty label is added to an unlocked issue.
+# Triggers CodeRabbit's plan feature when a skill label is added to an already-approved (unlocked) issue.
+# Primary trigger path: approved-issues.yml fires CodeRabbit immediately after unlocking the issue.
+# This workflow is the fallback: fires when a skill label arrives after the issue was already approved and unlocked.
 name: CodeRabbit Plan Trigger
 on:
   issues:
@@ -15,10 +16,12 @@ jobs:
     concurrency:
       group: coderabbit-plan-${{ github.event.issue.number }}
       cancel-in-progress: false
-    # Run only for open, unlocked issues when a difficulty label is added.
+    # Only run when a skill label is added to an open, unlocked, approved issue.
+    # This guards against triggering while the issue is still locked (newly created issues).
     if: >
       github.event.issue.state == 'open' &&
       github.event.issue.locked == false &&
+      contains(github.event.issue.labels.*.name, 'approved') &&
       contains(fromJson('["skill: beginner","skill: intermediate","skill: advanced"]'), github.event.label.name)
 
     steps: