Merge branch 'main' into fix/issue-1350

Author: Omswastik-11

.github/scripts/helpers/api.js

@@ -554,7 +554,12 @@ async function resolveLinkedIssue(botContext) {
         }
 
         if (issueNumbers.length === 1) {
-            return await fetchIssue(botContext, issueNumbers[0]) || null;
+            const issue = await fetchIssue(botContext, issueNumbers[0]);
+            if (!issue || SKILL_HIERARCHY.findIndex(level => hasLabel(issue, level)) === -1) {
+                getLogger().log('Single linked issue has no skill label', { issueNumber: issueNumbers[0] });
+                return null;
+            }
+            return issue;
         }
 
         const issues = await Promise.all(
@@ -573,6 +578,12 @@ async function resolveLinkedIssue(botContext) {
             return currIndex > bestIndex ? issue : best;
         });
 
+        const selectedIndex = SKILL_HIERARCHY.findIndex(level => hasLabel(selected, level));
+        if (selectedIndex === -1) {
+            getLogger().log('No linked issues have a skill label', { issueNumbers });
+            return null;
+        }
+
         getLogger().log('Multiple linked issues found (using highest level)', {
             issueNumbers,
             selected: selected.number,

.github/scripts/tests/test-api.js

@@ -404,9 +404,9 @@ const unitTests = [
     },
   },
   {
-    name: 'resolveLinkedIssue: single linked issue → returns it',
+    name: 'resolveLinkedIssue: single linked issue with skill label → returns it',
     test: async () => {
-      const issueData = { number: 10, title: 'Fix bug', labels: [] };
+      const issueData = { number: 10, title: 'Fix bug', labels: [{ name: LABELS.BEGINNER }] };
       const { botContext } = createMockBotContext({
         graphql: async () => ({
           repository: {
@@ -422,7 +422,28 @@ const unitTests = [
     },
   },
   {
-    name: 'resolveLinkedIssue: multiple linked issues → returns highest skill level',
+    name: 'resolveLinkedIssue: single linked issue with no skill label → returns null',
+    test: async () => {
+      const { botContext } = createMockBotContext({
+        graphql: async () => ({
+          repository: {
+            pullRequest: {
+              closingIssuesReferences: {
+                nodes: [{ number: 7 }],
+              },
+            },
+          },
+        }),
+        issues: {
+          7: { number: 7, title: 'Issue 7', labels: [{ name: 'bug' }] },
+        },
+      });
+      const result = await resolveLinkedIssue(botContext);
+      return result === null;
+    },
+  },
+  {
+    name: 'resolveLinkedIssue: multiple linked issues with skill label → returns highest skill level',
     test: async () => {
       const { botContext } = createMockBotContext({
         graphql: async () => ({
@@ -445,7 +466,7 @@ const unitTests = [
     },
   },
   {
-    name: 'resolveLinkedIssue: multiple issues, none with skill label → returns first fetched issue',
+    name: 'resolveLinkedIssue: multiple linked issues with no skill label → returns null',
     test: async () => {
       const { botContext } = createMockBotContext({
         graphql: async () => ({
@@ -463,8 +484,7 @@ const unitTests = [
         },
       });
       const result = await resolveLinkedIssue(botContext);
-      // No skill labels — reduce stays on first, so issue 4
-      return result !== null && result.number === 4;
+      return result === null;
     },
   },
   {

.github/workflows/on-comment.yaml

@@ -57,7 +57,7 @@ jobs:
           ref: ${{ github.event.repository.default_branch }}
 
       - name: Run On-Comment Handler
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const script = require('./.github/scripts/bot-on-comment.js');

.github/workflows/on-pr-close.yaml

@@ -33,7 +33,7 @@ jobs:
           ref: ${{ github.event.repository.default_branch }}
 
       - name: Run PR Close Handler
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const script = require('./.github/scripts/bot-on-pr-close.js');

.github/workflows/on-pr-update.yaml

@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Run Bot
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const script = require('./.github/scripts/bot-on-pr-update.js');

.github/workflows/on-pr.yaml

@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Run Bot
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const script = require('./.github/scripts/bot-on-pr-open.js');

.github/workflows/zxc-build-library.yaml

@@ -182,7 +182,7 @@ jobs:
         id: solo
         uses: hiero-ledger/hiero-solo-action@692b186bd2e4c8d46b9deb1c067dc6ddcf0abcd7 # v0.18.0
         with:
-          soloVersion: v0.67.0
+          soloVersion: v0.68.0
           installMirrorNode: true
           mirrorNodeVersion: v0.151.0
           hieroVersion: v0.72.0