Merge pull request #523 from netwrix/dev

resolve Vale inline comment threads after fixes are applied

Author: jth-nw

.github/workflows/claude-doc-pr.yml

@@ -276,7 +276,7 @@ jobs:
             /doc-pr-fix ${{ steps.pr-info.outputs.number }} $COMMENT_BODY
           claude_args: '--allowedTools "Bash(gh:*),Bash(git:*),Read,Write,Edit,Glob,Grep,Skill(doc-pr-fix),Skill(dale),Skill(doc-help)"'
 
-      - name: Resolve Dale inline comments
+      - name: Resolve inline comments and dismiss old reviews
         if: steps.pr-info.outputs.is_fork == 'false' && steps.pr-info.outputs.targets_dev == 'true'
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -286,7 +286,7 @@ jobs:
           OWNER="${REPO%%/*}"
           NAME="${REPO##*/}"
 
-          # Resolve all Dale inline comment threads
+          # Resolve all Dale and Vale inline comment threads
           THREAD_IDS=$(gh api graphql -f query='
             query($owner:String!,$name:String!,$pr:Int!) {
               repository(owner:$owner,name:$name) {
@@ -297,17 +297,17 @@ jobs:
                 }
               }
             }' -f owner="$OWNER" -f name="$NAME" -F pr="$PR_NUMBER" \
-            --jq '.data.repository.pullRequest.reviewThreads.nodes[] | select(.isResolved == false and (.comments.nodes[0].body | contains("**Dale**"))) | .id' 2>/dev/null || true)
+            --jq '.data.repository.pullRequest.reviewThreads.nodes[] | select(.isResolved == false and ((.comments.nodes[0].body | contains("**Dale**")) or (.comments.nodes[0].body | contains("**Vale**")))) | .id' 2>/dev/null || true)
           for TID in $THREAD_IDS; do
             gh api graphql -f query='
               mutation($tid:ID!) {
                 resolveReviewThread(input:{threadId:$tid}) { thread { isResolved } }
               }' -f tid="$TID" 2>/dev/null || true
           done
 
-          # Dismiss all previous Dale reviews
+          # Dismiss all previous Dale and Vale reviews
           REVIEW_IDS=$(gh api repos/${REPO}/pulls/${PR_NUMBER}/reviews \
-            --jq '[.[] | select(.user.login == "github-actions[bot]" and (.body | contains("Dale found"))) | .id] | .[]' 2>/dev/null || true)
+            --jq '[.[] | select(.user.login == "github-actions[bot]" and ((.body | contains("Dale found")) or (.body | contains("Vale found")))) | .id] | .[]' 2>/dev/null || true)
           for ID in $REVIEW_IDS; do
             gh api repos/${REPO}/pulls/${PR_NUMBER}/reviews/${ID}/dismissals \
               -f message="Superseded after fixes applied" -f event="DISMISS" 2>/dev/null || true

.github/workflows/vale-linter.yml

@@ -163,6 +163,27 @@ jobs:
           PR_NUMBER=${{ github.event.pull_request.number }}
           REPO=${{ github.repository }}
 
+          # Resolve previous Vale inline comment threads
+          OWNER="${REPO%%/*}"
+          NAME="${REPO##*/}"
+          THREAD_IDS=$(gh api graphql -f query='
+            query($owner:String!,$name:String!,$pr:Int!) {
+              repository(owner:$owner,name:$name) {
+                pullRequest(number:$pr) {
+                  reviewThreads(first:100) {
+                    nodes { id isResolved comments(first:1) { nodes { body } } }
+                  }
+                }
+              }
+            }' -f owner="$OWNER" -f name="$NAME" -F pr="$PR_NUMBER" \
+            --jq '.data.repository.pullRequest.reviewThreads.nodes[] | select(.isResolved == false and (.comments.nodes[0].body | contains("**Vale**"))) | .id' 2>/dev/null || true)
+          for TID in $THREAD_IDS; do
+            gh api graphql -f query='
+              mutation($tid:ID!) {
+                resolveReviewThread(input:{threadId:$tid}) { thread { isResolved } }
+              }' -f tid="$TID" 2>/dev/null || true
+          done
+
           # Delete previous Vale PR comments
           COMMENT_IDS=$(gh api "repos/${REPO}/issues/${PR_NUMBER}/comments" --jq '[.[] | select(.user.login == "github-actions[bot]" and (.body | contains("## Vale Linting"))) | .id] | .[]' 2>/dev/null || true)
           for ID in $COMMENT_IDS; do