{pipelineCheck && pipelineFailed
@@ -81,11 +94,22 @@ export function PRTriageStrip({
'{{name}} failed',
{ name: pipelineCheck.name }
)
- : translate(
- 'auto.components.right.sidebar.checks.panel.content.failingChecks',
- '{{count}} failing checks',
- { count: failingCount, defaultValue_one: '{{count}} failing check' }
- )}
+ : outcome === 'cancelled'
+ ? translate(
+ 'auto.components.editor.CheckRunDetailsPanel.91a4c7e2b0',
+ 'Cancelled'
+ )
+ : outcome === 'pending'
+ ? translate(
+ 'auto.components.right.sidebar.checks.panel.content.pendingChecks',
+ '{{count}} checks pending',
+ { count: pendingCount, defaultValue_one: '{{count}} check pending' }
+ )
+ : translate(
+ 'auto.components.right.sidebar.checks.panel.content.failingChecks',
+ '{{count}} failing checks',
+ { count: failingCount, defaultValue_one: '{{count}} failing check' }
+ )}
{translate(
diff --git a/src/renderer/src/components/right-sidebar/checks-panel/use-checks-list-state.tsx b/src/renderer/src/components/right-sidebar/checks-panel/use-checks-list-state.tsx
index 059b2436b2e..ac6c6bc5afe 100644
--- a/src/renderer/src/components/right-sidebar/checks-panel/use-checks-list-state.tsx
+++ b/src/renderer/src/components/right-sidebar/checks-panel/use-checks-list-state.tsx
@@ -67,10 +67,12 @@ export function useChecksListState({
// Share the pill's classifier for skipped passes and completed-without-verdict unresolved checks.
const {
passed: passingCount,
- failed: failingCount,
+ failed: inclusiveFailingCount,
+ cancelled: cancelledCount = 0,
pending: pendingCount,
neutral: neutralCount
} = summarizeProviderChecks(checks)
+ const failingCount = inclusiveFailingCount - cancelledCount
useEffect(() => {
const validKeys = new Set(rows.map((row) => row.key))
@@ -344,6 +346,7 @@ export function useChecksListState({
rows,
passingCount,
failingCount,
+ cancelledCount,
pendingCount,
neutralCount,
toggleCheckExpanded,
diff --git a/src/renderer/src/components/right-sidebar/parent-pr-checks-row-status.ts b/src/renderer/src/components/right-sidebar/parent-pr-checks-row-status.ts
index 478ccec9a49..6fc5cd84766 100644
--- a/src/renderer/src/components/right-sidebar/parent-pr-checks-row-status.ts
+++ b/src/renderer/src/components/right-sidebar/parent-pr-checks-row-status.ts
@@ -1,3 +1,4 @@
+import { getProviderChecksOutcome } from '../../../../shared/provider-check-summary'
import type { CheckStatus } from '../../../../shared/github/pull-request-types'
import type { HostedReviewInfo } from '../../../../shared/hosted-review'
import { translate } from '@/i18n/i18n'
@@ -60,13 +61,17 @@ export function classifyKnownReviewStatus(review: HostedReviewInfo): ParentPrChe
if (review.state === 'draft') {
return 'draft'
}
- if (review.status === 'failure') {
+ const outcome = getProviderChecksOutcome(review.checksSummary, review.status)
+ if (outcome === 'cancelled') {
+ return 'cancelled'
+ }
+ if (outcome === 'failure') {
return 'failing'
}
- if (review.status === 'pending') {
+ if (outcome === 'pending') {
return 'pending'
}
- if (review.status === 'success') {
+ if (outcome === 'success') {
return 'success'
}
return 'neutral'
@@ -86,6 +91,7 @@ export function groupForRowStatus(status: ParentPrChecksRowStatus): ParentPrChec
return 'merged'
case 'success':
return 'passing'
+ case 'cancelled':
case 'draft':
case 'neutral':
return 'draftOrNoChecks'
@@ -102,7 +108,7 @@ export function groupForRowStatus(status: ParentPrChecksRowStatus): ParentPrChec
export function getRowCheckTone(
status: ParentPrChecksRowStatus,
review: HostedReviewInfo | null | undefined
-): CheckStatus {
+): CheckStatus | 'cancelled' {
if (
['failing', 'conflict', 'closed', 'linkedDetailsUnavailable', 'refreshError'].includes(status)
) {
@@ -114,7 +120,7 @@ export function getRowCheckTone(
if (status === 'success' || status === 'merged') {
return 'success'
}
- return review?.status ?? 'neutral'
+ return status === 'cancelled' ? 'cancelled' : (review?.status ?? 'neutral')
}
export function getRowSummary(
@@ -136,6 +142,8 @@ export function getRowSummary(
)
}
switch (status) {
+ case 'cancelled':
+ return translate('auto.components.editor.CheckRunDetailsPanel.91a4c7e2b0', 'Cancelled')
case 'failing':
return translate(
'auto.components.rightSidebar.parentPrChecks.rowSummary.checksFailing',
diff --git a/src/renderer/src/components/right-sidebar/parent-pr-checks-row-types.ts b/src/renderer/src/components/right-sidebar/parent-pr-checks-row-types.ts
index 2904b5565fc..956195f34e3 100644
--- a/src/renderer/src/components/right-sidebar/parent-pr-checks-row-types.ts
+++ b/src/renderer/src/components/right-sidebar/parent-pr-checks-row-types.ts
@@ -1,6 +1,7 @@
import type { PRCheckDetail } from '../../../../shared/github/check-types'
import type {
CheckStatus,
+ ProviderCheckSummary,
GitHubRepositoryIdentity,
PRInfo
} from '../../../../shared/github/pull-request-types'
@@ -32,6 +33,7 @@ export type ParentPrChecksRowStatus =
| 'refreshError'
| 'unsupported'
| 'unavailable'
+ | 'cancelled'
| 'failing'
| 'pending'
| 'success'
@@ -58,7 +60,8 @@ export type ParentPrChecksRow = {
branch: string | null
status: ParentPrChecksRowStatus
group: ParentPrChecksGroupKey
- checkTone: CheckStatus
+ checkTone: CheckStatus | 'cancelled'
+ checksSummary?: ProviderCheckSummary
title: string
reviewNumber: number | null
reviewLabel: string | null
diff --git a/src/renderer/src/components/right-sidebar/parent-pr-checks-rows.ts b/src/renderer/src/components/right-sidebar/parent-pr-checks-rows.ts
index 82ae59d9bdf..6253f1d5e4c 100644
--- a/src/renderer/src/components/right-sidebar/parent-pr-checks-rows.ts
+++ b/src/renderer/src/components/right-sidebar/parent-pr-checks-rows.ts
@@ -22,6 +22,7 @@ import {
type ParentPrChecksProjection,
type ParentPrChecksRefreshOutcome,
type ParentPrChecksRow,
+ type ParentPrChecksRowStatus,
type ParentPrChecksSummary
} from './parent-pr-checks-row-types'
import {
@@ -125,7 +126,7 @@ function buildParentPrChecksRow(
hasFallbackReview: fallbackDisplay !== null
})
const checkDetails = getCheckDetails(args, review, branch)
- const detailNames = getCheckDetailNames(checkDetails)
+ const detailNames = getCheckDetailNames(checkDetails, status)
return {
id: args.worktree.id,
@@ -136,6 +137,7 @@ function buildParentPrChecksRow(
status,
group: groupForRowStatus(status),
checkTone: getRowCheckTone(status, review),
+ checksSummary: review?.checksSummary,
title: review?.title ?? fallbackDisplay?.title ?? branch ?? args.worktree.displayName,
reviewNumber: review?.number ?? fallbackDisplay?.number ?? null,
reviewLabel: getReviewLabel(review, fallbackDisplay),
@@ -221,12 +223,15 @@ function getCheckDetails(
return getGitHubChecksEntry({ ...args, repo: args.repo }, review)?.data ?? []
}
-function getCheckDetailNames(checks: readonly PRCheckDetail[]): string[] {
+function getCheckDetailNames(
+ checks: readonly PRCheckDetail[],
+ status: ParentPrChecksRowStatus
+): string[] {
const interesting = checks.filter(
(check) =>
check.conclusion === 'failure' ||
check.conclusion === 'timed_out' ||
- check.conclusion === 'cancelled' ||
+ (check.conclusion === 'cancelled' && status === 'cancelled') ||
check.conclusion === 'action_required' ||
check.conclusion === 'pending' ||
check.conclusion === null ||
diff --git a/src/renderer/src/components/right-sidebar/right-sidebar-top-activity-bar.tsx b/src/renderer/src/components/right-sidebar/right-sidebar-top-activity-bar.tsx
index 643a9a5e476..71cfdc04dcb 100644
--- a/src/renderer/src/components/right-sidebar/right-sidebar-top-activity-bar.tsx
+++ b/src/renderer/src/components/right-sidebar/right-sidebar-top-activity-bar.tsx
@@ -1,6 +1,7 @@
import React from 'react'
import type { ActiveRightSidebarTab, ActivityBarPosition } from '@/store/slices/editor'
-import type { CheckStatus } from '../../../../shared/github/pull-request-types'
+import type { CheckStatus as CoarseCheckStatus } from '../../../../shared/github/pull-request-types'
+type CheckStatus = CoarseCheckStatus | 'cancelled'
import { cn } from '@/lib/utils'
import { TooltipProvider } from '@/components/ui/tooltip'
import { ContextMenu, ContextMenuTrigger } from '@/components/ui/context-menu'
diff --git a/src/renderer/src/components/right-sidebar/use-hosted-review-actions.ts b/src/renderer/src/components/right-sidebar/use-hosted-review-actions.ts
index 9029f2158ee..bada277068e 100644
--- a/src/renderer/src/components/right-sidebar/use-hosted-review-actions.ts
+++ b/src/renderer/src/components/right-sidebar/use-hosted-review-actions.ts
@@ -25,6 +25,7 @@ export type HostedReviewActionInfo = Pick<
Partial<
Pick<
HostedReviewInfo,
+ | 'checksSummary'
| 'reviewDecision'
| 'autoMergeEnabled'
| 'autoMergeAllowed'
diff --git a/src/renderer/src/components/sidebar/WorkspaceReviewChecksIndicator.tsx b/src/renderer/src/components/sidebar/WorkspaceReviewChecksIndicator.tsx
index b0a0e0cec52..6c6e11b83c3 100644
--- a/src/renderer/src/components/sidebar/WorkspaceReviewChecksIndicator.tsx
+++ b/src/renderer/src/components/sidebar/WorkspaceReviewChecksIndicator.tsx
@@ -1,3 +1,4 @@
+import { getProviderChecksOutcome } from '../../../../shared/provider-check-summary'
import React from 'react'
import { translate } from '@/i18n/i18n'
import type { WorkspaceReviewChecksSummary } from '../../../../shared/workspace-review-checks'
@@ -5,16 +6,19 @@ import { ReviewIcon } from './worktree-review-helpers'
import { reviewStateLabel } from './WorktreeCardMetadataStatusBadges'
export function workspaceReviewChecksLabel(summary: WorkspaceReviewChecksSummary): string {
+ const outcome = getProviderChecksOutcome(summary)
const status =
- summary.state === 'failure'
- ? translate('workspace.links.checksFailed', 'Failed')
- : summary.state === 'pending'
- ? translate('workspace.links.checksPending', 'Pending')
- : summary.state === 'success'
- ? translate('workspace.links.checksPassing', 'Passing')
- : summary.state === 'unknown'
- ? translate('workspace.links.checksUnknown', 'Unknown')
- : translate('workspace.links.checksNeutral', 'Neutral')
+ outcome === 'cancelled'
+ ? translate('auto.components.editor.CheckRunDetailsPanel.91a4c7e2b0', 'Cancelled')
+ : outcome === 'failure'
+ ? translate('workspace.links.checksFailed', 'Failed')
+ : outcome === 'pending'
+ ? translate('workspace.links.checksPending', 'Pending')
+ : outcome === 'success'
+ ? translate('workspace.links.checksPassing', 'Passing')
+ : outcome === 'unknown'
+ ? translate('workspace.links.checksUnknown', 'Unknown')
+ : translate('workspace.links.checksNeutral', 'Neutral')
const checks = translate(
'workspace.links.allReviewChecks',
'Reviews: {{count}} · Checks: {{status}}',
diff --git a/src/renderer/src/components/sidebar/WorktreeCardHelpers.tsx b/src/renderer/src/components/sidebar/WorktreeCardHelpers.tsx
index ab1fd21f501..3492ca2e402 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardHelpers.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardHelpers.tsx
@@ -1,6 +1,6 @@
import React from 'react'
import type { GitConflictOperation } from '../../../../shared/git-status-types'
-import type { CheckStatus } from '../../../../shared/github/pull-request-types'
+import type { CheckPresentationOutcome } from '../../../../shared/provider-check-summary'
import type { TerminalTab } from '../../../../shared/terminal-tab-types'
import { translate } from '@/i18n/i18n'
@@ -8,7 +8,7 @@ export function branchDisplayName(branch: string): string {
return branch.replace(/^refs\/heads\//, '')
}
-export function checksLabel(status: CheckStatus): string {
+export function checksLabel(status: CheckPresentationOutcome): string {
switch (status) {
case 'success':
return translate('auto.components.sidebar.WorktreeCardHelpers.checksPassing', 'Passing')
@@ -16,7 +16,11 @@ export function checksLabel(status: CheckStatus): string {
return translate('auto.components.sidebar.WorktreeCardHelpers.checksFailing', 'Failing')
case 'pending':
return translate('auto.components.sidebar.WorktreeCardHelpers.checksPending', 'Pending')
+ case 'cancelled':
+ return translate('auto.components.editor.CheckRunDetailsPanel.91a4c7e2b0', 'Cancelled')
case 'neutral':
+ case 'none':
+ case 'unknown':
return ''
}
}
diff --git a/src/renderer/src/components/sidebar/WorktreeCardMetadataStatusBadges.tsx b/src/renderer/src/components/sidebar/WorktreeCardMetadataStatusBadges.tsx
index 57c61f4515c..77eac2f120f 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardMetadataStatusBadges.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardMetadataStatusBadges.tsx
@@ -1,3 +1,4 @@
+import { getProviderChecksOutcome } from '../../../../shared/provider-check-summary'
import React from 'react'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
import { getReviewChecksTone } from './worktree-review-helpers'
@@ -86,10 +87,13 @@ export function ReviewStateBadge({
}
export function ReviewChecksBadge({
- status
+ status: coarseStatus,
+ checksSummary
}: {
+ checksSummary?: WorktreeCardPrDisplay['checksSummary']
status: WorktreeCardPrDisplay['status']
}): React.JSX.Element | null {
+ const status = coarseStatus ? getProviderChecksOutcome(checksSummary, coarseStatus) : undefined
if (!status || status === 'neutral') {
return null
}
@@ -102,6 +106,16 @@ export function ReviewChecksBadge({
}
)
+ if (status === 'cancelled') {
+ return (
+
+
+
+ )
+ }
if (status === 'success') {
return (
diff --git a/src/renderer/src/components/sidebar/WorktreeCardReferenceRow.tsx b/src/renderer/src/components/sidebar/WorktreeCardReferenceRow.tsx
index c8f436227f2..9a5ac1d73c4 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardReferenceRow.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardReferenceRow.tsx
@@ -166,7 +166,9 @@ export function WorktreeCardReferenceRow({
) : null}
{label}
- {review?.status ? : null}
+ {review?.status ? (
+
+ ) : null}
{sourceText ? (
<>
diff --git a/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx b/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx
index 29c20ed8ac6..6d60c195ed3 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx
@@ -1,3 +1,4 @@
+import { getProviderChecksOutcome } from '../../../../shared/provider-check-summary'
import React from 'react'
import { Bell, GitBranch, Moon } from 'lucide-react'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
@@ -5,7 +6,7 @@ import { translate } from '@/i18n/i18n'
import { cn } from '@/lib/utils'
import { observeOffscreenAnimation } from '@/lib/offscreen-animation-pause'
import { getWorktreeStatusLabel, type WorktreeStatus } from '@/lib/worktree-status'
-import { FilledBellIcon } from './WorktreeCardHelpers'
+import { FilledBellIcon, checksLabel } from './WorktreeCardHelpers'
import StatusIndicator from './StatusIndicator'
import { useWorktreeActivityStatus } from './use-worktree-activity-status'
import { useIsSleepingWorktree } from './use-worktree-sleep-state'
@@ -86,13 +87,19 @@ function getReviewStatusLabel(review: WorktreeCardPrDisplay): string {
if (review.state === 'draft') {
return translate('workspace.reviewStatus.draft', '{{review}}: Draft', values)
}
- if (review.status === 'failure') {
+ const outcome = review.status
+ ? getProviderChecksOutcome(review.checksSummary, review.status)
+ : undefined
+ if (outcome === 'cancelled') {
+ return `${getReviewLabel(review)}: ${checksLabel(outcome)}`
+ }
+ if (outcome === 'failure') {
return translate('workspace.reviewStatus.checksFailed', '{{review}} checks: Failed', values)
}
- if (review.status === 'pending') {
+ if (outcome === 'pending') {
return translate('workspace.reviewStatus.checksPending', '{{review}} checks: Pending', values)
}
- if (review.status === 'success') {
+ if (outcome === 'success') {
return translate('workspace.reviewStatus.checksPassing', '{{review}} checks: Passing', values)
}
return translate('workspace.reviewStatus.open', '{{review}}: Open', values)
diff --git a/src/renderer/src/components/sidebar/WorktreeReferenceStack.test.tsx b/src/renderer/src/components/sidebar/WorktreeReferenceStack.test.tsx
index c48ee3795e7..81c1f1209be 100644
--- a/src/renderer/src/components/sidebar/WorktreeReferenceStack.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeReferenceStack.test.tsx
@@ -4,6 +4,7 @@ import { afterEach, describe, expect, it } from 'vitest'
import { WorktreeReferenceStack } from './WorktreeReferenceStack'
import { getWorkspaceAttachmentKey } from '../../../../shared/workspace-attachment-normalization'
import { referenceAttachment, referenceReview } from './workspace-reference-fixtures.test-support'
+import { summarizeProviderChecks } from '../../../../shared/provider-check-summary'
afterEach(cleanup)
describe('fixed workspace reference stacks', () => {
@@ -30,4 +31,45 @@ describe('fixed workspace reference stacks', () => {
expect(container.querySelector('[data-reference-count]')?.textContent).toBe('3')
expect(container.textContent).toContain('PR #2 · draft')
})
+
+ it.each([
+ ['failure', 'text-rose-500/85'],
+ ['pending', 'text-amber-500/85'],
+ ['success', 'text-muted-foreground/60']
+ ] as const)(
+ 'orders cancellation between pending and passing with a %s sibling',
+ (status, tone) => {
+ const items = [referenceAttachment(1), referenceAttachment(2)]
+ const cancelledIndex = status === 'success' ? 1 : 0
+ const cancellation = {
+ status: 'failure' as const,
+ checksSummary: summarizeProviderChecks([{ status: 'completed', conclusion: 'cancelled' }])
+ }
+ const details = Object.fromEntries(
+ items.map((item, index) => [
+ getWorkspaceAttachmentKey(item),
+ {
+ title: '',
+ url: item.url ?? '',
+ review: referenceReview(
+ item.number,
+ index === cancelledIndex ? cancellation : { status }
+ )
+ }
+ ])
+ )
+ const { container } = render()
+ expect(container.querySelector('[data-reference-front] svg')?.classList.contains(tone)).toBe(
+ true
+ )
+ expect(container.textContent).toContain(`PR #${cancelledIndex + 1} · open · Cancelled`)
+ if (status !== 'success') {
+ expect(container.textContent).toContain(
+ `PR #2 · open · ${status}, PR #1 · open · Cancelled`
+ )
+ } else {
+ expect(container.textContent).toContain('PR #2 · open · Cancelled, PR #1 · open · success')
+ }
+ }
+ )
})
diff --git a/src/renderer/src/components/sidebar/WorktreeReferenceStack.tsx b/src/renderer/src/components/sidebar/WorktreeReferenceStack.tsx
index 4dcd6d98ef9..22c8bc9f774 100644
--- a/src/renderer/src/components/sidebar/WorktreeReferenceStack.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeReferenceStack.tsx
@@ -3,6 +3,7 @@ import { CircleDot } from 'lucide-react'
import { LinearIcon } from '@/components/icons/LinearIcon'
import { JiraIcon } from '@/components/icons/JiraIcon'
import { getWorkspaceAttachmentKey } from '../../../../shared/workspace-attachment-normalization'
+import { getProviderChecksOutcome } from '../../../../shared/provider-check-summary'
import type { WorkspaceAttachment } from '../../../../shared/worktree/types'
import { ReviewIcon } from './worktree-review-helpers'
import { workspaceAttachmentLabel } from './worktree-attachment-editing'
@@ -11,6 +12,7 @@ import {
type WorkspaceReferenceDetailsMap
} from './workspace-reference-details'
import { translate } from '@/i18n/i18n'
+import { checksLabel } from './WorktreeCardHelpers'
const EMPTY_DETAILS: WorkspaceReferenceDetailsMap = {}
function singleReferenceLabel(item: WorkspaceAttachment): string {
@@ -64,19 +66,22 @@ function priority(item: WorkspaceAttachment, details: WorkspaceReferenceDetailsM
const detail = details[key]
if (item.type !== 'issue') {
const review = detail?.review
+ const status = review && getProviderChecksOutcome(review.checksSummary, review.status)
return review?.state === 'open'
- ? review.status === 'failure'
+ ? status === 'failure'
? 0
- : review.status === 'pending'
+ : status === 'pending'
? 1
- : 2
+ : status === 'cancelled'
+ ? 2
+ : 3
: review?.state === 'draft'
- ? 3
+ ? 4
: review?.state === 'merged'
- ? 4
+ ? 5
: review?.state === 'closed'
- ? 5
- : 6
+ ? 6
+ : 7
}
const state = detail?.stateName?.toLowerCase() ?? ''
if (detail?.stateType) {
@@ -116,10 +121,12 @@ export function WorktreeReferenceStack({
const summary = ordered
.map((item) => {
const detail = details[getWorkspaceAttachmentKey(item)]
+ const review = detail?.review
+ const status = review && getProviderChecksOutcome(review.checksSummary, review.status)
return [
workspaceAttachmentLabel(item),
- detail?.review?.state ?? detail?.stateName,
- detail?.review?.status
+ review?.state ?? detail?.stateName,
+ status === 'cancelled' ? checksLabel(status) : status
]
.filter(Boolean)
.join(' · ')
diff --git a/src/renderer/src/components/sidebar/cancelled-pr-checks.test.tsx b/src/renderer/src/components/sidebar/cancelled-pr-checks.test.tsx
new file mode 100644
index 00000000000..3005a008376
--- /dev/null
+++ b/src/renderer/src/components/sidebar/cancelled-pr-checks.test.tsx
@@ -0,0 +1,222 @@
+import { renderToStaticMarkup } from 'react-dom/server'
+import type { ReactNode } from 'react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { i18n } from '@/i18n/i18n'
+import ko from '@/i18n/locales/ko.json'
+import { CircleCheck } from 'lucide-react'
+import {
+ summarizeProviderChecks,
+ getProviderChecksOutcome
+} from '../../../../shared/provider-check-summary'
+import { summarizeWorkspaceReviewChecks } from '../../../../shared/workspace-review-checks'
+import { getWorkspaceAttachmentKey } from '../../../../shared/workspace-attachment-normalization'
+import type { GitHubWorkItem } from '../../../../shared/github/work-item-types'
+import { PRChecksCell } from '../task-page/github/ChecksCell'
+import { ActivityBarButton, TopActivityOverflowMenu } from '../right-sidebar/activity-bar-buttons'
+import {
+ WorkspaceReviewChecksIndicator,
+ workspaceReviewChecksLabel
+} from './WorkspaceReviewChecksIndicator'
+import { ReviewChecksIndicator } from './WorktreeCardMetadataStatusBadges'
+import { WorktreeCardStatusSlot } from './WorktreeCardStatusSlot'
+import { buildParentPrChecksProjection } from '../right-sidebar/parent-pr-checks-rows'
+import { FolderWorkspacePrChecksRow } from '../right-sidebar/FolderWorkspacePrChecksRow'
+import { getFolderWorkspaceCardPrDisplay } from './folder-workspace-card-pr-display'
+import {
+ referenceAttachment,
+ referenceReview,
+ referenceRepo,
+ referenceWorkspace
+} from './workspace-reference-fixtures.test-support'
+
+vi.mock('@/components/ui/tooltip', () => ({
+ Tooltip: ({ children }: { children: ReactNode }) => {children},
+ TooltipContent: ({ children }: { children: ReactNode }) => {children},
+ TooltipTrigger: ({ children }: { children: ReactNode }) => <>{children}
+}))
+vi.mock('./use-worktree-activity-status', () => ({ useWorktreeActivityStatus: () => 'done' }))
+vi.mock('./use-worktree-sleep-state', () => ({ useIsSleepingWorktree: () => false }))
+
+afterEach(async () => {
+ await i18n.changeLanguage('en')
+})
+
+describe('cancelled PR aggregate rendering', () => {
+ it.each([
+ [['cancelled', 'success'], 'Cancelled', 'text-muted-foreground'],
+ [['cancelled', 'failure'], 'Failing', 'text-rose-500'],
+ [['cancelled', 'pending'], 'Pending', 'text-amber-500']
+ ] as const)('renders %j consistently on real aggregate surfaces', (conclusions, label, tone) => {
+ const checksSummary = summarizeProviderChecks(
+ conclusions.map((conclusion) => ({ status: 'completed', conclusion }))
+ )
+ const review = referenceReview(7, { status: 'failure', checksSummary })
+ const badge = renderToStaticMarkup(
+
+ )
+ expect(badge).toContain(`Checks: ${label}`)
+ expect(badge).toContain(tone)
+ const item: GitHubWorkItem = {
+ id: 'pr:7',
+ repoId: 'repo',
+ type: 'pr',
+ number: 7,
+ title: '',
+ state: 'open',
+ url: review.url,
+ labels: [],
+ updatedAt: '',
+ author: null,
+ checksSummary
+ }
+ const pill = renderToStaticMarkup(
+ {}} onLoadChecks={() => {}} />
+ )
+ expect(pill).toContain(
+ label === 'Failing' ? '1 failing' : label === 'Pending' ? '1 pending' : 'Cancelled'
+ )
+ expect(pill).toContain(
+ label === 'Failing' ? 'rose' : label === 'Pending' ? 'amber' : 'text-muted-foreground'
+ )
+ const outcome = getProviderChecksOutcome(checksSummary, 'failure')
+ const activityItem = { id: 'checks' as const, icon: CircleCheck, title: 'Checks', shortcut: '' }
+ const activity = renderToStaticMarkup(
+ {}}
+ statusIndicator={outcome}
+ />
+ )
+ const overflow = renderToStaticMarkup(
+ {}}
+ checksStatus={outcome}
+ />
+ )
+ for (const markup of [activity, overflow]) {
+ expect(markup).toContain(
+ outcome === 'failure'
+ ? 'bg-rose'
+ : outcome === 'pending'
+ ? 'bg-amber'
+ : 'bg-muted-foreground'
+ )
+ if (outcome === 'cancelled') {
+ expect(markup).toContain('Cancelled')
+ expect(markup).not.toContain('Error')
+ }
+ }
+ const context = {
+ worktrees: [referenceWorkspace],
+ repos: [referenceRepo],
+ settings: null,
+ hostedReviewCache: {
+ 'local::repo::feature': { data: review, fetchedAt: 1, linkedReviewHintKey: 'github:7' }
+ },
+ prCache: {},
+ checksCache: {}
+ }
+ const projection = buildParentPrChecksProjection(context)
+ const row = renderToStaticMarkup(
+ {}}
+ onLoadCheckDetails={async () => null}
+ />
+ )
+ expect(row).toContain(
+ label === 'Failing' ? 'Checks failing' : label === 'Pending' ? 'Checks pending' : label
+ )
+ if (label === 'Cancelled') {
+ expect(row).not.toContain('rose')
+ }
+ const passingSibling = {
+ ...referenceWorkspace,
+ id: 'passing-sibling',
+ branch: 'passing',
+ linkedPR: 8
+ }
+ const folderReview = getFolderWorkspaceCardPrDisplay({
+ ...context,
+ folderWorkspaceId: 'folder',
+ worktreeMap: new Map([
+ [passingSibling.id, passingSibling],
+ [referenceWorkspace.id, referenceWorkspace]
+ ]),
+ hostedReviewCache: {
+ ...context.hostedReviewCache,
+ 'local::repo::passing': {
+ data: referenceReview(8),
+ fetchedAt: 1,
+ linkedReviewHintKey: 'github:8'
+ }
+ },
+ repoMap: new Map([['repo', referenceRepo]]),
+ worktreeLineageById: {},
+ workspaceLineageByChildKey: {
+ passing: {
+ childWorkspaceKey: `worktree:${passingSibling.id}`,
+ parentWorkspaceKey: 'folder:folder',
+ origin: 'cli',
+ capture: { source: 'env-workspace', confidence: 'inferred' },
+ createdAt: 1
+ },
+ child: {
+ childWorkspaceKey: `worktree:${referenceWorkspace.id}`,
+ parentWorkspaceKey: 'folder:folder',
+ origin: 'cli',
+ capture: { source: 'env-workspace', confidence: 'inferred' },
+ createdAt: 1
+ }
+ }
+ })
+ expect(folderReview?.number).toBe(7)
+ expect(folderReview?.checksSummary).toEqual(checksSummary)
+ const folderBadge = renderToStaticMarkup(
+
+ )
+ expect(folderBadge).toContain(`Checks: ${label}`)
+ const attachment = referenceAttachment(7)
+ const details = { [getWorkspaceAttachmentKey(attachment)]: { review } }
+ const collection = summarizeWorkspaceReviewChecks([attachment], details)
+ expect(renderToStaticMarkup()).toContain(
+ 'text-emerald-500/80'
+ )
+ expect(workspaceReviewChecksLabel(collection)).toContain(label === 'Failing' ? 'Failed' : label)
+ })
+
+ it('uses the existing translated cancellation label and retains merged lifecycle purple', async () => {
+ i18n.addResourceBundle('ko', 'translation', ko, true, true)
+ await i18n.changeLanguage('ko')
+ const checksSummary = summarizeProviderChecks([
+ { status: 'completed', conclusion: 'cancelled' }
+ ])
+ const markup = renderToStaticMarkup(
+
+ )
+ expect(markup).toContain(ko.auto.components.editor.CheckRunDetailsPanel['91a4c7e2b0'])
+ await i18n.changeLanguage('en')
+ const merged = renderToStaticMarkup(
+ {}}
+ onPointerDown={() => {}}
+ newCardStyle
+ prDisplay={referenceReview(7, { state: 'merged', status: 'failure', checksSummary })}
+ />
+ )
+ expect(merged).toContain('text-purple')
+ })
+})
diff --git a/src/renderer/src/components/sidebar/folder-workspace-card-pr-display.test.ts b/src/renderer/src/components/sidebar/folder-workspace-card-pr-display.test.ts
index d8ef8a30bb2..92b78cefdc1 100644
--- a/src/renderer/src/components/sidebar/folder-workspace-card-pr-display.test.ts
+++ b/src/renderer/src/components/sidebar/folder-workspace-card-pr-display.test.ts
@@ -1,10 +1,14 @@
import { describe, expect, it } from 'vitest'
+import { createElement } from 'react'
+import { renderToStaticMarkup } from 'react-dom/server'
+import { summarizeProviderChecks } from '../../../../shared/provider-check-summary'
import type { CheckStatus, PRInfo } from '../../../../shared/github/pull-request-types'
import type { Repo } from '../../../../shared/repo-types'
import type { WorkspaceLineage, WorktreeLineage } from '../../../../shared/worktree/lineage-types'
import type { Worktree } from '../../../../shared/worktree/types'
import { folderWorkspaceKey, worktreeWorkspaceKey } from '../../../../shared/workspace-scope'
import { getFolderWorkspaceCardPrDisplay } from './folder-workspace-card-pr-display'
+import { ReviewChecksBadge } from './WorktreeCardMetadataStatusBadges'
const repo: Repo = {
id: 'repo-1',
@@ -328,6 +332,58 @@ describe('getFolderWorkspaceCardPrDisplay', () => {
expect(display).toMatchObject({ number: 11, status: 'failure' })
})
+ it.each([
+ { attention: 'conflict', pendingSibling: false, pendingCheck: false },
+ { attention: 'conflict', pendingSibling: true, pendingCheck: false },
+ { attention: 'conflict', pendingSibling: true, pendingCheck: true },
+ { attention: 'closed', pendingSibling: true, pendingCheck: false },
+ { attention: 'draft', pendingSibling: true, pendingCheck: false }
+ ] as const)(
+ 'preserves $attention attention with cancellation (sibling=$pendingSibling, pending check=$pendingCheck)',
+ ({ attention, pendingSibling, pendingCheck }) => {
+ const worktree = makeWorktree({ id: 'attention', linkedPR: 11 })
+ const pending = makeWorktree({ id: 'pending', linkedPR: 12 })
+ const worktrees = pendingSibling ? [pending, worktree] : [worktree]
+ const checksSummary = summarizeProviderChecks([
+ { status: 'completed', conclusion: 'cancelled' },
+ ...(pendingCheck ? [{ status: 'in_progress', conclusion: null }] : [])
+ ])
+ const display = getFolderWorkspaceCardPrDisplay({
+ folderWorkspaceId: 'folder-1',
+ workspaceLineageByChildKey: Object.fromEntries(
+ worktrees.map((child) => [child.id, makeWorkspaceLineage(child)])
+ ),
+ worktreeLineageById: {},
+ worktreeMap: new Map(worktrees.map((child) => [child.id, child])),
+ repoMap: new Map([[repo.id, repo]]),
+ hostedReviewCache: null,
+ prCache: {
+ 'repo-1::attention': {
+ data: {
+ ...makePr(11, 'failure'),
+ state: attention === 'conflict' ? 'open' : attention,
+ mergeable: attention === 'conflict' ? 'CONFLICTING' : 'MERGEABLE',
+ checksSummary
+ },
+ fetchedAt: 2
+ },
+ 'repo-1::pending': makePrEntry(12, 'pending')
+ }
+ })
+ expect(display).toMatchObject({ number: 11, status: 'failure' })
+ expect(display?.checksSummary).toBeUndefined()
+ const badge = renderToStaticMarkup(
+ createElement(ReviewChecksBadge, {
+ status: display?.status,
+ checksSummary: display?.checksSummary
+ })
+ )
+ expect(badge).toContain('Checks: Failing')
+ expect(badge).toContain('text-rose-600')
+ expect(badge).not.toContain('Cancelled')
+ }
+ )
+
it('does not use stale merged branch PR cache after the worktree advances', () => {
const worktree = makeWorktree({ id: 'advanced-after-merge', linkedPR: null, head: 'new-head' })
diff --git a/src/renderer/src/components/sidebar/folder-workspace-card-pr-display.ts b/src/renderer/src/components/sidebar/folder-workspace-card-pr-display.ts
index 860ffe16851..7355bf0c03e 100644
--- a/src/renderer/src/components/sidebar/folder-workspace-card-pr-display.ts
+++ b/src/renderer/src/components/sidebar/folder-workspace-card-pr-display.ts
@@ -1,3 +1,4 @@
+import { getProviderChecksOutcome } from '../../../../shared/provider-check-summary'
import type { AppState } from '@/store/types'
import type { Repo } from '../../../../shared/repo-types'
import type { WorkspaceLineage, WorktreeLineage } from '../../../../shared/worktree/lineage-types'
@@ -19,11 +20,12 @@ type FolderWorkspaceCardPrDisplayArgs = {
settings?: AppState['settings']
}
-const REVIEW_STATUS_PRIORITY: Record, number> = {
+const REVIEW_STATUS_PRIORITY: Record = {
failure: 0,
pending: 1,
- success: 2,
- neutral: 3
+ cancelled: 2,
+ success: 3,
+ neutral: 4
}
export function getFolderWorkspaceCardPrDisplay({
@@ -106,7 +108,11 @@ function parentPrChecksRowToCardDisplay(row: ParentPrChecksRow): WorktreeCardPrD
title: row.title,
...(row.reviewState ? { state: row.reviewState } : {}),
...(row.reviewUrl ? { url: row.reviewUrl } : {}),
- status: row.checkTone
+ status: row.checkTone === 'cancelled' ? 'failure' : row.checkTone,
+ // Review attention tones must not be reinterpreted as check outcomes.
+ checksSummary: ['failing', 'pending', 'cancelled', 'success', 'neutral'].includes(row.status)
+ ? row.checksSummary
+ : undefined
}
}
@@ -133,5 +139,7 @@ function compareReviewDisplays(left: WorktreeCardPrDisplay, right: WorktreeCardP
}
function getReviewDisplayPriority(review: WorktreeCardPrDisplay): number {
- return review.status ? REVIEW_STATUS_PRIORITY[review.status] : 4
+ return review.status
+ ? (REVIEW_STATUS_PRIORITY[getProviderChecksOutcome(review.checksSummary, review.status)] ?? 4)
+ : 5
}
diff --git a/src/renderer/src/components/sidebar/worktree-card-pr-display.ts b/src/renderer/src/components/sidebar/worktree-card-pr-display.ts
index b27db31ce23..b7871caeae6 100644
--- a/src/renderer/src/components/sidebar/worktree-card-pr-display.ts
+++ b/src/renderer/src/components/sidebar/worktree-card-pr-display.ts
@@ -38,6 +38,7 @@ export type WorktreeCardPrDisplay =
state?: HostedReviewInfo['state']
url?: string
status?: HostedReviewInfo['status']
+ checksSummary?: HostedReviewInfo['checksSummary']
}
type WorktreeCardPrDisplayOptions = {
diff --git a/src/renderer/src/components/sidebar/worktree-review-helpers.tsx b/src/renderer/src/components/sidebar/worktree-review-helpers.tsx
index a2847a481dd..4edc6304956 100644
--- a/src/renderer/src/components/sidebar/worktree-review-helpers.tsx
+++ b/src/renderer/src/components/sidebar/worktree-review-helpers.tsx
@@ -1,3 +1,7 @@
+import {
+ getProviderChecksOutcome,
+ type CheckPresentationOutcome
+} from '../../../../shared/provider-check-summary'
import { createElement } from 'react'
import { GitMerge } from 'lucide-react'
import { cn } from '@/lib/utils'
@@ -26,7 +30,7 @@ export function getProviderName(review: WorktreeCardPrDisplay): string {
}
// Open reviews take check tones; draft/closed/merged keep state tones, and unconfirmed stateless rows flag problems only.
-export function getReviewChecksTone(status: WorktreeCardPrDisplay['status']): string | null {
+export function getReviewChecksTone(status: CheckPresentationOutcome | undefined): string | null {
if (status === 'failure') {
return 'text-rose-500/85'
}
@@ -36,14 +40,18 @@ export function getReviewChecksTone(status: WorktreeCardPrDisplay['status']): st
if (status === 'success') {
return 'text-emerald-500/80'
}
- return null
+ return status === 'cancelled' ? 'text-muted-foreground/60' : null
}
-function getCheckTone(review: Pick): string | null {
+function getCheckTone(
+ review: Pick
+): string | null {
if ((review.state && review.state !== 'open') || (!review.state && review.status === 'success')) {
return null
}
- return getReviewChecksTone(review.status)
+ return getReviewChecksTone(
+ review.status ? getProviderChecksOutcome(review.checksSummary, review.status) : undefined
+ )
}
function getStateTone(state: WorktreeCardPrDisplay['state']): string {
@@ -68,7 +76,7 @@ export function ReviewIcon({
variant = 'provider',
showChecks = true
}: {
- review: Pick &
+ review: Pick &
Partial>
className?: string
variant?: 'provider' | 'generic'
diff --git a/src/renderer/src/components/status-bar/hosted-review-label.ts b/src/renderer/src/components/status-bar/hosted-review-label.ts
index 90ee7dd7726..97428c26206 100644
--- a/src/renderer/src/components/status-bar/hosted-review-label.ts
+++ b/src/renderer/src/components/status-bar/hosted-review-label.ts
@@ -1,3 +1,5 @@
+import type { ProviderCheckSummary } from '../../../../shared/github/pull-request-types'
+import { getProviderChecksOutcome } from '../../../../shared/provider-check-summary'
import type { HostedReviewProvider } from '../../../../shared/hosted-review'
import {
localizedHostedReviewCopy,
@@ -13,11 +15,19 @@ export function formatHostedReviewLabel(review: {
number: number
state: string
status: string
+ checksSummary?: ProviderCheckSummary
}): string {
const { shortLabel } = localizedHostedReviewCopy(
resolveSupportedHostedReviewCopyProvider(review.provider)
)
const symbol = review.provider === 'gitlab' ? '!' : '#'
- const statusSuffix = review.status && review.status !== 'none' ? `, ${review.status}` : ''
+ const status =
+ review.status === 'failure' ||
+ review.status === 'pending' ||
+ review.status === 'success' ||
+ review.status === 'neutral'
+ ? getProviderChecksOutcome(review.checksSummary, review.status)
+ : review.status
+ const statusSuffix = status && status !== 'none' ? `, ${status}` : ''
return `${shortLabel} ${symbol}${review.number} ${formatReviewState(review.state)}${statusSuffix}`
}
diff --git a/src/renderer/src/components/task-page/github/ChecksCell.tsx b/src/renderer/src/components/task-page/github/ChecksCell.tsx
index 2c51817b7eb..07c50221a5b 100644
--- a/src/renderer/src/components/task-page/github/ChecksCell.tsx
+++ b/src/renderer/src/components/task-page/github/ChecksCell.tsx
@@ -1,3 +1,4 @@
+import { getProviderChecksOutcome } from '../../../../../shared/provider-check-summary'
import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types'
import React, { useRef, useEffect } from 'react'
import { translate } from '@/i18n/i18n'
@@ -47,13 +48,13 @@ export function PRChecksCell({
)
}
- const summary = item.checksSummary
+ const outcome = getProviderChecksOutcome(item.checksSummary)
const Icon =
- summary?.state === 'success'
+ outcome === 'success'
? CheckCircle2
- : summary?.state === 'failure'
+ : outcome === 'failure'
? AlertCircle
- : summary?.state === 'pending'
+ : outcome === 'pending'
? Clock3
: Minus
return (
diff --git a/src/renderer/src/components/task-page/github/use-task-page-github-list-projection.ts b/src/renderer/src/components/task-page/github/use-task-page-github-list-projection.ts
index a98e8498a13..e5d1aacc5e4 100644
--- a/src/renderer/src/components/task-page/github/use-task-page-github-list-projection.ts
+++ b/src/renderer/src/components/task-page/github/use-task-page-github-list-projection.ts
@@ -123,18 +123,21 @@ export function useTaskPageGitHubListProjection(model: TaskPageJiraCreationMetad
sourceContext: getTaskPageRepoSourceContext(repo, 'github')
}
).then((checks) => {
+ const checksSummary = deriveTaskPagePRCheckSummary(checks)
patchTaskPageWorkItemRows(
{
id: item.id,
repoId: item.repoId
},
{
- checksSummary: deriveTaskPagePRCheckSummary(checks)
+ checksSummary
},
(currentItem) =>
currentItem.type === 'pr' &&
currentItem.headSha === requestedHeadSha &&
- sameOptionalGitHubOwnerRepo(currentItem.prRepo, requestedPRRepo)
+ sameOptionalGitHubOwnerRepo(currentItem.prRepo, requestedPRRepo) &&
+ (currentItem.checksSummary?.cancelled === undefined ||
+ currentItem.checksSummary.state !== checksSummary.state)
)
})
},
diff --git a/src/renderer/src/components/task-page/task-page-checks-pill.ts b/src/renderer/src/components/task-page/task-page-checks-pill.ts
index de68060133c..c658565507d 100644
--- a/src/renderer/src/components/task-page/task-page-checks-pill.ts
+++ b/src/renderer/src/components/task-page/task-page-checks-pill.ts
@@ -1,15 +1,21 @@
-import { getProviderChecksLabel } from '../../../../shared/provider-check-summary'
+import { translate } from '@/i18n/i18n'
+import {
+ getProviderChecksLabel,
+ getProviderChecksOutcome
+} from '../../../../shared/provider-check-summary'
import type { ProviderCheckSummary } from '../../../../shared/github/pull-request-types'
type ChecksPillItem = { checksSummary?: ProviderCheckSummary }
/** Derive label and tone from the same summary so neutral checks cannot contradict a successful state. */
export function getChecksLabel(item: ChecksPillItem): string {
- return getProviderChecksLabel(item.checksSummary)
+ return getProviderChecksOutcome(item.checksSummary) === 'cancelled'
+ ? translate('auto.components.editor.CheckRunDetailsPanel.91a4c7e2b0', 'Cancelled')
+ : getProviderChecksLabel(item.checksSummary)
}
export function getChecksPillTone(item: ChecksPillItem): string {
- const state = item.checksSummary?.state
+ const state = getProviderChecksOutcome(item.checksSummary)
if (state === 'success') {
return 'border-emerald-500/30 bg-emerald-500/10 text-emerald-700 dark:text-emerald-200'
}
diff --git a/src/renderer/src/components/task-page/task-page-pr-check-summary.ts b/src/renderer/src/components/task-page/task-page-pr-check-summary.ts
index f806c3f0f8e..d4f39856379 100644
--- a/src/renderer/src/components/task-page/task-page-pr-check-summary.ts
+++ b/src/renderer/src/components/task-page/task-page-pr-check-summary.ts
@@ -3,5 +3,8 @@ import type { PRCheckDetail } from '../../../../shared/github/check-types'
import type { ProviderCheckSummary } from '../../../../shared/github/pull-request-types'
export function deriveTaskPagePRCheckSummary(checks: PRCheckDetail[]): ProviderCheckSummary {
- return summarizeProviderChecks(checks)
+ const summary = summarizeProviderChecks(checks)
+ // Detail lists do not prove completeness; only whole-PR reads publish cancellation metadata.
+ delete summary.cancelled
+ return summary
}
diff --git a/src/renderer/src/components/task-page/task-page-work-item-signatures.ts b/src/renderer/src/components/task-page/task-page-work-item-signatures.ts
index 5ccbadfed4b..2e2589853cf 100644
--- a/src/renderer/src/components/task-page/task-page-work-item-signatures.ts
+++ b/src/renderer/src/components/task-page/task-page-work-item-signatures.ts
@@ -33,6 +33,9 @@ export function taskPageWorkItemStatusSignature(item: GitHubWorkItem): string {
item.checksSummary?.state ?? null,
item.checksSummary?.total ?? null,
item.checksSummary?.failed ?? null,
+ item.checksSummary?.cancelled ?? null,
+ item.checksSummary?.passed ?? null,
+ item.checksSummary?.scope ?? null,
item.checksSummary?.pending ?? null,
item.checksSummary?.neutral ?? null,
item.mergeable ?? null,
diff --git a/src/renderer/src/i18n/locales/de.json b/src/renderer/src/i18n/locales/de.json
index d72cb174961..dcacfd5eee6 100644
--- a/src/renderer/src/i18n/locales/de.json
+++ b/src/renderer/src/i18n/locales/de.json
@@ -2138,7 +2138,6 @@
"9c3ba11a05": "Status:",
"934d87ab96": "Check-Details werden geladen…",
"71c11aff84": "Alle Checks erneut ausführen",
- "e31651a224": "Fehlgeschlagene Checks erneut ausführen",
"1b56e28faa": "Erneut ausführen",
"f4b1292569": "Standard-KI-Agenten für diese Checks starten",
"9a1004fc76": "Checks aktualisieren",
@@ -2643,7 +2642,6 @@
"662bc2998d": "Status:",
"d8e82b7f15": "Check-Details werden geladen…",
"54cddd1858": "Alle Checks erneut ausführen",
- "68605516dd": "Fehlgeschlagene Checks erneut ausführen",
"522d9353e1": "Erneut ausführen",
"0fa8b8faec": "Standard-KI-Agenten für diese Checks starten",
"5d0f42766d": "Checks aktualisieren",
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 7a6724971ee..40debf44560 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -2255,7 +2255,6 @@
"9c3ba11a05": "Status:",
"934d87ab96": "Loading check details…",
"71c11aff84": "Rerun all checks",
- "e31651a224": "Rerun failed checks",
"1b56e28faa": "Rerun",
"f4b1292569": "Start the default AI agent on these checks",
"9a1004fc76": "Refresh checks",
@@ -2760,7 +2759,6 @@
"662bc2998d": "Status:",
"d8e82b7f15": "Loading check details…",
"54cddd1858": "Rerun all checks",
- "68605516dd": "Rerun failed checks",
"522d9353e1": "Rerun",
"0fa8b8faec": "Start the default AI agent on these checks",
"5d0f42766d": "Refresh checks",
@@ -23670,5 +23668,8 @@
"message": "{{plugin}} wants to open {{host}}",
"alwaysAllow": "Always allow {{host}} for this plugin"
}
+ },
+ "checks": {
+ "rerunUnsuccessful": "Rerun unsuccessful"
}
}
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index 04490421701..644c1ee6310 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -1705,7 +1705,6 @@
"9c3ba11a05": "Estado:",
"934d87ab96": "Cargando detalles del check...",
"71c11aff84": "Volver a ejecutar todos los checks",
- "e31651a224": "Volver a ejecutar checks fallidos",
"1b56e28faa": "Volver a ejecutar",
"f4b1292569": "Iniciar el agente de IA predeterminado en estos checks",
"9a1004fc76": "Actualizar checks",
@@ -2210,7 +2209,6 @@
"662bc2998d": "Estado:",
"d8e82b7f15": "Cargando detalles del check...",
"54cddd1858": "Volver a ejecutar todos los checks",
- "68605516dd": "Volver a ejecutar checks fallidos",
"522d9353e1": "Volver a ejecutar",
"0fa8b8faec": "Iniciar el agente de IA predeterminado en estos checks",
"5d0f42766d": "Actualizar checks",
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index f854ddab150..ff781131a23 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -1929,7 +1929,6 @@
"9c3ba11a05": "Statut :",
"934d87ab96": "Chargement des détails de la vérification…",
"71c11aff84": "Relancer toutes les vérifications",
- "e31651a224": "Relancer les vérifications échouées",
"1b56e28faa": "Relancer",
"f4b1292569": "Démarrer l'agent IA par défaut sur ces vérifications",
"9a1004fc76": "Actualiser les vérifications",
@@ -2438,7 +2437,6 @@
"662bc2998d": "Statut :",
"d8e82b7f15": "Chargement des détails de la vérification…",
"54cddd1858": "Relancer toutes les vérifications",
- "68605516dd": "Relancer les vérifications échouées",
"522d9353e1": "Relancer",
"0fa8b8faec": "Démarrer l'agent IA par défaut sur ces vérifications",
"5d0f42766d": "Actualiser les vérifications",
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index e84c28c31d1..797d1eabf18 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -1679,7 +1679,6 @@
"9c3ba11a05": "ステータス:",
"934d87ab96": "チェックの詳細を読み込んでいます…",
"71c11aff84": "すべてのチェックを再実行します",
- "e31651a224": "失敗したチェックを再実行する",
"1b56e28faa": "再実行",
"f4b1292569": "これらのチェックでデフォルトの AI Agent を開始します",
"9a1004fc76": "チェックを更新",
@@ -2176,7 +2175,6 @@
"662bc2998d": "ステータス:",
"d8e82b7f15": "チェックの詳細を読み込んでいます…",
"54cddd1858": "すべてのチェックを再実行します",
- "68605516dd": "失敗したチェックを再実行する",
"522d9353e1": "再実行",
"0fa8b8faec": "これらのチェックでデフォルトの AI Agent を開始します",
"5d0f42766d": "チェックを更新",
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index 6430fb1905c..68476ca1253 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -1679,7 +1679,6 @@
"9c3ba11a05": "상태:",
"934d87ab96": "체크 세부 정보 로드 중…",
"71c11aff84": "모든 체크 다시 실행",
- "e31651a224": "실패한 체크 다시 실행",
"1b56e28faa": "재실행",
"f4b1292569": "이 체크에 기본 AI agent 시작",
"9a1004fc76": "체크 새로고침",
@@ -2176,7 +2175,6 @@
"662bc2998d": "상태:",
"d8e82b7f15": "체크 세부 정보 로드 중…",
"54cddd1858": "모든 체크 다시 실행",
- "68605516dd": "실패한 체크 다시 실행",
"522d9353e1": "재실행",
"0fa8b8faec": "이 체크에 기본 AI agent 시작",
"5d0f42766d": "체크 새로고침",
diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json
index 860bae98481..3854463713b 100644
--- a/src/renderer/src/i18n/locales/pt.json
+++ b/src/renderer/src/i18n/locales/pt.json
@@ -16124,7 +16124,6 @@
"9c3ba11a05": "Status:",
"934d87ab96": "Carregando detalhes da verificação…",
"71c11aff84": "Executar todas as verificações novamente",
- "e31651a224": "Executar verificações com falha novamente",
"1b56e28faa": "Executar novamente",
"f4b1292569": "Iniciar o agente de IA padrão nestas verificações",
"9a1004fc76": "Atualizar verificações",
@@ -16886,7 +16885,6 @@
"662bc2998d": "Status:",
"d8e82b7f15": "Carregando detalhes da verificação…",
"54cddd1858": "Executar todas as verificações novamente",
- "68605516dd": "Executar verificações com falha novamente",
"522d9353e1": "Executar novamente",
"0fa8b8faec": "Iniciar o agente de IA padrão nestas verificações",
"5d0f42766d": "Atualizar verificações",
diff --git a/src/renderer/src/i18n/locales/ru.json b/src/renderer/src/i18n/locales/ru.json
index 8f0ffe1fd38..3bcfee51de2 100644
--- a/src/renderer/src/i18n/locales/ru.json
+++ b/src/renderer/src/i18n/locales/ru.json
@@ -2190,7 +2190,6 @@
"9c3ba11a05": "Статус:",
"934d87ab96": "Загрузка подробностей проверки…",
"71c11aff84": "Повторить все проверки",
- "e31651a224": "Повторить неуспешные проверки",
"1b56e28faa": "Повторить запуск",
"f4b1292569": "Запустить ИИ-агента по умолчанию для этих проверок",
"9a1004fc76": "Обновить проверки",
@@ -2703,7 +2702,6 @@
"662bc2998d": "Статус:",
"d8e82b7f15": "Загрузка сведений о проверке…",
"54cddd1858": "Перезапустить все проверки",
- "68605516dd": "Перезапустить неудачные проверки",
"522d9353e1": "Перезапустить",
"0fa8b8faec": "Запустить ИИ-агента по умолчанию для этих проверок",
"5d0f42766d": "Обновить проверки",
diff --git a/src/renderer/src/i18n/locales/tr.json b/src/renderer/src/i18n/locales/tr.json
index b4006baaa8b..1f62c93999f 100644
--- a/src/renderer/src/i18n/locales/tr.json
+++ b/src/renderer/src/i18n/locales/tr.json
@@ -2116,7 +2116,6 @@
"9c3ba11a05": "Durum:",
"934d87ab96": "Kontrol ayrıntıları yükleniyor…",
"71c11aff84": "Tüm kontrolleri yeniden çalıştır",
- "e31651a224": "Başarısız kontrolleri yeniden çalıştır",
"1b56e28faa": "Yeniden çalıştır",
"f4b1292569": "Bu kontroller için varsayılan AI ajanını başlat",
"9a1004fc76": "Kontrolleri yenile",
@@ -2621,7 +2620,6 @@
"662bc2998d": "Durum:",
"d8e82b7f15": "Kontrol ayrıntıları yükleniyor…",
"54cddd1858": "Tüm kontrolleri yeniden çalıştır",
- "68605516dd": "Başarısız kontrolleri yeniden çalıştır",
"522d9353e1": "Yeniden çalıştır",
"0fa8b8faec": "Bu kontroller için varsayılan AI ajanını başlat",
"5d0f42766d": "Kontrolleri yenile",
diff --git a/src/renderer/src/i18n/locales/zh-Hant.json b/src/renderer/src/i18n/locales/zh-Hant.json
index da3d9b9408a..20fe79dc7ea 100644
--- a/src/renderer/src/i18n/locales/zh-Hant.json
+++ b/src/renderer/src/i18n/locales/zh-Hant.json
@@ -2088,7 +2088,6 @@
"9c3ba11a05": "狀態：",
"934d87ab96": "正在載入檢查詳細資訊...",
"71c11aff84": "重新執行所有檢查",
- "e31651a224": "重新執行失敗的檢查",
"1b56e28faa": "重新執行",
"f4b1292569": "啟動預設的 AI 代理程式處理這些檢查",
"9a1004fc76": "重新整理檢查",
@@ -2589,7 +2588,6 @@
"662bc2998d": "狀態：",
"d8e82b7f15": "正在載入檢查詳細資訊...",
"54cddd1858": "重新執行所有檢查",
- "68605516dd": "重新執行失敗的檢查",
"522d9353e1": "重新執行",
"0fa8b8faec": "啟動預設的 AI 代理程式來處理這些檢查",
"5d0f42766d": "重新整理檢查",
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index cc5ce69bc07..12ff754c073 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -1679,7 +1679,6 @@
"9c3ba11a05": "状态：",
"934d87ab96": "正在加载检查详细信息...",
"71c11aff84": "重新运行所有检查",
- "e31651a224": "重新运行失败的检查",
"1b56e28faa": "重新运行",
"f4b1292569": "在这些检查中启动默认的 AI 智能体",
"9a1004fc76": "刷新检查",
@@ -2176,7 +2175,6 @@
"662bc2998d": "状态：",
"d8e82b7f15": "正在加载检查详细信息...",
"54cddd1858": "重新运行所有检查",
- "68605516dd": "重新运行失败的检查",
"522d9353e1": "重新运行",
"0fa8b8faec": "在这些检查中启动默认的 AI 智能体",
"5d0f42766d": "刷新检查",
diff --git a/src/renderer/src/store/github/check-actions.ts b/src/renderer/src/store/github/check-actions.ts
index f3c0bffbf96..bc716078b4b 100644
--- a/src/renderer/src/store/github/check-actions.ts
+++ b/src/renderer/src/store/github/check-actions.ts
@@ -217,11 +217,7 @@ export const createCheckActions = (
repo?.executionHostId,
repo !== undefined
)
- if (prStatusUpdate?.prCache) {
- nextState.prCache = prStatusUpdate.prCache
- }
-
- return nextState
+ return { ...nextState, ...prStatusUpdate }
})
return checks
})().finally(() => {
diff --git a/src/renderer/src/store/github/pr-check-status-cache.ts b/src/renderer/src/store/github/pr-check-status-cache.ts
index 0f1289aeb01..3063ac9e644 100644
--- a/src/renderer/src/store/github/pr-check-status-cache.ts
+++ b/src/renderer/src/store/github/pr-check-status-cache.ts
@@ -76,7 +76,8 @@ export function applyCachedChecksStatus(
checksEntry.headSha === pr.headSha &&
fetchedAt - checksEntry.fetchedAt < getPRChecksCacheTtl(checksEntry)
) {
- return { ...pr, checksStatus: deriveCheckStatusFromChecks(checksEntry.data) }
+ const checksStatus = deriveCheckStatusFromChecks(checksEntry.data)
+ return checksStatus === pr.checksStatus ? pr : { ...pr, checksStatus, checksSummary: undefined }
}
return pr
}
diff --git a/src/renderer/src/store/github/pr-result-cache.ts b/src/renderer/src/store/github/pr-result-cache.ts
index a543e7b9b8d..427247635ac 100644
--- a/src/renderer/src/store/github/pr-result-cache.ts
+++ b/src/renderer/src/store/github/pr-result-cache.ts
@@ -166,6 +166,10 @@ export function applyGitHubPRResultToCaches(
current?.fetchedAt === args.fetchedAt &&
(current.data?.number ?? null) === prNumber &&
current.data?.url === args.pr?.url &&
+ current.data?.checksStatus === args.pr?.checksStatus &&
+ JSON.stringify(current.data?.checksSummary) === JSON.stringify(args.pr?.checksSummary) &&
+ JSON.stringify(hostedReviewEntry?.data?.checksSummary) ===
+ JSON.stringify(args.pr?.checksSummary) &&
hostedReviewEntry?.data?.url === args.pr?.url &&
(hostedReviewEntry?.data?.provider === 'github' ? hostedReviewEntry.data.number : null) ===
prNumber
diff --git a/src/renderer/src/store/slices/github-checks.ts b/src/renderer/src/store/slices/github-checks.ts
index 3e4c4b22bda..58d5fd556eb 100644
--- a/src/renderer/src/store/slices/github-checks.ts
+++ b/src/renderer/src/store/slices/github-checks.ts
@@ -1,3 +1,4 @@
+import { getHostedReviewCacheKey } from './hosted-review-cache-identity'
import type { AppState } from '../types'
import type { PRCheckDetail } from '../../../../shared/github/check-types'
import type { GitHubOwnerRepo } from '../../../../shared/github/pull-request-types'
@@ -54,18 +55,45 @@ export function syncPRChecksStatus(
}
const nextStatus = deriveCheckStatusFromChecks(checks)
+ // Detail pages are partial; retain the complete same-head summary until the next PR lookup.
if (prEntry.data.checksStatus === nextStatus) {
return null
}
+ const hostedKey = getHostedReviewCacheKey(
+ repoPath,
+ normalized,
+ settings,
+ repoId,
+ connectionId,
+ executionHostId,
+ hasRepoOwner
+ )
+ const hostedEntry = state.hostedReviewCache?.[hostedKey]
+ const hosted = hostedEntry?.data
return {
+ ...(hosted?.provider === 'github' &&
+ hosted.number === prEntry.data.number &&
+ hosted.headSha === prEntry.data.headSha &&
+ samePRRepo(hosted.githubRepository, prEntry.data.prRepo)
+ ? {
+ hostedReviewCache: {
+ ...state.hostedReviewCache,
+ [hostedKey]: {
+ ...hostedEntry,
+ data: { ...hosted, status: nextStatus, checksSummary: undefined }
+ }
+ }
+ }
+ : {}),
prCache: {
...state.prCache,
[prCacheKey]: {
...prEntry,
data: {
...prEntry.data,
- checksStatus: nextStatus
+ checksStatus: nextStatus,
+ checksSummary: undefined
}
}
}
diff --git a/src/renderer/src/store/slices/github-pr-branch-hosted-review-cache.test.ts b/src/renderer/src/store/slices/github-pr-branch-hosted-review-cache.test.ts
index 71c250059e9..cc8c14a777f 100644
--- a/src/renderer/src/store/slices/github-pr-branch-hosted-review-cache.test.ts
+++ b/src/renderer/src/store/slices/github-pr-branch-hosted-review-cache.test.ts
@@ -1,3 +1,9 @@
+// @vitest-environment happy-dom
+import { createElement } from 'react'
+import { act, render, cleanup } from '@testing-library/react'
+import { TooltipProvider } from '@/components/ui/tooltip'
+import { ReviewChecksIndicator } from '@/components/sidebar/WorktreeCardMetadataStatusBadges'
+import { summarizeProviderChecks } from '../../../../shared/provider-check-summary'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { prChecksCacheSuffix } from '../github/cache-identity'
import { _clearGitHubPRRefreshStartedEntriesForTest } from '../github/request-coordination'
@@ -23,6 +29,7 @@ describe('createGitHubSlice.fetchPRForBranch', () => {
})
afterEach(() => {
+ cleanup()
_clearGitHubPRRefreshStartedEntriesForTest()
vi.useRealTimers()
})
@@ -347,3 +354,98 @@ describe('createGitHubSlice.fetchPRForBranch', () => {
})
})
})
+
+it('updates the mounted indicator on complete same-head failure → cancellation → failure and clears absent metadata', async () => {
+ const store = createTestStore()
+ const branch = 'feature/cancellation'
+ const cacheKey = `repo-1::${branch}`
+ const hostedKey = getHostedReviewCacheKey('/repo', branch, null, 'repo-1')
+ const headSha = 'same-head'
+ const checks = Array.from({ length: 100 }, () => ({
+ name: 'old run',
+ status: 'completed' as const,
+ conclusion: 'cancelled' as const,
+ url: null
+ }))
+ const complete = [
+ ...checks,
+ {
+ name: 'real failure',
+ status: 'completed' as const,
+ conclusion: 'failure' as const,
+ url: null
+ }
+ ]
+ let sequence = 0
+ function refresh(checksSummary = summarizeProviderChecks(complete)) {
+ sequence += 1
+ store.getState().applyGitHubPRRefreshEvent({
+ sequence,
+ reason: 'visible',
+ aliases: [{ cacheKey, repoId: 'repo-1', repoPath: '/repo', branch }],
+ requestStartedAt: sequence * 100,
+ outcome: {
+ kind: 'found',
+ fetchedAt: sequence * 100 + 1,
+ pr: makePR({ checksStatus: 'failure', headSha, checksSummary })
+ }
+ })
+ }
+ function Indicator() {
+ const review = store((state) => state.hostedReviewCache[hostedKey]?.data)
+ return createElement(ReviewChecksIndicator, {
+ status: review?.status,
+ checksSummary: review?.checksSummary
+ })
+ }
+ const view = render(createElement(TooltipProvider, null, createElement(Indicator)))
+ act(() => refresh())
+ expect(view.getByLabelText('Checks: Failing').className).toContain('rose')
+ // Opening details returns only page one; its cancellation-only rows cannot erase entry 101.
+ mockApi.gh.prChecks.mockResolvedValue(checks)
+ await act(async () => {
+ await store
+ .getState()
+ .fetchPRChecks('/repo', 12, branch, headSha, undefined, { repoId: 'repo-1' })
+ })
+ expect(store.getState().prCache[cacheKey]?.data?.checksSummary?.total).toBe(101)
+ expect(view.getByLabelText('Checks: Failing').className).toContain('rose')
+ act(() => refresh(summarizeProviderChecks([...checks, checks[0]])))
+ expect(view.getByLabelText('Checks: Cancelled').className).toContain('muted')
+ act(() => refresh())
+ expect(view.getByLabelText('Checks: Failing').className).toContain('rose')
+ act(() => {
+ sequence += 1
+ store.getState().applyGitHubPRRefreshEvent({
+ sequence,
+ reason: 'visible',
+ aliases: [{ cacheKey, repoId: 'repo-1', repoPath: '/repo', branch }],
+ requestStartedAt: sequence * 100,
+ outcome: {
+ kind: 'found',
+ fetchedAt: sequence * 100 + 1,
+ pr: makePR({ checksStatus: 'failure', headSha })
+ }
+ })
+ })
+ expect(store.getState().prCache[cacheKey]?.data?.checksSummary).toBeUndefined()
+ expect(store.getState().hostedReviewCache[hostedKey]?.data?.checksSummary).toBeUndefined()
+ expect(view.getByLabelText('Checks: Failing').className).toContain('rose')
+
+ act(() => refresh(summarizeProviderChecks(checks)))
+ expect(view.getByLabelText('Checks: Cancelled').className).toContain('muted')
+ mockApi.gh.prChecks.mockResolvedValue([
+ { name: 'new run', status: 'queued', conclusion: null, url: null }
+ ])
+ await act(async () => {
+ await store.getState().fetchPRChecks('/repo', 12, branch, headSha, undefined, {
+ repoId: 'repo-1',
+ force: true
+ })
+ })
+ expect(store.getState().prCache[cacheKey]?.data).toMatchObject({ checksStatus: 'pending' })
+ expect(store.getState().prCache[cacheKey]?.data?.checksSummary).toBeUndefined()
+ expect(store.getState().hostedReviewCache[hostedKey]?.data).toMatchObject({ status: 'pending' })
+ expect(store.getState().hostedReviewCache[hostedKey]?.data?.checksSummary).toBeUndefined()
+ expect(view.getByLabelText('Checks: Pending')).toBeDefined()
+})
diff --git a/src/renderer/src/store/slices/github-slice-test-harness.ts b/src/renderer/src/store/slices/github-slice-test-harness.ts
index 67642e21929..8901ae7d3e9 100644
--- a/src/renderer/src/store/slices/github-slice-test-harness.ts
+++ b/src/renderer/src/store/slices/github-slice-test-harness.ts
@@ -84,8 +84,7 @@ export const mockApi = {
}
}
-// @ts-expect-error test window mock
-globalThis.window = { api: mockApi }
+globalThis.window = Object.assign(globalThis.window ?? {}, { api: mockApi })
export function resetRemoteRuntimeMocks() {
clearRuntimeCompatibilityCacheForTests()
diff --git a/src/shared/github/pull-request-merge-state.ts b/src/shared/github/pull-request-merge-state.ts
index 23c90c85440..3f973c5f911 100644
--- a/src/shared/github/pull-request-merge-state.ts
+++ b/src/shared/github/pull-request-merge-state.ts
@@ -1,3 +1,4 @@
+import { getProviderChecksOutcome } from '../provider-check-summary'
import type { CheckStatus, ProviderCheckSummary } from './pull-request-types'
import {
canShowGitHubPRAutoMergeControl,
@@ -41,7 +42,10 @@ export type GitHubPRMergeStateDecision = {
function checksState(item: GitHubPRMergeStateInput): CheckStatus | 'none' | undefined {
if (item.checksSummary) {
- return item.checksSummary.state
+ const outcome = item.checksStatus
+ ? getProviderChecksOutcome(item.checksSummary, item.checksStatus)
+ : getProviderChecksOutcome(item.checksSummary)
+ return outcome === 'cancelled' ? 'failure' : outcome
}
return item.checksStatus
}
diff --git a/src/shared/github/pull-request-types.ts b/src/shared/github/pull-request-types.ts
index 49b647c15ba..ac0dea42d95 100644
--- a/src/shared/github/pull-request-types.ts
+++ b/src/shared/github/pull-request-types.ts
@@ -53,6 +53,7 @@ export type PRInfo = {
state: PRState
url: string
checksStatus: CheckStatus
+ checksSummary?: ProviderCheckSummary
updatedAt: string
mergeable: PRMergeableState
reviewDecision?: PRReviewDecision | null
@@ -105,6 +106,8 @@ export type ProviderCheckSummary = {
total: number
passed: number
failed: number
+ /** Subset of failed; absent when cancellation detail is unavailable. */
+ cancelled?: number
pending: number
neutral: number
/** 'pipeline' when the state is a GitLab pipeline's own verdict, so its counts are not check counts. */
diff --git a/src/shared/hosted-review-github.ts b/src/shared/hosted-review-github.ts
index 26d866d5c09..fc7b348dd53 100644
--- a/src/shared/hosted-review-github.ts
+++ b/src/shared/hosted-review-github.ts
@@ -9,6 +9,7 @@ export function hostedReviewInfoFromGitHubPRInfo(pr: PRInfo): HostedReviewInfo {
state: pr.state,
url: pr.url,
status: pr.checksStatus,
+ ...(pr.checksSummary ? { checksSummary: pr.checksSummary } : {}),
updatedAt: pr.updatedAt,
mergeable: pr.mergeable,
...(pr.reviewDecision !== undefined ? { reviewDecision: pr.reviewDecision } : {}),
diff --git a/src/shared/hosted-review.ts b/src/shared/hosted-review.ts
index b2b632f157f..4372975e28c 100644
--- a/src/shared/hosted-review.ts
+++ b/src/shared/hosted-review.ts
@@ -4,7 +4,8 @@ import type {
GitHubRepositoryIdentity,
PRConflictSummary,
PRMergeableState,
- PRReviewDecision
+ PRReviewDecision,
+ ProviderCheckSummary
} from './github/pull-request-types'
export type HostedReviewProvider =
@@ -34,6 +35,7 @@ export type HostedReviewInfo = {
state: HostedReviewState
url: string
status: CheckStatus
+ checksSummary?: ProviderCheckSummary
updatedAt: string
mergeable: PRMergeableState
reviewDecision?: PRReviewDecision | null
diff --git a/src/shared/pr-check-status.test.ts b/src/shared/pr-check-status.test.ts
index 50f5132b40e..8d60a5ac577 100644
--- a/src/shared/pr-check-status.test.ts
+++ b/src/shared/pr-check-status.test.ts
@@ -1,5 +1,10 @@
import { describe, expect, it } from 'vitest'
-import { derivePRCheckStatus, derivePRCheckStatusFromRollup } from './pr-check-status'
+import {
+ derivePRCheckStatus,
+ derivePRCheckStatusFromRollup,
+ summarizePRCheckRollup
+} from './pr-check-status'
+import { getProviderChecksOutcome } from './provider-check-summary'
import type { PRCheckDetail } from './github/check-types'
const check = (
@@ -38,3 +43,33 @@ describe('provider-neutral check status', () => {
expect(derivePRCheckStatusFromRollup([{ status: 'COMPLETED', conclusion }])).toBe('failure')
})
})
+
+it.each([
+ [['CANCELLED'], 'cancelled'],
+ [['SUCCESS', 'CANCELLED'], 'cancelled'],
+ [['CANCELLED', 'PENDING'], 'pending'],
+ [['CANCELLED', 'FAILURE', 'PENDING'], 'failure']
+] as const)('preserves legacy counts while presenting %j as %s', (conclusions, outcome) => {
+ const raw = conclusions.map((conclusion) => ({ status: 'COMPLETED', conclusion }))
+ const summary = summarizePRCheckRollup(raw)
+ expect(summary.state).toBe('failure')
+ expect(summary.cancelled).toBe(1)
+ expect(summary.total).toBe(summary.passed + summary.failed + summary.pending + summary.neutral)
+ expect(getProviderChecksOutcome(summary)).toBe(outcome)
+ expect(getProviderChecksOutcome({ ...summary, cancelled: undefined })).toBe('failure')
+ expect(getProviderChecksOutcome({ ...summary, cancelled: summary.failed + 1 })).toBe('failure')
+ expect(getProviderChecksOutcome({ ...summary, total: 999 })).toBe('failure')
+})
+
+it('does not downgrade a coarse failure from contradictory cancellation metadata', () => {
+ const summary = {
+ state: 'failure' as const,
+ total: 1,
+ passed: 0,
+ failed: 0,
+ pending: 1,
+ neutral: 0,
+ cancelled: 0
+ }
+ expect(getProviderChecksOutcome(summary, 'failure')).toBe('failure')
+})
diff --git a/src/shared/pr-check-status.ts b/src/shared/pr-check-status.ts
index be9847bb6ac..b5e4a1f04dc 100644
--- a/src/shared/pr-check-status.ts
+++ b/src/shared/pr-check-status.ts
@@ -1,6 +1,6 @@
import { summarizeProviderChecks } from './provider-check-summary'
import type { PRCheckDetail } from './github/check-types'
-import type { CheckStatus } from './github/pull-request-types'
+import type { CheckStatus, ProviderCheckSummary } from './github/pull-request-types'
export function derivePRCheckStatus(checks: readonly PRCheckDetail[]): CheckStatus {
const { state } = summarizeProviderChecks(checks)
@@ -40,13 +40,18 @@ function normalizeRollupCheck(raw: RawCheckRollup, index: number): PRCheckDetail
}
}
-export function derivePRCheckStatusFromRollup(rollup: unknown): CheckStatus {
+export function summarizePRCheckRollup(rollup: unknown): ProviderCheckSummary {
if (!Array.isArray(rollup) || rollup.length === 0) {
- return 'neutral'
+ return summarizeProviderChecks([])
}
- return derivePRCheckStatus(
+ return summarizeProviderChecks(
rollup.map((raw, index) =>
normalizeRollupCheck(raw && typeof raw === 'object' ? (raw as RawCheckRollup) : {}, index)
)
)
}
+
+export function derivePRCheckStatusFromRollup(rollup: unknown): CheckStatus {
+ const { state } = summarizePRCheckRollup(rollup)
+ return state === 'none' ? 'neutral' : state
+}
diff --git a/src/shared/provider-check-summary.ts b/src/shared/provider-check-summary.ts
index 44f6439e6b5..e54e8ff31f3 100644
--- a/src/shared/provider-check-summary.ts
+++ b/src/shared/provider-check-summary.ts
@@ -1,4 +1,4 @@
-import type { ProviderCheckSummary } from './github/pull-request-types'
+import type { CheckStatus, ProviderCheckSummary } from './github/pull-request-types'
export type CheckOutcome = 'passed' | 'failed' | 'pending' | 'neutral'
@@ -55,6 +55,7 @@ export function summarizeProviderChecks(
): ProviderCheckSummary {
let passed = 0
let failed = 0
+ let cancelled = 0
let pending = 0
let neutral = 0
for (const check of checks) {
@@ -63,6 +64,9 @@ export function summarizeProviderChecks(
passed += 1
} else if (outcome === 'failed') {
failed += 1
+ if (check.conclusion?.toLowerCase() === 'cancelled') {
+ cancelled += 1
+ }
} else if (outcome === 'pending') {
pending += 1
} else {
@@ -75,11 +79,88 @@ export function summarizeProviderChecks(
total,
passed,
failed,
+ cancelled,
pending,
neutral
}
}
+export type CheckPresentationOutcome = ProviderCheckSummary['state'] | 'cancelled' | 'unknown'
+
+type PresentationSummary = Omit & {
+ state: CheckPresentationOutcome
+ unknown?: number
+}
+
+/** Only a complete, consistent breakdown can subtract cancellations from legacy failures. */
+export function getCancelledCheckCount(summary: PresentationSummary): number | undefined {
+ const counts = [
+ summary.total,
+ summary.passed,
+ summary.failed,
+ summary.pending,
+ summary.neutral,
+ summary.cancelled
+ ]
+ if (
+ !counts.every(
+ (count) => typeof count === 'number' && Number.isSafeInteger(count) && count >= 0
+ ) ||
+ summary.total !==
+ summary.passed +
+ summary.failed +
+ summary.pending +
+ summary.neutral +
+ (summary.unknown ?? 0) ||
+ (summary.state === 'failure' && summary.failed === 0) ||
+ (summary.cancelled ?? Infinity) > summary.failed ||
+ summary.scope !== undefined
+ ) {
+ return undefined
+ }
+ return summary.cancelled
+}
+
+export function getProviderChecksOutcome(
+ summary: ProviderCheckSummary
+): ProviderCheckSummary['state'] | 'cancelled'
+export function getProviderChecksOutcome(
+ summary: PresentationSummary | undefined,
+ fallback: CheckStatus
+): CheckStatus | 'cancelled'
+export function getProviderChecksOutcome(
+ summary: PresentationSummary | undefined,
+ fallback?: CheckStatus
+): CheckPresentationOutcome | undefined
+export function getProviderChecksOutcome(
+ summary: PresentationSummary | undefined,
+ fallback?: ProviderCheckSummary['state']
+): CheckPresentationOutcome | undefined {
+ const state = fallback ?? summary?.state
+ if (
+ !summary ||
+ (fallback !== undefined &&
+ summary.state !== fallback &&
+ !(summary.state === 'none' && fallback === 'neutral'))
+ ) {
+ return state
+ }
+ const cancelled = getCancelledCheckCount(summary)
+ if (cancelled === undefined || state === 'unknown') {
+ return state
+ }
+ if (summary.failed > cancelled) {
+ return 'failure'
+ }
+ if (summary.pending > 0) {
+ return 'pending'
+ }
+ if (cancelled > 0 && state === 'failure') {
+ return 'cancelled'
+ }
+ return state
+}
+
const PIPELINE_CHECKS_LABEL: Record = {
success: 'Pipeline passed',
failure: 'Pipeline failed',
@@ -99,12 +180,16 @@ export function getProviderChecksLabel(summary: ProviderCheckSummary | undefined
if (summary.total === 0) {
return 'No checks'
}
- if (summary.failed > 0) {
- return `${summary.failed} failing`
+ const outcome = getProviderChecksOutcome(summary)
+ if (outcome === 'failure') {
+ return `${summary.failed - (getCancelledCheckCount(summary) ?? 0)} failing`
}
- if (summary.pending > 0) {
+ if (outcome === 'pending') {
return `${summary.pending} pending`
}
+ if (outcome === 'cancelled') {
+ return 'Cancelled'
+ }
return summary.state === 'neutral'
? 'Unresolved checks'
: `${summary.passed}/${summary.total} passed`
diff --git a/src/shared/runtime-worktree-contracts.ts b/src/shared/runtime-worktree-contracts.ts
index c2867c7a6c0..b61c6f3fdca 100644
--- a/src/shared/runtime-worktree-contracts.ts
+++ b/src/shared/runtime-worktree-contracts.ts
@@ -6,7 +6,7 @@ import type {
} from './agent-status/contracts/agent-status-types'
import type { AgentMainAgentStatus } from './agent-status/lifecycle/main-agent-status'
import type { ProgramStatusFacet } from './program-status/facet'
-import type { CheckStatus } from './github/pull-request-types'
+import type { CheckStatus, ProviderCheckSummary } from './github/pull-request-types'
import type { AgentChildWorkView } from './agent-status/child-work/agent-status-child-work-view'
import type { AgentSubagentSnapshot } from './agent-status/contracts/agent-status-subagent-snapshot'
import type { RuntimeTerminalInteractiveWait } from './runtime-terminal-contracts'
@@ -101,6 +101,7 @@ export type RuntimeWorktreePsSummary = {
title?: string
url?: string
checksStatus?: CheckStatus
+ checksSummary?: ProviderCheckSummary
} | null
linkedLinearIssue: string | null
linkedGitLabMR: number | null
diff --git a/src/shared/workspace-review-checks.test.ts b/src/shared/workspace-review-checks.test.ts
index 5cfd3d5900a..bb33c67f1b0 100644
--- a/src/shared/workspace-review-checks.test.ts
+++ b/src/shared/workspace-review-checks.test.ts
@@ -1,3 +1,4 @@
+import { getProviderChecksOutcome, summarizeProviderChecks } from './provider-check-summary'
import { describe, expect, it } from 'vitest'
import type { WorkspaceAttachment } from './worktree/types'
import type { HostedReviewState } from './hosted-review'
@@ -162,3 +163,44 @@ describe('all workspace review checks', () => {
expect(summarizeWorkspaceReviewChecks([task], {})).toMatchObject({ state: 'none', total: 0 })
})
})
+
+it('counts nested cancelled and pending review outcomes once per review', () => {
+ const first = attachment(1)
+ const second = attachment(2)
+ const summaryFor = (...conclusions: string[]) =>
+ summarizeProviderChecks(conclusions.map((conclusion) => ({ status: 'completed', conclusion })))
+ const mixed = {
+ ...details(first, 'failure'),
+ review: {
+ ...details(first, 'failure').review!,
+ checksSummary: summaryFor('cancelled', 'pending')
+ }
+ }
+ const cancelled = {
+ ...details(second, 'failure'),
+ review: {
+ ...details(second, 'failure').review!,
+ checksSummary: summaryFor('cancelled', 'cancelled')
+ }
+ }
+ const alone = summarizeWorkspaceReviewChecks([first], map([[first, mixed]]))
+ expect(alone).toMatchObject({ total: 1, pending: 1, failed: 0, cancelled: 0 })
+ expect(getProviderChecksOutcome(alone)).toBe('pending')
+ const combined = summarizeWorkspaceReviewChecks(
+ [first, second],
+ map([
+ [first, mixed],
+ [second, cancelled]
+ ])
+ )
+ expect(combined).toMatchObject({ total: 2, failed: 1, cancelled: 1, pending: 1 })
+ expect(getProviderChecksOutcome(combined)).toBe('pending')
+ expect(
+ getProviderChecksOutcome(summarizeWorkspaceReviewChecks([second], map([[second, cancelled]])))
+ ).toBe('cancelled')
+ expect(
+ getProviderChecksOutcome(
+ summarizeWorkspaceReviewChecks([first, second], map([[second, cancelled]]))
+ )
+ ).not.toBe('success')
+})
diff --git a/src/shared/workspace-review-checks.ts b/src/shared/workspace-review-checks.ts
index 39fcfeedd7a..2b5baa63f7b 100644
--- a/src/shared/workspace-review-checks.ts
+++ b/src/shared/workspace-review-checks.ts
@@ -1,6 +1,6 @@
import type { CheckStatus, ProviderCheckSummary } from './github/pull-request-types'
import type { HostedReviewState } from './hosted-review'
-import { resolveProviderCheckState } from './provider-check-summary'
+import { resolveProviderCheckState, getProviderChecksOutcome } from './provider-check-summary'
import type { WorkspaceAttachment } from './worktree/types'
import {
getWorkspaceAttachmentKey,
@@ -16,6 +16,7 @@ export type WorkspaceReviewCheckDetails = {
url?: string
state?: HostedReviewState
status?: CheckStatus
+ checksSummary?: ProviderCheckSummary
}
}
@@ -40,6 +41,7 @@ export function summarizeWorkspaceReviewChecks(
stale: 0,
passed: 0,
failed: 0,
+ cancelled: 0,
pending: 0,
neutral: 0
}
@@ -64,11 +66,15 @@ export function summarizeWorkspaceReviewChecks(
continue
}
summary.known += 1
- if (review.status === 'failure') {
+ const outcome = getProviderChecksOutcome(review.checksSummary, review.status)
+ if (outcome === 'cancelled') {
summary.failed += 1
- } else if (review.status === 'pending') {
+ summary.cancelled = (summary.cancelled ?? 0) + 1
+ } else if (outcome === 'failure') {
+ summary.failed += 1
+ } else if (outcome === 'pending') {
summary.pending += 1
- } else if (review.status === 'success') {
+ } else if (outcome === 'success') {
summary.passed += 1
} else {
summary.neutral += 1
@@ -82,9 +88,10 @@ export function summarizeWorkspaceReviewChecks(
summary.reviewState = 'closed'
}
const state = resolveProviderCheckState(summary)
+ const outcome = getProviderChecksOutcome({ ...summary, state })
// Missing or stale reviews cannot certify the workspace green; known failures still count.
summary.state =
- state !== 'failure' && state !== 'pending' && (summary.unknown > 0 || summary.stale > 0)
+ outcome !== 'failure' && outcome !== 'pending' && (summary.unknown > 0 || summary.stale > 0)
? 'unknown'
: state
return summary