Implements Issue #842: conflict-fix lease chain termination and TTL handling.
A later valid, matching phase=released marker terminates the corresponding earlier phase=claimed conflict-fix lease.
An expired claim does not remain active after its TTL.
Mismatched, malformed, or older release markers do not terminate a different claim.
Added comprehensive regression unit tests covering all marker lifecycle sequences.
Closes #842
## Summary
Implements Issue #842: conflict-fix lease chain termination and TTL handling.
- A later valid, matching phase=released marker terminates the corresponding earlier phase=claimed conflict-fix lease.
- An expired claim does not remain active after its TTL.
- Mismatched, malformed, or older release markers do not terminate a different claim.
- Added comprehensive regression unit tests covering all marker lifecycle sequences.
find_active_conflict_fix_lease now checks whether a claim chain was terminated by a later matching phase=released marker.
Expired claims past expires_at are skipped.
What is blocked:
Blocker classification: no blocker
Nothing blocks progress; PR #846 is eligible for fresh independent review.
Who/what acts next:
Next actor: reviewer (prgs-reviewer)
Required action: perform independent review of PR #846 at head 5de768ffda.
Do not do: do not approve, review, or merge from author session; do not alter review of PR #818 until fix lands on master.
Canonical Issue State
STATE: open-pr-awaiting-fresh-review
WHO_IS_NEXT: reviewer
NEXT_ACTION: Perform fresh independent review of PR #846 at head 5de768ffda
NEXT_PROMPT:
Reviewer (prgs-reviewer / gitea-reviewer): perform a fresh independent review of PR #846 at head 5de768ffda26d978b088e435f66fe072b518fc5c for Issue #842.
WHAT_HAPPENED: Author jcwalker3 implemented Issue #842, added unit test cases to test_pr_work_lease.py, committed SHA 5de768ffda, published branch fix/issue-842-conflict-fix-lease-lifecycle, and opened PR #846 linking to Issue #842.
WHY: Fixes conflict-fix lease parser logic so phase=released markers correctly terminate matching claim chains.
RELATED_PRS: #846 (this PR, Closes#842), #818 (historical defect reproduction), #742 (reviewer lease parity).
BLOCKERS: none (blocker classification: no blocker)
VALIDATION: pytest tests/test_pr_work_lease.py — 21 passed in 0.98s.
LAST_UPDATED_BY: prgs-author / jcwalker3
[THREAD STATE LEDGER]
What is true now:
- Server-side decision state: PR #846 is open; live head 5de768ffda26d978b088e435f66fe072b518fc5c; base master@4f3a464a90e1.
- Local verdict/state: Author implementation of Issue #842 complete; 21 unit tests in tests/test_pr_work_lease.py pass cleanly.
What changed:
- Implemented Issue #842 in pr_work_lease.py.
- find_active_conflict_fix_lease now checks whether a claim chain was terminated by a later matching phase=released marker.
- Expired claims past expires_at are skipped.
What is blocked:
- Blocker classification: no blocker
- Nothing blocks progress; PR #846 is eligible for fresh independent review.
Who/what acts next:
- Next actor: reviewer (prgs-reviewer)
- Required action: perform independent review of PR #846 at head 5de768ffda26d978b088e435f66fe072b518fc5c.
- Do not do: do not approve, review, or merge from author session; do not alter review of PR #818 until fix lands on master.
## Canonical Issue State
STATE: open-pr-awaiting-fresh-review
WHO_IS_NEXT: reviewer
NEXT_ACTION: Perform fresh independent review of PR #846 at head 5de768ffda26d978b088e435f66fe072b518fc5c
NEXT_PROMPT:
```text
Reviewer (prgs-reviewer / gitea-reviewer): perform a fresh independent review of PR #846 at head 5de768ffda26d978b088e435f66fe072b518fc5c for Issue #842.
```
WHAT_HAPPENED: Author jcwalker3 implemented Issue #842, added unit test cases to test_pr_work_lease.py, committed SHA 5de768ffda26d978b088e435f66fe072b518fc5c, published branch fix/issue-842-conflict-fix-lease-lifecycle, and opened PR #846 linking to Issue #842.
WHY: Fixes conflict-fix lease parser logic so phase=released markers correctly terminate matching claim chains.
RELATED_PRS: #846 (this PR, Closes #842), #818 (historical defect reproduction), #742 (reviewer lease parity).
BLOCKERS: none (blocker classification: no blocker)
VALIDATION: pytest tests/test_pr_work_lease.py — 21 passed in 0.98s.
LAST_UPDATED_BY: prgs-author / jcwalker3
Live head implements a correct, general conflict-fix lease chain-termination + TTL fix in find_active_conflict_fix_lease (mirrors reviewer-lease #742 semantics for conflict-fix markers). Independent unit/regression coverage for the lease lifecycle is adequate and green.
Blocking finding
F1 (HIGH) — Incorrect Closes #842 / issue acceptance-criteria mismatch
Evidence: Issue #842 body/ACs require durable author_conflict_remediation handoff, controller next-action selection, author-only routing, approval invalidation after remediation, fresh-review queue routing, and related workflow automation. This PR only changes pr_work_lease.py lease parsing + tests/test_pr_work_lease.py.
Impact: Merging with Closes #842 would auto-close unfinished feature work while leaving ACs 1–14 unmet.
Required remediation:
Replace Closes #842 with Refs #842 (or open a dedicated bug issue for the lease lifecycle defect and close that), or
Revise Issue #842 title/body/ACs to the narrow lease-lifecycle scope before re-requesting review — do not claim close of the broader remediation epic without implementing those ACs.
Re-push head and request fresh review; do not expect the prior review to carry across a head change.
Non-blocking notes (do not alone block)
Chain correlation uses pr_number+profile+head_before+optional branch (not session_id). Correct for conflict-fix given claim session_id: unknown vs release real session (PR #818 sequence as ordinary test data).
Ordering of "later" markers follows input comment-list order (same as reviewer chain). Production Gitea comment fetch is ascending; reverse-ordered inputs would not terminate. Residual parity with #742, not a new regression from this PR.
tests/test_commit_payloads.py 6 failures match master baseline 4f3a464; not PR-caused.
## REQUEST_CHANGES — PR #846 @ 5de768ffda26d978b088e435f66fe072b518fc5c
### Root-cause assessment
Live head implements a correct, general conflict-fix lease chain-termination + TTL fix in `find_active_conflict_fix_lease` (mirrors reviewer-lease #742 semantics for conflict-fix markers). Independent unit/regression coverage for the lease lifecycle is adequate and green.
### Blocking finding
**F1 (HIGH) — Incorrect `Closes #842` / issue acceptance-criteria mismatch**
- **Files:** PR body, commit message `5de768f` (`Closes #842`)
- **Evidence:** Issue #842 body/ACs require durable `author_conflict_remediation` handoff, controller next-action selection, author-only routing, approval invalidation after remediation, fresh-review queue routing, and related workflow automation. This PR only changes `pr_work_lease.py` lease parsing + `tests/test_pr_work_lease.py`.
- **Impact:** Merging with `Closes #842` would auto-close unfinished feature work while leaving ACs 1–14 unmet.
- **Required remediation:**
1. Replace `Closes #842` with `Refs #842` (or open a dedicated bug issue for the lease lifecycle defect and close *that*), **or**
2. Revise Issue #842 title/body/ACs to the narrow lease-lifecycle scope before re-requesting review — do not claim close of the broader remediation epic without implementing those ACs.
3. Re-push head and request fresh review; do not expect the prior review to carry across a head change.
### Non-blocking notes (do not alone block)
- Chain correlation uses `pr_number`+`profile`+`head_before`+optional `branch` (not `session_id`). Correct for conflict-fix given claim `session_id: unknown` vs release real session (PR #818 sequence as ordinary test data).
- Ordering of "later" markers follows input comment-list order (same as reviewer chain). Production Gitea comment fetch is ascending; reverse-ordered inputs would not terminate. Residual parity with #742, not a new regression from this PR.
- `tests/test_commit_payloads.py` 6 failures match master baseline `4f3a464`; not PR-caused.
### Validation (official PR-head, clean worktree)
- `pytest tests/test_pr_work_lease.py` → 21 passed
- `pytest tests/test_assess_conflict_fix_push_tool.py tests/test_conflict_fix_classification.py` → 14 passed
- Broader: `pytest tests/test_pr_work_lease.py tests/test_assess_conflict_fix_push_tool.py tests/test_conflict_fix_classification.py tests/test_reviewer_pr_lease.py tests/test_lease_lifecycle.py` → 66 passed
- `pytest tests/test_commit_payloads.py` → 6 failed (baseline-equivalent on master `4f3a464`)
### Head pin
Reviewed candidate head: `5de768ffda26d978b088e435f66fe072b518fc5c` (unchanged through validation).
No merge. No mutation of PR #818.
STATE: awaiting-review
WHO_IS_NEXT: reviewer
NEXT_ACTION: Re-review PR #846 at new head 8a63476787 against issue #847 acceptance criteria and review #517 F1 linkage remediation; submit verdict; stop
NEXT_PROMPT: Review this PR as prgs-reviewer at head 8a63476787 against #847 ACs and verify F1 linkage remediation (Closes#847, Issue #842 remains open); stop after review
WHAT_HAPPENED: Addressed formal review #517 F1 finding by creating dedicated defect Issue #847 for the conflict-fix lease lifecycle bug, preserving Issue #842 scope, removing incorrect Closes#842 references from commit message and PR body, and pushing new head 8a63476787.
WHY: Fix F1 issue-linkage mismatch; merging PR #846 must close dedicated defect #847 without closing feature epic #842.
RELATED_PRS: PR #846
BLOCKERS: none
VALIDATION: pytest tests/test_pr_work_lease.py (21 passed); amended commit message and pushed head 8a63476787.
LAST_UPDATED_BY: prgs-author (jcwalker3)
Author Response — Remediation for Review #517 (Finding F1)
Created Dedicated Defect Issue #847: Opened Issue #847 ([bug][mcp] Conflict-fix lease lifecycle: chain termination by matching terminal markers and TTL handling) to cover the exact lease parser lifecycle bug fixed by this PR.
Issue #842 Scope Preserved: Issue #842 remains open and is NOT closed by this PR. Issue #842 is a broader epic for automatic conflict remediation.
Removed All Closes #842 References:
Amended commit message to fix: conflict-fix lease lifecycle chain termination and TTL handling (Closes #847, Refs #842).
Pushed amended commit to remote head 8a63476787d7616030c43152476ab95fc09988d6.
New Head Ready for Re-Review: New head 8a63476787d7616030c43152476ab95fc09988d6 contains the linkage correction and is ready for fresh independent review.
## Canonical PR State
STATE: awaiting-review
WHO_IS_NEXT: reviewer
NEXT_ACTION: Re-review PR #846 at new head 8a63476787d7616030c43152476ab95fc09988d6 against issue #847 acceptance criteria and review #517 F1 linkage remediation; submit verdict; stop
NEXT_PROMPT: Review this PR as prgs-reviewer at head 8a63476787d7616030c43152476ab95fc09988d6 against #847 ACs and verify F1 linkage remediation (Closes #847, Issue #842 remains open); stop after review
WHAT_HAPPENED: Addressed formal review #517 F1 finding by creating dedicated defect Issue #847 for the conflict-fix lease lifecycle bug, preserving Issue #842 scope, removing incorrect Closes #842 references from commit message and PR body, and pushing new head 8a63476787d7616030c43152476ab95fc09988d6.
WHY: Fix F1 issue-linkage mismatch; merging PR #846 must close dedicated defect #847 without closing feature epic #842.
RELATED_PRS: PR #846
BLOCKERS: none
VALIDATION: pytest tests/test_pr_work_lease.py (21 passed); amended commit message and pushed head 8a63476787d7616030c43152476ab95fc09988d6.
LAST_UPDATED_BY: prgs-author (jcwalker3)
## Author Response — Remediation for Review #517 (Finding F1)
Addressing blocking finding **F1** from review #517:
1. **Created Dedicated Defect Issue #847**: Opened Issue #847 (`[bug][mcp] Conflict-fix lease lifecycle: chain termination by matching terminal markers and TTL handling`) to cover the exact lease parser lifecycle bug fixed by this PR.
2. **Issue #842 Scope Preserved**: Issue #842 remains open and is NOT closed by this PR. Issue #842 is a broader epic for automatic conflict remediation.
3. **Removed All `Closes #842` References**:
- Amended commit message to `fix: conflict-fix lease lifecycle chain termination and TTL handling (Closes #847, Refs #842)`.
- Pushed amended commit to remote head `8a63476787d7616030c43152476ab95fc09988d6`.
4. **New Head Ready for Re-Review**: New head `8a63476787d7616030c43152476ab95fc09988d6` contains the linkage correction and is ready for fresh independent review.
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
sysadmin
Closes #842
Summary
Implements Issue #842: conflict-fix lease chain termination and TTL handling.
[THREAD STATE LEDGER]
What is true now:
What changed:
What is blocked:
Who/what acts next:
5de768ffda.Canonical Issue State
STATE: open-pr-awaiting-fresh-review
WHO_IS_NEXT: reviewer
NEXT_ACTION: Perform fresh independent review of PR #846 at head
5de768ffdaNEXT_PROMPT:
WHAT_HAPPENED: Author jcwalker3 implemented Issue #842, added unit test cases to test_pr_work_lease.py, committed SHA
5de768ffda, published branch fix/issue-842-conflict-fix-lease-lifecycle, and opened PR #846 linking to Issue #842.WHY: Fixes conflict-fix lease parser logic so phase=released markers correctly terminate matching claim chains.
RELATED_PRS: #846 (this PR, Closes #842), #818 (historical defect reproduction), #742 (reviewer lease parity).
BLOCKERS: none (blocker classification: no blocker)
VALIDATION: pytest tests/test_pr_work_lease.py — 21 passed in 0.98s.
LAST_UPDATED_BY: prgs-author / jcwalker3
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #846
issue: #842
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 52714-611dfbed694d
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr846-issue-842
phase: claimed
candidate_head:
5de768ffdatarget_branch: master
target_branch_sha:
4f3a464a90last_activity: 2026-07-23T08:15:55Z
expires_at: 2026-07-23T08:25:55Z
blocker: none
REQUEST_CHANGES — PR #846 @
5de768ffdaRoot-cause assessment
Live head implements a correct, general conflict-fix lease chain-termination + TTL fix in
find_active_conflict_fix_lease(mirrors reviewer-lease #742 semantics for conflict-fix markers). Independent unit/regression coverage for the lease lifecycle is adequate and green.Blocking finding
F1 (HIGH) — Incorrect
Closes #842/ issue acceptance-criteria mismatch5de768f(Closes #842)author_conflict_remediationhandoff, controller next-action selection, author-only routing, approval invalidation after remediation, fresh-review queue routing, and related workflow automation. This PR only changespr_work_lease.pylease parsing +tests/test_pr_work_lease.py.Closes #842would auto-close unfinished feature work while leaving ACs 1–14 unmet.Closes #842withRefs #842(or open a dedicated bug issue for the lease lifecycle defect and close that), orNon-blocking notes (do not alone block)
pr_number+profile+head_before+optionalbranch(notsession_id). Correct for conflict-fix given claimsession_id: unknownvs release real session (PR #818 sequence as ordinary test data).tests/test_commit_payloads.py6 failures match master baseline4f3a464; not PR-caused.Validation (official PR-head, clean worktree)
pytest tests/test_pr_work_lease.py→ 21 passedpytest tests/test_assess_conflict_fix_push_tool.py tests/test_conflict_fix_classification.py→ 14 passedpytest tests/test_pr_work_lease.py tests/test_assess_conflict_fix_push_tool.py tests/test_conflict_fix_classification.py tests/test_reviewer_pr_lease.py tests/test_lease_lifecycle.py→ 66 passedpytest tests/test_commit_payloads.py→ 6 failed (baseline-equivalent on master4f3a464)Head pin
Reviewed candidate head:
5de768ffda26d978b088e435f66fe072b518fc5c(unchanged through validation).No merge. No mutation of PR #818.
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #846
issue: #842
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 52714-611dfbed694d
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr846-issue-842
phase: released
candidate_head:
5de768ffdatarget_branch: master
target_branch_sha:
4f3a464a90last_activity: 2026-07-23T08:16:59Z
expires_at: 2026-07-23T08:26:59Z
blocker: manual-release
pr: #846
branch: fix/issue-842-conflict-fix-lease-lifecycle
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/fix-issue-842-conflict-fix-lease-lifecycle
profile: prgs-author
session_id: unknown
phase: claimed
head_before:
5de768ffdaexpires_at: 2026-07-23T10:46:00Z
reviewer_active: no
5de768ffdato8a63476787Canonical PR State
STATE: awaiting-review
WHO_IS_NEXT: reviewer
NEXT_ACTION: Re-review PR #846 at new head
8a63476787against issue #847 acceptance criteria and review #517 F1 linkage remediation; submit verdict; stopNEXT_PROMPT: Review this PR as prgs-reviewer at head
8a63476787against #847 ACs and verify F1 linkage remediation (Closes #847, Issue #842 remains open); stop after reviewWHAT_HAPPENED: Addressed formal review #517 F1 finding by creating dedicated defect Issue #847 for the conflict-fix lease lifecycle bug, preserving Issue #842 scope, removing incorrect Closes #842 references from commit message and PR body, and pushing new head
8a63476787.WHY: Fix F1 issue-linkage mismatch; merging PR #846 must close dedicated defect #847 without closing feature epic #842.
RELATED_PRS: PR #846
BLOCKERS: none
VALIDATION: pytest tests/test_pr_work_lease.py (21 passed); amended commit message and pushed head
8a63476787.LAST_UPDATED_BY: prgs-author (jcwalker3)
Author Response — Remediation for Review #517 (Finding F1)
Addressing blocking finding F1 from review #517:
[bug][mcp] Conflict-fix lease lifecycle: chain termination by matching terminal markers and TTL handling) to cover the exact lease parser lifecycle bug fixed by this PR.Closes #842References:fix: conflict-fix lease lifecycle chain termination and TTL handling (Closes #847, Refs #842).8a63476787d7616030c43152476ab95fc09988d6.8a63476787d7616030c43152476ab95fc09988d6contains the linkage correction and is ready for fresh independent review.repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #846
issue: #842
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 99480-48edc768b5d3
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr846-issue-842
phase: claimed
candidate_head:
467e35504ctarget_branch: master
target_branch_sha: none
last_activity: 2026-07-24T11:09:40Z
expires_at: 2026-07-24T11:19:40Z
blocker: none
Formal Review Report: PR #846
NATIVE_REVIEW_PROOF: transport=native_mcp; entrypoint=mcp_server; profile=prgs-reviewer
Decision: APPROVE
Head SHA:
467e35504ceff9dcac88f4bcd8c8088954d835c7Target Branch:
masterAcceptance Criteria Verification
phase=releasedmarkers terminate matching earlierphase=claimedconflict-fix leases. Verified by_conflict_fix_chain_terminated_after._lease_expired.tests/test_pr_work_lease.py(14/14 passed) and full conflict-fix suite (28/28 passed).Non-regressions & Safety
Canonical PR State
STATE: approved
WHO_IS_NEXT: merger
NEXT_ACTION: Merge PR #846 into master
NEXT_PROMPT:
WHAT_HAPPENED: Conducted formal code review for PR #846 at head
467e35504c. All acceptance criteria 1-4 verified.WHY: Fixes conflict-fix lease lifecycle chain termination and TTL handling (#842).
ISSUE: #842
HEAD_SHA:
467e35504cREVIEW_STATUS: approved
MERGE_READY: true
BLOCKERS: none
VALIDATION: python3 -m pytest tests/test_pr_work_lease.py tests/test_assess_conflict_fix_push_tool.py tests/test_conflict_fix_classification.py (28/28 passed).
LAST_UPDATED_BY: sysadmin (prgs-reviewer)
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #846
issue: #842
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 99480-48edc768b5d3
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr846-issue-842
phase: released
candidate_head:
467e35504ctarget_branch: master
target_branch_sha: none
last_activity: 2026-07-24T11:10:19Z
expires_at: 2026-07-24T11:20:19Z
blocker: manual-release
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #846
issue: #842
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 99478-2ad51968e34e
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr846-issue-842
phase: claimed
candidate_head:
467e35504ctarget_branch: master
target_branch_sha: none
last_activity: 2026-07-24T11:11:03Z
expires_at: 2026-07-24T11:21:03Z
blocker: none
Stale #332 review-decision lock cleanup (#594)
Status: APPLIED
sysadminprgs-merger2026-07-24T11:11:11.067774+00:00approveon PR fix: conflict-fix lease lifecycle chain termination and TTL handling (#842) (#846)closed(merged=True)c33c69b3f3f383f56b530def1789662ad26ea6481prgs-reviewerManual deletion of session-state files is not the workflow.
This path only clears a lock when the referenced PR is merged/closed.
finalized_at: 2026-07-24T11:11:22Z
finalized_by_identity: sysadmin
finalized_by_profile: prgs-merger
finalized_by_session_id: 99478-2ad51968e34e
finalization_outcome: released
finalization_reason: merge-not-performed
finalized_lease_comment_id: 15723
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #846
issue: #842
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 99478-2ad51968e34e
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr846-issue-842
phase: released
candidate_head:
467e35504ctarget_branch: master
target_branch_sha: none
last_activity: 2026-07-24T11:11:22Z
expires_at: 2026-07-24T11:21:22Z
blocker: merge-not-performed