fix_build_error refactoring by opohorel · Pull Request #498 · packit/ai-workflows

opohorel · 2026-05-19T07:31:34Z

Summary

This PR improves the fix_build_error iterative workflow for the backport agent by adding persistent memory across fix iterations and slimming down the prompts.

Changes

Persistent memory for fix iterations:

Build logs (builder-live.log, root.log) are now preserved in <upstream-repo>/build-logs/attempt-N/ directories across fix attempts, instead of being deleted after analysis.
A fix-attempts.md file is seeded and appended on each iteration with the build error, giving each fresh fix agent context on what was already tried.

Prompt optimization:

Replaced two verbose, nearly identical prompts (~290 lines total) with a single concise version (~55 lines) that instructs the agent to read fix-attempts.md before starting and not repeat failed strategies.

Misc:

Fixed restart: no YAML parsing bug in compose.yaml (interpreted as boolean False).

Commits

Commit	Description
`build_agent: stop deleting build logs after analysis`	Logs persist for the fix workflow
`backport_agent: guard against missing upstream repo in fix_build_error`	Graceful fallback instead of crash
`backport_agent: preserve build logs for fix iterations`	Move logs to `build-logs/attempt-0/` on initial failure
`backport_agent: seed fix-attempts.md as persistent memory across iterations`	Create/append fix history + per-attempt log dirs
`backport_agent: slim fix_build_error prompts`	Replace verbose prompts with concise version
`fix restart error of supervisor container`	Fix YAML `restart: no` → `restart: "no"`

Let log files persist in the working directory so the backport fix workflow can preserve them for subsequent fix iterations. Assisted-by: Claude Opus 4.6

Fall back to fork_and_prepare_dist_git (full reset) if the upstream repository is missing when entering the incremental fix loop. Assisted-by: Claude Opus 4.6

Move .log.gz files left by the build agent into the upstream repo's build-logs/attempt-0/ directory so the fix agent can access them. Assisted-by: Claude Opus 4.6

…ations Write a structured log file before each fix agent invocation so subsequent iterations can see what was already tried and avoid repeating failed strategies. Assisted-by: Claude Opus 4.6

Replace the verbose 143-line prompts with a concise 55-line version. Remove git command examples, log-reading micromanagement, and redundant rules. Add references to fix-attempts.md and build-logs. ZSTREAM variant now references the same constant since both were identical. Assisted-by: Claude Opus 4.6

gemini-code-assist

Code Review

This pull request enhances the backport agent's ability to handle build failures by implementing a structured tracking system for fix attempts. Key changes include refactoring the backport agent's prompt for conciseness, organizing build logs into attempt-specific directories, and maintaining a historical log of fix attempts in a markdown file. Additionally, the build agent no longer deletes log files, and a YAML syntax fix was applied to the compose configuration. A review comment suggests refactoring the logic for writing to the fix-attempts log to reduce code duplication and improve maintainability.

TomasKorbar · 2026-05-19T08:11:00Z

@opohorel hmm, how did you push this? :D the pre-push check should have stopped you, because you did not update the skill.

TomasTomecek

+89-267 love to see such PRs that reduce tech debt

TomasTomecek · 2026-05-19T08:11:02Z

+                            f.write(
+                                f"\n## Attempt {attempt_num}\n\n"
+                                f"**Build error to fix:**\n```\n{state.build_error}\n```\n\n"
+                            )


would it be a big hassle to cover this new code with a test case?

hmm, I'll think about it. I would love to get some e2e testing for the backport agent

I've added tests for the helpers functions

opohorel · 2026-05-19T08:15:24Z

@opohorel hmm, how did you push this? :D the pre-push check should have stopped you, because you did not update the skill.

good question, simple answer. I force pushed into my fork as I was rewriting history. I'll regenerate the skills 😅

nforro

Nice!

nforro · 2026-05-19T08:17:11Z

@opohorel hmm, how did you push this? :D the pre-push check should have stopped you, because you did not update the skill.

good question, simple answer. I force pushed into my fork as I was rewriting history. I'll regenerate the skills 😅

Even force push triggers pre-push hook. Do you have pre-commit properly installed?

Consolidate duplicated log-moving logic from run_build_agent and fix_build_error into a single private helper, placed alongside the other utility functions after the prompt definitions. Assisted-by: Claude Opus 4.6

Assisted-by: Claude Opus 4.6

opohorel · 2026-05-19T08:26:13Z

@opohorel hmm, how did you push this? :D the pre-push check should have stopped you, because you did not update the skill.

good question, simple answer. I force pushed into my fork as I was rewriting history. I'll regenerate the skills 😅

Even force push triggers pre-push hook. Do you have pre-commit properly installed?

you are right, I remember installing it and using it, but somehow it didn't trigger here. I reinstalled it and now it warns me

Assisted-by: Claude Opus 4.6

opohorel · 2026-05-19T08:57:00Z

/gemini review

gemini-code-assist

Code Review

This pull request implements a structured tracking system for incremental build fix attempts. It introduces 'justification' and 'fix_version' parameters to the backport skill, refactors the build error fix prompt for conciseness, and adds logic to move build logs into versioned directories while maintaining a 'fix-attempts.md' log. Review feedback identifies a conflict between agent instructions and orchestrator logic regarding log locations, an off-by-one error in directory naming, and the need to use 'shutil.move' for cross-filesystem reliability. Additionally, improvements were suggested to reduce redundancy in the generated fix attempts log.

Assisted-by: Claude Opus 4.6

opohorel added 6 commits May 19, 2026 09:28

build_agent: stop deleting build logs after analysis

1f1a828

Let log files persist in the working directory so the backport fix workflow can preserve them for subsequent fix iterations. Assisted-by: Claude Opus 4.6

backport_agent: guard against missing upstream repo in fix_build_error

b29f70b

Fall back to fork_and_prepare_dist_git (full reset) if the upstream repository is missing when entering the incremental fix loop. Assisted-by: Claude Opus 4.6

backport_agent: preserve build logs for fix iterations

296094d

Move .log.gz files left by the build agent into the upstream repo's build-logs/attempt-0/ directory so the fix agent can access them. Assisted-by: Claude Opus 4.6

backport_agent: seed fix-attempts.md as persistent memory across iter…

b35e77c

…ations Write a structured log file before each fix agent invocation so subsequent iterations can see what was already tried and avoid repeating failed strategies. Assisted-by: Claude Opus 4.6

fix restart error of supervisor container

e7acd17

gemini-code-assist Bot reviewed May 19, 2026

View reviewed changes

Comment thread ymir/agents/backport_agent.py Outdated

opohorel changed the title ~~Fix build~~ fix_build_error refactoring May 19, 2026

TomasTomecek reviewed May 19, 2026

View reviewed changes

nforro previously approved these changes May 19, 2026

View reviewed changes

Comment thread ymir/agents/backport_agent.py Outdated

Comment thread ymir/agents/backport_agent.py Outdated

opohorel added 2 commits May 19, 2026 10:21

backport_agent: extract _move_build_logs helper function

964c423

Consolidate duplicated log-moving logic from run_build_agent and fix_build_error into a single private helper, placed alongside the other utility functions after the prompt definitions. Assisted-by: Claude Opus 4.6

backport_agent: use explicit globs in _move_build_logs

d7ffec1

Assisted-by: Claude Opus 4.6

opohorel dismissed nforro’s stale review via f1a39c9 May 19, 2026 08:31

opohorel added 3 commits May 19, 2026 10:41

backport_agent: extract _update_fix_attempts_log helper

2a571be

Assisted-by: Claude Opus 4.6

backport_agent: add unit tests for build log helpers

15d1076

Assisted-by: Claude Opus 4.6

regenerated backport SKILL.md

87ab487

opohorel force-pushed the fix_build branch from f1a39c9 to 87ab487 Compare May 19, 2026 08:43

opohorel requested review from TomasTomecek and nforro May 19, 2026 08:44

gemini-code-assist Bot reviewed May 19, 2026

View reviewed changes

Comment thread ymir/agents/backport_agent.py Outdated

Comment thread ymir/agents/backport_agent.py Outdated

Comment thread ymir/agents/backport_agent.py

Comment thread ymir/agents/backport_agent.py

Comment thread ymir/agents/backport_agent.py

address Gemini review

0cfc0aa

Assisted-by: Claude Opus 4.6

nforro approved these changes May 19, 2026

View reviewed changes

opohorel merged commit 5741d68 into packit:main May 19, 2026
9 checks passed

qodo-for-packit Bot mentioned this pull request Jul 8, 2026

Fix buildroot check for c8s z-stream rebuilds #659

Merged

qodo-for-packit Bot mentioned this pull request Aug 5, 2026

Allow modifying (Build)Requires on build errors under strict conditions #739

Merged

qodo-for-packit Bot mentioned this pull request Aug 7, 2026

Filter out modular and regular issues when looking for duplicates #743

Merged

qodo-for-packit Bot mentioned this pull request Sep 11, 2026

Keep backport repair diagnostics out of generated patches #822

Merged

Conversation

opohorel commented May 19, 2026

Summary

Changes

Commits

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

TomasKorbar commented May 19, 2026

Uh oh!

TomasTomecek left a comment

Choose a reason for hiding this comment

Uh oh!

TomasTomecek May 19, 2026

Choose a reason for hiding this comment

Uh oh!

opohorel May 19, 2026

Choose a reason for hiding this comment

Uh oh!

opohorel May 19, 2026

Choose a reason for hiding this comment

Uh oh!

opohorel commented May 19, 2026

Uh oh!

nforro left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

nforro commented May 19, 2026

Uh oh!

opohorel commented May 19, 2026

Uh oh!

opohorel commented May 19, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants