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

MCP infra_stop conflict state must be recomputed live, not cached across resolved worktree states #285

New Issue
Closed
opened 2026-07-06 23:19:30 -05:00 by jcwalker3 · 2 comments
jcwalker3 commented 2026-07-06 23:19:30 -05:00
Owner
Copy Link
Copy Source

A reviewer session was blocked from reviewing Gitea-Tools PR #276 because gitea_resolve_task_capability returned infra_stop for an unresolved merge conflict. Manual checks showed the main checkout was clean and no merge/rebase state existed, but the long-running MCP server still returned the stale conflict gate.

Acceptance criteria:

  1. infra_stop conflict checks are recomputed from live git state on every capability resolution.
  2. Resolved merge/rebase state clears without requiring manual process restart.
  3. Capability responses include the exact path and conflict file that triggered infra_stop.
  4. Tests cover conflict present  infra_stop, conflict resolved  allowed.
  5. Stale cached infra_stop cannot block review/merge after the worktree is clean.
A reviewer session was blocked from reviewing Gitea-Tools PR #276 because gitea_resolve_task_capability returned infra_stop for an unresolved merge conflict. Manual checks showed the main checkout was clean and no merge/rebase state existed, but the long-running MCP server still returned the stale conflict gate. Acceptance criteria: 1. infra_stop conflict checks are recomputed from live git state on every capability resolution. 2. Resolved merge/rebase state clears without requiring manual process restart. 3. Capability responses include the exact path and conflict file that triggered infra_stop. 4. Tests cover conflict present  infra_stop, conflict resolved  allowed. 5. Stale cached infra_stop cannot block review/merge after the worktree is clean.
jcwalker3 commented 2026-07-06 23:19:46 -05:00
Author
Owner
Copy Link
Copy Source

Correction to acceptance criterion 4: the intended text is:

  1. Tests cover conflict present -> infra_stop, conflict resolved -> allowed.

The issue body creation path encoded the arrow glyph incorrectly; this comment preserves the required criterion in plain ASCII.

Correction to acceptance criterion 4: the intended text is: 4. Tests cover conflict present -> infra_stop, conflict resolved -> allowed. The issue body creation path encoded the arrow glyph incorrectly; this comment preserves the required criterion in plain ASCII.
jcwalker3 added the status:in-progress label 2026-07-06 23:20:30 -05:00
jcwalker3 commented 2026-07-06 23:20:33 -05:00
Author
Owner
Copy Link
Copy Source

Claimed. Branch: feat/issue-285-live-infra-stop-recompute. Worktree: branches/feat-issue-285-live-infra-stop-recompute.

Claimed. Branch: `feat/issue-285-live-infra-stop-recompute`. Worktree: `branches/feat-issue-285-live-infra-stop-recompute`.
sysadmin removed the status:in-progress label 2026-07-07 03:37:24 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
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
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

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