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

feat: guard merged branch cleanup path #516

Merged
sysadmin merged 8 commits from feat/issue-514-branch-delete-guard into master 2026-07-09 10:45:06 -05:00
Conversation 19 Commits 8 Files Changed 7
+457 -1
jcwalker3 commented 2026-07-08 03:18:46 -05:00
Owner
Copy Link
Copy Source

Summary

  • Add a guarded gitea_cleanup_merged_pr_branch MCP path for merged PR source branch cleanup with explicit gitea.branch.delete authority, branches/ worktree enforcement, merged/open-PR/ancestry checks, and exact confirmation text.
  • Add final-report detection for raw git branch deletion commands so git branch -d, git push --delete, and colon-ref deletes are not accepted as authorized cleanup proof.
  • Register the cleanup task as reconciler-scoped and update reviewer handoff guidance to keep review mutations separate from cleanup mutations.

Closes #514

Validation

  • PASS: /Users/jasonwalker/Development/Gitea-Tools/venv/bin/python -m py_compile branch_cleanup_guard.py gitea_mcp_server.py final_report_validator.py task_capability_map.py role_session_router.py tests/test_branch_cleanup_guard.py
  • PASS: /Users/jasonwalker/Development/Gitea-Tools/venv/bin/python -m pytest tests/test_branch_cleanup_guard.py tests/test_delete_branch_capability.py tests/test_resolve_task_capability.py tests/test_role_session_router.py tests/test_final_report_validator.py tests/test_post_merge_cleanup_proof.py -q (98 passed, 3 subtests passed)
  • PASS: git diff --check
  • FULL SUITE: /Users/jasonwalker/Development/Gitea-Tools/venv/bin/python -m pytest -q -> 1804 passed, 6 skipped, 1 known failure: tests/test_mcp_server.py::TestMergePR::test_merge_blocked_on_stale_approval_head
  • BASELINE: The same stale-approval merge test fails on clean prgs/master at 4d24c34, so it is not introduced by this PR.

LLM Metadata

  • Model: GPT-5 Codex
  • Worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-514-branch-delete-guard
  • Branch: feat/issue-514-branch-delete-guard
  • Issue lock: #514 active via gitea_lock_issue
  • Duplicate gates: selection, commit, and PR creation all clear
## Summary - Add a guarded `gitea_cleanup_merged_pr_branch` MCP path for merged PR source branch cleanup with explicit `gitea.branch.delete` authority, `branches/` worktree enforcement, merged/open-PR/ancestry checks, and exact confirmation text. - Add final-report detection for raw git branch deletion commands so `git branch -d`, `git push --delete`, and colon-ref deletes are not accepted as authorized cleanup proof. - Register the cleanup task as reconciler-scoped and update reviewer handoff guidance to keep review mutations separate from cleanup mutations. Closes #514 ## Validation - PASS: `/Users/jasonwalker/Development/Gitea-Tools/venv/bin/python -m py_compile branch_cleanup_guard.py gitea_mcp_server.py final_report_validator.py task_capability_map.py role_session_router.py tests/test_branch_cleanup_guard.py` - PASS: `/Users/jasonwalker/Development/Gitea-Tools/venv/bin/python -m pytest tests/test_branch_cleanup_guard.py tests/test_delete_branch_capability.py tests/test_resolve_task_capability.py tests/test_role_session_router.py tests/test_final_report_validator.py tests/test_post_merge_cleanup_proof.py -q` (98 passed, 3 subtests passed) - PASS: `git diff --check` - FULL SUITE: `/Users/jasonwalker/Development/Gitea-Tools/venv/bin/python -m pytest -q` -> 1804 passed, 6 skipped, 1 known failure: `tests/test_mcp_server.py::TestMergePR::test_merge_blocked_on_stale_approval_head` - BASELINE: The same stale-approval merge test fails on clean `prgs/master` at `4d24c34`, so it is not introduced by this PR. ## LLM Metadata - Model: GPT-5 Codex - Worktree: `/Users/jasonwalker/Development/Gitea-Tools/branches/issue-514-branch-delete-guard` - Branch: `feat/issue-514-branch-delete-guard` - Issue lock: #514 active via `gitea_lock_issue` - Duplicate gates: selection, commit, and PR creation all clear
jcwalker3 added 1 commit 2026-07-08 03:18:46 -05:00
feat: guard merged branch cleanup path 3cb05284b3 
Closes #514
jcwalker3 added 1 commit 2026-07-08 10:10:23 -05:00
fix: resolve conflicts for PR #516 3550262613 
Merge prgs/master into feat/issue-514-branch-delete-guard and preserve PR intent
alongside compatible master guardrails.
jcwalker3 commented 2026-07-08 21:31:27 -05:00
Author
Owner
Copy Link
Copy Source

pr: #516
branch: feat/issue-514-branch-delete-guard
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-514-branch-delete-guard
profile: prgs-author
session_id: unknown
phase: claimed
head_before: 3550262613
expires_at: 2026-07-09T04:31:27Z
reviewer_active: no

<!-- mcp-conflict-fix-lease:v1 --> pr: #516 branch: feat/issue-514-branch-delete-guard worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-514-branch-delete-guard profile: prgs-author session_id: unknown phase: claimed head_before: 355026261324602ac98ca4732680e2d7c99ff4cf expires_at: 2026-07-09T04:31:27Z reviewer_active: no
jcwalker3 added 1 commit 2026-07-08 21:32:28 -05:00
fix: resolve conflicts for PR #516 09d8db5b9e 
Merge prgs/master into PR branch to restore mergeability.

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
jcwalker3 added 1 commit 2026-07-08 21:33:33 -05:00
fix: re-resolve conflicts for PR #516 after master advance d57ca94ec5
sysadmin commented 2026-07-08 22:02:12 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #516
issue: #514
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 10371-bc73a2a41c79
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-feat-issue-514-branch-delete-guard
phase: claimed
candidate_head: d57ca94ec5
target_branch: master
target_branch_sha: none
last_activity: 2026-07-09T03:02:12Z
expires_at: 2026-07-09T05:02:12Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #516 issue: #514 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 10371-bc73a2a41c79 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-feat-issue-514-branch-delete-guard phase: claimed candidate_head: d57ca94ec5b8cffa45a3842d32367acf93ca1b97 target_branch: master target_branch_sha: none last_activity: 2026-07-09T03:02:12Z expires_at: 2026-07-09T05:02:12Z blocker: none
sysadmin commented 2026-07-08 22:07:31 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #516
issue: #514
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 10371-bc73a2a41c79
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-feat-issue-514-branch-delete-guard
phase: released
candidate_head: d57ca94ec5
target_branch: master
target_branch_sha: none
last_activity: 2026-07-09T03:07:30Z
expires_at: 2026-07-09T05:07:30Z
blocker: manual-release

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #516 issue: #514 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 10371-bc73a2a41c79 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-feat-issue-514-branch-delete-guard phase: released candidate_head: d57ca94ec5b8cffa45a3842d32367acf93ca1b97 target_branch: master target_branch_sha: none last_activity: 2026-07-09T03:07:30Z expires_at: 2026-07-09T05:07:30Z blocker: manual-release
sysadmin added 1 commit 2026-07-08 22:45:21 -05:00
Merge branch 'master' into feat/issue-514-branch-delete-guard d9cf26ddbf
jcwalker3 added 1 commit 2026-07-09 07:35:33 -05:00
Merge remote-tracking branch 'prgs/master' into feat/issue-514-branch-delete-guard 62ab4b4d95 
# Conflicts:
#	gitea_mcp_server.py
jcwalker3 added 1 commit 2026-07-09 08:13:35 -05:00
Merge remote-tracking branch 'prgs/master' into feat/issue-514-branch-delete-guard 7acd55d2d2 
# Conflicts:
#	final_report_validator.py
sysadmin commented 2026-07-09 08:28:32 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #516
issue: #514
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: continue-prgs-rc-516
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-514-branch-delete-guard
phase: claimed
candidate_head: 7acd55d2d2
target_branch: master
target_branch_sha: none
last_activity: 2026-07-09T13:28:31Z
expires_at: 2026-07-09T15:28:31Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #516 issue: #514 reviewer_identity: sysadmin profile: prgs-reviewer session_id: continue-prgs-rc-516 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-514-branch-delete-guard phase: claimed candidate_head: 7acd55d2d2e2aaf3ac6378dc853f85034ebafb1a target_branch: master target_branch_sha: none last_activity: 2026-07-09T13:28:31Z expires_at: 2026-07-09T15:28:31Z blocker: none
sysadmin commented 2026-07-09 08:29:02 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #516
issue: #514
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: continue-prgs-rc-516
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-514-branch-delete-guard
phase: claimed
candidate_head: 7acd55d2d2
target_branch: master
target_branch_sha: none
last_activity: 2026-07-09T13:29:01Z
expires_at: 2026-07-09T15:29:01Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #516 issue: #514 reviewer_identity: sysadmin profile: prgs-reviewer session_id: continue-prgs-rc-516 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-514-branch-delete-guard phase: claimed candidate_head: 7acd55d2d2e2aaf3ac6378dc853f85034ebafb1a target_branch: master target_branch_sha: none last_activity: 2026-07-09T13:29:01Z expires_at: 2026-07-09T15:29:01Z blocker: none
sysadmin requested changes 2026-07-09 08:29:12 -05:00
Dismissed
sysadmin left a comment
Owner
Copy Link
Copy Source

Review REQUEST_CHANGES — PR #516

Cannot approve while the PR is not mergeable against current master.

Blockers

  1. Gitea reports Conflicted / Not Mergeable against master.
  2. Local merge of prgs/master into head 7acd55d2d2e2aaf3ac6378dc853f85034ebafb1a conflicts in gitea_mcp_server.py.
  3. Branch is behind current master; needs author-side resolution + re-push.

Canonical PR State

STATE: blocked on merge conflicts with master
WHO_IS_NEXT: author
NEXT_ACTION: merge or rebase onto current prgs/master, resolve gitea_mcp_server.py conflicts, re-run claimed pytest suite, push, request re-review
NEXT_PROMPT:

Fix PR #516 conflicts with master on branch feat/issue-514-branch-delete-guard (gitea_mcp_server.py). Rebase or merge prgs/master, resolve conflicts, re-run pytest tests/test_branch_cleanup_guard.py tests/test_delete_branch_capability.py tests/test_resolve_task_capability.py tests/test_role_session_router.py tests/test_final_report_validator.py tests/test_post_merge_cleanup_proof.py -q, push, and hand off for re-review.

WHAT_HAPPENED: Reviewer attempted review; PR not mergeable; local master merge conflicts in gitea_mcp_server.py
WHY: Master advanced with #511 and other merges; tip needs conflict resolution before review can complete
ISSUE: #514
HEAD_SHA: 7acd55d2d2
REVIEW_STATUS: REQUEST_CHANGES
MERGE_READY: no
BLOCKERS: merge conflict with master in gitea_mcp_server.py — unblocks when author merges/rebases prgs/master, resolves conflicts, pushes a mergeable tip, and re-requests review
VALIDATION: not re-run at conflicted tip; prior author claim was 98 passed on older base
LAST_UPDATED_BY: sysadmin (prgs-reviewer)

## Review REQUEST_CHANGES — PR #516 Cannot approve while the PR is not mergeable against current master. ### Blockers 1. Gitea reports Conflicted / Not Mergeable against master. 2. Local merge of prgs/master into head `7acd55d2d2e2aaf3ac6378dc853f85034ebafb1a` conflicts in `gitea_mcp_server.py`. 3. Branch is behind current master; needs author-side resolution + re-push. ## Canonical PR State STATE: blocked on merge conflicts with master WHO_IS_NEXT: author NEXT_ACTION: merge or rebase onto current prgs/master, resolve gitea_mcp_server.py conflicts, re-run claimed pytest suite, push, request re-review NEXT_PROMPT: ```text Fix PR #516 conflicts with master on branch feat/issue-514-branch-delete-guard (gitea_mcp_server.py). Rebase or merge prgs/master, resolve conflicts, re-run pytest tests/test_branch_cleanup_guard.py tests/test_delete_branch_capability.py tests/test_resolve_task_capability.py tests/test_role_session_router.py tests/test_final_report_validator.py tests/test_post_merge_cleanup_proof.py -q, push, and hand off for re-review. ``` WHAT_HAPPENED: Reviewer attempted review; PR not mergeable; local master merge conflicts in gitea_mcp_server.py WHY: Master advanced with #511 and other merges; tip needs conflict resolution before review can complete ISSUE: #514 HEAD_SHA: 7acd55d2d2e2aaf3ac6378dc853f85034ebafb1a REVIEW_STATUS: REQUEST_CHANGES MERGE_READY: no BLOCKERS: merge conflict with master in gitea_mcp_server.py — unblocks when author merges/rebases prgs/master, resolves conflicts, pushes a mergeable tip, and re-requests review VALIDATION: not re-run at conflicted tip; prior author claim was 98 passed on older base LAST_UPDATED_BY: sysadmin (prgs-reviewer)
sysadmin commented 2026-07-09 08:51:43 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #516
issue: #514
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: continue-prgs-rc-516
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-514-branch-delete-guard
phase: claimed
candidate_head: 7acd55d2d2
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T13:51:41Z
expires_at: 2026-07-09T15:51:41Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #516 issue: #514 reviewer_identity: sysadmin profile: prgs-reviewer session_id: continue-prgs-rc-516 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-514-branch-delete-guard phase: claimed candidate_head: 7acd55d2d2e2aaf3ac6378dc853f85034ebafb1a target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T13:51:41Z expires_at: 2026-07-09T15:51:41Z blocker: none
sysadmin commented 2026-07-09 08:51:56 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #516
issue: #514
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: continue-prgs-rc-516
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-514-branch-delete-guard
phase: released
candidate_head: 7acd55d2d2
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T13:51:54Z
expires_at: 2026-07-09T15:51:54Z
blocker: manual-release

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #516 issue: #514 reviewer_identity: sysadmin profile: prgs-reviewer session_id: continue-prgs-rc-516 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-514-branch-delete-guard phase: released candidate_head: 7acd55d2d2e2aaf3ac6378dc853f85034ebafb1a target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T13:51:54Z expires_at: 2026-07-09T15:51:54Z blocker: manual-release
jcwalker3 added 1 commit 2026-07-09 08:59:18 -05:00
Merge remote-tracking branch 'prgs/master' into feat/issue-514-branch-delete-guard d7c29afde5 
# Conflicts:
#	gitea_mcp_server.py
sysadmin commented 2026-07-09 09:57:29 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #516
issue: #514
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: continue-prgs-rc-516
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-516-branch-delete-guard
phase: claimed
candidate_head: d7c29afde5
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T14:57:28Z
expires_at: 2026-07-09T16:57:28Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #516 issue: #514 reviewer_identity: sysadmin profile: prgs-reviewer session_id: continue-prgs-rc-516 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-516-branch-delete-guard phase: claimed candidate_head: d7c29afde5ec2b6aee471da9070d502806d77f79 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T14:57:28Z expires_at: 2026-07-09T16:57:28Z blocker: none
sysadmin commented 2026-07-09 10:01:58 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #516
issue: #514
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: continue-prgs-rc-516
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-516-branch-delete-guard
phase: claimed
candidate_head: d7c29afde5
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T15:01:55Z
expires_at: 2026-07-09T17:01:55Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #516 issue: #514 reviewer_identity: sysadmin profile: prgs-reviewer session_id: continue-prgs-rc-516 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-516-branch-delete-guard phase: claimed candidate_head: d7c29afde5ec2b6aee471da9070d502806d77f79 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T15:01:55Z expires_at: 2026-07-09T17:01:55Z blocker: none
sysadmin commented 2026-07-09 10:02:42 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #516
issue: #514
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: continue-prgs-rc-516
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-516-branch-delete-guard
phase: claimed
candidate_head: d7c29afde5
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T15:02:41Z
expires_at: 2026-07-09T17:02:41Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #516 issue: #514 reviewer_identity: sysadmin profile: prgs-reviewer session_id: continue-prgs-rc-516 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-516-branch-delete-guard phase: claimed candidate_head: d7c29afde5ec2b6aee471da9070d502806d77f79 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T15:02:41Z expires_at: 2026-07-09T17:02:41Z blocker: none
sysadmin approved these changes 2026-07-09 10:03:16 -05:00
Dismissed
sysadmin left a comment
Owner
Copy Link
Copy Source

Canonical PR State

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

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

WHAT_HAPPENED: Reviewed PR #516 for issue #514; approved head d7c29afde5.
WHY: Guarded merged-branch cleanup path is reconciler-scoped with confirmation text, ancestry/open-PR checks, and final-report block on raw git deletes.
ISSUE: #514
HEAD_SHA: d7c29afde5
REVIEW_STATUS: APPROVED
MERGE_READY: yes (awaiting explicit merge authorization)
BLOCKERS: none
VALIDATION: pytest branch_cleanup_guard + related suites -> 88 passed, 3 subtests
LAST_UPDATED_BY: sysadmin (prgs-reviewer)

Review notes

  • Not self-review (author jcwalker3).
## Canonical PR State STATE: review-approved WHO_IS_NEXT: merger NEXT_ACTION: merge PR #516 after explicit operator authorization NEXT_PROMPT: ```text Use prgs-merger on remote=prgs org=Scaled-Tech-Consulting repo=Gitea-Tools. Merge PR #516 at expected_head_sha=d7c29afde5ec2b6aee471da9070d502806d77f79 only if still approved and mergeable. ``` WHAT_HAPPENED: Reviewed PR #516 for issue #514; approved head d7c29afde5ec2b6aee471da9070d502806d77f79. WHY: Guarded merged-branch cleanup path is reconciler-scoped with confirmation text, ancestry/open-PR checks, and final-report block on raw git deletes. ISSUE: #514 HEAD_SHA: d7c29afde5ec2b6aee471da9070d502806d77f79 REVIEW_STATUS: APPROVED MERGE_READY: yes (awaiting explicit merge authorization) BLOCKERS: none VALIDATION: pytest branch_cleanup_guard + related suites -> 88 passed, 3 subtests LAST_UPDATED_BY: sysadmin (prgs-reviewer) ## Review notes - Not self-review (author jcwalker3).
sysadmin commented 2026-07-09 10:03:30 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #516
issue: #514
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: continue-prgs-rc-516
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-516-branch-delete-guard
phase: claimed
candidate_head: d7c29afde5
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T15:03:30Z
expires_at: 2026-07-09T17:03:30Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #516 issue: #514 reviewer_identity: sysadmin profile: prgs-reviewer session_id: continue-prgs-rc-516 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-516-branch-delete-guard phase: claimed candidate_head: d7c29afde5ec2b6aee471da9070d502806d77f79 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T15:03:30Z expires_at: 2026-07-09T17:03:30Z blocker: none
sysadmin approved these changes 2026-07-09 10:04:34 -05:00
sysadmin left a comment
Owner
Copy Link
Copy Source

Canonical PR State

STATE:
approved

WHO_IS_NEXT:
merger

NEXT_ACTION:
Merge PR #516 with expected head SHA d7c29afde5 after controller authorization.

NEXT_PROMPT:

Use the merger profile on prgs. Merge PR #516 (feat/issue-514-branch-delete-guard) into master only if still open and head is d7c29afde5ec2b6aee471da9070d502806d77f79. Do not force-push.

WHAT_HAPPENED:
Reviewer approved PR #516. Guarded merged-branch cleanup path and raw git delete bypass detection match #514 intent; tests pass.

WHY:
Scope is limited to cleanup guard + MCP tool + capability map + final-report gate + docs. Fail-closed on reviewer role, missing branch.delete, root checkout, unmerged PR, protected branches, open-head collision, missing ancestry, and exact confirmation text. Reconciler-scoped as required.

ISSUE:
#514

BASE:
master

HEAD:
feat/issue-514-branch-delete-guard

HEAD_SHA:
d7c29afde5

REVIEW_STATUS:
approved

VALIDATION:
pytest tests/test_branch_cleanup_guard.py -q → 7 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.

Non-blocking: ancestry check uses PROJECT_ROOT git context (existing pattern); PR has several master-merge commits for conflict resolution only.

## Canonical PR State STATE: approved WHO_IS_NEXT: merger NEXT_ACTION: Merge PR #516 with expected head SHA d7c29afde5ec2b6aee471da9070d502806d77f79 after controller authorization. NEXT_PROMPT: ```text Use the merger profile on prgs. Merge PR #516 (feat/issue-514-branch-delete-guard) into master only if still open and head is d7c29afde5ec2b6aee471da9070d502806d77f79. Do not force-push. ``` WHAT_HAPPENED: Reviewer approved PR #516. Guarded merged-branch cleanup path and raw git delete bypass detection match #514 intent; tests pass. WHY: Scope is limited to cleanup guard + MCP tool + capability map + final-report gate + docs. Fail-closed on reviewer role, missing branch.delete, root checkout, unmerged PR, protected branches, open-head collision, missing ancestry, and exact confirmation text. Reconciler-scoped as required. ISSUE: #514 BASE: master HEAD: feat/issue-514-branch-delete-guard HEAD_SHA: d7c29afde5ec2b6aee471da9070d502806d77f79 REVIEW_STATUS: approved VALIDATION: pytest tests/test_branch_cleanup_guard.py -q → 7 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. Non-blocking: ancestry check uses PROJECT_ROOT git context (existing pattern); PR has several master-merge commits for conflict resolution only.
sysadmin commented 2026-07-09 10:05:42 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #516
issue: #514
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: continue-prgs-rc-516
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-516-branch-delete-guard
phase: released
candidate_head: d7c29afde5
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T15:05:40Z
expires_at: 2026-07-09T17:05:40Z
blocker: manual-release

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #516 issue: #514 reviewer_identity: sysadmin profile: prgs-reviewer session_id: continue-prgs-rc-516 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-516-branch-delete-guard phase: released candidate_head: d7c29afde5ec2b6aee471da9070d502806d77f79 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T15:05:40Z expires_at: 2026-07-09T17:05:40Z blocker: manual-release
sysadmin commented 2026-07-09 10:38:01 -05:00
Owner
Copy Link
Copy Source

adopted_at: 2026-07-09T15:38:00Z
adopted_by_identity: sysadmin
adopted_by_profile: prgs-merger
adopted_from_session_id: continue-prgs-rc-516
adopted_from_profile: prgs-reviewer
adopted_from_reviewer_identity: sysadmin
adopted_from_comment_id: 8177
adoption_reason: merger-handoff-approved-head

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #516
issue: #514
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 91637-6176639e7f06
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merge-pr-516-branch-delete-guard
phase: adopted
candidate_head: d7c29afde5
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T15:38:00Z
expires_at: 2026-07-09T17:38:00Z
blocker: none

<!-- mcp-review-lease-adoption:v1 --> adopted_at: 2026-07-09T15:38:00Z adopted_by_identity: sysadmin adopted_by_profile: prgs-merger adopted_from_session_id: continue-prgs-rc-516 adopted_from_profile: prgs-reviewer adopted_from_reviewer_identity: sysadmin adopted_from_comment_id: 8177 adoption_reason: merger-handoff-approved-head <!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #516 issue: #514 reviewer_identity: sysadmin profile: prgs-merger session_id: 91637-6176639e7f06 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merge-pr-516-branch-delete-guard phase: adopted candidate_head: d7c29afde5ec2b6aee471da9070d502806d77f79 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T15:38:00Z expires_at: 2026-07-09T17:38:00Z blocker: none
sysadmin commented 2026-07-09 10:38:49 -05:00
Owner
Copy Link
Copy Source

adopted_at: 2026-07-09T15:38:48Z
adopted_by_identity: sysadmin
adopted_by_profile: prgs-merger
adopted_from_session_id: 91637-6176639e7f06
adopted_from_profile: prgs-merger
adopted_from_reviewer_identity: sysadmin
adopted_from_comment_id: 8201
adoption_reason: merger-handoff-approved-head

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #516
issue: #514
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 1956-a0e5513faf75
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merger-queue
phase: adopted
candidate_head: d7c29afde5
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T15:38:48Z
expires_at: 2026-07-09T17:38:48Z
blocker: none

<!-- mcp-review-lease-adoption:v1 --> adopted_at: 2026-07-09T15:38:48Z adopted_by_identity: sysadmin adopted_by_profile: prgs-merger adopted_from_session_id: 91637-6176639e7f06 adopted_from_profile: prgs-merger adopted_from_reviewer_identity: sysadmin adopted_from_comment_id: 8201 adoption_reason: merger-handoff-approved-head <!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #516 issue: #514 reviewer_identity: sysadmin profile: prgs-merger session_id: 1956-a0e5513faf75 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merger-queue phase: adopted candidate_head: d7c29afde5ec2b6aee471da9070d502806d77f79 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T15:38:48Z expires_at: 2026-07-09T17:38:48Z blocker: none
sysadmin commented 2026-07-09 10:43:46 -05:00
Owner
Copy Link
Copy Source

adopted_at: 2026-07-09T15:43:45Z
adopted_by_identity: sysadmin
adopted_by_profile: prgs-merger
adopted_from_session_id: 1956-a0e5513faf75
adopted_from_profile: prgs-merger
adopted_from_reviewer_identity: sysadmin
adopted_from_comment_id: 8208
adoption_reason: merger-handoff-approved-head

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #516
issue: #514
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 31616-825c35d82173
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merger-queue
phase: adopted
candidate_head: d7c29afde5
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T15:43:45Z
expires_at: 2026-07-09T17:43:45Z
blocker: none

<!-- mcp-review-lease-adoption:v1 --> adopted_at: 2026-07-09T15:43:45Z adopted_by_identity: sysadmin adopted_by_profile: prgs-merger adopted_from_session_id: 1956-a0e5513faf75 adopted_from_profile: prgs-merger adopted_from_reviewer_identity: sysadmin adopted_from_comment_id: 8208 adoption_reason: merger-handoff-approved-head <!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #516 issue: #514 reviewer_identity: sysadmin profile: prgs-merger session_id: 31616-825c35d82173 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merger-queue phase: adopted candidate_head: d7c29afde5ec2b6aee471da9070d502806d77f79 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T15:43:45Z expires_at: 2026-07-09T17:43:45Z blocker: none
sysadmin commented 2026-07-09 10:44:30 -05:00
Owner
Copy Link
Copy Source

adopted_at: 2026-07-09T15:44:29Z
adopted_by_identity: sysadmin
adopted_by_profile: prgs-merger
adopted_from_session_id: 31616-825c35d82173
adopted_from_profile: prgs-merger
adopted_from_reviewer_identity: sysadmin
adopted_from_comment_id: 8217
adoption_reason: merger-handoff-approved-head

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #516
issue: #514
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 1956-a0e5513faf75
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merger-queue
phase: adopted
candidate_head: d7c29afde5
target_branch: master
target_branch_sha: cc4b95839d
last_activity: 2026-07-09T15:44:29Z
expires_at: 2026-07-09T17:44:29Z
blocker: none

<!-- mcp-review-lease-adoption:v1 --> adopted_at: 2026-07-09T15:44:29Z adopted_by_identity: sysadmin adopted_by_profile: prgs-merger adopted_from_session_id: 31616-825c35d82173 adopted_from_profile: prgs-merger adopted_from_reviewer_identity: sysadmin adopted_from_comment_id: 8217 adoption_reason: merger-handoff-approved-head <!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #516 issue: #514 reviewer_identity: sysadmin profile: prgs-merger session_id: 1956-a0e5513faf75 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merger-queue phase: adopted candidate_head: d7c29afde5ec2b6aee471da9070d502806d77f79 target_branch: master target_branch_sha: cc4b95839dce8715d2d0ca6764e5e927968ae2ae last_activity: 2026-07-09T15:44:29Z expires_at: 2026-07-09T17:44:29Z blocker: none
sysadmin merged commit 8d1098f916 into master 2026-07-09 10:45:06 -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
Due Date
No due date set.
Dependencies

No dependencies set.

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