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

fix(mcp): accept strict-descendant dead-session recovery (Closes #768) #769

Merged
sysadmin merged 1 commits from fix/issue-768-descendant-recovery into master 2026-07-20 03:05:41 -05:00
Conversation 6 Commits 1 Files Changed 6
+971 -30
jcwalker3 commented 2026-07-20 02:53:03 -05:00
Owner
Copy Link
Copy Source

Closes #768

Summary

Dead-session author lock recovery previously required exact head equality between the clean local worktree and the head recorded at lock time. That made post-review remediation unpublishable after a session death: recovery requires a clean worktree, committing is the only sanctioned way to clean without discarding work, and committing advances HEAD past the recorded value.

This change accepts a strict descendant of the recorded/remote head when every other ownership proof still matches (same issue, branch, worktree, claimant, profile, dead prior PID, no competing live lock). Ancestry is observed server-side via git merge-base --is-ancestor — never caller-asserted.

Recovery evidence (recorded head, accepted head, relation, ancestry proof) is written into the durable lock and re-read for commit / create-PR / duplicate-work gates so an open owning PR is not re-blocked as competing work.

Acceptance criteria

AC Status
AC1 strict-descendant recovery with full ownership match Implemented
AC2 evidence propagates through commit/push/PR/duplicate gates Implemented
AC3 foreign/dirty/diverged/behind/rewritten/live-owner still fail closed Implemented + tested
AC4 regression sequence for REQUEST_CHANGES remediation after dead session Covered by unit + real-git tests
AC5 no weakening of branches-only, anti-stomp, role, lease protections Preserved
AC6 recovery evidence server-derived only read_head_ancestry + lock record only
AC7 atomic provenance (prior/replacement PID, heads, relation, proof) build_recovery_record
AC8 no special-case of #607/#767/a487f9fd Generic

Files changed

  • issue_lock_recovery.py — descendant disposition, owning-PR evidence, lock rebuild helper
  • issue_lock_worktree.py — read_head_ancestry
  • issue_work_duplicate_gate.py — accept recorded or accepted head for owning-PR exemption
  • gitea_mcp_server.py — wire ancestry probe + lock-derived recovery evidence into lock/commit/create-PR paths
  • tests/test_issue_768_strict_descendant_recovery.py — new focused suite
  • tests/test_issue_755_owning_pr_recovery.py — evidence shape update for equal-head tokens

Validation

Runner: /opt/homebrew/bin/python3, worktree branches/issue-768-descendant-recovery.

  1. Focused: pytest tests/test_issue_768_strict_descendant_recovery.py tests/test_issue_753_dead_pid_lock_recovery.py tests/test_issue_755_owning_pr_recovery.py -q → 90 passed, 2 subtests passed.
  2. Broader lock/workspace: + lock worktree/store/adoption/provenance/duplicate/author worktree/namespace binding → 171 passed, 2 subtests passed.
  3. Full suite: pytest -q → 3737 passed, 6 skipped, 2 failed (pre-existing #737 master drift: test_issue_702_review_findings_f1_f6 and test_reconciler_supersession_close; outside this diff).

Evidence only — not modified

Issue #607, PR #767, review #479, branch feat/issue-607-sentry-incident-bridge, worktree branches/issue-607-sentry-incident-bridge, and local commit a487f9fdc94388252b9a234976ca0c9c9ea7f706 were not modified or published. They remain reproduction evidence for the #768 deadlock only.

Head

  • Branch: fix/issue-768-descendant-recovery
  • Head SHA: 554739903795bca34e0bbbdf56542d3e74deb606
  • Base: master at d12adabeb1cf7810b1286ca8871a9b680646021c

Author role only. Stop for an independent reviewer; do not merge from this session.

Closes #768 ## Summary Dead-session author lock recovery previously required exact head equality between the clean local worktree and the head recorded at lock time. That made post-review remediation unpublishable after a session death: recovery requires a clean worktree, committing is the only sanctioned way to clean without discarding work, and committing advances HEAD past the recorded value. This change accepts a **strict descendant** of the recorded/remote head when every other ownership proof still matches (same issue, branch, worktree, claimant, profile, dead prior PID, no competing live lock). Ancestry is observed server-side via `git merge-base --is-ancestor` — never caller-asserted. Recovery evidence (recorded head, accepted head, relation, ancestry proof) is written into the durable lock and re-read for commit / create-PR / duplicate-work gates so an open owning PR is not re-blocked as competing work. ## Acceptance criteria | AC | Status | |---|---| | AC1 strict-descendant recovery with full ownership match | Implemented | | AC2 evidence propagates through commit/push/PR/duplicate gates | Implemented | | AC3 foreign/dirty/diverged/behind/rewritten/live-owner still fail closed | Implemented + tested | | AC4 regression sequence for REQUEST_CHANGES remediation after dead session | Covered by unit + real-git tests | | AC5 no weakening of branches-only, anti-stomp, role, lease protections | Preserved | | AC6 recovery evidence server-derived only | `read_head_ancestry` + lock record only | | AC7 atomic provenance (prior/replacement PID, heads, relation, proof) | `build_recovery_record` | | AC8 no special-case of #607/#767/a487f9fd | Generic | ## Files changed - `issue_lock_recovery.py` — descendant disposition, owning-PR evidence, lock rebuild helper - `issue_lock_worktree.py` — `read_head_ancestry` - `issue_work_duplicate_gate.py` — accept recorded or accepted head for owning-PR exemption - `gitea_mcp_server.py` — wire ancestry probe + lock-derived recovery evidence into lock/commit/create-PR paths - `tests/test_issue_768_strict_descendant_recovery.py` — new focused suite - `tests/test_issue_755_owning_pr_recovery.py` — evidence shape update for equal-head tokens ## Validation Runner: `/opt/homebrew/bin/python3`, worktree `branches/issue-768-descendant-recovery`. 1. Focused: `pytest tests/test_issue_768_strict_descendant_recovery.py tests/test_issue_753_dead_pid_lock_recovery.py tests/test_issue_755_owning_pr_recovery.py -q` → **90 passed**, 2 subtests passed. 2. Broader lock/workspace: + lock worktree/store/adoption/provenance/duplicate/author worktree/namespace binding → **171 passed**, 2 subtests passed. 3. Full suite: `pytest -q` → **3737 passed**, 6 skipped, **2 failed** (pre-existing #737 master drift: `test_issue_702_review_findings_f1_f6` and `test_reconciler_supersession_close`; outside this diff). ## Evidence only — not modified Issue **#607**, PR **#767**, review **#479**, branch `feat/issue-607-sentry-incident-bridge`, worktree `branches/issue-607-sentry-incident-bridge`, and local commit **`a487f9fdc94388252b9a234976ca0c9c9ea7f706`** were **not** modified or published. They remain reproduction evidence for the #768 deadlock only. ## Head - Branch: `fix/issue-768-descendant-recovery` - Head SHA: `554739903795bca34e0bbbdf56542d3e74deb606` - Base: `master` at `d12adabeb1cf7810b1286ca8871a9b680646021c` Author role only. Stop for an independent reviewer; do not merge from this session.
jcwalker3 added 1 commit 2026-07-20 02:53:04 -05:00
fix(mcp): accept strict-descendant dead-session recovery (Closes #768) 5547399037 
Permit fail-closed recovery when a clean local head is a strict
descendant of the recorded PR/remote head, with server-side ancestry
proof. Propagate recovery evidence through commit, push, and PR
duplicate gates so an owning PR is not re-blocked as competing work.

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
jcwalker3 commented 2026-07-20 02:53:53 -05:00
Author
Owner
Copy Link
Copy Source

Canonical Issue State

STATE:
pr_open_awaiting_independent_review

WHO_IS_NEXT:
reviewer

NEXT_ACTION:
Independent prgs-reviewer acquires a reviewer PR lease on PR #769 and reviews at pinned head 5547399037.

NEXT_PROMPT:

Role: REVIEWER
Repo: prgs / Scaled-Tech-Consulting / Gitea-Tools
PR: #769 (Closes #768)
Pinned head: 554739903795bca34e0bbbdf56542d3e74deb606
Validate AC1–AC8 strict-descendant dead-session recovery. Do not merge.

WHAT_HAPPENED:
Author opened PR #769 at head 5547399037 implementing #768.

WHY:
Handoff to independent reviewer after author-only implementation and validation.

RELATED_PRS:
#769 closes #768

BLOCKERS:
none

VALIDATION:
Focused 90 passed; broader 171 passed; full suite 3737 passed / 6 skipped / 2 failed (#737 pre-existing). #607/#767/a487f9fd preserved untouched.

LAST_UPDATED_BY:
jcwalker3 / prgs-author

## Canonical Issue State STATE: pr_open_awaiting_independent_review WHO_IS_NEXT: reviewer NEXT_ACTION: Independent prgs-reviewer acquires a reviewer PR lease on PR #769 and reviews at pinned head 554739903795bca34e0bbbdf56542d3e74deb606. NEXT_PROMPT: ```text Role: REVIEWER Repo: prgs / Scaled-Tech-Consulting / Gitea-Tools PR: #769 (Closes #768) Pinned head: 554739903795bca34e0bbbdf56542d3e74deb606 Validate AC1–AC8 strict-descendant dead-session recovery. Do not merge. ``` WHAT_HAPPENED: Author opened PR #769 at head 554739903795bca34e0bbbdf56542d3e74deb606 implementing #768. WHY: Handoff to independent reviewer after author-only implementation and validation. RELATED_PRS: #769 closes #768 BLOCKERS: none VALIDATION: Focused 90 passed; broader 171 passed; full suite 3737 passed / 6 skipped / 2 failed (#737 pre-existing). #607/#767/a487f9fd preserved untouched. LAST_UPDATED_BY: jcwalker3 / prgs-author
sysadmin commented 2026-07-20 02:57:37 -05:00
Owner
Copy Link
Copy Source

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #769
issue: #768
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 23716-f4eb79cb2196
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-fix-issue-768-descendant-recovery
phase: claimed
candidate_head: 5547399037
target_branch: master
target_branch_sha: d12adabeb1
last_activity: 2026-07-20T07:57:37Z
expires_at: 2026-07-20T08:07:37Z
blocker: none

<!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #769 issue: #768 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 23716-f4eb79cb2196 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-fix-issue-768-descendant-recovery phase: claimed candidate_head: 554739903795bca34e0bbbdf56542d3e74deb606 target_branch: master target_branch_sha: d12adabeb1cf7810b1286ca8871a9b680646021c last_activity: 2026-07-20T07:57:37Z expires_at: 2026-07-20T08:07:37Z blocker: none
sysadmin approved these changes 2026-07-20 03:02:31 -05:00
sysadmin left a comment
Owner
Copy Link
Copy Source

Canonical PR State

STATE:
approved_awaiting_merge

WHO_IS_NEXT:
merger

NEXT_ACTION:
Merger (separate role/session) may merge PR #769 only after re-pinning head 5547399037 and passing all merge gates. Do not merge from this reviewer session.

NEXT_PROMPT:

Role: MERGER
Repo: prgs / Scaled-Tech-Consulting / Gitea-Tools
PR: #769 (Closes #768)
Pinned approved head: 554739903795bca34e0bbbdf56542d3e74deb606
Base: master @ d12adabeb1cf7810b1286ca8871a9b680646021c
Re-verify live head, approval at current head, CI/mergeability, then merge only with explicit MERGE PR 769 confirmation. Do not re-review unless head moved.

WHAT_HAPPENED:
Independent prgs-reviewer sysadmin acquired reviewer lease 13141, reviewed full diff at exact head 5547399037, validated AC1–AC8, and APPROVED via native gitea_submit_pr_review.

WHY:
Strict-descendant dead-session recovery is correctly fail-closed, server-derived, and in scope for #768; no blocking findings.

ISSUE:
#768

HEAD_SHA:
5547399037

REVIEW_STATUS:
APPROVED

MERGE_READY:
false (approval is not merge authorization; merger role required)

BLOCKERS:
none for review; merge requires separate merger session and gates

VALIDATION:
Focused: 90 passed (+2 subtests). Broader lock/workspace: 171 passed (+2 subtests). Pre-merge baseline-proven failures only: test_issue_702_review_findings_f1_f6::test_removed_worktree_recovers_before_probe and test_reconciler_supersession_close::test_tool_posts_comment_and_closes_superseded_pr_issue (same signatures on base d12adab and PR head; outside this diff).

NATIVE_REVIEW_PROOF: transport=native_mcp; entrypoint=mcp_server; token_fingerprint=7efadb39b285ede3; pid=23716; mode=production

LAST_UPDATED_BY:
sysadmin / prgs-reviewer

Independent formal review — APPROVE

Repo: prgs / Scaled-Tech-Consulting / Gitea-Tools
PR: #769 · Issue: #768
Reviewed head: 554739903795bca34e0bbbdf56542d3e74deb606
Base: master @ d12adabeb1cf7810b1286ca8871a9b680646021c
Author: jcwalker3 · Reviewer: sysadmin (prgs-reviewer)

Review Metadata

  • LLM-Agent-SHA: llm-a7c3e91b2f04
  • LLM-Role: reviewer
  • Authenticated-Gitea-User: sysadmin
  • MCP-Profile: prgs-reviewer
  • Eligibility: passed (review + approve; self_author=false)
  • Reviewer lease: comment 13141, session 23716-f4eb79cb2196, candidate_head pinned
  • Worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-fix-issue-768-descendant-recovery (detached, clean, HEAD == pinned)

Provenance

  • Single commit on top of master d12adab (parent exactly d12adabeb1cf…).
  • Coherent, reviewable diff only; no unexplained files.
  • Changed files match #768 scope only:
    • issue_lock_recovery.py
    • issue_lock_worktree.py
    • issue_work_duplicate_gate.py
    • gitea_mcp_server.py
    • tests/test_issue_768_strict_descendant_recovery.py (new)
    • tests/test_issue_755_owning_pr_recovery.py (token shape)
  • Diff does not special-case #607, PR #767, or a487f9fd (AC8).
  • No secrets/credentials introduced (diff sweep).

AC1–AC8

AC Verdict
AC1 strict-descendant recovery with full ownership match + server-side ancestry PASS
AC2 recovery evidence into commit/push/create-PR/duplicate gates PASS
AC3 dirty/diverged/behind/rewritten/unrelated/ambiguous/mismatched/live-owner fail closed PASS
AC4 exact-head still supported; remediation sequence covered PASS
AC5 no weakening of branches-only / anti-stomp / workspace / role / lease / live-owner PASS
AC6 no caller-asserted recovery eligibility PASS
AC7 atomic provenance (prior/replacement PID, heads, relation, proof) PASS
AC8 no #607/#767/a487f9fd special-case PASS

Diagnostics distinguish equal, strict_descendant, and rejected (no accepted relation).

Tests (review worktree)

  1. Focused → 90 passed, 2 subtests passed.
  2. Broader lock/workspace → 171 passed, 2 subtests passed.

Pre-merge baseline proof (#533)

  • pre-merge base commit: d12adabeb1cf7810b1286ca8871a9b680646021c
  • tested PR head: 554739903795bca34e0bbbdf56542d3e74deb606
  • baseline worktree: branches/baseline-master-pr769-review
  • command: pytest tests/test_issue_702_review_findings_f1_f6.py tests/test_reconciler_supersession_close.py -q
  • Same 2 failures on PR head and pre-merge base; signatures match; outside this PR’s diff.
  • Label: pre-merge baseline-proven failure

Formal verdict

APPROVE at exact head 554739903795bca34e0bbbdf56542d3e74deb606.

Blocking findings: none.

Review approval is not merge authorization.

## Canonical PR State STATE: approved_awaiting_merge WHO_IS_NEXT: merger NEXT_ACTION: Merger (separate role/session) may merge PR #769 only after re-pinning head 554739903795bca34e0bbbdf56542d3e74deb606 and passing all merge gates. Do not merge from this reviewer session. NEXT_PROMPT: ```text Role: MERGER Repo: prgs / Scaled-Tech-Consulting / Gitea-Tools PR: #769 (Closes #768) Pinned approved head: 554739903795bca34e0bbbdf56542d3e74deb606 Base: master @ d12adabeb1cf7810b1286ca8871a9b680646021c Re-verify live head, approval at current head, CI/mergeability, then merge only with explicit MERGE PR 769 confirmation. Do not re-review unless head moved. ``` WHAT_HAPPENED: Independent prgs-reviewer sysadmin acquired reviewer lease 13141, reviewed full diff at exact head 554739903795bca34e0bbbdf56542d3e74deb606, validated AC1–AC8, and APPROVED via native gitea_submit_pr_review. WHY: Strict-descendant dead-session recovery is correctly fail-closed, server-derived, and in scope for #768; no blocking findings. ISSUE: #768 HEAD_SHA: 554739903795bca34e0bbbdf56542d3e74deb606 REVIEW_STATUS: APPROVED MERGE_READY: false (approval is not merge authorization; merger role required) BLOCKERS: none for review; merge requires separate merger session and gates VALIDATION: Focused: 90 passed (+2 subtests). Broader lock/workspace: 171 passed (+2 subtests). Pre-merge baseline-proven failures only: test_issue_702_review_findings_f1_f6::test_removed_worktree_recovers_before_probe and test_reconciler_supersession_close::test_tool_posts_comment_and_closes_superseded_pr_issue (same signatures on base d12adab and PR head; outside this diff). NATIVE_REVIEW_PROOF: transport=native_mcp; entrypoint=mcp_server; token_fingerprint=7efadb39b285ede3; pid=23716; mode=production LAST_UPDATED_BY: sysadmin / prgs-reviewer --- ## Independent formal review — APPROVE **Repo:** prgs / Scaled-Tech-Consulting / Gitea-Tools **PR:** #769 · **Issue:** #768 **Reviewed head:** `554739903795bca34e0bbbdf56542d3e74deb606` **Base:** `master` @ `d12adabeb1cf7810b1286ca8871a9b680646021c` **Author:** jcwalker3 · **Reviewer:** sysadmin (prgs-reviewer) ### Review Metadata - LLM-Agent-SHA: llm-a7c3e91b2f04 - LLM-Role: reviewer - Authenticated-Gitea-User: sysadmin - MCP-Profile: prgs-reviewer - Eligibility: passed (review + approve; self_author=false) - Reviewer lease: comment 13141, session 23716-f4eb79cb2196, candidate_head pinned - Worktree: `/Users/jasonwalker/Development/Gitea-Tools/branches/review-fix-issue-768-descendant-recovery` (detached, clean, HEAD == pinned) ### Provenance - Single commit on top of master `d12adab` (parent exactly `d12adabeb1cf…`). - Coherent, reviewable diff only; no unexplained files. - Changed files match #768 scope only: - `issue_lock_recovery.py` - `issue_lock_worktree.py` - `issue_work_duplicate_gate.py` - `gitea_mcp_server.py` - `tests/test_issue_768_strict_descendant_recovery.py` (new) - `tests/test_issue_755_owning_pr_recovery.py` (token shape) - Diff does **not** special-case #607, PR #767, or `a487f9fd` (AC8). - No secrets/credentials introduced (diff sweep). ### AC1–AC8 | AC | Verdict | |---|---| | AC1 strict-descendant recovery with full ownership match + server-side ancestry | **PASS** | | AC2 recovery evidence into commit/push/create-PR/duplicate gates | **PASS** | | AC3 dirty/diverged/behind/rewritten/unrelated/ambiguous/mismatched/live-owner fail closed | **PASS** | | AC4 exact-head still supported; remediation sequence covered | **PASS** | | AC5 no weakening of branches-only / anti-stomp / workspace / role / lease / live-owner | **PASS** | | AC6 no caller-asserted recovery eligibility | **PASS** | | AC7 atomic provenance (prior/replacement PID, heads, relation, proof) | **PASS** | | AC8 no #607/#767/a487f9fd special-case | **PASS** | Diagnostics distinguish `equal`, `strict_descendant`, and rejected (no accepted relation). ### Tests (review worktree) 1. Focused → **90 passed**, 2 subtests passed. 2. Broader lock/workspace → **171 passed**, 2 subtests passed. ### Pre-merge baseline proof (#533) - **pre-merge base commit:** `d12adabeb1cf7810b1286ca8871a9b680646021c` - **tested PR head:** `554739903795bca34e0bbbdf56542d3e74deb606` - **baseline worktree:** `branches/baseline-master-pr769-review` - **command:** `pytest tests/test_issue_702_review_findings_f1_f6.py tests/test_reconciler_supersession_close.py -q` - Same 2 failures on PR head and pre-merge base; signatures match; outside this PR’s diff. - Label: **pre-merge baseline-proven failure** ### Formal verdict **APPROVE** at exact head `554739903795bca34e0bbbdf56542d3e74deb606`. Blocking findings: **none**. Review approval is not merge authorization.
sysadmin commented 2026-07-20 03:05:10 -05:00
Owner
Copy Link
Copy Source

adopted_at: 2026-07-20T08:05:10Z
adopted_by_identity: sysadmin
adopted_by_profile: prgs-merger
adopted_from_session_id: 23716-f4eb79cb2196
adopted_from_profile: prgs-reviewer
adopted_from_reviewer_identity: sysadmin
adopted_from_comment_id: 13141
adoption_reason: merger-handoff-approved-head

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #769
issue: #768
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 26866-19bf1dbaab46
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merge-pr-769
phase: adopted
candidate_head: 5547399037
target_branch: master
target_branch_sha: d12adabeb1
last_activity: 2026-07-20T08:05:10Z
expires_at: 2026-07-20T08:15:10Z
blocker: none

<!-- mcp-review-lease-adoption:v1 --> adopted_at: 2026-07-20T08:05:10Z adopted_by_identity: sysadmin adopted_by_profile: prgs-merger adopted_from_session_id: 23716-f4eb79cb2196 adopted_from_profile: prgs-reviewer adopted_from_reviewer_identity: sysadmin adopted_from_comment_id: 13141 adoption_reason: merger-handoff-approved-head <!-- mcp-review-lease:v1 --> repo: Scaled-Tech-Consulting/Gitea-Tools pr: #769 issue: #768 reviewer_identity: sysadmin profile: prgs-merger session_id: 26866-19bf1dbaab46 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merge-pr-769 phase: adopted candidate_head: 554739903795bca34e0bbbdf56542d3e74deb606 target_branch: master target_branch_sha: d12adabeb1cf7810b1286ca8871a9b680646021c last_activity: 2026-07-20T08:05:10Z expires_at: 2026-07-20T08:15:10Z blocker: none
sysadmin merged commit edaeede250 into master 2026-07-20 03:05:41 -05:00
sysadmin commented 2026-07-20 03:05:47 -05:00
Owner
Copy Link
Copy Source

Stale #332 review-decision lock cleanup (#594)

Status: APPLIED

Manual deletion of session-state files is not the workflow.
This path only clears a lock when the referenced PR is merged/closed.

## Stale #332 review-decision lock cleanup (#594) Status: **APPLIED** - actor: `sysadmin` - profile: `prgs-merger` - timestamp: `2026-07-20T08:05:47.031393+00:00` - last terminal: `approve` on PR #769 - PR state: `closed` (merged=True) - merge_commit_sha: `edaeede250f46f361784061f025ab0e867172d2c` - prior live_mutations_count: `2` - prior profile_identity: `prgs-reviewer` Manual deletion of session-state files is **not** the workflow. This path only clears a lock when the referenced PR is merged/closed.
sysadmin commented 2026-07-20 03:07:12 -05:00
Owner
Copy Link
Copy Source

CTH: Merger Handoff

Canonical Issue State

STATE:
merged

WHO_IS_NEXT:
reconciler

NEXT_ACTION:
Post-merge cleanup only: release moot merger lease, delete merged branch if eligible, prune worktrees/labels for #768/#769. Do not remediate #767 in this lane.

NEXT_PROMPT:

Role: RECONCILER (prgs-reconciler only)
Repo: prgs / Scaled-Tech-Consulting / Gitea-Tools
Merged PR: #769 · Issue: #768 (closed)
Merge commit / master: edaeede250f46f361784061f025ab0e867172d2c
Merged head: 554739903795bca34e0bbbdf56542d3e74deb606
Moot lease: session 26866-19bf1dbaab46, comment 13148, candidate_head 554739903795bca34e0bbbdf56542d3e74deb606 (lease_moot=true; dry-run cleanup_allowed)
Tasks: (1) gitea_cleanup_post_merge_moot_lease apply=true with expected session/head/comment pins; (2) branch delete if eligible; (3) worktree/label cleanup for #768/#769; (4) report. Do not start #767 remediation unless controller authorizes a separate session.

WHAT_HAPPENED:
PR #769 merged via gitea_merge_pr method=merge under prgs-merger/sysadmin with confirmation MERGE PR 769. Pinned head 5547399037 matched live. Review #480 APPROVED at exact head. Lease adopted comment 13148 from reviewer session 23716-f4eb79cb2196. Decision lock cleared (audit 13153). Issue #768 closed via Closes linkage.

WHY:
All merger gates passed: identity sysadmin, profile prgs-merger, workflow boundary clean, namespace IDE-proven, parity current, eligibility true, sync recommended_next_action=merge_now, approval_at_current_head=true, baseline-proven suite failures accepted per review evidence.

RELATED_PRS:
#769 (merged); Issue #768 (closed); #767 evidence-only (do not remediate here)

BLOCKERS:
none

VALIDATION:
Read-after-write: PR state=closed, merged_at set, merge_commit_sha=edaeede250f46f361784061f025ab0e867172d2c; prgs/master advanced d12adab→edaeede; 5547399 is ancestor of master; Issue #768 state=closed. Unrelated PRs not mutated in this session.

LAST_UPDATED_BY:
sysadmin / prgs-merger

## CTH: Merger Handoff ## Canonical Issue State STATE: merged WHO_IS_NEXT: reconciler NEXT_ACTION: Post-merge cleanup only: release moot merger lease, delete merged branch if eligible, prune worktrees/labels for #768/#769. Do not remediate #767 in this lane. NEXT_PROMPT: ```text Role: RECONCILER (prgs-reconciler only) Repo: prgs / Scaled-Tech-Consulting / Gitea-Tools Merged PR: #769 · Issue: #768 (closed) Merge commit / master: edaeede250f46f361784061f025ab0e867172d2c Merged head: 554739903795bca34e0bbbdf56542d3e74deb606 Moot lease: session 26866-19bf1dbaab46, comment 13148, candidate_head 554739903795bca34e0bbbdf56542d3e74deb606 (lease_moot=true; dry-run cleanup_allowed) Tasks: (1) gitea_cleanup_post_merge_moot_lease apply=true with expected session/head/comment pins; (2) branch delete if eligible; (3) worktree/label cleanup for #768/#769; (4) report. Do not start #767 remediation unless controller authorizes a separate session. ``` WHAT_HAPPENED: PR #769 merged via gitea_merge_pr method=merge under prgs-merger/sysadmin with confirmation MERGE PR 769. Pinned head 554739903795bca34e0bbbdf56542d3e74deb606 matched live. Review #480 APPROVED at exact head. Lease adopted comment 13148 from reviewer session 23716-f4eb79cb2196. Decision lock cleared (audit 13153). Issue #768 closed via Closes linkage. WHY: All merger gates passed: identity sysadmin, profile prgs-merger, workflow boundary clean, namespace IDE-proven, parity current, eligibility true, sync recommended_next_action=merge_now, approval_at_current_head=true, baseline-proven suite failures accepted per review evidence. RELATED_PRS: #769 (merged); Issue #768 (closed); #767 evidence-only (do not remediate here) BLOCKERS: none VALIDATION: Read-after-write: PR state=closed, merged_at set, merge_commit_sha=edaeede250f46f361784061f025ab0e867172d2c; prgs/master advanced d12adab→edaeede; 5547399 is ancestor of master; Issue #768 state=closed. Unrelated PRs not mutated in this session. LAST_UPDATED_BY: sysadmin / prgs-merger
Sign in to join this conversation.
Reviewers
No Reviewers
sysadmin
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
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

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