ci: add /ai-resolve-conflicts slash command and dispatch workflow#82246
Draft
suisuixia42 wants to merge 1 commit into
Draft
ci: add /ai-resolve-conflicts slash command and dispatch workflow#82246suisuixia42 wants to merge 1 commit into
suisuixia42 wants to merge 1 commit into
Conversation
Register ai-resolve-conflicts and add the dispatch workflow that runs the resolver playbook, which re-triggers /ai-review on the resolved HEAD (HYD-63). Co-Authored-By: suisui.xia <suisui.xia@airbyte.io>
Contributor
🤖 Devin AI EngineerI'll be helping with this pull request! Here's what you should know: ✅ I will automatically:
Note: I can only respond to comments from users who have write access to this repository. ⚙️ Control Options:
|
Contributor
👋 Greetings, Airbyte Team Member!Here are some helpful tips and reminders for your convenience. 💡 Show Tips and TricksPR Slash CommandsAirbyte Maintainers (that's you!) can execute the following slash commands on your PR:
📚 Show Repo GuidanceHelpful Resources
|
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
|
|
||
| - name: Post start comment | ||
| if: inputs.comment-id != '' | ||
| uses: peter-evans/create-or-update-comment@v4 |
| > [View workflow run](${{ steps.job-vars.outputs.run-url }}) | ||
|
|
||
| - name: Run AI Resolve Conflicts | ||
| uses: aaronsteers/devin-action@main |
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
2 participants
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
Adds the
/ai-resolve-conflictsslash command that repairs ahyd-readyPR which has goneDIRTY(merge conflict withmaster) before it reaches/ai-ready— the airbyte-side half of HYD-63 (Resolve merge conflicts as part of ai-ready).Today
hydra-automerge.ymlnever checks mergeability: on a conflicted PR,gh pr merge --squashfails all 3 retries and the PR sits stuck (approved,hyd-ready, unmerged). This command lets hands-free (or a human) resolve the conflict earlier so the PR re-enters the normal review → ready → merge flow instead of jamming the merge gate.Pairs with the playbook + hands-free-hook PR: airbytehq/ai-skills#607.
How
.github/workflows/slash-commands.yml— registerai-resolve-conflictsin the dispatcher'scommands:list..github/workflows/ai-resolve-conflicts-command.yml(new) — a single-job dispatcher, mirroringai-prove-fix-command.yml: authenticate as the OCTAVIA GitHub App, require a PR context (comment +exit 1otherwise, likeai-ready-command.yml), post a start comment, and launch a Devin session withplaybook-macro: "!resolve_merge_conflicts"viaaaronsteers/devin-action@main.The re-review chain is intentionally handled inside the playbook, not here.
devin-actionis fire-and-forget (results come back via marker comments parsed by*-submit.ymlworkflows), so aneeds:/workflow_calljob could not gate on the resolver's outcome. Instead the resolver playbook, after a successful--force-with-leasepush, posts a/ai-reviewcomment as Airbyte Support Bot on the new HEAD — the same mechanismdaily_hands_free_triagealready uses. So this workflow only needs to dispatch the resolver.Review guide
.github/workflows/ai-resolve-conflicts-command.yml— new dispatch workflow (validated withactionlint, rc=0)..github/workflows/slash-commands.yml— one-line command registration.User Impact
New
/ai-resolve-conflictscommand available on PRs. No change to existing commands or the merge gate. The deferredhydra-automerge.ymlpre-merge safety guard (for the post-review race window and manual/ai-ready) is not in this PR — a planned fast follow-up.Can this PR be safely reverted and rolled back?
Link to Devin session: https://app.devin.ai/sessions/c51aecdc57fb426da8920ecfbfc59866
Requested by: suisuixia42