[Fix] Label workflow strips has-conflicts when mergeability is unknown - #2028

​Created by Roomote. Follow up by mentioning @roomote, in the web UI, or in Discord.

Related GitHub Issue

Fixes #2025

Description

The "Label PR review state" workflow removed has-conflicts from PRs while GitHub had not yet computed mergeability. A conflicting PR gets no merge-ref CI run, so its required checks are missing. The workflow read this as "CI pending" and stripped every state label, including has-conflicts.

The fix stays inside the CI pending/failed branch of the reconcile script in .github/workflows/label-pr-review-state.yml:

• The branch now detects unknown mergeability (mergeable === null or mergeable_state === 'unknown').
• When mergeability is unknown and the PR already carries has-conflicts, the branch keeps that label and strips only the other state labels. The label is never added by this branch.
• When mergeability is known clean, the branch strips has-conflicts as before.
• When mergeability is known dirty, the earlier conflict check runs first and labels has-conflicts, unchanged.
• The log line notes when has-conflicts is kept, so run logs still explain the decision.

Reviewers should check that the preservation is scoped to the CI pending/failed branch only. The conflict path, the mergeability recheck before maintainer handoff, and the failure cleanup path are unchanged.

Test Procedure

The workflow script is executed by the existing harness in src/services/__tests__/pr-review-state-workflow.test.ts. Three new tests cover the issue cases:

1. Unknown mergeability with missing required CI: has-conflicts is kept, not re-added, and other state labels are stripped.
2. Known-clean mergeability with missing required CI: has-conflicts is stripped per the existing rules.
3. Known-dirty mergeability with missing required CI: the conflict path adds has-conflicts.

Run pnpm exec vitest run services/__tests__/pr-review-state-workflow.test.ts from src/. All 198 tests pass. Full pnpm test passes (10,438 tests). ESLint and tsc --noEmit pass on the changed files.

Pre-Submission Checklist

• Issue Linked: This PR is linked to an approved GitHub Issue (see "Related GitHub Issue" above).
• Scope: My changes are focused on the linked issue (one major feature/fix per PR).
• Self-Review: I reviewed my own code with care.
• Writing Style: The PR title and description use Simplified Technical English (ASD-STE100): short sentences, plain words, active voice, one idea per sentence, no contractions.
• Testing: New and/or updated tests have been added to cover my changes (if applicable).
• Visual Snapshot (UI changes only): If a user would notice this change at a glance (layout, theme tokens, brand elements, empty/error states), I added or updated a *.visual.tsx snapshot in webview-ui/. See webview-ui/AGENTS.md → "When a UI change needs a snapshot".
• Documentation Impact: I checked if my changes need documentation updates (see "Documentation Updates" section below).
• Contribution Guidelines: I read and agree to the Contributor Guidelines.

Documentation Updates

• No documentation updates are required. The change is internal workflow behavior; no user-facing documentation covers this label reconciliation logic.

Additional Notes

This is a pure bug fix with no UI surface; visual proof is not applicable. The strongest evidence is the workflow-script test harness, which executes the embedded github-script against deterministic API doubles.

Get in Touch

Available via the PR or the Roomote links above.