Skip to content

Conversation

@m-blaha
Copy link
Member

@m-blaha m-blaha commented Oct 16, 2025

Add instructions to the prompt to check merge status in case the proposed fix comes from a pull request. Fixes from PRs that has not yet been merged will not be used for backporting.

Resolves: https://github.com/packit/jotnar/issues/229

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request adds an important validation step to the triage agent's prompt, preventing it from using fixes from unmerged pull requests. The change is well-implemented by adding a new instruction section and updating the subsequent step numbering. I've added one suggestion to improve the clarity and conciseness of the new instructions for the language model, which should lead to more reliable behavior.

Add instructions to the prompt to check merge status in case the
proposed fix comes from a pull request. Fixes from PRs that has not yet
been merged will not be used for backporting.

Signed-off-by: Marek Blaha <[email protected]>
Co-authored-by: gemini-code-assist[bot]
Copy link
Member

@lbarcziova lbarcziova left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks good to me, thanks!

Since we recently discussed few times the possibility of using an unmerged fix (although in the end we avoided going this way), I'm wondering if we still might need a way how to bypass this verification step, curious what do others think. Maybe forcing the fix by attaching it directly to Jira? Which also leads me to the question, how does the new instruction 2.3 behave if the patch is coming from Jira attachment? Should we explicitly mention not to do the check for that case?

@TomasKorbar
Copy link
Collaborator

Could we perhaps add pull request validator tool to check the pull request? There could be parameter to allow unmerged pull requests set by default to False and we would add jira label like unmerged_allowed to switch the parameter to True.

@m-blaha
Copy link
Member Author

m-blaha commented Nov 20, 2025

@TomasKorbar That's a great idea - there even is an issue for something similar: https://github.com/packit/jotnar/issues/154 .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants