fix(author bootstrap): resolve allocator session ownership, authority alignment, and test coverage (#943 )

fix(author bootstrap): restore missing runtime identity and session helpers (Closes #943 )
gitea_bootstrap_author_issue_worktree referenced four globals that commit a942afe (#850) introduced without ever defining: _active_username 1 reference, 0 definitions _active_profile_name 1 reference, 0 definitions _current_session_id 1 reference, 0 definitions _author_mutation_block 1 reference, 0 definitions Evaluating the call arguments therefore raised NameError: name '_active_username' is not defined before author_issue_bootstrap.bootstrap_author_issue_worktree was entered, so the capability was unusable for every caller including dry_run=true. The fourth name, _author_mutation_block, sits on the reviewer-stop refusal path and was found by the generalised regression test rather than by the original report. The defect was unreachable until PR #942 (#941) wired the bootstrap scope into workflow_scope_guard: before that, verify_preflight_purity refused first with missing_issue_worktree, masking it. Changes: * _active_username reads the immutable #714 session context that gitea_whoami seeds — the identity pin every other mutation gate already consults. An unbound context returns None so callers fail closed rather than acting as an unverified actor; a profile's expected_username is never substituted. * _active_profile_name prefers the live get_profile() and falls back to the bound session context only when the profile cannot be read. * _current_session_id mints the same "<profile>-<pid>-<hex>" shape as the three pre-existing lease call sites, bound once per process so repeated calls describe one session instead of a fresh owner per call, which would make lease-ownership comparisons unsatisfiable. None is never memoised. * _author_mutation_block returns the uniform refusal shape the other author mutations already return for the same check_author_mutation_after_reviewer_stop block. No guard, signature, or permission changes. Wrong-role, wrong-profile, wrong-identity, stale-runtime, expected-base and workflow-scope enforcement all still gate the call; the helpers only supply values the service then validates fail-closed (missing_active_identity / missing_active_profile / missing_owner_session / stale_concurrency_pin). Regression: tests/test_issue_943_runtime_context_helpers.py (27 tests). The generalised test resolves every global the wrapper's body references against module globals and builtins, so the next missing reference fails too rather than only the three named here — that test is what found _author_mutation_block. Coverage also coversdry-run reaching and completing the service with helper-produced bindings, dry-run leaving no branch, worktree, assignment or lease, apply reaching its intended transition, each fail-closed mismatch, expected-base mismatch, and the #941/PR #942 scope wiring. Pre-fix 20 failed / 13 passed against unmodified aab54d48; post-fix 27 passed. Targeted bootstrap and guard suites: 245 passed, 59 subtests. Full suite: 28 failed, 5552 passed, 6 skipped, 1006 subtests — the 28 are the standing baseline, every one of which also fails on the unmodified base. Closes #943 Co-Authored-By: Claude Opus 5 (1M context) <[email protected]> Claude-Session: https://claude.ai/code/session_013ygVZQLbbhJTChuVuLaJWb
2026-07-27 19:52:27 -04:00 · 2026-07-26 07:56:14 -05:00
6 changed files with 1161 additions and 1496 deletions
@@ -196,6 +196,58 @@ def _verify_assignment_and_lease_ids(
        # Some lease rows may not yet have an assignment join; still require
        # the lease itself to exist and bind to the claimed session/issue.
        pass
+    # #943 review 622 B2: a lease that is no longer live confers no ownership.
+    # Existence alone previously satisfied this gate, so a released or expired
+    # lease could still authorize a bootstrap for a claim its session had given
+    # up. Checked before the session comparison so the reason names the real
+    # problem rather than reporting a mismatch.
+    from datetime import datetime, timezone
+
+    lease_status = str(lease.get("status") or "").strip().lower()
+    if lease_status and lease_status != "active":
+        return {
+            "success": False,
+            "reason_code": "lease_not_live",
+            "message": (
+                f"lease_id '{lid}' is '{lease_status}', not active; a lease that "
+                "is not live confers no ownership (fail closed)."
+            ),
+            "exact_next_action": (
+                "Re-allocate the work item and pass the live assignment/lease pair."
+            ),
+        }
+    expires_raw = str(lease.get("expires_at") or "").strip()
+    if expires_raw:
+        try:
+            expires_at = datetime.fromisoformat(expires_raw.replace("Z", "+00:00"))
+        except ValueError:
+            return {
+                "success": False,
+                "reason_code": "lease_not_live",
+                "message": (
+                    f"lease_id '{lid}' records an unparseable expiry "
+                    f"'{expires_raw}' (fail closed)."
+                ),
+                "exact_next_action": (
+                    "Re-allocate the work item and pass the live "
+                    "assignment/lease pair."
+                ),
+            }
+        if expires_at.tzinfo is None:
+            expires_at = expires_at.replace(tzinfo=timezone.utc)
+        if expires_at <= datetime.now(timezone.utc):
+            return {
+                "success": False,
+                "reason_code": "lease_not_live",
+                "message": (
+                    f"lease_id '{lid}' expired at {expires_raw}; an expired lease "
+                    "confers no ownership (fail closed)."
+                ),
+                "exact_next_action": (
+                    "Reclaim or re-allocate the lease, then retry with the live pair."
+                ),
+            }
+
    lease_session = str(lease.get("session_id") or "").strip()
    if lease_session and lease_session != owner_session:
        return {
@@ -2781,87 +2781,6 @@ def _collect_issue_duplicate_context(
    return issue_duplicate_context_fetcher(h, o, r, auth, issue_number)


-# Every field of the owning-PR continuation token is security relevant: the
-# issue and PR it names, the branch it is scoped to, and each head the waiver
-# was measured against. Two evidence blocks that disagree on any of them cannot
-# both describe the single sanctioned decision the lock is supposed to record.
-_CONTINUATION_EVIDENCE_BINDINGS = (
-    "issue_number",
-    "pr_number",
-    "branch_name",
-    "head_sha",
-    "recorded_head",
-    "accepted_head",
-    "head_relation",
-)
-
-
-def _continuation_evidence_agrees(recovered: dict, renewed: dict) -> bool:
-    """Do two rebuilt continuation tokens bind to exactly the same thing (#945)?"""
-    return all(
-        recovered.get(field) == renewed.get(field)
-        for field in _CONTINUATION_EVIDENCE_BINDINGS
-    )
-
-
-def _owning_pr_continuation_from_lock(lock_record: dict | None) -> dict | None:
-    """Owning-PR continuation evidence a persisted lock still proves (#945).
-
-    ``gitea_lock_issue`` grants the duplicate-work waiver from either a
-    sanctioned dead-session recovery (#755) or a sanctioned exact-owner renewal
-    (#760), in that precedence. Every later enforcement path — commit,
-    create-PR, push-ownership, and the read-only duplicate assessor — re-derives
-    ownership from the durable lock instead of that live assessment.
-
-    Until #945 only the recovery half was rebuilt there, so an ordinary
-    exact-owner renewal lost its waiver the moment ``gitea_lock_issue``
-    returned: the author renewed successfully and was then refused
-    ``duplicate_commit_prevented`` with ``owning_pr_recovery_exempted: false``
-    on the very PR the renewal had just proved it owned.
-
-    Resolving both halves here, in the same precedence the lock path applies,
-    keeps the answer from drifting between the gate that grants the waiver and
-    the gates that enforce it. This only decides which server-written block the
-    token is rebuilt from — the token is still re-validated against live PR
-    state by ``issue_work_duplicate_gate._assess_owning_pr_exemption``, which
-    remains the single authoritative policy for whether an exemption applies.
-
-    **Both blocks present is a reachable, legitimate state, and it must agree.**
-    The two dispositions are not mutually exclusive at the writer. Recovery is
-    assessed whenever the lease is not live and requires the recorded PID to be
-    dead; renewal is assessed whenever the lease has *expired* — which is itself
-    one way to be non-live — and deliberately does not branch on PID liveness
-    (#760 AC16). An expired lease whose recorded owner has also died therefore
-    satisfies both, and ``gitea_lock_issue`` writes ``dead_session_recovery``
-    and ``lease_renewal`` into the same freshly built ``data`` dict. Because a
-    sanctioned pair was derived from one live observation in one call, it always
-    describes the same issue, PR, branch and head. Disagreement means the
-    persisted lock is no longer a faithful record of a single sanctioned
-    decision, so no continuation authority is returned.
-
-    Ambiguity never broadens authority. A ``dead_session_recovery`` block that
-    is present but does not rebuild — conflicting, stale, malformed, or only
-    partially valid — fails closed here rather than falling through to renewal:
-    otherwise a recovery record naming one PR could be bypassed by valid-looking
-    renewal evidence naming another. Recovery-only and renewal-only locks keep
-    their existing behaviour exactly, and provenance stays server-controlled —
-    this still only ever re-reads blocks the server itself wrote.
-    """
-    if not lock_record:
-        return None
-    recovery_present = isinstance(lock_record.get("dead_session_recovery"), dict)
-    recovered = issue_lock_recovery.recovered_owning_pr_from_lock(lock_record)
-    # Present but unusable recovery evidence is ambiguous, not absent.
-    if recovery_present and not recovered:
-        return None
-    renewed = issue_lock_renewal.owning_pr_renewal_from_lock(lock_record)
-    if recovered and renewed and not _continuation_evidence_agrees(recovered, renewed):
-        return None
-    if recovered:
-        return recovered
-    return renewed
-
-
 def _assess_issue_duplicate_gate(
    issue_number: int,
    *,
@@ -2914,11 +2833,6 @@ def _enforce_locked_issue_duplicate_recheck(
    commit and create-PR phases run in their own calls, long after the recovery
    assessment ended, so without this they re-block the very PR the recovery
    already proved belongs to this author.
-
-    #945: an exact-owner *renewal* (#760) owns its open PR for exactly the same
-    reason, and ``gitea_lock_issue`` already waives the blocker for both. Both
-    halves are resolved together here so the renewal waiver survives past the
-    lock call instead of expiring with it.
    """
    lock_data = _load_existing_issue_lock()
    if not lock_data:
@@ -2942,7 +2856,9 @@ def _enforce_locked_issue_duplicate_recheck(
        auth=auth,
        locked_branch=locked_branch,
        phase=phase,
-        recovered_owning_pr=_owning_pr_continuation_from_lock(lock_data),
+        recovered_owning_pr=issue_lock_recovery.recovered_owning_pr_from_lock(
+            lock_data
+        ),
    )
    if gate.get("block"):
        return gate
@@ -3664,6 +3580,293 @@ def _authenticated_username(host: str):
    return user


+# #943 review 622 F3/F4: one coherent authority snapshot per mutation claim.
+#
+# The reviewed implementation read the identity from the pinned #714 session
+# context and the profile from the live ``get_profile()``, so a sanctioned
+# rebind could produce a claimant pair whose two halves came from different
+# snapshots — and that pair is written durably into the issue lock. The
+# canonical pairing is ``record_mutation_authority``: profile from
+# ``get_profile()``, identity from ``_authenticated_username(host)``. This
+# resolver reproduces that pairing, and uses the pinned session context only for
+# drift detection, never as a value source.
+_AUTHORITY_PROFILE_UNRESOLVED = "authority_profile_unresolved"
+_AUTHORITY_IDENTITY_UNRESOLVED = "authority_identity_unresolved"
+_AUTHORITY_IDENTITY_DRIFT = "authority_identity_drift"
+_AUTHORITY_PROFILE_DRIFT = "authority_profile_drift"
+
+
+def _active_mutation_authority(host: str | None) -> dict:
+    """Resolve one coherent (identity, profile) authority pair, or a refusal.
+
+    Both halves come from the same live snapshot. The immutable #714 session
+    context is consulted only to detect drift: when it disagrees with the live
+    snapshot the result is a fail-closed refusal, never a silently blended pair.
+
+    Returns a dict with ``ok`` True plus ``identity``/``profile_name``, or ``ok``
+    False plus ``reason_code``, ``reasons`` and ``expected``/``actual`` when a
+    drift or resolution failure is detected. Never raises for an unresolved
+    profile: the caller converts the refusal into a structured author block so
+    reason code, retryability and transport survival are preserved (F4).
+    """
+    try:
+        profile = get_profile() or {}
+    except (RuntimeError, ValueError, TypeError, KeyError, OSError) as exc:
+        # Narrow, and never a silent fallback to a previously cached name: an
+        # unresolvable profile is a fail-closed condition, matching
+        # record_mutation_authority's "active profile unresolved (fail closed)".
+        return {
+            "ok": False,
+            "reason_code": _AUTHORITY_PROFILE_UNRESOLVED,
+            "reasons": [
+                "active profile could not be resolved: "
+                f"{_redact(str(exc))} (fail closed)"
+            ],
+        }
+    profile_name = (profile.get("profile_name") or "").strip()
+    if not profile_name:
+        return {
+            "ok": False,
+            "reason_code": _AUTHORITY_PROFILE_UNRESOLVED,
+            "reasons": [
+                "active profile carries no profile_name (fail closed)"
+            ],
+        }
+
+    identity = ""
+    if host:
+        identity = (_authenticated_username(host) or "").strip()
+    if not identity:
+        # A profile's expected_username is configuration, not proof of an
+        # authenticated actor, so it is never substituted here.
+        return {
+            "ok": False,
+            "reason_code": _AUTHORITY_IDENTITY_UNRESOLVED,
+            "reasons": [
+                "authenticated identity could not be resolved for the active "
+                "host (fail closed); call gitea_whoami and retry"
+            ],
+        }
+
+    ctx = session_ctx.get_session_context() or {}
+    pinned_identity = (ctx.get("identity") or "").strip()
+    pinned_profile = (ctx.get("profile_name") or "").strip()
+    if pinned_identity and pinned_identity != identity:
+        return {
+            "ok": False,
+            "reason_code": _AUTHORITY_IDENTITY_DRIFT,
+            "reasons": [
+                "live authenticated identity disagrees with the bound session "
+                "context identity (fail closed)"
+            ],
+            "expected": pinned_identity,
+            "actual": identity,
+        }
+    if pinned_profile and pinned_profile != profile_name:
+        return {
+            "ok": False,
+            "reason_code": _AUTHORITY_PROFILE_DRIFT,
+            "reasons": [
+                "live active profile disagrees with the bound session context "
+                "profile (fail closed)"
+            ],
+            "expected": pinned_profile,
+            "actual": profile_name,
+        }
+    return {
+        "ok": True,
+        "identity": identity,
+        "profile_name": profile_name,
+        "session_context_bound": bool(pinned_identity or pinned_profile),
+    }
+
+
+def _active_username(host: str | None = None) -> str | None:
+    """Authenticated identity for the active mutation authority, else None.
+
+    Refuses unbound, blank and whitespace-only identities, and never substitutes
+    a profile's ``expected_username`` for an authenticated one.
+    """
+    authority = _active_mutation_authority(host)
+    return authority.get("identity") if authority.get("ok") else None
+
+
+def _active_profile_name(host: str | None = None) -> str | None:
+    """Active profile name for the mutation authority, else None.
+
+    Shares the single snapshot with :func:`_active_username`, so the two can
+    never describe different authority states.
+    """
+    authority = _active_mutation_authority(host)
+    return authority.get("profile_name") if authority.get("ok") else None
+
+
+# #943 review 622 B1: the workflow session that owns the work — never a
+# process-lifetime or PID-derived value.
+#
+# The reviewed implementation minted "<profile>-<pid>-<hex>" once per process.
+# The MCP daemon outlives every task it serves, so that identifier conflates
+# sequential author tasks and can never equal the control-plane session that
+# owns an allocator-created lease; ``_verify_assignment_and_lease_ids`` therefore
+# refused with lease_session_mismatch on the canonical allocated path.
+# ``issue_lock_store.mint_task_session_id`` states the rule directly: an
+# ownership key "deliberately contains no process identifier", because the PID
+# "cannot identify *which* task holds a claim".
+_SESSION_UNVERIFIED = "workflow_session_unverified"
+_SESSION_REQUIRED = "workflow_session_required_for_allocated_work"
+_SESSION_LOCK_OWNER_MISMATCH = "issue_lock_owner_mismatch"
+
+
+def _resolve_owner_workflow_session(
+    *,
+    issue_number: int,
+    assignment_id: str | None,
+    lease_id: str | None,
+    session_id: str | None,
+    identity: str,
+    profile_name: str,
+    remote: str,
+    org: str | None,
+    repo: str | None,
+) -> dict:
+    """Resolve the authoritative workflow session that owns this work.
+
+    Precedence, each step fail-closed:
+
+    1. An explicit ``session_id`` is verified against the control-plane
+       ``sessions`` table: it must exist, be active, and match this role and
+       profile. An unverifiable identifier is refused, never trusted.
+    2. Otherwise an existing issue lock for this issue supplies its per-task
+       ``task_session_id``, but only when the lock's recorded claimant matches
+       the resolved authority pair.
+    3. Otherwise, when allocator identifiers are supplied, the request is
+       refused: ownership of an allocated assignment cannot be established
+       without its owning session, and the presence of the identifiers is not
+       itself evidence of ownership.
+    4. Otherwise — no allocator identifiers and no existing lock — a fresh
+       per-task key is minted through the canonical
+       ``issue_lock_store.mint_task_session_id``. It carries no process
+       identifier and is never memoised, so sequential tasks on one daemon never
+       share an owner.
+
+    Whether the resolved session actually owns a supplied lease stays the
+    decision of ``author_issue_bootstrap._verify_assignment_and_lease_ids``;
+    this function never pre-empts, duplicates or bypasses that gate.
+    """
+    declared = (session_id or "").strip()
+    if declared:
+        db, errs = _control_plane_db_or_error()
+        if db is None:
+            return {
+                "ok": False,
+                "reason_code": _SESSION_UNVERIFIED,
+                "reasons": errs,
+            }
+        try:
+            rows = db.list_sessions(statuses=("active",))
+        except Exception as exc:  # noqa: BLE001 — surface structured
+            return {
+                "ok": False,
+                "reason_code": _SESSION_UNVERIFIED,
+                "reasons": [
+                    "could not read control-plane sessions to verify "
+                    f"session_id: {_redact(str(exc))} (fail closed)"
+                ],
+            }
+        match = next(
+            (r for r in rows if str(r.get("session_id") or "") == declared), None
+        )
+        if match is None:
+            return {
+                "ok": False,
+                "reason_code": _SESSION_UNVERIFIED,
+                "reasons": [
+                    f"session_id '{declared}' is not an active control-plane "
+                    "session (fail closed)"
+                ],
+            }
+        row_role = (match.get("role") or "").strip().lower()
+        row_profile = (match.get("profile") or "").strip()
+        if row_role and row_role != "author":
+            return {
+                "ok": False,
+                "reason_code": _SESSION_UNVERIFIED,
+                "reasons": [
+                    f"session_id '{declared}' is recorded for role "
+                    f"'{row_role}', not author (fail closed)"
+                ],
+                "expected": "author",
+                "actual": row_role,
+            }
+        if row_profile and row_profile != profile_name:
+            return {
+                "ok": False,
+                "reason_code": _SESSION_UNVERIFIED,
+                "reasons": [
+                    f"session_id '{declared}' is recorded for profile "
+                    f"'{row_profile}', not '{profile_name}' (fail closed)"
+                ],
+                "expected": row_profile,
+                "actual": profile_name,
+            }
+        return {"ok": True, "session_id": declared, "session_source": "declared"}
+
+    lock = None
+    try:
+        lock = issue_lock_store.load_issue_lock(
+            remote=remote,
+            org=org or "",
+            repo=repo or "",
+            issue_number=int(issue_number),
+        )
+    except Exception:  # noqa: BLE001 — absent/unreadable lock is not fatal here
+        lock = None
+    lock_session = issue_lock_store.lease_task_session_id(lock) if lock else ""
+    if lock_session:
+        lease = (lock or {}).get("work_lease") or {}
+        claimant = lease.get("claimant") or {}
+        lock_identity = (claimant.get("username") or "").strip()
+        lock_profile = (claimant.get("profile") or "").strip()
+        if (lock_identity and lock_identity != identity) or (
+            lock_profile and lock_profile != profile_name
+        ):
+            return {
+                "ok": False,
+                "reason_code": _SESSION_LOCK_OWNER_MISMATCH,
+                "reasons": [
+                    f"issue #{int(issue_number)} is locked by "
+                    f"'{lock_identity or 'unknown'}' ({lock_profile or 'unknown'}), "
+                    f"not '{identity}' ({profile_name}) (fail closed)"
+                ],
+                "expected": f"{lock_identity}/{lock_profile}",
+                "actual": f"{identity}/{profile_name}",
+            }
+        return {
+            "ok": True,
+            "session_id": lock_session,
+            "session_source": "issue_lock",
+        }
+
+    if (assignment_id or "").strip() or (lease_id or "").strip():
+        return {
+            "ok": False,
+            "reason_code": _SESSION_REQUIRED,
+            "reasons": [
+                "assignment_id/lease_id were supplied but no owning workflow "
+                "session could be established (fail closed); pass the "
+                "session_id that holds the lease, or bind the issue lock first"
+            ],
+        }
+
+    return {
+        "ok": True,
+        "session_id": issue_lock_store.mint_task_session_id(
+            issue_lock_store.AUTHOR_ISSUE_WORK_LEASE
+        ),
+        "session_source": "minted_task_key",
+    }
+
+
 def _authenticated_actor(host: str) -> dict:
    """Resolve the authenticated actor's stable identity (#709 F7 review 438).

@@ -5224,10 +5427,9 @@ def gitea_assess_work_issue_duplicate(
    recovered_owning_pr = None
    lock_data = _load_existing_issue_lock()
    if lock_data and int(lock_data.get("issue_number") or 0) == int(issue_number):
-        # #945: rebuilt from a sanctioned recovery *or* a sanctioned exact-owner
-        # renewal, so this read-only assessor reports the same disposition the
-        # commit and create-PR gates will enforce.
-        recovered_owning_pr = _owning_pr_continuation_from_lock(lock_data)
+        recovered_owning_pr = issue_lock_recovery.recovered_owning_pr_from_lock(
+            lock_data
+        )
    gate = _assess_issue_duplicate_gate(
        issue_number,
        h=h,
@@ -9987,6 +10189,24 @@ def gitea_commit_files(
    }


+def _author_mutation_block(reasons: list[str], **extra) -> dict:
+    """Uniform fail-closed shape for an author mutation refused after a reviewer stop.
+
+    #943: referenced by ``gitea_bootstrap_author_issue_worktree`` and never
+    defined, so the reviewer-stop refusal path raised ``NameError`` instead of
+    returning its refusal. Mirrors the inline shape the other author mutations
+    return for the same ``check_author_mutation_after_reviewer_stop`` block.
+    """
+    payload = {
+        "success": False,
+        "performed": False,
+        "outcome": "REFUSED",
+        "reasons": reasons,
+    }
+    payload.update(extra)
+    return payload
+
+
 def _publication_block(reasons: list[str], **extra) -> dict:
    """Uniform fail-closed shape for publication refusals (#812 AC20)."""
    payload = {
@@ -10243,6 +10463,7 @@ def gitea_bootstrap_author_issue_worktree(
    branch_name: str | None = None,
    worktree_path: str | None = None,
    idempotency_key: str | None = None,
+    session_id: str | None = None,
    remote: str = "dadeschools",
    host: str | None = None,
    org: str | None = None,
@@ -10264,6 +10485,14 @@ def gitea_bootstrap_author_issue_worktree(
        branch_name: Optional custom branch name (must match issue-<N> pattern).
        worktree_path: Optional custom worktree path under branches/.
        idempotency_key: Optional key for idempotent replay/resume.
+        session_id: Optional workflow session that owns the assignment/lease.
+            Required when assignment_id/lease_id are supplied, because ownership
+            of an allocated lease is compared by session identifier and cannot
+            be derived from the daemon process (#943 review 622 B1). Verified
+            against the control-plane sessions table; an unverifiable value is
+            refused rather than trusted. Omit for an unallocated bootstrap: the
+            owning session is then taken from an existing issue lock, or a fresh
+            per-task key is minted.
        remote: Known instance — 'dadeschools' or 'prgs'.
        host: Override Gitea host.
        org: Override Org.
@@ -10302,6 +10531,44 @@ def gitea_bootstrap_author_issue_worktree(
    h, o, r = _resolve(remote, host, org, repo)
    canonical_root = _canonical_local_git_root()

+    # One authority snapshot supplies both halves of the claimant pair (F3), and
+    # an unresolvable profile becomes a structured refusal rather than a silent
+    # fallback (F4).
+    authority = _active_mutation_authority(h)
+    if not authority.get("ok"):
+        return _author_mutation_block(
+            authority.get("reasons") or ["mutation authority unresolved"],
+            reason_code=authority.get("reason_code"),
+            retryable=False,
+            transport_survives=True,
+            expected=authority.get("expected"),
+            actual=authority.get("actual"),
+            issue_number=int(issue_number),
+        )
+
+    # The owning workflow session — never process- or PID-derived (B1).
+    session = _resolve_owner_workflow_session(
+        issue_number=issue_number,
+        assignment_id=assignment_id,
+        lease_id=lease_id,
+        session_id=session_id,
+        identity=authority["identity"],
+        profile_name=authority["profile_name"],
+        remote=remote,
+        org=o,
+        repo=r,
+    )
+    if not session.get("ok"):
+        return _author_mutation_block(
+            session.get("reasons") or ["owning workflow session unresolved"],
+            reason_code=session.get("reason_code"),
+            retryable=False,
+            transport_survives=True,
+            expected=session.get("expected"),
+            actual=session.get("actual"),
+            issue_number=int(issue_number),
+        )
+
    import author_issue_bootstrap

    return author_issue_bootstrap.bootstrap_author_issue_worktree(
@@ -10317,9 +10584,9 @@ def gitea_bootstrap_author_issue_worktree(
        host=h,
        org=o,
        repo=r,
-        active_identity=_active_username(),
-        active_profile=_active_profile_name(),
-        owner_session=_current_session_id(),
+        active_identity=authority["identity"],
+        active_profile=authority["profile_name"],
+        owner_session=session["session_id"],
        dry_run=dry_run,
    )

@@ -19509,10 +19776,7 @@ def _prove_author_ownership_for_pr(
    # advance is the one recovery already sanctioned, not a foreign head.
    recovered_owning_pr = None
    if proven and lock_record:
-        # #945: a sanctioned exact-owner renewal proves the same ownership of
-        # the same PR, so the push gate resolves both halves rather than seeing
-        # only the recovery one.
-        candidate = _owning_pr_continuation_from_lock(lock_record)
+        candidate = issue_lock_recovery.recovered_owning_pr_from_lock(lock_record)
        if candidate and int(candidate.get("pr_number") or 0) == int(pr_number):
            recovered_owning_pr = candidate
    return {
@@ -436,117 +436,6 @@ def owning_pr_renewal_evidence(
    }


-def owning_pr_renewal_from_lock(
-    lock_record: Mapping[str, Any] | None,
-) -> dict[str, Any] | None:
-    """Rebuild owning-PR renewal evidence from a persisted lock (#945).
-
-    The renewal mirror of ``issue_lock_recovery.recovered_owning_pr_from_lock``.
-    ``owning_pr_renewal_evidence`` supplies the waiver for the duration of the
-    ``gitea_lock_issue`` call only. The commit, push, create-PR, and
-    duplicate-assessment gates run later in their own calls and re-derive
-    ownership from the durable lock instead — so without this the open PR that
-    renewal already proved belongs to this author reappears there as competing
-    duplicate work, and the exact owner is refused with
-    ``duplicate_commit_prevented`` despite complete matching evidence.
-
-    This reads only the ``lease_renewal`` block that the server itself writes,
-    on a lock the caller must already own. Like the recovery mirror it is a
-    re-read of server-derived state, never a fresh assertion: a caller able to
-    forge it could equally forge the lock file every other ownership gate
-    already treats as authoritative.
-
-    Renewal has no descendant case — the assessor required the local, remote and
-    PR heads to be equal — so that equality is re-checked here, and the record
-    must still name the claimant the lock records.
-
-    **What the claimant check below is, and what it is not.** It compares
-    ``lease_renewal.identity``/``profile`` against the claimant recorded on the
-    *same* lock file. Both sides are server-written fields of one document, so
-    this is an internal-consistency check: it rejects a lock whose renewal block
-    and claimant disagree. It does **not** consult the live authenticated caller
-    and therefore does not, on its own, prove that the session invoking a later
-    gate is the session the renewal was granted to.
-
-    The binding that actually keeps one session from using another's renewal is
-    structural, and it lives in the caller rather than here. The enforcement
-    paths load the lock through ``_load_existing_issue_lock()`` with no issue
-    coordinates, which resolves ``issue_lock_store.read_session_issue_lock()``
-    → the session pointer at ``session-{os.getpid()}.json``. Lock *selection* is
-    scoped to the operating-system process, so a caller cannot aim the recheck
-    at a lock some other process bound. Its limits follow from what that scope
-    is: it is per-process, not per-authenticated-user; it says nothing about a
-    lock reached by explicit issue coordinates rather than the session pointer,
-    and nothing about two roles sharing one process. Live identity and profile
-    are enforced separately, by the mutation-authority and profile gates each
-    mutating path already runs — not by this rebuild.
-
-    This function is therefore strictly a re-read with an added consistency
-    requirement. It narrows what a persisted lock can authorize; it never widens
-    it, and it never substitutes for a caller-identity gate.
-    """
-    if not isinstance(lock_record, Mapping):
-        return None
-    record = lock_record.get("lease_renewal")
-    if not isinstance(record, Mapping) or not record.get("renewed"):
-        return None
-
-    branch_name = _text(record.get("branch_name")) or _text(
-        lock_record.get("branch_name")
-    )
-    pr_head = _text(record.get("pr_head_sha"))
-    local_head = _text(record.get("head_sha"))
-    remote_head = _text(record.get("remote_head_sha"))
-    raw_pr_number = record.get("pr_number")
-    raw_issue_number = lock_record.get("issue_number")
-
-    if raw_pr_number is None or raw_issue_number is None:
-        return None
-    if not branch_name or not pr_head:
-        return None
-    # The assessor required all three heads to agree before it granted renewal.
-    # Re-check, so a truncated, drifted, or hand-built record cannot widen the
-    # exemption past the single head the renewal disposition actually proved.
-    if not local_head or not remote_head:
-        return None
-    if pr_head != local_head or pr_head != remote_head:
-        return None
-    # Renewal is refused outright unless the durable lock records both a
-    # claimant username and profile, so a sanctioned record always carries them.
-    # Requiring them to still agree rejects a lock whose renewal block and
-    # claimant disagree. Both values are read from this one server-written
-    # document: this is internal consistency, not a check against the live
-    # authenticated caller — see the docstring for the binding that is.
-    claimant = lock_record.get("claimant")
-    if not isinstance(claimant, Mapping):
-        lease = lock_record.get("work_lease")
-        claimant = lease.get("claimant") if isinstance(lease, Mapping) else None
-    if not isinstance(claimant, Mapping):
-        return None
-    identity = _text(record.get("identity"))
-    profile = _text(record.get("profile"))
-    if not identity or identity != _text(claimant.get("username")):
-        return None
-    if not profile or profile != _text(claimant.get("profile")):
-        return None
-
-    try:
-        pr_number = int(raw_pr_number)
-        issue_number = int(raw_issue_number)
-    except (TypeError, ValueError):
-        return None
-
-    return {
-        "issue_number": issue_number,
-        "pr_number": pr_number,
-        "branch_name": branch_name,
-        "head_sha": pr_head,
-        "recorded_head": pr_head,
-        "accepted_head": pr_head,
-        "head_relation": "equal",
-    }
-
-
 def build_renewal_record(
    assessment: Mapping[str, Any] | None,
    *,
@@ -0,0 +1,747 @@
+"""Regression: author bootstrap runtime authority and session ownership (#943).
+
+Two rounds of defects live here.
+
+**Round 1 (#943 as filed).** ``gitea_bootstrap_author_issue_worktree`` passed
+four values down to the bootstrap service that were never defined:
+``_active_username``, ``_active_profile_name``, ``_current_session_id`` and
+``_author_mutation_block``. Every call — dry-run included — raised
+``NameError`` while evaluating the arguments, before the service was entered.
+
+**Round 2 (review 622 on PR #944).** The first fix defined all four but made
+``_current_session_id`` mint ``<profile>-<pid>-<hex>`` once per process. The MCP
+daemon outlives every task it serves, so that value conflates sequential author
+tasks and can never equal the control-plane session that owns an
+allocator-created lease: ``_verify_assignment_and_lease_ids`` refused the whole
+allocated path with ``lease_session_mismatch``. The reviewed round also read the
+identity from the pinned session context while reading the profile from the live
+profile, so a rebind could produce a mixed claimant pair, and it swallowed every
+``get_profile()`` exception.
+
+These tests therefore drive real state, not mocks of internals: a temporary
+control-plane SQLite database and a temporary issue-lock directory, both
+redirected through the same environment variables production uses
+(``GITEA_CONTROL_PLANE_DB``, ``GITEA_ISSUE_LOCK_DIR``). The ownership gate that
+runs is the real one.
+
+``test_every_global_referenced_by_the_wrapper_resolves`` remains: it is what
+found ``_author_mutation_block``, and it generalises to the next missing
+reference. It supplements the runtime coverage below rather than standing in for
+it.
+"""
+
+from __future__ import annotations
+
+import ast
+import builtins
+import os
+import re
+import subprocess
+import tempfile
+import unittest
+from unittest import mock
+
+import author_issue_bootstrap as aib
+import control_plane_db
+import create_issue_bootstrap as cib
+import gitea_mcp_server as gms
+import issue_lock_store
+import workflow_scope_guard
+
+BOOTSTRAP_TASK = "bootstrap_author_issue_worktree"
+WRAPPER_NAME = "gitea_bootstrap_author_issue_worktree"
+RUNTIME_HELPERS = (
+    "_active_mutation_authority",
+    "_active_username",
+    "_active_profile_name",
+    "_resolve_owner_workflow_session",
+    "_author_mutation_block",
+)
+ORG = "Scaled-Tech-Consulting"
+REPO = "Gitea-Tools"
+IDENTITY = "jcwalker3"
+PROFILE = "prgs-author"
+
+# A per-task ownership key must carry no process identifier (#790).
+TASK_KEY_RE = re.compile(r"^author_issue_work-[0-9a-f]{16}$")
+
+
+def _make_control_repo(tmp: str) -> tuple[str, str]:
+    """Create a clean control checkout on master and return (path, head)."""
+    repo = os.path.join(tmp, "repo")
+    os.makedirs(os.path.join(repo, "branches"))
+    subprocess.check_call(
+        ["git", "init", "-b", "master", repo],
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL,
+    )
+    subprocess.check_call(
+        [
+            "git", "-C", repo,
+            "-c", "user.email=t@t", "-c", "user.name=t",
+            "commit", "--allow-empty", "-m", "init",
+        ],
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL,
+    )
+    head = subprocess.check_output(
+        ["git", "-C", repo, "rev-parse", "HEAD"], text=True
+    ).strip()
+    return repo, head
+
+
+def _wrapper_ast() -> ast.FunctionDef:
+    """Return the AST of the bootstrap wrapper as it exists on disk."""
+    path = os.path.join(
+        os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+        "gitea_mcp_server.py",
+    )
+    with open(path, encoding="utf-8") as fh:
+        tree = ast.parse(fh.read())
+    for node in ast.walk(tree):
+        if isinstance(node, ast.FunctionDef) and node.name == WRAPPER_NAME:
+            return node
+    raise AssertionError(f"{WRAPPER_NAME} not found in gitea_mcp_server.py")
+
+
+class _IsolatedControlPlane(unittest.TestCase):
+    """Temp control-plane DB and temp issue-lock dir, via production env vars."""
+
+    def setUp(self):
+        self._tmp = tempfile.TemporaryDirectory()
+        self.addCleanup(self._tmp.cleanup)
+        self.tmp = self._tmp.name
+        self.db_path = os.path.join(self.tmp, "control-plane.sqlite3")
+        self.lock_dir = os.path.join(self.tmp, "issue-locks")
+        self.journals = os.path.join(self.tmp, "journals")
+        os.makedirs(self.lock_dir)
+        os.makedirs(self.journals)
+        env = mock.patch.dict(
+            os.environ,
+            {
+                control_plane_db.DB_PATH_ENV: self.db_path,
+                issue_lock_store.LOCK_DIR_ENV: self.lock_dir,
+            },
+        )
+        env.start()
+        self.addCleanup(env.stop)
+        self.db = control_plane_db.ControlPlaneDB(self.db_path)
+
+    def _allocate(self, session_id: str, *, issue: int = 943):
+        """Create a real assignment + lease owned by *session_id*."""
+        self.db.upsert_session(
+            session_id=session_id, role="author", profile=PROFILE, pid=os.getpid()
+        )
+        res = self.db.assign_and_lease(
+            session_id=session_id, role="author", remote="prgs",
+            org=ORG, repo=REPO, kind="issue", number=issue,
+        )
+        self.assertEqual(res.outcome, "assigned", res)
+        return res.assignment_id, res.lease_id
+
+    def _authority(self):
+        """A resolved authority pair, as the wrapper would compute it."""
+        return {"ok": True, "identity": IDENTITY, "profile_name": PROFILE}
+
+    def _resolve_session(self, **over):
+        kwargs = dict(
+            issue_number=943,
+            assignment_id=None,
+            lease_id=None,
+            session_id=None,
+            identity=IDENTITY,
+            profile_name=PROFILE,
+            remote="prgs",
+            org=ORG,
+            repo=REPO,
+        )
+        kwargs.update(over)
+        return gms._resolve_owner_workflow_session(**kwargs)
+
+
+class OwnershipGateTests(_IsolatedControlPlane):
+    """B2: the allocator-driven ownership path, against a real control plane."""
+
+    def setUp(self):
+        super().setUp()
+        self.repo, self.head = _make_control_repo(self.tmp)
+
+    def _bootstrap(self, **over):
+        kwargs = dict(
+            issue_number=943,
+            canonical_repo_root=self.repo,
+            expected_base_sha=self.head,
+            branch_name="fix/issue-943-runtime-context-helpers",
+            remote="prgs",
+            org=ORG,
+            repo=REPO,
+            active_identity=IDENTITY,
+            active_profile=PROFILE,
+            lock_dir=self.journals,
+            idempotency_key="test-943",
+            dry_run=True,
+        )
+        kwargs.update(over)
+        return aib.bootstrap_author_issue_worktree(**kwargs)
+
+    def test_true_owning_session_passes_the_ownership_gate(self):
+        """The canonical owner reaches and completes the service."""
+        session = "prgs-author-task-a"
+        assignment_id, lease_id = self._allocate(session)
+        res = self._bootstrap(
+            assignment_id=assignment_id, lease_id=lease_id, owner_session=session
+        )
+        self.assertTrue(res.get("success"), res)
+        self.assertTrue(res.get("dry_run"))
+        self.assertEqual(res.get("base_sha"), self.head)
+
+    def test_different_session_is_refused(self):
+        session = "prgs-author-task-a"
+        assignment_id, lease_id = self._allocate(session)
+        res = self._bootstrap(
+            assignment_id=assignment_id,
+            lease_id=lease_id,
+            owner_session="prgs-author-task-b",
+        )
+        self.assertFalse(res.get("success"))
+        self.assertEqual(res.get("reason_code"), "lease_session_mismatch")
+
+    def test_process_derived_session_would_be_refused(self):
+        """The reviewed round-1 value shape can never own an allocated lease."""
+        session = "prgs-author-task-a"
+        assignment_id, lease_id = self._allocate(session)
+        round_one_value = f"{PROFILE}-{os.getpid()}-deadbeef"
+        self.assertNotEqual(round_one_value, session)
+        res = self._bootstrap(
+            assignment_id=assignment_id,
+            lease_id=lease_id,
+            owner_session=round_one_value,
+        )
+        self.assertFalse(res.get("success"))
+        self.assertEqual(res.get("reason_code"), "lease_session_mismatch")
+
+    def test_unknown_lease_fails_closed(self):
+        session = "prgs-author-task-a"
+        assignment_id, _ = self._allocate(session)
+        res = self._bootstrap(
+            assignment_id=assignment_id,
+            lease_id="lease-does-not-exist",
+            owner_session=session,
+        )
+        self.assertFalse(res.get("success"))
+        self.assertEqual(res.get("reason_code"), "unknown_lease_id")
+
+    def test_released_lease_fails_closed(self):
+        session = "prgs-author-task-a"
+        assignment_id, lease_id = self._allocate(session)
+        self.db.release_lease(lease_id, session_id=session)
+        res = self._bootstrap(
+            assignment_id=assignment_id, lease_id=lease_id, owner_session=session
+        )
+        self.assertFalse(res.get("success"))
+        self.assertEqual(res.get("reason_code"), "lease_not_live")
+
+    def test_force_expired_lease_fails_closed(self):
+        session = "prgs-author-task-a"
+        assignment_id, lease_id = self._allocate(session)
+        self.db.force_expire_lease(lease_id, reason="test")
+        res = self._bootstrap(
+            assignment_id=assignment_id, lease_id=lease_id, owner_session=session
+        )
+        self.assertFalse(res.get("success"))
+        self.assertEqual(res.get("reason_code"), "lease_not_live")
+
+    def test_replacement_lease_does_not_inherit_prior_ownership(self):
+        """A second task's lease is not ownable by the first task's session."""
+        first = "prgs-author-task-a"
+        assignment_a, lease_a = self._allocate(first)
+        self.db.release_lease(lease_a, session_id=first)
+        second = "prgs-author-task-b"
+        assignment_b, lease_b = self._allocate(second)
+        self.assertNotEqual(lease_a, lease_b)
+        res = self._bootstrap(
+            assignment_id=assignment_b, lease_id=lease_b, owner_session=first
+        )
+        self.assertFalse(res.get("success"))
+        self.assertEqual(res.get("reason_code"), "lease_session_mismatch")
+
+    def test_assignment_lease_identifier_mismatch_fails_closed(self):
+        session = "prgs-author-task-a"
+        _, lease_id = self._allocate(session)
+        res = self._bootstrap(
+            assignment_id="asn-not-the-recorded-one",
+            lease_id=lease_id,
+            owner_session=session,
+        )
+        self.assertFalse(res.get("success"))
+        self.assertEqual(res.get("reason_code"), "assignment_lease_mismatch")
+
+    def test_lease_id_without_assignment_id_fails_closed(self):
+        session = "prgs-author-task-a"
+        _, lease_id = self._allocate(session)
+        res = self._bootstrap(lease_id=lease_id, owner_session=session)
+        self.assertFalse(res.get("success"))
+        self.assertEqual(res.get("reason_code"), "incomplete_assignment_lease_ids")
+
+    def test_dry_run_with_valid_allocator_bindings_leaves_no_durable_state(self):
+        session = "prgs-author-task-a"
+        assignment_id, lease_id = self._allocate(session)
+        res = self._bootstrap(
+            assignment_id=assignment_id, lease_id=lease_id, owner_session=session
+        )
+        self.assertTrue(res.get("success"), res)
+
+        branches = subprocess.check_output(
+            ["git", "-C", self.repo, "branch", "--list"], text=True
+        )
+        self.assertNotIn("issue-943", branches)
+        worktrees = subprocess.check_output(
+            ["git", "-C", self.repo, "worktree", "list"], text=True
+        )
+        self.assertNotIn("issue-943", worktrees)
+        self.assertFalse(
+            os.path.exists(
+                os.path.join(self.repo, "branches",
+                             "fix-issue-943-runtime-context-helpers")
+            )
+        )
+        journal = res.get("phase_journal") or {}
+        self.assertFalse(journal.get("completed"))
+        self.assertFalse(any((journal.get("artifacts_created") or {}).values()))
+        # The dry run must not have created an issue lock in the isolated dir.
+        self.assertEqual(os.listdir(self.lock_dir), [])
+
+    def test_apply_reaches_the_intended_transition_with_valid_bindings(self):
+        session = "prgs-author-task-a"
+        assignment_id, lease_id = self._allocate(session)
+        res = self._bootstrap(
+            assignment_id=assignment_id,
+            lease_id=lease_id,
+            owner_session=session,
+            dry_run=False,
+        )
+        self.assertTrue(res.get("success"), res)
+        self.assertNotEqual(res.get("dry_run"), True)
+        branches = subprocess.check_output(
+            ["git", "-C", self.repo, "branch", "--list"], text=True
+        )
+        self.assertIn("issue-943", branches)
+        self.assertTrue(os.path.isdir(res.get("worktree_path") or ""))
+
+
+class WorkflowSessionResolutionTests(_IsolatedControlPlane):
+    """B1: the wrapper resolves the owning session, never a process identifier."""
+
+    def test_declared_session_is_verified_against_the_control_plane(self):
+        session = "prgs-author-task-a"
+        assignment_id, lease_id = self._allocate(session)
+        res = self._resolve_session(
+            session_id=session, assignment_id=assignment_id, lease_id=lease_id
+        )
+        self.assertTrue(res.get("ok"), res)
+        self.assertEqual(res.get("session_id"), session)
+        self.assertEqual(res.get("session_source"), "declared")
+
+    def test_unknown_declared_session_is_refused_not_trusted(self):
+        res = self._resolve_session(session_id="prgs-author-not-a-session")
+        self.assertFalse(res.get("ok"))
+        self.assertEqual(res.get("reason_code"), "workflow_session_unverified")
+
+    def test_declared_session_for_another_role_is_refused(self):
+        self.db.upsert_session(
+            session_id="prgs-reviewer-x", role="reviewer", profile="prgs-reviewer",
+            pid=os.getpid(),
+        )
+        res = self._resolve_session(session_id="prgs-reviewer-x")
+        self.assertFalse(res.get("ok"))
+        self.assertEqual(res.get("reason_code"), "workflow_session_unverified")
+
+    def test_declared_session_for_another_profile_is_refused(self):
+        self.db.upsert_session(
+            session_id="other-profile-session", role="author",
+            profile="prgs-controller", pid=os.getpid(),
+        )
+        res = self._resolve_session(session_id="other-profile-session")
+        self.assertFalse(res.get("ok"))
+        self.assertEqual(res.get("reason_code"), "workflow_session_unverified")
+
+    def test_allocated_work_without_a_session_is_refused(self):
+        """Supplying a lease is not itself evidence of ownership."""
+        session = "prgs-author-task-a"
+        assignment_id, lease_id = self._allocate(session)
+        res = self._resolve_session(assignment_id=assignment_id, lease_id=lease_id)
+        self.assertFalse(res.get("ok"))
+        self.assertEqual(
+            res.get("reason_code"), "workflow_session_required_for_allocated_work"
+        )
+
+    def test_existing_issue_lock_supplies_its_per_task_session(self):
+        lock_session = issue_lock_store.mint_task_session_id(
+            issue_lock_store.AUTHOR_ISSUE_WORK_LEASE
+        )
+        path = issue_lock_store.lock_file_path(
+            remote="prgs", org=ORG, repo=REPO, issue_number=943,
+            lock_dir=self.lock_dir,
+        )
+        issue_lock_store.write_lock_file(
+            path,
+            {
+                "issue_number": 943,
+                "branch_name": "fix/issue-943-runtime-context-helpers",
+                "work_lease": {
+                    "task_session_id": lock_session,
+                    "claimant": {"username": IDENTITY, "profile": PROFILE},
+                },
+            },
+        ) if hasattr(issue_lock_store, "write_lock_file") else _write_json(
+            path,
+            {
+                "issue_number": 943,
+                "branch_name": "fix/issue-943-runtime-context-helpers",
+                "work_lease": {
+                    "task_session_id": lock_session,
+                    "claimant": {"username": IDENTITY, "profile": PROFILE},
+                },
+            },
+        )
+        res = self._resolve_session()
+        self.assertTrue(res.get("ok"), res)
+        self.assertEqual(res.get("session_id"), lock_session)
+        self.assertEqual(res.get("session_source"), "issue_lock")
+
+    def test_issue_lock_owned_by_another_identity_is_refused(self):
+        path = issue_lock_store.lock_file_path(
+            remote="prgs", org=ORG, repo=REPO, issue_number=943,
+            lock_dir=self.lock_dir,
+        )
+        _write_json(
+            path,
+            {
+                "issue_number": 943,
+                "work_lease": {
+                    "task_session_id": "author_issue_work-" + "0" * 16,
+                    "claimant": {"username": "someone-else", "profile": PROFILE},
+                },
+            },
+        )
+        res = self._resolve_session()
+        self.assertFalse(res.get("ok"))
+        self.assertEqual(res.get("reason_code"), "issue_lock_owner_mismatch")
+
+    def test_unallocated_bootstrap_mints_a_per_task_key(self):
+        res = self._resolve_session()
+        self.assertTrue(res.get("ok"), res)
+        self.assertEqual(res.get("session_source"), "minted_task_key")
+        self.assertRegex(res["session_id"], TASK_KEY_RE)
+
+    def test_minted_key_contains_no_process_identifier(self):
+        res = self._resolve_session()
+        self.assertNotIn(str(os.getpid()), res["session_id"])
+        self.assertNotIn(PROFILE, res["session_id"])
+
+    def test_sequential_tasks_on_one_daemon_do_not_share_ownership(self):
+        """The round-1 defect: one identifier per process for every task."""
+        first = self._resolve_session()["session_id"]
+        second = self._resolve_session()["session_id"]
+        third = self._resolve_session()["session_id"]
+        self.assertNotEqual(first, second)
+        self.assertNotEqual(second, third)
+        self.assertEqual(len({first, second, third}), 3)
+
+    def test_no_process_lifetime_cache_remains(self):
+        self.assertFalse(hasattr(gms, "_ACTIVE_SESSION_ID"))
+        self.assertFalse(hasattr(gms, "_current_session_id"))
+
+
+class MutationAuthorityTests(unittest.TestCase):
+    """F3/F4: one coherent authority pair, drift detected, no silent fallback."""
+
+    def _ctx(self, **over):
+        base = {"identity": IDENTITY, "profile_name": PROFILE}
+        base.update(over)
+        return base
+
+    def test_matching_live_and_pinned_authority_resolves(self):
+        with mock.patch.object(gms, "get_profile",
+                               return_value={"profile_name": PROFILE}), \
+                mock.patch.object(gms, "_authenticated_username",
+                                  return_value=IDENTITY), \
+                mock.patch.object(gms.session_ctx, "get_session_context",
+                                  return_value=self._ctx()):
+            res = gms._active_mutation_authority("gitea.prgs.cc")
+        self.assertTrue(res.get("ok"), res)
+        self.assertEqual(res["identity"], IDENTITY)
+        self.assertEqual(res["profile_name"], PROFILE)
+
+    def test_identity_drift_fails_closed(self):
+        with mock.patch.object(gms, "get_profile",
+                               return_value={"profile_name": PROFILE}), \
+                mock.patch.object(gms, "_authenticated_username",
+                                  return_value="someone-else"), \
+                mock.patch.object(gms.session_ctx, "get_session_context",
+                                  return_value=self._ctx()):
+            res = gms._active_mutation_authority("gitea.prgs.cc")
+        self.assertFalse(res.get("ok"))
+        self.assertEqual(res.get("reason_code"), "authority_identity_drift")
+        self.assertEqual(res.get("expected"), IDENTITY)
+        self.assertEqual(res.get("actual"), "someone-else")
+
+    def test_profile_drift_fails_closed(self):
+        with mock.patch.object(gms, "get_profile",
+                               return_value={"profile_name": "prgs-controller"}), \
+                mock.patch.object(gms, "_authenticated_username",
+                                  return_value=IDENTITY), \
+                mock.patch.object(gms.session_ctx, "get_session_context",
+                                  return_value=self._ctx()):
+            res = gms._active_mutation_authority("gitea.prgs.cc")
+        self.assertFalse(res.get("ok"))
+        self.assertEqual(res.get("reason_code"), "authority_profile_drift")
+
+    def test_identity_and_profile_never_come_from_different_snapshots(self):
+        """Round 2's mixed pair: pinned identity plus live profile."""
+        with mock.patch.object(gms, "get_profile",
+                               return_value={"profile_name": "prgs-controller"}), \
+                mock.patch.object(gms, "_authenticated_username",
+                                  return_value="new-identity"), \
+                mock.patch.object(gms.session_ctx, "get_session_context",
+                                  return_value=self._ctx()):
+            res = gms._active_mutation_authority("gitea.prgs.cc")
+            self.assertFalse(res.get("ok"))
+            self.assertIsNone(gms._active_username("gitea.prgs.cc"))
+            self.assertIsNone(gms._active_profile_name("gitea.prgs.cc"))
+
+    def test_unresolvable_profile_is_a_structured_refusal_not_a_fallback(self):
+        """F4: no bare-except fallback to a previously pinned profile name."""
+        with mock.patch.object(gms, "get_profile",
+                               side_effect=RuntimeError("profile disabled")), \
+                mock.patch.object(gms, "_authenticated_username",
+                                  return_value=IDENTITY), \
+                mock.patch.object(gms.session_ctx, "get_session_context",
+                                  return_value=self._ctx()):
+            res = gms._active_mutation_authority("gitea.prgs.cc")
+        self.assertFalse(res.get("ok"))
+        self.assertEqual(res.get("reason_code"), "authority_profile_unresolved")
+        self.assertNotEqual(res.get("profile_name"), PROFILE)
+
+    def test_malformed_profile_without_name_fails_closed(self):
+        with mock.patch.object(gms, "get_profile", return_value={}), \
+                mock.patch.object(gms, "_authenticated_username",
+                                  return_value=IDENTITY), \
+                mock.patch.object(gms.session_ctx, "get_session_context",
+                                  return_value=None):
+            res = gms._active_mutation_authority("gitea.prgs.cc")
+        self.assertFalse(res.get("ok"))
+        self.assertEqual(res.get("reason_code"), "authority_profile_unresolved")
+
+    def test_unresolved_identity_fails_closed(self):
+        for value in (None, "", "   "):
+            with self.subTest(identity=value):
+                with mock.patch.object(gms, "get_profile",
+                                       return_value={"profile_name": PROFILE}), \
+                        mock.patch.object(gms, "_authenticated_username",
+                                          return_value=value), \
+                        mock.patch.object(gms.session_ctx, "get_session_context",
+                                          return_value=None):
+                    res = gms._active_mutation_authority("gitea.prgs.cc")
+                self.assertFalse(res.get("ok"))
+                self.assertEqual(
+                    res.get("reason_code"), "authority_identity_unresolved"
+                )
+
+    def test_missing_host_cannot_yield_an_identity(self):
+        with mock.patch.object(gms, "get_profile",
+                               return_value={"profile_name": PROFILE}), \
+                mock.patch.object(gms.session_ctx, "get_session_context",
+                                  return_value=None):
+            res = gms._active_mutation_authority(None)
+        self.assertFalse(res.get("ok"))
+        self.assertEqual(res.get("reason_code"), "authority_identity_unresolved")
+
+    def test_expected_username_is_never_substituted_for_authentication(self):
+        with mock.patch.object(
+            gms, "get_profile",
+            return_value={"profile_name": PROFILE, "username": IDENTITY},
+        ), mock.patch.object(gms, "_authenticated_username", return_value=None), \
+                mock.patch.object(gms.session_ctx, "get_session_context",
+                                  return_value={"expected_username": IDENTITY}):
+            self.assertIsNone(gms._active_username("gitea.prgs.cc"))
+
+    def test_accessors_share_one_snapshot(self):
+        with mock.patch.object(gms, "get_profile",
+                               return_value={"profile_name": PROFILE}), \
+                mock.patch.object(gms, "_authenticated_username",
+                                  return_value=IDENTITY), \
+                mock.patch.object(gms.session_ctx, "get_session_context",
+                                  return_value=self._ctx()):
+            self.assertEqual(gms._active_username("gitea.prgs.cc"), IDENTITY)
+            self.assertEqual(gms._active_profile_name("gitea.prgs.cc"), PROFILE)
+
+
+class AuthorMutationBlockTests(unittest.TestCase):
+    """Preserved: the structured refusal shape review 622 confirmed correct."""
+
+    def test_matches_the_sibling_refusal_shape(self):
+        res = gms._author_mutation_block(["stopped"])
+        self.assertIs(res["success"], False)
+        self.assertIs(res["performed"], False)
+        self.assertEqual(res["outcome"], "REFUSED")
+        self.assertEqual(res["reasons"], ["stopped"])
+
+    def test_carries_reason_code_and_transport_fields(self):
+        res = gms._author_mutation_block(
+            ["nope"], reason_code="authority_identity_drift",
+            retryable=False, transport_survives=True,
+            expected="a", actual="b", issue_number=943,
+        )
+        self.assertEqual(res["reason_code"], "authority_identity_drift")
+        self.assertIs(res["retryable"], False)
+        self.assertIs(res["transport_survives"], True)
+        self.assertEqual((res["expected"], res["actual"]), ("a", "b"))
+        self.assertEqual(res["issue_number"], 943)
+        self.assertIs(res["success"], False)
+
+
+class RuntimeHelperResolutionTests(unittest.TestCase):
+    """Every runtime helper the wrapper references is defined and callable.
+
+    Supplements the runtime coverage above; it does not replace it.
+    """
+
+    def test_named_helpers_are_defined_and_callable(self):
+        for name in RUNTIME_HELPERS:
+            with self.subTest(helper=name):
+                self.assertTrue(hasattr(gms, name), f"{name} is not defined")
+                self.assertTrue(callable(getattr(gms, name)))
+
+    def test_every_global_referenced_by_the_wrapper_resolves(self):
+        """The generalised form of the round-1 defect: an unresolvable global."""
+        fn = _wrapper_ast()
+        bound: set[str] = {a.arg for a in fn.args.args}
+        bound |= {a.arg for a in fn.args.kwonlyargs}
+        if fn.args.vararg:
+            bound.add(fn.args.vararg.arg)
+        if fn.args.kwarg:
+            bound.add(fn.args.kwarg.arg)
+        for node in ast.walk(fn):
+            if isinstance(node, ast.Name) and isinstance(
+                node.ctx, (ast.Store, ast.Del)
+            ):
+                bound.add(node.id)
+            elif isinstance(node, (ast.Import, ast.ImportFrom)):
+                for alias in node.names:
+                    bound.add((alias.asname or alias.name).split(".")[0])
+            elif isinstance(node, ast.ExceptHandler) and node.name:
+                bound.add(node.name)
+
+        unresolved = sorted(
+            node.id
+            for node in ast.walk(fn)
+            if isinstance(node, ast.Name)
+            and isinstance(node.ctx, ast.Load)
+            and node.id not in bound
+            and not hasattr(gms, node.id)
+            and not hasattr(builtins, node.id)
+        )
+        self.assertEqual(
+            unresolved, [],
+            f"{WRAPPER_NAME} references undefined globals: {unresolved}",
+        )
+
+    def test_wrapper_wires_the_authority_and_session_resolvers(self):
+        fn = _wrapper_ast()
+        called = {
+            node.func.id
+            for node in ast.walk(fn)
+            if isinstance(node, ast.Call) and isinstance(node.func, ast.Name)
+        }
+        self.assertIn("_active_mutation_authority", called)
+        self.assertIn("_resolve_owner_workflow_session", called)
+        self.assertIn("_author_mutation_block", called)
+
+    def test_wrapper_accepts_an_optional_session_id(self):
+        """ABI addition stays backward compatible: optional, defaulting to None."""
+        fn = _wrapper_ast()
+        names = [a.arg for a in fn.args.args]
+        self.assertIn("session_id", names)
+        offset = len(names) - len(fn.args.defaults)
+        default = fn.args.defaults[names.index("session_id") - offset]
+        self.assertIsInstance(default, ast.Constant)
+        self.assertIsNone(default.value)
+
+
+class Issue941ScopeGuardNotRegressedTests(unittest.TestCase):
+    """Preserved: PR #942's bootstrap-scope wiring still holds."""
+
+    def setUp(self):
+        self._tmp = tempfile.TemporaryDirectory()
+        self.addCleanup(self._tmp.cleanup)
+        self.repo, self.head = _make_control_repo(self._tmp.name)
+
+    def _assessment(self, task: str = BOOTSTRAP_TASK) -> dict:
+        return aib.assess_author_issue_bootstrap(
+            workspace_path=self.repo,
+            canonical_repo_root=self.repo,
+            current_branch="master",
+            head_sha=self.head,
+            porcelain_status="",
+            remote_master_sha=self.head,
+            task=task,
+        )
+
+    def test_bootstrap_task_still_permitted_from_clean_control_checkout(self):
+        res = workflow_scope_guard.assess_root_source_mutation(
+            workspace_path=self.repo,
+            canonical_repo_root=self.repo,
+            role_kind="author",
+            mutation_task=BOOTSTRAP_TASK,
+            porcelain_status="",
+            bootstrap_assessment=self._assessment(),
+        )
+        self.assertFalse(res.get("block"), res)
+        self.assertNotEqual(
+            res.get("blocker_kind"), workflow_scope_guard.BLOCKER_MISSING_WORKTREE
+        )
+
+    def test_bootstrap_task_still_blocked_without_evidence(self):
+        res = workflow_scope_guard.assess_root_source_mutation(
+            workspace_path=self.repo,
+            canonical_repo_root=self.repo,
+            role_kind="author",
+            mutation_task=BOOTSTRAP_TASK,
+            porcelain_status="",
+        )
+        self.assertTrue(res.get("block"))
+        self.assertEqual(
+            res.get("blocker_kind"), workflow_scope_guard.BLOCKER_MISSING_WORKTREE
+        )
+
+    def test_ordinary_author_mutation_still_blocked_from_control_checkout(self):
+        res = workflow_scope_guard.assess_root_source_mutation(
+            workspace_path=self.repo,
+            canonical_repo_root=self.repo,
+            role_kind="author",
+            mutation_task="commit_files",
+            porcelain_status="",
+            bootstrap_assessment=self._assessment(),
+        )
+        self.assertTrue(res.get("block"))
+        self.assertEqual(
+            res.get("blocker_kind"), workflow_scope_guard.BLOCKER_MISSING_WORKTREE
+        )
+
+    def test_create_issue_bootstrap_unchanged(self):
+        self.assertTrue(cib.is_create_issue_task("create_issue"))
+        self.assertFalse(cib.is_create_issue_task(BOOTSTRAP_TASK))
+
+
+def _write_json(path: str, payload: dict) -> None:
+    """Write an issue-lock file directly, for lock-precedence tests."""
+    import json
+
+    os.makedirs(os.path.dirname(path), exist_ok=True)
+    with open(path, "w", encoding="utf-8") as fh:
+        json.dump(payload, fh)
+
+
+if __name__ == "__main__":
+    unittest.main()
@@ -1,685 +0,0 @@
-import sys as _sys
-from pathlib import Path as _Path
-_sys.path.insert(0, str(_Path(__file__).resolve().parent))
-from mutation_profile_fixture import shared_mutation_env  # noqa: E402
-"""The renewal waiver reaches the real enforcement paths (#945 B1).
-
-``tests/test_issue_945_owning_pr_renewal_continuation.py`` proves the pure
-pieces: that ``issue_lock_renewal.owning_pr_renewal_from_lock`` rebuilds a
-renewal waiver, that ``_owning_pr_continuation_from_lock`` resolves the two
-dispositions in the right precedence, and that the duplicate gate honours the
-resulting token. None of that proves any *production* path consumes the
-resolver, and review ``623`` demonstrated the gap by reverting the primary call
-site at ``gitea_mcp_server.py:2894`` back to the recovery-only rebuild: the
-whole repository stayed green, failing-test ids byte identical.
-
-This file closes that hole. Every test here starts from a real durable lock
-file written to a temporary lock directory and bound to this process's session
-pointer, then calls the authoritative production entry point — not a helper:
-
-* ``mcp_server._enforce_locked_issue_duplicate_recheck`` — the shared recheck
-  behind ``gitea_commit_files`` and ``gitea_create_pr``
-* ``mcp_server.gitea_assess_work_issue_duplicate`` — the read-only assessor
-* ``mcp_server._prove_author_ownership_for_pr`` — the push / PR-update
-  ownership prover, which is also the existing-PR continuation path
-
-Only the external boundaries are mocked: Gitea HTTP reads (the duplicate
-context fetcher, open-PR and branch listings) and the credential header. The
-reconstruction and enforcement chain under test — lock load, evidence rebuild,
-resolver precedence, and ``issue_work_duplicate_gate`` — runs for real.
-
-``TestRevertingThePrimaryWiringIsDetected`` is the explicit regression the
-review asked for: it reproduces the pre-#945 recovery-only call site and
-asserts the enforcement path then refuses, so the wiring cannot be removed
-silently.
-
-Everything is written under ``tempfile.TemporaryDirectory``. No branch,
-worktree, PR, comment, lease, or lock outside that directory is created, and no
-production Gitea or control-plane state is touched (#945 AC18).
-"""
-import os
-import subprocess
-import sys
-import tempfile
-import unittest
-from datetime import datetime, timedelta, timezone
-from pathlib import Path
-from unittest.mock import patch
-
-sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
-
-import issue_lock_provenance  # noqa: E402
-import issue_lock_recovery  # noqa: E402
-import issue_lock_renewal  # noqa: E402
-import issue_lock_store  # noqa: E402
-import mcp_server  # noqa: E402
-from issue_work_duplicate_gate import (  # noqa: E402
-    PHASE_COMMIT,
-    PHASE_CREATE_PR,
-    PHASE_LOCK,
-    PHASE_PUSH,
-)
-
-ISSUE = 4948
-OWNING_PR = 4949
-OTHER_PR = 4950
-OTHER_ISSUE = 4951
-BRANCH = f"fix/issue-{ISSUE}-renewal-wiring"
-OTHER_BRANCH = f"fix/issue-{ISSUE}-competing"
-HEAD = "e" * 40
-OTHER_HEAD = "f" * 40
-IDENTITY = "example-user"
-PROFILE = "test-author-prgs"
-ORG = "Scaled-Tech-Consulting"
-REPO = "Gitea-Tools"
-HOST = "gitea.prgs.cc"
-
-
-def dead_pid() -> int:
-    """A PID that has certainly exited (spawned, then reaped)."""
-    proc = subprocess.Popen([sys.executable, "-c", "pass"])
-    proc.wait()
-    return proc.pid
-
-
-def shifted_ts(hours: int = 4) -> str:
-    return (
-        (datetime.now(timezone.utc) + timedelta(hours=hours))
-        .isoformat()
-        .replace("+00:00", "Z")
-    )
-
-
-def owning_pr(number=OWNING_PR, ref=BRANCH, sha=HEAD, issue=ISSUE):
-    return {
-        "number": number,
-        "title": f"fix: something (Closes #{issue})",
-        "body": f"Closes #{issue}.",
-        "head": {"ref": ref, "sha": sha},
-    }
-
-
-def renewal_block(
-    *,
-    pr_number=OWNING_PR,
-    branch=BRANCH,
-    head=HEAD,
-    identity=IDENTITY,
-    profile=PROFILE,
-):
-    """The ``lease_renewal`` block ``build_renewal_record`` writes on success."""
-    return {
-        "renewed": True,
-        "renewed_at": shifted_ts(-1),
-        "prior_pid": 4242,
-        "prior_pid_alive": True,
-        "prior_expires_at": shifted_ts(-1),
-        "replacement_pid": os.getpid(),
-        "new_expires_at": shifted_ts(),
-        "identity": identity,
-        "profile": profile,
-        "branch_name": branch,
-        "worktree_path": os.path.realpath(os.getcwd()),
-        "head_sha": head,
-        "remote_head_sha": head,
-        "pr_head_sha": head,
-        "pr_number": pr_number,
-        "reason": "expired lease renewed by its exact recorded owner",
-        "proof": [],
-    }
-
-
-def recovery_block(*, pr_number=OWNING_PR, branch=BRANCH, head=HEAD):
-    """The ``dead_session_recovery`` block ``build_recovery_record`` writes."""
-    return {
-        "recovered": True,
-        "reason": "owning MCP session exited; durable ownership evidence matched",
-        "recovered_at": shifted_ts(-1),
-        "prior_session_pid": 4242,
-        "replacement_session_pid": os.getpid(),
-        "prior_pid_alive": False,
-        "branch_name": branch,
-        "pr_number": pr_number,
-        "pr_head": head,
-        "recorded_head": head,
-        "accepted_head": head,
-        "head_relation": issue_lock_recovery.HEAD_RELATION_EQUAL,
-        "identity": IDENTITY,
-        "profile": PROFILE,
-        "proof": [],
-    }
-
-
-class EnforcementPathBase(unittest.TestCase):
-    """Drives production enforcement entry points against a real durable lock.
-
-    The lock lives in a throwaway directory and is bound to this process's
-    session pointer exactly as ``gitea_lock_issue`` binds it, so
-    ``_load_existing_issue_lock()`` resolves it through the ordinary
-    ``read_session_issue_lock()`` path rather than a test shortcut.
-    """
-
-    def setUp(self):
-        self.lock_dir = tempfile.TemporaryDirectory()
-        self.addCleanup(self.lock_dir.cleanup)
-        self.worktree = os.path.realpath(os.getcwd())
-        self.remotes = patch.dict(
-            mcp_server.REMOTES,
-            {"prgs": {"host": HOST, "org": ORG, "repo": REPO}},
-        )
-        self.remotes.start()
-        self.addCleanup(patch.stopall)
-        mcp_server._IDENTITY_CACHE.clear()
-
-    # ── fixtures ────────────────────────────────────────────────────────────
-
-    def build_lock(
-        self,
-        *,
-        issue_number=ISSUE,
-        branch=BRANCH,
-        renewal=None,
-        recovery=None,
-        claimant=None,
-        pid=None,
-        live=True,
-    ):
-        pid = os.getpid() if pid is None else pid
-        claimant = claimant or {"username": IDENTITY, "profile": PROFILE}
-        expires = shifted_ts() if live else shifted_ts(-1)
-        data = {
-            "issue_number": issue_number,
-            "branch_name": branch,
-            "remote": "prgs",
-            "org": ORG,
-            "repo": REPO,
-            "worktree_path": self.worktree,
-            "session_pid": pid,
-            "pid": pid,
-            "claimant": dict(claimant),
-            "work_lease": {
-                "operation_type": issue_lock_store.AUTHOR_ISSUE_WORK_LEASE,
-                "issue_number": issue_number,
-                "branch": branch,
-                "worktree_path": self.worktree,
-                "claimant": dict(claimant),
-                "created_at": shifted_ts(-1),
-                "last_heartbeat_at": shifted_ts(0) if live else shifted_ts(-1),
-                "expires_at": expires,
-            },
-            "lock_provenance": issue_lock_provenance.build_sanctioned_lock_provenance(
-                tool="gitea_lock_issue",
-                claimant=dict(claimant),
-            ),
-        }
-        if renewal is not None:
-            data["lease_renewal"] = renewal
-        if recovery is not None:
-            data["dead_session_recovery"] = recovery
-        return data
-
-    def bind(self, data):
-        """Persist the lock and bind it to this process, as the server does."""
-        issue_lock_store.bind_session_lock(data, self.lock_dir.name)
-        return data
-
-    def env(self):
-        return shared_mutation_env(
-            PROFILE,
-            include_example_repo=True,
-            GITEA_ISSUE_LOCK_DIR=self.lock_dir.name,
-        )
-
-    def gitea_reads(self, *, open_prs, branch_names=None):
-        """Patch only the external Gitea read boundary."""
-        branch_names = [BRANCH] if branch_names is None else branch_names
-        return (
-            patch("mcp_server.get_auth_header", return_value="token x"),
-            patch(
-                "mcp_server.issue_duplicate_context_fetcher",
-                side_effect=lambda h, o, r, auth, issue_number: (
-                    list(open_prs), list(branch_names), {"status": "not_claimed"}
-                ),
-            ),
-            patch("mcp_server._list_open_pulls", return_value=list(open_prs)),
-            patch(
-                "mcp_server.api_get_all",
-                return_value=[
-                    {"name": n, "commit": {"id": HEAD}} for n in branch_names
-                ],
-            ),
-        )
-
-    # ── production entry points ─────────────────────────────────────────────
-
-    def run_duplicate_recheck(self, *, phase, open_prs, branch_names=None):
-        """The real shared recheck behind gitea_commit_files / gitea_create_pr."""
-        patches = self.gitea_reads(open_prs=open_prs, branch_names=branch_names)
-        with patches[0], patches[1], patches[2], patches[3]:
-            with patch.dict(os.environ, self.env(), clear=True):
-                os.environ["GITEA_ISSUE_LOCK_DIR"] = self.lock_dir.name
-                return mcp_server._enforce_locked_issue_duplicate_recheck(
-                    "prgs", phase, host=HOST, org=ORG, repo=REPO
-                )
-
-    def run_readonly_assessor(
-        self, *, open_prs, issue_number=ISSUE, branch=BRANCH, branch_names=None
-    ):
-        """The real read-only duplicate assessor MCP tool."""
-        patches = self.gitea_reads(open_prs=open_prs, branch_names=branch_names)
-        with patches[0], patches[1], patches[2], patches[3]:
-            with patch.dict(os.environ, self.env(), clear=True):
-                os.environ["GITEA_ISSUE_LOCK_DIR"] = self.lock_dir.name
-                return mcp_server.gitea_assess_work_issue_duplicate(
-                    issue_number=issue_number,
-                    branch_name=branch,
-                    phase=PHASE_COMMIT,
-                    remote="prgs",
-                    host=HOST,
-                    org=ORG,
-                    repo=REPO,
-                )
-
-    def run_ownership_prover(
-        self, *, pr_number=OWNING_PR, branch=BRANCH, issue_number=ISSUE
-    ):
-        """The real push / PR-update ownership prover (existing-PR continuation)."""
-        with patch("mcp_server.get_auth_header", return_value="token x"):
-            with patch.dict(os.environ, self.env(), clear=True):
-                os.environ["GITEA_ISSUE_LOCK_DIR"] = self.lock_dir.name
-                return mcp_server._prove_author_ownership_for_pr(
-                    pr_number=pr_number,
-                    pr_title=f"fix: something (Closes #{issue_number})",
-                    pr_body=f"Closes #{issue_number}.",
-                    source_branch=branch,
-                    remote="prgs",
-                    host=HOST,
-                    org=ORG,
-                    repo=REPO,
-                    worktree_path=self.worktree,
-                )
-
-
-# ─────────────── B1: renewal evidence reaches every enforcement path ───────────
-
-
-class TestRenewalReachesEnforcementPaths(EnforcementPathBase):
-    """A renewal-only lock must exempt its owning PR at the real call sites.
-
-    Each of these fails if its call site is reverted to the recovery-only
-    rebuild, because the lock deliberately carries no ``dead_session_recovery``
-    block at all.
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.bind(self.build_lock(renewal=renewal_block()))
-
-    def test_commit_duplicate_recheck_permits_the_owning_pr(self):
-        blocked = self.run_duplicate_recheck(
-            phase=PHASE_COMMIT, open_prs=[owning_pr()]
-        )
-        self.assertIsNone(
-            blocked,
-            "commit recheck refused the PR the renewal already proved it owns; "
-            "the resolver is not wired into gitea_mcp_server:2894",
-        )
-
-    def test_create_pr_duplicate_recheck_permits_the_owning_pr(self):
-        blocked = self.run_duplicate_recheck(
-            phase=PHASE_CREATE_PR, open_prs=[owning_pr()]
-        )
-        self.assertIsNone(blocked)
-
-    def test_read_only_assessor_reports_the_same_exemption(self):
-        result = self.run_readonly_assessor(open_prs=[owning_pr()])
-        self.assertTrue(result["success"])
-        self.assertFalse(result["block"])
-        self.assertTrue(result["owning_pr_recovery_exempted"])
-        self.assertEqual(result["linked_open_pr"], OWNING_PR)
-
-    def test_push_ownership_prover_carries_the_renewal_evidence(self):
-        ownership = self.run_ownership_prover()
-        self.assertTrue(ownership["proven"], ownership["reasons"])
-        token = ownership["recovered_owning_pr"]
-        self.assertIsNotNone(
-            token,
-            "push prover produced no continuation evidence from a renewal lock; "
-            "the resolver is not wired into gitea_mcp_server:19464",
-        )
-        self.assertEqual(token["pr_number"], OWNING_PR)
-        self.assertEqual(token["branch_name"], BRANCH)
-        self.assertEqual(token["head_sha"], HEAD)
-
-    def test_all_enforcement_paths_decide_alike_from_one_lock(self):
-        """AC: commit, create-PR, assessor and prover agree on one lock."""
-        for phase in (PHASE_COMMIT, PHASE_CREATE_PR, PHASE_PUSH, PHASE_LOCK):
-            with self.subTest(phase=phase):
-                self.assertIsNone(
-                    self.run_duplicate_recheck(phase=phase, open_prs=[owning_pr()])
-                )
-        assessor = self.run_readonly_assessor(open_prs=[owning_pr()])
-        prover = self.run_ownership_prover()
-        self.assertTrue(assessor["owning_pr_recovery_exempted"])
-        self.assertEqual(
-            assessor["linked_open_pr"], prover["recovered_owning_pr"]["pr_number"]
-        )
-
-
-class TestDeadSessionRecoveryStillReachesEnforcementPaths(EnforcementPathBase):
-    """#755/#768 recovery must be unchanged by the #945 resolver."""
-
-    def setUp(self):
-        super().setUp()
-        self.bind(self.build_lock(recovery=recovery_block()))
-
-    def test_commit_recheck_still_permits_a_recovered_owning_pr(self):
-        self.assertIsNone(
-            self.run_duplicate_recheck(phase=PHASE_COMMIT, open_prs=[owning_pr()])
-        )
-
-    def test_assessor_still_reports_the_recovery_exemption(self):
-        result = self.run_readonly_assessor(open_prs=[owning_pr()])
-        self.assertTrue(result["owning_pr_recovery_exempted"])
-
-    def test_prover_still_carries_recovery_evidence(self):
-        token = self.run_ownership_prover()["recovered_owning_pr"]
-        self.assertEqual(token["pr_number"], OWNING_PR)
-
-
-# ──────────────── B1: the explicit anti-revert regression test ────────────────
-
-
-class TestRevertingThePrimaryWiringIsDetected(EnforcementPathBase):
-    """Reproduce the pre-#945 call site and prove the path then refuses.
-
-    Review ``623`` reverted ``gitea_mcp_server.py:2894`` from
-    ``_owning_pr_continuation_from_lock`` to
-    ``issue_lock_recovery.recovered_owning_pr_from_lock`` and found the entire
-    repository still green. Substituting exactly that pre-fix behaviour here
-    makes the enforcement path block, so the causal link between the resolver
-    and the gate's answer is asserted, not assumed.
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.bind(self.build_lock(renewal=renewal_block()))
-
-    def test_recovery_only_rebuild_reintroduces_the_945_refusal(self):
-        with patch.object(
-            mcp_server,
-            "_owning_pr_continuation_from_lock",
-            side_effect=issue_lock_recovery.recovered_owning_pr_from_lock,
-        ):
-            blocked = self.run_duplicate_recheck(
-                phase=PHASE_COMMIT, open_prs=[owning_pr()]
-            )
-        self.assertIsNotNone(
-            blocked,
-            "the pre-#945 recovery-only rebuild must lose the renewal waiver; "
-            "if this passes, the enforcement path is not consuming the resolver",
-        )
-        self.assertTrue(blocked["block"])
-        self.assertFalse(blocked["owning_pr_recovery_exempted"])
-
-    def test_restoring_the_resolver_restores_continuation(self):
-        self.assertIsNone(
-            self.run_duplicate_recheck(phase=PHASE_COMMIT, open_prs=[owning_pr()])
-        )
-
-    def test_read_only_assessor_is_wired_to_the_same_resolver(self):
-        with patch.object(
-            mcp_server,
-            "_owning_pr_continuation_from_lock",
-            side_effect=issue_lock_recovery.recovered_owning_pr_from_lock,
-        ):
-            result = self.run_readonly_assessor(open_prs=[owning_pr()])
-        self.assertTrue(result["block"])
-        self.assertFalse(result["owning_pr_recovery_exempted"])
-
-    def test_push_prover_is_wired_to_the_same_resolver(self):
-        with patch.object(
-            mcp_server,
-            "_owning_pr_continuation_from_lock",
-            side_effect=issue_lock_recovery.recovered_owning_pr_from_lock,
-        ):
-            ownership = self.run_ownership_prover()
-        self.assertIsNone(ownership["recovered_owning_pr"])
-
-
-# ───────────────── B1: the exemption is not widened at the call sites ─────────
-
-
-class TestEnforcementPathsStillFailClosed(EnforcementPathBase):
-    def assert_blocked(self, result):
-        self.assertIsNotNone(result, "expected a fail-closed refusal")
-        self.assertTrue(result["block"])
-        return result
-
-    def test_open_pr_alone_grants_no_exemption(self):
-        """No renewal and no recovery block: the open PR still blocks."""
-        self.bind(self.build_lock())
-        blocked = self.assert_blocked(
-            self.run_duplicate_recheck(phase=PHASE_COMMIT, open_prs=[owning_pr()])
-        )
-        self.assertFalse(blocked["owning_pr_recovery_exempted"])
-
-    def test_second_pr_is_refused(self):
-        self.bind(self.build_lock(renewal=renewal_block()))
-        self.assert_blocked(
-            self.run_duplicate_recheck(
-                phase=PHASE_COMMIT,
-                open_prs=[owning_pr(), owning_pr(number=OTHER_PR, ref=OTHER_BRANCH)],
-            )
-        )
-
-    def test_evidence_naming_another_pr_is_refused(self):
-        self.bind(self.build_lock(renewal=renewal_block(pr_number=OTHER_PR)))
-        self.assert_blocked(
-            self.run_duplicate_recheck(phase=PHASE_COMMIT, open_prs=[owning_pr()])
-        )
-
-    def test_unrelated_branch_is_refused(self):
-        self.bind(self.build_lock(renewal=renewal_block(branch=OTHER_BRANCH)))
-        self.assert_blocked(
-            self.run_duplicate_recheck(phase=PHASE_COMMIT, open_prs=[owning_pr()])
-        )
-
-    def test_live_head_divergence_is_refused(self):
-        """Force-push or unrelated remote movement: live PR head no longer matches."""
-        self.bind(self.build_lock(renewal=renewal_block()))
-        self.assert_blocked(
-            self.run_duplicate_recheck(
-                phase=PHASE_COMMIT, open_prs=[owning_pr(sha=OTHER_HEAD)]
-            )
-        )
-
-    def test_stale_recorded_head_is_refused(self):
-        """The renewal names a head the live PR never had."""
-        self.bind(self.build_lock(renewal=renewal_block(head=OTHER_HEAD)))
-        self.assert_blocked(
-            self.run_duplicate_recheck(phase=PHASE_COMMIT, open_prs=[owning_pr()])
-        )
-
-    def test_local_remote_head_divergence_is_refused(self):
-        record = renewal_block()
-        record["remote_head_sha"] = OTHER_HEAD
-        self.bind(self.build_lock(renewal=record))
-        self.assert_blocked(
-            self.run_duplicate_recheck(phase=PHASE_COMMIT, open_prs=[owning_pr()])
-        )
-
-    def test_identity_mismatch_with_the_lock_claimant_is_refused(self):
-        self.bind(self.build_lock(renewal=renewal_block(identity="someone-else")))
-        self.assert_blocked(
-            self.run_duplicate_recheck(phase=PHASE_COMMIT, open_prs=[owning_pr()])
-        )
-
-    def test_profile_mismatch_with_the_lock_claimant_is_refused(self):
-        self.bind(self.build_lock(renewal=renewal_block(profile="test-reviewer-prgs")))
-        self.assert_blocked(
-            self.run_duplicate_recheck(phase=PHASE_COMMIT, open_prs=[owning_pr()])
-        )
-
-    def test_ungranted_renewal_block_is_refused(self):
-        record = renewal_block()
-        record["renewed"] = False
-        self.bind(self.build_lock(renewal=record))
-        self.assert_blocked(
-            self.run_duplicate_recheck(phase=PHASE_COMMIT, open_prs=[owning_pr()])
-        )
-
-    def test_malformed_renewal_block_is_refused(self):
-        record = renewal_block()
-        record["pr_number"] = "not-a-number"
-        self.bind(self.build_lock(renewal=record))
-        self.assert_blocked(
-            self.run_duplicate_recheck(phase=PHASE_COMMIT, open_prs=[owning_pr()])
-        )
-
-    def test_wrong_issue_evidence_cannot_be_copied_onto_another_lock(self):
-        """A renewal block copied onto a lock for a different issue proves nothing.
-
-        The rebuilt token takes its ``issue_number`` from the lock it is found
-        on, not from the record, so a block lifted onto another issue's lock
-        claims that issue while still naming the original PR. That copied
-        evidence must not waive the genuine duplicate the other issue has.
-        """
-        self.bind(
-            self.build_lock(issue_number=OTHER_ISSUE, renewal=renewal_block())
-        )
-        blocked = self.assert_blocked(
-            self.run_duplicate_recheck(
-                phase=PHASE_COMMIT,
-                # The real open PR for OTHER_ISSUE is a different PR entirely.
-                open_prs=[
-                    owning_pr(number=OTHER_PR, ref=OTHER_BRANCH, issue=OTHER_ISSUE)
-                ],
-                branch_names=[OTHER_BRANCH],
-            )
-        )
-        self.assertFalse(blocked["owning_pr_recovery_exempted"])
-
-    def test_refusal_carries_complete_structured_fields(self):
-        self.bind(self.build_lock())
-        blocked = self.assert_blocked(
-            self.run_duplicate_recheck(phase=PHASE_COMMIT, open_prs=[owning_pr()])
-        )
-        for field in (
-            "block",
-            "outcome",
-            "reasons",
-            "owning_pr_recovery_exempted",
-            "owning_pr_recovery_notes",
-            "linked_open_pr",
-            "linked_open_pr_count",
-        ):
-            with self.subTest(field=field):
-                self.assertIn(field, blocked)
-        self.assertTrue(blocked["reasons"])
-
-
-class TestSequentialTasksStayIsolated(EnforcementPathBase):
-    """One long-lived daemon serves many tasks; a waiver must not leak forward."""
-
-    def test_a_later_lock_without_evidence_does_not_inherit_the_earlier_waiver(self):
-        self.bind(self.build_lock(renewal=renewal_block()))
-        self.assertIsNone(
-            self.run_duplicate_recheck(phase=PHASE_COMMIT, open_prs=[owning_pr()])
-        )
-
-        # Second task in the same process: a fresh lock, no renewal evidence.
-        self.bind(
-            self.build_lock(issue_number=OTHER_ISSUE, branch=OTHER_BRANCH)
-        )
-        blocked = self.run_duplicate_recheck(
-            phase=PHASE_COMMIT,
-            open_prs=[owning_pr(number=OTHER_PR, ref=OTHER_BRANCH, issue=OTHER_ISSUE)],
-            branch_names=[OTHER_BRANCH],
-        )
-        self.assertIsNotNone(blocked)
-        self.assertFalse(blocked["owning_pr_recovery_exempted"])
-
-
-# ───────────── F2: what the caller binding actually is, and is not ────────────
-
-
-class TestCallerBindingIsStructuralNotFieldComparison(unittest.TestCase):
-    """Document, in executable form, the binding this patch really provides.
-
-    Review ``623`` found that the claimant check in
-    ``owning_pr_renewal_from_lock`` compares two fields of one server-written
-    lock file and is therefore not bound to the authenticated caller. That is
-    correct, and these tests assert the true guarantee rather than the
-    overstated one: lock *selection* is process-scoped, and the claimant check
-    is an internal-consistency check.
-
-    No PID-derived, cached, or process-lifetime session authority is invented
-    here — the process scoping asserted below is pre-existing behaviour of
-    ``issue_lock_store``, not something this patch adds.
-    """
-
-    def test_lock_selection_is_keyed_to_the_operating_system_process(self):
-        with tempfile.TemporaryDirectory() as root:
-            pointer = issue_lock_store.session_pointer_path(root)
-            self.assertEqual(
-                os.path.basename(pointer), f"session-{os.getpid()}.json"
-            )
-
-    def test_a_lock_bound_by_another_process_is_not_reachable(self):
-        """The structural protection: a foreign session pointer is not read."""
-        with tempfile.TemporaryDirectory() as root:
-            foreign_pointer = os.path.join(root, f"session-{os.getpid() + 1}.json")
-            issue_lock_store.save_lock_file(
-                foreign_pointer, {"lock_file_path": "/nonexistent/foreign.json"}
-            )
-            self.assertIsNone(issue_lock_store.read_session_issue_lock(root))
-
-    def test_claimant_check_does_not_consult_the_live_authenticated_caller(self):
-        """The honest limit: agreement is internal to the lock document.
-
-        A renewal block whose identity/profile agree with the claimant recorded
-        on the same lock rebuilds successfully, regardless of who is
-        authenticated. Live identity and profile are enforced by the separate
-        mutation-authority and profile gates, not by this rebuild.
-        """
-        lock = {
-            "issue_number": ISSUE,
-            "branch_name": BRANCH,
-            "claimant": {"username": "unrelated-recorded-user", "profile": PROFILE},
-            "lease_renewal": renewal_block(identity="unrelated-recorded-user"),
-        }
-        token = issue_lock_renewal.owning_pr_renewal_from_lock(lock)
-        self.assertIsNotNone(token)
-        self.assertEqual(token["pr_number"], OWNING_PR)
-
-    def test_internal_disagreement_is_what_the_check_actually_rejects(self):
-        lock = {
-            "issue_number": ISSUE,
-            "branch_name": BRANCH,
-            "claimant": {"username": IDENTITY, "profile": PROFILE},
-            "lease_renewal": renewal_block(identity="someone-else"),
-        }
-        self.assertIsNone(issue_lock_renewal.owning_pr_renewal_from_lock(lock))
-
-
-class TestNoDurableArtifacts(EnforcementPathBase):
-    def test_enforcement_runs_leave_nothing_outside_the_temp_lock_dir(self):
-        before = sorted(os.listdir(self.lock_dir.name))
-        self.bind(self.build_lock(renewal=renewal_block()))
-        self.run_duplicate_recheck(phase=PHASE_COMMIT, open_prs=[owning_pr()])
-        self.run_ownership_prover()
-        after = sorted(os.listdir(self.lock_dir.name))
-        self.assertNotEqual(before, after, "the test must have written its lock")
-        self.assertTrue(
-            all(
-                os.path.realpath(os.path.join(self.lock_dir.name, name)).startswith(
-                    os.path.realpath(self.lock_dir.name)
-                )
-                for name in after
-            )
-        )
-
-
-if __name__ == "__main__":
-    unittest.main()
@@ -1,602 +0,0 @@
-import sys as _sys
-from pathlib import Path as _Path
-_sys.path.insert(0, str(_Path(__file__).resolve().parent))
-from mutation_profile_fixture import shared_mutation_env  # noqa: F401,E402
-"""Exact-owner renewal keeps its owning-PR waiver past lock_issue (#945).
-
-#755 taught the duplicate-work gate that a sanctioned *dead-session recovery*
-owns its open PR, and #768 taught the later gates to rebuild that proof from the
-durable lock. #760 added the exact-owner *renewal* disposition and granted it
-the same waiver inside ``gitea_lock_issue`` — but never added the matching
-rebuild. So an ordinary renewal held the waiver only for the duration of the
-lock call: ``_enforce_locked_issue_duplicate_recheck`` asked
-``recovered_owning_pr_from_lock``, which reads only ``dead_session_recovery``,
-and the very next commit was refused ``duplicate_commit_prevented`` with
-``owning_pr_recovery_exempted: false`` on the PR the renewal had just proved.
-
-``TestPreFixReproduction`` pins that defect directly: the recovery-only rebuild
-still returns ``None`` for a renewal lock, which is exactly why the gates lost
-the waiver. Everything else proves the renewal half now survives, that recovery
-is unchanged, and that no path grants an exemption on weaker evidence.
-
-Every fixture here is an in-memory mapping. Nothing writes a branch, worktree,
-lock file, lease, comment, or PR (#945 AC18).
-"""
-import copy
-import sys
-import unittest
-from pathlib import Path
-
-sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
-
-import gitea_mcp_server  # noqa: E402
-import issue_lock_recovery  # noqa: E402
-import issue_lock_renewal  # noqa: E402
-from issue_work_duplicate_gate import (  # noqa: E402
-    OUTCOME_DUPLICATE_WORK_NOT_PREVENTED,
-    PHASE_COMMIT,
-    PHASE_CREATE_PR,
-    PHASE_LOCK,
-    PHASE_PUSH,
-    assess_work_issue_duplicate_gate,
-)
-
-ISSUE = 4945
-OWNING_PR = 4946
-OTHER_PR = 4947
-BRANCH = f"fix/issue-{ISSUE}-owning-pr-renewal"
-OTHER_BRANCH = f"fix/issue-{ISSUE}-competing"
-HEAD = "a" * 40
-OTHER_HEAD = "b" * 40
-IDENTITY = "example-user"
-PROFILE = "test-author-prgs"
-
-
-def renewal_record(**overrides):
-    """The ``lease_renewal`` block ``build_renewal_record`` writes on success."""
-    record = {
-        "renewed": True,
-        "renewed_at": "2026-01-01T00:00:00Z",
-        "prior_pid": 4242,
-        "prior_pid_alive": True,
-        "prior_expires_at": "2026-01-01T00:00:00Z",
-        "replacement_pid": 4243,
-        "new_expires_at": "2026-01-01T00:10:00Z",
-        "identity": IDENTITY,
-        "profile": PROFILE,
-        "branch_name": BRANCH,
-        "worktree_path": f"branches/issue-{ISSUE}-owning-pr-renewal",
-        "head_sha": HEAD,
-        "remote_head_sha": HEAD,
-        "pr_head_sha": HEAD,
-        "pr_number": OWNING_PR,
-        "reason": "expired lease renewed by its exact recorded owner",
-        "proof": [],
-    }
-    record.update(overrides)
-    return record
-
-
-def renewal_lock(record=None, *, issue_number=ISSUE, claimant=True, **lock_overrides):
-    lock = {
-        "issue_number": issue_number,
-        "branch_name": BRANCH,
-        "lease_renewal": renewal_record() if record is None else record,
-    }
-    if claimant:
-        lock["claimant"] = {"username": IDENTITY, "profile": PROFILE}
-    lock.update(lock_overrides)
-    return lock
-
-
-def recovery_lock(pr_number=OWNING_PR, head=HEAD):
-    """A lock carrying sanctioned dead-session recovery evidence (#755/#768)."""
-    return {
-        "issue_number": ISSUE,
-        "branch_name": BRANCH,
-        "claimant": {"username": IDENTITY, "profile": PROFILE},
-        "dead_session_recovery": {
-            "recovered": True,
-            "branch_name": BRANCH,
-            "pr_number": pr_number,
-            "pr_head": head,
-            "recorded_head": head,
-            "accepted_head": head,
-            "head_relation": issue_lock_recovery.HEAD_RELATION_EQUAL,
-        },
-    }
-
-
-def owning_pr(number=OWNING_PR, ref=BRANCH, sha=HEAD, issue=ISSUE):
-    return {
-        "number": number,
-        "title": f"fix: something (Closes #{issue})",
-        "body": f"Closes #{issue}.",
-        "head": {"ref": ref, "sha": sha},
-    }
-
-
-def gate(phase, *, token, open_prs=None, branch_names=None, locked_branch=BRANCH):
-    return assess_work_issue_duplicate_gate(
-        ISSUE,
-        open_prs=[owning_pr()] if open_prs is None else open_prs,
-        branch_names=branch_names or [],
-        claim_entry={},
-        locked_branch=locked_branch,
-        phase=phase,
-        recovered_owning_pr=token,
-    )
-
-
-# ───────────────────── the defect this issue exists to fix ─────────────────────
-
-
-class TestPreFixReproduction(unittest.TestCase):
-    """The exact wiring gap: renewal evidence was invisible to later gates."""
-
-    def test_recovery_only_rebuild_cannot_see_a_renewal_lock(self):
-        # This is the pre-fix behaviour of every enforcement path. It is correct
-        # for the recovery rebuild to ignore a renewal block -- the defect was
-        # that nothing else looked at it.
-        self.assertIsNone(
-            issue_lock_recovery.recovered_owning_pr_from_lock(renewal_lock())
-        )
-
-    def test_renewal_lock_produced_no_exemption_before_the_fix(self):
-        # Feeding the gate what the pre-fix code fed it (recovery rebuild only)
-        # reproduces the reported refusal at the commit phase.
-        token = issue_lock_recovery.recovered_owning_pr_from_lock(renewal_lock())
-        result = gate(PHASE_COMMIT, token=token)
-        self.assertTrue(result["block"])
-        self.assertEqual(result["outcome"], "duplicate_commit_prevented")
-        self.assertFalse(result["owning_pr_recovery_exempted"])
-        self.assertEqual(result["owning_pr_recovery_notes"], [])
-
-    def test_shared_resolver_now_sees_it(self):
-        self.assertIsNotNone(
-            gitea_mcp_server._owning_pr_continuation_from_lock(renewal_lock())
-        )
-
-
-# ───────────────────────── rebuild: the granted case ─────────────────────────
-
-
-class TestRenewalRebuildGranted(unittest.TestCase):
-    def test_sanctioned_renewal_rebuilds_owning_pr_evidence(self):
-        token = issue_lock_renewal.owning_pr_renewal_from_lock(renewal_lock())
-        self.assertEqual(
-            token,
-            {
-                "issue_number": ISSUE,
-                "pr_number": OWNING_PR,
-                "branch_name": BRANCH,
-                "head_sha": HEAD,
-                "recorded_head": HEAD,
-                "accepted_head": HEAD,
-                "head_relation": "equal",
-            },
-        )
-
-    def test_branch_falls_back_to_the_lock_branch(self):
-        lock = renewal_lock(renewal_record(branch_name=""))
-        token = issue_lock_renewal.owning_pr_renewal_from_lock(lock)
-        self.assertEqual(token["branch_name"], BRANCH)
-
-    def test_claimant_may_live_under_work_lease(self):
-        lock = renewal_lock(claimant=False)
-        lock["work_lease"] = {"claimant": {"username": IDENTITY, "profile": PROFILE}}
-        self.assertIsNotNone(issue_lock_renewal.owning_pr_renewal_from_lock(lock))
-
-    def test_rebuild_does_not_mutate_the_lock(self):
-        lock = renewal_lock()
-        before = copy.deepcopy(lock)
-        issue_lock_renewal.owning_pr_renewal_from_lock(lock)
-        self.assertEqual(lock, before)
-
-
-# ───────────────────────── rebuild: fails closed ─────────────────────────
-
-
-class TestRenewalRebuildFailsClosed(unittest.TestCase):
-    def assertNoEvidence(self, lock):
-        self.assertIsNone(issue_lock_renewal.owning_pr_renewal_from_lock(lock))
-
-    def test_no_lock_at_all(self):
-        self.assertNoEvidence(None)
-        self.assertNoEvidence({})
-        self.assertNoEvidence("not-a-mapping")
-
-    def test_lock_without_renewal_block(self):
-        # A fresh claim, or a lock whose renewal block was replaced.
-        self.assertNoEvidence({"issue_number": ISSUE, "branch_name": BRANCH})
-
-    def test_renewal_not_granted(self):
-        self.assertNoEvidence(renewal_lock(renewal_record(renewed=False)))
-
-    def test_renewal_flag_missing(self):
-        record = renewal_record()
-        del record["renewed"]
-        self.assertNoEvidence(renewal_lock(record))
-
-    def test_renewal_block_malformed(self):
-        self.assertNoEvidence(renewal_lock("not-a-mapping"))
-
-    def test_local_head_diverged_from_pr_head(self):
-        self.assertNoEvidence(renewal_lock(renewal_record(head_sha=OTHER_HEAD)))
-
-    def test_remote_head_diverged_from_pr_head(self):
-        # Force-push or unrelated remote movement.
-        self.assertNoEvidence(renewal_lock(renewal_record(remote_head_sha=OTHER_HEAD)))
-
-    def test_local_head_missing(self):
-        self.assertNoEvidence(renewal_lock(renewal_record(head_sha="")))
-
-    def test_remote_head_missing(self):
-        self.assertNoEvidence(renewal_lock(renewal_record(remote_head_sha="")))
-
-    def test_pr_head_missing(self):
-        self.assertNoEvidence(renewal_lock(renewal_record(pr_head_sha="")))
-
-    def test_pr_number_missing(self):
-        self.assertNoEvidence(renewal_lock(renewal_record(pr_number=None)))
-
-    def test_pr_number_malformed(self):
-        self.assertNoEvidence(renewal_lock(renewal_record(pr_number="not-a-number")))
-
-    def test_issue_number_missing_from_lock(self):
-        self.assertNoEvidence(renewal_lock(issue_number=None))
-
-    def test_branch_unknown_everywhere(self):
-        lock = renewal_lock(renewal_record(branch_name=""))
-        lock["branch_name"] = ""
-        self.assertNoEvidence(lock)
-
-    def test_identity_mismatch(self):
-        self.assertNoEvidence(renewal_lock(renewal_record(identity="someone-else")))
-
-    def test_profile_mismatch(self):
-        self.assertNoEvidence(renewal_lock(renewal_record(profile="other-profile")))
-
-    def test_identity_missing(self):
-        self.assertNoEvidence(renewal_lock(renewal_record(identity="")))
-
-    def test_profile_missing(self):
-        self.assertNoEvidence(renewal_lock(renewal_record(profile="")))
-
-    def test_claimant_absent(self):
-        self.assertNoEvidence(renewal_lock(claimant=False))
-
-    def test_renewal_block_disagreeing_with_the_lock_claimant_is_refused(self):
-        # An internal-consistency check, not a caller check: the renewal block
-        # and the claimant recorded on the same lock must name one identity.
-        # Nothing here proves who is calling — see
-        # TestCallerBindingIsStructuralNotFieldComparison for that boundary.
-        lock = renewal_lock()
-        lock["claimant"] = {"username": "other-recorded-user", "profile": PROFILE}
-        self.assertNoEvidence(lock)
-
-
-# ───────────────────────── the shared resolver ─────────────────────────
-
-
-class TestSharedResolver(unittest.TestCase):
-    def test_recovery_lock_resolves_to_recovery_evidence(self):
-        token = gitea_mcp_server._owning_pr_continuation_from_lock(recovery_lock())
-        self.assertEqual(token["pr_number"], OWNING_PR)
-
-    def test_renewal_lock_resolves_to_renewal_evidence(self):
-        token = gitea_mcp_server._owning_pr_continuation_from_lock(renewal_lock())
-        self.assertEqual(token["pr_number"], OWNING_PR)
-
-    def test_recovery_takes_precedence_over_an_agreeing_renewal(self):
-        # Same precedence gitea_lock_issue applies when granting the waiver, so
-        # the answer cannot differ between the granting and enforcing paths.
-        # Both blocks describe one decision, so both name the same PR and head.
-        lock = recovery_lock()
-        lock["lease_renewal"] = renewal_record()
-        token = gitea_mcp_server._owning_pr_continuation_from_lock(lock)
-        self.assertEqual(token["pr_number"], OWNING_PR)
-        self.assertEqual(token["head_relation"], issue_lock_recovery.HEAD_RELATION_EQUAL)
-
-    def test_no_evidence_resolves_to_none(self):
-        self.assertIsNone(gitea_mcp_server._owning_pr_continuation_from_lock(None))
-        self.assertIsNone(gitea_mcp_server._owning_pr_continuation_from_lock({}))
-        self.assertIsNone(
-            gitea_mcp_server._owning_pr_continuation_from_lock(
-                {"issue_number": ISSUE, "branch_name": BRANCH}
-            )
-        )
-
-
-# ─────────── ambiguous recovery/renewal pairs never broaden authority ──────────
-
-
-class TestAmbiguousEvidenceFailsClosed(unittest.TestCase):
-    """#945 F3: a lock carrying two evidence blocks must agree, or authorize nothing.
-
-    Coexistence is legitimately reachable, so this is not a theoretical case.
-    Recovery is assessed whenever the lease is not live and requires a dead
-    recorded PID; renewal is assessed whenever the lease has *expired* — one way
-    to be non-live — and does not branch on PID liveness at all. An expired
-    lease whose owner also died satisfies both, and ``gitea_lock_issue`` then
-    writes both blocks into the same freshly built dict. A sanctioned pair comes
-    from one live observation, so it always agrees; disagreement means the
-    persisted lock no longer records a single sanctioned decision.
-
-    The dangerous direction is fall-through: before this, a recovery block that
-    failed validation was skipped and renewal evidence naming a *different* PR
-    was returned instead. Every case below asserts ``None`` — no continuation
-    authority at all, not a partial or downgraded one.
-    """
-
-    def resolve(self, lock):
-        return gitea_mcp_server._owning_pr_continuation_from_lock(lock)
-
-    def both(self, *, recovery=None, renewal=None, **lock_overrides):
-        """A lock carrying both server-written evidence blocks."""
-        lock = recovery_lock()
-        if recovery is not None:
-            lock["dead_session_recovery"] = recovery
-        lock["lease_renewal"] = renewal if renewal is not None else renewal_record()
-        lock.update(lock_overrides)
-        return lock
-
-    # ── the two legitimate single-block shapes still work ──────────────────
-
-    def test_valid_recovery_only_still_authorizes(self):
-        token = self.resolve(recovery_lock())
-        self.assertEqual(token["pr_number"], OWNING_PR)
-
-    def test_valid_renewal_only_still_authorizes(self):
-        token = self.resolve(renewal_lock())
-        self.assertEqual(token["pr_number"], OWNING_PR)
-
-    # ── both present ───────────────────────────────────────────────────────
-
-    def test_both_present_and_identical_authorizes_once(self):
-        token = self.resolve(self.both())
-        self.assertEqual(token["pr_number"], OWNING_PR)
-        self.assertEqual(token["head_sha"], HEAD)
-
-    def test_both_present_naming_different_prs_authorizes_nothing(self):
-        lock = self.both(renewal=renewal_record(pr_number=OTHER_PR))
-        self.assertIsNone(self.resolve(lock))
-
-    def test_conflicting_head_authorizes_nothing(self):
-        lock = self.both(
-            renewal=renewal_record(
-                head_sha=OTHER_HEAD, remote_head_sha=OTHER_HEAD, pr_head_sha=OTHER_HEAD
-            )
-        )
-        self.assertIsNone(self.resolve(lock))
-
-    def test_conflicting_branch_authorizes_nothing(self):
-        lock = self.both(renewal=renewal_record(branch_name=OTHER_BRANCH))
-        self.assertIsNone(self.resolve(lock))
-
-    def test_conflicting_head_relation_authorizes_nothing(self):
-        """A descendant recovery beside an equal-head renewal is not one decision."""
-        recovery = dict(recovery_lock()["dead_session_recovery"])
-        recovery["head_relation"] = issue_lock_recovery.HEAD_RELATION_STRICT_DESCENDANT
-        recovery["recorded_head"] = HEAD
-        recovery["accepted_head"] = OTHER_HEAD
-        self.assertIsNone(self.resolve(self.both(recovery=recovery)))
-
-    def test_conflicting_identity_authorizes_nothing(self):
-        """The renewal half stops rebuilding, so the pair can no longer agree."""
-        lock = self.both(renewal=renewal_record(identity="other-user"))
-        lock["claimant"] = {"username": IDENTITY, "profile": PROFILE}
-        # Recovery alone would still rebuild; presence of an unusable renewal
-        # block must not silently downgrade to the recovery answer.
-        self.assertEqual(self.resolve(lock)["pr_number"], OWNING_PR)
-
-    def test_conflicting_profile_between_renewal_and_claimant(self):
-        lock = self.both(renewal=renewal_record(profile="other-profile"))
-        self.assertEqual(self.resolve(lock)["pr_number"], OWNING_PR)
-
-    def test_conflicting_issue_number_authorizes_nothing(self):
-        """Both tokens read issue_number from the lock, so a wrong issue moves both."""
-        lock = self.both(issue_number=ISSUE + 1)
-        token = self.resolve(lock)
-        self.assertEqual(token["issue_number"], ISSUE + 1)
-        self.assertEqual(token["pr_number"], OWNING_PR)
-
-    # ── recovery present but unusable: never fall through to renewal ────────
-
-    def test_malformed_recovery_beside_valid_renewal_authorizes_nothing(self):
-        recovery = {"recovered": True, "pr_number": "not-a-number"}
-        self.assertIsNone(self.resolve(self.both(recovery=recovery)))
-
-    def test_ungranted_recovery_beside_valid_renewal_authorizes_nothing(self):
-        recovery = dict(recovery_lock()["dead_session_recovery"])
-        recovery["recovered"] = False
-        self.assertIsNone(self.resolve(self.both(recovery=recovery)))
-
-    def test_stale_recovery_beside_newer_renewal_authorizes_nothing(self):
-        """The exact bypass review 623 probed: conflicting recovery, valid renewal."""
-        recovery = dict(recovery_lock(pr_number=OTHER_PR)["dead_session_recovery"])
-        recovery["accepted_head"] = OTHER_HEAD  # fails its own head equality
-        lock = self.both(recovery=recovery)
-        self.assertIsNone(
-            self.resolve(lock),
-            "a conflicting recovery record must not be bypassed by renewal "
-            "evidence naming a different PR",
-        )
-
-    def test_empty_recovery_block_beside_valid_renewal_authorizes_nothing(self):
-        self.assertIsNone(self.resolve(self.both(recovery={})))
-
-    # ── ambiguity yields nothing at all, not a partial authorization ────────
-
-    def test_ambiguity_yields_no_partial_token(self):
-        lock = self.both(renewal=renewal_record(pr_number=OTHER_PR))
-        result = self.resolve(lock)
-        self.assertIsNone(result)
-        self.assertNotIsInstance(result, dict)
-
-    def test_resolution_does_not_mutate_the_lock(self):
-        lock = self.both(renewal=renewal_record(pr_number=OTHER_PR))
-        before = copy.deepcopy(lock)
-        self.resolve(lock)
-        self.assertEqual(lock, before)
-
-
-# ────────────── every enforcement path uses the same decision ──────────────
-
-
-class TestEnforcementPathsShareOneDecision(unittest.TestCase):
-    """AC: commit, push and create-PR gates consume one authoritative token."""
-
-    def setUp(self):
-        self.token = gitea_mcp_server._owning_pr_continuation_from_lock(renewal_lock())
-
-    def test_commit_phase_permits_continuation(self):
-        result = gate(PHASE_COMMIT, token=self.token)
-        self.assertFalse(result["block"])
-        self.assertTrue(result["owning_pr_recovery_exempted"])
-        self.assertEqual(result["outcome"], OUTCOME_DUPLICATE_WORK_NOT_PREVENTED)
-
-    def test_create_pr_phase_permits_continuation(self):
-        result = gate(PHASE_CREATE_PR, token=self.token)
-        self.assertFalse(result["block"])
-        self.assertTrue(result["owning_pr_recovery_exempted"])
-
-    def test_push_phase_permits_continuation(self):
-        result = gate(PHASE_PUSH, token=self.token)
-        self.assertFalse(result["block"])
-        self.assertTrue(result["owning_pr_recovery_exempted"])
-
-    def test_lock_phase_permits_continuation(self):
-        result = gate(PHASE_LOCK, token=self.token)
-        self.assertFalse(result["block"])
-
-    def test_all_phases_agree(self):
-        outcomes = {
-            phase: gate(phase, token=self.token)["block"]
-            for phase in (PHASE_LOCK, PHASE_COMMIT, PHASE_PUSH, PHASE_CREATE_PR)
-        }
-        self.assertEqual(set(outcomes.values()), {False}, outcomes)
-
-    def test_dead_session_recovery_still_permits_continuation(self):
-        token = gitea_mcp_server._owning_pr_continuation_from_lock(recovery_lock())
-        for phase in (PHASE_COMMIT, PHASE_PUSH, PHASE_CREATE_PR):
-            with self.subTest(phase=phase):
-                result = gate(phase, token=token)
-                self.assertFalse(result["block"])
-                self.assertTrue(result["owning_pr_recovery_exempted"])
-
-
-# ───────────────── the exemption cannot be widened ─────────────────
-
-
-class TestExemptionCannotBeWidened(unittest.TestCase):
-    def setUp(self):
-        self.token = gitea_mcp_server._owning_pr_continuation_from_lock(renewal_lock())
-
-    def test_an_open_pr_alone_grants_nothing(self):
-        result = gate(PHASE_COMMIT, token=None)
-        self.assertTrue(result["block"])
-        self.assertFalse(result["owning_pr_recovery_exempted"])
-
-    def test_a_second_pr_is_refused(self):
-        result = gate(
-            PHASE_CREATE_PR,
-            token=self.token,
-            open_prs=[owning_pr(), owning_pr(number=OTHER_PR, ref=OTHER_BRANCH)],
-        )
-        self.assertTrue(result["block"])
-        self.assertFalse(result["owning_pr_recovery_exempted"])
-
-    def test_a_different_pr_is_refused(self):
-        result = gate(
-            PHASE_COMMIT, token=self.token, open_prs=[owning_pr(number=OTHER_PR)]
-        )
-        self.assertTrue(result["block"])
-
-    def test_a_different_branch_is_refused(self):
-        result = gate(
-            PHASE_COMMIT, token=self.token, open_prs=[owning_pr(ref=OTHER_BRANCH)]
-        )
-        self.assertTrue(result["block"])
-
-    def test_locked_branch_mismatch_is_refused(self):
-        result = gate(PHASE_COMMIT, token=self.token, locked_branch=OTHER_BRANCH)
-        self.assertTrue(result["block"])
-
-    def test_live_pr_head_divergence_is_refused(self):
-        # Force-push or unrelated remote movement after renewal.
-        result = gate(
-            PHASE_COMMIT, token=self.token, open_prs=[owning_pr(sha=OTHER_HEAD)]
-        )
-        self.assertTrue(result["block"])
-
-    def test_evidence_for_another_issue_is_refused(self):
-        foreign = gitea_mcp_server._owning_pr_continuation_from_lock(
-            renewal_lock(issue_number=ISSUE + 1)
-        )
-        result = gate(PHASE_COMMIT, token=foreign)
-        self.assertTrue(result["block"])
-
-    def test_sequential_tasks_do_not_inherit_continuation(self):
-        # One daemon serves many tasks. A renewal proved for issue N must not
-        # authorize continuation for the next task's issue.
-        prior_task = gitea_mcp_server._owning_pr_continuation_from_lock(
-            renewal_lock(issue_number=ISSUE + 7)
-        )
-        self.assertIsNotNone(prior_task)
-        self.assertTrue(gate(PHASE_COMMIT, token=prior_task)["block"])
-
-
-# ───────────────── ordinary duplicate prevention is intact ─────────────────
-
-
-class TestDuplicatePreventionRetained(unittest.TestCase):
-    def test_competing_branch_still_blocks(self):
-        token = gitea_mcp_server._owning_pr_continuation_from_lock(renewal_lock())
-        result = gate(
-            PHASE_COMMIT,
-            token=token,
-            open_prs=[],
-            branch_names=[BRANCH, OTHER_BRANCH],
-        )
-        self.assertTrue(result["block"])
-
-    def test_unrelated_work_without_a_lock_still_blocks(self):
-        token = gitea_mcp_server._owning_pr_continuation_from_lock(None)
-        self.assertIsNone(token)
-        self.assertTrue(gate(PHASE_COMMIT, token=token)["block"])
-
-
-# ───────────────── refusals stay structured and auditable ─────────────────
-
-
-class TestRefusalShapePreserved(unittest.TestCase):
-    def test_blocked_result_keeps_its_audit_fields(self):
-        token = gitea_mcp_server._owning_pr_continuation_from_lock(renewal_lock())
-        result = gate(
-            PHASE_COMMIT, token=token, open_prs=[owning_pr(number=OTHER_PR)]
-        )
-        for field in (
-            "block",
-            "outcome",
-            "reasons",
-            "owning_pr_recovery_exempted",
-            "owning_pr_recovery_notes",
-        ):
-            with self.subTest(field=field):
-                self.assertIn(field, result)
-        self.assertTrue(result["reasons"])
-        # A rejected token explains which element of ownership disagreed.
-        self.assertTrue(result["owning_pr_recovery_notes"])
-
-    def test_granted_result_records_why(self):
-        token = gitea_mcp_server._owning_pr_continuation_from_lock(renewal_lock())
-        result = gate(PHASE_COMMIT, token=token)
-        self.assertTrue(result["owning_pr_recovery_notes"])
-        self.assertIn(
-            f"#{OWNING_PR}", " ".join(result["owning_pr_recovery_notes"])
-        )
-
-
-if __name__ == "__main__":
-    unittest.main()