fix: newest reviewer lease marker wins so release ends prior claims (Closes #577) #579

Merged

sysadmin merged 1 commits from fix/issue-577-reviewer-lease-newest-wins into master 2026-07-09 10:38:23 -05:00

Conversation 10 Commits 1 Files Changed 2

+60 -11

jcwalker3 commented 2026-07-09 09:15:57 -05:00

Owner

Copy Link

Copy Source

Summary

find_active_reviewer_lease ignored newer terminal markers and re-activated older claimed leases after gitea_release_reviewer_pr_lease. Author conflict-fix push then stayed blocked even though release reported success.

Change

• Treat the newest lease marker on a PR as authoritative (append-only ledger).
• Newest released / done / blocked → no active lease.
• Newest active phase → that lease is active.
• Regression tests for claim→release and claim→release→reclaim.

Closes #577

Validation

• PASS: python -m pytest tests/test_reviewer_pr_lease.py -q (11 passed)

Worktree

branches/fix-reviewer-lease-newest-wins
Branch: fix/issue-577-reviewer-lease-newest-wins

## Summary `find_active_reviewer_lease` ignored newer terminal markers and re-activated older `claimed` leases after `gitea_release_reviewer_pr_lease`. Author conflict-fix push then stayed blocked even though release reported success. ## Change - Treat the newest lease marker on a PR as authoritative (append-only ledger). - Newest `released` / `done` / `blocked` → no active lease. - Newest active phase → that lease is active. - Regression tests for claim→release and claim→release→reclaim. Closes #577 ## Validation - PASS: `python -m pytest tests/test_reviewer_pr_lease.py -q` (11 passed) ## Worktree `branches/fix-reviewer-lease-newest-wins` Branch: `fix/issue-577-reviewer-lease-newest-wins`

jcwalker3 added 1 commit 2026-07-09 09:15:58 -05:00

fix: newest lease marker wins so release ends prior claims ... 9b96085d8d

find_active_reviewer_lease walked past terminal markers and re-armed
older claimed leases after gitea_release_reviewer_pr_lease. Treat the
newest marker as authoritative (append-only ledger).

Closes #577

sysadmin commented 2026-07-09 09:39:55 -05:00

Owner

Copy Link

Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #579
issue: #577
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 70869-8ee6195fac9f
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-579-lease-newest-wins
phase: claimed
candidate_head: 9b96085d8d
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T14:39:54Z
expires_at: 2026-07-09T16:39:54Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #579 issue: #577 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 70869-8ee6195fac9f worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-579-lease-newest-wins phase: claimed candidate_head: 9b96085d8d5fd6b7f54a3cac8573a261aad40972 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T14:39:54Z expires_at: 2026-07-09T16:39:54Z blocker: none

sysadmin commented 2026-07-09 09:46:37 -05:00

Owner

Copy Link

Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #579
issue: #577
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 70869-8ee6195fac9f
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-579-lease-newest-wins
phase: claimed
candidate_head: 9b96085d8d
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T14:46:35Z
expires_at: 2026-07-09T16:46:35Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #579 issue: #577 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 70869-8ee6195fac9f worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-579-lease-newest-wins phase: claimed candidate_head: 9b96085d8d5fd6b7f54a3cac8573a261aad40972 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T14:46:35Z expires_at: 2026-07-09T16:46:35Z blocker: none

sysadmin commented 2026-07-09 09:48:44 -05:00

Owner

Copy Link

Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #579
issue: #577
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 70869-8ee6195fac9f
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-579-lease-newest-wins
phase: claimed
candidate_head: 9b96085d8d
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T14:48:43Z
expires_at: 2026-07-09T16:48:43Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #579 issue: #577 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 70869-8ee6195fac9f worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-579-lease-newest-wins phase: claimed candidate_head: 9b96085d8d5fd6b7f54a3cac8573a261aad40972 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T14:48:43Z expires_at: 2026-07-09T16:48:43Z blocker: none

sysadmin commented 2026-07-09 09:50:31 -05:00

Owner

Copy Link

Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #579
issue: #577
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 70869-8ee6195fac9f
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-579-lease-newest-wins
phase: claimed
candidate_head: 9b96085d8d
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T14:50:31Z
expires_at: 2026-07-09T16:50:31Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #579 issue: #577 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 70869-8ee6195fac9f worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-579-lease-newest-wins phase: claimed candidate_head: 9b96085d8d5fd6b7f54a3cac8573a261aad40972 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T14:50:31Z expires_at: 2026-07-09T16:50:31Z blocker: none

sysadmin approved these changes 2026-07-09 09:52:01 -05:00

Dismissed

sysadmin left a comment

Owner

Copy Link

Copy Source

Canonical PR State

STATE:
approved

WHO_IS_NEXT:
merger

NEXT_ACTION:
Merge PR #579 with expected head SHA 9b96085d8d after controller authorization.

NEXT_PROMPT:

Use the merger profile on prgs. Merge PR #579 (fix/issue-577-reviewer-lease-newest-wins) into master only if still open and head is 9b96085d8d5fd6b7f54a3cac8573a261aad40972. Do not force-push.

WHAT_HAPPENED:
Reviewer approved PR #579. Code review found the newest-lease-marker-wins fix correct and tests pass (11).

WHY:
Scope is limited to reviewer_pr_lease.py + tests; append-only newest-marker semantics correctly end leases on released/done/blocked and fix post-release re-arm of older claimed markers.

ISSUE:
#577

BASE:
master

HEAD:
fix/issue-577-reviewer-lease-newest-wins

HEAD_SHA:
9b96085d8d

REVIEW_STATUS:
approved

VALIDATION:
python -m pytest tests/test_reviewer_pr_lease.py -q → 11 passed; mergeable=true; author jcwalker3 ≠ reviewer sysadmin

BLOCKERS:
none

SUPERSEDES:
none

SUPERSEDED_BY:
none

MERGE_READY:
yes — approved, mergeable, head matches expected SHA, no blockers

LAST_UPDATED_BY:
sysadmin / prgs-reviewer / 2026-07-09

Review notes

Workflow-load helper result: workflow_hash=435e6aad9ba4; final_report_schema_hash=a7634e7b8689; boundary_status=clean.

## Canonical PR State STATE: approved WHO_IS_NEXT: merger NEXT_ACTION: Merge PR #579 with expected head SHA 9b96085d8d5fd6b7f54a3cac8573a261aad40972 after controller authorization. NEXT_PROMPT: ```text Use the merger profile on prgs. Merge PR #579 (fix/issue-577-reviewer-lease-newest-wins) into master only if still open and head is 9b96085d8d5fd6b7f54a3cac8573a261aad40972. Do not force-push. ``` WHAT_HAPPENED: Reviewer approved PR #579. Code review found the newest-lease-marker-wins fix correct and tests pass (11). WHY: Scope is limited to reviewer_pr_lease.py + tests; append-only newest-marker semantics correctly end leases on released/done/blocked and fix post-release re-arm of older claimed markers. ISSUE: #577 BASE: master HEAD: fix/issue-577-reviewer-lease-newest-wins HEAD_SHA: 9b96085d8d5fd6b7f54a3cac8573a261aad40972 REVIEW_STATUS: approved VALIDATION: python -m pytest tests/test_reviewer_pr_lease.py -q → 11 passed; mergeable=true; author jcwalker3 ≠ reviewer sysadmin BLOCKERS: none SUPERSEDES: none SUPERSEDED_BY: none MERGE_READY: yes — approved, mergeable, head matches expected SHA, no blockers LAST_UPDATED_BY: sysadmin / prgs-reviewer / 2026-07-09 ## Review notes Workflow-load helper result: workflow_hash=435e6aad9ba4; final_report_schema_hash=a7634e7b8689; boundary_status=clean.

sysadmin commented 2026-07-09 09:53:27 -05:00

Owner

Copy Link

Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #579
issue: #577
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 70869-8ee6195fac9f
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-579-lease-newest-wins
phase: released
candidate_head: 9b96085d8d
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T14:53:26Z
expires_at: 2026-07-09T16:53:26Z
blocker: manual-release

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #579 issue: #577 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 70869-8ee6195fac9f worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-579-lease-newest-wins phase: released candidate_head: 9b96085d8d5fd6b7f54a3cac8573a261aad40972 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T14:53:26Z expires_at: 2026-07-09T16:53:26Z blocker: manual-release

sysadmin commented 2026-07-09 09:56:16 -05:00

Owner

Copy Link

Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #579
issue: #577
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 70869-8ee6195fac9f
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-579-lease-newest-wins
phase: claimed
candidate_head: 9b96085d8d
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T14:56:15Z
expires_at: 2026-07-09T16:56:15Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #579 issue: #577 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 70869-8ee6195fac9f worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-579-lease-newest-wins phase: claimed candidate_head: 9b96085d8d5fd6b7f54a3cac8573a261aad40972 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T14:56:15Z expires_at: 2026-07-09T16:56:15Z blocker: none

sysadmin commented 2026-07-09 09:57:47 -05:00

Owner

Copy Link

Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #579
issue: #577
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 70869-8ee6195fac9f
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-579-lease-newest-wins
phase: claimed
candidate_head: 9b96085d8d
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T14:57:46Z
expires_at: 2026-07-09T16:57:46Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #579 issue: #577 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 70869-8ee6195fac9f worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-579-lease-newest-wins phase: claimed candidate_head: 9b96085d8d5fd6b7f54a3cac8573a261aad40972 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T14:57:46Z expires_at: 2026-07-09T16:57:46Z blocker: none

sysadmin approved these changes 2026-07-09 09:58:00 -05:00

sysadmin left a comment

Owner

Copy Link

Copy Source

Canonical PR State

STATE: review-approved
WHO_IS_NEXT: merger
NEXT_ACTION: merge PR #579 after explicit operator authorization
NEXT_PROMPT:

Use prgs-merger on remote=prgs org=Scaled-Tech-Consulting repo=Gitea-Tools.
Merge PR #579 at expected_head_sha=9b96085d8d5fd6b7f54a3cac8573a261aad40972 only if still approved and mergeable.

WHAT_HAPPENED: Reviewed PR #579 for issue #577; approved head 9b96085d8d.
WHY: Newest lease marker is authoritative; terminal release ends prior claims. Tests cover claim-release and reclaim.
ISSUE: #577
HEAD_SHA: 9b96085d8d
REVIEW_STATUS: APPROVED
MERGE_READY: yes (awaiting explicit merge authorization)
BLOCKERS: none
VALIDATION: pytest tests/test_reviewer_pr_lease.py -> 11 passed; git diff --check clean; scope 2 files
LAST_UPDATED_BY: sysadmin (prgs-reviewer)

Review notes

• Not self-review (author jcwalker3).
• Matches operational bug (stale claimed markers after release).

## Canonical PR State STATE: review-approved WHO_IS_NEXT: merger NEXT_ACTION: merge PR #579 after explicit operator authorization NEXT_PROMPT: ```text Use prgs-merger on remote=prgs org=Scaled-Tech-Consulting repo=Gitea-Tools. Merge PR #579 at expected_head_sha=9b96085d8d5fd6b7f54a3cac8573a261aad40972 only if still approved and mergeable. ``` WHAT_HAPPENED: Reviewed PR #579 for issue #577; approved head 9b96085d8d5fd6b7f54a3cac8573a261aad40972. WHY: Newest lease marker is authoritative; terminal release ends prior claims. Tests cover claim-release and reclaim. ISSUE: #577 HEAD_SHA: 9b96085d8d5fd6b7f54a3cac8573a261aad40972 REVIEW_STATUS: APPROVED MERGE_READY: yes (awaiting explicit merge authorization) BLOCKERS: none VALIDATION: pytest tests/test_reviewer_pr_lease.py -> 11 passed; git diff --check clean; scope 2 files LAST_UPDATED_BY: sysadmin (prgs-reviewer) ## Review notes - Not self-review (author jcwalker3). - Matches operational bug (stale claimed markers after release).

sysadmin commented 2026-07-09 10:38:09 -05:00

Owner

Copy Link

Copy Source

adopted_at: 2026-07-09T15:38:08Z
adopted_by_identity: sysadmin
adopted_by_profile: prgs-merger
adopted_from_session_id: 70869-8ee6195fac9f
adopted_from_profile: prgs-reviewer
adopted_from_reviewer_identity: sysadmin
adopted_from_comment_id: 8166
adoption_reason: merger-handoff-approved-head

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #579
issue: #577
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 1956-3ed4bb2e17b1
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merger-queue
phase: adopted
candidate_head: 9b96085d8d
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T15:38:08Z
expires_at: 2026-07-09T17:38:08Z
blocker: none

<!-- mcp-review-lease-adoption:v1 --> adopted_at: 2026-07-09T15:38:08Z adopted_by_identity: sysadmin adopted_by_profile: prgs-merger adopted_from_session_id: 70869-8ee6195fac9f adopted_from_profile: prgs-reviewer adopted_from_reviewer_identity: sysadmin adopted_from_comment_id: 8166 adoption_reason: merger-handoff-approved-head <!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #579 issue: #577 reviewer_identity: sysadmin profile: prgs-merger session_id: 1956-3ed4bb2e17b1 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merger-queue phase: adopted candidate_head: 9b96085d8d5fd6b7f54a3cac8573a261aad40972 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T15:38:08Z expires_at: 2026-07-09T17:38:08Z blocker: none

sysadmin merged commit 94004f05ac into master 2026-07-09 10:38:23 -05:00

Sign in to join this conversation.

Reviewers

No Reviewers

sysadmin

Labels

Clear labels

allocator

Controller-owned work allocator

anti-stomp

Prevent concurrent LLM session stomping

architecture

Architecture / structural design

bug

chore

codex

OpenAI Codex client / workflow session surface

concurrency

Concurrent session safety

contamination

Workflow or session contamination incident

control-plane

MCP control-plane coordination and allocation authority

dashboard

MCP operational dashboard/queue view

database

Internal coordination storage (SQLite/Postgres)

design

Design / investigation, no implementation

documentation

Docs / runbooks

enhancement

New feature or improvement

gitea

Gitea MCP workflow

glitchtip

GlitchTip integration

important

incident

Operational or process incident requiring durable audit trail

incident-bridge

Sentry-to-Gitea incident bridging

integration

Integration testing

jenkins

Jenkins integration

labels

Label taxonomy management

leases

Lease adopt/release/expire lifecycle

mcp

MCP server / tooling

mcp-health

MCP namespace and runtime health

mcp-menu

MCP menu surface

multi-project

Work spanning multiple monitoring projects or Gitea repos

mutating

Mutating action; requires gating

nice-to-have

observability

Observability, metrics, traces, error reporting

portability

Cross-platform / portability

preflight

Shared preflight gates before mutation

protected-branch

Protected branch / stable-branch policy concern

queue

Work queue visibility and allocation

read-only

Read-only, no mutation

reconnect

MCP client reconnect/reload recovery path

recovery

Recovery paths for stale/foreign leases

refactor

Code refactor / restructure

release

Release / versioning

reliability

Reliability / failure handling

resumable-review

Persist and resume prepared review verdicts across sessions

reviewer

Reviewer workflow tooling

roadmap

Roadmap / umbrella issue

safety

Safety rails and fail-closed mutation guards

security

Security / trust boundary

self-hosted

Self-hosted infrastructure integration

sentry

Sentry error monitoring integration

stale-runtime

Stale backend daemon / runtime-vs-master parity failures

status:blocked

Issue is blocked

status:in-progress

Issue is being worked on

status:pr-open

Issue has an open pull request

status:ready

Issue is ready for work

terminal-lock

Terminal review lock (#332) path

testing

Tests / test coverage

tracker

Issue tracker hygiene / meta

type:bug

Bug or defect

type:feature

Feature or enhancement

type:feature

Feature or enhancement

type:guardrail

Safety gate or guardrail

visibility

Workflow state visibility for LLMs/operators

workflow

Cross-tool workflow

workflow-hardening

LLM workflow coordination hardening

workflow-hardening

LLM workflow coordination hardening

No labels

Milestone

No items

No Milestone

Projects

Clear projects

No projects

Assignees

Clear assignees

jcwalker3 sysadmin

No Assignees

2 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Scaled-Tech-Consulting/Gitea-Tools#579