@opengsd/gsd-path 1.6.1 → 1.7.0

package/skills/gsd-path-roadmap/scripts/isolation.py

@@ -11,7 +11,6 @@ from __future__ import annotations
 
 import argparse
 import contextlib
-import functools
 import hashlib
 import io
 import json
@@ -27,7 +26,7 @@ import sys
 sys.dont_write_bytecode = True
 import tempfile
 from pathlib import Path, PurePosixPath
-from typing import Dict, Iterator, Optional, Sequence, Set, Tuple
+from typing import Dict, Iterator, List, Optional, Sequence, Set, Tuple
 
 if __package__:
     from .pipeline_git import (
@@ -77,6 +76,8 @@ DISCUSSION_PATHS = frozenset(
 VERIFY_LEDGER_PATH = _common.VERIFY_LEDGER_PATH
 # recover verdicts that count as a landed task
 LANDED_VERDICTS = frozenset({"recovered", "attested"})
+# The withdrawn-tombstone citation rule is shared through _common (#483).
+withdrawn_citations = _common.withdrawn_citations
 # Orchestrator bookkeeping that may stay uncommitted in the primary while a
 # parallel task lands; the next `.project` checkpoint commits it.
 BOOKKEEPING_PATHS = DISCUSSION_PATHS | {
@@ -98,6 +99,13 @@ INLINE_LIST_PATTERN = _common.INLINE_LIST_PATTERN
 LIST_ITEM_PATTERN = _common.LIST_ITEM_PATTERN
 COLLECT_JOURNAL_SCHEMA = "gsd-path/collect-artifact/v1"
 NULL_SHA = "0" * 40
+RETIRE_HINT = (
+    " A stale isolate or sidecar from an earlier attempt may be there; retire it first:"
+    " `python3 -B <absolute isolation.py> retire --repo <absolute primary>"
+    " --worktree <path> --branch <branch> --force` (retire --force exists for exactly"
+    " this; a stale review sidecar must be hash-compared against its archived copy"
+    " before retiring)"
+)
 
 
 class IsolationError(RuntimeError):
@@ -174,8 +182,20 @@ def common_git_dir(repo: Path) -> Path:
 
 
 def sidecar_root(primary: Path, kind: str, name: str, *, pin: bool = False) -> Path:
+    # Recovery resolves the same placements per task; each resolution lists
+    # every worktree. Within one read-only run the answer cannot change, so
+    # the entrypoint-cleared memo answers repeats (#469).
+    key = ("sidecar-root", str(primary), kind, name)
+    run_active = ("head-sha", str(primary)) in _RECOVERY_MEMO
     try:
-        return worktree_paths.worktree_path(primary, kind, name, pin=pin)
+        if run_active and not pin and key in _RECOVERY_MEMO:
+            return _RECOVERY_MEMO[key]  # type: ignore[return-value]
+        resolved = worktree_paths.worktree_path(primary, kind, name, pin=pin)
+        if run_active and not pin:
+            # Only a read-only recovery run memoizes; pinning writes a
+            # placement receipt and must always run for real (#469).
+            _RECOVERY_MEMO[key] = resolved
+        return resolved
     except (ValueError, OSError) as error:
         raise IsolationError(str(error)) from error
 
@@ -500,6 +520,105 @@ def _long_path(absolute: str) -> str:
     return "\\\\?\\" + absolute
 
 
+def _is_link_like(status: os.stat_result) -> bool:
+    """A symlink, or on Windows any name-surrogate reparse point such as a junction.
+
+    Path.is_symlink() is false for a junction, which still redirects the
+    path; the reparse name-surrogate bit covers junctions and symlinks on
+    every supported Python (3.9+) without os.path.isjunction (3.12+). The
+    same classification is used by guard_hook and detect_project.
+    """
+    return stat.S_ISLNK(status.st_mode) or bool(
+        getattr(status, "st_reparse_tag", 0) & 0x20000000  # IO_REPARSE_TAG name surrogate
+    )
+
+
+def _tracked_symlinks(tree: Path, when: str) -> Set[str]:
+    """Paths, relative to `tree`, that its index (and submodules') tracks as symlinks."""
+    tracked_links: Set[str] = set()
+    if os.path.lexists(os.path.join(tree, ".git")):
+        listed = run_git(tree, "ls-files", "-s", "-z", "--recurse-submodules")
+        if listed.returncode != 0:
+            raise IsolationError(
+                f"could not list tracked files in {tree} {when}: "
+                + (listed.stderr or listed.stdout).strip())
+        for record in listed.stdout.split("\0"):
+            info, _, path = record.partition("\t")
+            if info.startswith("120000 "):
+                tracked_links.add(path)
+    return tracked_links
+
+
+def _unlink_link_like(tree: Path) -> None:
+    """Unlink every link-like entry under a disposable tree before git removes it.
+
+    `git worktree remove` on Git for Windows older than 2.54 recurses through
+    NTFS junctions and deletes the target's contents (#462); untracked or
+    gitignored junctions pass the cleanliness checks that guard removal.
+    Unlinking each link — never traversing it — leaves git nothing to follow
+    and keeps POSIX symlinks on the same single code path. A link that cannot
+    be removed is a hard error: removal never proceeds with links present.
+    A symlink git tracks as a symlink is left for git, which removes it as an
+    index entry without traversing it; unlinking it would make a clean tree
+    dirty. A junction, or a symlink replacing a tracked non-link, is unlinked.
+    """
+    remaining: List[str] = []
+    tracked_links = _tracked_symlinks(tree, "before removal")
+
+    def _unlink_one(entry: str) -> bool:
+        try:
+            os.unlink(entry)
+            return True
+        except OSError:
+            try:
+                os.rmdir(entry)  # an empty link-like dir on some platforms
+                return True
+            except OSError:
+                remaining.append(entry)
+                return False
+
+    def _scan_failed(error: OSError) -> None:
+        # A directory that cannot be scanned leaves an unaudited subtree, and
+        # an incomplete sweep must never hand git a tree that may still hold
+        # a junction (#462).
+        raise IsolationError(f"could not scan {tree} before removal: {error}")
+
+    root = Path(_long_path(os.path.abspath(tree))) if os.name == "nt" else tree
+
+    def _spared(entry: str, status: os.stat_result) -> bool:
+        return stat.S_ISLNK(status.st_mode) and (
+            os.path.relpath(entry, root).replace(os.sep, "/") in tracked_links)
+    for directory, dirnames, _files in os.walk(root, topdown=True, onerror=_scan_failed):
+        for base in dirnames[:]:
+            entry = os.path.join(directory, base)
+            try:
+                status = os.lstat(entry)
+            except OSError as error:
+                _scan_failed(error)
+                return  # unreachable; _scan_failed raises
+            if not _is_link_like(status):
+                continue
+            # Prune BEFORE unlinking: os.walk(followlinks=False) still
+            # descends Windows junctions — they are directories, not
+            # symlinks, at the stat level (CPython issue 88174) — so a
+            # link whose unlink fails must already be out of the walk.
+            dirnames.remove(base)
+            if not _spared(entry, status):
+                _unlink_one(entry)
+        for name in _files:
+            entry = os.path.join(directory, name)
+            try:
+                status = os.lstat(entry)
+            except OSError as error:
+                _scan_failed(error)
+                return  # unreachable; _scan_failed raises
+            if _is_link_like(status) and not _spared(entry, status):
+                _unlink_one(entry)
+    if remaining:
+        raise IsolationError(
+            "could not unlink link-like entries before removal: " + ", ".join(remaining))
+
+
 def _force_rmtree(path: Path) -> None:
     """Delete a sidecar tree directly, tolerating read-only files and long paths."""
     def _writable(function, target, _error):
@@ -526,6 +645,10 @@ def _remove_worktree(primary: Path, destination: Path, force: bool) -> None:
     """
     tree_delete_failure = ("failed to delete", "directory not empty", "permission denied")
 
+    if destination.is_dir():
+        # Defuse first: never let git traverse a junction or symlink (#462).
+        _unlink_link_like(destination)
+
     def failure(*flags: str) -> str:
         result = run_git(primary, "worktree", "remove", *flags, str(destination))
         return (result.stderr or result.stdout).strip() if result.returncode else ""
@@ -567,6 +690,8 @@ def _cleanup_reserved_worktree(
     records = _registered_worktrees(primary)
     registered = records.get(destination.resolve())
     if registered == ref and _same_directory(destination, reserved_directory):
+        if destination.is_dir():
+            _unlink_link_like(destination)
         run_git(primary, "worktree", "remove", "--force", str(destination))
         records = _registered_worktrees(primary)
     elif registered is None and _same_directory(destination, reserved_directory):
@@ -588,7 +713,7 @@ def create_named_worktree(
             f"refusing to check out the bound branch {bound} in a second worktree"
         )
     if os.path.lexists(destination):
-        raise IsolationError(f"worktree path already exists: {destination}")
+        raise IsolationError(f"worktree path already exists: {destination}." + RETIRE_HINT)
     destination.parent.mkdir(parents=True, exist_ok=True)
     ref = f"refs/heads/{branch}"
     reserved = run_git(primary, "update-ref", ref, base, NULL_SHA)
@@ -598,7 +723,7 @@ def create_named_worktree(
         destination.mkdir()
     except FileExistsError as error:
         run_git(primary, "update-ref", "-d", ref, base)
-        raise IsolationError(f"worktree path already exists: {destination}") from error
+        raise IsolationError(f"worktree path already exists: {destination}." + RETIRE_HINT) from error
     except OSError as error:
         run_git(primary, "update-ref", "-d", ref, base)
         raise IsolationError(f"cannot reserve worktree path {destination}: {error}") from error
@@ -752,7 +877,7 @@ def member_bound_checkout(coordinator: Path, member: str) -> Dict[str, object]:
             raise IsolationError(f"bound checkout is missing or invalid: {destination}")
     if not holders:
         if os.path.lexists(destination):
-            raise IsolationError(f"worktree path already exists: {destination}")
+            raise IsolationError(f"worktree path already exists: {destination}." + RETIRE_HINT)
         destination.parent.mkdir(parents=True, exist_ok=True)
         added = run_git(checkout, "worktree", "add", str(destination), branch)
         if added.returncode != 0:
@@ -760,6 +885,106 @@ def member_bound_checkout(coordinator: Path, member: str) -> Dict[str, object]:
     return {"branch": branch, "checkout": str(destination.resolve()), "member": member}
 
 
+def _member_prepare_command(coordinator: Path, member: str) -> Optional[str]:
+    """The member's declared Prepare command from MEMBERS.md, if any (#463)."""
+    try:
+        import members
+    except ImportError:  # pragma: no cover - package import used by tests
+        from scripts import members
+    try:
+        rows = members.read_members(coordinator)
+    except members.MembersError as error:
+        raise IsolationError(str(error)) from error
+    for row in rows:
+        if row["name"] == member:
+            return row.get("prepare") or None
+    return None
+
+
+def _refuse_link_like(tree: Path) -> None:
+    """Refuse an isolate that provisioning left link-like entries in (#463).
+
+    Prepare must copy, never link: a link into the primary checkout would let
+    the isolate read and mutate shared inputs, and retirement would silently
+    defuse it (#462). Checked at handout, after the command exits zero. A
+    symlink the member repo tracks as a symlink is checked-out content, not
+    provisioning, and is spared; a junction, or a symlink replacing a tracked
+    non-link, is refused.
+    """
+    found: List[str] = []
+    tracked_links = _tracked_symlinks(tree, "after Prepare")
+    root = Path(_long_path(os.path.abspath(tree))) if os.name == "nt" else tree
+
+    def _scan_failed(error: OSError) -> None:
+        raise IsolationError(f"could not scan {tree} after Prepare: {error}")
+
+    def _refused(entry: str, status: os.stat_result) -> bool:
+        return _is_link_like(status) and not (stat.S_ISLNK(status.st_mode) and (
+            os.path.relpath(entry, root).replace(os.sep, "/") in tracked_links))
+
+    for directory, dirnames, files in os.walk(root, topdown=True, onerror=_scan_failed):
+        for base in dirnames[:]:
+            entry = os.path.join(directory, base)
+            try:
+                status = os.lstat(entry)
+            except OSError as error:
+                _scan_failed(error)
+                return
+            if _is_link_like(status):
+                dirnames.remove(base)  # never descend a link
+                if _refused(entry, status):
+                    found.append(entry)
+        for name in files:
+            entry = os.path.join(directory, name)
+            try:
+                status = os.lstat(entry)
+            except OSError as error:
+                _scan_failed(error)
+                return
+            if _refused(entry, status):
+                found.append(entry)
+    if found:
+        raise IsolationError(
+            "member Prepare left link-like entries; provisioning must copy, "
+            "never link: " + ", ".join(found))
+
+
+def run_member_prepare(coordinator: Path, member: str, sidecar: Path) -> Optional[Dict[str, object]]:
+    """Run the member's declared Prepare command inside a fresh isolate (#463).
+
+    A bare member worktree lacks uninitialized submodules and gitignored build
+    inputs; the committed MEMBERS.md `Prepare:` command provisions them before
+    any Verify runs. The command runs with the isolate as cwd, through the
+    same bash argv Verify uses (host-neutral, and a script file on Windows);
+    a non-zero exit is a loud IsolationError carrying the output so the
+    attempt fails before a Verify burns time against a half-provisioned
+    tree. Provisioning must copy, never link, outside the isolate (#462) —
+    retirement defuses links, and a link would let the isolate mutate shared
+    inputs. Retained isolates keep their provisioning (#461): this runs only
+    where a fresh isolate is created.
+    """
+    command = _member_prepare_command(coordinator, member)
+    if command is None:
+        return None
+    completed = subprocess.run(
+        _common.bash_argv(command), cwd=sidecar,
+        capture_output=True, encoding="utf-8", errors="replace",
+    )
+    receipt = {
+        "command": command,
+        "exit_code": completed.returncode,
+        "stdout": completed.stdout,
+        "stderr": completed.stderr,
+    }
+    if completed.returncode != 0:
+        raise IsolationError(
+            f"member {member} Prepare failed in {sidecar}: "
+            f"{completed.stderr.strip() or completed.stdout.strip() or completed.returncode}"
+        )
+    _refuse_link_like(sidecar)
+    return receipt
+
+
 def isolate_member_task(coordinator: Path, member: str, task_id: str) -> Dict[str, object]:
     """Member tasks always run in a sidecar at the member bound branch tip."""
     validate_task_id(task_id)
@@ -776,7 +1001,22 @@ def isolate_member_task(coordinator: Path, member: str, task_id: str) -> Dict[st
     branch = f"{TASK_BRANCH_PREFIX}{name}"
     destination = sidecar_root(checkout, "task", name, pin=True)
     create_named_worktree(checkout, branch, destination, member_base, bound=str(bound["branch"]))
+    try:
+        prepared = run_member_prepare(coordinator, member, destination)
+    except BaseException as error:
+        # A fresh tree with a failed Prepare has nothing to land; retire it so
+        # the retry starts clean instead of refusing on the existing path.
+        try:
+            _remove_worktree(checkout, destination, force=True)
+            run_git(checkout, "update-ref", "-d", f"refs/heads/{branch}", member_base)
+        except IsolationError as cleanup_error:
+            raise IsolationError(
+                f"{error}; retiring the fresh isolate also failed: {cleanup_error}") from error
+        finally:
+            release_workspace_quietly(checkout)
+        raise
     return {
+        "prepare": prepared,
         "bound_branch": bound["branch"],
         "bound_checkout": bound["checkout"],
         "kind": "task",
@@ -1021,6 +1261,15 @@ def activate_member_task(
     elif not copy.is_file():
         copy.parent.mkdir(parents=True, exist_ok=True)
         _common.atomic_write(copy, activated)
+    # Pin the sibling preflight inputs (#484): the coder's role requires the
+    # Interface-contract-sharing sibling task files; a member sidecar receives
+    # them from the immutable coordinator base beside the live task copy.
+    for sibling_file in _member_sibling_contract_files(coordinator, resolved_base, task_file):
+        sibling_copy = _safe_member_task_copy(sidecar, sibling_file)
+        sibling_copy.parent.mkdir(parents=True, exist_ok=True)
+        _common.atomic_write(
+            sibling_copy, git_text(coordinator, "show", f"{resolved_base}:{sibling_file}")
+        )
     ref = member_task_authorization_ref(project, task_id)
     created = run_git(checkout, "update-ref", ref, member_base, "0" * 40)
     if created.returncode != 0 and run_git(checkout, "rev-parse", "--verify", "--quiet", ref).stdout.strip() != member_base:
@@ -1032,6 +1281,137 @@ def activate_member_task(
     return result
 
 
+def reauthorize_member_task(coordinator: Path, member: str, task_id: str) -> Dict[str, object]:
+    """Re-arm the member task authorization a failed finish cleared (#461).
+
+    A failed finish clears the authorization ref so that attempt cannot land.
+    When the failure was environmental, the sidecar still stands at the same
+    member base with the same live copy, and this explicit command re-records
+    the authorization at that base so a rerunning finish can land without a
+    full re-isolate. The copy is coder-writable, so every binding comes from
+    orchestrator-owned records instead: the dispatch ledger's native member
+    activation names the agent, base, member base, task file, and branch the
+    live copy must still match, the coordinator task must still be pending,
+    the contract at the recorded base must be unchanged with an append-only
+    Log, the member base must stand unchanged and unlanded, and no member
+    landing journal may be pending. Nothing inside the failed attempt's own
+    machinery invokes this; it is an owner decision, under the driver lock.
+    """
+    coordinator = require_directory(coordinator, "coordinator")
+    try:
+        if __package__:
+            from . import dispatch_driver
+        else:
+            import dispatch_driver
+    except ImportError:  # pragma: no cover - package import used by tests
+        from scripts import dispatch_driver
+    try:
+        lock = dispatch_driver.acquire_lock(coordinator)
+    except dispatch_driver.DriverStop as error:
+        raise IsolationError(str(error)) from error
+    with lock:
+        return _reauthorize_member_task_locked(dispatch_driver, coordinator, member, task_id)
+
+
+def _reauthorize_member_task_locked(
+        dispatch_driver, coordinator: Path, member: str, task_id: str) -> Dict[str, object]:
+    checkout, project, entry = _member_context(coordinator, member)
+    task_id = validate_task_id(task_id)
+    # The orchestrator-recorded activation is the source of truth for every
+    # binding; the live copy only proves continuity against it.
+    record = None
+    for state in dispatch_driver.latest_states(dispatch_driver.records_root(coordinator)):
+        if (state.get("task_id") == task_id and state.get("mode") == "member"
+                and state.get("member") == member):
+            record = state
+            break
+    if record is None:
+        raise IsolationError(f"member task {task_id} has no recorded member activation")
+    branch = f"{TASK_BRANCH_PREFIX}{project}-{task_id}"
+    if record.get("task_branch") not in (None, branch):
+        raise IsolationError(f"member task {task_id} activation names another task branch")
+    recorded_member_base = require_full_sha(str(record["member_base"]))
+    recorded_base = require_full_sha(str(record["base"]))
+    # The native record's task_file names the sidecar copy path (including
+    # the copy-directory prefix); the contract file is the coordinator path.
+    task_file = str(record.get("contract_file") or record["task_file"])
+    if task_file.startswith(MEMBER_TASK_COPY_DIR + "/"):
+        task_file = task_file[len(MEMBER_TASK_COPY_DIR) + 1:]
+    sidecar = sidecar_root(checkout, "task", f"{project}-{task_id}")
+    if require_attached(sidecar) != branch:
+        raise IsolationError(f"member task sidecar is not on its task branch: {sidecar}")
+    copy = _safe_member_task_copy(sidecar, task_file)
+    if not copy.is_file():
+        raise IsolationError(f"member task {task_id} live copy is missing: {copy}")
+    copy_text = copy.read_text(encoding="utf-8")
+    fields, error = task_frontmatter(copy_text)
+    if error or fields is None or fields.get("id") != task_id:
+        raise IsolationError(error or "unreadable member task live copy")
+    if fields.get("status") != "in-progress":
+        raise IsolationError(f"member task {task_id} live copy is not in-progress")
+    agent = fields.get("agent")
+    if not agent:
+        raise IsolationError(f"member task {task_id} live copy lacks its agent")
+    recorded_agent = record.get("agent")
+    if recorded_agent and agent != recorded_agent:
+        raise IsolationError(
+            f"member task {task_id} live copy activation fields differ from its "
+            "recorded activation; re-isolate instead")
+    if not recorded_agent:
+        # Activations recorded before the agent field existed name no agent;
+        # the field is informational today (no authorization decision
+        # consumes it), so a legacy record accepts the copy's non-empty one.
+        pass
+    if (fields.get("base") != recorded_base
+            or fields.get("member_base") != recorded_member_base):
+        raise IsolationError(
+            f"member task {task_id} live copy activation fields differ from its "
+            "recorded activation; re-isolate instead")
+    # A settled coordinator task has nothing left to authorize.
+    coordinator_task = coordinator / task_file
+    coordinator_fields, coordinator_error = task_frontmatter(
+        coordinator_task.read_text(encoding="utf-8"))
+    if coordinator_error or coordinator_fields is None:
+        raise IsolationError(coordinator_error or f"unreadable coordinator task: {task_file}")
+    if coordinator_fields.get("status") != "pending":
+        raise IsolationError(
+            f"member task {task_id} is {coordinator_fields.get('status')} in the "
+            "coordinator; there is nothing to reauthorize")
+    member_base = recorded_member_base
+    # The coder's uncommitted work may sit in the sidecar; the task branch and
+    # the member bound branch must still stand at the recorded member base,
+    # and nothing may have landed yet.
+    tip = run_git(checkout, "rev-parse", "--verify", "--quiet", f"refs/heads/{branch}").stdout.strip()
+    if tip != member_base:
+        raise IsolationError(f"member task branch {branch} moved off its member base")
+    if run_git(checkout, "merge-base", "--is-ancestor", member_base,
+               f"refs/heads/{entry['branch']}").returncode != 0:
+        raise IsolationError("member task member base is not on the member bound branch")
+    resolved_base = require_commit(coordinator, recorded_base)
+    _member_contract(coordinator, resolved_base, task_file, member)
+    contract = git_text(coordinator, "show", f"{resolved_base}:{task_file}")
+    member_log_delta(contract, copy_text)
+    path = _member_journal_path(coordinator, task_id)
+    if os.path.lexists(path):
+        raise IsolationError(
+            f"a member landing is pending for {task_id}; run recover_member_landing first")
+    for pending in sorted(path.parent.glob("*.json")):
+        if json.loads(pending.read_text(encoding="utf-8"))["member"] == member:
+            raise IsolationError(
+                f"member {member} has pending landing {pending.stem}; run recover_member_landing first")
+    ref = member_task_authorization_ref(project, task_id)
+    recorded = run_git(checkout, "rev-parse", "--verify", "--quiet", ref).stdout.strip()
+    if recorded and recorded != member_base:
+        raise IsolationError("member task authorization names another member base")
+    if not recorded:
+        created = run_git(checkout, "update-ref", ref, member_base, "0" * 40)
+        if created.returncode != 0:
+            raise IsolationError("could not record member task authorization")
+    return {"agent": agent, "base": resolved_base, "copy": str(copy), "member": member,
+            "member_base": member_base, "status": "in-progress", "task_branch": branch,
+            "task_file": task_file, "worktree": str(sidecar), "reauthorized": not recorded}
+
+
 def retained_member_task(
     coordinator: Path, member: str, task_id: str, task_file: str, base: str
 ) -> Optional[Dict[str, object]]:
@@ -1164,6 +1544,36 @@ def _record_member_journal(path: Path, journal: Dict[str, object]) -> None:
     _common.atomic_write(path, json.dumps(journal, indent=2, sort_keys=True) + "\n")
 
 
+def _member_sibling_contract_files(
+    coordinator: Path, base: str, task_file: str
+) -> List[str]:
+    """Sibling task files sharing this task's Interface contract, at the base.
+
+    The coder's sibling-interface preflight needs each sibling's task file;
+    a member activation projects only the live task, so the preflight had no
+    sanctioned read (#484). Siblings are recognized by their Interface
+    contract text: every other task at `base` that shares at least one
+    Interface-contract bullet with this task. The copies land beside the live task under the
+    member copy directory, read from the immutable `base` tree.
+    """
+    def contract_bullets(text: str) -> Set[str]:
+        body = _common.section_body(text, "Interface contract")
+        return set() if body is None else _common.contract_shapes(body)
+
+    live = contract_bullets(git_text(coordinator, "show", f"{base}:{task_file}"))
+    if not live:
+        return []
+    listing = git_output(
+        coordinator, "ls-tree", "-r", "--name-only", base, "--", ".project/tasks")
+    siblings: List[str] = []
+    for sibling_file in listing.splitlines():
+        if not sibling_file.endswith(".md") or sibling_file == task_file:
+            continue
+        if contract_bullets(git_text(coordinator, "show", f"{base}:{sibling_file}")) & live:
+            siblings.append(sibling_file)
+    return siblings
+
+
 def _member_contract(
     coordinator: Path, base: str, task_file: str, member: str,
     current_text: Optional[str] = None,
@@ -1468,8 +1878,11 @@ def isolate_member_verify(coordinator: Path, sidecar: Path) -> Dict[str, Dict[st
             branch = f"{VERIFY_BRANCH_PREFIX}{project}-{entry['name']}"
             destination = sidecar.parent / entry["name"]
             create_named_worktree(checkout, branch, destination, tip, bound=entry["branch"])
+            # Registered before Prepare so a failed provisioning retires with
+            # the loop's existing cleanup (#463).
             created[entry["name"]] = {"checkout": str(checkout), "worktree": str(destination),
                                      "branch": branch, "tip": tip}
+            run_member_prepare(coordinator, entry["name"], destination)
     except BaseException:
         retire_member_verify(created)
         raise
@@ -1545,7 +1958,7 @@ def ensure_verify_sidecar(primary: Path, base: str, branch: str) -> Dict[str, ob
     ref = f"refs/heads/{branch}"
     registered = _registered_worktrees(primary)
     if destination.is_symlink() or (destination.exists() and not destination.is_dir()):
-        raise IsolationError(f"worktree path already exists: {destination}")
+        raise IsolationError(f"worktree path already exists: {destination}." + RETIRE_HINT)
     if destination.is_dir():
         try:
             # A leftover empty directory (a half-deleted sidecar) clears;
@@ -1578,6 +1991,8 @@ def ensure_verify_sidecar(primary: Path, base: str, branch: str) -> Dict[str, ob
                 "worktree": str(destination),
             }
     if destination.resolve() in registered:
+        if destination.is_dir():
+            _unlink_link_like(destination)
         cleared = run_git(primary, "worktree", "remove", str(destination))
         if cleared.returncode != 0:
             run_git(primary, "worktree", "prune")
@@ -1748,6 +2163,16 @@ def _commit_pending(
     return current_sha(repo)
 
 
+# Run-scoped memo for read-only recovery queries (#469): recovery re-proves
+# every task against the same immutable commits, so shared-base lookups (tree
+# kinds, blob listings, serial bookkeeping, the primary worktree report) answer
+# once per run. Each public recovery entrypoint clears it, so a process that
+# mutates between runs never reads a stale entry, and only immutable inputs —
+# full commit shas or per-run constants — are ever keyed.
+_RECOVERY_MEMO: Dict[tuple, object] = {}
+_FULL_SHA = re.compile(r"[0-9a-f]{40}")
+
+
 def undeclared_paths(
     repo: Path, base: str, paths: Set[str], declared: Set[str]
 ) -> list[str]:
@@ -1757,11 +2182,17 @@ def undeclared_paths(
     An entry that is a file at `base` covers only itself: the task-brief lint
     rejects a path below a base file.
     """
+    cacheable = _FULL_SHA.fullmatch(base) is not None
 
-    @functools.lru_cache(maxsize=None)
     def directory(entry: str) -> bool:
+        key = ("tree-kind", str(repo), base, entry)
+        if cacheable and key in _RECOVERY_MEMO:
+            return _RECOVERY_MEMO[key]  # type: ignore[index]
         kind = run_git(repo, "cat-file", "-t", f"{base}:{entry}")
-        return kind.returncode != 0 or kind.stdout.strip() == "tree"
+        covering = kind.returncode != 0 or kind.stdout.strip() == "tree"
+        if cacheable:
+            _RECOVERY_MEMO[key] = covering
+        return covering
 
     return sorted(
         path
@@ -1774,6 +2205,124 @@ def undeclared_paths(
     )
 
 
+RUNTIME_HOTFIX_MARKER = " — runtime-hotfix: "
+RUNTIME_PIN = ".gsd-path/runtime.json"
+
+
+def _runtime_hotfix_receipts(task_text: str, task_file: str) -> List[Dict[str, str]]:
+    """The runtime-hotfix receipts recorded in a task Log (#480).
+
+    Each receipt line is
+    `- <date> — runtime-hotfix: task <id> base <sha> runtime <old> -> <new> authorized by <ruling>`.
+    The orchestrator's own command writes it; a hand-written line without
+    matching digests authorizes nothing.
+    """
+    receipts: List[Dict[str, str]] = []
+    for line in task_text.splitlines():
+        stripped = line.strip()
+        if not stripped.startswith("- ") or RUNTIME_HOTFIX_MARKER not in stripped:
+            continue
+        match = re.fullmatch(
+            r"- (?P<date>\d{4}-\d{2}-\d{2}) — runtime-hotfix: task (?P<task>T\d{3}) "
+            r"base (?P<base>[0-9a-f]{40}) runtime (?P<old>[0-9a-f]{16,64}) "
+            r"-> (?P<new>[0-9a-f]{16,64}) authorized by (?P<authority>.+)",
+            stripped,
+        )
+        if match is not None:
+            receipts.append(match.groupdict())
+    return receipts
+
+
+def runtime_hotfix_ref(task_id: str, base: str) -> str:
+    """The orchestrator-owned ref recording a runtime-hotfix receipt (#480).
+
+    The task Log is coder-writable, so a Log line alone proves nothing: the
+    runtime-hotfix command also stores the receipt as a blob behind this ref,
+    and refs/gsd-path/ is guard-owned — an agent cannot write it. A landing
+    admits the pin path only when the Log line and the ref record match
+    verbatim.
+    """
+    return f"refs/gsd-path/runtime-hotfix/{task_id}-{base}"
+
+
+RUNTIME_SCHEMA_VALUE = "gsd-path/runtime/v1"
+
+
+def runtime_hotfix_allowed_paths(
+    repo: Path, task_text: str, task_file: str, base: str,
+    pin_text: Optional[str] = None,
+) -> Set[str]:
+    """The runtime pin path a task's receipts authorize at this base (#480).
+
+    Authorization needs BOTH records: the receipt line in the task Log —
+    matched against the task's own frontmatter id and this landing's base —
+    and the same line stored verbatim behind the orchestrator-owned
+    runtime-hotfix ref. A Log line without the ref is a bare mention and
+    authorizes nothing; a receipt for any other task or base authorizes
+    nothing.
+    """
+    fields, error = task_frontmatter(task_text)
+    if error or fields is None:
+        return set()
+    task_id = str(fields.get("id", ""))
+    if not task_id:
+        return set()
+    ref = runtime_hotfix_ref(task_id, base)
+    recorded = run_git(repo, "cat-file", "blob", ref)
+    if recorded.returncode != 0:
+        return set()
+    recorded_lines = recorded.stdout.splitlines()
+    # The exact pin bytes under admission — from the working tree, the index,
+    # or a commit — supplied by the caller that knows which state it gates.
+    if pin_text is None:
+        try:
+            pin_text = (repo / RUNTIME_PIN).read_text(encoding="utf-8")
+        except OSError:
+            return set()
+    try:
+        landed_pin = json.loads(pin_text)
+    except json.JSONDecodeError:
+        return set()
+    if not isinstance(landed_pin, dict):
+        return set()
+    allowed: Set[str] = set()
+    for receipt in _runtime_hotfix_receipts(task_text, task_file):
+        if (receipt["task"] == task_id and receipt["base"] == base
+                and receipt_line(receipt) in recorded_lines
+                and _pin_is_receipt_runtime(landed_pin, receipt["new"])):
+            allowed.add(RUNTIME_PIN)
+    return allowed
+
+
+def _pin_is_receipt_runtime(pin: Dict[str, object], digest: str) -> bool:
+    """Whether a pin declaration names exactly the receipt's replacement runtime.
+
+    Digest alone is not enough: the guard's loader needs schema and version
+    too, so a receipt must not admit a declaration those checks would refuse.
+    """
+    if pin.get("digest") != digest or str(pin.get("schema", "")) != RUNTIME_SCHEMA_VALUE:
+        return False
+    try:
+        import status_runtime
+    except ImportError:  # pragma: no cover - package import used by tests
+        from scripts import status_runtime
+    manifest_path = status_runtime.runtime_home() / digest / "manifest.json"
+    try:
+        manifest = json.loads(manifest_path.read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError):
+        return False
+    return pin.get("version") == manifest.get("version")
+
+
+def receipt_line(receipt: Dict[str, str]) -> str:
+    """The canonical Log text of a parsed receipt, without its list marker."""
+    return (
+        f"{receipt['date']} — runtime-hotfix: task {receipt['task']} base "
+        f"{receipt['base']} runtime {receipt['old']} -> {receipt['new']} "
+        f"authorized by {receipt['authority']}"
+    )
+
+
 def validate_allowed_changes(
     repo: Path,
     base: str,
@@ -2046,6 +2595,160 @@ def _write_native_member_dispatch_record(coordinator: Path, activation: Dict[str
     dispatch_driver.record_native_member_activation(coordinator, activation)
 
 
+def _hotfix_snapshot_tree(primary: Path) -> str:
+    """Tree of the primary's complete working tree via a temporary index."""
+    with tempfile.TemporaryDirectory() as temporary:
+        env = dict(os.environ, GIT_INDEX_FILE=str(Path(temporary) / "index"))
+        for arguments in (("read-tree", "HEAD"), ("add", "-A"), ("write-tree",)):
+            completed = subprocess.run(("git", "-C", str(primary), *arguments), env=env,
+                                       encoding="utf-8", errors="replace", capture_output=True)
+            if completed.returncode:
+                raise IsolationError(
+                    f"git {' '.join(arguments)} failed: {completed.stderr.strip()}")
+        return completed.stdout.strip()
+
+
+def _hotfix_task_file(primary: Path, task_id: str) -> str:
+    tasks_dir = primary / ".project" / "tasks"
+    matches = sorted(tasks_dir.glob(f"{task_id}-*.md")) if tasks_dir.is_dir() else []
+    exact = tasks_dir / f"{task_id}.md"
+    if exact.is_file() and not exact.is_symlink():
+        matches = [exact]
+    if len(matches) != 1 or not matches[0].is_file() or matches[0].is_symlink():
+        raise IsolationError(f"task file for {task_id} is missing or ambiguous")
+    return matches[0].relative_to(primary).as_posix()
+
+
+def _append_task_log(primary: Path, task_file: str, line: str) -> None:
+    path = primary / task_file
+    text = path.read_text(encoding="utf-8")
+    if not text.endswith("\n"):
+        text += "\n"
+    _common.atomic_write(path, text + line + "\n")
+
+
+def runtime_hotfix(
+    primary: Path,
+    task_id: str,
+    runtime_digest: str,
+    authority: str,
+) -> Dict[str, object]:
+    """Authorize a runtime hotfix for one active serial task and re-verify it (#480).
+
+    The replacement runtime must be published in the shared store; the
+    authorization, the exact task/base/digest identities, and the re-run
+    Verify all stay explicit, and no unrelated change may slip into the
+    landing. This command validates the replacement runtime, re-runs the
+    task's Verify in a fresh verify sidecar at the recorded base, and on
+    success records the receipt twice: as a blob behind the guard-owned
+    runtime-hotfix ref (the authority an agent cannot forge) and as a Log
+    line in the task file (the provenance a reader sees). Only a Log line
+    whose identical twin the ref holds later admits `.gsd-path/runtime.json`
+    into that task's landing; a failing re-run refuses the hotfix before
+    either record is written.
+    """
+    primary = require_directory(primary, "primary worktree")
+    task_id = validate_task_id(task_id)
+    authority = authority.strip()
+    if not authority or authority.splitlines() != [authority]:
+        raise IsolationError("runtime-hotfix requires the authorizing ruling as one line of text")
+    try:
+        import runtime_store
+        import status_runtime
+    except ImportError:  # pragma: no cover - package import used by tests
+        from scripts import runtime_store, status_runtime
+    from datetime import date as _date
+    task_file = _hotfix_task_file(primary, task_id)
+    task_text, _ = _read_task_text(primary / task_file)
+    fields, error = task_frontmatter(task_text)
+    if error or fields is None:
+        raise IsolationError(error or f"unreadable task frontmatter: {task_file}")
+    if fields.get("status") != "in-progress":
+        raise IsolationError(
+            f"runtime-hotfix applies to an active task; {task_id} is {fields.get('status')}")
+    if str(fields.get("worktree", "")) not in ("", "null") and Path(
+            str(fields.get("worktree"))).resolve() != primary.resolve():
+        raise IsolationError(
+            "runtime-hotfix applies to a serial task working in the primary; "
+            f"{task_id} records another worktree")
+    recorded_base = fields.get("base")
+    if not isinstance(recorded_base, str) or not re.fullmatch(r"[0-9a-f]{40}", recorded_base):
+        raise IsolationError(f"{task_id} records no full base; the hotfix cannot be bound")
+    command = _common.task_verify_command(task_text)
+    if not command:
+        raise IsolationError(f"{task_id} has no Verify command to re-run")
+    new_digest = runtime_digest.strip().lower()
+    if re.fullmatch(r"[0-9a-f]{64}", new_digest) is None:
+        raise IsolationError("--runtime must be the 64-hex digest of a published runtime")
+    manifest_path = status_runtime.runtime_home() / new_digest / "manifest.json"
+    try:
+        manifest = json.loads(manifest_path.read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError) as error:
+        raise IsolationError(
+            f"runtime {new_digest} is not published in the store: {error}"
+        ) from error
+    try:
+        status_runtime.validate_runtime({
+            "schema": status_runtime.RUNTIME_SCHEMA,
+            "version": str(manifest.get("version", "")),
+            "digest": new_digest,
+        })
+        declaration = status_runtime.declaration(primary)
+    except (OSError, ValueError) as error:
+        raise IsolationError(f"runtime-hotfix refused: {error}") from error
+    old_digest = str(declaration.get("digest", ""))
+    if old_digest == new_digest:
+        raise IsolationError("runtime-hotfix requires a different runtime than the pinned one")
+    sidecar = ensure_verify_sidecar(
+        primary, recorded_base, verify_branch_name(f"runtime-hotfix-{task_id}")
+    )
+    sidecar_path = Path(str(sidecar["worktree"]))
+    reproduce_verify_sidecar(sidecar_path, _hotfix_snapshot_tree(primary))
+    # The re-run must prove the task under the REPLACEMENT runtime: write the
+    # new declaration into the sidecar's pin before Verify runs (#480). The
+    # primary's pin stays untouched; sidecar effects are the point of the
+    # sidecar.
+    sidecar_pin = sidecar_path / RUNTIME_PIN
+    sidecar_pin.parent.mkdir(parents=True, exist_ok=True)
+    _common.atomic_write(sidecar_pin, json.dumps({
+        "schema": status_runtime.RUNTIME_SCHEMA,
+        "version": str(manifest.get("version", "")),
+        "digest": new_digest,
+    }, indent=2, sort_keys=True) + "\n")
+    completed = subprocess.run(
+        ("sh", "-c", command), cwd=str(sidecar_path),
+        encoding="utf-8", errors="replace", capture_output=True,
+    )
+    clean_verify(primary, sidecar_path, recorded_base, str(sidecar["branch"]))
+    retire(primary, sidecar_path, str(sidecar["branch"]), False)
+    if completed.returncode != 0:
+        raise IsolationError(
+            f"{task_id} Verify failed in the hotfix sidecar; the hotfix is refused")
+    receipt = (
+        f"- {_date.today().isoformat()} — runtime-hotfix: task {task_id} "
+        f"base {recorded_base} runtime {old_digest} -> {new_digest} "
+        f"authorized by {authority}"
+    )
+    blob = run_git(primary, "hash-object", "-w", "--stdin", input=receipt[2:])
+    if blob.returncode != 0:
+        raise IsolationError("runtime-hotfix could not record its receipt blob")
+    created = run_git(
+        primary, "update-ref", runtime_hotfix_ref(task_id, recorded_base),
+        blob.stdout.strip(),
+    )
+    if created.returncode != 0:
+        raise IsolationError("runtime-hotfix could not record its authorization ref")
+    _append_task_log(primary, task_file, receipt)
+    return {
+        "task": task_id,
+        "base": recorded_base,
+        "old_runtime": old_digest,
+        "new_runtime": new_digest,
+        "receipt": receipt,
+        "authorization_ref": runtime_hotfix_ref(task_id, recorded_base),
+    }
+
+
 def deactivate_task(
     worktree: Path, task_id: str, task_branch: str
 ) -> Dict[str, object]:
@@ -2275,7 +2978,10 @@ def _stamp_and_commit(
     pending = uncommitted_paths(worktree)
     if stamped != task_bytes:
         pending.add(task_file)
-    validate_allowed_changes(worktree, base, pending, allowed, tolerated)
+    # A runtime hotfix receipt for exactly this task and base admits the
+    # runtime pin path into this landing — nothing else does (#480).
+    hotfix_allowed = runtime_hotfix_allowed_paths(worktree, task_text, task_file, base)
+    validate_allowed_changes(worktree, base, pending, allowed | hotfix_allowed, tolerated)
     original_head = current_sha(worktree)
     index_tree = git_output(worktree, "write-tree")
     try:
@@ -2348,6 +3054,11 @@ def land(
     allowed = {relative_posix(task_file)}
     for path in allow_paths:
         allowed.add(relative_posix(path))
+    # A runtime-hotfix receipt for exactly this task and base admits the
+    # runtime pin path into this landing — nothing else does (#480).
+    task_text, _ = _read_task_text(primary / relative_posix(task_file))
+    allowed |= runtime_hotfix_allowed_paths(
+        primary, task_text, relative_posix(task_file), resolved_base)
     serial = source == primary
     if serial:
         if source_branch != bound:
@@ -2552,13 +3263,52 @@ def _declared_task_paths(
         return None, str(error)
 
 
+def _tree_blob_map(repo: Path, revision: str) -> Dict[str, tuple[str, str, str]]:
+    """{path: (mode, type, oid)} for one commit's full tree."""
+    mapping: Dict[str, tuple[str, str, str]] = {}
+    for entry in git_output(
+        repo, "ls-tree", "-r", "-z", revision
+    ).split("\0"):
+        if not entry:
+            continue
+        meta, separator, name = entry.partition("\t")
+        if not separator:
+            continue
+        parts = meta.split()
+        if len(parts) == 3:
+            mapping[name] = (parts[0], parts[1], parts[2])
+    return mapping
+
+
 def _regular_blob_oid(repo: Path, revision: str, path: str) -> str:
+    # A full-sha revision addresses immutable content: the listing answers
+    # once per run (#469). Moving names are never cached, but within one
+    # read-only run HEAD is the entrypoint's recorded head, so resolve it.
+    if revision == "HEAD":
+        recorded = _RECOVERY_MEMO.get(("head-sha", str(repo)))
+        if isinstance(recorded, str):
+            # Every task compares against the same run head: one full listing
+            # answers all of them (#469).
+            map_key = ("head-tree", str(repo), recorded)
+            if map_key not in _RECOVERY_MEMO:
+                _RECOVERY_MEMO[map_key] = _tree_blob_map(repo, recorded)
+            mapping = _RECOVERY_MEMO[map_key]
+            assert isinstance(mapping, dict)
+            entry = mapping.get(path)
+            if entry is None or entry[1] != "blob" or entry[0] not in {"100644", "100755"}:
+                raise IsolationError(f"task path is not a regular file in HEAD: {path}")
+            return entry[2]
+    key = ("blob-oid", str(repo), revision, path)
+    if _FULL_SHA.fullmatch(revision) is not None and key in _RECOVERY_MEMO:
+        return str(_RECOVERY_MEMO[key])
     entries = git_output(repo, "ls-tree", revision, "--", path).splitlines()
     if len(entries) != 1:
         raise IsolationError(f"task path is not a regular file in {revision}: {path}")
     parts = entries[0].split(maxsplit=3)
     if len(parts) != 4 or parts[0] not in {"100644", "100755"} or parts[1] != "blob":
         raise IsolationError(f"task path is not a regular file in {revision}: {path}")
+    if _FULL_SHA.fullmatch(revision) is not None:
+        _RECOVERY_MEMO[key] = parts[2]
     return parts[2]
 
 
@@ -2619,9 +3369,12 @@ def _landing_state(
             contract_paths,
             f"source commit subject is {subject!r}, expected {expected_subject!r}",
         )
-    if allowed is not None and allowed != contract_paths:
-        missing = sorted(contract_paths - allowed)
-        extra = sorted(allowed - contract_paths)
+    # The runtime pin path joins only with a matching hotfix receipt (#480).
+    receipt_allowed = runtime_hotfix_allowed_paths(repo, after_text, task_file, base)
+    comparable = allowed - receipt_allowed if allowed is not None else None
+    if comparable is not None and comparable != contract_paths:
+        missing = sorted(contract_paths - comparable)
+        extra = sorted(comparable - contract_paths)
         details = []
         if missing:
             details.append("missing " + ", ".join(missing))
@@ -2700,7 +3453,14 @@ def _prove_task_commit(
     )
     if task_file not in changed:
         return None, "commit does not touch the task file"
-    stray = undeclared_paths(repo, base, changed, contract_paths)
+    committed_pin = None
+    if RUNTIME_PIN in changed:
+        shown = run_git(repo, "show", f"{sha}:{RUNTIME_PIN}")
+        committed_pin = shown.stdout if shown.returncode == 0 else ""
+    stray = undeclared_paths(
+        repo, base, changed,
+        contract_paths | runtime_hotfix_allowed_paths(
+            repo, after_text, task_file, base, pin_text=committed_pin))
     if stray:
         return None, f"commit touches undeclared paths: {', '.join(stray)}"
     if landing_error:
@@ -2868,6 +3628,23 @@ def _worktree_report(
         return None, f"invalid sidecar worktree {path}: {error}"
 
 
+def _primary_worktree_report(
+    primary: Path, bound: str, head: str
+) -> tuple[Optional[Dict[str, object]], Optional[str]]:
+    """The primary's own worktree report, answered once per recovery run.
+
+    Recovery is read-only and the run's head is fixed, so every serial task
+    sees the same answer; the entrypoint-cleared memo scopes it to one run
+    (#469).
+    """
+    key = ("primary-report", str(primary), bound, head)
+    if key in _RECOVERY_MEMO:
+        return _RECOVERY_MEMO[key]  # type: ignore[return-value]
+    report = _worktree_report(primary, primary, bound)
+    _RECOVERY_MEMO[key] = report
+    return report
+
+
 def _retained_task_contract_error(
     current_text: str, isolate_text: str
 ) -> Optional[str]:
@@ -2932,6 +3709,15 @@ def _serial_bookkeeping_error(primary: Path, base: str, head: str) -> Optional[s
     """Prove that serial task history advanced only through linear .project commits."""
     if base == head:
         return None
+    key = ("serial-bookkeeping", str(primary), base, head)
+    if key in _RECOVERY_MEMO:
+        return _RECOVERY_MEMO[key]  # type: ignore[return-value]
+    error = _serial_bookkeeping_proof(primary, base, head)
+    _RECOVERY_MEMO[key] = error
+    return error
+
+
+def _serial_bookkeeping_proof(primary: Path, base: str, head: str) -> Optional[str]:
     if run_git(primary, "merge-base", "--is-ancestor", base, head).returncode != 0:
         return "recorded base is not an ancestor of the current branch"
     commits = git_output(
@@ -3104,6 +3890,18 @@ def _recover_task(
         return result("block", reason=str(error))
     except IsolationError as exc:
         return result("block", reason=str(exc))
+    if status == "withdrawn":
+        # A cited tombstone is inventory, not recoverable work: no isolate,
+        # no landing, nothing to resume — coordinator or member alike (#483).
+        # Without the owner citation the tombstone is an obligation someone
+        # dropped: block it.
+        if not withdrawn_citations(task_text):
+            return result(
+                "block",
+                reason="withdrawn task lacks a `- Withdrawn — <YYYY-MM-DD>: "
+                       "<owner ruling verbatim>` Log citation",
+            )
+        return result("none", reason="withdrawn task is a tombstone")
     if fields.get("repo"):
         # Only the landing record proves member task completion.
         if status in ("pending", "in-progress"):
@@ -3132,7 +3930,7 @@ def _recover_task(
             return leftover(landed["commit"], landed["base"])
         return result("block", reason=worktree_error)
 
-    valid_statuses = {"pending", "in-progress", "done", "failed", "blocked"}
+    valid_statuses = {"pending", "in-progress", "done", "failed", "blocked", "withdrawn"}
     if status not in valid_statuses:
         return result("block", reason=f"unknown task status: {status!r}")
 
@@ -3271,7 +4069,7 @@ def _recover_task(
                     "block",
                     reason=f"{status} serial task advanced past its base: {advance_error}",
                 )
-            primary_worktree, primary_error = _worktree_report(primary, primary, bound)
+            primary_worktree, primary_error = _primary_worktree_report(primary, bound, head)
             if primary_error:
                 return result("block", reason=primary_error)
             report["worktree"] = primary_worktree
@@ -3327,11 +4125,14 @@ def _recover_task(
                     "block",
                     reason=f"{status} serial task advanced past its base: {advance_error}",
                 )
-            primary_worktree, primary_error = _worktree_report(primary, primary, bound)
+            primary_worktree, primary_error = _primary_worktree_report(primary, bound, head)
             if primary_error:
                 return result("block", reason=primary_error)
             report["worktree"] = primary_worktree
-        return result("reconcile", base=base)
+        return result(
+            "reconcile", base=base,
+            reason=f"{status} task needs recovery; run reconcile for its classification",
+        )
 
     recorded_base = str(fields.get("base", ""))
     try:
@@ -3414,9 +4215,7 @@ def _recover_task(
             primary, recorded_base, task_file, task_text, subject
         )
         if retry_error is None:
-            primary_worktree, primary_error = _worktree_report(
-                primary, primary, bound
-            )
+            primary_worktree, primary_error = _primary_worktree_report(primary, bound, head)
             if primary_error:
                 return result("block", reason=primary_error)
             report["worktree"] = primary_worktree
@@ -3521,6 +4320,20 @@ def recover(primary: Path, tasks_dir: Path) -> Dict[str, object]:
         raise IsolationError(f"primary is not its Git root: {primary}")
     bound = require_attached(primary)
     head = current_sha(primary)
+    _RECOVERY_MEMO.clear()
+    _RECOVERY_MEMO[("head-sha", str(primary))] = head
+    try:
+        with worktree_paths.readonly_placement_cache():
+            return _recover_all(primary, tasks_dir, bound, head)
+    finally:
+        # HEAD resumes its moving-name meaning the moment the read-only run
+        # ends: landing flows in the same process must never resolve it to a
+        # stale recorded head.
+        _RECOVERY_MEMO.pop(("head-sha", str(primary)), None)
+        _RECOVERY_MEMO.pop(("head-tree", str(primary), head), None)
+
+
+def _recover_all(primary: Path, tasks_dir: Path, bound: str, head: str) -> Dict[str, object]:
     task_paths, inventory_error = _recovery_task_inventory(primary, tasks_dir, head)
     if inventory_error:
         return {
@@ -3534,10 +4347,11 @@ def recover(primary: Path, tasks_dir: Path) -> Dict[str, object]:
     branches = set(
         git_output(primary, "for-each-ref", "--format=%(refname:short)", f"refs/heads/{TASK_BRANCH_PREFIX}").splitlines()
     )
-    tasks = [
-        _recover_task(primary, path, history, branches, head, bound)
-        for path in task_paths
-    ]
+    tasks = []
+    for number, path in enumerate(task_paths, start=1):
+        if number % 20 == 0:
+            print(f"recover: {number}/{len(task_paths)} tasks", file=sys.stderr, flush=True)
+        tasks.append(_recover_task(primary, path, history, branches, head, bound))
     return {
         "bound_branch": bound,
         "tasks": tasks,
@@ -3558,7 +4372,6 @@ def verify_landed_task_files(
         raise IsolationError(f"primary is not its Git root: {primary}")
     bound = require_attached(primary)
     resolved_head = require_commit(primary, require_full_sha(head))
-    canonical_dir = relative_posix(canonical_tasks_dir)
     history = _first_parent_history(primary, resolved_head)
     branches = set(
         git_output(
@@ -3568,8 +4381,32 @@ def verify_landed_task_files(
             f"refs/heads/{TASK_BRANCH_PREFIX}",
         ).splitlines()
     )
+    _RECOVERY_MEMO.clear()
+    _RECOVERY_MEMO[("head-sha", str(primary))] = resolved_head
+    try:
+        with worktree_paths.readonly_placement_cache():
+            return _verify_landed_all(
+                primary, list(task_paths), relative_posix(canonical_tasks_dir),
+                resolved_head, history, branches, bound,
+            )
+    finally:
+        _RECOVERY_MEMO.pop(("head-sha", str(primary)), None)
+        _RECOVERY_MEMO.pop(("head-tree", str(primary), resolved_head), None)
+
+
+def _verify_landed_all(
+    primary: Path,
+    task_paths: Sequence[Path],
+    canonical_dir: str,
+    resolved_head: str,
+    history: Dict[str, list[tuple[str, str]]],
+    branches: Set[str],
+    bound: str,
+) -> Dict[str, object]:
     tasks = []
-    for path in task_paths:
+    for number, path in enumerate(task_paths, start=1):
+        if number % 20 == 0:
+            print(f"recover: {number}/{len(task_paths)} tasks", file=sys.stderr, flush=True)
         resolved = path.resolve()
         if path.is_symlink() or not path.is_file():
             raise IsolationError(f"task artifact is missing or unsafe: {path}")
@@ -3582,6 +4419,22 @@ def verify_landed_task_files(
         fields, error = task_frontmatter(task_text)
         if error or fields is None:
             raise IsolationError(error or f"unreadable task frontmatter: {path.name}")
+        if fields.get("status") == "withdrawn":
+            # A cited tombstone is shippable inventory with no landing to
+            # prove; an uncited one is an obligation someone dropped (#483).
+            if not withdrawn_citations(task_text):
+                raise IsolationError(
+                    f"{fields.get('id', path.name)}: withdrawn task needs a "
+                    "`- Withdrawn — <YYYY-MM-DD>: <owner ruling verbatim>` Log citation"
+                )
+            tasks.append({
+                "task": canonical,
+                "task_id": str(fields.get("id", "")),
+                "status": "withdrawn",
+                "verdict": "withdrawn",
+                "reason": "withdrawn task is a tombstone",
+            })
+            continue
         if fields.get("status") != "done":
             raise IsolationError(
                 f"{fields.get('id', path.name)}: task must have status: done"
@@ -3597,7 +4450,10 @@ def verify_landed_task_files(
                 canonical,
             )
         )
-    blocked = [task for task in tasks if task["verdict"] not in LANDED_VERDICTS]
+    blocked = [
+        task for task in tasks
+        if task["verdict"] not in LANDED_VERDICTS and task["verdict"] != "withdrawn"
+    ]
     if blocked:
         def failure_reason(task: Dict[str, object]) -> str:
             rejected = task.get("rejected")
@@ -4502,6 +5358,64 @@ def attest(
     }
 
 
+def _committed_ship_active(repo: Path) -> bool:
+    """True when the STATE.md committed at HEAD is ship/active."""
+
+    result = run_git(repo, "show", "HEAD:.project/STATE.md")
+    if result.returncode != 0:
+        return False
+    frontmatter = result.stdout.split("\n---", 1)[0]
+    fields = {
+        key: _unquote(value)
+        for key, value in re.findall(r"(?m)^(phase|status):(.*)$", frontmatter)
+    }
+    return fields.get("phase") == "ship" and fields.get("status") == "active"
+
+
+# The STATE Log tail that sanctions a build checkpoint past a HEAD that is
+# still ship/active: the blocked final review went through the patch plan
+# (reopened, then approved) and build started again (#526).
+_PATCH_REENTRY_LOG = (
+    ("plan", "patch plan reopened"),
+    ("plan", "patch plan approved"),
+    ("build", "build started"),
+)
+
+
+def _patch_reentry_build_active(repo: Path) -> bool:
+    """True when the worktree STATE is the sanctioned patch-re-entry build.
+
+    A blocked final review leaves HEAD at `build: complete milestone`
+    (ship/active) on purpose: the patch plan runs uncommitted and the patch
+    build's own checkpoint commits the artifacts (SHIP.md). This reads the
+    worktree STATE the checkpoint is about to commit and accepts only the
+    documented sequence — a hand-flipped build/active during final review
+    carries no such Log tail and stays refused (#429, #526).
+    """
+
+    state = repo / ".project" / "STATE.md"
+    try:
+        text = state.read_text(encoding="utf-8")
+    except (OSError, UnicodeDecodeError):
+        return False
+    frontmatter = text.split("\n---", 1)[0]
+    fields = {
+        key: _unquote(value)
+        for key, value in re.findall(r"(?m)^(phase|status):(.*)$", frontmatter)
+    }
+    if not (fields.get("phase") == "build" and fields.get("status") == "active"):
+        return False
+    events: List[Tuple[str, str]] = []
+    for line in text.splitlines():
+        match = re.fullmatch(r"- \d{4}-\d{2}-\d{2} — (\S+) — (.+)", line)
+        if match:
+            events.append((match.group(1), match.group(2)))
+    # The sanctioned sequence appears in order, as the Log tail of this
+    # milestone's patch loop; the final event must be the build restart.
+    last = len(_PATCH_REENTRY_LOG)
+    return len(events) >= last and tuple(events[-last:]) == _PATCH_REENTRY_LOG
+
+
 def checkpoint(
     repo: Path,
     expected_head: str,
@@ -4551,6 +5465,16 @@ def checkpoint(
                 "subject": subject.strip(),
             }
         raise IsolationError("primary HEAD differs from --expected-head")
+    if (
+        subject.strip().startswith("build:")
+        and _committed_ship_active(repo)
+        and not _patch_reentry_build_active(repo)
+    ):
+        raise IsolationError(
+            "STATE is ship/active: final review creates no pre-ship commit; leave its "
+            "outputs uncommitted for archive_milestone.py, and send findings through "
+            "the patch plan (see SHIP.md)"
+        )
     pending = uncommitted_paths(repo)
     forced: Set[str] = set()
     # Build only: an approval undo resets to a parent without the ledger and would drop it.
@@ -4580,10 +5504,18 @@ def checkpoint(
     )
     if unexpected:
         raise IsolationError("unexpected paths: " + ", ".join(unexpected))
+    # An unsupported entry violates only if it will exist after this
+    # checkpoint commits: _commit_pending stages exactly the pending paths
+    # from the worktree, so a staged or completed removal (git rm / git mv)
+    # passes and the removal lands here instead of forcing a plain commit
+    # (#466). A kept worktree file (rm --cached, untracked junk) would be
+    # re-staged and still blocks.
     unsupported = sorted({
         path.split("/")[1]
         for path in pending
-        if path.startswith(".project/") and path.split("/")[1] not in PROJECT_ENTRIES
+        if path.startswith(".project/")
+        and path.split("/")[1] not in PROJECT_ENTRIES
+        and ((repo / path).exists() or (repo / path).is_symlink())
     })
     if unsupported:
         raise IsolationError(
@@ -4915,9 +5847,16 @@ def parser() -> argparse.ArgumentParser:
     activate_member_parser.add_argument("--repo", type=Path, required=True, help="coordinator root")
     activate_member_parser.add_argument("--member", required=True)
     activate_member_parser.add_argument("--task-id", required=True)
-    activate_member_parser.add_argument("--agent", required=True)
-    activate_member_parser.add_argument("--task-file", required=True)
-    activate_member_parser.add_argument("--base", required=True)
+    activate_member_parser.add_argument("--agent")
+    activate_member_parser.add_argument("--task-file")
+    activate_member_parser.add_argument("--base")
+    activate_member_parser.add_argument(
+        "--reauthorize", action="store_true",
+        help="re-record the authorization a failed finish cleared, for the same "
+             "live copy at the same member base, without re-isolating (#461); "
+             "--task-file/--base come from the recorded activation, which the "
+             "live copy must match"
+    )
 
     retire_member_parser = subparsers.add_parser(
         "retire-member-task", help="remove a member task sidecar and branch before a retry"
@@ -4929,12 +5868,31 @@ def parser() -> argparse.ArgumentParser:
                                       help="discard a rejected attempt whose Log the coordinator task holds")
     retire_member_parser.add_argument("--task-file")
 
+    runtime_hotfix_parser = subparsers.add_parser(
+        "runtime-hotfix",
+        help="authorize a runtime hotfix for one active task and re-verify it (#480)",
+    )
+    runtime_hotfix_parser.add_argument("--repo", type=Path, required=True)
+    runtime_hotfix_parser.add_argument("--task-id", required=True)
+    runtime_hotfix_parser.add_argument(
+        "--runtime", required=True,
+        help="64-hex runtime digest printed by runtime_store.py publish, validated before recording",
+    )
+    runtime_hotfix_parser.add_argument(
+        "--authorized-by", required=True,
+        help="the authorizing ruling, recorded verbatim in the task Log receipt",
+    )
     deactivate_task_parser = subparsers.add_parser(
-        "deactivate-task", help="revoke one helper-owned task dispatch"
+        "deactivate-task",
+        help="revoke one helper-owned task dispatch (parallel tasks only: a serial "
+             "task has no task branch and no authorization to deactivate)",
     )
     deactivate_task_parser.add_argument("--repo", type=Path, required=True)
     deactivate_task_parser.add_argument("--task-id", required=True)
-    deactivate_task_parser.add_argument("--task-branch", required=True)
+    deactivate_task_parser.add_argument(
+        "--task-branch", required=True,
+        help="the parallel isolate's branch gsd-path-task/<id>",
+    )
 
     isolate_verify_parser = subparsers.add_parser(
         "isolate-verify", help="create a named verify sidecar"
@@ -5011,8 +5969,18 @@ def parser() -> argparse.ArgumentParser:
 
 
 def main(argv: Optional[Sequence[str]] = None) -> int:
-    arguments = parser().parse_args(argv)
+    argument_parser = parser()
+    arguments = argument_parser.parse_args(argv)
     try:
+        if arguments.command == "activate-member-task" and (
+            (arguments.reauthorize and (arguments.agent or arguments.task_file or arguments.base))
+            or (not arguments.reauthorize
+                and not (arguments.agent and arguments.task_file and arguments.base))
+        ):
+            argument_parser.error(
+                "activate-member-task requires --agent, --task-file, and --base, "
+                "or --reauthorize alone (which uses the recorded activation)"
+            )
         if arguments.command == "isolate-task":
             result = isolate_task(
                 arguments.repo,
@@ -5032,14 +6000,24 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
         elif arguments.command == "isolate-member-task":
             result = isolate_member_task(arguments.repo, arguments.member, arguments.task_id)
         elif arguments.command == "activate-member-task":
-            result = activate_member_task(arguments.repo, arguments.member, arguments.task_id,
-                                          arguments.agent, arguments.task_file, arguments.base)
+            if arguments.reauthorize:
+                result = reauthorize_member_task(arguments.repo, arguments.member, arguments.task_id)
+            else:
+                result = activate_member_task(arguments.repo, arguments.member, arguments.task_id,
+                                              arguments.agent, arguments.task_file, arguments.base)
         elif arguments.command == "retire-member-task":
             copy_rejected = retire_member_task(arguments.repo, arguments.member, arguments.task_id,
                                                arguments.force, arguments.task_file)
             result = {"member": arguments.member, "retired": True, "task_id": arguments.task_id}
             if copy_rejected:
                 result["copy_rejected"] = copy_rejected
+        elif arguments.command == "runtime-hotfix":
+            result = runtime_hotfix(
+                arguments.repo,
+                arguments.task_id,
+                arguments.runtime,
+                arguments.authorized_by,
+            )
         elif arguments.command == "deactivate-task":
             result = deactivate_task(
                 arguments.repo,