factory-factory 0.4.0 → 0.4.2

package/dist/src/backend/services/ratchet/service/ratchet-pr-state.helpers.test.js

@@ -9,7 +9,24 @@ vi.mock('@/backend/services/logger.service', () => ({
     createLogger: () => mockLogger,
 }));
 import { CIStatus, RatchetState } from '../../../../shared/core/index.js';
-import { buildFailedCheckDiagnostics, buildReviewSummariesForPrompt, computeCiSnapshotKey, computeDispatchSnapshotKey, determineRatchetState, fetchPRState, shouldSkipCleanPR, } from './ratchet-pr-state.helpers.js';
+import { buildFailedCheckDiagnostics, buildReviewSummariesForPrompt, computeCiSnapshotKey, computeDispatchSnapshotKey, computeLatestReviewActivityAtMs, determineRatchetState, fetchPRState, shouldSkipCleanPR, } from './ratchet-pr-state.helpers.js';
+function fakeCoordinator(state = {}) {
+    return vi.fn(async (_workspaceId, fetch, options) => {
+        if (state.inFlight || (state.cooldown && !options?.ignoreCooldown)) {
+            state.outcomes?.push('skipped');
+            return { status: 'skipped', reason: 'recently_fetched' };
+        }
+        try {
+            const value = await fetch();
+            state.outcomes?.push('fetched');
+            return { status: 'fetched', value };
+        }
+        catch (error) {
+            state.outcomes?.push('released');
+            throw error;
+        }
+    });
+}
 function makePRState(overrides = {}) {
     return {
         ciStatus: CIStatus.SUCCESS,
@@ -19,6 +36,8 @@ function makePRState(overrides = {}) {
         latestReviewActivityAtMs: null,
         statusCheckRollup: null,
         prState: 'OPEN',
+        cachedPrState: 'OPEN',
+        reviewDecision: null,
         prNumber: 1,
         reviewComments: [],
         ...overrides,
@@ -88,6 +107,21 @@ describe('shouldSkipCleanPR', () => {
         const prState = makePRState({ hasChangesRequested: true });
         expect(shouldSkipCleanPR(makeWorkspace(), prState)).toBe(false);
     });
+    it('does not skip when actionable review comments are still present', () => {
+        const prState = makePRState({
+            latestReviewActivityAtMs: new Date('2025-12-31T00:00:00Z').getTime(),
+            reviewComments: [
+                {
+                    author: 'reviewer',
+                    body: 'Please handle this edge case.',
+                    path: 'src/example.ts',
+                    line: 10,
+                    url: 'https://github.com/example/repo/pull/1#discussion_r1',
+                },
+            ],
+        });
+        expect(shouldSkipCleanPR(makeWorkspace(), prState)).toBe(false);
+    });
 });
 describe('fetchPRState', () => {
     const backoff = {
@@ -108,38 +142,34 @@ describe('fetchPRState', () => {
             getReviewComments: vi.fn(),
             getResolvedReviewCommentIds: vi.fn(async () => new Set()),
             computeCIStatus: vi.fn(),
+            computePRState: vi.fn(() => 'OPEN'),
             getAuthenticatedUsername: vi.fn(),
             fetchAndComputePRState: vi.fn(),
-            isRecentlyFetched: vi.fn(() => false),
-            isFetchInFlight: vi.fn(() => false),
-            startFetch: vi.fn(),
-            registerFetch: vi.fn(),
-            cancelFetch: vi.fn(),
+            coordinatePrFetch: fakeCoordinator(),
             ...overrides,
         };
     }
     it('skips GitHub API calls when the workspace was recently fetched', async () => {
         const github = makeGitHub({
-            isRecentlyFetched: vi.fn(() => true),
+            coordinatePrFetch: fakeCoordinator({ cooldown: true }),
         });
         const result = await fetchPRState({
             workspace: makeWorkspace(),
             authenticatedUsername: null,
+            reviewTriggerMode: 'CHANGES_REQUESTED',
             github,
             backoff,
         });
         expect(result).toEqual({ skipped: true, reason: 'recently_fetched' });
-        expect(github.isRecentlyFetched).toHaveBeenCalledWith('ws-1');
-        expect(github.startFetch).not.toHaveBeenCalled();
+        expect(github.coordinatePrFetch).toHaveBeenCalledWith('ws-1', expect.any(Function), expect.objectContaining({ ignoreCooldown: false }));
         expect(github.getPRFullDetails).not.toHaveBeenCalled();
         expect(github.getReviewComments).not.toHaveBeenCalled();
-        expect(github.registerFetch).not.toHaveBeenCalled();
-        expect(github.cancelFetch).not.toHaveBeenCalled();
     });
     it('fetches despite a recent fetch when bypassRecentFetchCooldown is set', async () => {
         const github = makeGitHub({
-            isRecentlyFetched: vi.fn(() => true),
+            coordinatePrFetch: fakeCoordinator({ cooldown: true }),
             getPRFullDetails: vi.fn().mockResolvedValue({
+                isDraft: false,
                 state: 'OPEN',
                 number: 123,
                 url: 'https://github.com/example/repo/pull/123',
@@ -151,10 +181,12 @@ describe('fetchPRState', () => {
             }),
             getReviewComments: vi.fn().mockResolvedValue([]),
             computeCIStatus: vi.fn().mockReturnValue(CIStatus.SUCCESS),
+            computePRState: vi.fn(() => 'OPEN'),
         });
         const result = await fetchPRState({
             workspace: makeWorkspace(),
             authenticatedUsername: null,
+            reviewTriggerMode: 'CHANGES_REQUESTED',
             github,
             backoff,
             bypassRecentFetchCooldown: true,
@@ -163,29 +195,29 @@ describe('fetchPRState', () => {
             throw new Error('Expected PR state fetch to return PR details');
         }
         expect(result.prState).toBe('OPEN');
-        expect(github.startFetch).toHaveBeenCalledWith('ws-1');
-        expect(github.registerFetch).toHaveBeenCalledWith('ws-1');
+        expect(github.coordinatePrFetch).toHaveBeenCalledWith('ws-1', expect.any(Function), expect.objectContaining({ ignoreCooldown: true }));
     });
     it('still skips a bypassed fetch while another fetch is actively in flight', async () => {
         const github = makeGitHub({
-            isRecentlyFetched: vi.fn(() => true),
-            isFetchInFlight: vi.fn(() => true),
+            coordinatePrFetch: fakeCoordinator({ cooldown: true, inFlight: true }),
         });
         const result = await fetchPRState({
             workspace: makeWorkspace(),
             authenticatedUsername: null,
+            reviewTriggerMode: 'CHANGES_REQUESTED',
             github,
             backoff,
             bypassRecentFetchCooldown: true,
         });
         expect(result).toEqual({ skipped: true, reason: 'recently_fetched' });
-        expect(github.startFetch).not.toHaveBeenCalled();
         expect(github.getPRFullDetails).not.toHaveBeenCalled();
     });
     it('forwards cancellation, releases the fetch claim, and skips backoff', async () => {
         const controller = new AbortController();
         const timeoutError = new Error('Workspace check timed out after 1000ms');
+        const outcomes = [];
         const github = makeGitHub({
+            coordinatePrFetch: fakeCoordinator({ outcomes }),
             getPRFullDetails: vi.fn(async (_repo, _pr, signal) => {
                 await Promise.resolve();
                 controller.abort(timeoutError);
@@ -198,6 +230,7 @@ describe('fetchPRState', () => {
         await expect(fetchPRState({
             workspace: makeWorkspace(),
             authenticatedUsername: null,
+            reviewTriggerMode: 'CHANGES_REQUESTED',
             github,
             backoff,
             signal: controller.signal,
@@ -205,22 +238,31 @@ describe('fetchPRState', () => {
         expect(github.getPRFullDetails).toHaveBeenCalledWith('example/repo', 123, controller.signal);
         expect(github.getReviewComments).toHaveBeenCalledWith('example/repo', 123, undefined, controller.signal);
         expect(github.getResolvedReviewCommentIds).toHaveBeenCalledWith('example/repo', 123, controller.signal);
-        expect(github.cancelFetch).toHaveBeenCalledWith('ws-1');
+        expect(outcomes).toEqual(['released']);
         expect(backoff.handleError).not.toHaveBeenCalled();
     });
 });
 describe('computeDispatchSnapshotKey', () => {
+    it('includes the pull request number', () => {
+        const key = computeDispatchSnapshotKey(123, CIStatus.SUCCESS, false, null, null, true);
+        expect(key).toBe('pr:123|ci:SUCCESS|no-changes-requested:none|merge:conflict');
+    });
+    it('produces different keys for identical state on different pull requests', () => {
+        const first = computeDispatchSnapshotKey(123, CIStatus.SUCCESS, false, null, null, true);
+        const second = computeDispatchSnapshotKey(456, CIStatus.SUCCESS, false, null, null, true);
+        expect(first).not.toBe(second);
+    });
     it('includes merge:conflict suffix when hasMergeConflict is true', () => {
-        const key = computeDispatchSnapshotKey(CIStatus.SUCCESS, false, null, null, true);
+        const key = computeDispatchSnapshotKey(123, CIStatus.SUCCESS, false, null, null, true);
         expect(key).toContain('merge:conflict');
     });
     it('includes merge:clean suffix when hasMergeConflict is false', () => {
-        const key = computeDispatchSnapshotKey(CIStatus.SUCCESS, false, null, null, false);
+        const key = computeDispatchSnapshotKey(123, CIStatus.SUCCESS, false, null, null, false);
         expect(key).toContain('merge:clean');
     });
     it('produces different keys for conflicted vs clean PRs', () => {
-        const clean = computeDispatchSnapshotKey(CIStatus.PENDING, false, null, null, false);
-        const conflicted = computeDispatchSnapshotKey(CIStatus.PENDING, false, null, null, true);
+        const clean = computeDispatchSnapshotKey(123, CIStatus.PENDING, false, null, null, false);
+        const conflicted = computeDispatchSnapshotKey(123, CIStatus.PENDING, false, null, null, true);
         expect(clean).not.toBe(conflicted);
     });
 });
@@ -295,6 +337,7 @@ describe('fetchPRState', () => {
         return {
             extractPRInfo: vi.fn().mockReturnValue({ owner: 'example', repo: 'repo', number: 123 }),
             getPRFullDetails: vi.fn().mockResolvedValue({
+                isDraft: false,
                 state: 'OPEN',
                 number: 123,
                 url: 'https://github.com/example/repo/pull/123',
@@ -307,13 +350,10 @@ describe('fetchPRState', () => {
             getReviewComments: vi.fn().mockResolvedValue([]),
             getResolvedReviewCommentIds: vi.fn(async () => new Set()),
             computeCIStatus: vi.fn().mockReturnValue(CIStatus.SUCCESS),
+            computePRState: vi.fn(() => 'OPEN'),
             getAuthenticatedUsername: vi.fn(),
             fetchAndComputePRState: vi.fn(),
-            isRecentlyFetched: vi.fn(() => false),
-            isFetchInFlight: vi.fn(() => false),
-            startFetch: vi.fn(),
-            registerFetch: vi.fn(),
-            cancelFetch: vi.fn(),
+            coordinatePrFetch: fakeCoordinator(),
             ...overrides,
         };
     }
@@ -326,6 +366,7 @@ describe('fetchPRState', () => {
                 prReviewLastCheckedAt: new Date('2026-01-02T00:00:00Z'),
             },
             authenticatedUsername: null,
+            reviewTriggerMode: 'CHANGES_REQUESTED',
             github,
             backoff: { handleError: vi.fn() },
         };
@@ -352,6 +393,7 @@ describe('fetchPRState', () => {
                 url: 'https://github.com/example/repo/pull/123#discussion_r1',
             },
         ]);
+        expect(result.snapshotKey).toBe('pr:123|ci:SUCCESS|changes-requested:1767225600000|merge:clean');
     });
     it('filters comments in resolved threads out of the prompt payload', async () => {
         const github = makeFetchGitHub({
@@ -402,6 +444,66 @@ describe('fetchPRState', () => {
         expect(handleError).not.toHaveBeenCalled();
         expect(mockLogger.warn).toHaveBeenCalledWith('Failed to fetch resolved review threads; including all review comments', expect.objectContaining({ workspaceId: 'ws-1', error: 'GraphQL unavailable' }));
     });
+    it('excludes top-level commented summaries and ordinary comments in changes-requested mode', async () => {
+        const github = makeFetchGitHub({
+            getPRFullDetails: vi.fn().mockResolvedValue({
+                isDraft: false,
+                state: 'OPEN',
+                number: 123,
+                url: 'https://github.com/example/repo/pull/123',
+                reviewDecision: null,
+                mergeStateStatus: 'CLEAN',
+                reviews: [
+                    {
+                        author: { login: 'cubic-dev-ai' },
+                        state: 'COMMENTED',
+                        body: 'All reported issues have been addressed.',
+                        submittedAt: '2026-01-02T00:00:00Z',
+                    },
+                ],
+                comments: [
+                    {
+                        author: { login: 'coverage-bot' },
+                        updatedAt: '2026-01-03T00:00:00Z',
+                    },
+                ],
+                statusCheckRollup: null,
+            }),
+        });
+        const result = expectPRStateInfo(await fetchPRState(makeFetchParams(github)));
+        expect(result.reviewComments).toEqual([]);
+        expect(result.latestReviewActivityAtMs).toBeNull();
+    });
+    it('includes top-level commented summaries in all-feedback mode', async () => {
+        const github = makeFetchGitHub({
+            getPRFullDetails: vi.fn().mockResolvedValue({
+                isDraft: false,
+                state: 'OPEN',
+                number: 123,
+                url: 'https://github.com/example/repo/pull/123',
+                reviewDecision: null,
+                mergeStateStatus: 'CLEAN',
+                reviews: [
+                    {
+                        author: { login: 'reviewer' },
+                        state: 'COMMENTED',
+                        body: 'Please fix the edge case.',
+                        submittedAt: '2026-01-02T00:00:00Z',
+                    },
+                ],
+                comments: [],
+                statusCheckRollup: null,
+            }),
+        });
+        const result = expectPRStateInfo(await fetchPRState({
+            ...makeFetchParams(github),
+            reviewTriggerMode: 'ALL_REVIEW_FEEDBACK',
+        }));
+        expect(result.reviewComments.map((comment) => comment.body)).toEqual([
+            'Please fix the edge case.',
+        ]);
+        expect(result.latestReviewActivityAtMs).toBe(Date.parse('2026-01-02T00:00:00Z'));
+    });
 });
 describe('buildReviewSummariesForPrompt', () => {
     it('includes actionable commented review bodies as prompt feedback', () => {
@@ -415,7 +517,7 @@ describe('buildReviewSummariesForPrompt', () => {
                     url: 'https://github.com/example/repo/pull/1#pullrequestreview-1',
                 },
             ],
-        }, null);
+        }, null, 'ALL_REVIEW_FEEDBACK');
         expect(summaries).toEqual([
             {
                 author: 'cubic-dev-ai',
@@ -446,7 +548,7 @@ describe('buildReviewSummariesForPrompt', () => {
                     body: 'My own note.',
                 },
             ],
-        }, 'me');
+        }, 'me', 'CHANGES_REQUESTED');
         expect(summaries).toEqual([]);
     });
     it('excludes stale changes-requested reviews after the same reviewer approves', () => {
@@ -454,22 +556,25 @@ describe('buildReviewSummariesForPrompt', () => {
             url: 'https://github.com/example/repo/pull/1',
             reviews: [
                 {
+                    submittedAt: '2026-01-01T00:00:00Z',
                     author: { login: 'reviewer-a' },
                     state: 'CHANGES_REQUESTED',
                     body: 'A requests changes first',
                 },
                 {
+                    submittedAt: '2026-01-02T00:00:00Z',
                     author: { login: 'reviewer-b' },
                     state: 'CHANGES_REQUESTED',
                     body: 'B requests changes',
                 },
                 {
+                    submittedAt: '2026-01-03T00:00:00Z',
                     author: { login: 'reviewer-a' },
                     state: 'APPROVED',
                     body: '',
                 },
             ],
-        }, null);
+        }, null, 'CHANGES_REQUESTED');
         expect(summaries).toEqual([
             {
                 author: 'reviewer-b',
@@ -480,6 +585,44 @@ describe('buildReviewSummariesForPrompt', () => {
             },
         ]);
     });
+    it('excludes stale commented reviews after the same reviewer approves', () => {
+        const summaries = buildReviewSummariesForPrompt({
+            url: 'https://github.com/example/repo/pull/1',
+            reviews: [
+                {
+                    submittedAt: '2026-01-02T00:00:00Z',
+                    author: { login: 'reviewer-a' },
+                    state: 'COMMENTED',
+                    body: 'Please fix the first-round issue',
+                },
+                {
+                    submittedAt: '2026-01-03T00:00:00Z',
+                    author: { login: 'reviewer-a' },
+                    state: 'APPROVED',
+                    body: '',
+                },
+            ],
+        }, null, 'ALL_REVIEW_FEEDBACK');
+        expect(summaries).toEqual([]);
+    });
+    it('uses response order when stale feedback and approval timestamps are missing', () => {
+        const summaries = buildReviewSummariesForPrompt({
+            url: 'https://github.com/example/repo/pull/1',
+            reviews: [
+                {
+                    author: { login: 'reviewer-a' },
+                    state: 'COMMENTED',
+                    body: 'Please fix the first-round issue',
+                },
+                {
+                    author: { login: 'reviewer-a' },
+                    state: 'APPROVED',
+                    body: '',
+                },
+            ],
+        }, null, 'ALL_REVIEW_FEEDBACK');
+        expect(summaries).toEqual([]);
+    });
     it('keeps changes-requested reviews when they are the reviewer latest state', () => {
         const summaries = buildReviewSummariesForPrompt({
             url: 'https://github.com/example/repo/pull/1',
@@ -495,7 +638,7 @@ describe('buildReviewSummariesForPrompt', () => {
                     body: 'A found a later issue',
                 },
             ],
-        }, null);
+        }, null, 'CHANGES_REQUESTED');
         expect(summaries).toEqual([
             {
                 author: 'reviewer-a',
@@ -511,22 +654,25 @@ describe('buildReviewSummariesForPrompt', () => {
             url: 'https://github.com/example/repo/pull/1',
             reviews: [
                 {
+                    submittedAt: '2026-01-01T00:00:00Z',
                     author: { login: 'reviewer-a' },
                     state: 'CHANGES_REQUESTED',
                     body: 'Please fix the null check',
                 },
                 {
+                    submittedAt: '2026-01-02T00:00:00Z',
                     author: { login: 'reviewer-a' },
                     state: 'APPROVED',
                     body: '',
                 },
                 {
+                    submittedAt: '2026-01-03T00:00:00Z',
                     author: { login: 'reviewer-a' },
                     state: 'COMMENTED',
                     body: 'Thanks for the fix!',
                 },
             ],
-        }, null);
+        }, null, 'ALL_REVIEW_FEEDBACK');
         expect(summaries).toEqual([
             {
                 author: 'reviewer-a',
@@ -542,22 +688,25 @@ describe('buildReviewSummariesForPrompt', () => {
             url: 'https://github.com/example/repo/pull/1',
             reviews: [
                 {
+                    submittedAt: '2026-01-01T00:00:00Z',
                     author: { login: 'reviewer-a' },
                     state: 'CHANGES_REQUESTED',
                     body: 'First round of feedback',
                 },
                 {
+                    submittedAt: '2026-01-02T00:00:00Z',
                     author: { login: 'reviewer-a' },
                     state: 'APPROVED',
                     body: '',
                 },
                 {
+                    submittedAt: '2026-01-03T00:00:00Z',
                     author: { login: 'reviewer-a' },
                     state: 'CHANGES_REQUESTED',
                     body: 'Found a new issue after approving',
                 },
             ],
-        }, null);
+        }, null, 'CHANGES_REQUESTED');
         expect(summaries).toEqual([
             {
                 author: 'reviewer-a',
@@ -568,6 +717,181 @@ describe('buildReviewSummariesForPrompt', () => {
             },
         ]);
     });
+    it('uses submission time to filter reviews when GitHub returns them out of order', () => {
+        const prDetails = {
+            url: 'https://github.com/example/repo/pull/1',
+            reviews: [
+                {
+                    submittedAt: '2026-01-04T00:00:00Z',
+                    author: { login: 'reviewer-a' },
+                    state: 'COMMENTED',
+                    body: 'New feedback after approval',
+                },
+                {
+                    submittedAt: '2026-01-03T00:00:00Z',
+                    author: { login: 'reviewer-a' },
+                    state: 'APPROVED',
+                    body: '',
+                },
+                {
+                    submittedAt: '2026-01-02T00:00:00Z',
+                    author: { login: 'reviewer-a' },
+                    state: 'COMMENTED',
+                    body: 'Old feedback before approval',
+                },
+            ],
+        };
+        expect(buildReviewSummariesForPrompt(prDetails, null, 'ALL_REVIEW_FEEDBACK')).toEqual([
+            {
+                author: 'reviewer-a',
+                body: 'New feedback after approval',
+                path: 'PR review',
+                line: null,
+                url: 'https://github.com/example/repo/pull/1',
+            },
+        ]);
+    });
+    it('excludes commented review summaries in changes-requested mode', () => {
+        const summaries = buildReviewSummariesForPrompt({
+            url: 'https://github.com/example/repo/pull/1',
+            reviews: [
+                {
+                    author: { login: 'cubic-dev-ai' },
+                    state: 'COMMENTED',
+                    body: 'Please fix the hydration edge case.',
+                },
+            ],
+        }, null, 'CHANGES_REQUESTED');
+        expect(summaries).toEqual([]);
+    });
+    it('includes changes-requested summaries in both modes', () => {
+        const prDetails = {
+            url: 'https://github.com/example/repo/pull/1',
+            reviews: [
+                {
+                    author: { login: 'reviewer' },
+                    state: 'CHANGES_REQUESTED',
+                    body: 'Please fix this.',
+                },
+            ],
+        };
+        expect(buildReviewSummariesForPrompt(prDetails, null, 'CHANGES_REQUESTED')).toHaveLength(1);
+        expect(buildReviewSummariesForPrompt(prDetails, null, 'ALL_REVIEW_FEEDBACK')).toHaveLength(1);
+    });
+});
+describe('computeLatestReviewActivityAtMs', () => {
+    const prDetails = {
+        reviews: [
+            {
+                submittedAt: '2026-01-02T00:00:00Z',
+                author: { login: 'commenting-reviewer' },
+                state: 'COMMENTED',
+                body: 'Please address this feedback.',
+            },
+            {
+                submittedAt: '2026-01-01T00:00:00Z',
+                author: { login: 'changes-reviewer' },
+                state: 'CHANGES_REQUESTED',
+            },
+        ],
+        comments: [
+            {
+                updatedAt: '2026-01-04T00:00:00Z',
+                author: { login: 'coverage-bot' },
+            },
+        ],
+    };
+    it('ignores ordinary PR comments and commented summaries in changes-requested mode', () => {
+        expect(computeLatestReviewActivityAtMs(prDetails, [], null, 'CHANGES_REQUESTED')).toBe(Date.parse('2026-01-01T00:00:00Z'));
+    });
+    it('includes commented review submissions in all-feedback mode', () => {
+        expect(computeLatestReviewActivityAtMs(prDetails, [], null, 'ALL_REVIEW_FEEDBACK')).toBe(Date.parse('2026-01-02T00:00:00Z'));
+    });
+    it('ignores empty commented review submissions in all-feedback mode', () => {
+        expect(computeLatestReviewActivityAtMs({
+            ...prDetails,
+            reviews: [
+                {
+                    submittedAt: '2026-01-05T00:00:00Z',
+                    author: { login: 'empty-commenting-reviewer' },
+                    state: 'COMMENTED',
+                    body: '   ',
+                },
+                ...prDetails.reviews,
+            ],
+        }, [], null, 'ALL_REVIEW_FEEDBACK')).toBe(Date.parse('2026-01-02T00:00:00Z'));
+    });
+    it('ignores stale commented review activity after the same reviewer approves', () => {
+        expect(computeLatestReviewActivityAtMs({
+            reviews: [
+                {
+                    submittedAt: '2026-01-02T00:00:00Z',
+                    author: { login: 'reviewer-a' },
+                    state: 'COMMENTED',
+                    body: 'Please fix the first-round issue',
+                },
+                {
+                    submittedAt: '2026-01-03T00:00:00Z',
+                    author: { login: 'reviewer-a' },
+                    state: 'APPROVED',
+                    body: '',
+                },
+            ],
+            comments: [],
+        }, [], null, 'ALL_REVIEW_FEEDBACK')).toBeNull();
+    });
+    it('uses response order when an approval timestamp is unparseable', () => {
+        expect(computeLatestReviewActivityAtMs({
+            reviews: [
+                {
+                    submittedAt: '2026-01-02T00:00:00Z',
+                    author: { login: 'reviewer-a' },
+                    state: 'COMMENTED',
+                    body: 'Please fix the first-round issue',
+                },
+                {
+                    submittedAt: 'not-a-timestamp',
+                    author: { login: 'reviewer-a' },
+                    state: 'APPROVED',
+                    body: '',
+                },
+            ],
+            comments: [],
+        }, [], null, 'ALL_REVIEW_FEEDBACK')).toBeNull();
+    });
+    it('uses submission time for activity when GitHub returns reviews out of order', () => {
+        expect(computeLatestReviewActivityAtMs({
+            reviews: [
+                {
+                    submittedAt: '2026-01-04T00:00:00Z',
+                    author: { login: 'reviewer-a' },
+                    state: 'COMMENTED',
+                    body: 'New feedback after approval',
+                },
+                {
+                    submittedAt: '2026-01-03T00:00:00Z',
+                    author: { login: 'reviewer-a' },
+                    state: 'APPROVED',
+                    body: '',
+                },
+                {
+                    submittedAt: '2026-01-02T00:00:00Z',
+                    author: { login: 'reviewer-a' },
+                    state: 'COMMENTED',
+                    body: 'Old feedback before approval',
+                },
+            ],
+            comments: [],
+        }, [], null, 'ALL_REVIEW_FEEDBACK')).toBe(Date.parse('2026-01-04T00:00:00Z'));
+    });
+    it('always includes inline review comment activity', () => {
+        expect(computeLatestReviewActivityAtMs(prDetails, [
+            {
+                updatedAt: '2026-01-03T00:00:00Z',
+                author: { login: 'inline-reviewer' },
+            },
+        ], null, 'CHANGES_REQUESTED')).toBe(Date.parse('2026-01-03T00:00:00Z'));
+    });
 });
 describe('buildFailedCheckDiagnostics', () => {
     it('includes STARTUP_FAILURE checks in failed check diagnostics', () => {