From 2c50ce608c211469673b07eea04b947e0a3a54be Mon Sep 17 00:00:00 2001
From: Jozef Izso <izso@cisco.com>
Date: Mon, 2 Mar 2026 13:17:41 +0100
Subject: [PATCH] Rebuild the `dist/index.js` file

---
 dist/index.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/dist/index.js b/dist/index.js
index b24a507..773e3e1 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2947,8 +2947,18 @@ function getCheckRunContext() {
         if (!event.workflow_run) {
             throw new Error("Event of type 'workflow_run' is missing 'workflow_run' field");
         }
+        const prs = event.workflow_run.pull_requests ?? [];
+        // For `workflow_run`, we want to report against the PR commit when possible so annotations land
+        // on the contributor's changes. Prefer the PR whose `head.ref` matches `workflow_run.head_branch`,
+        // then fall back to the first PR head SHA, and finally to `workflow_run.head_sha` for non-PR runs.
+        const prShaMatch = prs.find(pr => pr.head?.ref === event.workflow_run.head_branch)?.head?.sha;
+        const prShaFirst = prs[0]?.head?.sha;
+        const sha = prShaMatch ?? prShaFirst ?? event.workflow_run.head_sha;
+        if (!sha) {
+            throw new Error('Unable to resolve SHA from workflow_run (no PR head.sha or head_sha)');
+        }
         return {
-            sha: event.workflow_run.head_commit.id,
+            sha,
             runId: event.workflow_run.id
         };
     }