[yordis]

Problem

The Watch Dog button read "All clear" on a pull request that GitHub reports as conflicting with its base, because the status only counted failed checks, unresolved threads, and change requests.

Change

resolveWatchDogStatus now takes mergeability and returns attention with a conflicting flag when the branch conflicts. The button turns red, the tooltip lists "merge conflicts", and the babysit prompt tells the agent to check for conflicts before it starts watching.

Scope and approval

Small fix of an obvious bug in the status the button shows. No new setting or workflow.

Verification

vp test run src/components/pullRequest/pullRequestDetail.logic.test.ts passes (86 tests), including a new case for a conflicting branch. Not checked in a running client.

[cursor]

PR Summary

Low Risk
Small pull-request UI and status-logic change with no auth, data, or merge execution paths touched.

Overview
The Watch Dog button no longer shows All clear when GitHub reports the branch conflicts with its base, even if CI is green and reviews look fine.

resolveWatchDogStatus now accepts mergeability and returns attention with a conflicting flag when it is conflicting. The detail panel passes detail.mergeability into that call. On attention, the button stays on the destructive outline variant and the tooltip can list merge conflicts alongside failed jobs, threads, and change requests.

The babysit handoff prompt’s first step now tells the agent to check whether the branch conflicts with its base before watching. Tests cover the conflicting case and expect conflicting: false on other attention scenarios.

^{Reviewed by Cursor Bugbot for commit 55e84db. Bugbot is set up for automated code reviews on this repo. Configure here.}

[coderabbitai]

No actionable comments were generated in the recent review.

Recent review info

Run configuration

• Source mode: Auto
• Repository: TrogonStack/t3code
• Branch: yordis/fix-web-watch-dog-conflicts
• File: .coderabbit.config.ts
• Commit: 55e84db
• Layers: Repository TS config
• Review profile: CHILL
• Plan: Advanced
• Run ID: 08203804-4d64-4e55-8bb0-1b4a5150305f

Commits

Reviewing files that changed from the base of the PR and between 80c9b47 and 55e84db.

Files selected for processing: 4

• apps/web/src/components/pullRequest/PullRequestDetailActions.tsx
• apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
• apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts
• apps/web/src/components/pullRequest/pullRequestDetail.logic.ts

Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.

Walkthrough

Watch Dog status resolution now treats merge conflicts as an attention condition. The pull request detail UI passes mergeability to the resolver and includes merge conflicts in the attention tooltip.

Changes: Watch Dog merge-conflict handling

Layer / File(s)	Summary
Resolve conflicts as an attention status apps/web/src/components/pullRequest/pullRequestDetail.logic.ts, apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts	resolveWatchDogStatus accepts mergeability and returns an attention status when it is conflicting. The attention status includes a conflicting flag. The prompt and tests include merge-conflict checks.
Pass and display conflict status apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx, apps/web/src/components/pullRequest/PullRequestDetailActions.tsx	The detail panel passes mergeability to the resolver. The attention tooltip includes “merge conflicts” when the status is conflicting.

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Bug fix

Possibly related PRs

• TrogonStack/t3code#177: Introduced the Watch Dog status resolver, tooltip, and prompt that this change extends.
• TrogonStack/t3code#195: Sets the attention button variant that applies when merge conflicts produce an attention status.
• TrogonStack/t3code#179: Updated Watch Dog instructions and workflow; this change also extends the agent prompt.

Suggested labels: size:S

Suggested reviewers: juliusmarminge

Merge Risk: Minimal · up to 55e84

No actionable merge-blocking issue is identified in the Watch Dog merge-conflict status changes. Merge after normal checks pass.

Pre-merge checks: 4

Check name	Status	Explanation
Title check		The title clearly and concisely describes the primary fix: Watch Dog now reports merge conflicts instead of showing all clear.
Description check		The description includes all required sections. It explains the problem, change, scope rationale, focused test result, and the limitation that the change was not tested in a running client. It does no…
Linked Issues check		Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check		Check skipped because no linked issues were found for this pull request.

Full details: Description check

Explanation

The description includes all required sections. It explains the problem, change, scope rationale, focused test result, and the limitation that the change was not tested in a running client. It does not include the template-requested before/after UI screenshots, but the description is otherwise complete and directly related to the change.

Finishing Touches

Generate docstrings

• Commit to this branch
• Create a new PR

Generate unit tests (beta)

• Commit to this branch
• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

• X
• Mastodon
• Reddit
• LinkedIn