patchrelay 0.36.7 → 0.36.9

package/dist/run-orchestrator.js

@@ -1,63 +1,25 @@
-import { randomUUID } from "node:crypto";
-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 { TERMINAL_STATES } from "./factory-state.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";
-import { loadPatchRelayRepoPrompting } from "./patchrelay-customization.js";
-import { buildRunPrompt as buildPatchRelayRunPrompt, findDisallowedPatchRelayPromptSectionIds, findUnknownPatchRelayPromptSectionIds, mergePromptCustomizationLayers, resolveImplementationDeliveryMode, resolvePromptLayers, } from "./prompting/patchrelay.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 { 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 { InterruptedRunRecovery, resolveRecoverablePostRunState } from "./interrupted-run-recovery.js";
+import { RunCompletionPolicy } from "./run-completion-policy.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;
 }
 function isRequestedChangesRunType(runType) {
     return runType === "review_fix" || runType === "branch_upkeep";
 }
-function resolveRequestedChangesMode(runType, context) {
-    if (runType === "branch_upkeep") {
-        return "branch_upkeep";
-    }
-    return context?.reviewFixMode === "branch_upkeep" || context?.branchUpkeepRequired === true
-        ? "branch_upkeep"
-        : "address_review_feedback";
-}
-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;
-}
 export class RunOrchestrator {
     config;
     db;
@@ -73,7 +35,14 @@ export class RunOrchestrator {
     linearSync;
     activeThreadId;
     workerId = `patchrelay:${process.pid}`;
-    activeSessionLeases = new Map();
+    leaseService;
+    runFinalizer;
+    runLauncher;
+    runRecovery;
+    runWakePlanner;
+    interruptedRunRecovery;
+    runCompletionPolicy;
+    activeSessionLeases;
     botIdentity;
     constructor(config, db, codex, linearProvider, enqueueIssue, logger, feed) {
         this.config = config;
@@ -85,6 +54,14 @@ 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.runCompletionPolicy = new RunCompletionPolicy(config, db, logger, (projectId, linearIssueId, fn) => this.withHeldIssueSessionLease(projectId, linearIssueId, fn));
+        this.runFinalizer = new RunFinalizer(db, logger, this.linearSync, this.enqueueIssue, (projectId, linearIssueId, fn) => this.withHeldIssueSessionLease(projectId, linearIssueId, fn), (projectId, linearIssueId) => this.releaseIssueSessionLease(projectId, linearIssueId), (lease, issue, runType, context, dedupeScope) => this.appendWakeEventWithLease(lease, issue, runType, context, dedupeScope), (run, message, nextState) => this.failRunAndClear(run, message, nextState), this.runCompletionPolicy, feed);
+        this.runLauncher = new RunLauncher(config, db, codex, logger, this.worktreeManager);
+        this.runRecovery = new RunRecoveryService(db, logger, this.linearSync, (projectId, linearIssueId, fn) => this.withHeldIssueSessionLease(projectId, linearIssueId, fn), (projectId, linearIssueId) => this.getHeldIssueSessionLease(projectId, linearIssueId), (lease, issue, runType, context, dedupeScope) => this.appendWakeEventWithLease(lease, issue, runType, context, dedupeScope), (projectId, linearIssueId) => this.releaseIssueSessionLease(projectId, linearIssueId), (projectId, issueId) => this.enqueueIssue(projectId, issueId), (newState, pendingRunType) => this.resolveBranchOwnerForStateTransition(newState, pendingRunType), feed);
+        this.interruptedRunRecovery = new InterruptedRunRecovery(db, logger, this.linearSync, (projectId, linearIssueId, fn) => this.withHeldIssueSessionLease(projectId, linearIssueId, fn), (projectId, linearIssueId) => this.releaseIssueSessionLease(projectId, linearIssueId), (run, message, nextState) => this.failRunAndClear(run, message, nextState), (issue) => this.restoreIdleWorktree(issue), this.runCompletionPolicy, (projectId, issueId) => this.enqueueIssue(projectId, issueId), feed);
+        this.runWakePlanner = new RunWakePlanner(db);
         this.idleReconciler = new IdleIssueReconciler(db, config, {
             enqueueIssue: (projectId, issueId) => this.enqueueIssue(projectId, issueId),
         }, logger, feed);
@@ -94,205 +71,78 @@ 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);
+        const issue = this.db.issues.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;
         const effectiveContext = isRequestedChangesRunType(runType)
-            ? await this.resolveRequestedChangesWakeContext(issue, runType, context, project)
+            ? await this.runCompletionPolicy.resolveRequestedChangesWakeContext(issue, runType, context)
             : context;
         const sourceHeadSha = typeof effectiveContext?.failureHeadSha === "string"
             ? effectiveContext.failureHeadSha
             : 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)`);
-            return;
-        }
-        if (runType === "queue_repair" && issue.queueRepairAttempts >= DEFAULT_QUEUE_REPAIR_BUDGET) {
-            this.escalate(issue, runType, `Queue repair budget exhausted (${DEFAULT_QUEUE_REPAIR_BUDGET} attempts)`);
+        const budgetExceeded = this.runWakePlanner.budgetExceeded(issue, runType, isRequestedChangesRunType);
+        if (budgetExceeded) {
+            this.escalate(issue, runType, budgetExceeded);
             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;
-            }
-        }
-        const repoPrompting = loadPatchRelayRepoPrompting({
-            repoRoot: project.repoPath,
-            logger: this.logger,
-        });
-        const promptLayer = mergePromptCustomizationLayers(resolvePromptLayers(this.config.prompting, runType), resolvePromptLayers(repoPrompting, runType));
-        const unknownPromptSections = findUnknownPatchRelayPromptSectionIds(promptLayer);
-        if (unknownPromptSections.length > 0) {
-            this.logger.warn({ issueKey: issue.issueKey, runType, unknownPromptSections }, "PatchRelay prompt customization references unknown section ids");
-        }
-        const disallowedPromptSections = findDisallowedPatchRelayPromptSectionIds(promptLayer);
-        if (disallowedPromptSections.length > 0) {
-            this.logger.warn({ issueKey: issue.issueKey, runType, disallowedPromptSections }, "PatchRelay prompt customization attempted to replace non-overridable sections");
-        }
-        const prompt = buildPatchRelayRunPrompt({
+        const { prompt, branchName, worktreePath } = this.runLauncher.prepareLaunchPlan({
+            project,
             issue,
             runType,
-            repoPath: project.repoPath,
-            ...(effectiveContext ? { context: effectiveContext } : {}),
-            ...(promptLayer ? { promptLayer } : {}),
+            ...(effectiveContext ? { 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 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);
@@ -307,110 +157,34 @@ 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),
+            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,
@@ -419,98 +193,15 @@ export class RunOrchestrator {
         }
         this.logger.info({ issueKey: issue.issueKey, runType, threadId, turnId }, `Started ${runType} run`);
         // Emit Linear activity + plan
-        const freshIssue = this.db.getIssue(item.projectId, item.issueId) ?? issue;
+        const freshIssue = this.db.issues.getIssue(item.projectId, item.issueId) ?? issue;
         void this.linearSync.emitActivity(freshIssue, buildRunStartedActivity(runType));
         void this.linearSync.syncSession(freshIssue, { activeRunType: runType });
     }
-    // ─── Pre-run branch freshening ────────────────────────────────────
-    /**
-     * Fetch origin and rebase the worktree onto the latest base branch.
-     *
-     * Risks mitigated:
-     * - Dirty worktree from interrupted run → stash before, pop after
-     * - Conflicts → abort rebase, throw so the run fails with a clear reason
-     * - Already up-to-date → no-op
-     * - Keep publishing explicit: the orchestrator updates the local worktree
-     *   only; the agent/run owns any later branch push.
-     */
-    async freshenWorktree(worktreePath, project, issue) {
-        const gitBin = this.config.runner.gitBin;
-        const baseBranch = project.github?.baseBranch ?? "main";
-        // Stash any uncommitted changes from a previous interrupted run
-        const stashResult = await execCommand(gitBin, ["-C", worktreePath, "stash"], { timeoutMs: 30_000 });
-        const didStash = stashResult.exitCode === 0 && !stashResult.stdout?.includes("No local changes");
-        // Fetch latest base
-        const fetchResult = await execCommand(gitBin, ["-C", worktreePath, "fetch", "origin", baseBranch], { timeoutMs: 60_000 });
-        if (fetchResult.exitCode !== 0) {
-            this.logger.warn({ issueKey: issue.issueKey, stderr: fetchResult.stderr?.slice(0, 300) }, "Pre-run fetch failed, proceeding with current base");
-            if (didStash)
-                await execCommand(gitBin, ["-C", worktreePath, "stash", "pop"], { timeoutMs: 10_000 });
-            return;
-        }
-        // Check if rebase is needed: is HEAD already on top of origin/baseBranch?
-        const mergeBaseResult = await execCommand(gitBin, ["-C", worktreePath, "merge-base", "--is-ancestor", `origin/${baseBranch}`, "HEAD"], { timeoutMs: 10_000 });
-        if (mergeBaseResult.exitCode === 0) {
-            // Already up-to-date — no rebase needed
-            this.logger.debug({ issueKey: issue.issueKey }, "Pre-run freshen: branch already up to date");
-            if (didStash)
-                await execCommand(gitBin, ["-C", worktreePath, "stash", "pop"], { timeoutMs: 10_000 });
-            return;
-        }
-        // Rebase onto latest base
-        const rebaseResult = await execCommand(gitBin, ["-C", worktreePath, "rebase", `origin/${baseBranch}`], { timeoutMs: 120_000 });
-        if (rebaseResult.exitCode !== 0) {
-            // Abort the failed rebase and restore state — then let the agent run
-            // proceed. The agent can resolve the conflict itself (the workflow
-            // prompt tells it to rebase and handle conflicts).
-            await execCommand(gitBin, ["-C", worktreePath, "rebase", "--abort"], { timeoutMs: 10_000 });
-            if (didStash)
-                await execCommand(gitBin, ["-C", worktreePath, "stash", "pop"], { timeoutMs: 10_000 });
-            this.logger.warn({ issueKey: issue.issueKey, baseBranch }, "Pre-run freshen: rebase conflict, agent will resolve");
-            return;
-        }
-        this.logger.info({ issueKey: issue.issueKey, baseBranch }, "Pre-run freshen: rebased locally onto latest base");
-        // Restore stashed changes
-        if (didStash)
-            await execCommand(gitBin, ["-C", worktreePath, "stash", "pop"], { timeoutMs: 10_000 });
-    }
     async resetWorktreeToTrackedBranch(worktreePath, branchName, issue) {
-        const gitBin = this.config.runner.gitBin;
-        const branchFetch = await execCommand(gitBin, ["-C", worktreePath, "fetch", "origin", branchName], { timeoutMs: 60_000 });
-        const hasRemoteBranch = branchFetch.exitCode === 0;
-        await execCommand(gitBin, ["-C", worktreePath, "rebase", "--abort"], { timeoutMs: 10_000 });
-        await execCommand(gitBin, ["-C", worktreePath, "merge", "--abort"], { timeoutMs: 10_000 });
-        await execCommand(gitBin, ["-C", worktreePath, "cherry-pick", "--abort"], { timeoutMs: 10_000 });
-        await execCommand(gitBin, ["-C", worktreePath, "am", "--abort"], { timeoutMs: 10_000 });
-        await execCommand(gitBin, ["-C", worktreePath, "reset", "--hard", "HEAD"], { timeoutMs: 30_000 });
-        await execCommand(gitBin, ["-C", worktreePath, "clean", "-fd"], { timeoutMs: 30_000 });
-        const checkoutTarget = hasRemoteBranch ? `origin/${branchName}` : branchName;
-        const checkoutResult = await execCommand(gitBin, ["-C", worktreePath, "checkout", "-B", branchName, checkoutTarget], { timeoutMs: 30_000 });
-        if (checkoutResult.exitCode !== 0) {
-            throw new Error(`Failed to restore ${branchName} worktree state: ${checkoutResult.stderr?.slice(0, 300) ?? "git checkout failed"}`);
-        }
-        const resetTarget = hasRemoteBranch ? `origin/${branchName}` : "HEAD";
-        const resetResult = await execCommand(gitBin, ["-C", worktreePath, "reset", "--hard", resetTarget], { timeoutMs: 30_000 });
-        if (resetResult.exitCode !== 0) {
-            throw new Error(`Failed to reset ${branchName} worktree state: ${resetResult.stderr?.slice(0, 300) ?? "git reset failed"}`);
-        }
-        await execCommand(gitBin, ["-C", worktreePath, "clean", "-fd"], { timeoutMs: 30_000 });
-        this.logger.debug({ issueKey: issue.issueKey, branchName, hasRemoteBranch }, "Reset issue worktree to tracked branch state");
+        await this.worktreeManager.resetWorktreeToTrackedBranch(worktreePath, branchName, issue, this.logger);
     }
     async restoreIdleWorktree(issue) {
-        if (!issue.worktreePath || !issue.branchName)
-            return;
-        try {
-            await this.resetWorktreeToTrackedBranch(issue.worktreePath, issue.branchName, issue);
-        }
-        catch (error) {
-            this.logger.warn({
-                issueKey: issue.issueKey,
-                branchName: issue.branchName,
-                worktreePath: issue.worktreePath,
-                error: error instanceof Error ? error.message : String(error),
-            }, "Failed to restore idle worktree after interrupted run");
-        }
+        await this.worktreeManager.restoreIdleWorktree(issue, this.logger);
     }
     // ─── Notification handler ─────────────────────────────────────────
     async handleCodexNotification(notification) {
@@ -526,7 +217,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)) {
@@ -535,7 +226,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 } : {}),
@@ -547,7 +238,7 @@ export class RunOrchestrator {
         this.linearSync.maybeEmitProgress(notification, run);
         // Sync codex plan to Linear session when it updates
         if (notification.method === "turn/plan/updated") {
-            const issue = this.db.getIssue(run.projectId, run.linearIssueId);
+            const issue = this.db.issues.getIssue(run.projectId, run.linearIssueId);
             if (issue) {
                 void this.linearSync.syncCodexPlan(issue, notification.params);
             }
@@ -555,7 +246,7 @@ export class RunOrchestrator {
         if (notification.method !== "turn/completed")
             return;
         const thread = await this.readThreadWithRetry(threadId);
-        const issue = this.db.getIssue(run.projectId, run.linearIssueId);
+        const issue = this.db.issues.getIssue(run.projectId, run.linearIssueId);
         if (!issue)
             return;
         const completedTurnId = extractTurnId(notification.params);
@@ -563,13 +254,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,
@@ -591,7 +282,7 @@ export class RunOrchestrator {
                 status: "failed",
                 summary: `Turn failed for ${run.runType}`,
             });
-            const failedIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? issue;
+            const failedIssue = this.db.issues.getIssue(run.projectId, run.linearIssueId) ?? issue;
             void this.linearSync.emitActivity(failedIssue, buildRunFailureActivity(run.runType));
             void this.linearSync.syncSession(failedIssue, { activeRunType: run.runType });
             this.linearSync.clearProgress(run.id);
@@ -599,158 +290,23 @@ 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 } : {}),
+            resolveRecoverableRunState: resolveRecoverablePostRunState,
         });
-        // 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);
+        const issue = this.db.issues.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);
@@ -763,7 +319,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
@@ -775,7 +331,7 @@ export class RunOrchestrator {
         await this.reconcileMergedLinearCompletion();
     }
     async reconcileMergedLinearCompletion() {
-        for (const issue of this.db.listIssues()) {
+        for (const issue of this.db.issues.listIssues()) {
             if (issue.prState !== "merged")
                 continue;
             if (issue.currentLinearStateType?.trim().toLowerCase() === "completed")
@@ -790,7 +346,7 @@ export class RunOrchestrator {
                     continue;
                 const normalizedCurrent = liveIssue.stateName?.trim().toLowerCase();
                 if (normalizedCurrent === targetState.trim().toLowerCase()) {
-                    this.db.upsertIssue({
+                    this.db.issues.upsertIssue({
                         projectId: issue.projectId,
                         linearIssueId: issue.linearIssueId,
                         ...(liveIssue.stateName ? { currentLinearState: liveIssue.stateName } : {}),
@@ -799,7 +355,7 @@ export class RunOrchestrator {
                     continue;
                 }
                 const updated = await linear.setIssueState(issue.linearIssueId, targetState);
-                this.db.upsertIssue({
+                this.db.issues.upsertIssue({
                     projectId: issue.projectId,
                     linearIssueId: issue.linearIssueId,
                     ...(updated.stateName ? { currentLinearState: updated.stateName } : {}),
@@ -821,121 +377,15 @@ 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,
         });
-        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);
+        const issue = this.db.issues.getIssue(run.projectId, run.linearIssueId);
         if (!issue)
             return;
         let recoveryLease = this.claimLeaseForReconciliation(run.projectId, run.linearIssueId);
@@ -949,11 +399,11 @@ 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.upsertIssue({ projectId: run.projectId, linearIssueId: run.linearIssueId, activeRunId: null });
+                this.db.runs.finishRun(run.id, { status: "released", failureReason: "Issue reached terminal state during active run" });
+                this.db.issues.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");
-            const releasedIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? issue;
+            const releasedIssue = this.db.issues.getIssue(run.projectId, run.linearIssueId) ?? issue;
             void this.linearSync.syncSession(releasedIssue, { activeRunType: run.runType });
             this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
             return;
@@ -962,11 +412,11 @@ 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.upsertIssue({ projectId: run.projectId, linearIssueId: run.linearIssueId, activeRunId: null });
+                this.db.runs.finishRun(run.id, { status: "failed", failureReason: "Zombie: never started (no thread after restart)" });
+                this.db.issues.upsertIssue({ projectId: run.projectId, linearIssueId: run.linearIssueId, activeRunId: null });
             });
             this.recoverOrEscalate(issue, run.runType, "zombie");
-            const recoveredIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? issue;
+            const recoveredIssue = this.db.issues.getIssue(run.projectId, run.linearIssueId) ?? issue;
             void this.linearSync.emitActivity(recoveredIssue, buildRunFailureActivity(run.runType, "The Codex turn never started before PatchRelay restarted."));
             void this.linearSync.syncSession(recoveredIssue, { activeRunType: run.runType });
             this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
@@ -980,11 +430,11 @@ 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.upsertIssue({ projectId: run.projectId, linearIssueId: run.linearIssueId, activeRunId: null });
+                this.db.runs.finishRun(run.id, { status: "failed", failureReason: "Stale thread after restart" });
+                this.db.issues.upsertIssue({ projectId: run.projectId, linearIssueId: run.linearIssueId, activeRunId: null });
             });
             this.recoverOrEscalate(issue, run.runType, "stale_thread");
-            const recoveredIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? issue;
+            const recoveredIssue = this.db.issues.getIssue(run.projectId, run.linearIssueId) ?? issue;
             void this.linearSync.emitActivity(recoveredIssue, buildRunFailureActivity(run.runType, "PatchRelay lost the active Codex thread after restart and needs to recover."));
             void this.linearSync.syncSession(recoveredIssue, { activeRunType: run.runType });
             this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
@@ -998,8 +448,8 @@ 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.upsertIssue({
+                        this.db.runs.finishRun(run.id, { status: "released" });
+                        this.db.issues.upsertIssue({
                             projectId: run.projectId,
                             linearIssueId: run.linearIssueId,
                             activeRunId: null,
@@ -1016,7 +466,7 @@ export class RunOrchestrator {
                         status: "reconciled",
                         summary: `Linear state ${stopState.stateName} \u2192 done`,
                     });
-                    const doneIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? issue;
+                    const doneIssue = this.db.issues.getIssue(run.projectId, run.linearIssueId) ?? issue;
                     void this.linearSync.syncSession(doneIssue, { activeRunType: run.runType });
                     this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
                     return;
@@ -1028,250 +478,20 @@ export class RunOrchestrator {
         // The agent may have partially completed work (commits, PR) before interruption.
         // Reactive loops (CI repair, review fix) will handle follow-up if needed.
         if (latestTurn?.status === "interrupted") {
-            this.logger.warn({ issueKey: issue.issueKey, runType: run.runType, threadId: run.threadId }, "Run has interrupted turn — marking as failed");
-            // 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, {
-                        projectId: issue.projectId,
-                        linearIssueId: issue.linearIssueId,
-                        ciRepairAttempts: issue.ciRepairAttempts - 1,
-                    });
-                }
-                else if (run.runType === "queue_repair" && issue.queueRepairAttempts > 0) {
-                    this.db.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, {
-                        projectId: issue.projectId,
-                        linearIssueId: issue.linearIssueId,
-                        lastAttemptedFailureHeadSha: null,
-                        lastAttemptedFailureSignature: null,
-                    });
-                }
-                return true;
-            });
-            if (!repairedCounters) {
-                this.logger.warn({ runId: run.id, issueId: run.linearIssueId }, "Skipping interrupted-run recovery after losing issue-session lease");
-                this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
-                return;
-            }
-            if (isRequestedChangesRunType(run.runType)) {
-                const refreshedIssue = await this.refreshIssueAfterReactivePublish(run, this.db.getIssue(run.projectId, run.linearIssueId) ?? issue);
-                const project = this.config.projects.find((entry) => entry.id === run.projectId);
-                const retryContext = project
-                    ? await this.resolveRequestedChangesWakeContext(refreshedIssue, run.runType, run.runType === "branch_upkeep"
-                        ? {
-                            branchUpkeepRequired: true,
-                            reviewFixMode: "branch_upkeep",
-                            wakeReason: "branch_upkeep",
-                        }
-                        : undefined, project)
-                    : undefined;
-                const retryRunType = resolveRequestedChangesMode(run.runType, retryContext) === "branch_upkeep"
-                    ? "branch_upkeep"
-                    : "review_fix";
-                const recoveredState = resolveRecoverablePostRunState(refreshedIssue) ?? "failed";
-                const interruptedMessage = "Requested-changes run was interrupted before PatchRelay could verify that a new PR head was published";
-                this.failRunAndClear(run, interruptedMessage, recoveredState);
-                await this.restoreIdleWorktree(issue);
-                const recoveredIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? refreshedIssue;
-                if (recoveredState === "changes_requested") {
-                    this.db.upsertIssue({
-                        projectId: run.projectId,
-                        linearIssueId: run.linearIssueId,
-                        pendingRunType: retryRunType,
-                        pendingRunContextJson: retryContext ? JSON.stringify(retryContext) : null,
-                    });
-                    this.feed?.publish({
-                        level: "warn",
-                        kind: "workflow",
-                        issueKey: issue.issueKey,
-                        projectId: run.projectId,
-                        stage: run.runType,
-                        status: "retry_queued",
-                        summary: "Requested-changes run was interrupted; PatchRelay will retry from fresh GitHub truth",
-                    });
-                    this.enqueueIssue(run.projectId, run.linearIssueId);
-                }
-                else {
-                    this.feed?.publish({
-                        level: "error",
-                        kind: "workflow",
-                        issueKey: issue.issueKey,
-                        projectId: run.projectId,
-                        stage: run.runType,
-                        status: "escalated",
-                        summary: interruptedMessage,
-                    });
-                }
-                void this.linearSync.emitActivity(recoveredIssue, buildRunFailureActivity(run.runType, interruptedMessage));
-                void this.linearSync.syncSession(recoveredIssue, { activeRunType: run.runType });
-                this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
-                return;
-            }
-            const recoveredState = resolveRecoverablePostRunState(this.db.getIssue(run.projectId, run.linearIssueId) ?? issue);
-            this.failRunAndClear(run, "Codex turn was interrupted", recoveredState);
-            await this.restoreIdleWorktree(issue);
-            const failedIssue = this.db.getIssue(run.projectId, run.linearIssueId) ?? issue;
-            if (recoveredState) {
-                this.feed?.publish({
-                    level: "info",
-                    kind: "stage",
-                    issueKey: issue.issueKey,
-                    projectId: run.projectId,
-                    stage: recoveredState,
-                    status: "reconciled",
-                    summary: `Interrupted ${run.runType} recovered \u2192 ${recoveredState}`,
-                });
-            }
-            else {
-                void this.linearSync.emitActivity(failedIssue, buildRunFailureActivity(run.runType, "The Codex turn was interrupted."));
-            }
-            void this.linearSync.syncSession(failedIssue, { activeRunType: run.runType });
-            this.releaseIssueSessionLease(run.projectId, run.linearIssueId);
+            await this.interruptedRunRecovery.handle(run, issue);
             return;
         }
         // 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 } : {}),
+                resolveRecoverableRunState: resolveRecoverablePostRunState,
             });
-            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)
@@ -1279,402 +499,24 @@ 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;
-        });
-        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}`,
+        this.runRecovery.escalate({
+            issue,
+            runType,
+            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,
         });
-        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);
     }
-    async verifyReactiveRunAdvancedBranch(run, issue) {
-        if (run.runType !== "ci_repair" && run.runType !== "queue_repair") {
-            return undefined;
-        }
-        if (!issue.prNumber || issue.prState !== "open" || !issue.lastGitHubFailureHeadSha) {
-            return undefined;
-        }
-        const project = this.config.projects.find((entry) => entry.id === run.projectId);
-        if (!project?.github?.repoFullName) {
-            return undefined;
-        }
-        try {
-            const pr = await this.loadRemotePrState(project.github.repoFullName, issue.prNumber);
-            if (!pr || pr.state?.toUpperCase() !== "OPEN")
-                return undefined;
-            if (!pr.headRefOid || pr.headRefOid !== issue.lastGitHubFailureHeadSha)
-                return undefined;
-            return `Repair finished but PR #${issue.prNumber} is still on failing head ${issue.lastGitHubFailureHeadSha.slice(0, 8)}`;
-        }
-        catch (error) {
-            this.logger.debug({
-                issueKey: issue.issueKey,
-                prNumber: issue.prNumber,
-                error: error instanceof Error ? error.message : String(error),
-            }, "Failed to verify PR head advancement after repair");
-            return undefined;
-        }
-    }
-    async verifyReviewFixAdvancedHead(run, issue) {
-        if (!isRequestedChangesRunType(run.runType)) {
-            return undefined;
-        }
-        if (!issue.prNumber || issue.prState !== "open") {
-            return undefined;
-        }
-        if (!run.sourceHeadSha) {
-            return `Requested-changes run finished for PR #${issue.prNumber} without a recorded starting head SHA. PatchRelay cannot verify that a new head was published.`;
-        }
-        const project = this.config.projects.find((entry) => entry.id === run.projectId);
-        if (!project?.github?.repoFullName) {
-            return undefined;
-        }
-        try {
-            const pr = await this.loadRemotePrState(project.github.repoFullName, issue.prNumber);
-            if (!pr || pr.state?.toUpperCase() !== "OPEN")
-                return undefined;
-            if (!pr.headRefOid) {
-                return `Requested-changes run finished for PR #${issue.prNumber} but GitHub did not report a current head SHA.`;
-            }
-            if (pr.headRefOid === run.sourceHeadSha) {
-                return `Requested-changes run finished for PR #${issue.prNumber} without pushing a new head; PatchRelay must not hand the same SHA back to review.`;
-            }
-            return undefined;
-        }
-        catch (error) {
-            this.logger.debug({
-                issueKey: issue.issueKey,
-                prNumber: issue.prNumber,
-                error: error instanceof Error ? error.message : String(error),
-            }, "Failed to verify PR head advancement after requested-changes work");
-            return undefined;
-        }
-    }
-    async refreshIssueAfterReactivePublish(run, issue) {
-        if (run.runType !== "ci_repair" && run.runType !== "queue_repair" && !isRequestedChangesRunType(run.runType)) {
-            return this.db.getIssue(run.projectId, run.linearIssueId) ?? issue;
-        }
-        if (!issue.prNumber) {
-            return this.db.getIssue(run.projectId, run.linearIssueId) ?? issue;
-        }
-        const project = this.config.projects.find((entry) => entry.id === run.projectId);
-        const repoFullName = project?.github?.repoFullName;
-        if (!repoFullName) {
-            return this.db.getIssue(run.projectId, run.linearIssueId) ?? issue;
-        }
-        try {
-            const pr = await this.loadRemotePrState(repoFullName, issue.prNumber);
-            if (!pr) {
-                return this.db.getIssue(run.projectId, run.linearIssueId) ?? issue;
-            }
-            const nextPrState = normalizeRemotePrState(pr.state);
-            const nextReviewState = normalizeRemoteReviewDecision(pr.reviewDecision);
-            const gateCheckName = project?.gateChecks?.find((entry) => entry.trim())?.trim() ?? "verify";
-            const headAdvanced = Boolean(pr.headRefOid && pr.headRefOid !== issue.lastGitHubFailureHeadSha);
-            const reviewFixHeadAdvanced = isRequestedChangesRunType(run.runType)
-                && Boolean(pr.headRefOid && run.sourceHeadSha && pr.headRefOid !== run.sourceHeadSha);
-            this.upsertIssueIfLeaseHeld(run.projectId, run.linearIssueId, {
-                projectId: run.projectId,
-                linearIssueId: run.linearIssueId,
-                ...(nextPrState ? { prState: nextPrState } : {}),
-                ...(pr.headRefOid ? { prHeadSha: pr.headRefOid } : {}),
-                ...(nextReviewState ? { prReviewState: nextReviewState } : {}),
-                ...((headAdvanced || reviewFixHeadAdvanced)
-                    ? {
-                        prCheckStatus: "pending",
-                        lastGitHubFailureSource: null,
-                        lastGitHubFailureHeadSha: null,
-                        lastGitHubFailureSignature: null,
-                        lastGitHubFailureCheckName: null,
-                        lastGitHubFailureCheckUrl: null,
-                        lastGitHubFailureContextJson: null,
-                        lastGitHubFailureAt: null,
-                        lastQueueIncidentJson: null,
-                        lastAttemptedFailureHeadSha: null,
-                        lastAttemptedFailureSignature: null,
-                        lastGitHubCiSnapshotHeadSha: pr.headRefOid ?? null,
-                        lastGitHubCiSnapshotGateCheckName: gateCheckName,
-                        lastGitHubCiSnapshotGateCheckStatus: "pending",
-                        lastGitHubCiSnapshotJson: null,
-                        lastGitHubCiSnapshotSettledAt: null,
-                    }
-                    : {}),
-            }, "reactive publish refresh");
-        }
-        catch (error) {
-            this.logger.debug({
-                issueKey: issue.issueKey,
-                prNumber: issue.prNumber,
-                error: error instanceof Error ? error.message : String(error),
-            }, "Failed to refresh PR state after reactive publish");
-        }
-        return this.db.getIssue(run.projectId, run.linearIssueId) ?? issue;
-    }
-    async loadRemotePrState(repoFullName, prNumber) {
-        const { stdout, exitCode } = await execCommand("gh", [
-            "pr", "view", String(prNumber),
-            "--repo", repoFullName,
-            "--json", "headRefOid,state,reviewDecision,mergeStateStatus",
-        ], { timeoutMs: 10_000 });
-        if (exitCode !== 0)
-            return undefined;
-        return JSON.parse(stdout);
-    }
-    async resolveRequestedChangesWakeContext(issue, runType, context, project) {
-        if (runType === "branch_upkeep" || isBranchUpkeepRequired(context)) {
-            return context;
-        }
-        if (!issue.prNumber || issue.prState !== "open" || issue.prReviewState !== "changes_requested") {
-            return context;
-        }
-        const repoFullName = project.github?.repoFullName;
-        if (!repoFullName) {
-            return context;
-        }
-        try {
-            const pr = await this.loadRemotePrState(repoFullName, issue.prNumber);
-            if (!pr)
-                return context;
-            const nextPrState = normalizeRemotePrState(pr.state);
-            const nextReviewState = normalizeRemoteReviewDecision(pr.reviewDecision);
-            this.upsertIssueIfLeaseHeld(issue.projectId, issue.linearIssueId, {
-                projectId: issue.projectId,
-                linearIssueId: issue.linearIssueId,
-                ...(nextPrState ? { prState: nextPrState } : {}),
-                ...(pr.headRefOid ? { prHeadSha: pr.headRefOid } : {}),
-                ...(nextReviewState ? { prReviewState: nextReviewState } : {}),
-            }, "review-fix wake refresh");
-            if (nextPrState !== "open")
-                return context;
-            if (nextReviewState && nextReviewState !== "changes_requested")
-                return context;
-            if (!isDirtyMergeStateStatus(pr.mergeStateStatus))
-                return context;
-            return buildReviewFixBranchUpkeepContext(issue.prNumber, project.github?.baseBranch ?? "main", pr, context);
-        }
-        catch (error) {
-            this.logger.debug({
-                issueKey: issue.issueKey,
-                prNumber: issue.prNumber,
-                error: error instanceof Error ? error.message : String(error),
-            }, "Failed to resolve requested-changes wake context");
-            return context;
-        }
-    }
-    async resolvePostRunFollowUp(run, issue, projectOverride) {
-        if (run.runType !== "review_fix") {
-            return undefined;
-        }
-        if (!issue.prNumber || issue.prState !== "open") {
-            return undefined;
-        }
-        if (issue.prReviewState !== "changes_requested") {
-            return undefined;
-        }
-        const project = projectOverride ?? this.config.projects.find((entry) => entry.id === run.projectId);
-        const repoFullName = project?.github?.repoFullName;
-        if (!repoFullName) {
-            return undefined;
-        }
-        try {
-            const pr = await this.loadRemotePrState(repoFullName, issue.prNumber);
-            if (!pr)
-                return undefined;
-            const nextPrState = normalizeRemotePrState(pr.state);
-            const nextReviewState = normalizeRemoteReviewDecision(pr.reviewDecision);
-            this.upsertIssueIfLeaseHeld(issue.projectId, issue.linearIssueId, {
-                projectId: issue.projectId,
-                linearIssueId: issue.linearIssueId,
-                ...(nextPrState ? { prState: nextPrState } : {}),
-                ...(pr.headRefOid ? { prHeadSha: pr.headRefOid } : {}),
-                ...(nextReviewState ? { prReviewState: nextReviewState } : {}),
-            }, "post-run follow-up refresh");
-            if (nextPrState !== "open")
-                return undefined;
-            if (nextReviewState && nextReviewState !== "changes_requested")
-                return undefined;
-            if (!isDirtyMergeStateStatus(pr.mergeStateStatus))
-                return undefined;
-            return {
-                pendingRunType: "branch_upkeep",
-                factoryState: "changes_requested",
-                context: buildReviewFixBranchUpkeepContext(issue.prNumber, project?.github?.baseBranch ?? "main", pr),
-                summary: `PR #${issue.prNumber} is still dirty after review fix; queued branch upkeep`,
-            };
-        }
-        catch (error) {
-            this.logger.debug({
-                issueKey: issue.issueKey,
-                prNumber: issue.prNumber,
-                error: error instanceof Error ? error.message : String(error),
-            }, "Failed to resolve post-run PR upkeep");
-            return undefined;
-        }
-    }
-    async verifyPublishedRunOutcome(run, issue, projectOverride) {
-        if (run.runType !== "implementation") {
-            return undefined;
-        }
-        const project = projectOverride ?? this.config.projects.find((entry) => entry.id === run.projectId);
-        const baseBranch = project?.github?.baseBranch ?? "main";
-        const deliveryMode = resolveImplementationDeliveryMode(issue, undefined, run.promptText);
-        if (deliveryMode === "linear_only") {
-            if (issue.prNumber !== undefined) {
-                return `Planning-only implementation should not open a PR, but PR #${issue.prNumber} was observed`;
-            }
-            return this.describeLocalImplementationOutcome(issue, baseBranch, deliveryMode);
-        }
-        if (issue.prNumber && issue.prState && issue.prState !== "closed") {
-            return undefined;
-        }
-        if (project?.github?.repoFullName && issue.branchName) {
-            try {
-                const { stdout, exitCode } = await execCommand("gh", [
-                    "pr",
-                    "list",
-                    "--repo",
-                    project.github.repoFullName,
-                    "--head",
-                    issue.branchName,
-                    "--state",
-                    "all",
-                    "--json",
-                    "number,url,state,author,headRefOid",
-                ], { timeoutMs: 10_000 });
-                if (exitCode === 0) {
-                    const matches = JSON.parse(stdout);
-                    const pr = matches[0];
-                    if (pr?.number) {
-                        this.upsertIssueIfLeaseHeld(issue.projectId, issue.linearIssueId, {
-                            projectId: issue.projectId,
-                            linearIssueId: issue.linearIssueId,
-                            prNumber: pr.number,
-                            ...(pr.url ? { prUrl: pr.url } : {}),
-                            ...(pr.state ? { prState: pr.state.toLowerCase() } : {}),
-                            ...(pr.headRefOid ? { prHeadSha: pr.headRefOid } : {}),
-                            ...(pr.author?.login ? { prAuthorLogin: pr.author.login } : {}),
-                        }, "published PR verification refresh");
-                        return undefined;
-                    }
-                }
-            }
-            catch (error) {
-                this.logger.debug({
-                    issueKey: issue.issueKey,
-                    branchName: issue.branchName,
-                    repoFullName: project.github.repoFullName,
-                    error: error instanceof Error ? error.message : String(error),
-                }, "Failed to verify published PR state after implementation");
-            }
-        }
-        const details = await this.describeLocalImplementationOutcome(issue, baseBranch, deliveryMode);
-        return details ?? `Implementation completed without opening a PR for branch ${issue.branchName ?? issue.linearIssueId}`;
-    }
-    async describeLocalImplementationOutcome(issue, baseBranch, deliveryMode = "publish_pr") {
-        if (!issue.worktreePath) {
-            return undefined;
-        }
-        try {
-            const status = await execCommand(this.config.runner.gitBin, [
-                "-C",
-                issue.worktreePath,
-                "status",
-                "--short",
-            ], { timeoutMs: 10_000 });
-            const dirtyEntries = status.exitCode === 0
-                ? status.stdout.split("\n").map((line) => line.trim()).filter(Boolean)
-                : [];
-            if (dirtyEntries.length > 0) {
-                if (deliveryMode === "linear_only") {
-                    return `Planning-only implementation should not modify the repo; worktree still has ${dirtyEntries.length} uncommitted change(s)`;
-                }
-                return `Implementation completed without opening a PR; worktree still has ${dirtyEntries.length} uncommitted change(s)`;
-            }
-        }
-        catch {
-            // Best effort only.
-        }
-        try {
-            const ahead = await execCommand(this.config.runner.gitBin, [
-                "-C",
-                issue.worktreePath,
-                "rev-list",
-                "--count",
-                `origin/${baseBranch}..HEAD`,
-            ], { timeoutMs: 10_000 });
-            if (ahead.exitCode === 0) {
-                const count = Number(ahead.stdout.trim());
-                if (Number.isFinite(count) && count > 0) {
-                    if (deliveryMode === "linear_only") {
-                        return `Planning-only implementation should not create repo commits; worktree is ${count} local commit(s) ahead of origin/${baseBranch}`;
-                    }
-                    return `Implementation completed with ${count} local commit(s) ahead of origin/${baseBranch} but no PR was observed`;
-                }
-            }
-        }
-        catch {
-            // Best effort only.
-        }
-        return undefined;
+    async resolveRequestedChangesWakeContext(issue, runType, context) {
+        return await this.runCompletionPolicy.resolveRequestedChangesWakeContext(issue, runType, context);
     }
     async readThreadWithRetry(threadId, maxRetries = 3) {
         for (let attempt = 0; attempt < maxRetries; attempt++) {
@@ -1689,32 +531,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));
-    }
-    upsertIssueIfLeaseHeld(projectId, linearIssueId, params, context) {
-        const lease = this.getHeldIssueSessionLease(projectId, linearIssueId);
-        if (!lease) {
-            this.logger.warn({ projectId, linearIssueId, context }, "Skipping issue write without a held issue-session lease");
-            return undefined;
-        }
-        const updated = this.db.upsertIssueWithLease(lease, params);
-        if (!updated) {
-            this.logger.warn({ projectId, linearIssueId, context }, "Skipping issue write after losing issue-session lease");
-        }
-        return updated;
+        return this.leaseService.withHeldLease(projectId, linearIssueId, fn);
     }
     assertLaunchLease(run, phase) {
         if (this.heartbeatIssueSessionLease(run.projectId, run.linearIssueId)) {
@@ -1725,197 +546,16 @@ export class RunOrchestrator {
         this.logger.warn({ runId: run.id, issueId: run.linearIssueId, phase }, "Aborting run launch after losing issue-session lease");
         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;
-    }
-    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;
-    }
     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);
     }
 }
-/**
- * Determine post-run factory state from current PR metadata.
- * Used by both the normal completion path and reconciliation.
- */
-function resolvePostRunState(issue) {
-    if (ACTIVE_RUN_STATES.has(issue.factoryState) && issue.prNumber) {
-        // Check merged first — a merged PR is both approved and merged,
-        // and "done" must take priority over "awaiting_queue".
-        if (issue.prState === "merged")
-            return "done";
-        if (issue.prReviewState === "approved")
-            return "awaiting_queue";
-        return "pr_open";
-    }
-    return undefined;
-}
-function resolveCompletedRunState(issue, run) {
-    if (run.runType === "implementation" && resolveImplementationDeliveryMode(issue, undefined, run.promptText) === "linear_only") {
-        return "done";
-    }
-    return resolvePostRunState(issue);
-}
-function resolveRecoverablePostRunState(issue) {
-    if (!issue.prNumber) {
-        return resolvePostRunState(issue);
-    }
-    if (issue.prState === "merged")
-        return "done";
-    if (issue.prState === "open") {
-        const reactiveIntent = deriveIssueSessionReactiveIntent({
-            prNumber: issue.prNumber,
-            prState: issue.prState,
-            prReviewState: issue.prReviewState,
-            prCheckStatus: issue.prCheckStatus,
-            latestFailureSource: issue.lastGitHubFailureSource,
-        });
-        if (reactiveIntent)
-            return reactiveIntent.compatibilityFactoryState;
-        if (issue.prReviewState === "approved")
-            return "awaiting_queue";
-        return "pr_open";
-    }
-    return resolvePostRunState(issue);
-}
-function normalizeRemotePrState(value) {
-    const normalized = value?.trim().toUpperCase();
-    if (normalized === "OPEN")
-        return "open";
-    if (normalized === "CLOSED")
-        return "closed";
-    if (normalized === "MERGED")
-        return "merged";
-    return undefined;
-}
-function normalizeRemoteReviewDecision(value) {
-    const normalized = value?.trim().toUpperCase();
-    if (normalized === "APPROVED")
-        return "approved";
-    if (normalized === "CHANGES_REQUESTED")
-        return "changes_requested";
-    if (normalized === "REVIEW_REQUIRED")
-        return "commented";
-    return undefined;
-}
-function isDirtyMergeStateStatus(value) {
-    return value?.trim().toUpperCase() === "DIRTY";
-}
-function buildReviewFixBranchUpkeepContext(prNumber, baseBranch, pr, context) {
-    const promptContext = [
-        `The requested code change may already be present, but GitHub still reports PR #${prNumber} as ${String(pr.mergeStateStatus)} against latest ${baseBranch}.`,
-        `This turn is branch upkeep on the existing PR branch: update onto latest ${baseBranch}, resolve any conflicts, rerun the narrowest relevant verification, and push a newer head.`,
-        "Do not stop just because the requested code change is already present. Review can only move forward after a new pushed head.",
-    ].join(" ");
-    return {
-        ...(context ?? {}),
-        branchUpkeepRequired: true,
-        reviewFixMode: "branch_upkeep",
-        wakeReason: "branch_upkeep",
-        promptContext,
-        ...(pr.mergeStateStatus ? { mergeStateStatus: pr.mergeStateStatus } : {}),
-        ...(pr.headRefOid ? { failingHeadSha: pr.headRefOid } : {}),
-        baseBranch,
-    };
-}