Scaled-Tech-Consulting/Gitea-Tools
2
0
Fork 0
Code Issues 73 Pull Requests 9 Actions Packages Projects Releases Wiki Activity

feat: add safe post-merge moot lease cleanup for already-merged PRs (Closes #515) #527

Merged
sysadmin merged 1 commits from feat/issue-515-post-merge-moot-lease into master 2026-07-08 04:02:24 -05:00
Conversation 8 Commits 1 Files Changed 3
+494 -1
jcwalker3 commented 2026-07-08 03:54:01 -05:00
Owner
Copy Link
Copy Source

Summary

Closes #515.

Refuses merge-oriented reviewer lease adoption on already-merged/closed PRs and adds an explicit post-merge moot-lease read/cleanup path that never force-cleans active foreign leases on open PRs.

Changes

  • reviewer_pr_lease.py — refuse gitea_acquire_reviewer_pr_lease on merged/closed PRs with post_merge_moot reason
  • gitea_mcp_server.py — post-merge moot lease assessment/cleanup tool path with read-first structured report
  • tests/test_post_merge_moot_lease.py — adoption refusal, safe cleanup, and open-PR foreign-lease protection

Validation

venv/bin/python -m pytest tests/test_post_merge_moot_lease.py -q

Worktree

Lock: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-515-lock-scratch
Implementation: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-post-merge-moot-lease @ 2faf18a

## Summary Closes #515. Refuses merge-oriented reviewer lease adoption on already-merged/closed PRs and adds an explicit post-merge moot-lease read/cleanup path that never force-cleans active foreign leases on open PRs. ## Changes - `reviewer_pr_lease.py` — refuse `gitea_acquire_reviewer_pr_lease` on merged/closed PRs with `post_merge_moot` reason - `gitea_mcp_server.py` — post-merge moot lease assessment/cleanup tool path with read-first structured report - `tests/test_post_merge_moot_lease.py` — adoption refusal, safe cleanup, and open-PR foreign-lease protection ## Validation ```bash venv/bin/python -m pytest tests/test_post_merge_moot_lease.py -q ``` ## Worktree Lock: `/Users/jasonwalker/Development/Gitea-Tools/branches/issue-515-lock-scratch` Implementation: `/Users/jasonwalker/Development/Gitea-Tools/branches/issue-post-merge-moot-lease` @ `2faf18a`
jcwalker3 added 1 commit 2026-07-08 03:54:01 -05:00
feat: add safe post-merge moot lease cleanup for already-merged PRs (Closes #515) 2faf18a802 
Refuse merge-oriented reviewer-lease acquisition/adoption on an already
merged/closed PR, and add a read-first cleanup path for a lingering moot lease.

- reviewer_pr_lease.assess_acquire_lease: new pr_merged_or_closed flag; fail
  closed with a post_merge_moot reason and no lease body when the PR already
  merged/closed.
- reviewer_pr_lease.assess_post_merge_moot_lease: pure assessment. Only treats a
  lease as moot when the PR is merged/closed; never proposes touching an active
  lease on an open PR; provides a terminal phase:released (blocker:
  post-merge-moot) body to neutralise the moot lease append-only; idempotent
  once the released marker is the newest entry.
- gitea_acquire_reviewer_pr_lease: fetch live PR state, pass the flag, surface
  post_merge_moot on refusal (no comment posted).
- gitea_cleanup_post_merge_moot_lease: new read-first tool. Reports merged
  state, merge_commit_sha, linked-issue closure, lease-moot, cleanup
  performed/skipped, and no_merge_or_adoption. apply=True posts the released
  marker only when merged/closed with an active lease; refuses on open PRs.
- tests/test_post_merge_moot_lease.py: 10 tests covering acquire refusal on
  merged PR (no post), safe/idempotent cleanup, and open-PR foreign-lease
  protection.

No relaxation of #407 reviewer-lease or #16 gated-merge gates for open PRs.

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
sysadmin commented 2026-07-08 04:00:54 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #527
issue: #515
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 97778-e4b87fc07082
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr527
phase: claimed
candidate_head: 2faf18a802
target_branch: master
target_branch_sha: none
last_activity: 2026-07-08T09:00:54Z
expires_at: 2026-07-08T11:00:54Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #527 issue: #515 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 97778-e4b87fc07082 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr527 phase: claimed candidate_head: 2faf18a80213d7813ab36d08d0c9efa87c12d1d0 target_branch: master target_branch_sha: none last_activity: 2026-07-08T09:00:54Z expires_at: 2026-07-08T11:00:54Z blocker: none
sysadmin approved these changes 2026-07-08 04:01:36 -05:00
sysadmin left a comment
Owner
Copy Link
Copy Source

Review verdict: APPROVED

Reviewed head: 2faf18a80213d7813ab36d08d0c9efa87c12d1d0
Reviewer: sysadmin / prgs-reviewer
PR author: jcwalker3 (self-review: no)

Scope check

3 files, +494/-1 — tightly scoped to #515:

  • reviewer_pr_lease.py — acquire refusal + post-merge moot assessment
  • gitea_mcp_server.py — live PR state gate on acquire; new gitea_cleanup_post_merge_moot_lease tool
  • tests/test_post_merge_moot_lease.py — acceptance coverage

No changes to merge gates, lock store, or role capability maps.

Review focus

  1. Acquire fails closed on merged/closed PR — gitea_acquire_reviewer_pr_lease fetches live PR state; assess_acquire_lease(..., pr_merged_or_closed=True) blocks with post_merge_moot and posts no lease.
  2. Stale active lease assessable as moot — assess_post_merge_moot_lease reports is_moot/cleanup_allowed when PR is merged/closed and a non-terminal lease remains; newest-terminal entry short-circuits to idempotent "nothing to clean".
  3. No unsafe force-clean on open PRs — open PR path sets cleanup_allowed=false, refuses with "still open" reason; tests assert zero POSTs.
  4. PR #512 ambiguity — resolves the #6724-active / #6761-released split: if newest lease entry is terminal (released), assess reports resolved; if an older claimed still looks active, apply=true posts authoritative phase: released / blocker: post-merge-moot append-only marker.
  5. No authorization widening — cleanup tool gates on gitea.read + optional gitea.pr.comment only; never calls merge/adopt paths; acquire still requires reviewer/merger comment permission.
  6. Read-first / safe mutation — apply=false (default) is read-only; apply=true posts only when cleanup_allowed; no_merge_or_adoption always true.
  7. #526 registry intact — gitea_lock_issue remains @mcp.tool(); _list_open_pulls stays internal helper (registration tests pass).

Validation

py_compile gitea_mcp_server.py reviewer_pr_lease.py tests/test_post_merge_moot_lease.py  # OK
pytest tests/test_post_merge_moot_lease.py tests/test_lock_issue_mcp_registration.py tests/test_pr_work_lease.py tests/test_pr_lease_comments_non_list_guard.py -q  # 33 passed
git diff --check prgs/master...HEAD  # OK
secret/provenance scan  # no matches
pytest tests/ -q  # 1822 passed, 1 failed (pre-existing: test_merge_blocked_on_stale_approval_head on master)

Ready for merger with pinned head 2faf18a80213d7813ab36d08d0c9efa87c12d1d0.

## Review verdict: APPROVED **Reviewed head:** `2faf18a80213d7813ab36d08d0c9efa87c12d1d0` **Reviewer:** `sysadmin` / `prgs-reviewer` **PR author:** `jcwalker3` (self-review: no) ### Scope check 3 files, +494/-1 — tightly scoped to #515: - `reviewer_pr_lease.py` — acquire refusal + post-merge moot assessment - `gitea_mcp_server.py` — live PR state gate on acquire; new `gitea_cleanup_post_merge_moot_lease` tool - `tests/test_post_merge_moot_lease.py` — acceptance coverage No changes to merge gates, lock store, or role capability maps. ### Review focus 1. **Acquire fails closed on merged/closed PR** — `gitea_acquire_reviewer_pr_lease` fetches live PR state; `assess_acquire_lease(..., pr_merged_or_closed=True)` blocks with `post_merge_moot` and posts no lease. 2. **Stale active lease assessable as moot** — `assess_post_merge_moot_lease` reports `is_moot`/`cleanup_allowed` when PR is merged/closed and a non-terminal lease remains; newest-terminal entry short-circuits to idempotent "nothing to clean". 3. **No unsafe force-clean on open PRs** — open PR path sets `cleanup_allowed=false`, refuses with "still open" reason; tests assert zero POSTs. 4. **PR #512 ambiguity** — resolves the #6724-active / #6761-released split: if newest lease entry is terminal (`released`), assess reports resolved; if an older `claimed` still looks active, `apply=true` posts authoritative `phase: released` / `blocker: post-merge-moot` append-only marker. 5. **No authorization widening** — cleanup tool gates on `gitea.read` + optional `gitea.pr.comment` only; never calls merge/adopt paths; acquire still requires reviewer/merger comment permission. 6. **Read-first / safe mutation** — `apply=false` (default) is read-only; `apply=true` posts only when `cleanup_allowed`; `no_merge_or_adoption` always true. 7. **#526 registry intact** — `gitea_lock_issue` remains `@mcp.tool()`; `_list_open_pulls` stays internal helper (registration tests pass). ### Validation ``` py_compile gitea_mcp_server.py reviewer_pr_lease.py tests/test_post_merge_moot_lease.py # OK pytest tests/test_post_merge_moot_lease.py tests/test_lock_issue_mcp_registration.py tests/test_pr_work_lease.py tests/test_pr_lease_comments_non_list_guard.py -q # 33 passed git diff --check prgs/master...HEAD # OK secret/provenance scan # no matches pytest tests/ -q # 1822 passed, 1 failed (pre-existing: test_merge_blocked_on_stale_approval_head on master) ``` Ready for merger with pinned head `2faf18a80213d7813ab36d08d0c9efa87c12d1d0`.
sysadmin commented 2026-07-08 04:02:17 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #527
issue: #515
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 97778-e4b87fc07082
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merge-pr527
phase: claimed
candidate_head: 2faf18a802
target_branch: master
target_branch_sha: none
last_activity: 2026-07-08T09:02:16Z
expires_at: 2026-07-08T11:02:16Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #527 issue: #515 reviewer_identity: sysadmin profile: prgs-merger session_id: 97778-e4b87fc07082 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merge-pr527 phase: claimed candidate_head: 2faf18a80213d7813ab36d08d0c9efa87c12d1d0 target_branch: master target_branch_sha: none last_activity: 2026-07-08T09:02:16Z expires_at: 2026-07-08T11:02:16Z blocker: none
sysadmin commented 2026-07-08 04:02:21 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #527
issue: #515
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 97778-e4b87fc07082
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merge-pr527
phase: merge
candidate_head: 2faf18a802
target_branch: master
target_branch_sha: none
last_activity: 2026-07-08T09:02:20Z
expires_at: 2026-07-08T11:02:20Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #527 issue: #515 reviewer_identity: sysadmin profile: prgs-merger session_id: 97778-e4b87fc07082 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merge-pr527 phase: merge candidate_head: 2faf18a80213d7813ab36d08d0c9efa87c12d1d0 target_branch: master target_branch_sha: none last_activity: 2026-07-08T09:02:20Z expires_at: 2026-07-08T11:02:20Z blocker: none
sysadmin merged commit af938064cd into master 2026-07-08 04:02:24 -05:00
sysadmin commented 2026-07-08 04:02:24 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #527
issue: none
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 97778-e4b87fc07082
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-post-merge-moot-lease
phase: claimed
candidate_head: none
target_branch: master
target_branch_sha: none
last_activity: 2026-07-08T09:02:23Z
expires_at: 2026-07-08T11:02:23Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #527 issue: none reviewer_identity: sysadmin profile: prgs-reviewer session_id: 97778-e4b87fc07082 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-post-merge-moot-lease phase: claimed candidate_head: none target_branch: master target_branch_sha: none last_activity: 2026-07-08T09:02:23Z expires_at: 2026-07-08T11:02:23Z blocker: none
sysadmin commented 2026-07-08 04:05:15 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #527
issue: none
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 97778-e4b87fc07082
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-post-merge-moot-lease
phase: released
candidate_head: none
target_branch: master
target_branch_sha: none
last_activity: 2026-07-08T09:05:15Z
expires_at: 2026-07-08T11:05:15Z
blocker: post-merge-moot

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #527 issue: none reviewer_identity: sysadmin profile: prgs-reviewer session_id: 97778-e4b87fc07082 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-post-merge-moot-lease phase: released candidate_head: none target_branch: master target_branch_sha: none last_activity: 2026-07-08T09:05:15Z expires_at: 2026-07-08T11:05:15Z blocker: post-merge-moot
sysadmin commented 2026-07-08 04:13:49 -05:00
Owner
Copy Link
Copy Source

[CONTROLLER AUDIT] PR #527 / issue #515 — canonical closure

Verdict: All final-state checks PASS. Issue #515 is complete.

Canonical final state

Check Result
PR #527 merged/closed PASS — closed, merged 2026-07-08T04:02:24-05:00
Issue #515 closed PASS
Merge commit PASS — af938064cd7558872af888c41eef64380ff0a111
Merged head PASS — 2faf18a80213d7813ab36d08d0c9efa87c12d1d0
prgs/master contains approved head PASS — 2faf18a is ancestor of af93806
Merger identity PASS — sysadmin / prgs-merger (lease #6802/#6804)
PR author PASS — jcwalker3 (no self-merge)
Approval at current head PASS — APPROVED @ 2faf18a, not stale
Blocking REQUEST_CHANGES PASS — none
Issue lock #515 released on merge PASS — merger cleanup_status: released
No branch deletion / unrelated cleanup PASS — remote branch retained

Deliverable

PR #527 landed post-merge moot reviewer-lease handling (#515):

  • gitea_acquire_reviewer_pr_lease fails closed on merged/closed PRs
  • gitea_cleanup_post_merge_moot_lease provides read-first post-merge moot reconciliation

Follow-on capability

Post-merge moot reviewer lease reconciliation is now available for held stale leases (e.g. PR #512 comment #6724, where authoritative release #6761 already terminal).

Controller acceptance: Issue #515 closed by PR #527. No further merge/review action required.

## [CONTROLLER AUDIT] PR #527 / issue #515 — canonical closure **Verdict:** All final-state checks **PASS**. Issue #515 is complete. ### Canonical final state | Check | Result | |-------|--------| | PR #527 merged/closed | **PASS** — `closed`, merged `2026-07-08T04:02:24-05:00` | | Issue #515 closed | **PASS** | | Merge commit | **PASS** — `af938064cd7558872af888c41eef64380ff0a111` | | Merged head | **PASS** — `2faf18a80213d7813ab36d08d0c9efa87c12d1d0` | | `prgs/master` contains approved head | **PASS** — `2faf18a` is ancestor of `af93806` | | Merger identity | **PASS** — `sysadmin` / `prgs-merger` (lease #6802/#6804) | | PR author | **PASS** — `jcwalker3` (no self-merge) | | Approval at current head | **PASS** — APPROVED @ `2faf18a`, not stale | | Blocking REQUEST_CHANGES | **PASS** — none | | Issue lock #515 released on merge | **PASS** — merger `cleanup_status: released` | | No branch deletion / unrelated cleanup | **PASS** — remote branch retained | ### Deliverable PR #527 landed post-merge moot reviewer-lease handling (#515): - `gitea_acquire_reviewer_pr_lease` fails closed on merged/closed PRs - `gitea_cleanup_post_merge_moot_lease` provides read-first post-merge moot reconciliation ### Follow-on capability Post-merge moot reviewer lease reconciliation is now available for held stale leases (e.g. PR #512 comment **#6724**, where authoritative release **#6761** already terminal). **Controller acceptance:** Issue #515 closed by PR #527. No further merge/review action required.
sysadmin commented 2026-07-08 09:58:58 -05:00
Owner
Copy Link
Copy Source

Reviewer Handoff Comment (PR #527)

  • Review Outcome: APPROVE-equivalent, but formal submission moot because PR #527 had already merged.
  • PR #527 Status: Merged at af938064cd7558872af888c41eef64380ff0a111.
  • Issue #515 Status: Closed.
  • Validation: py_compile passed, targeted pytest passed (10 tests), full suite passed (1822 passed, 6 skipped), diff-check clean.
  • Baseline Proof: test_merge_blocked_on_stale_approval_head failure reproduced at base commit 236c8b7, confirming it is pre-existing and not caused by #527.
  • Acceptance Criteria Met:
    • Lease acquire fails closed on merged/closed PRs.
    • Post-merge moot lease cleanup is read-first, gated, and append-only.
    • Open-PR foreign lease is never cleaned.
    • Cleanup is idempotent through terminal-phase checks.
  • Moot Lease: Active moot lease remains on Gitea and must be handled by reconciler, not reviewer.

WHO_IS_NEXT: Reconciler
NEXT_PROMPT: Reconciler should run post-merge moot lease cleanup:

gitea_cleanup_post_merge_moot_lease(pr_number=527, apply=True, remote=prgs, org=Scaled-Tech-Consulting, repo=Gitea-Tools)
### Reviewer Handoff Comment (PR #527) - **Review Outcome**: APPROVE-equivalent, but formal submission moot because PR #527 had already merged. - **PR #527 Status**: Merged at `af938064cd7558872af888c41eef64380ff0a111`. - **Issue #515 Status**: Closed. - **Validation**: py_compile passed, targeted pytest passed (10 tests), full suite passed (1822 passed, 6 skipped), diff-check clean. - **Baseline Proof**: `test_merge_blocked_on_stale_approval_head` failure reproduced at base commit `236c8b7`, confirming it is pre-existing and not caused by #527. - **Acceptance Criteria Met**: - Lease acquire fails closed on merged/closed PRs. - Post-merge moot lease cleanup is read-first, gated, and append-only. - Open-PR foreign lease is never cleaned. - Cleanup is idempotent through terminal-phase checks. - **Moot Lease**: Active moot lease remains on Gitea and must be handled by reconciler, not reviewer. **WHO_IS_NEXT**: Reconciler **NEXT_PROMPT**: Reconciler should run post-merge moot lease cleanup: ```text gitea_cleanup_post_merge_moot_lease(pr_number=527, apply=True, remote=prgs, org=Scaled-Tech-Consulting, repo=Gitea-Tools) ```
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
Due Date
No due date set.
Dependencies

No dependencies set.

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