feat(lock): allow exact-owner renewal of expired author issue locks (Closes #760)
An expired author issue lease could not be renewed by the exact session that already owned it. `assess_same_issue_lease_conflict` computed same-owner evidence and then returned on the expired branch before consulting it, and `assess_expired_lock_reclaim` only permits takeover on a dead PID or a missing worktree. Because the recorded PID is the long-lived MCP daemon rather than the authoring task, a lease that expires under a live daemon is the ordinary case for any author task outliving the TTL — and in that case the owner's own lock became permanently unmodifiable through sanctioned tools. Add `issue_lock_renewal`, a pure evidence assessor for that one case, and evaluate its disposition before the expired foreign-takeover return. Renewal requires an exact match of remote, org, repo, issue number, operation type, branch, realpath-normalized worktree, claimant username, and claimant profile; a registered worktree that exists, sits on the locked branch, and is clean; local and remote heads that agree; and, when an owning PR exists, a PR head that agrees too. No competing live lock, competing branch claim, or other owning PR may exist. Any missing or contradictory evidence fails closed. PID liveness is never authorization: it is recorded as evidence and is neither necessary nor sufficient (AC16). Only an expired lease is ever a candidate, so a live foreign lease stays non-recoverable (AC12) and dead-PID takeover keeps its existing #601 conditions (AC11). Renewal is never caller-declarable — the waiver is server-computed and `gitea_lock_issue` gains no parameter (AC14). A sanctioned renewal records prior PID, prior expiry, replacement PID, new expiry, claimant, and its supporting proof under `lease_renewal`, and reuses the #772 compare-and-swap so two sessions observing the same expired lease cannot both win. Absolute wall-clock expiry is preserved. Sliding heartbeat renewal, fencing tokens, and the shared cross-role lifecycle remain #790's scope and are deliberately not implemented here; #790 stays sequenced behind this change. Tests: 40 new cases covering the positive path, every near-match and foreign-owner refusal, the non-candidate cases, the gate-ordering regression, the renewal record, downstream mutation ownership, and AC14/AC17. Two #772 test doubles now forward the new keyword. Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]> Claude-Session: https://claude.ai/code/session_01Ti8deB36iWcjHmE9cuxour
This commit is contained in:
@@ -871,9 +871,13 @@ class TestAc6McpUnpublishedClaimRecovery(_UnpublishedMcpBase):
|
||||
save_calls: list[dict] = []
|
||||
real_save = mcp_server._save_issue_lock
|
||||
|
||||
def tracking_save(data, *, expected_generation=None):
|
||||
def tracking_save(data, *, expected_generation=None, renewal_sanctioned=False):
|
||||
save_calls.append({"expected_generation": expected_generation, "data": dict(data)})
|
||||
return real_save(data, expected_generation=expected_generation)
|
||||
return real_save(
|
||||
data,
|
||||
expected_generation=expected_generation,
|
||||
renewal_sanctioned=renewal_sanctioned,
|
||||
)
|
||||
|
||||
with patch("mcp_server._save_issue_lock", side_effect=tracking_save):
|
||||
result = self.run_lock_issue()
|
||||
@@ -926,18 +930,33 @@ class TestAc6McpUnpublishedClaimRecovery(_UnpublishedMcpBase):
|
||||
real_bind = issue_lock_store.bind_session_lock
|
||||
bind_calls: list[int | None] = []
|
||||
|
||||
def racing_bind(data, lock_dir=None, expected_generation=None):
|
||||
# #760 added the renewal waiver keyword; the double forwards it verbatim
|
||||
# so this race still exercises the real compare-and-swap.
|
||||
def racing_bind(
|
||||
data, lock_dir=None, expected_generation=None, renewal_sanctioned=False
|
||||
):
|
||||
bind_calls.append(expected_generation)
|
||||
if expected_generation is None:
|
||||
return real_bind(data, lock_dir=lock_dir, expected_generation=None)
|
||||
return real_bind(
|
||||
data,
|
||||
lock_dir=lock_dir,
|
||||
expected_generation=None,
|
||||
renewal_sanctioned=renewal_sanctioned,
|
||||
)
|
||||
# First concurrent writer wins.
|
||||
if len([c for c in bind_calls if c is not None]) == 1:
|
||||
return real_bind(
|
||||
data, lock_dir=lock_dir, expected_generation=expected_generation
|
||||
data,
|
||||
lock_dir=lock_dir,
|
||||
expected_generation=expected_generation,
|
||||
renewal_sanctioned=renewal_sanctioned,
|
||||
)
|
||||
# Second concurrent writer still holds the pre-race generation.
|
||||
return real_bind(
|
||||
data, lock_dir=lock_dir, expected_generation=expected_generation
|
||||
data,
|
||||
lock_dir=lock_dir,
|
||||
expected_generation=expected_generation,
|
||||
renewal_sanctioned=renewal_sanctioned,
|
||||
)
|
||||
|
||||
# First recovery succeeds and advances generation.
|
||||
|
||||
Reference in New Issue
Block a user