GH#18815: fix(pulse-merge): file-overlap verification before auto-closing conflicting worker PRs by marcusquinn · Pull Request #18820 · marcusquinn/aidevops

marcusquinn · 2026-04-14T03:03:58Z

Summary

Fixes the false-positive in _close_conflicting_pr that closed PR #18760 (t2060 task-complete-helper implementation) by claiming the work had landed on main via PR #18749 — when in fact #18749 was a planning-only PR. Implementation files were never touched on main. The fix adds file-overlap verification: a matching commit must share at least one non-planning file with the closing PR before the auto-close fires. On overlap miss or file lookup error, fail CLOSED (leave PR open, post rebase nudge). Recovery for the existing victim is in PR #18760 (reopened).

Files Changed

.agents/scripts/pulse-merge.sh,.agents/scripts/tests/test-close-conflicting-pr-wording.sh

Runtime Testing

Risk level: Low (agent prompts / infrastructure scripts)
Verification: shellcheck clean on pulse-merge.sh and test-close-conflicting-pr-wording.sh; 7/7 assertions pass in test-close-conflicting-pr-wording.sh including 4 new GH#18815 regressions; 6/6 pass in test-pulse-merge-rebase-nudge.sh; 26/26 pass in test-pulse-wrapper-characterization.sh; 8/8 pass in test-pulse-wrapper-main-commit-check.sh

Resolves #18815

aidevops.sh v3.8.18 plugin for OpenCode v1.4.3 with claude-opus-4-6 spent 21m and 64,602 tokens on this with the user in an interactive session.

Summary by CodeRabbit

Bug Fixes
- PR auto-close logic now distinguishes between planning-file overlaps and implementation conflicts. Planning files (README, TODO, VERSION, configs) no longer trigger auto-closure. Workers receive a rebase nudge comment instead. Added fail-closed error handling to prevent false-positive closures.

…icting worker PRs The deterministic merge pass closed PR #18760 with a false 'work has already landed on main' claim, citing PR #18749 as the merging PR. PR #18749 was a planning-only PR (added briefs, modified TODO.md) — it touched zero implementation files. The closing PR's task ID appeared in #18749's commit subject ('plan(t2059, t2060): file follow-ups...') and the task-ID grep matched, but no implementation work had landed. Fix: require non-planning file overlap between the closing PR and the matching commit before claiming 'work landed on main'. On overlap miss OR file-lookup failure, fail CLOSED — leave the PR open and post a one-time rebase nudge instead of discarding work. Three new helpers: - _is_planning_path_for_overlap: classifies TODO.md, README.md, CHANGELOG.md, VERSION, todo/**, and simplification-state.json as planning paths that cannot satisfy the duplicate-work signal. - _verify_pr_overlaps_commit: fetches the closing PR's files and the matching commit's files, returns 0 only on non-planning intersection; returns 1 on lookup failure (fail-CLOSED). - _post_rebase_nudge_on_worker_conflicting: idempotent rebase nudge modelled on _post_rebase_nudge_on_interactive_conflicting, posted exactly once per affected worker PR. Refactored _close_conflicting_pr to fetch (sha, subject) JSON from gh api commits and use jq for word-boundary matching, so the matching commit's files can be looked up by SHA. Test coverage: extends test-close-conflicting-pr-wording.sh from 3 to 7 assertions covering 4 new GH#18815 regressions: - Planning-only match leaves PR open (the #18760 incident exactly) - Real implementation overlap still closes PR - commit-files lookup failure → fail-CLOSED - PR-files lookup failure → fail-CLOSED

marcusquinn · 2026-04-14T03:04:01Z

Completion Summary

What: Fixes the false-positive in _close_conflicting_pr that closed PR t2060: fix(task-complete-helper): move completed entries to ## Done instead of in-place marking #18760 (t2060 task-complete-helper implementation) by claiming the work had landed on main via PR plan(t2059, t2060): file follow-ups from GH#18538 worker-is-triager session #18749 — when in fact plan(t2059, t2060): file follow-ups from GH#18538 worker-is-triager session #18749 was a planning-only PR. Implementation files were never touched on main. The fix adds file-overlap verification: a matching commit must share at least one non-planning file with the closing PR before the auto-close fires. On overlap miss or file lookup error, fail CLOSED (leave PR open, post rebase nudge). Recovery for the existing victim is in PR t2060: fix(task-complete-helper): move completed entries to ## Done instead of in-place marking #18760 (reopened).
Issue: bug: _close_conflicting_pr auto-closes implementation PRs when a planning PR with the same task ID has merged #18815
Files changed: .agents/scripts/pulse-merge.sh,.agents/scripts/tests/test-close-conflicting-pr-wording.sh
Testing: shellcheck clean on pulse-merge.sh and test-close-conflicting-pr-wording.sh; 7/7 assertions pass in test-close-conflicting-pr-wording.sh including 4 new GH#18815 regressions; 6/6 pass in test-pulse-merge-rebase-nudge.sh; 26/26 pass in test-pulse-wrapper-characterization.sh; 8/8 pass in test-pulse-wrapper-main-commit-check.sh
Key decisions: Targeted fix on the match-found path only — the no-match path (current 're-attempt' close behaviour) is left alone in this PR to keep blast radius small. The broader question of 'should we ever auto-close conflicting worker PRs at all' is worth a separate discussion. Planning-path classification is hardcoded (TODO.md, README.md, CHANGELOG.md, VERSION, todo/**, simplification-state.json) — extensible if other planning patterns emerge. Failure mode is consistently fail-CLOSED: when in doubt, leave the PR open.

gemini-code-assist · 2026-04-14T03:04:02Z

Warning

You have reached your daily quota limit. Please wait up to 24 hours and I will start processing your requests again!

coderabbitai · 2026-04-14T03:04:12Z

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)

no-review

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: a8063830-7b6c-404b-bbb5-5ca06c7f8205

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

Walkthrough

Enhanced the conflicting-PR auto-close heuristic to exclude planning-only paths (docs, config files) from overlap verification. Added file-overlap validation requiring matching commits to share non-planning files with the PR. When overlap fails, the PR remains open and a rebase nudge comment is posted instead of auto-closing.

Changes

Cohort / File(s)	Summary
Core merge logic `.agents/scripts/pulse-merge.sh`	Added `_is_planning_path_for_overlap()` to classify paths as planning-only (TODO.md, README.md, CHANGELOG.md, VERSION, `todo/*`, `.agents/configs/simplification-state.json`). Introduced `_verify_pr_overlaps_commit()` to fetch and compare file lists from PR and matching main-branch commit, returning success only on non-planning file intersection. Modified `_close_conflicting_pr()` to gate auto-close on overlap verification and post idempotent rebase nudge via `_post_rebase_nudge_on_worker_conflicting()` when task-ID match occurs but overlap fails.
Test coverage expansion `.agents/scripts/tests/test-close-conflicting-pr-wording.sh`	Replaced simple commit-subject stub with comprehensive sandboxed harness (`setup_sandbox`/`teardown_sandbox`, `write_stub_gh`). Introduced `load_functions_under_test()` and `set_responses()` for response-file-based stubbing of `gh api` and `gh pr view` calls. Existing wording tests now validate formatting under new overlap-aware contract. Added GH#18815-specific test cases: planning-file-only commits prevent auto-close, implementation-file overlap enables auto-close, and lookup failures trigger fail-closed behavior.

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~45 minutes

Poem

Planning paths step back with grace, ✨
File overlaps now claim their place,
False positives fade away,
Rebase nudges save the day,
Zero debt, A-grade for play! 🚀

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch bugfix/close-conflicting-pr-overlap-check

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.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

github-actions · 2026-04-14T03:04:34Z

🔍 Code Quality Report

�[0;35m[MONITOR]�[0m Code Review Monitoring Report

SonarCloud: 0 bugs, 0 vulnerabilities, 231 code smells

Tue Apr 14 03:04:30 UTC 2026: Code review monitoring started
Tue Apr 14 03:04:31 UTC 2026: SonarCloud - Bugs: 0, Vulnerabilities: 0, Code Smells: 231

📈 Current Quality Metrics

BUGS: 0
CODE SMELLS: 231
VULNERABILITIES: 0

Generated on: Tue Apr 14 03:04:33 UTC 2026

Generated by AI DevOps Framework Code Review Monitoring

sonarqubecloud · 2026-04-14T03:05:49Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

codacy-production · 2026-04-14T03:06:11Z

Up to standards ✅

🟢 Issues 0 issues

Results:
0 new issues

View in Codacy

_{TIP This summary will be updated as you push new changes. Give us feedback}

marcusquinn added the origin:interactive Auto-created from TODO.md tag label Apr 14, 2026

github-actions bot added the bug Auto-created from TODO.md tag label Apr 14, 2026

marcusquinn merged commit a394f73 into main Apr 14, 2026
32 of 36 checks passed

marcusquinn deleted the bugfix/close-conflicting-pr-overlap-check branch April 14, 2026 03:04

github-actions bot mentioned this pull request Apr 14, 2026

bug: _close_conflicting_pr auto-closes implementation PRs when a planning PR with the same task ID has merged #18815

Closed

marcusquinn mentioned this pull request Apr 14, 2026

t2060: fix(task-complete-helper): move completed entries to ## Done instead of in-place marking #18760

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GH#18815: fix(pulse-merge): file-overlap verification before auto-closing conflicting worker PRs#18820

GH#18815: fix(pulse-merge): file-overlap verification before auto-closing conflicting worker PRs#18820
marcusquinn merged 1 commit intomainfrom
bugfix/close-conflicting-pr-overlap-check

marcusquinn commented Apr 14, 2026 •

edited by coderabbitai bot

Loading

Uh oh!

marcusquinn commented Apr 14, 2026

Uh oh!

gemini-code-assist bot commented Apr 14, 2026

Uh oh!

coderabbitai bot commented Apr 14, 2026 •

edited

Loading

Review skipped

Uh oh!

Uh oh!

github-actions bot commented Apr 14, 2026

Uh oh!

sonarqubecloud bot commented Apr 14, 2026

Uh oh!

codacy-production bot commented Apr 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

marcusquinn commented Apr 14, 2026 • edited by coderabbitai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Files Changed

Runtime Testing

Summary by CodeRabbit

Uh oh!

marcusquinn commented Apr 14, 2026

Completion Summary

Uh oh!

gemini-code-assist bot commented Apr 14, 2026

Uh oh!

coderabbitai bot commented Apr 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Walkthrough

Changes

Estimated code review effort

Poem

Uh oh!

Uh oh!

github-actions bot commented Apr 14, 2026

🔍 Code Quality Report

📈 Current Quality Metrics

Uh oh!

sonarqubecloud bot commented Apr 14, 2026

Quality Gate passed

Uh oh!

codacy-production bot commented Apr 14, 2026

Up to standards ✅

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

marcusquinn commented Apr 14, 2026 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Apr 14, 2026 •

edited

Loading