feat: add conflict-fix leases and stale-head protection (Closes #399) #416

Merged

sysadmin merged 3 commits from feat/issue-399-conflict-fix-leases into master

2026-07-08 00:34:20 -05:00

Author	SHA1	Message	Date
sysadmin	d4dc9aa854	fix: align test mocks with #399 lease gates and head SHA requirements PR #416 introduced pr_work_lease reviewer blocks and mandatory full 40-hex expected_head_sha on mark/merge paths. Update audit, review, permission-report, terminal hard-stop, inventory, and schema tests to patch lease comment fetches, seed ready review decisions, and use consistent HEAD_SHA constants so the full suite passes again.	2026-07-08 01:26:36 -04:00
sysadmin	55b3658d93	fix: resolve conflicts for PR #416 Merge current prgs/master into feat/issue-399-conflict-fix-leases. Preserve reviewer PR lease gate (#407) before conflict-fix stale-head gate (#399); document both as §26B and §26C. Align MCP and validator tests with mandatory expected_head_sha and stale-head proof fields.	2026-07-07 17:38:45 -04:00
sysadmin	87beb44394	feat: add conflict-fix leases and stale-head protection (Closes #399 ) Introduce structured PR work leases so author conflict-fix pushes cannot race reviewer validation, approval, or merge on a moving head SHA. - pr_work_lease.py: parse/acquire leases, push and reviewer mutation gates - gitea_acquire_conflict_fix_lease, gitea_assess_conflict_fix_push MCP tools - Enforce reviewed head SHA on mark_final_review_decision, submit_pr_review, merge_pr - Final-report rules and workflow sections 20A / 26B - tests/test_pr_work_lease.py (14 cases)	2026-07-07 13:06:07 -04:00

Author

SHA1

Message

Date

sysadmin

d4dc9aa854

fix: align test mocks with #399 lease gates and head SHA requirements

PR #416 introduced pr_work_lease reviewer blocks and mandatory full
40-hex expected_head_sha on mark/merge paths. Update audit, review,
permission-report, terminal hard-stop, inventory, and schema tests to
patch lease comment fetches, seed ready review decisions, and use
consistent HEAD_SHA constants so the full suite passes again.

2026-07-08 01:26:36 -04:00

sysadmin

55b3658d93

fix: resolve conflicts for PR #416

Merge current prgs/master into feat/issue-399-conflict-fix-leases.
Preserve reviewer PR lease gate (#407) before conflict-fix stale-head
gate (#399); document both as §26B and §26C. Align MCP and validator
tests with mandatory expected_head_sha and stale-head proof fields.

2026-07-07 17:38:45 -04:00

sysadmin

87beb44394

feat: add conflict-fix leases and stale-head protection (Closes #399 )

Introduce structured PR work leases so author conflict-fix pushes cannot
race reviewer validation, approval, or merge on a moving head SHA.

- pr_work_lease.py: parse/acquire leases, push and reviewer mutation gates
- gitea_acquire_conflict_fix_lease, gitea_assess_conflict_fix_push MCP tools
- Enforce reviewed head SHA on mark_final_review_decision, submit_pr_review, merge_pr
- Final-report rules and workflow sections 20A / 26B
- tests/test_pr_work_lease.py (14 cases)

2026-07-07 13:06:07 -04:00