fix(label-pr-review-state): detect merge conflicts and label PRs with has-conflicts

[roomote]

What problem this solves

The label-pr-review-state workflow decides between awaiting-review and awaiting-author based solely on CI status and review state — it never checks whether the PR actually has merge conflicts with the base branch. As a result, a PR with unresolved conflicts but green CI and no pending change requests gets labeled awaiting-review, which is misleading: reviewers see a "ready for review" label on a PR that can't even be merged yet.

What changed

• Added has-conflicts to the set of reconciled state labels.
• Before evaluating CI/review state, the workflow now checks mergeable/mergeable_state on the PR. If GitHub reports the PR as dirty (i.e. real conflicts, not just an unresolved async check), it strips the other state labels and applies has-conflicts instead of proceeding to the CI/review checks.
• Since mergeable/mergeable_state are only present on the single-PR GET response (not on pulls.list), the schedule/workflow_dispatch path — which lists all open PRs — now does an extra per-PR pulls.get call to fetch a fresh value. The single-PR event path reuses the PR object it already fetched.
• mergeable === null / mergeable_state === 'unknown' (GitHub still computing the merge check) is treated as "not yet known" rather than as conflicting, so it falls through to the existing CI/review logic instead of flapping the label.

User impact

PRs with real merge conflicts now get a distinct has-conflicts label instead of awaiting-review, so reviewers and maintainers can tell from the PR list alone that a PR needs a rebase/merge before it's actually reviewable.

Summary by CodeRabbit

• Chores
  • Improved PR label handling by adding support for a new conflict state.
  • PRs with merge conflicts are now detected more reliably and marked accordingly.
  • When conflict status is unclear or still being calculated, the existing labels continue to remain unchanged until updated data is available.

[roomote]

2 issues outstanding. Action required. See task

• injectSyntheticToolResults appends synthetic tool_result blocks after existing user content, which can still violate Anthropic's required block ordering when text survives ahead of the synthetic pad.
• CI: e2e-mock failed with four Roo Code execute_command Tool timeouts.

[roomote]

Appending the synthetic tool_result blocks after target.content still leaves the next user message starting with text when the surviving user message has text but no result. Anthropic treats the tool_result blocks as needing to come before any text in that reply (see the prepend logic in validateAndFixToolResultIds), so the truncation shape this PR is fixing can still be rejected. Prepending the synthetic blocks here, or inserting them before the first non-tool_result block, would preserve the provider contract.

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

[edelauna]

@CodeRabbit review

[coderabbitai]

✅ Action performed

Review finished.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

[coderabbitai]

📝 Walkthrough

Walkthrough

The PR modifies the label-pr-review-state.yml GitHub workflow to add a has-conflicts label to the reconciled PR state label set, alongside a new step that re-fetches PR mergeable state, treats unknown states as non-conflicting, and labels dirty PRs as has-conflicts while skipping further reconciliation.

Changes

Merge Conflict Labeling

Layer / File(s)	Summary
Merge conflict detection and labeling .github/workflows/label-pr-review-state.yml	Expands the reconciled label set to include has-conflicts and adds a step to re-fetch PR mergeable status, treat unresolved states as non-conflicting, and apply has-conflicts label (skipping CI/review reconciliation) when a PR is confirmed dirty/unmergeable.

Estimated code review effort: 1 (Trivial) | ~5 minutes

Possibly related PRs

• Zoo-Code-Org/Zoo-Code#636: Both PRs modify the same label-pr-review-state.yml workflow's PR reconciliation logic.

Suggested reviewers: taltas, hannesrudolph, JamesRobert20, navedmerchant

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Description check	⚠️ Warning	The description explains the change well, but it misses required template sections like the linked issue and test procedure.	Add the required Related GitHub Issue and Test Procedure sections, plus the checklist and any other template fields the repo expects.

✅ Passed checks (4 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly matches the main change: detecting merge conflicts and adding the has-conflicts label.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch roomote/repro-190-zoocode-e2e

---

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

_{Comment @coderabbitai help to get the list of available commands.}

[coderabbitai]

🧹 Nitpick comments (1)

.github/workflows/label-pr-review-state.yml (1)

128-143: 🚀 Performance & Scalability | 🔵 Trivial

Conflict-detection logic is correct. Requiring both mergeable === false and mergeable_state === 'dirty' correctly avoids misclassifying blocked/unstable states (failing required checks) as merge conflicts, and treating null/unknown as not-yet-computed avoids false positives while mergeability is still being calculated by GitHub.

One thing worth being aware of operationally: for schedule/workflow_dispatch runs, every open PR now incurs an extra pulls.get call (line 136) since pulls.list doesn't return mergeable. On repos with a large number of open PRs, this adds to the already-sequential per-PR API calls (checks, reviews, etc.) and could bring the hourly run closer to secondary rate limits. Not a concern at typical PR volumes, but worth keeping in mind if the open-PR count grows significantly.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In @.github/workflows/label-pr-review-state.yml around lines 128 - 143, The
conflict-detection logic is fine; the only concern is that
`label-pr-review-state.yml` now does an extra `github.rest.pulls.get` for every
open PR in scheduled/`workflow_dispatch` runs, which can increase API pressure
when `processOpenPulls` iterates many PRs. Reduce the per-run call count in this
path by reusing already-fetched PR details where possible, or by only refreshing
mergeability when it is actually needed, and keep the
`prDetail`/`reconcileLabels` flow intact.

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Nitpick comments:
In @.github/workflows/label-pr-review-state.yml:
- Around line 128-143: The conflict-detection logic is fine; the only concern is
that `label-pr-review-state.yml` now does an extra `github.rest.pulls.get` for
every open PR in scheduled/`workflow_dispatch` runs, which can increase API
pressure when `processOpenPulls` iterates many PRs. Reduce the per-run call
count in this path by reusing already-fetched PR details where possible, or by
only refreshing mergeability when it is actually needed, and keep the
`prDetail`/`reconcileLabels` flow intact.

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: fdbac8fc-668b-4e7e-8813-3e9d7067b23c

📥 Commits

Reviewing files that changed from the base of the PR and between 7fa008c and 4d274f8.

📒 Files selected for processing (1)

• .github/workflows/label-pr-review-state.yml