Repository navigation
fix(changes): show merge conflicts on PR tabs - #8295
Conversation
UX Review (Fable 5) — ✅ PASSUX-level review of UX-Verdict: PASS Nothing to check. [UX-REVIEWED] e154306 |
Design Review (Fable 5) — ✅ PASSDesign-level review of Design-Verdict: PASS Precedence now lives as two hand-written copies (panel + sidebar chip) kept equal only by comments and tests — verify no third copy exists. Suggestions
[DESIGN-REVIEWED] e154306 |
Opus 4.8 Review — ✅ no blocking findingsReviewed Verdict parsed from the review's SHA-scoped output markers for commit False positive or not applicable? A repository writer can comment: |
GPT 5.6 Review — ✅ no blocking findingsGPT 5.6 completed its review of This comment is updated in place on each push. Review detailsNo findings. False positive or not applicable? A repository writer can comment: |
First Principles Review (Fable 5) — 🟡 CONCERNSPremise-level review of First-Principles-Verdict: CONCERNS The conflict-over-CI precedence now lives twice: Not justified as shipped
What this change shipsInventory (6 items) — 3 justifiedIntent: stop a conflicted pull request's compact tab from reading as healthy ("Checks passed") when the branch cannot merge — a FIX, with provenance in tests this PR adds that fail on base.
[FIRST-PRINCIPLES-REVIEWED] e154306 |
Open PR relationship auditThis is a consolidated, point-in-time code-level audit note. It compares complete merge-base diffs and current/merged code; it does not treat a shared topic as duplication or partial coverage as completion. Relationship findings
No PR, Issue, label, branch, or review state was changed by the relationship-note portion of this audit. |
2703c78 to
be0a8bb
Compare
|
@kyleseaman Thanks for this. We are keeping the PR open: the defect is real and still unfixed on What already landed: #3760 shipped exactly this precedence rule (failed CI outranks conflict, conflict outranks running or passed, both suppressed once the pull request is merged or closed, with What is still missing: on Two things before we can merge:
Optional, and worth considering: export Posted from the 2026-09-08 open-PR relationship audit (read-only, one auditor per PR); reply here if any of this is wrong. |
|
🤖 Kiro Crew [operator: NicholasRBowers#a942f9ca]: This PR has been inactive for 7+ days with failing CI. I've assessed the blockers and they appear resolvable — I'll push fixes directly to this branch as a co-author. Assessment: The full CI matrix, GPT, Opus, Design and UX are all green on the current head. The single blocker is the First Principles BLOCK on If you'd prefer I don't touch this PR, add the |
Replace misleading pending or passing CI glyphs with a conflict warning while preserving failed CI precedence. Cover selected and background tabs and update the deterministic screenshot harness. The capture harness resolves its browser through the shared chromium-executable helper used by sibling harnesses instead of a one-off environment variable. Original change by Kyle Seaman. Co-authored-by: Kiro Crew <noreply@kirodotdev.github.io>
be0a8bb to
e154306
Compare
|
🤖 Kiro Crew [operator: NicholasRBowers#a942f9ca]
|
|
🤖 Kiro Crew [operator: NicholasRBowers#a942f9ca]
|
|
🤖 Kiro Crew [operator: NicholasRBowers#a942f9ca]
|
|
🤖 Kiro Crew [operator: NicholasRBowers#a942f9ca] Drive-to-green update — pushed What changed and why:
Verification: |
chenmingwei23
left a comment
There was a problem hiding this comment.
Tier 1 auto-approve: fix (4 files). Criteria: no conflict, no requested changes, security path denylist clean, design-doc gate clean, SAST annotations clean, security checklist all-NO, AI reviewers green. Category: fix - render a merge-conflict glyph on PR source tabs so an unmergeable branch never reads as ready (frontend display precedence only, plus screenshot harness and unit tests).
iamwhatever
left a comment
There was a problem hiding this comment.
Tier 1 auto-approve: fix (4 files). Criteria: no conflict, no requested changes, security path denylist clean, design-doc gate clean, SAST annotations clean, security checklist all-NO, AI reviewers green. Category: PullRequestPanel now renders a TriangleAlert conflict glyph on a pull-request tab whose merge state is dirty instead of leaving the passing-CI check in place, with the screenshot harness retargeted to that case and a unit test added -- narrow render fix with a clear root cause, no data or API changes.
dwu96
left a comment
There was a problem hiding this comment.
Tier 1 auto-approve: fix (4 files). Criteria: no conflict, no requested changes, security path denylist clean, design-doc gate clean, SAST annotations clean, security checklist all-NO, AI reviewers green. Category: clear root cause in SourceTabState - it computed the tab glyph from status.ci alone, so a branch with a settled conflict but passing checks rendered a green check and read as ready; the fix layers a conflict glyph with failed-CI still winning, mirroring the precedence ChatSidebar.tsx::chipStatusGlyph already applies, and both directions are pinned by new tests.
Replace misleading pending or passing CI glyphs with a conflict warning while preserving failed CI precedence. Cover selected and background tabs and update the deterministic screenshot harness. The capture harness resolves its browser through the shared chromium-executable helper used by sibling harnesses instead of a one-off environment variable. Original change by Kyle Seaman. Co-authored-by: Kiro Crew <noreply@kirodotdev.github.io>
Problem / Motivation
A pull request with merge conflicts can still show the green Checks passed glyph in the Changes-panel source tab. The detail pane reports the conflict, but the compact tab incorrectly reads as healthy.
Why it matters
Users scanning several pull requests can miss that a branch is unmergeable and assume it is ready based on the tab status alone.
What changed (motivation → approach → change)
The source-tab status now uses explicit precedence: failed CI remains highest priority; otherwise, a settled merge conflict replaces pending or passing CI with a red Merge conflicts warning. Merged and closed pull requests suppress stale conflict state. The same logic applies to selected and background tabs.
The deterministic screenshot harness exercises conflict-plus-passing-CI and asserts that the conflicted tab suppresses Checks passed while a clean neighboring tab retains it. It resolves its browser through the shared
chromium-executable.mjshelper the sibling capture scripts use.Tests
npx vitest run src/test/PullRequestPanel.test.tsx— 61 passednpm run typecheck— passednpm run lint -- --quiet— passednpm run lint:i18n— passedscripts/local-gate.py): 36,379 passed; 83 environment failures on the local runner that reproduce identically on pristine main, none in changed paths.Manual verification
Ran the real-SPA screenshot harness against conflict-plus-passing-CI and clean-plus-passing-CI tabs. Its DOM assertions verified the conflicted tab exposes Merge conflicts, omits Checks passed, and leaves the clean tab unchanged.
Screenshots / video
Related Issues
no linked issue: reported directly from the Changes panel.
Pattern harvest
Rule candidate: review-prompt
Pattern: Compact status summaries must define explicit precedence when independent health signals can disagree.
Checklist
feat|fix|docs|refactor|perf|test|chore|ci|build|revert: ...)