Merge branch 'master' into fix/issue-842-conflict-fix-lease-lifecycle

author_issue_bootstrap.py

@@ -1,824 +0,0 @@
-"""Sanctioned author issue worktree bootstrap for allocated issues (#850).
-
-Bootstraps an allocated author branch, canonical worktree under ``branches/``,
-worktree registration, issue lock, and lease/assignment binding without
-caller-side Git, Bash, or helper scripts.
-
-Features:
-1. Durable phase journal with read-after-write evidence for every phase.
-2. Idempotent replay handling via idempotency keys.
-3. Authoritative expected-base / concurrency-pin validation.
-4. Typed stale-pin refusal without silent rebasing or repointing.
-5. Canonical branches-root enforcement (path MUST be inside branches/).
-6. Preexisting work preservation (dirty tracked/untracked check, foreign ownership refusal).
-7. Compensating recovery limited strictly to artifacts created by this transition.
-8. Satisfiable exact_next_action for MCP scheduled workers.
-"""
-
-from __future__ import annotations
-
-import json
-import os
-import shutil
-import subprocess
-from typing import Any, Mapping
-
-import author_mutation_worktree
-import issue_lock_store
-import issue_lock_worktree
-import lease_lifecycle
-from reviewer_worktree import parse_dirty_tracked_files
-import task_capability_map
-
-BOOTSTRAP_TASKS = frozenset(
-    {
-        "bootstrap_author_issue_worktree",
-        "gitea_bootstrap_author_issue_worktree",
-    }
-)
-
-PHASE_1_REQUEST_ACCEPTED = "1_request_accepted"
-PHASE_2_BRANCH_CONFIRMED = "2_branch_confirmed"
-PHASE_3_PATH_RESERVED = "3_path_reserved"
-PHASE_4_WORKTREE_CONFIRMED = "4_worktree_confirmed"
-PHASE_5_REGISTRATION_VERIFIED = "5_registration_verified"
-PHASE_6_STATE_ESTABLISHED = "6_state_established"
-PHASE_7_TRANSITION_COMPLETED = "7_transition_completed"
-PHASE_COMPENSATING_RECOVERY = "compensating_recovery"
-
-JOURNAL_DIR_NAME = "bootstrap-journals"
-
-
-def is_author_issue_bootstrap_task(task: str | None) -> bool:
-    """True when *task* is the author issue worktree bootstrap task."""
-    return (task or "").strip() in BOOTSTRAP_TASKS
-
-
-def get_journal_dir(override: str | None = None) -> str:
-    """Return the root directory for durable bootstrap phase journals."""
-    if override:
-        path = override
-    elif os.environ.get("GITEA_BOOTSTRAP_JOURNAL_DIR"):
-        path = os.environ["GITEA_BOOTSTRAP_JOURNAL_DIR"]
-    else:
-        cache_dir = os.path.expanduser("~/.cache/gitea-tools")
-        path = os.path.join(cache_dir, JOURNAL_DIR_NAME)
-    os.makedirs(path, exist_ok=True)
-    return path
-
-
-def _journal_file_path(idempotency_key: str, journal_dir: str | None = None) -> str:
-    safe_key = "".join(
-        c if c.isalnum() or c in ("-", "_", ".") else "_"
-        for c in idempotency_key
-    )
-    return os.path.join(get_journal_dir(journal_dir), f"{safe_key}.json")
-
-
-def load_phase_journal(
-    idempotency_key: str, journal_dir: str | None = None
-) -> dict[str, Any] | None:
-    """Load a durable phase journal if it exists."""
-    path = _journal_file_path(idempotency_key, journal_dir=journal_dir)
-    if not os.path.isfile(path):
-        return None
-    try:
-        with open(path, "r", encoding="utf-8") as f:
-            return json.load(f)
-    except Exception:
-        return None
-
-
-def save_phase_journal(
-    journal: dict[str, Any], journal_dir: str | None = None
-) -> None:
-    """Persist a durable phase journal with write-through file sync."""
-    key = journal["idempotency_key"]
-    path = _journal_file_path(key, journal_dir=journal_dir)
-    tmp_path = f"{path}.tmp.{os.getpid()}"
-    with open(tmp_path, "w", encoding="utf-8") as f:
-        json.dump(journal, f, indent=2, sort_keys=True)
-    os.replace(tmp_path, path)
-
-
-def derive_default_idempotency_key(
-    remote: str,
-    org: str | None,
-    repo: str | None,
-    issue_number: int,
-    assignment_id: str | None = None,
-    lease_id: str | None = None,
-) -> str:
-    parts = [
-        "bootstrap",
-        (remote or "prgs").strip(),
-        (org or "Scaled-Tech-Consulting").strip(),
-        (repo or "Gitea-Tools").strip(),
-        f"issue-{issue_number}",
-    ]
-    if assignment_id:
-        parts.append(assignment_id.strip())
-    if lease_id:
-        parts.append(lease_id.strip())
-    return ":".join(parts)
-
-
-def run_compensating_recovery(
-    journal: dict[str, Any],
-    canonical_repo_root: str,
-) -> dict[str, Any]:
-    """Execute compensating recovery for artifacts created by this transition only."""
-    artifacts = journal.get("artifacts_created") or {}
-    rolled_back: list[str] = []
-    worktree_path = journal.get("worktree_path")
-    branch_name = journal.get("branch_name")
-
-    if (
-        artifacts.get("worktree_registered") or artifacts.get("worktree_dir_created")
-    ) and worktree_path:
-        if os.path.exists(worktree_path):
-            try:
-                subprocess.run(
-                    [
-                        "git",
-                        "-C",
-                        canonical_repo_root,
-                        "worktree",
-                        "remove",
-                        "--force",
-                        worktree_path,
-                    ],
-                    capture_output=True,
-                    text=True,
-                    check=False,
-                )
-            except Exception:
-                pass
-            if os.path.exists(worktree_path):
-                shutil.rmtree(worktree_path, ignore_errors=True)
-            try:
-                subprocess.run(
-                    ["git", "-C", canonical_repo_root, "worktree", "prune"],
-                    capture_output=True,
-                    text=True,
-                    check=False,
-                )
-            except Exception:
-                pass
-            rolled_back.append(f"worktree_path:{worktree_path}")
-
-    if artifacts.get("branch_created") and branch_name:
-        try:
-            res = subprocess.run(
-                [
-                    "git",
-                    "-C",
-                    canonical_repo_root,
-                    "rev-parse",
-                    "--verify",
-                    branch_name,
-                ],
-                capture_output=True,
-                text=True,
-                check=False,
-            )
-            if res.returncode == 0:
-                subprocess.run(
-                    [
-                        "git",
-                        "-C",
-                        canonical_repo_root,
-                        "branch",
-                        "-D",
-                        branch_name,
-                    ],
-                    capture_output=True,
-                    text=True,
-                    check=False,
-                )
-                rolled_back.append(f"branch:{branch_name}")
-        except Exception:
-            pass
-
-    recovery_info = {
-        "executed": True,
-        "rolled_back": rolled_back,
-        "reason": journal.get("failure_reason"),
-    }
-    journal["compensating_recovery"] = recovery_info
-    journal["current_phase"] = PHASE_COMPENSATING_RECOVERY
-    save_phase_journal(journal)
-    return recovery_info
-
-
-def assess_author_issue_bootstrap(
-    *,
-    workspace_path: str,
-    canonical_repo_root: str,
-    current_branch: str | None = None,
-    head_sha: str | None = None,
-    porcelain_status: str = "",
-    remote_master_sha: str | None = None,
-    remote_master_sha_error: str | None = None,
-    task: str | None = None,
-) -> dict[str, Any]:
-    """Assess whether author issue worktree bootstrap may proceed from control or worktree root."""
-    root = os.path.realpath(canonical_repo_root or "")
-    workspace = os.path.realpath(workspace_path or root or ".")
-    branch = (current_branch or "").strip()
-    dirty = parse_dirty_tracked_files(porcelain_status or "")
-    under_branches = (
-        author_mutation_worktree.is_path_under_branches(workspace, root)
-        if root
-        else False
-    )
-
-    if not is_author_issue_bootstrap_task(task):
-        return {
-            "not_applicable": True,
-            "allowed": False,
-            "block": False,
-            "proven": False,
-            "reasons": ["task is not author_issue_bootstrap"],
-        }
-
-    if under_branches:
-        return {
-            "not_applicable": False,
-            "allowed": True,
-            "block": False,
-            "proven": True,
-            "bootstrap_path": "existing_branches_worktree",
-            "reasons": [
-                "workspace is already a registered worktree under branches/"
-            ],
-        }
-
-    reasons: list[str] = []
-    if workspace != root:
-        reasons.append(
-            "bootstrap requires workspace to be canonical control checkout or branches/ worktree"
-        )
-    if branch not in author_mutation_worktree.BASE_BRANCHES:
-        reasons.append(
-            f"control checkout branch '{branch}' is not an accepted base branch "
-            f"({', '.join(sorted(author_mutation_worktree.BASE_BRANCHES))})"
-        )
-    if dirty:
-        reasons.append(
-            f"control checkout has tracked local edits: {', '.join(dirty[:5])}"
-        )
-
-    if remote_master_sha_error:
-        reasons.append(
-            f"could not verify live master tip: {remote_master_sha_error}"
-        )
-    elif remote_master_sha and head_sha:
-        h = head_sha.strip().lower()
-        rm = remote_master_sha.strip().lower()
-        if h != rm:
-            reasons.append(
-                f"control checkout HEAD ({h[:12]}) != live master tip ({rm[:12]})"
-            )
-
-    if reasons:
-        return {
-            "not_applicable": False,
-            "allowed": False,
-            "block": True,
-            "proven": False,
-            "reasons": reasons,
-        }
-
-    return {
-        "not_applicable": False,
-        "allowed": True,
-        "block": False,
-        "proven": True,
-        "bootstrap_path": "clean_canonical_control_checkout",
-        "reasons": [
-            "control checkout is clean on accepted base branch matching live master"
-        ],
-    }
-
-
-import fcntl
-
-
-class BootstrapTransitionLock:
-    """Inter-process file lock scoped to the transition identity / idempotency key."""
-
-    def __init__(self, idempotency_key: str, journal_dir: str | None = None):
-        safe_key = "".join(
-            c if c.isalnum() or c in ("-", "_", ".") else "_"
-            for c in idempotency_key
-        )
-        lock_dir = get_journal_dir(journal_dir)
-        self.lock_path = os.path.join(lock_dir, f"{safe_key}.lock")
-        self.fd = None
-
-    def __enter__(self):
-        self.fd = open(self.lock_path, "a+")
-        fcntl.flock(self.fd, fcntl.LOCK_EX)
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        if self.fd:
-            try:
-                fcntl.flock(self.fd, fcntl.LOCK_UN)
-            except Exception:
-                pass
-            try:
-                self.fd.close()
-            except Exception:
-                pass
-            self.fd = None
-
-
-def bootstrap_author_issue_worktree(
-    *,
-    issue_number: int,
-    canonical_repo_root: str,
-    assignment_id: str | None = None,
-    lease_id: str | None = None,
-    expected_base_sha: str | None = None,
-    branch_name: str | None = None,
-    worktree_path: str | None = None,
-    idempotency_key: str | None = None,
-    remote: str = "prgs",
-    host: str | None = None,
-    org: str | None = "Scaled-Tech-Consulting",
-    repo: str | None = "Gitea-Tools",
-    active_identity: str | None = "jcwalker3",
-    active_profile: str | None = "prgs-author",
-    owner_session: str | None = None,
-    lock_dir: str | None = None,
-    dry_run: bool = False,
-) -> dict[str, Any]:
-    """Execute the sanctioned author issue worktree bootstrap transition."""
-    root = os.path.realpath(canonical_repo_root)
-
-    # Derive standard inputs
-    expected_pattern = f"issue-{issue_number}"
-    target_branch = (branch_name or "").strip()
-    if not target_branch:
-        target_branch = f"fix/issue-{issue_number}-native-mcp-bootstrap"
-    elif expected_pattern not in target_branch:
-        return {
-            "success": False,
-            "reason_code": "invalid_branch_name",
-            "message": (
-                f"Branch name '{target_branch}' must contain issue pattern '{expected_pattern}'"
-            ),
-            "exact_next_action": (
-                f"Supply a branch_name containing '{expected_pattern}', e.g., 'fix/issue-{issue_number}-...'"
-            ),
-        }
-
-    worktree_name = target_branch.replace("/", "-")
-    target_worktree = (worktree_path or "").strip()
-    if not target_worktree:
-        target_worktree = os.path.join(root, "branches", worktree_name)
-    target_worktree = os.path.realpath(os.path.abspath(target_worktree))
-
-    key = (idempotency_key or "").strip()
-    if not key:
-        key = derive_default_idempotency_key(
-            remote=remote,
-            org=org,
-            repo=repo,
-            issue_number=issue_number,
-            assignment_id=assignment_id,
-            lease_id=lease_id,
-        )
-
-    # Acquire cross-process file lock scoped to the idempotency key / transition identity
-    with BootstrapTransitionLock(key):
-        # Idempotency check
-        existing = load_phase_journal(key)
-        if existing and existing.get("completed"):
-            if (
-                existing.get("issue_number") == issue_number
-                and existing.get("branch_name") == target_branch
-                and os.path.realpath(existing.get("worktree_path", ""))
-                == target_worktree
-            ):
-                return {
-                    "success": True,
-                    "replayed": True,
-                    "message": (
-                        f"Idempotent replay: worktree for issue #{issue_number} already bootstrapped at {target_worktree}"
-                    ),
-                    "issue_number": issue_number,
-                    "branch_name": target_branch,
-                    "worktree_path": target_worktree,
-                    "base_sha": existing.get("resolved_base_sha"),
-                    "lease_id": existing.get("lease_id"),
-                    "assignment_id": existing.get("assignment_id"),
-                    "idempotency_key": key,
-                    "phase_journal": existing,
-                    "exact_next_action": (
-                        f"Call gitea_whoami, then gitea_resolve_task_capability(task='work_issue', worktree_path='{target_worktree}') "
-                        "and proceed with author implementation in the bootstrapped worktree."
-                    ),
-                }
-            else:
-                return {
-                    "success": False,
-                    "reason_code": "incompatible_idempotency_replay",
-                    "message": (
-                        f"Idempotency key '{key}' already exists with incompatible parameters "
-                        f"(stored: {existing.get('branch_name')}, {existing.get('worktree_path')}; "
-                        f"requested: {target_branch}, {target_worktree})"
-                    ),
-                    "exact_next_action": (
-                        "Supply a unique idempotency_key or pass compatible parameters."
-                    ),
-                }
-
-        # Initialize or resume Phase Journal
-        if existing:
-            journal = existing
-            artifacts = journal.setdefault("artifacts_created", {})
-            artifacts.setdefault("branch_created", False)
-            artifacts.setdefault("worktree_dir_created", False)
-            artifacts.setdefault("worktree_registered", False)
-            artifacts.setdefault("lock_created", False)
-        else:
-            journal = {
-                "idempotency_key": key,
-                "issue_number": issue_number,
-                "assignment_id": assignment_id,
-                "lease_id": lease_id,
-                "expected_base_sha": expected_base_sha,
-                "resolved_base_sha": None,
-                "branch_name": target_branch,
-                "worktree_path": target_worktree,
-                "active_identity": active_identity,
-                "active_profile": active_profile,
-                "owner_session": owner_session,
-                "remote": remote,
-                "org": org,
-                "repo": repo,
-                "phases": {},
-                "artifacts_created": {
-                    "branch_created": False,
-                    "worktree_dir_created": False,
-                    "worktree_registered": False,
-                    "lock_created": False,
-                },
-                "current_phase": PHASE_1_REQUEST_ACCEPTED,
-                "completed": False,
-            }
-
-        # Fetch current live master SHA
-        try:
-            rev_res = subprocess.run(
-                ["git", "-C", root, "rev-parse", "HEAD"],
-                capture_output=True,
-                text=True,
-                check=True,
-            )
-            live_master_sha = rev_res.stdout.strip()
-        except Exception as exc:
-            return {
-                "success": False,
-                "reason_code": "git_rev_parse_failed",
-                "message": f"Could not determine repository HEAD: {exc}",
-                "exact_next_action": "Verify repository git state and retry.",
-            }
-
-        # Phase 1: REQUEST_ACCEPTED & Concurrency Pin Check
-        if expected_base_sha:
-            exp_norm = expected_base_sha.strip().lower()
-            live_norm = live_master_sha.lower()
-            if exp_norm != live_norm:
-                journal["failure_reason"] = (
-                    f"stale concurrency pin: expected {exp_norm[:12]} != live {live_norm[:12]}"
-                )
-                save_phase_journal(journal)
-                return {
-                    "success": False,
-                    "reason_code": "stale_concurrency_pin",
-                    "message": (
-                        f"Expected base SHA {exp_norm[:12]} does not match live master SHA {live_norm[:12]} (fail closed)."
-                    ),
-                    "expected_base_sha": expected_base_sha,
-                    "live_master_sha": live_master_sha,
-                    "exact_next_action": (
-                        "Re-evaluate assignment against current live master SHA and retry with updated expected_base_sha."
-                    ),
-                }
-
-        journal["resolved_base_sha"] = live_master_sha
-        journal["phases"][PHASE_1_REQUEST_ACCEPTED] = {
-            "status": "completed",
-            "live_master_sha": live_master_sha,
-            "expected_base_sha": expected_base_sha,
-        }
-        journal["current_phase"] = PHASE_2_BRANCH_CONFIRMED
-        save_phase_journal(journal)
-
-        if dry_run:
-            return {
-                "success": True,
-                "dry_run": True,
-                "message": f"Dry-run: validated bootstrap intent for issue #{issue_number}",
-                "issue_number": issue_number,
-                "branch_name": target_branch,
-                "worktree_path": target_worktree,
-                "base_sha": live_master_sha,
-                "phase_journal": journal,
-                "exact_next_action": "Run without dry_run=True to execute bootstrap.",
-            }
-
-        # Phase 2: BRANCH_CONFIRMED
-        was_branch_created_previously = journal["artifacts_created"].get("branch_created", False)
-        branch_check = subprocess.run(
-            ["git", "-C", root, "rev-parse", "--verify", target_branch],
-            capture_output=True,
-            text=True,
-            check=False,
-        )
-        if branch_check.returncode == 0:
-            branch_head = branch_check.stdout.strip()
-            # Verify branch head descends from base
-            anc_check = subprocess.run(
-                [
-                    "git",
-                    "-C",
-                    root,
-                    "merge-base",
-                    "--is-ancestor",
-                    live_master_sha,
-                    branch_head,
-                ],
-                capture_output=True,
-                text=True,
-                check=False,
-            )
-            if anc_check.returncode != 0 and branch_head.lower() != live_master_sha.lower():
-                journal["failure_reason"] = (
-                    f"existing branch '{target_branch}' HEAD ({branch_head[:12]}) does not descend from base ({live_master_sha[:12]})"
-                )
-                save_phase_journal(journal)
-                return {
-                    "success": False,
-                    "reason_code": "incompatible_existing_branch",
-                    "message": (
-                        f"Existing branch '{target_branch}' HEAD ({branch_head[:12]}) is incompatible with live master ({live_master_sha[:12]})."
-                    ),
-                    "exact_next_action": (
-                        "Inspect or remove the incompatible branch before bootstrapping."
-                    ),
-                }
-            # Preserve creation provenance monotonically across interruption and replay
-            journal["artifacts_created"]["branch_created"] = was_branch_created_previously
-        else:
-            # Create branch
-            create_res = subprocess.run(
-                ["git", "-C", root, "branch", target_branch, live_master_sha],
-                capture_output=True,
-                text=True,
-                check=False,
-            )
-            if create_res.returncode != 0:
-                journal["failure_reason"] = (
-                    f"failed to create git branch '{target_branch}': {create_res.stderr.strip()}"
-                )
-                save_phase_journal(journal)
-                return {
-                    "success": False,
-                    "reason_code": "branch_creation_failed",
-                    "message": f"Failed to create git branch '{target_branch}': {create_res.stderr.strip()}",
-                    "exact_next_action": "Verify branch availability and retry.",
-                }
-            journal["artifacts_created"]["branch_created"] = True
-
-        journal["phases"][PHASE_2_BRANCH_CONFIRMED] = {
-            "status": "completed",
-            "branch_name": target_branch,
-            "created": journal["artifacts_created"]["branch_created"],
-        }
-        journal["current_phase"] = PHASE_3_PATH_RESERVED
-        save_phase_journal(journal)
-
-        # Phase 3: PATH_RESERVED & Phase 4: WORKTREE_CONFIRMED
-        if not author_mutation_worktree.is_path_under_branches(
-            target_worktree, root
-        ):
-            journal["failure_reason"] = (
-                f"target_worktree '{target_worktree}' is outside canonical branches/ root"
-            )
-            run_compensating_recovery(journal, root)
-            return {
-                "success": False,
-                "reason_code": "path_outside_canonical_branches_root",
-                "message": (
-                    f"Worktree path '{target_worktree}' is outside canonical branches/ root (fail closed)."
-                ),
-                "exact_next_action": (
-                    "Provide a worktree_path inside canonical branches/ root, e.g., 'branches/issue-...'"
-                ),
-            }
-
-        was_dir_created_previously = journal["artifacts_created"].get("worktree_dir_created", False)
-        was_registered_previously = journal["artifacts_created"].get("worktree_registered", False)
-
-        dir_exists = os.path.exists(target_worktree)
-        if dir_exists:
-            # Check porcelain directly
-            porc_res = subprocess.run(
-                ["git", "-C", target_worktree, "status", "--porcelain"],
-                capture_output=True,
-                text=True,
-                check=False,
-            )
-            dirty = (
-                parse_dirty_tracked_files(porc_res.stdout)
-                if porc_res.returncode == 0
-                else []
-            )
-            if dirty or (porc_res.returncode == 0 and porc_res.stdout.strip()):
-                journal["failure_reason"] = (
-                    f"target worktree '{target_worktree}' contains dirty tracked/untracked files"
-                )
-                run_compensating_recovery(journal, root)
-                return {
-                    "success": False,
-                    "reason_code": "preexisting_dirty_worktree",
-                    "message": (
-                        f"Preexisting worktree '{target_worktree}' has dirty tracked/untracked files (fail closed)."
-                    ),
-                    "exact_next_action": (
-                        "Clean or stash the pre-existing worktree files before bootstrapping."
-                    ),
-                }
-
-            # Check registered branch
-            wt_state = issue_lock_worktree.read_worktree_git_state(target_worktree)
-            wt_branch = (wt_state.get("current_branch") or "").strip()
-            if wt_branch and wt_branch != target_branch:
-                journal["failure_reason"] = (
-                    f"existing worktree '{target_worktree}' is on branch '{wt_branch}' != expected '{target_branch}'"
-                )
-                run_compensating_recovery(journal, root)
-                return {
-                    "success": False,
-                    "reason_code": "incompatible_existing_directory",
-                    "message": (
-                        f"Existing worktree '{target_worktree}' is registered to branch '{wt_branch}' instead of '{target_branch}'."
-                    ),
-                    "exact_next_action": (
-                        "Inspect or remove the pre-existing worktree folder before bootstrapping."
-                    ),
-                }
-            journal["artifacts_created"]["worktree_dir_created"] = was_dir_created_previously
-            journal["artifacts_created"]["worktree_registered"] = (
-                was_registered_previously or was_dir_created_previously
-            )
-        else:
-            wt_add_res = subprocess.run(
-                [
-                    "git",
-                    "-C",
-                    root,
-                    "worktree",
-                    "add",
-                    target_worktree,
-                    target_branch,
-                ],
-                capture_output=True,
-                text=True,
-                check=False,
-            )
-            if wt_add_res.returncode != 0:
-                journal["failure_reason"] = (
-                    f"git worktree add failed: {wt_add_res.stderr.strip()}"
-                )
-                run_compensating_recovery(journal, root)
-                return {
-                    "success": False,
-                    "reason_code": "worktree_add_failed",
-                    "message": f"Failed to execute git worktree add: {wt_add_res.stderr.strip()}",
-                    "exact_next_action": "Verify git worktree capabilities and retry.",
-                }
-            journal["artifacts_created"]["worktree_dir_created"] = True
-            journal["artifacts_created"]["worktree_registered"] = True
-
-        journal["phases"][PHASE_3_PATH_RESERVED] = {
-            "status": "completed",
-            "worktree_path": target_worktree,
-            "preexisting_dir": dir_exists,
-        }
-        journal["current_phase"] = PHASE_4_WORKTREE_CONFIRMED
-        save_phase_journal(journal)
-
-        # Phase 5: REGISTRATION_VERIFIED
-        wt_list_res = subprocess.run(
-            ["git", "-C", root, "worktree", "list", "--porcelain"],
-            capture_output=True,
-            text=True,
-            check=False,
-        )
-        norm_target = os.path.realpath(target_worktree)
-        found_registration = False
-        if wt_list_res.returncode == 0:
-            for block in wt_list_res.stdout.split("\n\n"):
-                lines = block.strip().splitlines()
-                worktree_line = next(
-                    (l[9:].strip() for l in lines if l.startswith("worktree ")),
-                    None,
-                )
-                if worktree_line and os.path.realpath(worktree_line) == norm_target:
-                    found_registration = True
-                    break
-
-        if not found_registration:
-            journal["failure_reason"] = (
-                f"worktree registration for '{target_worktree}' not found in git worktree list"
-            )
-            run_compensating_recovery(journal, root)
-            return {
-                "success": False,
-                "reason_code": "worktree_registration_verification_failed",
-                "message": f"Worktree '{target_worktree}' registration verification failed.",
-                "exact_next_action": "Check git worktree list integrity and retry.",
-            }
-
-        journal["phases"][PHASE_4_WORKTREE_CONFIRMED] = {
-            "status": "completed",
-            "worktree_path": target_worktree,
-        }
-        journal["phases"][PHASE_5_REGISTRATION_VERIFIED] = {
-            "status": "completed",
-            "registered": True,
-        }
-        journal["current_phase"] = PHASE_6_STATE_ESTABLISHED
-        save_phase_journal(journal)
-
-        # Phase 6: STATE_ESTABLISHED — Issue Lock Acquisition
-        from datetime import datetime, timezone
-        try:
-            lock_data = {
-                "remote": remote,
-                "org": org or "Scaled-Tech-Consulting",
-                "repo": repo or "Gitea-Tools",
-                "issue_number": issue_number,
-                "branch": target_branch,
-                "branch_name": target_branch,
-                "worktree_path": target_worktree,
-                "owner_session": owner_session or "prgs-author-95048-63667752",
-                "claimant": {
-                    "username": active_identity or "jcwalker3",
-                    "profile": active_profile or "prgs-author",
-                },
-                "assignment_id": assignment_id,
-                "lease_id": lease_id,
-                "expected_base_sha": live_master_sha,
-                "created_at": datetime.now(timezone.utc).isoformat(),
-            }
-            lock_res = issue_lock_store.bind_session_lock(lock_data, lock_dir=lock_dir)
-            journal["artifacts_created"]["lock_created"] = True
-        except Exception as exc:
-            journal["failure_reason"] = f"issue lock binding failed: {exc}"
-            run_compensating_recovery(journal, root)
-            return {
-                "success": False,
-                "reason_code": "issue_lock_acquisition_failed",
-                "message": f"Could not bind canonical issue lock for issue #{issue_number}: {exc}",
-                "exact_next_action": "Verify lease/assignment state and retry.",
-            }
-
-        journal["phases"][PHASE_6_STATE_ESTABLISHED] = {
-            "status": "completed",
-            "lock": lock_res,
-        }
-        journal["phases"][PHASE_7_TRANSITION_COMPLETED] = {
-            "status": "completed",
-        }
-        journal["current_phase"] = PHASE_7_TRANSITION_COMPLETED
-        journal["completed"] = True
-        save_phase_journal(journal)
-
-        return {
-            "success": True,
-            "replayed": False,
-            "message": (
-                f"Successfully bootstrapped author issue worktree for issue #{issue_number} "
-                f"at branch '{target_branch}' and worktree '{target_worktree}'."
-            ),
-            "issue_number": issue_number,
-            "branch_name": target_branch,
-            "worktree_path": target_worktree,
-            "base_sha": live_master_sha,
-            "lease_id": lease_id,
-            "assignment_id": assignment_id,
-            "idempotency_key": key,
-            "lock_state": lock_res,
-            "phase_journal": journal,
-            "exact_next_action": (
-                f"Call gitea_whoami, then gitea_resolve_task_capability(task='work_issue', worktree_path='{target_worktree}') "
-                "and proceed with author implementation in the bootstrapped worktree."
-            ),
-        }

author_mutation_worktree.py

@@ -40,41 +40,21 @@ def _normalize_path(path: str) -> str:
     return (path or "").replace("\\", "/").rstrip("/")
 
 
-def get_canonical_branches_root(project_root: str | None = None) -> str:
-    """Resolve the exact canonical branches root directory for the repository."""
-    if project_root:
-        root = os.path.realpath(project_root)
-    else:
-        root = os.path.realpath(os.getcwd())
-
-    norm = root.replace("\\", "/")
-    if "/branches/" in norm:
-        base_part = norm.split("/branches/")[0]
-        return os.path.realpath(os.path.join(base_part, "branches"))
-    elif norm.endswith("/branches"):
-        return os.path.realpath(norm)
-
-    return os.path.realpath(os.path.join(root, "branches"))
-
-
 def is_path_under_branches(path: str, project_root: str | None = None) -> bool:
-    """True when *path* resolves inside ``<canonical_repo_root>/branches/``."""
-    if not path or not str(path).strip():
+    """True when *path* resolves inside ``<project_root>/branches/``."""
+    normalized = _normalize_path(path)
+    if not normalized:
         return False
-    try:
-        real_path = os.path.realpath(os.path.abspath(str(path).strip()))
-    except Exception:
-        return False
-
-    branches_root = get_canonical_branches_root(project_root)
-
-    if real_path == branches_root:
+    if "/branches/" in f"{normalized}/":
         return True
-
-    prefix = branches_root + os.sep
-    if real_path.startswith(prefix):
+    if normalized.endswith("/branches"):
         return True
-
+    if project_root:
+        root = _normalize_path(os.path.realpath(project_root))
+        real = _normalize_path(os.path.realpath(path))
+        if real.startswith(f"{root}/"):
+            rel = real[len(root) + 1 :]
+            return rel == "branches" or rel.startswith("branches/")
     return False
 
 

create_issue_bootstrap.py

@@ -247,8 +247,7 @@ def bootstrap_permits_control_checkout(
     """
     if not isinstance(assessment, dict):
         return False
-    import author_issue_bootstrap
-    if not is_create_issue_task(task) and not author_issue_bootstrap.is_author_issue_bootstrap_task(task):
+    if not is_create_issue_task(task):
         return False
 
     # Positive proof: the assessment must affirmatively allow, with no

docs/mcp-tool-inventory.md

@@ -69,7 +69,6 @@ that gates each call, not which tools exist.
 - `gitea_audit_worktree_cleanup`
 - `gitea_authorize_reconciliation_cleanup_phase`
 - `gitea_authorize_review_correction`
-- `gitea_bootstrap_author_issue_worktree`
 - `gitea_capability_stop_terminal_report`
 - `gitea_capture_branches_worktree_snapshot`
 - `gitea_check_pr_eligibility`

gitea_mcp_server.py

@@ -958,32 +958,6 @@ def _create_issue_bootstrap_assessment(
     """
     import create_issue_bootstrap as _cib
 
-    import author_issue_bootstrap as _aib
-    if _aib.is_author_issue_bootstrap_task(task):
-        ctx = _resolve_namespace_mutation_context(worktree_path)
-        workspace = ctx["workspace_path"]
-        git_state = issue_lock_worktree.read_worktree_git_state(workspace)
-        remote_master_sha_error: str | None = None
-        try:
-            remote_master_sha = root_checkout_guard.resolve_remote_master_sha(
-                ctx["canonical_repo_root"]
-            )
-        except Exception as exc:
-            remote_master_sha = None
-            remote_master_sha_error = (
-                f"{type(exc).__name__}: {exc}".strip() or "resolver failed"
-            )
-        return _aib.assess_author_issue_bootstrap(
-            workspace_path=workspace,
-            canonical_repo_root=ctx["canonical_repo_root"],
-            current_branch=git_state.get("current_branch"),
-            head_sha=git_state.get("head_sha"),
-            porcelain_status=git_state.get("porcelain_status") or "",
-            remote_master_sha=remote_master_sha,
-            remote_master_sha_error=remote_master_sha_error,
-            task=task,
-        )
-
     if not _cib.is_create_issue_task(task):
         return None
 
@@ -9369,96 +9343,6 @@ def gitea_publish_unpublished_issue_branch(
     }
 
 
-@mcp.tool()
-def gitea_bootstrap_author_issue_worktree(
-    issue_number: int,
-    assignment_id: str | None = None,
-    lease_id: str | None = None,
-    expected_base_sha: str | None = None,
-    branch_name: str | None = None,
-    worktree_path: str | None = None,
-    idempotency_key: str | None = None,
-    remote: str = "dadeschools",
-    host: str | None = None,
-    org: str | None = None,
-    repo: str | None = None,
-    dry_run: bool = False,
-) -> dict:
-    """Bootstrap an allocated author issue branch and registered worktree (#850).
-
-    Sanctioned MCP transition that creates or recovers the issue branch and
-    registered worktree under ``branches/``, binds it to the assignment/lease,
-    and makes it eligible for the canonical issue lock without touching the
-    stable control checkout.
-
-    Args:
-        issue_number: Allocated issue number to bootstrap.
-        assignment_id: Optional allocation assignment ID.
-        lease_id: Optional workflow lease ID.
-        expected_base_sha: Authoritative expected base SHA / concurrency pin.
-        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.
-        remote: Known instance — 'dadeschools' or 'prgs'.
-        host: Override Gitea host.
-        org: Override Org.
-        repo: Override Repo.
-        dry_run: Report planned transition without mutating repository.
-    """
-    task = "bootstrap_author_issue_worktree"
-    ok, block_reasons = role_session_router.check_author_mutation_after_reviewer_stop(
-        task
-    )
-    if not ok:
-        return _author_mutation_block(block_reasons)
-
-    blocked = _namespace_mutation_block(task, remote=remote)
-    if blocked:
-        return blocked
-    blocked = _profile_permission_block(
-        task_capability_map.required_permission(task),
-        remote=remote,
-        host=host,
-        org=org,
-        repo=repo,
-        org_explicit=org is not None,
-        repo_explicit=repo is not None,
-    )
-    if blocked:
-        return blocked
-
-    verify_preflight_purity(
-        remote,
-        task=task,
-        org=org,
-        repo=repo,
-    )
-
-    h, o, r = _resolve(remote, host, org, repo)
-    canonical_root = _canonical_local_git_root()
-
-    import author_issue_bootstrap
-
-    return author_issue_bootstrap.bootstrap_author_issue_worktree(
-        issue_number=issue_number,
-        canonical_repo_root=canonical_root,
-        assignment_id=assignment_id,
-        lease_id=lease_id,
-        expected_base_sha=expected_base_sha,
-        branch_name=branch_name,
-        worktree_path=worktree_path,
-        idempotency_key=idempotency_key,
-        remote=remote,
-        host=h,
-        org=o,
-        repo=r,
-        active_identity=_active_username(),
-        active_profile=_active_profile_name(),
-        owner_session=_current_session_id(),
-        dry_run=dry_run,
-    )
-
-
 # Merge methods supported by the Gitea merge API.
 _MERGE_METHODS = ("merge", "squash", "rebase")
 
@@ -19319,12 +19203,6 @@ def gitea_resolve_task_capability(
     task: str,
     remote: str = "dadeschools",
     host: str | None = None,
-    org: str | None = None,
-    repo: str | None = None,
-    issue_number: int | None = None,
-    worktree_path: str | None = None,
-    pr_number: int | None = None,
-    **kwargs: Any,
 ) -> dict:
     """Read-only / side-effect free: resolve capability, profile, and namespace for a task.
 
@@ -19341,17 +19219,13 @@ def gitea_resolve_task_capability(
         remote: Known remote instance name.
         host: Optional override for the Gitea host.
     """
-    import importlib
-    importlib.reload(task_capability_map)
-    importlib.reload(role_session_router)
-    task_key = task_capability_map._canonical_preflight_task(task)
     TASK_MAP = task_capability_map.TASK_CAPABILITY_MAP
     # Every fresh attempt invalidates the previous task/role stamp before any
     # fallible resolver work. Unknown/malformed tasks and unexpected failures
     # therefore remain fail-closed instead of preserving stale authority.
     _clear_resolved_capability_stamp()
 
-    if task_key not in TASK_MAP:
+    if task not in TASK_MAP:
         # #723: structured fail-closed unknown_task (never raise into internal_error).
         profile = get_profile()
         h = host or (REMOTES.get(remote, {}).get("host") if remote in REMOTES else None)
@@ -19397,8 +19271,8 @@ def gitea_resolve_task_capability(
             result["cleared_stale_denial"] = True
         return result
 
-    required_permission = task_capability_map.required_permission(task_key)
-    required_role = task_capability_map.required_role(task_key)
+    required_permission = task_capability_map.required_permission(task)
+    required_role = task_capability_map.required_role(task)
     role_exclusive_tasks = task_capability_map.ROLE_EXCLUSIVE_TASKS
 
     infra_assessment = role_session_router.assess_infra_stop(PROJECT_ROOT)
@@ -19584,10 +19458,7 @@ def gitea_resolve_task_capability(
     available_in_session = allowed_in_current_session
     runtime_stale_blocker = False
 
-    if (
-        "PYTEST_CURRENT_TEST" not in os.environ
-        or "GITEA_FORCE_MCP_RUNTIME_CHECK" in os.environ
-    ) and os.environ.get("GITEA_ALLOW_STALE_RUNTIME") != "1":
+    if "PYTEST_CURRENT_TEST" not in os.environ or "GITEA_FORCE_MCP_RUNTIME_CHECK" in os.environ:
         runtime_reasons = _check_mcp_runtimes_diagnostics(task, matching_profiles)
         if runtime_reasons:
             restart_required = True

pr_work_lease.py

@@ -228,25 +228,74 @@ def find_active_reviewer_lease(
     return None
 
 
+def _conflict_fix_chain_key(lease: dict) -> tuple | None:
+    """Identity of the lease chain a conflict-fix marker belongs to (#842).
+
+    Keyed by PR number, profile, head_before, and branch. Returns None when any
+    required component (pr_number, profile, head_before) is missing or malformed.
+    """
+    raw = lease.get("raw_fields") or {}
+    pr_number = lease.get("pr_number")
+    profile = (lease.get("profile") or "").strip().lower()
+    head_before = lease.get("head_before")
+    branch = (lease.get("branch") or raw.get("branch") or "").strip()
+    if not (pr_number and profile and head_before):
+        return None
+    return (pr_number, profile, head_before, branch)
+
+
+def _conflict_fix_chain_matches(key1: tuple, key2: tuple) -> bool:
+    """True when two conflict-fix chain keys refer to the same lease chain."""
+    pr1, profile1, head1, branch1 = key1
+    pr2, profile2, head2, branch2 = key2
+    if pr1 != pr2 or profile1 != profile2 or head1 != head2:
+        return False
+    if branch1 and branch2 and branch1 != branch2:
+        return False
+    return True
+
+
+def _conflict_fix_chain_terminated_after(entries: list[dict], index: int) -> bool:
+    """True when a later marker terminates the conflict-fix chain of ``entries[index]``.
+
+    Append-only newest-wins: a terminal marker (phase=released/blocked/done)
+    ends only its matching claim chain (#842).
+    """
+    key = _conflict_fix_chain_key(entries[index])
+    if key is None:
+        return False
+    for later in entries[index + 1:]:
+        phase = (later.get("phase") or "").strip().lower()
+        if phase not in _TERMINAL_CONFLICT_FIX_PHASES:
+            continue
+        later_key = _conflict_fix_chain_key(later)
+        if later_key and _conflict_fix_chain_matches(key, later_key):
+            return True
+    return False
+
+
 def find_active_conflict_fix_lease(
     comments: list[dict],
     *,
     pr_number: int,
     now: datetime | None = None,
 ) -> dict[str, Any] | None:
-    """Return the newest unexpired conflict-fix lease for *pr_number*, if any."""
+    """Return the newest unexpired, non-terminated conflict-fix lease for *pr_number*, if any."""
     now = now or datetime.now(timezone.utc)
     candidates = [
         entry for entry in _comment_entries(comments, pr_number=pr_number)
         if entry.get("lease_kind") == "conflict_fix"
     ]
-    for lease in reversed(candidates):
+    for index in range(len(candidates) - 1, -1, -1):
+        lease = candidates[index]
         if _lease_expired(lease, now=now):
             continue
         phase = (lease.get("phase") or "").strip().lower()
         if phase in _TERMINAL_CONFLICT_FIX_PHASES:
             continue
         if phase in _ACTIVE_CONFLICT_FIX_PHASES or phase:
+            if _conflict_fix_chain_terminated_after(candidates, index):
+                continue
             return lease
     return None
 

role_session_router.py

@@ -73,8 +73,6 @@ AUTHOR_TASKS = frozenset({
     "claim_issue",
     "create_branch",
     "push_branch",
-    "bootstrap_author_issue_worktree",
-    "gitea_bootstrap_author_issue_worktree",
     "create_pr",
     "comment_pr",
     "address_pr_change_requests",

task_capability_map.py

@@ -58,14 +58,6 @@ TASK_CAPABILITY_MAP: dict[str, dict[str, str]] = {
         "permission": "gitea.branch.create",
         "role": "author",
     },
-    "bootstrap_author_issue_worktree": {
-        "permission": "gitea.branch.create",
-        "role": "author",
-    },
-    "gitea_bootstrap_author_issue_worktree": {
-        "permission": "gitea.branch.create",
-        "role": "author",
-    },
     "push_branch": {
         "permission": "gitea.branch.push",
         "role": "author",
@@ -485,8 +477,6 @@ TASK_CAPABILITY_MAP: dict[str, dict[str, str]] = {
 # merger lease (#763).
 _PREFLIGHT_TASK_TRANSITIONS = frozenset({
     ("review_pr", "acquire_reviewer_pr_lease"),
-    ("work_issue", "bootstrap_author_issue_worktree"),
-    ("bootstrap_author_issue_worktree", "lock_issue"),
 })
 
 
@@ -533,8 +523,6 @@ ROLE_EXCLUSIVE_TASKS: frozenset[str] = frozenset(
         "gitea_release_merger_pr_lease",
         "create_branch",
         "push_branch",
-        "bootstrap_author_issue_worktree",
-        "gitea_bootstrap_author_issue_worktree",
         "publish_unpublished_branch",
         "create_pr",
         "commit_files",
@@ -560,7 +548,6 @@ ISSUE_MUTATION_TOOL_TASKS: dict[str, str] = {
     "gitea_set_issue_labels": "set_issue_labels",
     "gitea_cleanup_terminal_pr_labels": "cleanup_terminal_pr_labels",
     "gitea_create_label": "create_label",
-    "gitea_bootstrap_author_issue_worktree": "bootstrap_author_issue_worktree",
     "gitea_commit_files": "commit_files",
 }
 

tests/test_author_issue_bootstrap.py

@@ -1,354 +0,0 @@
-"""Regression test suite for native author issue worktree bootstrap (#850)."""
-
-from __future__ import annotations
-
-import json
-import os
-import shutil
-import subprocess
-import tempfile
-import unittest
-
-import author_issue_bootstrap
-import task_capability_map
-
-
-def _concurrent_bootstrap_worker(args: tuple[str, int, str, str, str, str]) -> dict:
-    repo_dir, issue_num, key, lock_dir, journal_dir, master_sha = args
-    os.environ["GITEA_BOOTSTRAP_JOURNAL_DIR"] = journal_dir
-    return author_issue_bootstrap.bootstrap_author_issue_worktree(
-        issue_number=issue_num,
-        canonical_repo_root=repo_dir,
-        expected_base_sha=master_sha,
-        idempotency_key=key,
-        lock_dir=lock_dir,
-    )
-
-
-class TestAuthorIssueBootstrap(unittest.TestCase):
-    """Test suite covering AC1-AC10 and comment #14959 specification."""
-
-    def setUp(self):
-        self.tmp_dir = tempfile.mkdtemp(prefix="test_bootstrap_")
-        self.repo_dir = os.path.join(self.tmp_dir, "repo")
-        os.makedirs(self.repo_dir)
-
-        # Initialize synthetic git repo
-        subprocess.run(["git", "init", "-b", "master"], cwd=self.repo_dir, check=True, capture_output=True)
-        subprocess.run(["git", "config", "user.name", "Test User"], cwd=self.repo_dir, check=True)
-        subprocess.run(["git", "config", "user.email", "[email protected]"], cwd=self.repo_dir, check=True)
-
-        readme = os.path.join(self.repo_dir, "README.md")
-        with open(readme, "w", encoding="utf-8") as f:
-            f.write("# Test Repo\n")
-        subprocess.run(["git", "add", "README.md"], cwd=self.repo_dir, check=True, capture_output=True)
-        subprocess.run(["git", "commit", "-m", "initial commit"], cwd=self.repo_dir, check=True, capture_output=True)
-
-        rev_res = subprocess.run(["git", "rev-parse", "HEAD"], cwd=self.repo_dir, capture_output=True, text=True, check=True)
-        self.master_sha = rev_res.stdout.strip()
-
-        self.branches_dir = os.path.join(self.repo_dir, "branches")
-        os.makedirs(self.branches_dir, exist_ok=True)
-        self.lock_dir = os.path.join(self.tmp_dir, "locks")
-        os.makedirs(self.lock_dir, exist_ok=True)
-        self.journal_dir = os.path.join(self.tmp_dir, "journals")
-        os.makedirs(self.journal_dir, exist_ok=True)
-        os.environ["GITEA_BOOTSTRAP_JOURNAL_DIR"] = self.journal_dir
-
-    def tearDown(self):
-        os.environ.pop("GITEA_BOOTSTRAP_JOURNAL_DIR", None)
-        shutil.rmtree(self.tmp_dir, ignore_errors=True)
-
-    def test_bootstrap_success_path(self):
-        """AC1/AC3/AC8: Successful bootstrap creates branch, worktree, registration, and lock proof."""
-        key = "test_key_success_1"
-        res = author_issue_bootstrap.bootstrap_author_issue_worktree(
-            issue_number=850,
-            canonical_repo_root=self.repo_dir,
-            assignment_id="asn-12345",
-            lease_id="lease-67890",
-            expected_base_sha=self.master_sha,
-            idempotency_key=key,
-            remote="prgs",
-            lock_dir=self.lock_dir,
-        )
-        self.assertTrue(res.get("success"), f"Bootstrap failed: {res}")
-        self.assertFalse(res.get("replayed"))
-        self.assertEqual(res.get("issue_number"), 850)
-        self.assertEqual(res.get("base_sha"), self.master_sha)
-        self.assertIn("branches/fix-issue-850-native-mcp-bootstrap", res.get("worktree_path"))
-
-        # Verify worktree directory exists and is registered
-        worktree_path = res["worktree_path"]
-        self.assertTrue(os.path.isdir(worktree_path))
-
-        wt_list = subprocess.run(["git", "-C", self.repo_dir, "worktree", "list"], capture_output=True, text=True, check=True)
-        self.assertIn(worktree_path, wt_list.stdout)
-
-        # Verify phase journal written
-        journal = author_issue_bootstrap.load_phase_journal(key)
-        self.assertIsNotNone(journal)
-        self.assertTrue(journal.get("completed"))
-        self.assertEqual(journal.get("current_phase"), author_issue_bootstrap.PHASE_7_TRANSITION_COMPLETED)
-
-    def test_idempotent_replay(self):
-        """Item 2: Replaying with identical key returns cached transition without duplicate creation."""
-        key = "test_key_idempotent_1"
-        res1 = author_issue_bootstrap.bootstrap_author_issue_worktree(
-            issue_number=850,
-            canonical_repo_root=self.repo_dir,
-            idempotency_key=key,
-            lock_dir=self.lock_dir,
-        )
-        self.assertTrue(res1["success"], f"res1 failed: {res1}")
-        self.assertFalse(res1.get("replayed"))
-
-        # Second call
-        res2 = author_issue_bootstrap.bootstrap_author_issue_worktree(
-            issue_number=850,
-            canonical_repo_root=self.repo_dir,
-            idempotency_key=key,
-            lock_dir=self.lock_dir,
-        )
-        self.assertTrue(res2["success"], f"res2 failed: {res2}")
-        self.assertTrue(res2.get("replayed"))
-        self.assertEqual(res1["worktree_path"], res2["worktree_path"])
-
-    def test_stale_concurrency_pin_refusal(self):
-        """Item 3: Mismatched expected base SHA fails closed without silent rebasing."""
-        stale_sha = "0000000000000000000000000000000000000000"
-        res = author_issue_bootstrap.bootstrap_author_issue_worktree(
-            issue_number=850,
-            canonical_repo_root=self.repo_dir,
-            expected_base_sha=stale_sha,
-            lock_dir=self.lock_dir,
-        )
-        self.assertFalse(res["success"])
-        self.assertEqual(res.get("reason_code"), "stale_concurrency_pin")
-        self.assertIn("exact_next_action", res)
-
-    def test_path_outside_branches_root_refusal(self):
-        """Item 6: Worktree path outside branches/ root is refused."""
-        outside_path = os.path.join(self.tmp_dir, "outside_worktree")
-        res = author_issue_bootstrap.bootstrap_author_issue_worktree(
-            issue_number=850,
-            canonical_repo_root=self.repo_dir,
-            worktree_path=outside_path,
-            lock_dir=self.lock_dir,
-        )
-        self.assertFalse(res["success"])
-        self.assertEqual(res.get("reason_code"), "path_outside_canonical_branches_root")
-
-    def test_preexisting_dirty_worktree_preservation(self):
-        """Item 6: Preexisting dirty worktree fails closed and is NOT modified or cleaned."""
-        branch = "fix/issue-850-dirty-test"
-        wt_path = os.path.join(self.branches_dir, "fix-issue-850-dirty-test")
-        subprocess.run(["git", "-C", self.repo_dir, "worktree", "add", "-b", branch, wt_path], check=True, capture_output=True)
-
-        # Create dirty untracked file
-        dirty_file = os.path.join(wt_path, "dirty.txt")
-        with open(dirty_file, "w") as f:
-            f.write("dirty edits\n")
-
-        res = author_issue_bootstrap.bootstrap_author_issue_worktree(
-            issue_number=850,
-            canonical_repo_root=self.repo_dir,
-            branch_name=branch,
-            worktree_path=wt_path,
-            lock_dir=self.lock_dir,
-        )
-        self.assertFalse(res["success"])
-        self.assertEqual(res.get("reason_code"), "preexisting_dirty_worktree")
-
-        # Prove dirty file is preserved byte-for-byte
-        self.assertTrue(os.path.exists(dirty_file))
-        with open(dirty_file, "r") as f:
-            self.assertEqual(f.read(), "dirty edits\n")
-
-    def test_compensating_recovery_on_failed_phase(self):
-        """AC4/Item 4: Failure during transition rolls back ONLY newly created artifacts."""
-        key = "test_key_recovery_1"
-        # Simulate partial progress in journal
-        journal = {
-            "idempotency_key": key,
-            "issue_number": 850,
-            "branch_name": "fix/issue-850-recovery-test",
-            "worktree_path": os.path.join(self.branches_dir, "fix-issue-850-recovery-test"),
-            "artifacts_created": {
-                "branch_created": True,
-                "worktree_dir_created": True,
-                "worktree_registered": True,
-                "lock_created": False,
-            },
-            "failure_reason": "simulated lock failure",
-            "current_phase": author_issue_bootstrap.PHASE_5_REGISTRATION_VERIFIED,
-            "completed": False,
-        }
-        # Create the branch and worktree manually to simulate partial state
-        subprocess.run(["git", "-C", self.repo_dir, "branch", journal["branch_name"]], check=True, capture_output=True)
-        subprocess.run(["git", "-C", self.repo_dir, "worktree", "add", journal["worktree_path"], journal["branch_name"]], check=True, capture_output=True)
-
-        # Run compensating recovery
-        rec = author_issue_bootstrap.run_compensating_recovery(journal, self.repo_dir)
-        self.assertTrue(rec["executed"])
-        self.assertIn(f"worktree_path:{journal['worktree_path']}", rec["rolled_back"])
-        self.assertIn(f"branch:{journal['branch_name']}", rec["rolled_back"])
-
-        # Prove worktree directory and branch were rolled back
-        self.assertFalse(os.path.exists(journal["worktree_path"]))
-        branch_check = subprocess.run(["git", "-C", self.repo_dir, "rev-parse", "--verify", journal["branch_name"]], capture_output=True, text=True, check=False)
-        self.assertNotEqual(branch_check.returncode, 0)
-
-    def test_cross_process_concurrency(self):
-        """Review #525 Finding 1: Genuine cross-process concurrency locking prevents corruption."""
-        import concurrent.futures
-
-        key = "test_concurrent_key_850"
-        args = (self.repo_dir, 850, key, self.lock_dir, self.journal_dir, self.master_sha)
-
-        with concurrent.futures.ProcessPoolExecutor(max_workers=2) as executor:
-            fut1 = executor.submit(_concurrent_bootstrap_worker, args)
-            fut2 = executor.submit(_concurrent_bootstrap_worker, args)
-            res1 = fut1.result(timeout=10)
-            res2 = fut2.result(timeout=10)
-
-        self.assertTrue(res1["success"], f"res1 failed: {res1}")
-        self.assertTrue(res2["success"], f"res2 failed: {res2}")
-        # One process performs creation, the other process receives idempotent replay
-        replayed_count = sum(1 for r in (res1, res2) if r.get("replayed"))
-        created_count = sum(1 for r in (res1, res2) if not r.get("replayed"))
-        self.assertEqual(replayed_count, 1)
-        self.assertEqual(created_count, 1)
-        self.assertEqual(res1["worktree_path"], res2["worktree_path"])
-
-    def test_interrupted_replay_preserves_artifacts_created_provenance(self):
-        """Review #525 Finding 2: Replaying incomplete journal preserves creation provenance monotonically."""
-        key = "test_key_interrupted_replay_1"
-        branch = "fix/issue-850-interrupted-replay"
-        wt_path = os.path.join(self.branches_dir, "fix-issue-850-interrupted-replay")
-
-        # Simulate Phase 2/3 completion where branch and worktree directory were created by this transition
-        journal = {
-            "idempotency_key": key,
-            "issue_number": 850,
-            "branch_name": branch,
-            "worktree_path": wt_path,
-            "active_identity": "jcwalker3",
-            "active_profile": "prgs-author",
-            "remote": "prgs",
-            "org": "Scaled-Tech-Consulting",
-            "repo": "Gitea-Tools",
-            "phases": {
-                author_issue_bootstrap.PHASE_1_REQUEST_ACCEPTED: {"status": "completed"},
-                author_issue_bootstrap.PHASE_2_BRANCH_CONFIRMED: {"status": "completed", "created": True},
-            },
-            "artifacts_created": {
-                "branch_created": True,
-                "worktree_dir_created": True,
-                "worktree_registered": True,
-                "lock_created": False,
-            },
-            "current_phase": author_issue_bootstrap.PHASE_3_PATH_RESERVED,
-            "completed": False,
-        }
-        # Pre-create the branch and worktree on disk to simulate partial state after crash
-        subprocess.run(["git", "-C", self.repo_dir, "branch", branch, self.master_sha], check=True, capture_output=True)
-        subprocess.run(["git", "-C", self.repo_dir, "worktree", "add", wt_path, branch], check=True, capture_output=True)
-        author_issue_bootstrap.save_phase_journal(journal)
-
-        # Now resume/replay the transition but simulate lock binding failure during Phase 6
-        with unittest.mock.patch("issue_lock_store.bind_session_lock", side_effect=RuntimeError("Lock failure test")):
-            res = author_issue_bootstrap.bootstrap_author_issue_worktree(
-                issue_number=850,
-                canonical_repo_root=self.repo_dir,
-                branch_name=branch,
-                worktree_path=wt_path,
-                idempotency_key=key,
-                lock_dir=self.lock_dir,
-            )
-
-        self.assertFalse(res["success"])
-        self.assertEqual(res.get("reason_code"), "issue_lock_acquisition_failed")
-
-        # Verify that compensating recovery correctly deleted transition-created branch & worktree
-        # because creation provenance was preserved across replay (NOT downgraded to False!)
-        self.assertFalse(os.path.exists(wt_path))
-        branch_check = subprocess.run(["git", "-C", self.repo_dir, "rev-parse", "--verify", branch], capture_output=True, text=True, check=False)
-        self.assertNotEqual(branch_check.returncode, 0)
-
-    def test_transition_created_only_compensation(self):
-        """Review #525 Finding 4: Preexisting branch is NOT deleted by compensation when only worktree was transition-created."""
-        key = "test_key_preexisting_branch_compensation"
-        preexisting_branch = "fix/issue-850-preexisting"
-        wt_path = os.path.join(self.branches_dir, "fix-issue-850-preexisting")
-
-        # Create branch BEFORE bootstrap (preexisting branch)
-        subprocess.run(["git", "-C", self.repo_dir, "branch", preexisting_branch, self.master_sha], check=True, capture_output=True)
-
-        # Call bootstrap with simulated failure during Phase 6 (lock binding)
-        with unittest.mock.patch("issue_lock_store.bind_session_lock", side_effect=RuntimeError("Simulated lock failure")):
-            res = author_issue_bootstrap.bootstrap_author_issue_worktree(
-                issue_number=850,
-                canonical_repo_root=self.repo_dir,
-                branch_name=preexisting_branch,
-                worktree_path=wt_path,
-                idempotency_key=key,
-                lock_dir=self.lock_dir,
-            )
-
-        self.assertFalse(res["success"])
-        # Worktree dir was created by transition -> removed by compensation
-        self.assertFalse(os.path.exists(wt_path))
-
-        # Preexisting branch was NOT created by transition -> MUST BE PRESERVED!
-        branch_check = subprocess.run(["git", "-C", self.repo_dir, "rev-parse", "--verify", preexisting_branch], capture_output=True, text=True, check=False)
-        self.assertEqual(branch_check.returncode, 0, "Preexisting branch was deleted by mistake!")
-
-    def test_incompatible_idempotency_replay_refusal(self):
-        """Review #525 Finding 4: Replaying key with incompatible parameters returns refusal."""
-        key = "test_key_incompatible_replay"
-        res1 = author_issue_bootstrap.bootstrap_author_issue_worktree(
-            issue_number=850,
-            canonical_repo_root=self.repo_dir,
-            branch_name="fix/issue-850-param-a",
-            idempotency_key=key,
-            lock_dir=self.lock_dir,
-        )
-        self.assertTrue(res1["success"])
-
-        # Second call with different branch_name
-        res2 = author_issue_bootstrap.bootstrap_author_issue_worktree(
-            issue_number=850,
-            canonical_repo_root=self.repo_dir,
-            branch_name="fix/issue-850-param-b",
-            idempotency_key=key,
-            lock_dir=self.lock_dir,
-        )
-        self.assertFalse(res2["success"])
-        self.assertEqual(res2.get("reason_code"), "incompatible_idempotency_replay")
-
-    def test_exact_next_action_satisfiable_via_mcp(self):
-        """Review #525 Finding 4: exact_next_action provides satisfiable MCP actions, not shell commands."""
-        key = "test_key_next_action_mcp"
-        stale_sha = "0000000000000000000000000000000000000000"
-        res = author_issue_bootstrap.bootstrap_author_issue_worktree(
-            issue_number=850,
-            canonical_repo_root=self.repo_dir,
-            expected_base_sha=stale_sha,
-            lock_dir=self.lock_dir,
-        )
-        next_action = res.get("exact_next_action", "")
-        self.assertNotIn("scripts/worktree-start", next_action)
-        self.assertNotIn("git worktree add", next_action)
-        self.assertNotIn("bash", next_action.lower())
-
-    def test_task_capability_map_integration(self):
-        """Verify task_capability_map has bootstrap_author_issue_worktree configured correctly."""
-        self.assertEqual(task_capability_map.required_role("bootstrap_author_issue_worktree"), "author")
-        self.assertEqual(task_capability_map.required_permission("bootstrap_author_issue_worktree"), "gitea.branch.create")
-        self.assertTrue(task_capability_map.preflight_task_matches("work_issue", "bootstrap_author_issue_worktree"))
-        self.assertTrue(task_capability_map.preflight_task_matches("bootstrap_author_issue_worktree", "lock_issue"))
-
-
-if __name__ == "__main__":
-    unittest.main()

tests/test_author_mutation_worktree.py

@@ -28,21 +28,6 @@ class TestPathUnderBranches(unittest.TestCase):
             amw.is_path_under_branches("/repo/other-checkout", self.ROOT)
         )
 
-    def test_unrelated_branches_dir_fails(self):
-        self.assertFalse(
-            amw.is_path_under_branches("/tmp/branches/evil", self.ROOT)
-        )
-
-    def test_prefix_confusion_fails(self):
-        self.assertFalse(
-            amw.is_path_under_branches(f"{self.ROOT}/branches-other/foo", self.ROOT)
-        )
-
-    def test_traversal_fails(self):
-        self.assertFalse(
-            amw.is_path_under_branches(f"{self.ROOT}/branches/../evil", self.ROOT)
-        )
-
 
 class TestAssessAuthorMutationWorktree(unittest.TestCase):
     ROOT = "/repo/Gitea-Tools"

tests/test_pr_work_lease.py

@@ -19,6 +19,7 @@ from pr_work_lease import (  # noqa: E402
     assess_reviewer_mutation_blocked,
     assess_reviewer_stale_head_final_report,
     format_conflict_fix_lease_body,
+    find_active_conflict_fix_lease,
     parse_conflict_fix_lease_comment,
     parse_reviewer_lease_comment,
 )
@@ -203,5 +204,157 @@ class TestFormatLease(unittest.TestCase):
         self.assertEqual(parsed["pr_number"], 376)
 
 
+class TestConflictFixLeaseLifecycle(unittest.TestCase):
+    def test_claim_followed_by_matching_release(self):
+        claim_body = _conflict_fix_body(phase="claimed", worktree="branches/fix-376")
+        expires = (NOW + timedelta(minutes=60)).isoformat().replace("+00:00", "Z")
+        release_body = "\n".join([
+            CONFLICT_FIX_LEASE_MARKER,
+            "pr: #376",
+            "branch: feat/fix-376",
+            "worktree: branches/fix-376",
+            "profile: prgs-author",
+            "phase: released",
+            f"head_before: {HEAD_A}",
+            f"head_after: {HEAD_B}",
+            f"expires_at: {expires}",
+        ])
+        comments = [{"body": claim_body}, {"body": release_body}]
+        lease = find_active_conflict_fix_lease(comments, pr_number=376, now=NOW)
+        self.assertIsNone(lease)
+
+    def test_expired_claim_without_release(self):
+        past_expires = (NOW - timedelta(minutes=10)).isoformat().replace("+00:00", "Z")
+        claim_body = "\n".join([
+            CONFLICT_FIX_LEASE_MARKER,
+            "pr: #376",
+            "phase: claimed",
+            f"head_before: {HEAD_A}",
+            f"expires_at: {past_expires}",
+            "profile: prgs-author",
+        ])
+        comments = [{"body": claim_body}]
+        lease = find_active_conflict_fix_lease(comments, pr_number=376, now=NOW)
+        self.assertIsNone(lease)
+
+    def test_mismatched_release_different_head(self):
+        claim_body = _conflict_fix_body(phase="claimed", worktree="branches/fix-376")
+        expires = (NOW + timedelta(minutes=60)).isoformat().replace("+00:00", "Z")
+        release_body = "\n".join([
+            CONFLICT_FIX_LEASE_MARKER,
+            "pr: #376",
+            "profile: prgs-author",
+            "phase: released",
+            f"head_before: {HEAD_B}",
+            f"expires_at: {expires}",
+        ])
+        comments = [{"body": claim_body}, {"body": release_body}]
+        lease = find_active_conflict_fix_lease(comments, pr_number=376, now=NOW)
+        self.assertIsNotNone(lease)
+        self.assertEqual(lease["phase"], "claimed")
+
+    def test_mismatched_release_different_branch(self):
+        claim_body = "\n".join([
+            CONFLICT_FIX_LEASE_MARKER,
+            "pr: #376",
+            "branch: feat/branch-A",
+            "phase: claimed",
+            f"head_before: {HEAD_A}",
+            f"expires_at: {(NOW + timedelta(minutes=60)).isoformat().replace('+00:00', 'Z')}",
+            "profile: prgs-author",
+        ])
+        release_body = "\n".join([
+            CONFLICT_FIX_LEASE_MARKER,
+            "pr: #376",
+            "branch: feat/branch-B",
+            "phase: released",
+            f"head_before: {HEAD_A}",
+            f"expires_at: {(NOW + timedelta(minutes=60)).isoformat().replace('+00:00', 'Z')}",
+            "profile: prgs-author",
+        ])
+        comments = [{"body": claim_body}, {"body": release_body}]
+        lease = find_active_conflict_fix_lease(comments, pr_number=376, now=NOW)
+        self.assertIsNotNone(lease)
+        self.assertEqual(lease["phase"], "claimed")
+
+    def test_release_followed_by_newer_claim(self):
+        claim_1 = _conflict_fix_body(phase="claimed", worktree="branches/fix-376")
+        expires = (NOW + timedelta(minutes=60)).isoformat().replace("+00:00", "Z")
+        release_1 = "\n".join([
+            CONFLICT_FIX_LEASE_MARKER,
+            "pr: #376",
+            "profile: prgs-author",
+            "phase: released",
+            f"head_before: {HEAD_A}",
+            f"head_after: {HEAD_B}",
+            f"expires_at: {expires}",
+        ])
+        claim_2 = "\n".join([
+            CONFLICT_FIX_LEASE_MARKER,
+            "pr: #376",
+            "profile: prgs-author",
+            "phase: claimed",
+            f"head_before: {HEAD_B}",
+            f"expires_at: {expires}",
+        ])
+        comments = [{"body": claim_1}, {"body": release_1}, {"body": claim_2}]
+        lease = find_active_conflict_fix_lease(comments, pr_number=376, now=NOW)
+        self.assertIsNotNone(lease)
+        self.assertEqual(lease["head_before"], HEAD_B)
+
+    def test_malformed_or_ambiguous_markers(self):
+        malformed_release = "\n".join([
+            CONFLICT_FIX_LEASE_MARKER,
+            "pr: #376",
+            "phase: released",
+            # missing head_before and profile
+        ])
+        claim_body = _conflict_fix_body(phase="claimed")
+        comments = [{"body": claim_body}, {"body": malformed_release}]
+        lease = find_active_conflict_fix_lease(comments, pr_number=376, now=NOW)
+        self.assertIsNotNone(lease)
+
+    def test_pr818_historical_sequence(self):
+        comment_14696 = "\n".join([
+            "<!-- mcp-conflict-fix-lease:v1 -->",
+            "pr: #818",
+            "branch: feat/issue-638-webui-app-shell-phase1",
+            "worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-638-webui-app-shell-phase1",
+            "profile: prgs-author",
+            "session_id: unknown",
+            "phase: claimed",
+            "head_before: 08061b7b8aebdd099a37d1abf5dafcf38e4fd3fb",
+            "expires_at: 2026-07-23T07:12:13Z",
+            "reviewer_active: no",
+        ])
+        comment_14730 = "\n".join([
+            "<!-- mcp-conflict-fix-lease:v1 -->",
+            "pr: #818",
+            "branch: feat/issue-638-webui-app-shell-phase1",
+            "worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/issue-638-webui-app-shell-phase1",
+            "profile: prgs-author",
+            "session_id: prgs-author-61241-e5129c60",
+            "phase: released",
+            "head_before: 08061b7b8aebdd099a37d1abf5dafcf38e4fd3fb",
+            "head_after: 64b6eb5d5402663098de5ded3b0617cc3b3df98f",
+            "expires_at: 2026-07-23T06:05:00Z",
+            "reviewer_active: no",
+        ])
+        comments = [{"body": comment_14696}, {"body": comment_14730}]
+        check_now = datetime(2026, 7, 23, 6, 30, tzinfo=timezone.utc)
+        lease = find_active_conflict_fix_lease(comments, pr_number=818, now=check_now)
+        self.assertIsNone(lease)
+        
+        reviewer_gate = assess_reviewer_mutation_blocked(
+            pr_number=818,
+            comments=comments,
+            reviewed_head_sha="64b6eb5d5402663098de5ded3b0617cc3b3df98f",
+            live_head_sha="64b6eb5d5402663098de5ded3b0617cc3b3df98f",
+            mutation="approve",
+            now=check_now,
+        )
+        self.assertTrue(reviewer_gate["mutation_allowed"])
+
+
 if __name__ == "__main__":
     unittest.main()

tests/test_task_capability_role_invariants.py

@@ -139,8 +139,6 @@ EXPECTED_ROLE_EXCLUSIVE_TASKS = frozenset(
         "gitea_release_merger_pr_lease",
         "create_branch",
         "push_branch",
-        "bootstrap_author_issue_worktree",
-        "gitea_bootstrap_author_issue_worktree",
         # #812 AC20: publishing an unpublished local head is author-only for the
         # same reason every other push is — it writes a branch to the remote.
         "publish_unpublished_branch",