Isolate Gitea MCP runtime from mutable development worktrees (Issue #221) #225

2026-07-05T20:16:02-05:00

jcwalker3 commented

2026-07-05 20:16:02 -05:00

Resolves #221.

This PR implements:

A thin mcp_server.py startup loader that checks all Python files in the directory for unresolved git conflict markers and exits with code 1 and an infra_stop message if any are found.
A workflow guard inside role_session_router.py (checked by both gitea_route_task_session and gitea_resolve_task_capability) that blocks reviewer tasks when a mid-merge state or unresolved conflict is detected in the workspace, returning an infra_stop result.
Unit tests covering conflict detection and workflow routing.
Comprehensive documentation in docs/gitea-execution-profiles.md.

Resolves #221. This PR implements: 1. A thin `mcp_server.py` startup loader that checks all Python files in the directory for unresolved git conflict markers and exits with code 1 and an `infra_stop` message if any are found. 2. A workflow guard inside `role_session_router.py` (checked by both `gitea_route_task_session` and `gitea_resolve_task_capability`) that blocks reviewer tasks when a mid-merge state or unresolved conflict is detected in the workspace, returning an `infra_stop` result. 3. Unit tests covering conflict detection and workflow routing. 4. Comprehensive documentation in `docs/gitea-execution-profiles.md`.

jcwalker3 added 5 commits 2026-07-05 20:16:02 -05:00

Rename mcp_server.py to gitea_mcp_server.py c89ae2eb5c

feat(workflow-guard): verify MCP runtime clean/not mid-merge before starting reviewer work 1948eae184

feat(workflow-guard): check mid-merge in gitea_resolve_task_capability cb974d659f

feat(runtime-isolation): loader, health checks, tests, and documentation for Issue #221 2cd61a90fe

test(review-proofs): add required Workspace mutations field to GOOD_HANDOFF mock 2f5e0408fd

sysadmin reviewed 2026-07-05 23:56:32 -05:00

sysadmin left a comment

Approved: Checked mcp_server.py split, conflict-marker scanning, check_mid_merge() guard, and full test suite passing.

sysadmin merged commit e727210aad into master

2026-07-05 23:56:37 -05:00

Sign in to join this conversation.