diff --git a/ymir/agents/prompts/mr_consolidation/adapt_patch.j2 b/ymir/agents/prompts/mr_consolidation/adapt_patch.j2 index 3f3fe0633..17c5c8023 100644 --- a/ymir/agents/prompts/mr_consolidation/adapt_patch.j2 +++ b/ymir/agents/prompts/mr_consolidation/adapt_patch.j2 @@ -33,8 +33,9 @@ CRITICAL constraints: - Do NOT modify any pre-existing patches in the repository. - Never change anything in the spec file changelog. The changelog will be handled by a separate workflow step after your work is complete. -- Never modify the Release field in the spec file. The Release field will be updated - by a separate deterministic workflow step. +- NEVER modify the Release field in the spec file under ANY circumstances. The Release + field will be updated by a separate deterministic workflow step. Do not revert it, + bump it, or change it in any way — leave it exactly as it is. - Do NOT run `git fetch`, `git pull`, or `git clone`. - Do NOT run `git commit` — the commit will be created by a separate step. - Only add or modify the patch file(s) from commit {{ commit_sha }}. diff --git a/ymir/agents/prompts/mr_consolidation/adapt_spec.j2 b/ymir/agents/prompts/mr_consolidation/adapt_spec.j2 index 17d012342..2e25aae33 100644 --- a/ymir/agents/prompts/mr_consolidation/adapt_spec.j2 +++ b/ymir/agents/prompts/mr_consolidation/adapt_spec.j2 @@ -37,8 +37,9 @@ CRITICAL constraints: - Do NOT modify any pre-existing patches in the repository. - Never change anything in the spec file changelog. The changelog will be handled by a separate workflow step after your work is complete. -- Never modify the Release field in the spec file. The Release field will be updated - by a separate deterministic workflow step. +- NEVER modify the Release field in the spec file under ANY circumstances. The Release + field will be updated by a separate deterministic workflow step. Do not revert it, + bump it, or change it in any way — leave it exactly as it is. - Do NOT run `git fetch`, `git pull`, or `git clone`. - Do NOT run `git commit` — the commit will be created by a separate step. {% if build_error %} diff --git a/ymir/agents/prompts/mr_consolidation/instructions.j2 b/ymir/agents/prompts/mr_consolidation/instructions.j2 index 289b8a805..5a5a314da 100644 --- a/ymir/agents/prompts/mr_consolidation/instructions.j2 +++ b/ymir/agents/prompts/mr_consolidation/instructions.j2 @@ -72,9 +72,10 @@ Only combine the NEW patches added by the two source MRs. General instructions: - Never change anything in the spec file changelog. The changelog will be handled by a separate workflow step after your work is complete. -- Never modify the Release field in the spec file. The Release field will be updated - by a separate deterministic workflow step — do not revert, bump, or modify it. - If both source MRs contain Release bumps, REVERT the Release to its base branch value. +- NEVER modify the Release field in the spec file under ANY circumstances. The Release + field will be updated by a separate deterministic workflow step. Do not revert it, + bump it, reset it to the base branch value, or change it in any way — even if you + notice that both source MRs contain Release bumps. Leave it exactly as it is. - Never run `git fetch`, `git pull`, or `git clone`. All branches you need are already available locally. If a branch appears empty, work with what is available. - Preserve existing formatting and style conventions in spec files and patch headers.