Problem
When cherry-pick conflicts are resolved by AI, the server:
- Posts a comment on the original PR about the AI resolution, but does NOT
@mention the cherry-pick PR owner (pr_author)
- Does NOT post any comment on the cherry-pick PR itself to notify the assignee
The current comment on the original PR (runner_handler.py lines 1758-1765):
**Cherry-pick conflicts were resolved by AI**
Cherry-picked PR {title} into {target_branch}: {cherry_pick_pr_url}
Conflicts were automatically resolved by AI ({ai_provider}/{ai_model}).
**Manual verification is required** — please review the changes and test before merging.
The auto-verify and auto-merge are already correctly skipped for AI-resolved cherry-picks (pull_request_handler.py), but the PR owner is not explicitly notified via @mention.
Proposed Fix
In webhook_server/libs/handlers/runner_handler.py, in the cherry_pick method, when cherry_pick_had_conflicts is True:
- Original PR comment: Add
@{pr_author} mention to the existing comment so the owner gets a GitHub notification
- Cherry-pick PR comment: Post a NEW comment on
cherry_pick_pr (not pull_request) mentioning @{pr_author} that this cherry-pick had conflicts resolved by AI and needs their review and verification
Files Affected
webhook_server/libs/handlers/runner_handler.py — cherry_pick method, lines ~1753-1770
- Tests for the new comment behavior
Done
Problem
When cherry-pick conflicts are resolved by AI, the server:
@mentionthe cherry-pick PR owner (pr_author)The current comment on the original PR (runner_handler.py lines 1758-1765):
The auto-verify and auto-merge are already correctly skipped for AI-resolved cherry-picks (pull_request_handler.py), but the PR owner is not explicitly notified via @mention.
Proposed Fix
In
webhook_server/libs/handlers/runner_handler.py, in thecherry_pickmethod, whencherry_pick_had_conflictsis True:@{pr_author}mention to the existing comment so the owner gets a GitHub notificationcherry_pick_pr(notpull_request) mentioning@{pr_author}that this cherry-pick had conflicts resolved by AI and needs their review and verificationFiles Affected
webhook_server/libs/handlers/runner_handler.py— cherry_pick method, lines ~1753-1770Done