t1422: Cap quality-debt PR blast radius at 5 files to prevent conflict cascades#3956
t1422: Cap quality-debt PR blast radius at 5 files to prevent conflict cascades#3956marcusquinn merged 2 commits intomainfrom
Conversation
… cascades (t1422) Add three new rules to prevent the quality-debt PR conflict cascade observed in March 2026 (19/30 PRs conflicting, individual PRs touching up to 69 files): pulse.md: - Quality-debt PRs must touch at most 5 files (hard cap) - File-level dedup: skip dispatch if open PR already touches same files - Serial merge: only one quality-debt PR open per repo at a time - Auto-close stale conflicting quality-debt PRs with explanation full-loop.md: - Worker-side 5-file cap with detection and split guidance - Applies to quality-debt, simplification-debt, and batch-fix tasks - Workers must file follow-up issues for remaining files Closes #3955
Summary of ChangesHello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request addresses a critical issue of merge conflict cascades caused by large quality-debt PRs. By introducing systemic controls at both the supervisor and worker levels, it aims to limit the "blast radius" of such PRs to a maximum of 5 files. This strategy is designed to significantly reduce conflicts, accelerate merges, and improve the overall stability of the development pipeline, as evidenced by the immediate reduction in open and conflicting PRs. Highlights
Changelog
Activity
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
|
Warning Rate limit exceeded
⌛ How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (2)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
🔍 Code Quality Report�[0;35m[MONITOR]�[0m Code Review Monitoring Report �[0;34m[INFO]�[0m Latest Quality Status: �[0;34m[INFO]�[0m Recent monitoring activity: 📈 Current Quality Metrics
Generated on: Mon Mar 9 04:19:02 UTC 2026 Generated by AI DevOps Framework Code Review Monitoring |
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request introduces a valuable strategy to cap the size of quality-debt PRs, which will help prevent merge conflict cascades and improve the overall development workflow. The documentation changes are clear and well-structured. My review focuses on improving the robustness of the example shell scripts in pulse.md by removing error suppression that could hide important system or authentication issues, in line with repository guidelines.
Note: Security Review has been skipped due to the limited scope of the PR.
.agents/scripts/commands/pulse.md
Outdated
| OPEN_PR_FILES=$(gh pr list --repo <slug> --state open --json number,files \ | ||
| --jq '[.[].files[].path] | unique | .[]' 2>/dev/null) |
There was a problem hiding this comment.
Using 2>/dev/null here suppresses all error messages from the gh and jq commands. This can hide important issues like authentication failures, network problems, or incorrect repository slugs, leading to silent failures that are difficult to debug.
This practice violates a general rule for this repository: 'Avoid using '2>/dev/null' for blanket suppression of command errors in shell scripts to ensure that authentication, syntax, or system issues remain visible for debugging.'
Please remove the error suppression. The gh pr list command will gracefully handle cases with no open PRs by returning an empty list, which jq will process without error.
| OPEN_PR_FILES=$(gh pr list --repo <slug> --state open --json number,files \ | |
| --jq '[.[].files[].path] | unique | .[]' 2>/dev/null) | |
| OPEN_PR_FILES=$(gh pr list --repo <slug> --state open --json number,files \ | |
| --jq '[.[].files[].path] | unique | .[]') |
References
- Avoid using '2>/dev/null' for blanket suppression of command errors in shell scripts to ensure that authentication, syntax, or system issues remain visible for debugging.
.agents/scripts/commands/pulse.md
Outdated
| OPEN_DEBT_PRS=$(gh pr list --repo <slug> --state open \ | ||
| --json number,title,labels \ | ||
| --jq '[.[] | select(.labels[]?.name == "quality-debt" or (.title | test("quality.debt|fix:.*batch|fix:.*harden"; "i")))] | length' \ | ||
| 2>/dev/null || echo 0) |
There was a problem hiding this comment.
Similar to the previous comment, using 2>/dev/null here hides potentially critical errors from gh and jq, such as authentication or syntax issues. While || echo 0 provides a fallback for when no matching PRs are found, it's better to let genuine errors surface for easier debugging.
This violates the repository's general rule: 'In shell scripts with 'set -e' enabled, use '|| true' to prevent the script from exiting when a command like 'jq' fails on an optional lookup. Do not suppress stderr with '2>/dev/null' so that actual syntax or system errors remain visible for debugging.'
Removing 2>/dev/null will make the script more robust by allowing system and authentication errors to be visible, while the || echo 0 will still correctly handle the case where no matching PRs are found.
| OPEN_DEBT_PRS=$(gh pr list --repo <slug> --state open \ | |
| --json number,title,labels \ | |
| --jq '[.[] | select(.labels[]?.name == "quality-debt" or (.title | test("quality.debt|fix:.*batch|fix:.*harden"; "i")))] | length' \ | |
| 2>/dev/null || echo 0) | |
| OPEN_DEBT_PRS=$(gh pr list --repo <slug> --state open \ | |
| --json number,title,labels \ | |
| --jq '[.[] | select(.labels[]?.name == "quality-debt" or (.title | test("quality.debt|fix:.*batch|fix:.*harden"; "i")))] | length' \ | |
| || echo 0) |
References
- In shell scripts with 'set -e' enabled, use '|| true' to prevent the script from exiting when a command like 'jq' fails on an optional lookup. Do not suppress stderr with '2>/dev/null' so that actual syntax or system errors remain visible for debugging.
Address Gemini Code Assist review feedback — stderr suppression hides auth failures and syntax errors. The || echo 0 fallback handles the no-results case without hiding real errors.
🔍 Code Quality Report�[0;35m[MONITOR]�[0m Code Review Monitoring Report �[0;34m[INFO]�[0m Latest Quality Status: �[0;34m[INFO]�[0m Recent monitoring activity: 📈 Current Quality Metrics
Generated on: Mon Mar 9 04:22:17 UTC 2026 Generated by AI DevOps Framework Code Review Monitoring |
|
1 participant
Summary
Adds systemic controls to prevent the quality-debt PR conflict cascade observed in March 2026, where 19 of 30 open PRs were
CONFLICTINGbecause batch quality-debt PRs touched 10-69 files each.Root cause: Multiple quality-debt workers dispatched concurrently create large-batch PRs that all touch overlapping files. Each merge moves main, invalidating every other PR's base. The cascade is self-reinforcing — the longer the queue, the more conflicts, the slower the merges.
Changes
pulse.md— Supervisor dispatch rulesfull-loop.md— Worker-side enforcementPR Queue Cleanup (done in this session)
Evidence
Closes #3955