[Feat] Notify task threads when pull requests conflict - #1615
Merged
mrubens merged 3 commits intoAug 25, 2026
Conversation
Contributor
![roomote-community[bot]](https://avatars.githubusercontent.com/u/211522643?s=60&v=4){kind=small}
- Route conflict notifications to Teams and Telegram threads through the shared provider adapter (previously silently dropped but marked notified), reusing one route-to-post-input builder for both jobs and matching the active-installation filter on Slack lookups. - Tolerate partial GraphQL responses so one unresolvable PR number no longer aborts mergeability recording for the whole batch. - Make webhook-side queueing best-effort and run the push-path check concurrently, so a Redis/DB blip cannot drop the pre-existing push conflict check or PR open/reopen/synchronize handling. - Honor isRepoSkipped on both mergeability queue paths. - Queue a mergeability check on ready_for_review so conflicts accrued while a PR was a draft surface at the transition. - Carry a branch/PR scope in the job payload instead of frozen row ids, so opened webhooks that race the tracked-row insert still get checked. - Cap the dedup TTL at the job delay so pushes landing after promotion enqueue a fresh check instead of being silently deduplicated. - Share one conflict message builder across chat and Fast-parent paths, skip redundant base-ref writes, and drop the webhook-time list on the PR path.
mrubens
marked this pull request as ready for review
August 25, 2026 03:42
mrubens
requested review from
brunobergher,
daniel-lxs and
mrubens
as code owners
August 25, 2026 03:42
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changed
ready_for_review, so conflicts accrued while a PR was a draft surface at the transition). Queueing is best-effort and honors the repo skip list, so it can never fail the webhook's pre-existing handlers.UNKNOWNresults only once. Jobs carry a branch or PR scope and resolve the tracked rows at run time, so checks enqueued before the tracked row lands are still picked up.Why this change was made
Roomote-created pull requests can become unmergeable after either their base or head moves, but GitHub does not emit a dedicated conflict webhook. This adds a rate-limit-conscious webhook path without enabling the existing opt-in conflict resolver or scanning unrelated repository pull requests.
Impact
Originating chat threads (Slack, Teams, Telegram, Discord) now receive a linked merge-conflict notice when a Roomote-created open pull request transitions into a conflicting state, and Fast-parent conversations are informed directly. A later clean observation re-arms the notification, while durable claims prevent overlapping webhook jobs from double-posting.