fix: enforce merger role boundaries (Closes #539) #596
Labels
Clear labels
allocator
anti-stomp
architecture
bug
chore
codex
concurrency
contamination
control-plane
dashboard
database
design
documentation
enhancement
gitea
glitchtip
important
incident
incident-bridge
integration
jenkins
labels
leases
mcp
mcp-health
mcp-menu
multi-project
mutating
nice-to-have
observability
portability
preflight
protected-branch
queue
read-only
reconnect
recovery
refactor
release
reliability
resumable-review
reviewer
roadmap
safety
security
self-hosted
sentry
stale-runtime
status:blocked
status:in-progress
status:pr-open
status:ready
terminal-lock
testing
tracker
type:bug
type:feature
type:feature
type:guardrail
visibility
workflow
workflow-hardening
workflow-hardening
Controller-owned work allocator
Prevent concurrent LLM session stomping
Architecture / structural design
OpenAI Codex client / workflow session surface
Concurrent session safety
Workflow or session contamination incident
MCP control-plane coordination and allocation authority
MCP operational dashboard/queue view
Internal coordination storage (SQLite/Postgres)
Design / investigation, no implementation
Docs / runbooks
New feature or improvement
Gitea MCP workflow
GlitchTip integration
Operational or process incident requiring durable audit trail
Sentry-to-Gitea incident bridging
Integration testing
Jenkins integration
Label taxonomy management
Lease adopt/release/expire lifecycle
MCP server / tooling
MCP namespace and runtime health
MCP menu surface
Work spanning multiple monitoring projects or Gitea repos
Mutating action; requires gating
Observability, metrics, traces, error reporting
Cross-platform / portability
Shared preflight gates before mutation
Protected branch / stable-branch policy concern
Work queue visibility and allocation
Read-only, no mutation
MCP client reconnect/reload recovery path
Recovery paths for stale/foreign leases
Code refactor / restructure
Release / versioning
Reliability / failure handling
Persist and resume prepared review verdicts across sessions
Reviewer workflow tooling
Roadmap / umbrella issue
Safety rails and fail-closed mutation guards
Security / trust boundary
Self-hosted infrastructure integration
Sentry error monitoring integration
Stale backend daemon / runtime-vs-master parity failures
Issue is blocked
Issue is being worked on
Issue has an open pull request
Issue is ready for work
Terminal review lock (#332) path
Tests / test coverage
Issue tracker hygiene / meta
Bug or defect
Feature or enhancement
Feature or enhancement
Safety gate or guardrail
Workflow state visibility for LLMs/operators
Cross-tool workflow
LLM workflow coordination hardening
LLM workflow coordination hardening
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: Scaled-Tech-Consulting/Gitea-Tools#596
Reference in New Issue
Block a user
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.
Summary
merge_pras a merger task instead of a reviewer task.gitea_resolve_task_capabilityrole-aware for role-exclusive tasks, so exact permission alone cannot authorize reviewer/merger/author boundary crossings.Linked issue
Closes #539
Files changed
gitea_mcp_server.pyrole_session_router.pytests/test_resolve_task_capability.pytests/test_role_session_router.pyValidation
pytest tests/test_role_session_router.py tests/test_resolve_task_capability.py -q-> 45 passedpytest tests/test_role_session_router.py tests/test_resolve_task_capability.py tests/test_role_namespace_gate.py tests/test_issue_540_comment_role_poison.py tests/test_native_mcp_preference.py tests/test_permission_reports.py tests/test_review_feedback.py tests/test_commit_files_capability.py -q-> 128 passed, 2 subtests passedpython3 -m py_compile role_session_router.py gitea_mcp_server.py tests/test_role_session_router.py tests/test_resolve_task_capability.py-> passedgit diff --check-> passedpytest tests/test_mcp_server.py -q-> 1 failed, 205 passed; same failure reproduced on clean baseline worktreebranches/baseline-master-issue-539at6913ac98f13edf47109c46cbfb573184f2505720(TestMergePR.test_unknown_profile_blocks, tracked separately by #590 / PR #592)Worktree
/Users/jasonwalker/Development/Gitea-Tools/branches/issue-539-role-boundary-hard-stopsBranch
fix/issue-539-role-boundary-hard-stopsCommit
2941ec529c1e9a27b46ea66723df4bd34d7f3c9fRisk
Low to moderate. The resolver now denies role-exclusive tasks when profile role and task role disagree, but leaves comment/audit-style tasks permission-driven so existing reconciler/reviewer comment paths remain intact.
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #596
issue: #539
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 7715-33d48134b2bd
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-596-issue-539
phase: claimed
candidate_head:
2941ec529ctarget_branch: master
target_branch_sha:
7186718cfdlast_activity: 2026-07-09T21:35:09Z
expires_at: 2026-07-09T23:35:09Z
blocker: none
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #596
issue: #539
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 7715-33d48134b2bd
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-596-issue-539
phase: released
candidate_head:
2941ec529ctarget_branch: master
target_branch_sha:
7186718cfdlast_activity: 2026-07-09T21:37:58Z
expires_at: 2026-07-09T23:37:58Z
blocker: manual-release
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #596
issue: #539
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 13996-9d55ec453f78
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-596-issue-539
phase: claimed
candidate_head:
2941ec529ctarget_branch: master
target_branch_sha:
7186718cfdlast_activity: 2026-07-09T21:39:06Z
expires_at: 2026-07-09T23:39:06Z
blocker: none
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #596
issue: #539
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 13996-9d55ec453f78
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-596-issue-539
phase: validation_complete
candidate_head:
2941ec529ctarget_branch: master
target_branch_sha:
7186718cfdlast_activity: 2026-07-09T21:41:31Z
expires_at: 2026-07-09T23:41:31Z
blocker: none
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #596
issue: #539
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 13996-9d55ec453f78
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-596-issue-539
phase: released
candidate_head:
2941ec529ctarget_branch: master
target_branch_sha:
7186718cfdlast_activity: 2026-07-09T21:46:45Z
expires_at: 2026-07-09T23:46:45Z
blocker: manual-release
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #596
issue: #539
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 26850-0c95ec3bd4dd
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-596-issue-539
phase: claimed
candidate_head:
2941ec529ctarget_branch: master
target_branch_sha:
7186718cfdlast_activity: 2026-07-09T21:48:15Z
expires_at: 2026-07-09T23:48:15Z
blocker: none
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #596
issue: #539
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 26850-0c95ec3bd4dd
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-596-issue-539
phase: released
candidate_head:
2941ec529ctarget_branch: master
target_branch_sha:
7186718cfdlast_activity: 2026-07-09T21:51:24Z
expires_at: 2026-07-09T23:51:24Z
blocker: manual-release
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #596
issue: #539
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 39683-b4ddac021047
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-596-issue-539
phase: claimed
candidate_head:
2941ec529ctarget_branch: master
target_branch_sha:
7186718cfdlast_activity: 2026-07-09T21:52:02Z
expires_at: 2026-07-09T23:52:02Z
blocker: none
Canonical PR State
STATE: open / approved — merge not performed
WHO_IS_NEXT: merger
NEXT_ACTION: Merge PR #596 only with explicit operator confirmation MERGE PR 596 at expected_head_sha
2941ec529c.NEXT_PROMPT:
WHAT_HAPPENED: Formal independent review of PR #596 (Closes #539). Routes merge_pr as merger-only task; role-aware capability resolver blocks role-exclusive boundary crossings. Tests green; mergeable=true; scope limited to role routing + tests.
WHY: Correctly hardens reviewer/merger separation; baseline TestMergePR failure cited in PR body is resolved by landed #592.
ISSUE: #539 (PR #596)
HEAD_SHA:
2941ec529cREVIEW_STATUS: APPROVED
MERGE_READY: yes
BLOCKERS: none except explicit operator merge confirmation
VALIDATION:
2941ec529cLAST_UPDATED_BY: prgs-reviewer (sysadmin)
adopted_at: 2026-07-09T21:55:52Z
adopted_by_identity: sysadmin
adopted_by_profile: prgs-merger
adopted_from_session_id: 39683-b4ddac021047
adopted_from_profile: prgs-reviewer
adopted_from_reviewer_identity: sysadmin
adopted_from_comment_id: 8937
adoption_reason: merger-handoff-approved-head
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #596
issue: #539
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 39682-f4f1904f45d6
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-596-issue-539
phase: adopted
candidate_head:
2941ec529ctarget_branch: master
target_branch_sha:
7186718cfdlast_activity: 2026-07-09T21:55:52Z
expires_at: 2026-07-09T23:55:52Z
blocker: none
adopted_at: 2026-07-09T21:59:53Z
adopted_by_identity: sysadmin
adopted_by_profile: prgs-merger
adopted_from_session_id: 39682-f4f1904f45d6
adopted_from_profile: prgs-merger
adopted_from_reviewer_identity: sysadmin
adopted_from_comment_id: 8942
adoption_reason: merger-handoff-approved-head
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #596
issue: #539
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 48782-9e4bdb436bbe
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-596-issue-539
phase: adopted
candidate_head:
2941ec529ctarget_branch: master
target_branch_sha:
7186718cfdlast_activity: 2026-07-09T21:59:53Z
expires_at: 2026-07-09T23:59:53Z
blocker: none
adopted_at: 2026-07-09T22:03:22Z
adopted_by_identity: sysadmin
adopted_by_profile: prgs-merger
adopted_from_session_id: 48782-9e4bdb436bbe
adopted_from_profile: prgs-merger
adopted_from_reviewer_identity: sysadmin
adopted_from_comment_id: 8944
adoption_reason: merger-handoff-approved-head
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #596
issue: #539
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 50748-ace5240bf1e8
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-596-issue-539
phase: adopted
candidate_head:
2941ec529ctarget_branch: master
target_branch_sha:
7186718cfdlast_activity: 2026-07-09T22:03:22Z
expires_at: 2026-07-10T00:03:22Z
blocker: none
adopted_at: 2026-07-09T22:07:36Z
adopted_by_identity: sysadmin
adopted_by_profile: prgs-merger
adopted_from_session_id: 50748-ace5240bf1e8
adopted_from_profile: prgs-merger
adopted_from_reviewer_identity: sysadmin
adopted_from_comment_id: 8946
adoption_reason: merger-handoff-approved-head
repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #596
issue: #539
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 58456-1c2ff230451c
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr-596-issue-539
phase: adopted
candidate_head:
2941ec529ctarget_branch: master
target_branch_sha:
7186718cfdlast_activity: 2026-07-09T22:07:36Z
expires_at: 2026-07-10T00:07:36Z
blocker: none
Stale #332 review-decision lock cleanup (#594)
Status: APPLIED
sysadminprgs-reviewer2026-07-09T22:12:44.483201+00:00approveon PR fix: enforce merger role boundaries (Closes #539) (#596)closed(merged=True)2ac7519792075cad16abf72d7903e58a0478760d1prgs-reviewerManual deletion of session-state files is not the workflow.
This path only clears a lock when the referenced PR is merged/closed.