patchrelay 0.36.6 → 0.36.8

package/dist/run-orchestrator.js

@@ -1,190 +1,23 @@
-import { randomUUID } from "node:crypto";
-import { existsSync, readFileSync } from "node:fs";
-import path from "node:path";
 import { ACTIVE_RUN_STATES, TERMINAL_STATES } from "./factory-state.js";
-import { buildHookEnv, runProjectHook } from "./hook-runner.js";
-import { buildStageReport, countEventMethods, extractTurnId, resolveRunCompletionStatus, summarizeCurrentThread, } from "./run-reporting.js";
-import { buildRunCompletedActivity, buildRunFailureActivity, buildRunStartedActivity, } from "./linear-session-reporting.js";
+import { extractTurnId, resolveRunCompletionStatus, summarizeCurrentThread } from "./run-reporting.js";
+import { buildRunFailureActivity, buildRunStartedActivity, } from "./linear-session-reporting.js";
 import { WorktreeManager } from "./worktree-manager.js";
 import { resolveAuthoritativeLinearStopState, resolvePreferredCompletedLinearState } from "./linear-workflow.js";
 import { execCommand } from "./utils.js";
 import { getThreadTurns } from "./codex-thread-utils.js";
 import { deriveIssueSessionReactiveIntent } from "./issue-session.js";
-const DEFAULT_CI_REPAIR_BUDGET = 3;
-const DEFAULT_QUEUE_REPAIR_BUDGET = 3;
-// Requested-changes loops can legitimately take more iterations than CI/queue
-// repair when the reviewer is catching nuanced product or timing bugs across
-// successive heads. Keep a hard ceiling to prevent infinite ping-pong, but make
-// it wide enough that real review cycles can continue after multiple successful
-// head advances.
-const DEFAULT_REVIEW_FIX_BUDGET = 12;
-const DEFAULT_ZOMBIE_RECOVERY_BUDGET = 5;
-const ZOMBIE_RECOVERY_BASE_DELAY_MS = 15_000; // 15s, 30s, 60s, 120s, 240s
-const ISSUE_SESSION_LEASE_MS = 10 * 60_000;
-const MAX_THREAD_GENERATION_BEFORE_COMPACTION = 4;
-const MAX_FOLLOW_UPS_BEFORE_COMPACTION = 4;
 import { QueueHealthMonitor } from "./queue-health-monitor.js";
+import { resolveImplementationDeliveryMode, } from "./prompting/patchrelay.js";
 import { IdleIssueReconciler, resolveBranchOwnerForStateTransition } from "./idle-reconciliation.js";
 import { LinearSessionSync } from "./linear-session-sync.js";
-function slugify(value) {
-    return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 60);
-}
-function sanitizePathSegment(value) {
-    return value.replace(/[^a-zA-Z0-9._-]+/g, "-");
-}
+import { IssueSessionLeaseService } from "./issue-session-lease-service.js";
+import { RunFinalizer } from "./run-finalizer.js";
+import { RunLauncher } from "./run-launcher.js";
+import { RunRecoveryService } from "./run-recovery-service.js";
+import { RunWakePlanner } from "./run-wake-planner.js";
 function lowerCaseFirst(value) {
     return value ? `${value.slice(0, 1).toLowerCase()}${value.slice(1)}` : value;
 }
-const WORKFLOW_FILES = {
-    implementation: "IMPLEMENTATION_WORKFLOW.md",
-    review_fix: "REVIEW_WORKFLOW.md",
-    branch_upkeep: "REVIEW_WORKFLOW.md",
-    ci_repair: "IMPLEMENTATION_WORKFLOW.md",
-    queue_repair: "IMPLEMENTATION_WORKFLOW.md",
-};
-function readWorkflowFile(repoPath, runType) {
-    const filename = WORKFLOW_FILES[runType];
-    const filePath = path.join(repoPath, filename);
-    if (!existsSync(filePath))
-        return undefined;
-    return readFileSync(filePath, "utf8").trim();
-}
-function collectImplementationInstructionText(issue, context, promptText) {
-    const parts = [];
-    if (issue.title)
-        parts.push(issue.title);
-    if (issue.description)
-        parts.push(issue.description);
-    if (promptText)
-        parts.push(promptText);
-    const stringFields = ["promptContext", "promptBody", "operatorPrompt", "userComment"];
-    for (const field of stringFields) {
-        const value = context?.[field];
-        if (typeof value === "string" && value.trim()) {
-            parts.push(value);
-        }
-    }
-    if (Array.isArray(context?.followUps)) {
-        for (const entry of context.followUps) {
-            if (!entry || typeof entry !== "object")
-                continue;
-            const text = entry.text;
-            if (typeof text === "string" && text.trim()) {
-                parts.push(text);
-            }
-        }
-    }
-    return parts.join("\n").toLowerCase();
-}
-export function resolveImplementationDeliveryMode(issue, context, promptText) {
-    const instructionText = collectImplementationInstructionText(issue, context, promptText);
-    if (!instructionText)
-        return "publish_pr";
-    const hasExplicitNoPr = [
-        /\bdo not open (?:a |any )?pr\b/,
-        /\bdo not open (?:a |any )?pull request\b/,
-        /\bno pr is opened\b/,
-        /\bpatchrelay should not open a pr\b/,
-        /\bwithout opening a pr\b/,
-    ].some((pattern) => pattern.test(instructionText));
-    const forbidsRepoChanges = [
-        /\bdo not make repository changes\b/,
-        /\bdo not make repo changes\b/,
-        /\bno repository changes\b/,
-        /\bno repo changes\b/,
-        /\bdo not modify repo files\b/,
-    ].some((pattern) => pattern.test(instructionText));
-    const planningOnly = [
-        /\bplanning\/specification issue only\b/,
-        /\bplanning[- ]only\b/,
-        /\bspecification[- ]only\b/,
-        /\bplanning issue only\b/,
-    ].some((pattern) => pattern.test(instructionText));
-    if (hasExplicitNoPr || (planningOnly && forbidsRepoChanges)) {
-        return "linear_only";
-    }
-    return "publish_pr";
-}
-function appendPublicationContract(lines, runType, issue, context) {
-    const deliveryMode = runType === "implementation" && issue
-        ? resolveImplementationDeliveryMode(issue, context)
-        : "publish_pr";
-    if (runType === "implementation" && deliveryMode === "linear_only") {
-        lines.push("## Delivery Requirements", "");
-        lines.push("This issue is planning/specification only.", "Do not modify repo files or open a PR for this issue.", "Deliver the result through Linear artifacts such as follow-up issues, documents, and a concise summary.", "Leave the worktree clean before stopping.", "");
-        return;
-    }
-    lines.push("## Publication Requirements", "");
-    if (runType === "implementation") {
-        lines.push("Before finishing, publish the result instead of leaving it only in the worktree.", "If the worktree already contains relevant changes for this issue, verify them and publish them.", "If you changed files for this issue, commit them, push the issue branch, and open or update the PR before stopping.", "Do not stop with only local commits or uncommitted changes.", "");
-        return;
-    }
-    lines.push("Before finishing, publish the result to the existing PR branch.", "If you changed files for this repair, commit them and push the same branch before stopping.", "Do not open a new PR.", "Do not stop with only local commits or uncommitted changes.", "");
-}
-function buildPromptHeader(issue) {
-    return [
-        `Issue: ${issue.issueKey ?? issue.linearIssueId}`,
-        issue.title ? `Title: ${issue.title}` : undefined,
-        issue.branchName ? `Branch: ${issue.branchName}` : undefined,
-        issue.prNumber ? `PR: #${issue.prNumber}` : undefined,
-        "",
-    ].filter(Boolean);
-}
-function appendTaskObjective(lines, issue) {
-    const description = issue.description?.trim();
-    lines.push("## Task Objective", "");
-    lines.push(issue.title || `Complete ${issue.issueKey ?? issue.linearIssueId}.`);
-    if (description) {
-        lines.push("", description);
-    }
-    lines.push("");
-}
-function extractIssueSection(description, heading) {
-    if (!description)
-        return undefined;
-    const escaped = heading.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const pattern = new RegExp(`^## ${escaped}\\s*$([\\s\\S]*?)(?=^##\\s+|$)`, "im");
-    const match = description.match(pattern);
-    const body = match?.[1]?.trim();
-    return body && body.length > 0 ? body : undefined;
-}
-function appendScopeDiscipline(lines, issue) {
-    const description = issue.description?.trim();
-    const scope = extractIssueSection(description, "Scope");
-    const acceptance = extractIssueSection(description, "Acceptance criteria")
-        ?? extractIssueSection(description, "Success criteria");
-    const relevantCode = extractIssueSection(description, "Relevant code");
-    lines.push("## Scope Discipline", "");
-    lines.push("Stay inside the delegated task.", "Finish the issue completely enough to satisfy its stated scope and acceptance criteria, but do not widen it into unrelated product polish or follow-up cleanup.", "Only broaden to adjacent routes, copy, or supporting surfaces when the issue text or repository guidance explicitly says they are the same user flow.", "If you notice a worthwhile broader inconsistency that is not required to make this task correct, mention it in your summary as follow-up context instead of expanding the implementation.", "");
-    if (scope) {
-        lines.push("### In Scope", "", scope, "");
-    }
-    if (acceptance) {
-        lines.push("### Acceptance / Done", "", acceptance, "");
-    }
-    if (relevantCode) {
-        lines.push("### Relevant Code", "", relevantCode, "");
-    }
-    lines.push("### Likely Review Invariants", "", "- Check the surfaces explicitly named in the task before stopping.", "- If repository guidance says certain changed surfaces are one flow, verify that shared flow, but do not treat unrelated surrounding cleanup as part of this task.", "- A review repair should fix the concrete concern on the current head, not silently expand the Linear issue into a broader rewrite.", "");
-}
-function appendLinearContext(lines, context) {
-    const promptContext = typeof context?.promptContext === "string" ? context.promptContext.trim() : "";
-    const latestPrompt = typeof context?.promptBody === "string" ? context.promptBody.trim() : "";
-    const operatorPrompt = typeof context?.operatorPrompt === "string" ? context.operatorPrompt.trim() : "";
-    const userComment = typeof context?.userComment === "string" ? context.userComment.trim() : "";
-    if (promptContext) {
-        lines.push("## Linear Session Context", "", promptContext, "");
-    }
-    if (latestPrompt) {
-        lines.push("## Latest Human Instruction", "", latestPrompt, "");
-    }
-    if (operatorPrompt) {
-        lines.push("## Operator Prompt", "", operatorPrompt, "");
-    }
-    if (userComment) {
-        lines.push("## Human Follow-up Comment", "", userComment, "");
-    }
-}
 function isRequestedChangesRunType(runType) {
     return runType === "review_fix" || runType === "branch_upkeep";
 }
@@ -196,341 +29,6 @@ function resolveRequestedChangesMode(runType, context) {
         ? "branch_upkeep"
         : "address_review_feedback";
 }
-function readReviewFixComments(context) {
-    const raw = context?.reviewComments;
-    if (!Array.isArray(raw)) {
-        return [];
-    }
-    const comments = [];
-    for (const entry of raw) {
-        if (!entry || typeof entry !== "object")
-            continue;
-        const record = entry;
-        const body = typeof record.body === "string" ? record.body.trim() : "";
-        if (!body)
-            continue;
-        comments.push({
-            body,
-            ...(typeof record.path === "string" ? { path: record.path } : {}),
-            ...(typeof record.line === "number" ? { line: record.line } : {}),
-            ...(typeof record.side === "string" ? { side: record.side } : {}),
-            ...(typeof record.startLine === "number" ? { startLine: record.startLine } : {}),
-            ...(typeof record.startSide === "string" ? { startSide: record.startSide } : {}),
-            ...(typeof record.url === "string" ? { url: record.url } : {}),
-            ...(typeof record.authorLogin === "string" ? { authorLogin: record.authorLogin } : {}),
-        });
-    }
-    return comments;
-}
-function appendStructuredReviewContext(lines, context) {
-    const reviewId = typeof context?.reviewId === "number" ? context.reviewId : undefined;
-    const reviewCommitId = typeof context?.reviewCommitId === "string" ? context.reviewCommitId : undefined;
-    const reviewUrl = typeof context?.reviewUrl === "string" ? context.reviewUrl : undefined;
-    const reviewComments = readReviewFixComments(context);
-    if (!reviewId && !reviewCommitId && !reviewUrl && reviewComments.length === 0) {
-        return;
-    }
-    lines.push("## Structured Review Context", "");
-    if (reviewId !== undefined) {
-        lines.push(`Review ID: ${reviewId}`);
-    }
-    if (reviewCommitId) {
-        lines.push(`Reviewed commit: ${reviewCommitId}`);
-    }
-    if (reviewUrl) {
-        lines.push(`Review URL: ${reviewUrl}`);
-    }
-    if (reviewComments.length === 0) {
-        lines.push("No inline review comments were captured for this review.", "");
-        return;
-    }
-    lines.push(`Inline review comments captured: ${reviewComments.length}`, "Resolve each comment below or verify it is already fixed on the current head before you stop.", "A requested-changes turn is only complete if you push a newer PR head or deliberately escalate because you are blocked.", "");
-    for (const comment of reviewComments) {
-        const location = comment.path
-            ? `${comment.path}${comment.line !== undefined ? `:${comment.line}` : ""}${comment.side ? ` (${comment.side})` : ""}`
-            : "general";
-        lines.push(`- ${location}`);
-        lines.push(comment.body);
-        if (comment.url) {
-            lines.push(`  URL: ${comment.url}`);
-        }
-    }
-    lines.push("");
-}
-function collectFollowUpInputs(context) {
-    const followUps = Array.isArray(context?.followUps) ? context.followUps : [];
-    const inputs = [];
-    for (const entry of followUps) {
-        const followUp = entry && typeof entry === "object" ? entry : undefined;
-        const type = typeof followUp?.type === "string" ? followUp.type : "followup";
-        const author = typeof followUp?.author === "string" ? followUp.author : undefined;
-        const text = typeof followUp?.text === "string" ? followUp.text.trim() : "";
-        if (!text)
-            continue;
-        inputs.push({ type, text, ...(author ? { author } : {}) });
-    }
-    return inputs;
-}
-function resolveFollowUpWhy(runType, context) {
-    const wakeReason = typeof context?.wakeReason === "string" ? context.wakeReason : undefined;
-    switch (wakeReason) {
-        case "direct_reply":
-            return "A human reply arrived for the outstanding question from the previous turn.";
-        case "followup_prompt":
-            return "A new Linear agent prompt arrived after the previous turn.";
-        case "followup_comment":
-            return "A human follow-up comment arrived after the previous turn.";
-        case "operator_prompt":
-            return "An operator supplied new guidance for this issue.";
-        case "review_changes_requested":
-            return "GitHub review requested changes on the current PR head.";
-        case "branch_upkeep":
-            return "GitHub still shows the PR branch as needing upkeep after the requested code change was addressed.";
-        case "settled_red_ci":
-            return "Required CI settled red for the current PR head.";
-        case "merge_steward_incident":
-            return "Merge Steward reported an incident on the current PR head.";
-        case "delegated":
-            return runType === "implementation"
-                ? "This is the first implementation turn for the delegated issue."
-                : `This turn continues ${runType.replaceAll("_", " ")} work for the delegated issue.`;
-        default:
-            if (isRequestedChangesRunType(runType)) {
-                return resolveRequestedChangesMode(runType, context) === "branch_upkeep"
-                    ? "This turn continues branch upkeep on the existing PR after requested changes."
-                    : "This turn continues requested-changes work on the existing PR.";
-            }
-            if (runType === "ci_repair")
-                return "This turn continues CI repair work on the existing PR.";
-            if (runType === "queue_repair")
-                return "This turn continues merge-queue repair work on the existing PR.";
-            return "This turn continues implementation on the existing issue session.";
-    }
-}
-function resolveFollowUpAction(runType, context) {
-    if (context?.directReplyMode === true) {
-        return "Apply the latest human answer, continue from the current branch/session context, and only ask another question if you are still blocked.";
-    }
-    if (isRequestedChangesRunType(runType) && resolveRequestedChangesMode(runType, context) === "branch_upkeep") {
-        const baseBranch = typeof context?.baseBranch === "string" ? context.baseBranch : "main";
-        return `Update the existing PR branch onto latest ${baseBranch}, resolve conflicts if needed, rerun narrow verification, and push a newer head on the same branch.`;
-    }
-    switch (runType) {
-        case "review_fix":
-            return "Address the review feedback on the current PR branch, verify the fix, and push a newer head on the same branch.";
-        case "branch_upkeep":
-            return "Repair the existing PR branch after requested changes, rerun narrow verification, and push a newer head on the same branch.";
-        case "ci_repair":
-            return "Fix the failing CI root cause on the current PR branch, verify it locally, and push the same branch.";
-        case "queue_repair":
-            return "Repair the merge-queue incident on the current PR branch, verify the fix, and push the same branch.";
-        case "implementation":
-        default:
-            return "Continue from the latest branch state, incorporate the new input, and publish updates to the existing issue branch if you make changes.";
-    }
-}
-function hasAuthoritativeGitHubFacts(issue, runType, context) {
-    return issue.prNumber !== undefined
-        || issue.prHeadSha !== undefined
-        || runType !== "implementation"
-        || typeof context?.failureHeadSha === "string"
-        || typeof context?.failingHeadSha === "string"
-        || typeof context?.mergeStateStatus === "string"
-        || typeof context?.checkName === "string"
-        || typeof context?.reviewerName === "string";
-}
-function appendAuthoritativeGitHubFacts(lines, issue, runType, context) {
-    if (!hasAuthoritativeGitHubFacts(issue, runType, context)) {
-        return;
-    }
-    const prNumber = issue.prNumber !== undefined ? `#${issue.prNumber}` : undefined;
-    const headSha = typeof context?.failureHeadSha === "string"
-        ? context.failureHeadSha
-        : typeof context?.failingHeadSha === "string"
-            ? context.failingHeadSha
-            : issue.prHeadSha;
-    const mergeStateStatus = typeof context?.mergeStateStatus === "string" ? context.mergeStateStatus : undefined;
-    const baseBranch = typeof context?.baseBranch === "string" ? context.baseBranch : undefined;
-    const checkName = typeof context?.checkName === "string" ? context.checkName : undefined;
-    const jobName = typeof context?.jobName === "string" ? context.jobName : undefined;
-    const stepName = typeof context?.stepName === "string" ? context.stepName : undefined;
-    const reviewerName = typeof context?.reviewerName === "string" ? context.reviewerName : undefined;
-    const reviewBody = typeof context?.reviewBody === "string" ? context.reviewBody.trim() : "";
-    const summary = typeof context?.summary === "string" ? context.summary : undefined;
-    lines.push("## Authoritative GitHub Facts", "");
-    if (prNumber) {
-        lines.push(`- Current PR: ${prNumber}`);
-    }
-    if (headSha) {
-        lines.push(`- Current relevant head SHA: ${headSha}`);
-    }
-    if (issue.prReviewState) {
-        lines.push(`- Current review state: ${issue.prReviewState}`);
-    }
-    if (issue.prCheckStatus) {
-        lines.push(`- Current check status: ${issue.prCheckStatus}`);
-    }
-    if (mergeStateStatus) {
-        lines.push(`- Merge state against ${baseBranch ?? "base"}: ${mergeStateStatus}`);
-    }
-    if (checkName) {
-        lines.push(`- Relevant check: ${checkName}`);
-    }
-    if (jobName && jobName !== checkName) {
-        lines.push(`- Relevant job: ${jobName}`);
-    }
-    if (stepName) {
-        lines.push(`- Relevant step: ${stepName}`);
-    }
-    if (reviewerName) {
-        lines.push(`- Reviewer: ${reviewerName}`);
-    }
-    if (summary) {
-        lines.push(`- Summary: ${summary}`);
-    }
-    if (reviewBody) {
-        lines.push(`- Review body: ${reviewBody}`);
-    }
-    lines.push("");
-}
-function appendFactFreshness(lines, issue, runType, context) {
-    if (!hasAuthoritativeGitHubFacts(issue, runType, context)) {
-        return;
-    }
-    const hasFreshFacts = context?.githubFactsFresh === true || context?.branchUpkeepRequired === true;
-    lines.push("## Fact Freshness", "");
-    if (hasFreshFacts) {
-        lines.push("GitHub facts below were refreshed immediately before this turn was created.");
-    }
-    else {
-        lines.push("GitHub facts below came from the triggering event or last known reconciliation state and may now be stale.");
-        lines.push("Verify the current PR head, review state, and check state in GitHub before making branch-mutating decisions.");
-    }
-    lines.push("");
-}
-function appendFollowUpPromptPrelude(lines, issue, runType, context) {
-    lines.push("## Follow-up Turn", "");
-    lines.push(`Why this turn exists: ${resolveFollowUpWhy(runType, context)}`);
-    lines.push(`Required action now: ${resolveFollowUpAction(runType, context)}`);
-    lines.push("");
-    appendLinearContext(lines, context);
-    const followUps = collectFollowUpInputs(context);
-    if (followUps.length > 0) {
-        lines.push("## What Changed Since The Last Turn", "");
-        for (const followUp of followUps) {
-            lines.push(`- ${followUp.type}${followUp.author ? ` from ${followUp.author}` : ""}: ${followUp.text}`);
-        }
-        lines.push("");
-    }
-    appendFactFreshness(lines, issue, runType, context);
-    appendAuthoritativeGitHubFacts(lines, issue, runType, context);
-}
-function appendRequestedChangesInstructions(lines, runType, context) {
-    if (resolveRequestedChangesMode(runType, context) === "branch_upkeep") {
-        const baseBranch = typeof context?.baseBranch === "string" ? context.baseBranch : "main";
-        lines.push("## Branch Upkeep After Requested Changes", "", "The requested code change may already be present, but the PR branch still needs upkeep before review can continue.", typeof context?.mergeStateStatus === "string" ? `Current merge state: ${String(context.mergeStateStatus)}` : "", "", "Steps:", `1. Update the existing PR branch onto latest ${baseBranch}.`, "2. Resolve conflicts or branch drift without reopening the review-feedback debate unless the merge introduces a new issue.", "3. Run the narrowest verification that proves the branch is healthy again.", "4. Commit and push a newer head on the existing PR branch.", "5. If you cannot produce a new pushed head, stop and surface the exact blocker.", "");
-        return;
-    }
-    lines.push("## Review Changes Requested", "", "A reviewer has requested changes on your PR. Address the feedback and push.", context?.reviewerName ? `Reviewer: ${String(context.reviewerName)}` : "", context?.reviewBody ? `\n## Review comment\n\n${String(context.reviewBody)}` : "", "", "Steps:", "1. Start with the structured review context below. Treat the inline review comments as the primary repair checklist for this turn.", "2. Check the current diff (`git diff origin/main`) — a prior rebase may have already resolved some concerns (e.g., scope-bundling from stale commits).", "3. For each review point: if already resolved on the current head, note why. If not, fix it.", "4. If the structured review context looks incomplete, inspect the latest GitHub review threads directly before deciding you are done.", "5. Run verification, commit, and push a newer head on the existing PR branch.", "6. Do not try to hand the same head back to review. If you cannot produce a new pushed head, stop and surface the blocker clearly.", "7. GitHub review happens after the new head is pushed and CI is green. Do not use `gh pr edit --add-reviewer` as part of this workflow.", "");
-    appendStructuredReviewContext(lines, context);
-}
-export function buildInitialRunPrompt(issue, runType, repoPath, context) {
-    const lines = buildPromptHeader(issue);
-    appendTaskObjective(lines, issue);
-    appendScopeDiscipline(lines, issue);
-    appendLinearContext(lines, context);
-    // Add run-type-specific context for reactive runs
-    switch (runType) {
-        case "ci_repair": {
-            const snapshot = context?.ciSnapshot && typeof context.ciSnapshot === "object"
-                ? context.ciSnapshot
-                : undefined;
-            lines.push("## CI Repair", "", "A full CI iteration has settled failed on your PR. Start from the specific failing check/job/step below on the latest remote PR branch tip, fix that concrete failure first, then push to the same PR branch.", snapshot?.gateCheckName ? `Gate check: ${String(snapshot.gateCheckName)}` : "", snapshot?.gateCheckStatus ? `Gate status: ${String(snapshot.gateCheckStatus)}` : "", snapshot?.settledAt ? `Settled at: ${String(snapshot.settledAt)}` : "", context?.failureHeadSha ? `Failing head SHA: ${String(context.failureHeadSha)}` : "", context?.checkName ? `Failed check: ${String(context.checkName)}` : "", context?.jobName && context?.jobName !== context?.checkName ? `Failed job: ${String(context.jobName)}` : "", context?.stepName ? `Failed step: ${String(context.stepName)}` : "", context?.summary ? `Failure summary: ${String(context.summary)}` : "", Array.isArray(snapshot?.failedChecks) && snapshot.failedChecks.length > 0
-                ? `Other failed checks in the settled snapshot (context only; ignore unless the logs show the same root cause):\n${snapshot.failedChecks.map((entry) => `- ${String(entry.name ?? "unknown")}${entry.summary ? `: ${String(entry.summary)}` : ""}`).join("\n")}`
-                : "", context?.checkUrl ? `Check URL: ${String(context.checkUrl)}` : "", Array.isArray(context?.annotations) && context.annotations.length > 0
-                ? `Annotations:\n${context.annotations.map((entry) => `- ${String(entry)}`).join("\n")}`
-                : "", "", "Fetch the latest remote branch state first. If the branch moved since this failure, restart from the new tip instead of pushing older work.", "Read the latest logs for the named failing check, fix that root cause, and only broaden scope when the logs show direct fallout from the same issue.", "Do not change workflows, dependency installation, or unrelated tests unless the failing logs clearly point there.", "Run focused verification for the named failure, then commit and push.", "Do not open a new PR. Keep working on the existing branch until CI goes green or the situation is clearly stuck.", "Do not change test expectations unless the test is genuinely wrong.", "");
-            break;
-        }
-        case "review_fix":
-        case "branch_upkeep":
-            appendRequestedChangesInstructions(lines, runType, context);
-            break;
-        case "queue_repair":
-            appendQueueRepairContext(lines, context);
-            lines.push("## Merge Queue Failure", "", "The merge queue rejected this PR. Rebase onto latest main and fix conflicts.", context?.failureReason ? `Failure reason: ${String(context.failureReason)}` : "", "", "Fetch and rebase onto latest main, resolve conflicts, run verification, push.", "If the conflict is a semantic contradiction, explain and stop.", "");
-            break;
-    }
-    const workflowBody = readWorkflowFile(repoPath, runType);
-    if (workflowBody) {
-        lines.push(workflowBody);
-    }
-    else if (runType === "implementation") {
-        lines.push("Implement the Linear issue. Read the issue via MCP for details.");
-    }
-    appendPublicationContract(lines, runType, issue, context);
-    return lines.join("\n");
-}
-export function buildFollowUpRunPrompt(issue, runType, repoPath, context) {
-    const lines = buildPromptHeader(issue);
-    appendFollowUpPromptPrelude(lines, issue, runType, context);
-    appendTaskObjective(lines, issue);
-    appendScopeDiscipline(lines, issue);
-    // Add run-type-specific context for reactive runs
-    switch (runType) {
-        case "ci_repair": {
-            const snapshot = context?.ciSnapshot && typeof context.ciSnapshot === "object"
-                ? context.ciSnapshot
-                : undefined;
-            lines.push("## CI Repair", "", "A full CI iteration has settled failed on your PR. Start from the specific failing check/job/step below on the latest remote PR branch tip, fix that concrete failure first, then push to the same PR branch.", snapshot?.gateCheckName ? `Gate check: ${String(snapshot.gateCheckName)}` : "", snapshot?.gateCheckStatus ? `Gate status: ${String(snapshot.gateCheckStatus)}` : "", snapshot?.settledAt ? `Settled at: ${String(snapshot.settledAt)}` : "", context?.failureHeadSha ? `Failing head SHA: ${String(context.failureHeadSha)}` : "", context?.checkName ? `Failed check: ${String(context.checkName)}` : "", context?.jobName && context?.jobName !== context?.checkName ? `Failed job: ${String(context.jobName)}` : "", context?.stepName ? `Failed step: ${String(context.stepName)}` : "", context?.summary ? `Failure summary: ${String(context.summary)}` : "", Array.isArray(snapshot?.failedChecks) && snapshot.failedChecks.length > 0
-                ? `Other failed checks in the settled snapshot (context only; ignore unless the logs show the same root cause):\n${snapshot.failedChecks.map((entry) => `- ${String(entry.name ?? "unknown")}${entry.summary ? `: ${String(entry.summary)}` : ""}`).join("\n")}`
-                : "", context?.checkUrl ? `Check URL: ${String(context.checkUrl)}` : "", Array.isArray(context?.annotations) && context.annotations.length > 0
-                ? `Annotations:\n${context.annotations.map((entry) => `- ${String(entry)}`).join("\n")}`
-                : "", "", "Fetch the latest remote branch state first. If the branch moved since this failure, restart from the new tip instead of pushing older work.", "Read the latest logs for the named failing check, fix that root cause, and only broaden scope when the logs show direct fallout from the same issue.", "Do not change workflows, dependency installation, or unrelated tests unless the failing logs clearly point there.", "Run focused verification for the named failure, then commit and push.", "Do not open a new PR. Keep working on the existing branch until CI goes green or the situation is clearly stuck.", "Do not change test expectations unless the test is genuinely wrong.", "");
-            break;
-        }
-        case "review_fix":
-        case "branch_upkeep":
-            appendRequestedChangesInstructions(lines, runType, context);
-            break;
-        case "queue_repair":
-            appendQueueRepairContext(lines, context);
-            lines.push("## Merge Queue Failure", "", "The merge queue rejected this PR. Rebase onto latest main and fix conflicts.", context?.failureReason ? `Failure reason: ${String(context.failureReason)}` : "", "", "Fetch and rebase onto latest main, resolve conflicts, run verification, push.", "If the conflict is a semantic contradiction, explain and stop.", "");
-            break;
-    }
-    const workflowBody = readWorkflowFile(repoPath, runType);
-    if (workflowBody) {
-        lines.push(workflowBody);
-    }
-    else if (runType === "implementation") {
-        lines.push("Implement the Linear issue. Read the issue via MCP for details.");
-    }
-    appendPublicationContract(lines, runType, issue, context);
-    return lines.join("\n");
-}
-function shouldBuildFollowUpPrompt(runType, context) {
-    if (context?.followUpMode)
-        return true;
-    if (runType !== "implementation")
-        return true;
-    const wakeReason = typeof context?.wakeReason === "string" ? context.wakeReason : undefined;
-    return Boolean(wakeReason && wakeReason !== "delegated");
-}
-export function buildRunPrompt(issue, runType, repoPath, context) {
-    if (shouldBuildFollowUpPrompt(runType, context)) {
-        return buildFollowUpRunPrompt(issue, runType, repoPath, context);
-    }
-    return buildInitialRunPrompt(issue, runType, repoPath, context);
-}
-function shouldCompactThread(issue, threadGeneration, context) {
-    const followUpCount = typeof context?.followUpCount === "number" ? context.followUpCount : 0;
-    return issue.threadId !== undefined
-        && (threadGeneration ?? 0) >= MAX_THREAD_GENERATION_BEFORE_COMPACTION
-        && followUpCount >= MAX_FOLLOW_UPS_BEFORE_COMPACTION;
-}
-export function shouldReuseIssueThread(params) {
-    return Boolean(params.existingThreadId) && !params.compactThread && params.resumeThread;
-}
 function isBranchUpkeepRequired(context) {
     return context?.branchUpkeepRequired === true;
 }
@@ -549,7 +47,12 @@ export class RunOrchestrator {
     linearSync;
     activeThreadId;
     workerId = `patchrelay:${process.pid}`;
-    activeSessionLeases = new Map();
+    leaseService;
+    runFinalizer;
+    runLauncher;
+    runRecovery;
+    runWakePlanner;
+    activeSessionLeases;
     botIdentity;
     constructor(config, db, codex, linearProvider, enqueueIssue, logger, feed) {
         this.config = config;
@@ -561,6 +64,12 @@ export class RunOrchestrator {
         this.feed = feed;
         this.worktreeManager = new WorktreeManager(config);
         this.linearSync = new LinearSessionSync(config, db, linearProvider, logger, feed);
+        this.leaseService = new IssueSessionLeaseService(db, logger, this.workerId, (threadId, maxRetries) => this.readThreadWithRetry(threadId, maxRetries));
+        this.activeSessionLeases = this.leaseService.activeSessionLeases;
+        this.runFinalizer = new RunFinalizer(db, logger, this.linearSync, this.enqueueIssue, feed);
+        this.runLauncher = new RunLauncher(config, db, codex, logger, this.worktreeManager);
+        this.runRecovery = new RunRecoveryService(db, logger, this.linearSync, (projectId, linearIssueId) => this.releaseIssueSessionLease(projectId, linearIssueId), (projectId, issueId) => this.enqueueIssue(projectId, issueId), (newState, pendingRunType) => this.resolveBranchOwnerForStateTransition(newState, pendingRunType), feed);
+        this.runWakePlanner = new RunWakePlanner(db);
         this.idleReconciler = new IdleIssueReconciler(db, config, {
             enqueueIssue: (projectId, issueId) => this.enqueueIssue(projectId, issueId),
         }, logger, feed);
@@ -570,88 +79,40 @@ export class RunOrchestrator {
         }, logger, feed);
     }
     resolveRunWake(issue) {
-        const sessionWake = this.db.peekIssueSessionWake(issue.projectId, issue.linearIssueId);
-        if (sessionWake) {
-            return {
-                runType: sessionWake.runType,
-                context: sessionWake.context,
-                wakeReason: sessionWake.wakeReason,
-                resumeThread: sessionWake.resumeThread,
-                eventIds: sessionWake.eventIds,
-            };
-        }
-        return undefined;
+        return this.runWakePlanner.resolveRunWake(issue);
     }
     appendWakeEventWithLease(lease, issue, runType, context, dedupeScope) {
-        let eventType;
-        let dedupeKey;
-        if (runType === "queue_repair") {
-            eventType = "merge_steward_incident";
-            dedupeKey = `${dedupeScope ?? "wake"}:queue_repair:${issue.linearIssueId}:${issue.prHeadSha ?? issue.lastGitHubFailureHeadSha ?? "unknown-sha"}`;
-        }
-        else if (runType === "ci_repair") {
-            eventType = "settled_red_ci";
-            dedupeKey = `${dedupeScope ?? "wake"}:ci_repair:${issue.linearIssueId}:${issue.lastGitHubFailureSignature ?? issue.prHeadSha ?? "unknown-sha"}`;
-        }
-        else if (runType === "review_fix" || runType === "branch_upkeep") {
-            eventType = "review_changes_requested";
-            dedupeKey = `${dedupeScope ?? "wake"}:${runType}:${issue.linearIssueId}:${issue.prHeadSha ?? "unknown-sha"}`;
-        }
-        else {
-            eventType = "delegated";
-            dedupeKey = `${dedupeScope ?? "wake"}:implementation:${issue.linearIssueId}`;
-        }
-        return Boolean(this.db.appendIssueSessionEventWithLease(lease, {
-            projectId: issue.projectId,
-            linearIssueId: issue.linearIssueId,
-            eventType,
-            ...(context ? { eventJson: JSON.stringify(context) } : {}),
-            dedupeKey,
-        }));
+        return this.runWakePlanner.appendWakeEventWithLease(lease, issue, runType, context, dedupeScope);
     }
     materializeLegacyPendingWake(issue, lease) {
-        if (!issue.pendingRunType)
-            return issue;
-        const context = issue.pendingRunContextJson
-            ? JSON.parse(issue.pendingRunContextJson)
-            : undefined;
-        this.appendWakeEventWithLease(lease, issue, issue.pendingRunType, context, "legacy_pending");
-        const updated = this.db.upsertIssueWithLease(lease, {
-            projectId: issue.projectId,
-            linearIssueId: issue.linearIssueId,
-            pendingRunType: null,
-            pendingRunContextJson: null,
-        });
-        if (!updated)
-            return issue;
-        return this.db.getIssue(issue.projectId, issue.linearIssueId) ?? issue;
+        return this.runWakePlanner.materializeLegacyPendingWake(issue, lease);
     }
     // ─── Run ────────────────────────────────────────────────────────
     async run(item) {
         const project = this.config.projects.find((p) => p.id === item.projectId);
         if (!project)
             return;
-        if (this.activeSessionLeases.has(this.issueSessionLeaseKey(item.projectId, item.issueId))) {
+        if (this.leaseService.hasLocalLease(item.projectId, item.issueId)) {
             return;
         }
         const issue = this.db.getIssue(item.projectId, item.issueId);
         if (!issue || issue.activeRunId !== undefined)
             return;
-        const issueSession = this.db.getIssueSession(item.projectId, item.issueId);
-        const leaseId = this.acquireIssueSessionLease(item.projectId, item.issueId);
+        const issueSession = this.db.issueSessions.getIssueSession(item.projectId, item.issueId);
+        const leaseId = this.leaseService.acquire(item.projectId, item.issueId);
         if (!leaseId) {
             this.logger.info({ issueKey: issue.issueKey, projectId: item.projectId }, "Skipped run because another worker holds the session lease");
             return;
         }
         if (issue.prState === "merged") {
-            this.db.upsertIssueWithLease({ projectId: issue.projectId, linearIssueId: issue.linearIssueId, leaseId }, { projectId: issue.projectId, linearIssueId: issue.linearIssueId, pendingRunType: null, factoryState: "done" });
-            this.releaseIssueSessionLease(item.projectId, item.issueId);
+            this.db.issueSessions.upsertIssueWithLease({ projectId: issue.projectId, linearIssueId: issue.linearIssueId, leaseId }, { projectId: issue.projectId, linearIssueId: issue.linearIssueId, pendingRunType: null, factoryState: "done" });
+            this.leaseService.release(item.projectId, item.issueId);
             return;
         }
         const wakeIssue = this.materializeLegacyPendingWake(issue, { projectId: item.projectId, linearIssueId: item.issueId, leaseId });
         const wake = this.resolveRunWake(wakeIssue);
         if (!wake) {
-            this.releaseIssueSessionLease(item.projectId, item.issueId);
+            this.leaseService.release(item.projectId, item.issueId);
             return;
         }
         const { runType, context, resumeThread } = wake;
@@ -663,94 +124,33 @@ export class RunOrchestrator {
             : typeof effectiveContext?.headSha === "string"
                 ? effectiveContext.headSha
                 : issue.prHeadSha;
-        // Check repair budgets
-        if (runType === "ci_repair" && issue.ciRepairAttempts >= DEFAULT_CI_REPAIR_BUDGET) {
-            this.escalate(issue, runType, `CI repair budget exhausted (${DEFAULT_CI_REPAIR_BUDGET} attempts)`);
+        const budgetExceeded = this.runWakePlanner.budgetExceeded(issue, runType, isRequestedChangesRunType);
+        if (budgetExceeded) {
+            this.escalate(issue, runType, budgetExceeded);
             return;
         }
-        if (runType === "queue_repair" && issue.queueRepairAttempts >= DEFAULT_QUEUE_REPAIR_BUDGET) {
-            this.escalate(issue, runType, `Queue repair budget exhausted (${DEFAULT_QUEUE_REPAIR_BUDGET} attempts)`);
-            return;
-        }
-        if (isRequestedChangesRunType(runType) && issue.reviewFixAttempts >= DEFAULT_REVIEW_FIX_BUDGET) {
-            this.escalate(issue, runType, `Requested-changes budget exhausted (${DEFAULT_REVIEW_FIX_BUDGET} attempts)`);
+        if (!this.runWakePlanner.incrementAttemptCounters(issue, { projectId: issue.projectId, linearIssueId: issue.linearIssueId, leaseId }, runType, isRequestedChangesRunType)) {
+            this.releaseIssueSessionLease(item.projectId, item.issueId);
             return;
         }
-        // Increment repair counters
-        if (runType === "ci_repair") {
-            const updated = this.db.upsertIssueWithLease({ projectId: issue.projectId, linearIssueId: issue.linearIssueId, leaseId }, { projectId: issue.projectId, linearIssueId: issue.linearIssueId, ciRepairAttempts: issue.ciRepairAttempts + 1 });
-            if (!updated) {
-                this.releaseIssueSessionLease(item.projectId, item.issueId);
-                return;
-            }
-        }
-        if (runType === "queue_repair") {
-            const updated = this.db.upsertIssueWithLease({ projectId: issue.projectId, linearIssueId: issue.linearIssueId, leaseId }, { projectId: issue.projectId, linearIssueId: issue.linearIssueId, queueRepairAttempts: issue.queueRepairAttempts + 1 });
-            if (!updated) {
-                this.releaseIssueSessionLease(item.projectId, item.issueId);
-                return;
-            }
-        }
-        if (isRequestedChangesRunType(runType)) {
-            const updated = this.db.upsertIssueWithLease({ projectId: issue.projectId, linearIssueId: issue.linearIssueId, leaseId }, { projectId: issue.projectId, linearIssueId: issue.linearIssueId, reviewFixAttempts: issue.reviewFixAttempts + 1 });
-            if (!updated) {
-                this.releaseIssueSessionLease(item.projectId, item.issueId);
-                return;
-            }
-        }
-        // Build prompt
-        const prompt = buildRunPrompt(issue, runType, project.repoPath, effectiveContext);
-        // Resolve workspace
-        const issueRef = sanitizePathSegment(issue.issueKey ?? issue.linearIssueId);
-        const slug = issue.title ? slugify(issue.title) : "";
-        const branchSuffix = slug ? `${issueRef}-${slug}` : issueRef;
-        const branchName = issue.branchName ?? `${project.branchPrefix}/${branchSuffix}`;
-        const worktreePath = issue.worktreePath ?? `${project.worktreeRoot}/${issueRef}`;
-        // Claim the run atomically
-        const run = this.db.withIssueSessionLease(item.projectId, item.issueId, leaseId, () => {
-            const fresh = this.db.getIssue(item.projectId, item.issueId);
-            if (!fresh || fresh.activeRunId !== undefined)
-                return undefined;
-            const wakeIssue = this.materializeLegacyPendingWake(fresh, { projectId: item.projectId, linearIssueId: item.issueId, leaseId });
-            const freshWake = this.resolveRunWake(wakeIssue);
-            if (!freshWake || freshWake.runType !== runType)
-                return undefined;
-            const created = this.db.createRun({
-                issueId: fresh.id,
-                projectId: item.projectId,
-                linearIssueId: item.issueId,
-                runType,
-                ...(sourceHeadSha ? { sourceHeadSha } : {}),
-                promptText: prompt,
-            });
-            const failureHeadSha = typeof effectiveContext?.failureHeadSha === "string"
-                ? effectiveContext.failureHeadSha
-                : typeof effectiveContext?.headSha === "string" ? effectiveContext.headSha : undefined;
-            const failureSignature = typeof effectiveContext?.failureSignature === "string" ? effectiveContext.failureSignature : undefined;
-            this.db.upsertIssue({
-                projectId: item.projectId,
-                linearIssueId: item.issueId,
-                pendingRunType: null,
-                pendingRunContextJson: null,
-                activeRunId: created.id,
-                branchName,
-                worktreePath,
-                factoryState: runType === "implementation" ? "implementing"
-                    : runType === "ci_repair" ? "repairing_ci"
-                        : runType === "review_fix" || runType === "branch_upkeep" ? "changes_requested"
-                            : runType === "queue_repair" ? "repairing_queue"
-                                : "implementing",
-                ...((runType === "ci_repair" || runType === "queue_repair") && failureSignature
-                    ? {
-                        lastAttemptedFailureSignature: failureSignature,
-                        lastAttemptedFailureHeadSha: failureHeadSha ?? null,
-                    }
-                    : {}),
-            });
-            this.db.consumeIssueSessionEvents(item.projectId, item.issueId, freshWake.eventIds, created.id);
-            this.db.setIssueSessionLastWakeReason(item.projectId, item.issueId, freshWake.wakeReason ?? null);
-            this.db.setBranchOwnerWithLease({ projectId: item.projectId, linearIssueId: item.issueId, leaseId }, "patchrelay");
-            return created;
+        const { prompt, branchName, worktreePath } = this.runLauncher.prepareLaunchPlan({
+            project,
+            issue,
+            runType,
+            ...(effectiveContext ? { effectiveContext } : {}),
+        });
+        const run = this.runLauncher.claimRun({
+            item,
+            issue,
+            leaseId,
+            runType,
+            prompt,
+            ...(sourceHeadSha ? { sourceHeadSha } : {}),
+            ...(effectiveContext ? { effectiveContext } : {}),
+            materializeLegacyPendingWake: (targetIssue, lease) => this.materializeLegacyPendingWake(targetIssue, lease),
+            resolveRunWake: (targetIssue) => this.resolveRunWake(targetIssue),
+            branchName,
+            worktreePath,
         });
         if (!run) {
             this.releaseIssueSessionLease(item.projectId, item.issueId);
@@ -765,110 +165,36 @@ export class RunOrchestrator {
             status: "starting",
             summary: `Starting ${runType} run`,
         });
-        let threadId;
-        let turnId;
-        let parentThreadId;
-        try {
-            // Ensure worktree
-            await this.worktreeManager.ensureIssueWorktree(project.repoPath, project.worktreeRoot, worktreePath, branchName, { allowExistingOutsideRoot: issue.branchName !== undefined });
-            // Set bot git identity and push credentials when GitHub App is configured.
-            // This ensures commits are authored by and pushes are authenticated as
-            // patchrelay[bot], not the system user.
-            if (this.botIdentity) {
-                const gitBin = this.config.runner.gitBin;
-                await execCommand(gitBin, ["-C", worktreePath, "config", "user.name", this.botIdentity.name], { timeoutMs: 5_000 });
-                await execCommand(gitBin, ["-C", worktreePath, "config", "user.email", this.botIdentity.email], { timeoutMs: 5_000 });
-                // Override credential helper to use the App installation token for git push.
-                // The helper script reads the token file and returns it as the password.
-                const credentialHelper = `!f() { echo "username=x-access-token"; echo "password=$(cat ${this.botIdentity.tokenFile})"; }; f`;
-                await execCommand(gitBin, ["-C", worktreePath, "config", "credential.helper", credentialHelper], { timeoutMs: 5_000 });
-            }
-            await this.resetWorktreeToTrackedBranch(worktreePath, branchName, issue);
-            // Freshen the worktree: fetch + rebase onto latest base branch.
-            // This prevents branch contamination when local main has drifted
-            // and avoids scope-bundling review rejections from stale commits.
-            // Skip for queue_repair — its entire purpose is to resolve rebase conflicts.
-            if (runType !== "queue_repair") {
-                await this.freshenWorktree(worktreePath, project, issue);
-            }
-            // Run prepare-worktree hook
-            const hookEnv = buildHookEnv(issue.issueKey ?? issue.linearIssueId, branchName, runType, worktreePath);
-            const prepareResult = await runProjectHook(project.repoPath, "prepare-worktree", { cwd: worktreePath, env: hookEnv });
-            if (prepareResult.ran && prepareResult.exitCode !== 0) {
-                throw new Error(`prepare-worktree hook failed (exit ${prepareResult.exitCode}): ${prepareResult.stderr?.slice(0, 500) ?? ""}`);
-            }
-            this.assertLaunchLease(run, "before starting the Codex turn");
-            // Reuse the existing thread only for additive follow-ups that explicitly
-            // request continuity. Fresh review-fix runs now start a new thread so the
-            // model is not anchored to the implementation conversation that produced
-            // the rejected patch. If the thread has accumulated many resumptions and
-            // batched follow-ups, compact by starting a fresh main thread while
-            // keeping a parent link.
-            const compactThread = shouldCompactThread(issue, issueSession?.threadGeneration, effectiveContext);
-            if (compactThread && issue.threadId) {
-                parentThreadId = issue.threadId;
-            }
-            if (shouldReuseIssueThread({ existingThreadId: issue.threadId, compactThread, resumeThread })) {
-                threadId = issue.threadId;
-            }
-            else {
-                const thread = await this.codex.startThread({ cwd: worktreePath });
-                threadId = thread.id;
-                this.db.upsertIssueWithLease({ projectId: item.projectId, linearIssueId: item.issueId, leaseId }, { projectId: item.projectId, linearIssueId: item.issueId, threadId });
-            }
-            try {
-                const turn = await this.codex.startTurn({ threadId, cwd: worktreePath, input: prompt });
-                turnId = turn.turnId;
-            }
-            catch (turnError) {
-                // If the thread is stale (e.g. after app-server restart), start fresh and retry once.
-                const msg = turnError instanceof Error ? turnError.message : String(turnError);
-                if (msg.includes("thread not found") || msg.includes("not materialized")) {
-                    this.logger.info({ issueKey: issue.issueKey, staleThreadId: threadId }, "Thread is stale, retrying with fresh thread");
-                    const thread = await this.codex.startThread({ cwd: worktreePath });
-                    threadId = thread.id;
-                    this.db.upsertIssueWithLease({ projectId: item.projectId, linearIssueId: item.issueId, leaseId }, { projectId: item.projectId, linearIssueId: item.issueId, threadId });
-                    const turn = await this.codex.startTurn({ threadId, cwd: worktreePath, input: prompt });
-                    turnId = turn.turnId;
-                }
-                else {
-                    throw turnError;
-                }
-            }
-            this.assertLaunchLease(run, "after starting the Codex turn");
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            const lostLease = error instanceof Error && error.name === "IssueSessionLeaseLostError";
-            if (!lostLease) {
-                const nextState = isRequestedChangesRunType(runType) ? "escalated" : "failed";
-                this.db.finishRunWithLease({ projectId: item.projectId, linearIssueId: item.issueId, leaseId }, run.id, {
-                    status: "failed",
-                    failureReason: message,
-                });
-                this.db.upsertIssueWithLease({ projectId: item.projectId, linearIssueId: item.issueId, leaseId }, {
-                    projectId: item.projectId,
-                    linearIssueId: item.issueId,
-                    activeRunId: null,
-                    factoryState: nextState,
-                });
-            }
-            this.logger.error({ issueKey: issue.issueKey, runType, error: message }, `Failed to launch ${runType} run`);
-            const failedIssue = this.db.getIssue(item.projectId, item.issueId) ?? issue;
-            void this.linearSync.emitActivity(failedIssue, buildRunFailureActivity(runType, `Failed to start ${lowerCaseFirst(message)}`));
-            void this.linearSync.syncSession(failedIssue, { activeRunType: runType });
-            this.releaseIssueSessionLease(item.projectId, item.issueId);
-            throw error;
-        }
+        const { threadId, turnId, parentThreadId, } = await this.runLauncher.launchTurn({
+            project,
+            issue,
+            ...(issueSession ? { issueSession } : {}),
+            run,
+            runType,
+            prompt,
+            branchName,
+            worktreePath,
+            resumeThread,
+            ...(effectiveContext ? { effectiveContext } : {}),
+            leaseId,
+            ...(this.botIdentity ? { botIdentity: this.botIdentity } : {}),
+            assertLaunchLease: (targetRun, phase) => this.assertLaunchLease(targetRun, phase),
+            resetWorktreeToTrackedBranch: (targetWorktreePath, targetBranchName, targetIssue) => this.resetWorktreeToTrackedBranch(targetWorktreePath, targetBranchName, targetIssue),
+            freshenWorktree: (targetWorktreePath, targetProject, targetIssue) => this.freshenWorktree(targetWorktreePath, targetProject, targetIssue),
+            linearSync: this.linearSync,
+            releaseLease: (projectId, issueId) => this.releaseIssueSessionLease(projectId, issueId),
+            isRequestedChangesRunType,
+            lowerCaseFirst,
+        });
         this.assertLaunchLease(run, "before recording the active thread");
-        if (!this.db.updateRunThreadWithLease({ projectId: run.projectId, linearIssueId: run.linearIssueId, leaseId }, run.id, { threadId, turnId, ...(parentThreadId ? { parentThreadId } : {}) })) {
+        if (!this.db.issueSessions.updateRunThreadWithLease({ projectId: run.projectId, linearIssueId: run.linearIssueId, leaseId }, run.id, { threadId, turnId, ...(parentThreadId ? { parentThreadId } : {}) })) {
             this.logger.warn({ runId: run.id, issueId: run.linearIssueId }, "Skipping run thread update after losing issue-session lease");
             this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
             return;
         }
         // Reset zombie recovery counter — this run started successfully
         if (issue.zombieRecoveryAttempts > 0) {
-            this.db.upsertIssueWithLease({ projectId: item.projectId, linearIssueId: item.issueId, leaseId }, {
+            this.db.issueSessions.upsertIssueWithLease({ projectId: item.projectId, linearIssueId: item.issueId, leaseId }, {
                 projectId: item.projectId,
                 linearIssueId: item.issueId,
                 zombieRecoveryAttempts: 0,
@@ -984,7 +310,7 @@ export class RunOrchestrator {
         if (notification.method === "turn/started" && threadId) {
             this.activeThreadId = threadId;
         }
-        const run = this.db.getRunByThreadId(threadId);
+        const run = this.db.runs.getRunByThreadId(threadId);
         if (!run)
             return;
         if (!this.heartbeatIssueSessionLease(run.projectId, run.linearIssueId)) {
@@ -993,7 +319,7 @@ export class RunOrchestrator {
         }
         const turnId = typeof notification.params.turnId === "string" ? notification.params.turnId : undefined;
         if (this.config.runner.codex.persistExtendedHistory) {
-            this.db.saveThreadEvent({
+            this.db.runs.saveThreadEvent({
                 runId: run.id,
                 threadId,
                 ...(turnId ? { turnId } : {}),
@@ -1021,13 +347,13 @@ export class RunOrchestrator {
         if (status === "failed") {
             const nextState = isRequestedChangesRunType(run.runType) ? "escalated" : "failed";
             const updated = this.withHeldIssueSessionLease(run.projectId, run.linearIssueId, (lease) => {
-                this.db.finishRunWithLease(lease, run.id, {
+                this.db.issueSessions.finishRunWithLease(lease, run.id, {
                     status: "failed",
                     threadId,
                     ...(completedTurnId ? { turnId: completedTurnId } : {}),
                     failureReason: "Codex reported the turn completed in a failed state",
                 });
-                this.db.upsertIssueWithLease(lease, {
+                this.db.issueSessions.upsertIssueWithLease(lease, {
                     projectId: run.projectId,
                     linearIssueId: run.linearIssueId,
                     activeRunId: null,
@@ -1057,158 +383,33 @@ export class RunOrchestrator {
             this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
             return;
         }
-        // Complete the run
-        const trackedIssue = this.db.issueToTrackedIssue(issue);
-        const report = buildStageReport({ ...run, status: "completed" }, trackedIssue, thread, countEventMethods(this.db.listThreadEvents(run.id)));
-        // Determine post-run state based on current PR metadata.
-        const freshIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? issue;
-        const verifiedRepairError = await this.verifyReactiveRunAdvancedBranch(run, freshIssue);
-        if (verifiedRepairError) {
-            const holdState = resolveRecoverablePostRunState(freshIssue) ?? "failed";
-            this.failRunAndClear(run, verifiedRepairError, holdState);
-            const heldIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? freshIssue;
-            this.feed?.publish({
-                level: "warn",
-                kind: "turn",
-                issueKey: freshIssue.issueKey,
-                projectId: run.projectId,
-                stage: run.runType,
-                status: "branch_not_advanced",
-                summary: verifiedRepairError,
-            });
-            void this.linearSync.emitActivity(heldIssue, buildRunFailureActivity(run.runType, verifiedRepairError));
-            void this.linearSync.syncSession(heldIssue, { activeRunType: run.runType });
-            this.linearSync.clearProgress(run.id);
-            this.activeThreadId = undefined;
-            this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
-            return;
-        }
-        const missingReviewFixHeadError = await this.verifyReviewFixAdvancedHead(run, freshIssue);
-        if (missingReviewFixHeadError) {
-            this.failRunAndClear(run, missingReviewFixHeadError, "escalated");
-            const failedIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? freshIssue;
-            this.feed?.publish({
-                level: "error",
-                kind: "turn",
-                issueKey: freshIssue.issueKey,
-                projectId: run.projectId,
-                stage: run.runType,
-                status: "same_head_review_handoff_blocked",
-                summary: missingReviewFixHeadError,
-            });
-            void this.linearSync.emitActivity(failedIssue, buildRunFailureActivity(run.runType, missingReviewFixHeadError));
-            void this.linearSync.syncSession(failedIssue, { activeRunType: run.runType });
-            this.linearSync.clearProgress(run.id);
-            this.activeThreadId = undefined;
-            this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
-            return;
-        }
-        const publishedOutcomeError = await this.verifyPublishedRunOutcome(run, freshIssue);
-        if (publishedOutcomeError) {
-            this.failRunAndClear(run, publishedOutcomeError, "failed");
-            const failedIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? freshIssue;
-            this.feed?.publish({
-                level: "warn",
-                kind: "turn",
-                issueKey: freshIssue.issueKey,
-                projectId: run.projectId,
-                stage: run.runType,
-                status: "publish_incomplete",
-                summary: publishedOutcomeError,
-            });
-            void this.linearSync.emitActivity(failedIssue, buildRunFailureActivity(run.runType, publishedOutcomeError));
-            void this.linearSync.syncSession(failedIssue, { activeRunType: run.runType });
-            this.linearSync.clearProgress(run.id);
-            this.activeThreadId = undefined;
-            return;
-        }
-        const refreshedIssue = await this.refreshIssueAfterReactivePublish(run, freshIssue);
-        const postRunFollowUp = await this.resolvePostRunFollowUp(run, refreshedIssue);
-        const postRunState = postRunFollowUp?.factoryState ?? resolveCompletedRunState(refreshedIssue, run);
-        const completed = this.withHeldIssueSessionLease(run.projectId, run.linearIssueId, (lease) => {
-            this.db.finishRun(run.id, {
-                status: "completed",
-                threadId,
-                ...(completedTurnId ? { turnId: completedTurnId } : {}),
-                summaryJson: JSON.stringify({ latestAssistantMessage: report.assistantMessages.at(-1) ?? null }),
-                reportJson: JSON.stringify(report),
-            });
-            this.db.upsertIssue({
-                projectId: run.projectId,
-                linearIssueId: run.linearIssueId,
-                activeRunId: null,
-                ...(postRunState ? { factoryState: postRunState } : {}),
-                pendingRunType: null,
-                pendingRunContextJson: null,
-                ...(postRunFollowUp ? {} : (postRunState === "awaiting_queue" || postRunState === "done"
-                    ? {
-                        lastGitHubFailureSource: null,
-                        lastGitHubFailureHeadSha: null,
-                        lastGitHubFailureSignature: null,
-                        lastGitHubFailureCheckName: null,
-                        lastGitHubFailureCheckUrl: null,
-                        lastGitHubFailureContextJson: null,
-                        lastGitHubFailureAt: null,
-                        lastQueueIncidentJson: null,
-                        lastAttemptedFailureHeadSha: null,
-                        lastAttemptedFailureSignature: null,
-                    }
-                    : {})),
-            });
-            if (postRunFollowUp) {
-                return this.appendWakeEventWithLease(lease, issue, postRunFollowUp.pendingRunType, postRunFollowUp.context, "post_run");
-            }
-            return true;
-        });
-        if (!completed) {
-            this.logger.warn({ runId: run.id, issueId: run.linearIssueId }, "Skipping completion writes after losing issue-session lease");
-            this.linearSync.clearProgress(run.id);
-            this.activeThreadId = undefined;
-            this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
-            return;
-        }
-        if (postRunFollowUp) {
-            this.feed?.publish({
-                level: "info",
-                kind: "stage",
-                issueKey: issue.issueKey,
-                projectId: run.projectId,
-                stage: postRunFollowUp.factoryState,
-                status: "follow_up_queued",
-                summary: postRunFollowUp.summary,
-            });
-            this.enqueueIssue(run.projectId, run.linearIssueId);
-        }
-        this.feed?.publish({
-            level: "info",
-            kind: "turn",
-            issueKey: issue.issueKey,
-            projectId: run.projectId,
-            stage: run.runType,
-            status: "completed",
-            summary: `Turn completed for ${run.runType}`,
-            detail: summarizeCurrentThread(thread).latestAgentMessage,
+        await this.runFinalizer.finalizeCompletedRun({
+            source: "notification",
+            run,
+            issue,
+            thread,
+            threadId,
+            ...(completedTurnId ? { completedTurnId } : {}),
+            withHeldLease: (projectId, linearIssueId, fn) => this.withHeldIssueSessionLease(projectId, linearIssueId, fn),
+            releaseLease: (projectId, linearIssueId) => this.releaseIssueSessionLease(projectId, linearIssueId),
+            failRunAndClear: (targetRun, message, nextState) => this.failRunAndClear(targetRun, message, nextState),
+            verifyReactiveRunAdvancedBranch: (targetRun, targetIssue) => this.verifyReactiveRunAdvancedBranch(targetRun, targetIssue),
+            verifyReviewFixAdvancedHead: (targetRun, targetIssue) => this.verifyReviewFixAdvancedHead(targetRun, targetIssue),
+            verifyPublishedRunOutcome: (targetRun, targetIssue) => this.verifyPublishedRunOutcome(targetRun, targetIssue),
+            refreshIssueAfterReactivePublish: (targetRun, targetIssue) => this.refreshIssueAfterReactivePublish(targetRun, targetIssue),
+            resolvePostRunFollowUp: (targetRun, targetIssue) => this.resolvePostRunFollowUp(targetRun, targetIssue),
+            resolveCompletedRunState,
+            resolveRecoverableRunState: resolveRecoverablePostRunState,
+            appendWakeEventWithLease: (lease, targetIssue, runType, context, dedupeScope) => this.appendWakeEventWithLease(lease, targetIssue, runType, context, dedupeScope),
         });
-        // Emit Linear completion activity + plan
-        const updatedIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? refreshedIssue;
-        const completionSummary = report.assistantMessages.at(-1)?.slice(0, 300) ?? `${run.runType} completed.`;
-        void this.linearSync.emitActivity(updatedIssue, buildRunCompletedActivity({
-            runType: run.runType,
-            completionSummary,
-            postRunState: updatedIssue.factoryState,
-            ...(updatedIssue.prNumber !== undefined ? { prNumber: updatedIssue.prNumber } : {}),
-        }));
-        void this.linearSync.syncSession(updatedIssue);
-        this.linearSync.clearProgress(run.id);
         this.activeThreadId = undefined;
-        this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
     }
     // ─── Active status for query ──────────────────────────────────────
     async getActiveRunStatus(issueKey) {
         const issue = this.db.getIssueByKey(issueKey);
         if (!issue?.activeRunId)
             return undefined;
-        const run = this.db.getRun(issue.activeRunId);
+        const run = this.db.runs.getRunById(issue.activeRunId);
         if (!run?.threadId)
             return undefined;
         const trackedIssue = this.db.issueToTrackedIssue(issue);
@@ -1221,7 +422,7 @@ export class RunOrchestrator {
     }
     // ─── Reconciliation ───────────────────────────────────────────────
     async reconcileActiveRuns() {
-        for (const run of this.db.listRunningRuns()) {
+        for (const run of this.db.runs.listRunningRuns()) {
             await this.reconcileRun(run);
         }
         // Preemptively detect stuck merge-queue PRs (conflicts visible on
@@ -1279,118 +480,14 @@ export class RunOrchestrator {
      * escalate; backoff delay not elapsed → skip.
      */
     recoverOrEscalate(issue, runType, reason) {
-        // Re-read issue after the run was cleared (activeRunId is now null)
-        const fresh = this.db.getIssue(issue.projectId, issue.linearIssueId);
-        if (!fresh)
-            return;
-        if (isRequestedChangesRunType(runType)) {
-            const updated = this.withHeldIssueSessionLease(fresh.projectId, fresh.linearIssueId, (lease) => {
-                this.db.clearPendingIssueSessionEventsWithLease(lease);
-                this.db.upsertIssueWithLease(lease, {
-                    projectId: fresh.projectId,
-                    linearIssueId: fresh.linearIssueId,
-                    pendingRunType: null,
-                    pendingRunContextJson: null,
-                    factoryState: "escalated",
-                });
-                return true;
-            });
-            if (!updated) {
-                this.logger.warn({ issueKey: fresh.issueKey, reason }, "Skipping review-fix recovery escalation after losing issue-session lease");
-                this.releaseIssueSessionLease(fresh.projectId, fresh.linearIssueId);
-                return;
-            }
-            this.logger.warn({ issueKey: fresh.issueKey, reason }, "Requested-changes run failed before a new head was published — escalating");
-            this.feed?.publish({
-                level: "error",
-                kind: "workflow",
-                issueKey: fresh.issueKey,
-                projectId: fresh.projectId,
-                stage: runType,
-                status: "escalated",
-                summary: `Requested-changes run failed before publishing a new head (${reason})`,
-            });
-            this.releaseIssueSessionLease(fresh.projectId, fresh.linearIssueId);
-            return;
-        }
-        // If PR already merged, transition to done — no retry needed
-        if (fresh.prState === "merged") {
-            const updated = this.withHeldIssueSessionLease(fresh.projectId, fresh.linearIssueId, (lease) => {
-                this.db.upsertIssueWithLease(lease, {
-                    projectId: fresh.projectId,
-                    linearIssueId: fresh.linearIssueId,
-                    factoryState: "done",
-                    zombieRecoveryAttempts: 0,
-                    lastZombieRecoveryAt: null,
-                });
-                return true;
-            });
-            if (!updated) {
-                this.logger.warn({ issueKey: fresh.issueKey, reason }, "Skipping merged recovery completion after losing issue-session lease");
-                this.releaseIssueSessionLease(fresh.projectId, fresh.linearIssueId);
-                return;
-            }
-            this.logger.info({ issueKey: fresh.issueKey, reason }, "Recovery: PR already merged — transitioning to done");
-            this.releaseIssueSessionLease(fresh.projectId, fresh.linearIssueId);
-            return;
-        }
-        // Budget check
-        const attempts = fresh.zombieRecoveryAttempts + 1;
-        if (attempts > DEFAULT_ZOMBIE_RECOVERY_BUDGET) {
-            const updated = this.withHeldIssueSessionLease(fresh.projectId, fresh.linearIssueId, (lease) => {
-                this.db.upsertIssueWithLease(lease, {
-                    projectId: fresh.projectId,
-                    linearIssueId: fresh.linearIssueId,
-                    factoryState: "escalated",
-                });
-                return true;
-            });
-            if (!updated) {
-                this.logger.warn({ issueKey: fresh.issueKey, attempts, reason }, "Skipping recovery escalation after losing issue-session lease");
-                this.releaseIssueSessionLease(fresh.projectId, fresh.linearIssueId);
-                return;
-            }
-            this.logger.warn({ issueKey: fresh.issueKey, attempts, reason }, "Recovery: budget exhausted — escalating");
-            this.feed?.publish({
-                level: "error",
-                kind: "workflow",
-                issueKey: fresh.issueKey,
-                projectId: fresh.projectId,
-                stage: "escalated",
-                status: "budget_exhausted",
-                summary: `${reason} recovery failed after ${DEFAULT_ZOMBIE_RECOVERY_BUDGET} attempts`,
-            });
-            this.releaseIssueSessionLease(fresh.projectId, fresh.linearIssueId);
-            return;
-        }
-        // Exponential backoff — skip if delay hasn't elapsed
-        if (fresh.lastZombieRecoveryAt) {
-            const elapsed = Date.now() - new Date(fresh.lastZombieRecoveryAt).getTime();
-            const delay = ZOMBIE_RECOVERY_BASE_DELAY_MS * Math.pow(2, fresh.zombieRecoveryAttempts);
-            if (elapsed < delay) {
-                this.logger.debug({ issueKey: fresh.issueKey, attempts: fresh.zombieRecoveryAttempts, delay, elapsed }, "Recovery: backoff not elapsed, skipping");
-                return;
-            }
-        }
-        // Re-enqueue with backoff tracking
-        const requeued = this.withHeldIssueSessionLease(fresh.projectId, fresh.linearIssueId, (lease) => {
-            this.db.upsertIssueWithLease(lease, {
-                projectId: fresh.projectId,
-                linearIssueId: fresh.linearIssueId,
-                pendingRunType: null,
-                pendingRunContextJson: null,
-                zombieRecoveryAttempts: attempts,
-                lastZombieRecoveryAt: new Date().toISOString(),
-            });
-            return this.appendWakeEventWithLease(lease, fresh, runType, undefined, `recovery:${attempts}`);
+        this.runRecovery.recoverOrEscalate({
+            issue,
+            runType,
+            reason,
+            isRequestedChangesRunType,
+            withHeldLease: (projectId, linearIssueId, fn) => this.withHeldIssueSessionLease(projectId, linearIssueId, fn),
+            appendWakeEventWithLease: (lease, targetIssue, pendingRunType, context, dedupeScope) => this.appendWakeEventWithLease(lease, targetIssue, pendingRunType, context, dedupeScope),
         });
-        if (!requeued) {
-            this.logger.warn({ issueKey: fresh.issueKey, attempts, reason }, "Skipping recovery re-enqueue after losing issue-session lease");
-            this.releaseIssueSessionLease(fresh.projectId, fresh.linearIssueId);
-            return;
-        }
-        this.enqueueIssue(fresh.projectId, fresh.linearIssueId);
-        this.logger.info({ issueKey: fresh.issueKey, attempts, reason }, "Recovery: re-enqueued with backoff");
     }
     async reconcileRun(run) {
         const issue = this.db.getIssue(run.projectId, run.linearIssueId);
@@ -1407,7 +504,7 @@ export class RunOrchestrator {
         // (e.g. pr_merged processed, DB manually edited), just release the run.
         if (TERMINAL_STATES.has(issue.factoryState)) {
             this.withHeldIssueSessionLease(run.projectId, run.linearIssueId, () => {
-                this.db.finishRun(run.id, { status: "released", failureReason: "Issue reached terminal state during active run" });
+                this.db.runs.finishRun(run.id, { status: "released", failureReason: "Issue reached terminal state during active run" });
                 this.db.upsertIssue({ projectId: run.projectId, linearIssueId: run.linearIssueId, activeRunId: null });
             });
             this.logger.info({ issueKey: issue.issueKey, runId: run.id, factoryState: issue.factoryState }, "Reconciliation: released run on terminal issue");
@@ -1420,7 +517,7 @@ export class RunOrchestrator {
         if (!run.threadId) {
             this.logger.warn({ issueKey: issue.issueKey, runId: run.id, runType: run.runType }, "Zombie run detected (no thread)");
             this.withHeldIssueSessionLease(run.projectId, run.linearIssueId, () => {
-                this.db.finishRun(run.id, { status: "failed", failureReason: "Zombie: never started (no thread after restart)" });
+                this.db.runs.finishRun(run.id, { status: "failed", failureReason: "Zombie: never started (no thread after restart)" });
                 this.db.upsertIssue({ projectId: run.projectId, linearIssueId: run.linearIssueId, activeRunId: null });
             });
             this.recoverOrEscalate(issue, run.runType, "zombie");
@@ -1438,7 +535,7 @@ export class RunOrchestrator {
         catch {
             this.logger.warn({ issueKey: issue.issueKey, runId: run.id, runType: run.runType, threadId: run.threadId }, "Stale thread during reconciliation");
             this.withHeldIssueSessionLease(run.projectId, run.linearIssueId, () => {
-                this.db.finishRun(run.id, { status: "failed", failureReason: "Stale thread after restart" });
+                this.db.runs.finishRun(run.id, { status: "failed", failureReason: "Stale thread after restart" });
                 this.db.upsertIssue({ projectId: run.projectId, linearIssueId: run.linearIssueId, activeRunId: null });
             });
             this.recoverOrEscalate(issue, run.runType, "stale_thread");
@@ -1456,7 +553,7 @@ export class RunOrchestrator {
                 const stopState = resolveAuthoritativeLinearStopState(linearIssue);
                 if (stopState?.isFinal) {
                     this.withHeldIssueSessionLease(run.projectId, run.linearIssueId, () => {
-                        this.db.finishRun(run.id, { status: "released" });
+                        this.db.runs.finishRun(run.id, { status: "released" });
                         this.db.upsertIssue({
                             projectId: run.projectId,
                             linearIssueId: run.linearIssueId,
@@ -1490,21 +587,21 @@ export class RunOrchestrator {
             // Interrupted runs are not real failures — undo the budget increment.
             const repairedCounters = this.withHeldIssueSessionLease(issue.projectId, issue.linearIssueId, (lease) => {
                 if (run.runType === "ci_repair" && issue.ciRepairAttempts > 0) {
-                    this.db.upsertIssueWithLease(lease, {
+                    this.db.issueSessions.upsertIssueWithLease(lease, {
                         projectId: issue.projectId,
                         linearIssueId: issue.linearIssueId,
                         ciRepairAttempts: issue.ciRepairAttempts - 1,
                     });
                 }
                 else if (run.runType === "queue_repair" && issue.queueRepairAttempts > 0) {
-                    this.db.upsertIssueWithLease(lease, {
+                    this.db.issueSessions.upsertIssueWithLease(lease, {
                         projectId: issue.projectId,
                         linearIssueId: issue.linearIssueId,
                         queueRepairAttempts: issue.queueRepairAttempts - 1,
                     });
                 }
                 if (run.runType === "ci_repair" || run.runType === "queue_repair") {
-                    this.db.upsertIssueWithLease(lease, {
+                    this.db.issueSessions.upsertIssueWithLease(lease, {
                         projectId: issue.projectId,
                         linearIssueId: issue.linearIssueId,
                         lastAttemptedFailureHeadSha: null,
@@ -1596,140 +693,25 @@ export class RunOrchestrator {
         }
         // Handle completed turn discovered during reconciliation
         if (latestTurn?.status === "completed") {
-            const trackedIssue = this.db.issueToTrackedIssue(issue);
-            const report = buildStageReport({ ...run, status: "completed" }, trackedIssue, thread, countEventMethods(this.db.listThreadEvents(run.id)));
-            const freshIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? issue;
-            const verifiedRepairError = await this.verifyReactiveRunAdvancedBranch(run, freshIssue);
-            if (verifiedRepairError) {
-                const holdState = resolveRecoverablePostRunState(freshIssue) ?? "failed";
-                this.failRunAndClear(run, verifiedRepairError, holdState);
-                this.feed?.publish({
-                    level: "warn",
-                    kind: "turn",
-                    issueKey: issue.issueKey,
-                    projectId: run.projectId,
-                    stage: run.runType,
-                    status: "branch_not_advanced",
-                    summary: verifiedRepairError,
-                });
-                const heldIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? freshIssue;
-                void this.linearSync.emitActivity(heldIssue, buildRunFailureActivity(run.runType, verifiedRepairError));
-                void this.linearSync.syncSession(heldIssue, { activeRunType: run.runType });
-                this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
-                return;
-            }
-            const missingReviewFixHeadError = await this.verifyReviewFixAdvancedHead(run, freshIssue);
-            if (missingReviewFixHeadError) {
-                this.failRunAndClear(run, missingReviewFixHeadError, "escalated");
-                const failedIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? freshIssue;
-                this.feed?.publish({
-                    level: "error",
-                    kind: "turn",
-                    issueKey: freshIssue.issueKey,
-                    projectId: run.projectId,
-                    stage: run.runType,
-                    status: "same_head_review_handoff_blocked",
-                    summary: missingReviewFixHeadError,
-                });
-                void this.linearSync.emitActivity(failedIssue, buildRunFailureActivity(run.runType, missingReviewFixHeadError));
-                void this.linearSync.syncSession(failedIssue, { activeRunType: run.runType });
-                this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
-                return;
-            }
-            const publishedOutcomeError = await this.verifyPublishedRunOutcome(run, freshIssue);
-            if (publishedOutcomeError) {
-                this.failRunAndClear(run, publishedOutcomeError, "failed");
-                this.feed?.publish({
-                    level: "warn",
-                    kind: "turn",
-                    issueKey: issue.issueKey,
-                    projectId: run.projectId,
-                    stage: run.runType,
-                    status: "publish_incomplete",
-                    summary: publishedOutcomeError,
-                });
-                const failedIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? freshIssue;
-                void this.linearSync.emitActivity(failedIssue, buildRunFailureActivity(run.runType, publishedOutcomeError));
-                void this.linearSync.syncSession(failedIssue, { activeRunType: run.runType });
-                this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
-                return;
-            }
-            const refreshedIssue = await this.refreshIssueAfterReactivePublish(run, freshIssue);
-            const postRunFollowUp = await this.resolvePostRunFollowUp(run, refreshedIssue);
-            const postRunState = postRunFollowUp?.factoryState ?? resolveCompletedRunState(refreshedIssue, run);
-            const reconciled = this.withHeldIssueSessionLease(run.projectId, run.linearIssueId, (lease) => {
-                this.db.finishRun(run.id, {
-                    status: "completed",
-                    ...(run.threadId ? { threadId: run.threadId } : {}),
-                    ...(latestTurn.id ? { turnId: latestTurn.id } : {}),
-                    summaryJson: JSON.stringify({ latestAssistantMessage: report.assistantMessages.at(-1) ?? null }),
-                    reportJson: JSON.stringify(report),
-                });
-                this.db.upsertIssue({
-                    projectId: run.projectId,
-                    linearIssueId: run.linearIssueId,
-                    activeRunId: null,
-                    ...(postRunState ? { factoryState: postRunState } : {}),
-                    pendingRunType: null,
-                    pendingRunContextJson: null,
-                    ...(postRunFollowUp ? {} : (postRunState === "awaiting_queue" || postRunState === "done"
-                        ? {
-                            lastGitHubFailureSource: null,
-                            lastGitHubFailureHeadSha: null,
-                            lastGitHubFailureSignature: null,
-                            lastGitHubFailureCheckName: null,
-                            lastGitHubFailureCheckUrl: null,
-                            lastGitHubFailureContextJson: null,
-                            lastGitHubFailureAt: null,
-                            lastQueueIncidentJson: null,
-                            lastAttemptedFailureHeadSha: null,
-                            lastAttemptedFailureSignature: null,
-                        }
-                        : {})),
-                });
-                if (postRunFollowUp) {
-                    return this.appendWakeEventWithLease(lease, issue, postRunFollowUp.pendingRunType, postRunFollowUp.context, "post_run");
-                }
-                return true;
+            await this.runFinalizer.finalizeCompletedRun({
+                source: "reconciliation",
+                run,
+                issue,
+                thread,
+                threadId: run.threadId,
+                ...(latestTurn.id ? { completedTurnId: latestTurn.id } : {}),
+                withHeldLease: (projectId, linearIssueId, fn) => this.withHeldIssueSessionLease(projectId, linearIssueId, fn),
+                releaseLease: (projectId, linearIssueId) => this.releaseIssueSessionLease(projectId, linearIssueId),
+                failRunAndClear: (targetRun, message, nextState) => this.failRunAndClear(targetRun, message, nextState),
+                verifyReactiveRunAdvancedBranch: (targetRun, targetIssue) => this.verifyReactiveRunAdvancedBranch(targetRun, targetIssue),
+                verifyReviewFixAdvancedHead: (targetRun, targetIssue) => this.verifyReviewFixAdvancedHead(targetRun, targetIssue),
+                verifyPublishedRunOutcome: (targetRun, targetIssue) => this.verifyPublishedRunOutcome(targetRun, targetIssue),
+                refreshIssueAfterReactivePublish: (targetRun, targetIssue) => this.refreshIssueAfterReactivePublish(targetRun, targetIssue),
+                resolvePostRunFollowUp: (targetRun, targetIssue) => this.resolvePostRunFollowUp(targetRun, targetIssue),
+                resolveCompletedRunState,
+                resolveRecoverableRunState: resolveRecoverablePostRunState,
+                appendWakeEventWithLease: (lease, targetIssue, runType, context, dedupeScope) => this.appendWakeEventWithLease(lease, targetIssue, runType, context, dedupeScope),
             });
-            if (!reconciled) {
-                this.logger.warn({ runId: run.id, issueId: run.linearIssueId }, "Skipping reconciled completion writes after losing issue-session lease");
-                this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
-                return;
-            }
-            if (postRunFollowUp) {
-                this.feed?.publish({
-                    level: "info",
-                    kind: "stage",
-                    issueKey: issue.issueKey,
-                    projectId: run.projectId,
-                    stage: postRunFollowUp.factoryState,
-                    status: "follow_up_queued",
-                    summary: postRunFollowUp.summary,
-                });
-                this.enqueueIssue(run.projectId, run.linearIssueId);
-            }
-            if (postRunState) {
-                this.feed?.publish({
-                    level: "info",
-                    kind: "turn",
-                    issueKey: issue.issueKey,
-                    projectId: run.projectId,
-                    stage: run.runType,
-                    status: "completed",
-                    summary: `Reconciliation: ${run.runType} completed \u2192 ${postRunState}`,
-                });
-            }
-            const updatedIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? refreshedIssue;
-            const completionSummary = report.assistantMessages.at(-1)?.slice(0, 300) ?? `${run.runType} completed.`;
-            void this.linearSync.emitActivity(updatedIssue, buildRunCompletedActivity({
-                runType: run.runType,
-                completionSummary,
-                postRunState: updatedIssue.factoryState,
-                ...(updatedIssue.prNumber !== undefined ? { prNumber: updatedIssue.prNumber } : {}),
-            }));
-            void this.linearSync.syncSession(updatedIssue);
-            this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
             return;
         }
         if (acquiredRecoveryLease)
@@ -1737,69 +719,21 @@ export class RunOrchestrator {
     }
     // ─── Internal helpers ─────────────────────────────────────────────
     escalate(issue, runType, reason) {
-        this.logger.warn({ issueKey: issue.issueKey, runType, reason }, "Escalating to human");
-        const escalated = this.withHeldIssueSessionLease(issue.projectId, issue.linearIssueId, (lease) => {
-            if (issue.activeRunId) {
-                this.db.finishRunWithLease(lease, issue.activeRunId, { status: "released" });
-            }
-            this.db.clearPendingIssueSessionEventsWithLease(lease);
-            this.db.upsertIssueWithLease(lease, {
-                projectId: issue.projectId,
-                linearIssueId: issue.linearIssueId,
-                pendingRunType: null,
-                pendingRunContextJson: null,
-                activeRunId: null,
-                factoryState: "escalated",
-            });
-            return true;
+        this.runRecovery.escalate({
+            issue,
+            runType,
+            reason,
+            withHeldLease: (projectId, linearIssueId, fn) => this.withHeldIssueSessionLease(projectId, linearIssueId, fn),
         });
-        if (!escalated) {
-            this.logger.warn({ issueKey: issue.issueKey, runType }, "Skipping escalation write after losing issue-session lease");
-            this.releaseIssueSessionLease(issue.projectId, issue.linearIssueId);
-            return;
-        }
-        this.feed?.publish({
-            level: "error",
-            kind: "workflow",
-            issueKey: issue.issueKey,
-            projectId: issue.projectId,
-            stage: runType,
-            status: "escalated",
-            summary: `Escalated: ${reason}`,
-        });
-        const escalatedIssue = this.db.getIssue(issue.projectId, issue.linearIssueId) ?? issue;
-        void this.linearSync.emitActivity(escalatedIssue, {
-            type: "error",
-            body: `PatchRelay needs human help to continue.\n\n${reason}`,
-        });
-        void this.linearSync.syncSession(escalatedIssue);
-        this.releaseIssueSessionLease(issue.projectId, issue.linearIssueId);
     }
     failRunAndClear(run, message, nextState = "failed") {
-        const updated = this.withHeldIssueSessionLease(run.projectId, run.linearIssueId, (lease) => {
-            this.db.finishRun(run.id, { status: "failed", failureReason: message });
-            if (nextState === "failed" || nextState === "escalated" || nextState === "awaiting_input" || nextState === "done") {
-                this.db.clearPendingIssueSessionEventsWithLease(lease);
-            }
-            this.db.upsertIssue({
-                projectId: run.projectId,
-                linearIssueId: run.linearIssueId,
-                activeRunId: null,
-                factoryState: nextState,
-            });
-            const branchOwner = this.resolveBranchOwnerForStateTransition(nextState);
-            if (branchOwner) {
-                const lease = this.getHeldIssueSessionLease(run.projectId, run.linearIssueId);
-                if (lease) {
-                    this.db.setBranchOwnerWithLease(lease, branchOwner);
-                }
-            }
-            return true;
+        this.runRecovery.failRunAndClear({
+            run,
+            message,
+            nextState,
+            withHeldLease: (projectId, linearIssueId, fn) => this.withHeldIssueSessionLease(projectId, linearIssueId, fn),
+            getHeldLease: (projectId, linearIssueId) => this.getHeldIssueSessionLease(projectId, linearIssueId),
         });
-        if (!updated) {
-            this.logger.warn({ runId: run.id, issueId: run.linearIssueId }, "Skipping failure cleanup after losing issue-session lease");
-        }
-        this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
     }
     resolveBranchOwnerForStateTransition(newState, pendingRunType) {
         return resolveBranchOwnerForStateTransition(newState, pendingRunType);
@@ -2147,20 +1081,11 @@ export class RunOrchestrator {
         }
         throw new Error(`Failed to read thread ${threadId}`);
     }
-    issueSessionLeaseKey(projectId, linearIssueId) {
-        return `${projectId}:${linearIssueId}`;
-    }
     getHeldIssueSessionLease(projectId, linearIssueId) {
-        const leaseId = this.activeSessionLeases.get(this.issueSessionLeaseKey(projectId, linearIssueId));
-        if (!leaseId)
-            return undefined;
-        return { projectId, linearIssueId, leaseId };
+        return this.leaseService.getHeldLease(projectId, linearIssueId);
     }
     withHeldIssueSessionLease(projectId, linearIssueId, fn) {
-        const lease = this.getHeldIssueSessionLease(projectId, linearIssueId);
-        if (!lease)
-            return undefined;
-        return this.db.withIssueSessionLease(projectId, linearIssueId, lease.leaseId, () => fn(lease));
+        return this.leaseService.withHeldLease(projectId, linearIssueId, fn);
     }
     upsertIssueIfLeaseHeld(projectId, linearIssueId, params, context) {
         const lease = this.getHeldIssueSessionLease(projectId, linearIssueId);
@@ -2168,7 +1093,7 @@ export class RunOrchestrator {
             this.logger.warn({ projectId, linearIssueId, context }, "Skipping issue write without a held issue-session lease");
             return undefined;
         }
-        const updated = this.db.upsertIssueWithLease(lease, params);
+        const updated = this.db.issueSessions.upsertIssueWithLease(lease, params);
         if (!updated) {
             this.logger.warn({ projectId, linearIssueId, context }, "Skipping issue write after losing issue-session lease");
         }
@@ -2184,113 +1109,22 @@ export class RunOrchestrator {
         throw error;
     }
     acquireIssueSessionLease(projectId, linearIssueId) {
-        const leaseId = randomUUID();
-        const leasedUntil = new Date(Date.now() + ISSUE_SESSION_LEASE_MS).toISOString();
-        const acquired = this.db.acquireIssueSessionLease({
-            projectId,
-            linearIssueId,
-            leaseId,
-            workerId: this.workerId,
-            leasedUntil,
-        });
-        if (!acquired)
-            return undefined;
-        this.activeSessionLeases.set(this.issueSessionLeaseKey(projectId, linearIssueId), leaseId);
-        return leaseId;
+        return this.leaseService.acquire(projectId, linearIssueId);
     }
     forceAcquireIssueSessionLease(projectId, linearIssueId) {
-        const leaseId = randomUUID();
-        const leasedUntil = new Date(Date.now() + ISSUE_SESSION_LEASE_MS).toISOString();
-        const acquired = this.db.forceAcquireIssueSessionLease({
-            projectId,
-            linearIssueId,
-            leaseId,
-            workerId: this.workerId,
-            leasedUntil,
-        });
-        if (!acquired)
-            return undefined;
-        this.activeSessionLeases.set(this.issueSessionLeaseKey(projectId, linearIssueId), leaseId);
-        return leaseId;
+        return this.leaseService.forceAcquire(projectId, linearIssueId);
     }
     claimLeaseForReconciliation(projectId, linearIssueId) {
-        const key = this.issueSessionLeaseKey(projectId, linearIssueId);
-        if (this.activeSessionLeases.has(key)) {
-            return "owned";
-        }
-        const session = this.db.getIssueSession(projectId, linearIssueId);
-        if (!session)
-            return "skip";
-        const leasedUntilMs = session.leasedUntil ? Date.parse(session.leasedUntil) : undefined;
-        if (leasedUntilMs !== undefined && Number.isFinite(leasedUntilMs) && leasedUntilMs > Date.now()) {
-            return "skip";
-        }
-        return this.acquireIssueSessionLease(projectId, linearIssueId) ? true : "skip";
+        return this.leaseService.claimForReconciliation(projectId, linearIssueId);
     }
     async reclaimForeignRecoveryLeaseIfSafe(run, issue) {
-        const key = this.issueSessionLeaseKey(run.projectId, run.linearIssueId);
-        if (this.activeSessionLeases.has(key)) {
-            return false;
-        }
-        const session = this.db.getIssueSession(run.projectId, run.linearIssueId);
-        if (!session?.leaseId || !session.workerId || session.workerId === this.workerId) {
-            return false;
-        }
-        if (issue.activeRunId !== run.id) {
-            return false;
-        }
-        let safeToReclaim = !run.threadId;
-        if (!safeToReclaim && run.threadId) {
-            try {
-                const thread = await this.readThreadWithRetry(run.threadId, 1);
-                const latestTurn = getThreadTurns(thread).at(-1);
-                safeToReclaim = thread.status === "notLoaded"
-                    || latestTurn?.status === "interrupted"
-                    || latestTurn?.status === "completed";
-            }
-            catch {
-                safeToReclaim = true;
-            }
-        }
-        if (!safeToReclaim) {
-            return false;
-        }
-        const leaseId = this.forceAcquireIssueSessionLease(run.projectId, run.linearIssueId);
-        if (!leaseId) {
-            return false;
-        }
-        this.logger.info({
-            issueKey: issue.issueKey,
-            runId: run.id,
-            previousWorkerId: session.workerId,
-            previousLeaseId: session.leaseId,
-            reclaimedLeaseId: leaseId,
-        }, "Reclaimed foreign issue-session lease for active-run recovery");
-        return true;
+        return await this.leaseService.reclaimForeignRecoveryLeaseIfSafe(run, issue);
     }
     heartbeatIssueSessionLease(projectId, linearIssueId) {
-        const key = this.issueSessionLeaseKey(projectId, linearIssueId);
-        const leaseId = this.activeSessionLeases.get(key) ?? this.db.getIssueSession(projectId, linearIssueId)?.leaseId;
-        if (!leaseId)
-            return false;
-        const renewed = this.db.renewIssueSessionLease({
-            projectId,
-            linearIssueId,
-            leaseId,
-            leasedUntil: new Date(Date.now() + ISSUE_SESSION_LEASE_MS).toISOString(),
-        });
-        if (renewed) {
-            this.activeSessionLeases.set(key, leaseId);
-            return true;
-        }
-        this.activeSessionLeases.delete(key);
-        return false;
+        return this.leaseService.heartbeat(projectId, linearIssueId);
     }
     releaseIssueSessionLease(projectId, linearIssueId) {
-        const key = this.issueSessionLeaseKey(projectId, linearIssueId);
-        const leaseId = this.activeSessionLeases.get(key);
-        this.db.releaseIssueSessionLease(projectId, linearIssueId, leaseId);
-        this.activeSessionLeases.delete(key);
+        this.leaseService.release(projectId, linearIssueId);
     }
 }
 /**
@@ -2377,82 +1211,3 @@ function buildReviewFixBranchUpkeepContext(prNumber, baseBranch, pr, context) {
         baseBranch,
     };
 }
-function appendQueueRepairContext(lines, context) {
-    const incidentTitle = typeof context?.incidentTitle === "string" ? context.incidentTitle.trim() : "";
-    const incidentSummary = typeof context?.incidentSummary === "string" ? context.incidentSummary.trim() : "";
-    const incidentId = typeof context?.incidentId === "string" ? context.incidentId.trim() : "";
-    const incidentUrl = typeof context?.incidentUrl === "string" ? context.incidentUrl.trim() : "";
-    const incidentContext = context?.incidentContext && typeof context.incidentContext === "object"
-        ? context.incidentContext
-        : undefined;
-    const failureClass = typeof incidentContext?.failureClass === "string" ? incidentContext.failureClass : "";
-    const baseSha = typeof incidentContext?.baseSha === "string" ? incidentContext.baseSha : "";
-    const prHeadSha = typeof incidentContext?.prHeadSha === "string" ? incidentContext.prHeadSha : "";
-    const baseBranch = typeof incidentContext?.baseBranch === "string" ? incidentContext.baseBranch : "";
-    const branch = typeof incidentContext?.branch === "string" ? incidentContext.branch : "";
-    const queuePosition = typeof incidentContext?.queuePosition === "number" ? String(incidentContext.queuePosition) : "";
-    const conflictFiles = Array.isArray(incidentContext?.conflictFiles)
-        ? incidentContext.conflictFiles.filter((entry) => typeof entry === "string")
-        : [];
-    const failedChecks = Array.isArray(incidentContext?.failedChecks)
-        ? incidentContext.failedChecks
-            .filter((entry) => Boolean(entry) && typeof entry === "object")
-            .map((entry) => ({
-            name: typeof entry.name === "string" ? entry.name : "unknown",
-            conclusion: typeof entry.conclusion === "string" ? entry.conclusion : "unknown",
-            ...(typeof entry.url === "string" ? { url: entry.url } : {}),
-        }))
-        : [];
-    const retryHistory = Array.isArray(incidentContext?.retryHistory)
-        ? incidentContext.retryHistory
-            .filter((entry) => Boolean(entry) && typeof entry === "object")
-            .map((entry) => ({
-            at: typeof entry.at === "string" ? entry.at : "unknown",
-            baseSha: typeof entry.baseSha === "string" ? entry.baseSha : "unknown",
-            outcome: typeof entry.outcome === "string" ? entry.outcome : "unknown",
-        }))
-        : [];
-    if (!incidentTitle && !incidentSummary && !incidentId && !incidentUrl && !failureClass && !baseSha && !prHeadSha
-        && !queuePosition && conflictFiles.length === 0 && failedChecks.length === 0 && retryHistory.length === 0) {
-        return;
-    }
-    lines.push("## Queue Incident Context", "");
-    if (incidentTitle)
-        lines.push(`Incident: ${incidentTitle}`);
-    if (incidentId)
-        lines.push(`Incident ID: ${incidentId}`);
-    if (incidentUrl)
-        lines.push(`Incident URL: ${incidentUrl}`);
-    if (incidentSummary)
-        lines.push("", incidentSummary, "");
-    if (failureClass)
-        lines.push(`Failure class: ${failureClass}`);
-    if (baseBranch)
-        lines.push(`Base branch: ${baseBranch}`);
-    if (baseSha)
-        lines.push(`Base SHA: ${baseSha}`);
-    if (branch)
-        lines.push(`Queue branch: ${branch}`);
-    if (prHeadSha)
-        lines.push(`Queue branch head SHA: ${prHeadSha}`);
-    if (queuePosition)
-        lines.push(`Queue position at eviction: ${queuePosition}`);
-    if (conflictFiles.length > 0) {
-        lines.push("", "Conflicting files:");
-        for (const file of conflictFiles)
-            lines.push(`- ${file}`);
-    }
-    if (failedChecks.length > 0) {
-        lines.push("", "Failed checks:");
-        for (const check of failedChecks) {
-            lines.push(`- ${check.name} (${check.conclusion})${check.url ? ` ${check.url}` : ""}`);
-        }
-    }
-    if (retryHistory.length > 0) {
-        lines.push("", "Retry history:");
-        for (const retry of retryHistory) {
-            lines.push(`- ${retry.at}: ${retry.outcome} on base ${retry.baseSha}`);
-        }
-    }
-    lines.push("");
-}