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

Require live PR head re-pin before conflict-fix classification #522

New Issue
Closed
opened 2026-07-08 03:37:18 -05:00 by jcwalker3 · 1 comment
jcwalker3 commented 2026-07-08 03:37:18 -05:00
Owner
Copy Link
Copy Source

Problem:
The open PR inventory reported stale mergeable:false and stale head_sha values for PRs that were already conflict-resolved and mergeable at their live branch heads. This caused author sessions to start unnecessary conflict-fix work and even led to a rejected non-fast-forward push attempt.

Observed:

  • Inventory flagged PR #508 as mergeable:false at stale head dad1dc8.
  • Live PR #508 head was actually 3f3d6cb and mergeable:true.
  • Inventory flagged PR #493 as mergeable:false at stale head 685e627.
  • Live PR #493 head was actually 4561d7a and mergeable:true.
  • git merge-tree against current master showed 0 conflicts at the live heads.
  • PR #490 was correctly skipped for reconciler supersession, not conflict-fix.

Required behavior:
Before an author session classifies a PR as conflicted or performs conflict-fix work, the workflow must re-fetch the live PR state and re-pin the branch head SHA. Inventory mergeable/head_sha fields should be treated as advisory and potentially stale.

Acceptance criteria:

  1. Add a guard or helper that re-fetches live PR state before conflict-fix classification.
  2. Require live head SHA confirmation before creating a conflict-fix worktree.
  3. If inventory says mergeable:false but live PR says mergeable:true, classify as stale inventory and skip author mutation.
  4. If live head differs from inventory head, report both SHAs and use the live head only.
  5. Add tests covering stale inventory head/mergeability fields.
  6. Update author conflict-fix runbook guidance to require live-head re-pin before mutation.
Problem: The open PR inventory reported stale mergeable:false and stale head_sha values for PRs that were already conflict-resolved and mergeable at their live branch heads. This caused author sessions to start unnecessary conflict-fix work and even led to a rejected non-fast-forward push attempt. Observed: - Inventory flagged PR #508 as mergeable:false at stale head dad1dc8. - Live PR #508 head was actually 3f3d6cb and mergeable:true. - Inventory flagged PR #493 as mergeable:false at stale head 685e627. - Live PR #493 head was actually 4561d7a and mergeable:true. - git merge-tree against current master showed 0 conflicts at the live heads. - PR #490 was correctly skipped for reconciler supersession, not conflict-fix. Required behavior: Before an author session classifies a PR as conflicted or performs conflict-fix work, the workflow must re-fetch the live PR state and re-pin the branch head SHA. Inventory mergeable/head_sha fields should be treated as advisory and potentially stale. Acceptance criteria: 1. Add a guard or helper that re-fetches live PR state before conflict-fix classification. 2. Require live head SHA confirmation before creating a conflict-fix worktree. 3. If inventory says mergeable:false but live PR says mergeable:true, classify as stale inventory and skip author mutation. 4. If live head differs from inventory head, report both SHAs and use the live head only. 5. Add tests covering stale inventory head/mergeability fields. 6. Update author conflict-fix runbook guidance to require live-head re-pin before mutation.
jcwalker3 added the status:in-progress label 2026-07-08 21:28:29 -05:00
jcwalker3 commented 2026-07-08 21:28:29 -05:00
Author
Owner
Copy Link
Copy Source

Issue claim heartbeat

<!-- gitea-issue-claim-heartbeat:v1 --> **Issue claim heartbeat** - kind: claim - issue: #522 - branch: feat/issue-522-conflict-fix-classification - phase: claimed - profile: prgs-author - pr: none - blocker: none - next_action: create worktree and begin implementation
sysadmin removed the status:in-progress label 2026-07-09 07:41:39 -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#522