feat: require post-merge cleanup safety-gate proof in reviewer reports (Closes #402) #415

Merged

sysadmin merged 3 commits from feat/issue-402-post-merge-cleanup-proof into master 2026-07-08 03:13:43 -05:00

Conversation 2 Commits 3 Files Changed 4

+458

jcwalker3 commented 2026-07-07 10:41:54 -05:00

Owner

Copy Link

Copy Source

Summary

Closes #402.

Reviewer final reports could claim post-merge remote branch deletion and local worktree removal without proving the safety gates that make that cleanup safe. This PR adds report-time validation for the cleanup checklist.

Changes

• post_merge_cleanup_proof.py — branch deletion and worktree removal checklist verifier with CLEANUP_SKIPPED outcome support
• final_report_validator.py — reviewer.post_merge_cleanup_proof rule for review_pr handoffs
• review-merge-pr.md — §28A documents the cleanup proof checklist
• Tests: tests/test_post_merge_cleanup_proof.py (15 cases)

Validation

python3 -m unittest tests.test_post_merge_cleanup_proof -v

All 15 tests passed.

Worktree

branches/feat-issue-402-post-merge-cleanup-proof @ aa1baf8

## Summary Closes #402. Reviewer final reports could claim post-merge remote branch deletion and local worktree removal without proving the safety gates that make that cleanup safe. This PR adds report-time validation for the cleanup checklist. ## Changes - post_merge_cleanup_proof.py — branch deletion and worktree removal checklist verifier with CLEANUP_SKIPPED outcome support - final_report_validator.py — reviewer.post_merge_cleanup_proof rule for review_pr handoffs - review-merge-pr.md — §28A documents the cleanup proof checklist - Tests: tests/test_post_merge_cleanup_proof.py (15 cases) ## Validation python3 -m unittest tests.test_post_merge_cleanup_proof -v All 15 tests passed. ## Worktree branches/feat-issue-402-post-merge-cleanup-proof @ aa1baf8

jcwalker3 referenced this issue from a commit 2026-07-07 12:08:00 -05:00

fix: resolve conflicts for PR #415

jcwalker3 force-pushed feat/issue-402-post-merge-cleanup-proof from aa1baf8fe9 to 74f2db4d6a 2026-07-07 12:08:00 -05:00 Compare

jcwalker3 referenced this issue from a commit 2026-07-07 16:19:52 -05:00

fix: resolve conflicts for PR #415

jcwalker3 added 2 commits 2026-07-07 16:19:52 -05:00

feat: require post-merge cleanup safety-gate proof in reviewer reports (Closes #402) ... d5dc9f2708

Adds post_merge_cleanup_proof validation so cleanup claims must carry the
branch deletion and worktree removal checklists, or report CLEANUP_SKIPPED
with an exact blocker.

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>

fix: resolve conflicts for PR #415 ... 44a7c62dc3

Rebase onto current prgs/master and fix cleanup-mutations regex so
"Cleanup mutations: none" does not false-positive the proof checklist.

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>

jcwalker3 force-pushed feat/issue-402-post-merge-cleanup-proof from 74f2db4d6a to 44a7c62dc3 2026-07-07 16:19:52 -05:00 Compare

jcwalker3 commented 2026-07-08 01:20:13 -05:00

Author

Owner

Copy Link

Copy Source

pr: #415
branch: feat/issue-402-post-merge-cleanup-proof
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/fix-pr415-conflicts
profile: prgs-author
session_id: unknown
phase: claimed
head_before: 44a7c62dc3
expires_at: 2026-07-08T08:20:13Z
reviewer_active: no

<!-- mcp-conflict-fix-lease:v1 --> pr: #415 branch: feat/issue-402-post-merge-cleanup-proof worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/fix-pr415-conflicts profile: prgs-author session_id: unknown phase: claimed head_before: 44a7c62dc3648291bb68bc5080fc01d548607ce7 expires_at: 2026-07-08T08:20:13Z reviewer_active: no

jcwalker3 referenced this issue from a commit 2026-07-08 01:20:39 -05:00

fix: resolve conflicts for PR #415

jcwalker3 added 1 commit 2026-07-08 01:20:39 -05:00

fix: resolve conflicts for PR #415 d6b1e4be3c

sysadmin approved these changes 2026-07-08 03:02:47 -05:00

sysadmin left a comment

Owner

Copy Link

Copy Source

APPROVED: PR #415 correctly implements post-merge cleanup safety-gate validation and schema requirements. All tests pass with no regressions.

CLEANUP_SKIPPED
cleanup blocker: PR #415 is not merged yet.

APPROVED: PR #415 correctly implements post-merge cleanup safety-gate validation and schema requirements. All tests pass with no regressions. CLEANUP_SKIPPED cleanup blocker: PR #415 is not merged yet.

sysadmin merged commit 4d24c34548 into master 2026-07-08 03:13:43 -05:00

jcwalker3 referenced this pull request 2026-07-08 03:38:02 -05:00

Allow reconciler profile to run merged cleanup without switching to author #523

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#415