Auto-apply s/agent-ready-for-rerun from the PR Review Queue workflow

.github/scripts/Invoke-RerunReviewTrigger.Tests.ps1

@@ -333,14 +333,17 @@ Describe 'Get-RerunActions' {
         $result.Actions.Count | Should -Be 0
     }
 
-    It 'refuses to trigger when the candidate has no rerun comment id' {
+    It 'triggers when the candidate has no proven current-cycle rerun comment id' {
         $items = @(New-TestDecision -PRNumber '5' -Decision 'trigger' -ExpectedHeadSha 'x')
         $candidates = @(New-TestCandidate -PRNumber 5 -HeadSha 'x' -RerunCommentId 0)
 
         $result = Get-RerunActions -Items $items -Candidates $candidates
 
-        $result.HadFailure | Should -BeTrue
-        $result.Actions.Count | Should -Be 0
+        $result.HadFailure | Should -BeFalse
+        $result.Actions.Count | Should -Be 1
+        $result.Actions[0].prNumber | Should -Be 5
+        $result.Actions[0].decision | Should -Be 'trigger'
+        $result.Actions[0].rerunCommentId | Should -Be 0
     }
 
     It 'continues processing valid decisions after a failed one' {

.github/scripts/Invoke-RerunReviewTrigger.ps1

@@ -211,8 +211,11 @@ function Get-RerunActions {
             $platform = Get-PlatformFromLabels -Labels @() -Fallback ([string]$candidate.platform)
             $pipelineRef = Normalize-PipelineRef -Value ([string]$candidate.pipelineRef) -Fallback $DefaultPipelineRef
 
+            # The queue label does not prove which command created the current cycle,
+            # so source-ambiguous candidates intentionally carry no reaction target.
+            # review-trigger.yml does not need a comment to dispatch.
             if ($decision -eq 'trigger' -and $rerunCommentId -le 0) {
-                throw "Candidate for PR #$prNumber has no rerun comment id; cannot trigger."
+                Write-Host "PR #$prNumber trigger has no proven current-cycle rerun comment; dispatching without a reaction target."
             }
 
             $actions.Add([pscustomobject]@{

.github/scripts/Query-RerunReadyPRs.Tests.ps1

@@ -0,0 +1,98 @@
+#!/usr/bin/env pwsh
+#Requires -Modules Pester
+
+BeforeAll {
+    $scriptPath = Join-Path $PSScriptRoot 'Query-RerunReadyPRs.ps1'
+    $outputDir = Join-Path $PSScriptRoot '../../CustomAgentLogsTmp/QueryRerunReadyTests'
+    New-Item -ItemType Directory -Force -Path $outputDir | Out-Null
+
+    . $scriptPath -Owner 'test-owner' -Repo 'test-repo'
+
+    function ConvertTo-GhLines {
+        param([object[]]$Items)
+        return @($Items | ForEach-Object { $_ | ConvertTo-Json -Depth 10 -Compress })
+    }
+}
+
+AfterAll {
+    Remove-Item -LiteralPath $outputDir -Recurse -Force -ErrorAction SilentlyContinue
+}
+
+Describe 'Query-RerunReadyPRs' {
+    BeforeEach {
+        $script:OutputPath = Join-Path $outputDir "$([Guid]::NewGuid().ToString('N')).json"
+        $script:issueComments = @(
+            [pscustomobject]@{
+                id = 100
+                body = "<!-- AI Summary -->`n<!-- SESSION:1111111 START -->"
+                created_at = '2026-05-31T09:00:00Z'
+                updated_at = '2026-05-31T09:00:00Z'
+                user = [pscustomobject]@{ login = 'MauiBot'; type = 'User' }
+                author_association = 'MEMBER'
+            },
+            [pscustomobject]@{
+                id = 200
+                body = '/review rerun'
+                created_at = '2026-05-31T10:00:00Z'
+                updated_at = '2026-05-31T10:00:00Z'
+                user = [pscustomobject]@{ login = 'maintainer'; type = 'User' }
+                author_association = 'MEMBER'
+            }
+        )
+
+        Mock Get-LatestReviewCommandOptions {
+            [pscustomobject]@{
+                Platform = ''
+                PipelineRef = 'main'
+                CommentId = 200
+                Body = '/review rerun'
+            }
+        }
+
+        Mock gh {
+            param(
+                [Parameter(ValueFromRemainingArguments = $true)]
+                [string[]]$GhArgs
+            )
+
+            $command = $GhArgs -join ' '
+            $global:LASTEXITCODE = 0
+
+            if ($command -match '^pr list ') {
+                return ([pscustomobject]@{
+                    number = 1
+                    title = 'Autonomously queued PR'
+                    url = 'https://example.test/1'
+                    headRefOid = '2222222abcdef'
+                    isDraft = $false
+                    labels = @([pscustomobject]@{ name = 's/agent-ready-for-rerun' })
+                    author = [pscustomobject]@{ login = 'dev-user' }
+                } | ConvertTo-Json -Depth 10 -Compress)
+            }
+            if ($command -match '/issues/1/labels') {
+                return 's/agent-ready-for-rerun'
+            }
+            if ($command -match '/issues/1/comments') {
+                return ConvertTo-GhLines $script:issueComments
+            }
+            if ($command -match '/pulls/1/(reviews|comments|commits)') {
+                return @()
+            }
+
+            throw "Unexpected gh call: $command"
+        }
+    }
+
+    It 'does not reuse a historical rerun command as the current queue reaction target' {
+        Invoke-RerunReadyPRQuery `
+            -QueryMaxPRs 5 `
+            -QueryOwner 'test-owner' `
+            -QueryRepo 'test-repo' `
+            -QueryOutputPath $script:OutputPath | Out-Null
+
+        $result = Get-Content -Raw -LiteralPath $script:OutputPath | ConvertFrom-Json
+        $result.candidates.Count | Should -Be 1
+        $result.candidates[0].reviewCommandId | Should -Be 200
+        $result.candidates[0].rerunCommentId | Should -Be 0
+    }
+}

.github/scripts/Query-RerunReadyPRs.ps1

@@ -59,6 +59,19 @@ function Get-PlatformFromLabels {
     return 'android'
 }
 
+function Invoke-RerunReadyPRQuery {
+    param(
+        [int]$QueryMaxPRs = $MaxPRs,
+        [string]$QueryOwner = $Owner,
+        [string]$QueryRepo = $Repo,
+        [string]$QueryOutputPath = $OutputPath
+    )
+
+    $MaxPRs = $QueryMaxPRs
+    $Owner = $QueryOwner
+    $Repo = $QueryRepo
+    $OutputPath = $QueryOutputPath
+
 $searchJson = gh pr list `
     --repo "$Owner/$Repo" `
     --state open `
@@ -80,10 +93,8 @@ foreach ($pr in @($searchResult)) {
     if ($labels -contains $ReviewInProgressLabel -and -not (Test-AgentReviewInProgressIsStale -PRNumber $number -Owner $Owner -Repo $Repo)) {
         continue
     }
-
     $activity = @(Get-ActivityForPR -Number $number)
     $commits = @(Get-CommitsForPR -Number $number)
-    $latestRerun = Get-LatestRerunComment -Comments $activity
     $reviewOptions = Get-LatestReviewCommandOptions -Comments $activity -Owner $Owner -Repo $Repo
     $rawAuthorLogin = if ($pr.author -and $pr.author.login) { [string]$pr.author.login } else { '' }
     $authorLogin = Normalize-GitHubActorLogin $rawAuthorLogin
@@ -103,7 +114,10 @@ foreach ($pr in @($searchResult)) {
         reviewCommandId = $reviewOptions.CommentId
         reviewCommand   = $reviewOptions.Body
         labels          = $labels
-        rerunCommentId  = if ($latestRerun) { [Int64]$latestRerun.id } else { $null }
+        # The ready label does not encode whether this queue cycle came from a
+        # specific command or the autonomous labeler. Never reuse a historical
+        # /review rerun comment as this cycle's reaction target.
+        rerunCommentId  = [Int64]0
         contextMarkdown = $contextMarkdown
     }
 }
@@ -118,3 +132,8 @@ $json | Set-Content -LiteralPath $OutputPath -Encoding UTF8
 
 Write-Host "Wrote $($candidates.Count) rerun-ready candidate(s) to $OutputPath"
 Write-Output $json
+}
+
+if ($MyInvocation.InvocationName -ne '.') {
+    Invoke-RerunReadyPRQuery
+}

.github/scripts/Resolve-RerunEligibility.Tests.ps1

@@ -540,3 +540,186 @@ new
         $context | Should -Match 'New non-command author comments: 0'
     }
 }
+
+Describe 'Resolve-AutonomousRerunEligibility' {
+    It 'rejects a PR that was never AI-reviewed (no AI Summary)' {
+        $comments = @(
+            New-TestComment -Id 1 -Body 'Some author update.' -CreatedAt '2026-05-31T09:00:00Z'
+        )
+
+        $result = Resolve-AutonomousRerunEligibility -Comments $comments -Commits @() -CurrentHeadSha 'abcdef123' -PRAuthorLogin 'dev-user'
+        $result.Eligible | Should -BeFalse
+        $result.Reason | Should -Be 'no-ai-summary'
+    }
+
+    It 'accepts a new PR-author comment after the latest AI Summary' {
+        $comments = @(
+            New-TestComment -Id 1 -Body (New-AISummaryBody) -CreatedAt '2026-05-31T09:00:00Z' -UpdatedAt '2026-05-31T09:30:00Z' -Login 'MauiBot' -Type 'User'
+            New-TestComment -Id 2 -Body 'I pushed the requested update.' -CreatedAt '2026-05-31T09:45:00Z'
+        )
+
+        $result = Resolve-AutonomousRerunEligibility -Comments $comments -Commits @() -CurrentHeadSha 'abcdef123' -PRAuthorLogin 'dev-user'
+        $result.Eligible | Should -BeTrue
+        $result.Reason | Should -Be 'new-author-comment-after-ai-summary'
+    }
+
+    It 'accepts a new commit after the latest AI Summary' {
+        $comments = @(
+            New-TestComment -Id 1 -Body (New-AISummaryBody) -CreatedAt '2026-05-31T09:00:00Z' -UpdatedAt '2026-05-31T09:30:00Z' -Login 'MauiBot' -Type 'User'
+        )
+        $commits = @(
+            New-TestCommit -Sha 'aaaaaaa' -Date '2026-05-31T09:45:00Z'
+        )
+
+        $result = Resolve-AutonomousRerunEligibility -Comments $comments -Commits $commits -CurrentHeadSha 'abcdef123' -PRAuthorLogin 'dev-user'
+        $result.Eligible | Should -BeTrue
+        $result.Reason | Should -Be 'new-commit-after-ai-summary'
+    }
+
+    It 'accepts a head SHA that differs from the last reviewed SHA' {
+        $comments = @(
+            New-TestComment -Id 1 -Body (New-AISummaryBody -Sha '1111111') -CreatedAt '2026-05-31T09:00:00Z' -UpdatedAt '2026-05-31T09:30:00Z' -Login 'MauiBot' -Type 'User'
+        )
+
+        $result = Resolve-AutonomousRerunEligibility -Comments $comments -Commits @() -CurrentHeadSha '2222222abcdef' -PRAuthorLogin 'dev-user'
+        $result.Eligible | Should -BeTrue
+        $result.Reason | Should -Be 'new-head-commit'
+    }
+
+    It 'reports eligible with reason label-already-present when the ready-for-rerun label is already applied' {
+        $comments = @(
+            New-TestComment -Id 1 -Body (New-AISummaryBody) -CreatedAt '2026-05-31T09:00:00Z' -UpdatedAt '2026-05-31T09:30:00Z' -Login 'MauiBot' -Type 'User'
+            New-TestComment -Id 2 -Body 'I pushed the requested update.' -CreatedAt '2026-05-31T09:45:00Z'
+        )
+
+        $result = Resolve-AutonomousRerunEligibility -Comments $comments -Commits @() -CurrentHeadSha 'abcdef123' -PRAuthorLogin 'dev-user' -CurrentLabels @('s/agent-ready-for-rerun')
+        $result.Eligible | Should -BeTrue
+        $result.Reason | Should -Be 'label-already-present'
+    }
+
+    It 'skips when a review is already in progress' {
+        $comments = @(
+            New-TestComment -Id 1 -Body (New-AISummaryBody) -CreatedAt '2026-05-31T09:00:00Z' -UpdatedAt '2026-05-31T09:30:00Z' -Login 'MauiBot' -Type 'User'
+            New-TestComment -Id 2 -Body 'I pushed the requested update.' -CreatedAt '2026-05-31T09:45:00Z'
+        )
+
+        $result = Resolve-AutonomousRerunEligibility -Comments $comments -Commits @() -CurrentHeadSha 'abcdef123' -PRAuthorLogin 'dev-user' -CurrentLabels @('s/agent-review-in-progress')
+        $result.Eligible | Should -BeFalse
+        $result.Reason | Should -Be 'review-in-progress'
+    }
+
+    It 'rejects when there is no new activity since the AI Summary' {
+        $comments = @(
+            New-TestComment -Id 1 -Body (New-AISummaryBody) -CreatedAt '2026-05-31T09:00:00Z' -UpdatedAt '2026-05-31T09:30:00Z' -Login 'MauiBot' -Type 'User'
+        )
+
+        $result = Resolve-AutonomousRerunEligibility -Comments $comments -Commits @() -CurrentHeadSha 'abcdef123' -PRAuthorLogin 'dev-user'
+        $result.Eligible | Should -BeFalse
+        $result.Reason | Should -Be 'no-new-comments-or-commits'
+    }
+
+    It 'ignores a maintainer (non-author) comment after the AI Summary' {
+        $comments = @(
+            New-TestComment -Id 1 -Body (New-AISummaryBody) -CreatedAt '2026-05-31T09:00:00Z' -UpdatedAt '2026-05-31T09:30:00Z' -Login 'MauiBot' -Type 'User'
+            New-TestComment -Id 2 -Body 'Please address the AI feedback.' -CreatedAt '2026-05-31T09:45:00Z' -Login 'maintainer'
+        )
+
+        $result = Resolve-AutonomousRerunEligibility -Comments $comments -Commits @() -CurrentHeadSha 'abcdef123' -PRAuthorLogin 'dev-user'
+        $result.Eligible | Should -BeFalse
+        $result.Reason | Should -Be 'no-new-comments-or-commits'
+    }
+
+    Context 'anti-flap: last-declined checkpoint (scanner skip)' {
+        It 'does not re-qualify a head that only differs from the summary when the scanner already declined it and nothing new landed' {
+            # AI Summary reviewed 1111111; head is 2222222 (differs). An author comment
+            # landed after the summary but BEFORE the scanner removed the label. With the
+            # decline checkpoint that state is already-declined, so it must not flap back on.
+            $comments = @(
+                New-TestComment -Id 1 -Body (New-AISummaryBody -Sha '1111111') -CreatedAt '2026-05-31T09:00:00Z' -UpdatedAt '2026-05-31T09:30:00Z' -Login 'MauiBot' -Type 'User'
+                New-TestComment -Id 2 -Body 'I pushed the update.' -CreatedAt '2026-05-31T09:45:00Z'
+            )
+
+            $result = Resolve-AutonomousRerunEligibility -Comments $comments -Commits @() -CurrentHeadSha '2222222abcdef' -PRAuthorLogin 'dev-user' -LastDeclinedAt '2026-05-31T10:00:00Z'
+            $result.Eligible | Should -BeFalse
+            $result.Reason | Should -Be 'declined-state-unchanged'
+        }
+
+        It 're-qualifies (new-head-commit) when a commit lands after the decline' {
+            $comments = @(
+                New-TestComment -Id 1 -Body (New-AISummaryBody -Sha '1111111') -CreatedAt '2026-05-31T09:00:00Z' -UpdatedAt '2026-05-31T09:30:00Z' -Login 'MauiBot' -Type 'User'
+            )
+            $commits = @(
+                New-TestCommit -Sha '2222222abcdef' -Date '2026-05-31T10:30:00Z'
+            )
+
+            $result = Resolve-AutonomousRerunEligibility -Comments $comments -Commits $commits -CurrentHeadSha '2222222abcdef' -PRAuthorLogin 'dev-user' -LastDeclinedAt '2026-05-31T10:00:00Z'
+            $result.Eligible | Should -BeTrue
+            $result.Reason | Should -Be 'new-head-commit'
+        }
+
+        It 'does not re-qualify when the differing-head commit predates the decline' {
+            $comments = @(
+                New-TestComment -Id 1 -Body (New-AISummaryBody -Sha '1111111') -CreatedAt '2026-05-31T09:00:00Z' -UpdatedAt '2026-05-31T09:30:00Z' -Login 'MauiBot' -Type 'User'
+            )
+            $commits = @(
+                New-TestCommit -Sha '2222222abcdef' -Date '2026-05-31T09:45:00Z'
+            )
+
+            $result = Resolve-AutonomousRerunEligibility -Comments $comments -Commits $commits -CurrentHeadSha '2222222abcdef' -PRAuthorLogin 'dev-user' -LastDeclinedAt '2026-05-31T10:00:00Z'
+            $result.Eligible | Should -BeFalse
+            $result.Reason | Should -Be 'declined-state-unchanged'
+        }
+
+        It 're-qualifies when the current head differs from the exact declined head even if the marker is newer' {
+            $comments = @(
+                New-TestComment -Id 1 -Body (New-AISummaryBody -Sha '1111111') -CreatedAt '2026-05-31T09:00:00Z' -UpdatedAt '2026-05-31T09:30:00Z' -Login 'MauiBot' -Type 'User'
+            )
+
+            $result = Resolve-AutonomousRerunEligibility `
+                -Comments $comments `
+                -Commits @() `
+                -CurrentHeadSha '3333333333333333333333333333333333333333' `
+                -PRAuthorLogin 'dev-user' `
+                -LastDeclinedAt '2026-05-31T10:00:00Z' `
+                -LastDeclinedHeadSha '2222222222222222222222222222222222222222'
+
+            $result.Eligible | Should -BeTrue
+            $result.Reason | Should -Be 'new-head-commit'
+        }
+
+        It 're-qualifies on a fresh PR-author comment posted after the decline' {
+            $comments = @(
+                New-TestComment -Id 1 -Body (New-AISummaryBody -Sha '1111111') -CreatedAt '2026-05-31T09:00:00Z' -UpdatedAt '2026-05-31T09:30:00Z' -Login 'MauiBot' -Type 'User'
+                New-TestComment -Id 2 -Body 'Any update on this?' -CreatedAt '2026-05-31T10:30:00Z'
+            )
+
+            $result = Resolve-AutonomousRerunEligibility -Comments $comments -Commits @() -CurrentHeadSha '1111111abcdef' -PRAuthorLogin 'dev-user' -LastDeclinedAt '2026-05-31T10:00:00Z'
+            $result.Eligible | Should -BeTrue
+            $result.Reason | Should -Be 'new-author-comment-after-ai-summary'
+        }
+
+        It 'ignores a decline that predates the latest AI Summary (trigger-path removal superseded by the fresh summary)' {
+            $comments = @(
+                New-TestComment -Id 1 -Body (New-AISummaryBody -Sha '1111111') -CreatedAt '2026-05-31T09:00:00Z' -UpdatedAt '2026-05-31T09:30:00Z' -Login 'MauiBot' -Type 'User'
+                New-TestComment -Id 2 -Body 'I pushed the update.' -CreatedAt '2026-05-31T09:45:00Z'
+            )
+
+            # Label removed at 08:00 (before the 09:00 summary) — a completed review's removal,
+            # not a skip — so it must not suppress the genuine post-summary author comment.
+            $result = Resolve-AutonomousRerunEligibility -Comments $comments -Commits @() -CurrentHeadSha '1111111abcdef' -PRAuthorLogin 'dev-user' -LastDeclinedAt '2026-05-31T08:00:00Z'
+            $result.Eligible | Should -BeTrue
+            $result.Reason | Should -Be 'new-author-comment-after-ai-summary'
+        }
+
+        It 'falls back to the summary checkpoint when LastDeclinedAt is malformed' {
+            $comments = @(
+                New-TestComment -Id 1 -Body (New-AISummaryBody -Sha '1111111') -CreatedAt '2026-05-31T09:00:00Z' -UpdatedAt '2026-05-31T09:30:00Z' -Login 'MauiBot' -Type 'User'
+                New-TestComment -Id 2 -Body 'I pushed the update.' -CreatedAt '2026-05-31T09:45:00Z'
+            )
+
+            $result = Resolve-AutonomousRerunEligibility -Comments $comments -Commits @() -CurrentHeadSha '1111111abcdef' -PRAuthorLogin 'dev-user' -LastDeclinedAt 'not-a-real-date'
+            $result.Eligible | Should -BeTrue
+            $result.Reason | Should -Be 'new-author-comment-after-ai-summary'
+        }
+    }
+}