Skip to content

Our agents can handle multiple patches for a single Jira #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 4, 2025
Merged

Our agents can handle multiple patches for a single Jira #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5ecf16
triage: backport now outputs a list of patch URLs
TomasTomecek Oct 24, 2025
45b4a2b
backporting accepts a list of patches
TomasTomecek Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ run-rebase-agent-standalone: run-rebase-agent-c10s-standalone
run-backport-agent-c9s-standalone:
$(COMPOSE_AGENTS) run --rm \
-e PACKAGE=$(PACKAGE) \
-e UPSTREAM_FIX=$(UPSTREAM_FIX) \
-e UPSTREAM_PATCHES=$(UPSTREAM_PATCHES) \
-e JIRA_ISSUE=$(JIRA_ISSUE) \
-e BRANCH=$(BRANCH) \
-e DRY_RUN=$(DRY_RUN) \
Expand All @@ -70,7 +70,7 @@ run-backport-agent-c9s-standalone:
run-backport-agent-c10s-standalone:
$(COMPOSE_AGENTS) run --rm \
-e PACKAGE=$(PACKAGE) \
-e UPSTREAM_FIX=$(UPSTREAM_FIX) \
-e UPSTREAM_PATCHES=$(UPSTREAM_PATCHES) \
-e JIRA_ISSUE=$(JIRA_ISSUE) \
-e BRANCH=$(BRANCH) \
-e DRY_RUN=$(DRY_RUN) \
Expand Down
4 changes: 3 additions & 1 deletion README-agents.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,14 @@ make trigger-pipeline JIRA_ISSUE=RHEL-12345
# Test specific agents standalone
make JIRA_ISSUE=RHEL-12345 run-triage-agent-standalone
make PACKAGE=httpd VERSION=2.4.62 JIRA_ISSUE=RHEL-12345 BRANCH=c10s run-rebase-agent-standalone
make PACKAGE=httpd UPSTREAM_FIX=https://github.com/... JIRA_ISSUE=RHEL-12345 BRANCH=c10s run-backport-agent-standalone
make PACKAGE=httpd UPSTREAM_PATCHES=https://github.com/... JIRA_ISSUE=RHEL-12345 BRANCH=c10s run-backport-agent-standalone
Copy link
Member

@nforro nforro Nov 4, 2025

Choose a reason for hiding this comment

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

The example should point out that the patches are supposed to be comma-delimited.


# Or with dry-run
DRY_RUN=true make JIRA_ISSUE=RHEL-12345 run-triage-agent-standalone
```

Use commas to delimit multiple patch/commit URLs in `UPSTREAM_PATCHES`.

**Monitoring:**
- Phoenix tracing: http://localhost:6006/
- Redis queue monitoring: http://localhost:8081/
Expand Down
71 changes: 44 additions & 27 deletions agents/backport_agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def get_instructions() -> str:
return """
You are an expert on backporting upstream patches to packages in RHEL ecosystem.

To backport upstream fix <UPSTREAM_FIX> to package <PACKAGE> in dist-git branch <DIST_GIT_BRANCH>, do the following:
To backport upstream patches <UPSTREAM_PATCHES> to package <PACKAGE> in dist-git branch <DIST_GIT_BRANCH>, do the following:

CRITICAL: Do NOT modify, delete, or touch any existing patches in the dist-git repository.
Only add new patches for the current backport. Existing patches are there for a reason
Expand All @@ -97,7 +97,7 @@ def get_instructions() -> str:
end the process with `success=True` and `status="Backport already applied"`.

2. Use the `git_prepare_package_sources` tool to prepare package sources in directory <UNPACKED_SOURCES>
for application of the upstream fix.
for application of the upstream patch.

3. Determine which backport approach to use:

Expand All @@ -108,7 +108,7 @@ def get_instructions() -> str:
- <UPSTREAM_REPO>: A temporary upstream repository clone (created in step 3c with -upstream suffix)

When to use this workflow:
- <UPSTREAM_FIX> is a commit or pull request URL
- <UPSTREAM_PATCHES> is a list of commit or pull request URLs
- This includes URLs with .patch suffix (e.g., https://github.com/.../commit/abc123.patch)
- If URL extraction fails, fall back to approach B

Expand Down Expand Up @@ -218,22 +218,26 @@ def get_instructions() -> str:

B. GIT AM WORKFLOW (Fallback approach):

Note: For this workflow, use the pre-downloaded patch file at {{local_clone}}/{{jira_issue}}.patch
Note: For this workflow, use the pre-downloaded patch files in the current working directory.
They are called `<JIRA_ISSUE>-<N>.patch` where <N> is a 0-based index. For example,
for a `RHEL-12345` Jira issue the first patch would be called `RHEL-12345-0.patch`.

3a. Backport the patch:
- Use the `git_patch_apply` tool with the patch file: {{local_clone}}/{{jira_issue}}.patch
Backport all patches individually using the steps 3a and 3b below.

3a. Backport one patch at a time using the following steps:
- Use the `git_patch_apply` tool with the patch file: <JIRA_ISSUE>-<N>.patch
- Resolve all conflicts and leave the repository in a dirty state. Delete all *.rej files.
- Use the `git_apply_finish` tool to finish the patch application.

3b. Once there are no more conflicts, use the `git_patch_create` tool with the patch file path
{{local_clone}}/{{jira_issue}}.patch to update the patch file.
<JIRA_ISSUE>-<N>.patch to update the patch file.

4. Update the spec file. Add a new `Patch` tag pointing to the <UPSTREAM_FIX> patch file.
4. Update the spec file. Add a new `Patch` tag for every patch in <UPSTREAM_PATCHES>.
Add the new `Patch` tag after all existing `Patch` tags and, if `Patch` tags are numbered,
make sure it has the highest number. Make sure the patch is applied in the "%prep" section
and the `-p` argument is correct. Add an upstream URL as a comment above
the `Patch:` tag - this URL references the related upstream commit or a pull/merge request.
Default to <UPSTREAM_FIX> if it is an URL.
Include every patch defined in <UPSTREAM_PATCHES> list.
IMPORTANT: Only ADD new patches. Do NOT modify existing Patch tags or their order.

5. Run `centpkg --name=<PACKAGE> --namespace=rpms --release=<DIST_GIT_BRANCH> prep` to see if the new patch
Expand Down Expand Up @@ -269,7 +273,10 @@ def get_prompt() -> str:
{{dist_git_branch}} dist-git branch has been checked out. You are working on Jira issue {{jira_issue}}
{{#cve_id}}(a.k.a. {{.}}){{/cve_id}}.
{{^build_error}}
Backport upstream fix {{upstream_fix}}.
Backport upstream patches:
{{#upstream_patches}}
- {{.}}
{{/upstream_patches}}
Unpacked upstream sources are in {{unpacked_sources}}.
{{/build_error}}
{{#build_error}}
Expand All @@ -289,7 +296,12 @@ def get_fix_build_error_prompt() -> str:
{{dist_git_branch}} dist-git branch has been checked out. You are working on Jira issue {{jira_issue}}
{{#cve_id}}(a.k.a. {{.}}){{/cve_id}}.

The backport of {{upstream_fix}} was initially successful using the cherry-pick workflow,
Upstream patches that were backported:
{{#upstream_patches}}
- {{.}}
{{/upstream_patches}}

The backport of upstream patches was initially successful using the cherry-pick workflow,
but the build failed with the following error:

{{build_error}}
Expand Down Expand Up @@ -492,7 +504,7 @@ async def main() -> None:
local_tool_options = {"working_directory": None}

class State(PackageUpdateState):
upstream_fix: str
upstream_patches: list[str]
cve_id: str | None
unpacked_sources: Path | None = Field(default=None)
backport_log: list[str] = Field(default=[])
Expand All @@ -502,7 +514,7 @@ class State(PackageUpdateState):
incremental_fix_attempts: int = Field(default=0) # Track how many times we tried incremental fix

async def run_workflow(
package, dist_git_branch, upstream_fix, jira_issue, cve_id, redis_conn=None
package, dist_git_branch, upstream_patches, jira_issue, cve_id, redis_conn=None
):
local_tool_options["working_directory"] = None

Expand Down Expand Up @@ -545,11 +557,14 @@ async def fork_and_prepare_dist_git(state):
state.unpacked_sources = get_unpacked_sources(state.local_clone, state.package)
timeout = aiohttp.ClientTimeout(total=30)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with session.get(state.upstream_fix) as response:
if response.status < 400:
(state.local_clone / f"{state.jira_issue}.patch").write_text(await response.text())
else:
raise ValueError(f"Failed to fetch upstream fix: {response.status}")
for idx, upstream_patch in enumerate(state.upstream_patches):
# should we guess the patch name with log agent?
patch_name = f"{state.jira_issue}-{idx}.patch"
async with session.get(upstream_patch) as response:
if response.status < 400:
(state.local_clone / patch_name).write_text(await response.text())
else:
raise ValueError(f"Failed to fetch upstream patch: {response.status}")
return "run_backport_agent"

async def run_backport_agent(state):
Expand All @@ -563,7 +578,7 @@ async def run_backport_agent(state):
dist_git_branch=state.dist_git_branch,
jira_issue=state.jira_issue,
cve_id=state.cve_id,
upstream_fix=state.upstream_fix,
upstream_patches=state.upstream_patches,
build_error=state.build_error,
),
),
Expand Down Expand Up @@ -624,7 +639,7 @@ async def fix_build_error(state):
dist_git_branch=state.dist_git_branch,
jira_issue=state.jira_issue,
cve_id=state.cve_id,
upstream_fix=state.upstream_fix,
upstream_patches=state.upstream_patches,
build_error=state.build_error,
),
),
Expand Down Expand Up @@ -774,21 +789,22 @@ async def run_log_agent(state):
log_output=log_output,
operation_type="backport",
package=state.package,
details=state.upstream_fix,
details=str(state.upstream_patches),
)
state.log_result = log_output

return "stage_changes"

async def commit_push_and_open_mr(state):
try:
formatted_patches = "\n".join(f" - {p}" for p in state.upstream_patches)
state.merge_request_url = await tasks.commit_push_and_open_mr(
local_clone=state.local_clone,
commit_message=(
f"{state.log_result.title}\n\n"
f"{state.log_result.description}\n\n"
+ (f"CVE: {state.cve_id}\n" if state.cve_id else "")
+ f"Upstream fix: {state.upstream_fix}\n"
+ "Upstream patches:\n" + formatted_patches + "\n"
+ f"Resolves: {state.jira_issue}\n\n"
f"This commit was backported {I_AM_JOTNAR}\n\n"
"Assisted-by: Jotnar\n"
Expand All @@ -801,7 +817,7 @@ async def commit_push_and_open_mr(state):
f"This merge request was created {I_AM_JOTNAR}\n"
f"{CAREFULLY_REVIEW_CHANGES}\n\n"
f"{state.log_result.description}\n\n"
f"Upstream patch: {state.upstream_fix}\n\n"
+ "Upstream patches:\n" + formatted_patches + "\n"
f"Resolves: {state.jira_issue}\n\n"
f"Backporting steps:\n\n{state.backport_log[-1]}"
),
Expand Down Expand Up @@ -849,7 +865,7 @@ async def comment_in_jira(state):
State(
package=package,
dist_git_branch=dist_git_branch,
upstream_fix=upstream_fix,
upstream_patches=upstream_patches,
jira_issue=jira_issue,
cve_id=cve_id,
),
Expand All @@ -859,14 +875,15 @@ async def comment_in_jira(state):
if (
(package := os.getenv("PACKAGE", None))
and (branch := os.getenv("BRANCH", None))
and (upstream_fix := os.getenv("UPSTREAM_FIX", None))
and (upstream_patches_raw := os.getenv("UPSTREAM_PATCHES", None))
and (jira_issue := os.getenv("JIRA_ISSUE", None))
):
upstream_patches = upstream_patches_raw.split(",")
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Nov 4, 2025

Choose a reason for hiding this comment

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

high

If the UPSTREAM_PATCHES environment variable is set to an empty string, upstream_patches_raw.split(',') will result in ['']. This will cause the agent to attempt to download from an empty URL, which will likely fail. You should filter out empty strings after splitting.

Suggested change
upstream_patches = upstream_patches_raw.split(",")
upstream_patches = [p.strip() for p in upstream_patches_raw.split(",") if p.strip()]

Copy link
Member Author

@TomasTomecek TomasTomecek Nov 4, 2025

Choose a reason for hiding this comment

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

it can't be empty mate

logger.info("Running in direct mode with environment variables")
state = await run_workflow(
package=package,
dist_git_branch=branch,
upstream_fix=upstream_fix,
upstream_patches=upstream_patches,
jira_issue=jira_issue,
cve_id=os.getenv("CVE_ID", None),
redis_conn=None,
Expand Down Expand Up @@ -928,7 +945,7 @@ async def retry(task, error):
state = await run_workflow(
package=backport_data.package,
dist_git_branch=dist_git_branch,
upstream_fix=backport_data.patch_url,
upstream_patches=backport_data.patch_urls,
jira_issue=backport_data.jira_issue,
cve_id=backport_data.cve_id,
redis_conn=redis,
Expand Down
3 changes: 2 additions & 1 deletion agents/tools/patch_validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class PatchValidatorInput(BaseModel):


class PatchValidatorResult(BaseModel):
url: str = Field(description="URL of the patch/commit")
is_accessible: bool = Field(description="Whether the URL is accessible and not an issue reference")
status_code: int | None = Field(description="HTTP status code")
content: str | None = Field(description="Content of the URL (truncated if too long)")
Expand Down Expand Up @@ -65,7 +66,6 @@ def _truncate_content(self, content: str, max_length: int = MAX_CONTENT_LENGTH)
async def _run(
self, tool_input: PatchValidatorInput, options: ToolRunOptions | None, context: RunContext
) -> PatchValidatorOutput:

url = tool_input.url.strip()

is_issue, reason = self._is_issue_reference(url)
Expand Down Expand Up @@ -103,6 +103,7 @@ async def _run(
reason = f"Not an issue reference but raised exception: {str(e)}"

result = PatchValidatorResult(
url=url,
is_accessible=is_accessible,
status_code=status_code,
content=content,
Expand Down
11 changes: 7 additions & 4 deletions common/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ class BackportInputSchema(BaseModel):
dist_git_branch: str = Field(description="Git branch in dist-git to be updated")
jira_issue: str = Field(description="Jira issue to reference as resolved")
cve_id: str | None = Field(default=None, description="CVE ID if the jira issue is a CVE")
upstream_fix: str = Field(description="URL to the upstream fix (commit URL or patch URL)")
upstream_patches: list[str] = Field(
description="List of URLs to upstream patches that were validated using the PatchValidator tool")
build_error: str | None = Field(description="Error encountered during package build")


Expand Down Expand Up @@ -131,7 +132,8 @@ class RebaseData(BaseModel):
class BackportData(BaseModel):
"""Data for backport resolution."""
package: str = Field(description="Package name")
patch_url: str = Field(description="URL to the source of the fix that was validated using PatchValidator tool")
patch_urls: list[str] = Field(
description="A list of URLs to the sources of the fixes that were validated using the PatchValidator tool")
Comment on lines +135 to +136
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Oct 24, 2025

Choose a reason for hiding this comment

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

critical

This change from a single patch_url to a list patch_urls is a significant breaking change. The rest of the codebase does not seem to be updated to handle this, which will likely cause runtime errors.

For example, agents/backport_agent.py still references backport_data.patch_url on line 536, which no longer exists. The run_workflow function in that file is designed to handle only a single upstream_fix string. This PR should probably include the necessary changes in the agents to handle multiple patches, or this change should be behind a feature flag to avoid breaking the main branch.

Additionally, to improve robustness, you should ensure that patch_urls is never an empty list. You can enforce this with Pydantic's validation by adding min_length=1 to the Field definition.

Suggested change
patch_urls: list[str] = Field(
description="A list of URLs to the sources of the fixes that were validated using the PatchValidator tool")
patch_urls: list[str] = Field(
min_length=1,
description="A list of URLs to the sources of the fixes that were validated using the PatchValidator tool")

Comment on lines +135 to +136
Copy link
Member

@nforro nforro Nov 4, 2025

Choose a reason for hiding this comment

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

upstream_patches is a list but it's not treated as one in the prompt template. I can see that a direct substitution renders as e.g. ['patch1', 'patch2'], which is probably fine for the models to read, so take this just as a FYI. The templating docs are here: https://mustache.github.io/mustache.5.html

Copy link
Member Author

@TomasTomecek TomasTomecek Nov 4, 2025

Choose a reason for hiding this comment

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

okay, I didn't know we are following some syntax 🤦

Copy link
Member Author

@TomasTomecek TomasTomecek Nov 4, 2025

Choose a reason for hiding this comment

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

I thought you meant the <> syntax in system prompt, not the prompt templating, now I understand

Copy link
Member Author

@TomasTomecek TomasTomecek Nov 4, 2025

Choose a reason for hiding this comment

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

I added the list syntax.

Copy link
Member

@nforro nforro Nov 4, 2025

Choose a reason for hiding this comment

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

I thought you meant the <> syntax in system prompt

No, that's just a way how to express variables/placeholders, it's not defined anywhere.

justification: str = Field(description="Clear explanation of why this patch fixes the issue, linking it to the root cause")
jira_issue: str = Field(description="Jira issue identifier")
cve_id: str | None = Field(description="CVE identifier", default=None)
Expand Down Expand Up @@ -188,9 +190,10 @@ def format_for_comment(self) -> str:
case BackportData():
fix_version_text = f"\n*Fix Version*: {self.data.fix_version}" if self.data.fix_version else ""

patch_urls_text = "\n".join([f"*Patch URL {i+1}*: {url}" for i, url in enumerate(self.data.patch_urls)])
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Oct 24, 2025

Choose a reason for hiding this comment

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

medium

For better readability in the generated Jira comment, it would be good to handle the case of a single patch URL differently. When there's only one URL, using *Patch URL*: ... is cleaner than *Patch URL 1*: .... When there are multiple URLs, the numbered list is great.

Suggested change
patch_urls_text = "\n".join([f"*Patch URL {i+1}*: {url}" for i, url in enumerate(self.data.patch_urls)])
patch_urls_text = f"*Patch URL*: {self.data.patch_urls[0]}" if len(self.data.patch_urls) == 1 else "\n".join(f"*Patch URL {i+1}*: {url}" for i, url in enumerate(self.data.patch_urls))

Copy link
Member

@nforro nforro Nov 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Unlike Gemini, I would rather suggest a formatted list:

*Patch URLs:*
  - https://example.com/patch1
  - https://example.com/patch2

(or whatever Jira supports).

return (
f"{resolution}"
f"*Patch URL*: {self.data.patch_url}\n"
f"{patch_urls_text}\n"
f"*Justification*: {self.data.justification}"
f"{fix_version_text}"
)
Expand Down Expand Up @@ -271,4 +274,4 @@ class CachedMRMetadata(BaseModel):
operation_type: str = Field(description="Type of operation (backport or rebase)")
title: str = Field(description="Merge request title")
package: str = Field(description="Package name")
details: str = Field(description="Operation-specific identifier (upstream_fix URL for backport, version for rebase)")
details: str = Field(description="Operation-specific identifier (list of upstream patch URLs for backport, version for rebase)")
4 changes: 2 additions & 2 deletions common/tests/unit/test_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
def test_backport_formatting():
data = BackportData(
package="readline",
patch_url="https://example.com/patch.patch",
patch_urls=["https://example.com/patch.patch"],
justification="Fixes the bug in bind.c",
jira_issue="RHEL-12345",
cve_id="CVE-2024-1234",
Expand All @@ -22,7 +22,7 @@ def test_backport_formatting():

assert result.format_for_comment() == (
"*Resolution*: backport\n"
"*Patch URL*: https://example.com/patch.patch\n"
"*Patch URL 1*: https://example.com/patch.patch\n"
"*Justification*: Fixes the bug in bind.c\n"
"*Fix Version*: rhel-10.0"
)
Expand Down
4 changes: 3 additions & 1 deletion jira_issue_fetcher/tests/unit/test_jira_issue_fetcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,9 @@ async def test_run_full_workflow_with_labeled_issues(fetcher, mock_redis_context
"jira_issue": "ISSUE-3",
"triage_result": {
"resolution": "backport",
"data": BackportData(jira_issue="ISSUE-3", package="test-package", patch_url="https://example.com/patch", justification="Security fix", cve_id="CVE-2023-1234").model_dump()
"data": BackportData(jira_issue="ISSUE-3", package="test-package",
patch_urls=["https://example.com/patch"], justification="Security fix",
cve_id="CVE-2023-1234").model_dump()
}
}
task_for_backport = Task(metadata=triage_state_for_backport).model_dump_json()
Expand Down