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

Enforce already-landed PR gate before review approval or merge #294

New Issue
Closed
opened 2026-07-07 00:21:34 -05:00 by jcwalker3 · 0 comments
jcwalker3 commented 2026-07-07 00:21:34 -05:00
Owner
Copy Link
Copy Source

Reviewer workflows must not approve or attempt to merge PRs whose head commit is already an ancestor of the target branch.

Observed failure mode:

A reviewer workflow selected a PR, validated it, approved it, and attempted to merge it. The merge failed with a Gitea API error because the PR head commit had already landed on master. The correct behavior should have been to stop before approval and enter an ALREADY_LANDED_RECONCILE_REQUIRED state.

Required behavior:

  1. After selecting a PR and pinning the candidate head SHA, the workflow must fetch the target branch from the remote.

  2. The workflow must record the target branch SHA used for ancestry checks.

  3. The workflow must check whether the PR head SHA is already an ancestor of the target branch.

  4. If already landed:

    • do not validate as a normal merge candidate
    • do not approve
    • do not request changes unless there is a real blocker
    • do not call the merge API
    • produce an ALREADY_LANDED_RECONCILE_REQUIRED handoff

  5. The reconciliation handoff must include:

    • PR number/title
    • candidate head SHA
    • target branch
    • target branch SHA
    • ancestor proof
    • linked issue status
    • recommended reconciliation action

  6. Any PR close, issue close, or comment mutation must require separate exact capability proof.

  7. Final-report validation must reject APPROVED, MERGED, or READY_TO_MERGE states when the already-landed gate fired.

  8. Final-report validation must reject claims that the target branch was up to date unless the remote fetch and target SHA are reported.

Acceptance criteria:

  • Already-landed PRs cannot be approved.
  • Already-landed PRs cannot call the merge API.
  • Already-landed PRs produce a reconciliation handoff instead of a review/merge report.
  • Tests cover already-landed PR, normal mergeable PR, stale local target branch, changed PR head, and blocked close/comment capability.
  • Reports include target branch SHA used for the already-landed check.
Reviewer workflows must not approve or attempt to merge PRs whose head commit is already an ancestor of the target branch. Observed failure mode: A reviewer workflow selected a PR, validated it, approved it, and attempted to merge it. The merge failed with a Gitea API error because the PR head commit had already landed on `master`. The correct behavior should have been to stop before approval and enter an `ALREADY_LANDED_RECONCILE_REQUIRED` state. Required behavior: 1. After selecting a PR and pinning the candidate head SHA, the workflow must fetch the target branch from the remote. 2. The workflow must record the target branch SHA used for ancestry checks. 3. The workflow must check whether the PR head SHA is already an ancestor of the target branch. 4. If already landed: * do not validate as a normal merge candidate * do not approve * do not request changes unless there is a real blocker * do not call the merge API * produce an `ALREADY_LANDED_RECONCILE_REQUIRED` handoff 5. The reconciliation handoff must include: * PR number/title * candidate head SHA * target branch * target branch SHA * ancestor proof * linked issue status * recommended reconciliation action 6. Any PR close, issue close, or comment mutation must require separate exact capability proof. 7. Final-report validation must reject `APPROVED`, `MERGED`, or `READY_TO_MERGE` states when the already-landed gate fired. 8. Final-report validation must reject claims that the target branch was up to date unless the remote fetch and target SHA are reported. Acceptance criteria: * Already-landed PRs cannot be approved. * Already-landed PRs cannot call the merge API. * Already-landed PRs produce a reconciliation handoff instead of a review/merge report. * Tests cover already-landed PR, normal mergeable PR, stale local target branch, changed PR head, and blocked close/comment capability. * Reports include target branch SHA used for the already-landed check.
jcwalker3 added the status:in-progress label 2026-07-07 08:17:21 -05:00
sysadmin removed the status:in-progress label 2026-07-07 09:15:21 -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#294