patchrelay 0.36.7 → 0.36.9

package/dist/db.js

@@ -1,13 +1,16 @@
-import { isIssueSessionReadyForExecution, deriveIssueSessionState, deriveIssueSessionReactiveIntent, deriveIssueSessionWakeReason, } from "./issue-session.js";
-import { deriveSessionWakePlan, extractLatestAssistantSummary, } from "./issue-session-events.js";
-import { parseGitHubFailureContext } from "./github-failure-context.js";
-import { deriveIssueStatusNote } from "./status-note.js";
+import { isIssueSessionReadyForExecution, deriveIssueSessionState, deriveIssueSessionReactiveIntent, } from "./issue-session.js";
+import {} from "./issue-session-events.js";
+import { IssueStore } from "./db/issue-store.js";
+import { IssueSessionStore } from "./db/issue-session-store.js";
 import { LinearInstallationStore } from "./db/linear-installation-store.js";
 import { OperatorFeedStore } from "./db/operator-feed-store.js";
 import { RepositoryLinkStore } from "./db/repository-link-store.js";
+import { RunStore } from "./db/run-store.js";
+import { WebhookEventStore } from "./db/webhook-event-store.js";
 import { runPatchRelayMigrations } from "./db/migrations.js";
-import { SqliteConnection, isoNow } from "./db/shared.js";
-import { derivePatchRelayWaitingReason } from "./waiting-reason.js";
+import { SqliteConnection } from "./db/shared.js";
+import { syncIssueSessionFromIssue } from "./issue-session-projector.js";
+import { buildTrackedIssueRecord } from "./tracked-issue-projector.js";
 function parseObjectJson(raw) {
     if (!raw)
         return undefined;
@@ -90,6 +93,10 @@ export class PatchRelayDatabase {
     linearInstallations;
     operatorFeed;
     repositories;
+    webhookEvents;
+    issues;
+    issueSessions;
+    runs;
     constructor(databasePath, wal) {
         this.connection = new SqliteConnection(databasePath);
         this.connection.pragma("foreign_keys = ON");
@@ -99,6 +106,17 @@ export class PatchRelayDatabase {
         this.linearInstallations = new LinearInstallationStore(this.connection);
         this.operatorFeed = new OperatorFeedStore(this.connection);
         this.repositories = new RepositoryLinkStore(this.connection);
+        this.webhookEvents = new WebhookEventStore(this.connection);
+        this.issues = new IssueStore(this.connection, (issue) => syncIssueSessionFromIssue({ connection: this.connection, issues: this.issues, issueSessions: this.issueSessions, runs: this.runs, issue }));
+        this.runs = new RunStore(this.connection, mapRunRow, this.issues, (issue, options) => syncIssueSessionFromIssue({
+            connection: this.connection,
+            issues: this.issues,
+            issueSessions: this.issueSessions,
+            runs: this.runs,
+            issue,
+            ...(options ? { options } : {}),
+        }));
+        this.issueSessions = new IssueSessionStore(this.connection, mapIssueSessionRow, mapIssueSessionEventRow, this.issues, this.runs, deriveImplicitReactiveWake);
     }
     runMigrations() {
         runPatchRelayMigrations(this.connection);
@@ -106,721 +124,44 @@ export class PatchRelayDatabase {
     transaction(fn) {
         return this.connection.transaction(fn)();
     }
-    // ─── Webhook Events ───────────────────────────────────────────────
-    insertWebhookEvent(webhookId, receivedAt) {
-        const existing = this.connection
-            .prepare("SELECT id FROM webhook_events WHERE webhook_id = ?")
-            .get(webhookId);
-        if (existing) {
-            return { id: existing.id, duplicate: true };
-        }
-        const result = this.connection
-            .prepare("INSERT INTO webhook_events (webhook_id, received_at, processing_status) VALUES (?, ?, 'processed')")
-            .run(webhookId, receivedAt);
-        return { id: Number(result.lastInsertRowid), duplicate: false };
-    }
-    insertFullWebhookEvent(params) {
-        const existing = this.connection
-            .prepare("SELECT id FROM webhook_events WHERE webhook_id = ?")
-            .get(params.webhookId);
-        if (existing) {
-            return { id: existing.id, dedupeStatus: "duplicate" };
-        }
-        const result = this.connection
-            .prepare("INSERT INTO webhook_events (webhook_id, received_at, payload_json) VALUES (?, ?, ?)")
-            .run(params.webhookId, params.receivedAt, params.payloadJson);
-        return { id: Number(result.lastInsertRowid), dedupeStatus: "accepted" };
-    }
-    getWebhookPayload(id) {
-        const row = this.connection.prepare("SELECT webhook_id, payload_json FROM webhook_events WHERE id = ?").get(id);
-        if (!row || !row.payload_json)
-            return undefined;
-        return { webhookId: String(row.webhook_id), payloadJson: String(row.payload_json) };
-    }
-    isWebhookDuplicate(webhookId) {
-        return this.connection.prepare("SELECT 1 FROM webhook_events WHERE webhook_id = ?").get(webhookId) !== undefined;
-    }
-    markWebhookProcessed(id, status) {
-        this.connection.prepare("UPDATE webhook_events SET processing_status = ? WHERE id = ?").run(status, id);
-    }
-    assignWebhookProject(id, projectId) {
-        this.connection.prepare("UPDATE webhook_events SET project_id = ? WHERE id = ?").run(projectId, id);
-    }
-    // ─── Issues ───────────────────────────────────────────────────────
     upsertIssue(params) {
-        const now = isoNow();
-        const existing = this.getIssue(params.projectId, params.linearIssueId);
-        if (existing) {
-            // Build dynamic SET clauses for nullable fields
-            const sets = ["updated_at = @now"];
-            const values = {
-                now,
-                projectId: params.projectId,
-                linearIssueId: params.linearIssueId,
-            };
-            if (params.issueKey !== undefined) {
-                sets.push("issue_key = COALESCE(@issueKey, issue_key)");
-                values.issueKey = params.issueKey;
-            }
-            if (params.title !== undefined) {
-                sets.push("title = COALESCE(@title, title)");
-                values.title = params.title;
-            }
-            if (params.description !== undefined) {
-                sets.push("description = COALESCE(@description, description)");
-                values.description = params.description;
-            }
-            if (params.url !== undefined) {
-                sets.push("url = COALESCE(@url, url)");
-                values.url = params.url;
-            }
-            if (params.priority !== undefined) {
-                sets.push("priority = @priority");
-                values.priority = params.priority;
-            }
-            if (params.estimate !== undefined) {
-                sets.push("estimate = @estimate");
-                values.estimate = params.estimate;
-            }
-            if (params.currentLinearState !== undefined) {
-                sets.push("current_linear_state = COALESCE(@currentLinearState, current_linear_state)");
-                values.currentLinearState = params.currentLinearState;
-            }
-            if (params.currentLinearStateType !== undefined) {
-                sets.push("current_linear_state_type = COALESCE(@currentLinearStateType, current_linear_state_type)");
-                values.currentLinearStateType = params.currentLinearStateType;
-            }
-            if (params.factoryState !== undefined) {
-                sets.push("factory_state = @factoryState");
-                values.factoryState = params.factoryState;
-            }
-            if (params.pendingRunType !== undefined) {
-                sets.push("pending_run_type = @pendingRunType");
-                values.pendingRunType = params.pendingRunType;
-            }
-            if (params.pendingRunContextJson !== undefined) {
-                sets.push("pending_run_context_json = @pendingRunContextJson");
-                values.pendingRunContextJson = params.pendingRunContextJson;
-            }
-            if (params.branchName !== undefined) {
-                sets.push("branch_name = COALESCE(@branchName, branch_name)");
-                values.branchName = params.branchName;
-            }
-            if (params.worktreePath !== undefined) {
-                sets.push("worktree_path = COALESCE(@worktreePath, worktree_path)");
-                values.worktreePath = params.worktreePath;
-            }
-            if (params.threadId !== undefined) {
-                sets.push("thread_id = @threadId");
-                values.threadId = params.threadId;
-            }
-            if (params.activeRunId !== undefined) {
-                sets.push("active_run_id = @activeRunId");
-                values.activeRunId = params.activeRunId;
-            }
-            if (params.statusCommentId !== undefined) {
-                sets.push("status_comment_id = @statusCommentId");
-                values.statusCommentId = params.statusCommentId;
-            }
-            if (params.agentSessionId !== undefined) {
-                sets.push("agent_session_id = @agentSessionId");
-                values.agentSessionId = params.agentSessionId;
-            }
-            if (params.prNumber !== undefined) {
-                sets.push("pr_number = @prNumber");
-                values.prNumber = params.prNumber;
-            }
-            if (params.prUrl !== undefined) {
-                sets.push("pr_url = @prUrl");
-                values.prUrl = params.prUrl;
-            }
-            if (params.prState !== undefined) {
-                sets.push("pr_state = @prState");
-                values.prState = params.prState;
-            }
-            if (params.prHeadSha !== undefined) {
-                sets.push("pr_head_sha = @prHeadSha");
-                values.prHeadSha = params.prHeadSha;
-            }
-            if (params.prAuthorLogin !== undefined) {
-                sets.push("pr_author_login = @prAuthorLogin");
-                values.prAuthorLogin = params.prAuthorLogin;
-            }
-            if (params.prReviewState !== undefined) {
-                sets.push("pr_review_state = @prReviewState");
-                values.prReviewState = params.prReviewState;
-            }
-            if (params.prCheckStatus !== undefined) {
-                sets.push("pr_check_status = @prCheckStatus");
-                values.prCheckStatus = params.prCheckStatus;
-            }
-            if (params.lastBlockingReviewHeadSha !== undefined) {
-                sets.push("last_blocking_review_head_sha = @lastBlockingReviewHeadSha");
-                values.lastBlockingReviewHeadSha = params.lastBlockingReviewHeadSha;
-            }
-            if (params.lastGitHubFailureSource !== undefined) {
-                sets.push("last_github_failure_source = @lastGitHubFailureSource");
-                values.lastGitHubFailureSource = params.lastGitHubFailureSource;
-            }
-            if (params.lastGitHubFailureHeadSha !== undefined) {
-                sets.push("last_github_failure_head_sha = @lastGitHubFailureHeadSha");
-                values.lastGitHubFailureHeadSha = params.lastGitHubFailureHeadSha;
-            }
-            if (params.lastGitHubFailureSignature !== undefined) {
-                sets.push("last_github_failure_signature = @lastGitHubFailureSignature");
-                values.lastGitHubFailureSignature = params.lastGitHubFailureSignature;
-            }
-            if (params.lastGitHubFailureCheckName !== undefined) {
-                sets.push("last_github_failure_check_name = @lastGitHubFailureCheckName");
-                values.lastGitHubFailureCheckName = params.lastGitHubFailureCheckName;
-            }
-            if (params.lastGitHubFailureCheckUrl !== undefined) {
-                sets.push("last_github_failure_check_url = @lastGitHubFailureCheckUrl");
-                values.lastGitHubFailureCheckUrl = params.lastGitHubFailureCheckUrl;
-            }
-            if (params.lastGitHubFailureContextJson !== undefined) {
-                sets.push("last_github_failure_context_json = @lastGitHubFailureContextJson");
-                values.lastGitHubFailureContextJson = params.lastGitHubFailureContextJson;
-            }
-            if (params.lastGitHubFailureAt !== undefined) {
-                sets.push("last_github_failure_at = @lastGitHubFailureAt");
-                values.lastGitHubFailureAt = params.lastGitHubFailureAt;
-            }
-            if (params.lastGitHubCiSnapshotHeadSha !== undefined) {
-                sets.push("last_github_ci_snapshot_head_sha = @lastGitHubCiSnapshotHeadSha");
-                values.lastGitHubCiSnapshotHeadSha = params.lastGitHubCiSnapshotHeadSha;
-            }
-            if (params.lastGitHubCiSnapshotGateCheckName !== undefined) {
-                sets.push("last_github_ci_snapshot_gate_check_name = @lastGitHubCiSnapshotGateCheckName");
-                values.lastGitHubCiSnapshotGateCheckName = params.lastGitHubCiSnapshotGateCheckName;
-            }
-            if (params.lastGitHubCiSnapshotGateCheckStatus !== undefined) {
-                sets.push("last_github_ci_snapshot_gate_check_status = @lastGitHubCiSnapshotGateCheckStatus");
-                values.lastGitHubCiSnapshotGateCheckStatus = params.lastGitHubCiSnapshotGateCheckStatus;
-            }
-            if (params.lastGitHubCiSnapshotJson !== undefined) {
-                sets.push("last_github_ci_snapshot_json = @lastGitHubCiSnapshotJson");
-                values.lastGitHubCiSnapshotJson = params.lastGitHubCiSnapshotJson;
-            }
-            if (params.lastGitHubCiSnapshotSettledAt !== undefined) {
-                sets.push("last_github_ci_snapshot_settled_at = @lastGitHubCiSnapshotSettledAt");
-                values.lastGitHubCiSnapshotSettledAt = params.lastGitHubCiSnapshotSettledAt;
-            }
-            if (params.lastQueueSignalAt !== undefined) {
-                sets.push("last_queue_signal_at = @lastQueueSignalAt");
-                values.lastQueueSignalAt = params.lastQueueSignalAt;
-            }
-            if (params.lastQueueIncidentJson !== undefined) {
-                sets.push("last_queue_incident_json = @lastQueueIncidentJson");
-                values.lastQueueIncidentJson = params.lastQueueIncidentJson;
-            }
-            if (params.lastAttemptedFailureHeadSha !== undefined) {
-                sets.push("last_attempted_failure_head_sha = @lastAttemptedFailureHeadSha");
-                values.lastAttemptedFailureHeadSha = params.lastAttemptedFailureHeadSha;
-            }
-            if (params.lastAttemptedFailureSignature !== undefined) {
-                sets.push("last_attempted_failure_signature = @lastAttemptedFailureSignature");
-                values.lastAttemptedFailureSignature = params.lastAttemptedFailureSignature;
-            }
-            if (params.ciRepairAttempts !== undefined) {
-                sets.push("ci_repair_attempts = @ciRepairAttempts");
-                values.ciRepairAttempts = params.ciRepairAttempts;
-            }
-            if (params.queueRepairAttempts !== undefined) {
-                sets.push("queue_repair_attempts = @queueRepairAttempts");
-                values.queueRepairAttempts = params.queueRepairAttempts;
-            }
-            if (params.reviewFixAttempts !== undefined) {
-                sets.push("review_fix_attempts = @reviewFixAttempts");
-                values.reviewFixAttempts = params.reviewFixAttempts;
-            }
-            if (params.zombieRecoveryAttempts !== undefined) {
-                sets.push("zombie_recovery_attempts = @zombieRecoveryAttempts");
-                values.zombieRecoveryAttempts = params.zombieRecoveryAttempts;
-            }
-            if (params.lastZombieRecoveryAt !== undefined) {
-                sets.push("last_zombie_recovery_at = @lastZombieRecoveryAt");
-                values.lastZombieRecoveryAt = params.lastZombieRecoveryAt;
-            }
-            this.connection.prepare(`UPDATE issues SET ${sets.join(", ")} WHERE project_id = @projectId AND linear_issue_id = @linearIssueId`).run(values);
-        }
-        else {
-            this.connection.prepare(`
-        INSERT INTO issues (
-          project_id, linear_issue_id, issue_key, title, description, url,
-          priority, estimate,
-          current_linear_state, current_linear_state_type, factory_state, pending_run_type, pending_run_context_json,
-          branch_name, worktree_path, thread_id, active_run_id, status_comment_id,
-          agent_session_id,
-          pr_number, pr_url, pr_state, pr_head_sha, pr_author_login, pr_review_state, pr_check_status, last_blocking_review_head_sha,
-          last_github_failure_source, last_github_failure_head_sha, last_github_failure_signature, last_github_failure_check_name, last_github_failure_check_url, last_github_failure_context_json, last_github_failure_at,
-          last_github_ci_snapshot_head_sha, last_github_ci_snapshot_gate_check_name, last_github_ci_snapshot_gate_check_status, last_github_ci_snapshot_json, last_github_ci_snapshot_settled_at,
-          last_queue_signal_at, last_queue_incident_json,
-          last_attempted_failure_head_sha, last_attempted_failure_signature,
-          ci_repair_attempts, queue_repair_attempts, review_fix_attempts, zombie_recovery_attempts, last_zombie_recovery_at,
-          updated_at
-        ) VALUES (
-          @projectId, @linearIssueId, @issueKey, @title, @description, @url,
-          @priority, @estimate,
-          @currentLinearState, @currentLinearStateType, @factoryState, @pendingRunType, @pendingRunContextJson,
-          @branchName, @worktreePath, @threadId, @activeRunId, @statusCommentId,
-          @agentSessionId,
-          @prNumber, @prUrl, @prState, @prHeadSha, @prAuthorLogin, @prReviewState, @prCheckStatus, @lastBlockingReviewHeadSha,
-          @lastGitHubFailureSource, @lastGitHubFailureHeadSha, @lastGitHubFailureSignature, @lastGitHubFailureCheckName, @lastGitHubFailureCheckUrl, @lastGitHubFailureContextJson, @lastGitHubFailureAt,
-          @lastGitHubCiSnapshotHeadSha, @lastGitHubCiSnapshotGateCheckName, @lastGitHubCiSnapshotGateCheckStatus, @lastGitHubCiSnapshotJson, @lastGitHubCiSnapshotSettledAt,
-          @lastQueueSignalAt, @lastQueueIncidentJson,
-          @lastAttemptedFailureHeadSha, @lastAttemptedFailureSignature,
-          @ciRepairAttempts, @queueRepairAttempts, @reviewFixAttempts, @zombieRecoveryAttempts, @lastZombieRecoveryAt,
-          @now
-        )
-      `).run({
-                projectId: params.projectId,
-                linearIssueId: params.linearIssueId,
-                issueKey: params.issueKey ?? null,
-                title: params.title ?? null,
-                description: params.description ?? null,
-                url: params.url ?? null,
-                priority: params.priority ?? null,
-                estimate: params.estimate ?? null,
-                currentLinearState: params.currentLinearState ?? null,
-                currentLinearStateType: params.currentLinearStateType ?? null,
-                factoryState: params.factoryState ?? "delegated",
-                pendingRunType: params.pendingRunType ?? null,
-                pendingRunContextJson: params.pendingRunContextJson ?? null,
-                branchName: params.branchName ?? null,
-                worktreePath: params.worktreePath ?? null,
-                threadId: params.threadId ?? null,
-                activeRunId: params.activeRunId ?? null,
-                statusCommentId: params.statusCommentId ?? null,
-                agentSessionId: params.agentSessionId ?? null,
-                prNumber: params.prNumber ?? null,
-                prUrl: params.prUrl ?? null,
-                prState: params.prState ?? null,
-                prHeadSha: params.prHeadSha ?? null,
-                prAuthorLogin: params.prAuthorLogin ?? null,
-                prReviewState: params.prReviewState ?? null,
-                prCheckStatus: params.prCheckStatus ?? null,
-                lastBlockingReviewHeadSha: params.lastBlockingReviewHeadSha ?? null,
-                lastGitHubFailureSource: params.lastGitHubFailureSource ?? null,
-                lastGitHubFailureHeadSha: params.lastGitHubFailureHeadSha ?? null,
-                lastGitHubFailureSignature: params.lastGitHubFailureSignature ?? null,
-                lastGitHubFailureCheckName: params.lastGitHubFailureCheckName ?? null,
-                lastGitHubFailureCheckUrl: params.lastGitHubFailureCheckUrl ?? null,
-                lastGitHubFailureContextJson: params.lastGitHubFailureContextJson ?? null,
-                lastGitHubFailureAt: params.lastGitHubFailureAt ?? null,
-                lastGitHubCiSnapshotHeadSha: params.lastGitHubCiSnapshotHeadSha ?? null,
-                lastGitHubCiSnapshotGateCheckName: params.lastGitHubCiSnapshotGateCheckName ?? null,
-                lastGitHubCiSnapshotGateCheckStatus: params.lastGitHubCiSnapshotGateCheckStatus ?? null,
-                lastGitHubCiSnapshotJson: params.lastGitHubCiSnapshotJson ?? null,
-                lastGitHubCiSnapshotSettledAt: params.lastGitHubCiSnapshotSettledAt ?? null,
-                lastQueueSignalAt: params.lastQueueSignalAt ?? null,
-                lastQueueIncidentJson: params.lastQueueIncidentJson ?? null,
-                lastAttemptedFailureHeadSha: params.lastAttemptedFailureHeadSha ?? null,
-                lastAttemptedFailureSignature: params.lastAttemptedFailureSignature ?? null,
-                ciRepairAttempts: params.ciRepairAttempts ?? 0,
-                queueRepairAttempts: params.queueRepairAttempts ?? 0,
-                reviewFixAttempts: params.reviewFixAttempts ?? 0,
-                zombieRecoveryAttempts: params.zombieRecoveryAttempts ?? 0,
-                lastZombieRecoveryAt: params.lastZombieRecoveryAt ?? null,
-                now,
-            });
-        }
-        const updated = this.getIssue(params.projectId, params.linearIssueId);
-        this.syncIssueSessionFromIssue(updated);
-        return updated;
+        return this.issues.upsertIssue(params);
     }
     getIssue(projectId, linearIssueId) {
-        const row = this.connection
-            .prepare("SELECT * FROM issues WHERE project_id = ? AND linear_issue_id = ?")
-            .get(projectId, linearIssueId);
-        return row ? mapIssueRow(row) : undefined;
+        return this.issues.getIssue(projectId, linearIssueId);
     }
     getIssueById(id) {
-        const row = this.connection.prepare("SELECT * FROM issues WHERE id = ?").get(id);
-        return row ? mapIssueRow(row) : undefined;
+        return this.issues.getIssueById(id);
     }
     getIssueByKey(issueKey) {
-        const row = this.connection.prepare("SELECT * FROM issues WHERE issue_key = ?").get(issueKey);
-        return row ? mapIssueRow(row) : undefined;
+        return this.issues.getIssueByKey(issueKey);
     }
     getIssueByBranch(branchName) {
-        const row = this.connection.prepare("SELECT * FROM issues WHERE branch_name = ?").get(branchName);
-        return row ? mapIssueRow(row) : undefined;
+        return this.issues.getIssueByBranch(branchName);
     }
     getIssueByPrNumber(prNumber) {
-        const row = this.connection.prepare("SELECT * FROM issues WHERE pr_number = ?").get(prNumber);
-        return row ? mapIssueRow(row) : undefined;
-    }
-    getIssueSession(projectId, linearIssueId) {
-        const row = this.connection
-            .prepare("SELECT * FROM issue_sessions WHERE project_id = ? AND linear_issue_id = ?")
-            .get(projectId, linearIssueId);
-        return row ? mapIssueSessionRow(row) : undefined;
-    }
-    getIssueSessionByKey(issueKey) {
-        const row = this.connection.prepare("SELECT * FROM issue_sessions WHERE issue_key = ?").get(issueKey);
-        return row ? mapIssueSessionRow(row) : undefined;
-    }
-    appendIssueSessionEvent(params) {
-        if (params.dedupeKey) {
-            const existing = this.connection.prepare(`
-        SELECT * FROM issue_session_events
-        WHERE project_id = ? AND linear_issue_id = ? AND dedupe_key = ? AND processed_at IS NULL
-        ORDER BY id DESC LIMIT 1
-      `).get(params.projectId, params.linearIssueId, params.dedupeKey);
-            if (existing)
-                return mapIssueSessionEventRow(existing);
-        }
-        const now = isoNow();
-        const result = this.connection.prepare(`
-      INSERT INTO issue_session_events (
-        project_id, linear_issue_id, event_type, event_json, dedupe_key, created_at
-      ) VALUES (?, ?, ?, ?, ?, ?)
-    `).run(params.projectId, params.linearIssueId, params.eventType, params.eventJson ?? null, params.dedupeKey ?? null, now);
-        return this.getIssueSessionEvent(Number(result.lastInsertRowid));
-    }
-    appendIssueSessionEventWithLease(lease, params) {
-        return this.withIssueSessionLease(lease.projectId, lease.linearIssueId, lease.leaseId, () => this.appendIssueSessionEvent(params));
-    }
-    appendIssueSessionEventRespectingActiveLease(projectId, linearIssueId, params) {
-        const lease = this.getActiveIssueSessionLease(projectId, linearIssueId);
-        if (!lease) {
-            return this.appendIssueSessionEvent(params);
-        }
-        return this.appendIssueSessionEventWithLease(lease, params);
-    }
-    getIssueSessionEvent(id) {
-        const row = this.connection.prepare("SELECT * FROM issue_session_events WHERE id = ?").get(id);
-        return row ? mapIssueSessionEventRow(row) : undefined;
-    }
-    listIssueSessionEvents(projectId, linearIssueId, options) {
-        const conditions = ["project_id = ?", "linear_issue_id = ?"];
-        const values = [projectId, linearIssueId];
-        if (options?.pendingOnly) {
-            conditions.push("processed_at IS NULL");
-        }
-        let query = `SELECT * FROM issue_session_events WHERE ${conditions.join(" AND ")} ORDER BY id`;
-        if (options?.limit !== undefined) {
-            query += " LIMIT ?";
-            values.push(options.limit);
-        }
-        const rows = this.connection.prepare(query).all(...values);
-        return rows.map(mapIssueSessionEventRow);
-    }
-    consumeIssueSessionEvents(projectId, linearIssueId, eventIds, runId) {
-        if (eventIds.length === 0)
-            return;
-        const now = isoNow();
-        const placeholders = eventIds.map(() => "?").join(", ");
-        this.connection.prepare(`
-      UPDATE issue_session_events
-      SET processed_at = ?, consumed_by_run_id = ?
-      WHERE project_id = ? AND linear_issue_id = ? AND id IN (${placeholders}) AND processed_at IS NULL
-    `).run(now, runId, projectId, linearIssueId, ...eventIds);
-    }
-    clearPendingIssueSessionEvents(projectId, linearIssueId) {
-        this.connection.prepare(`
-      UPDATE issue_session_events
-      SET processed_at = ?, consumed_by_run_id = NULL
-      WHERE project_id = ? AND linear_issue_id = ? AND processed_at IS NULL
-    `).run(isoNow(), projectId, linearIssueId);
-    }
-    hasPendingIssueSessionEvents(projectId, linearIssueId) {
-        const row = this.connection.prepare(`
-      SELECT 1
-      FROM issue_session_events
-      WHERE project_id = ? AND linear_issue_id = ? AND processed_at IS NULL
-      LIMIT 1
-    `).get(projectId, linearIssueId);
-        return row !== undefined;
-    }
-    peekIssueSessionWake(projectId, linearIssueId) {
-        const issue = this.getIssue(projectId, linearIssueId);
-        if (!issue)
-            return undefined;
-        const events = this.listIssueSessionEvents(projectId, linearIssueId, { pendingOnly: true });
-        const plan = deriveSessionWakePlan(issue, events);
-        if (plan?.runType) {
-            return {
-                eventIds: events.map((event) => event.id),
-                runType: plan.runType,
-                context: plan.context,
-                ...(plan.wakeReason ? { wakeReason: plan.wakeReason } : {}),
-                resumeThread: plan.resumeThread,
-            };
-        }
-        const implicitWake = deriveImplicitReactiveWake(issue);
-        if (!implicitWake)
-            return undefined;
-        return {
-            eventIds: [],
-            runType: implicitWake.runType,
-            context: implicitWake.context,
-            wakeReason: implicitWake.wakeReason,
-            resumeThread: false,
-        };
-    }
-    acquireIssueSessionLease(params) {
-        const now = params.now ?? isoNow();
-        const result = this.connection.prepare(`
-      UPDATE issue_sessions
-      SET lease_id = ?, worker_id = ?, leased_until = ?, updated_at = ?
-      WHERE project_id = ? AND linear_issue_id = ?
-        AND (leased_until IS NULL OR leased_until <= ? OR lease_id = ?)
-    `).run(params.leaseId, params.workerId, params.leasedUntil, now, params.projectId, params.linearIssueId, now, params.leaseId);
-        return Number(result.changes ?? 0) > 0;
-    }
-    forceAcquireIssueSessionLease(params) {
-        const now = params.now ?? isoNow();
-        const result = this.connection.prepare(`
-      UPDATE issue_sessions
-      SET lease_id = ?, worker_id = ?, leased_until = ?, updated_at = ?
-      WHERE project_id = ? AND linear_issue_id = ?
-    `).run(params.leaseId, params.workerId, params.leasedUntil, now, params.projectId, params.linearIssueId);
-        return Number(result.changes ?? 0) > 0;
-    }
-    renewIssueSessionLease(params) {
-        const now = params.now ?? isoNow();
-        const result = this.connection.prepare(`
-      UPDATE issue_sessions
-      SET leased_until = ?, updated_at = ?
-      WHERE project_id = ? AND linear_issue_id = ? AND lease_id = ?
-    `).run(params.leasedUntil, now, params.projectId, params.linearIssueId, params.leaseId);
-        return Number(result.changes ?? 0) > 0;
-    }
-    releaseIssueSessionLease(projectId, linearIssueId, leaseId) {
-        this.connection.prepare(`
-      UPDATE issue_sessions
-      SET lease_id = NULL, worker_id = NULL, leased_until = NULL, updated_at = ?
-      WHERE project_id = ? AND linear_issue_id = ? AND (? IS NULL OR lease_id = ?)
-    `).run(isoNow(), projectId, linearIssueId, leaseId ?? null, leaseId ?? null);
-    }
-    releaseExpiredIssueSessionLeases(now = isoNow()) {
-        this.connection.prepare(`
-      UPDATE issue_sessions
-      SET lease_id = NULL, worker_id = NULL, leased_until = NULL, updated_at = ?
-      WHERE leased_until IS NOT NULL AND leased_until <= ?
-    `).run(now, now);
-    }
-    hasActiveIssueSessionLease(projectId, linearIssueId, leaseId, now = isoNow()) {
-        const row = this.connection.prepare(`
-      SELECT 1
-      FROM issue_sessions
-      WHERE project_id = ? AND linear_issue_id = ? AND lease_id = ?
-        AND leased_until IS NOT NULL
-        AND leased_until > ?
-      LIMIT 1
-    `).get(projectId, linearIssueId, leaseId, now);
-        return row !== undefined;
-    }
-    getActiveIssueSessionLease(projectId, linearIssueId, now = isoNow()) {
-        const row = this.connection.prepare(`
-      SELECT lease_id
-      FROM issue_sessions
-      WHERE project_id = ? AND linear_issue_id = ?
-        AND lease_id IS NOT NULL
-        AND leased_until IS NOT NULL
-        AND leased_until > ?
-      LIMIT 1
-    `).get(projectId, linearIssueId, now);
-        const leaseId = typeof row?.lease_id === "string" ? row.lease_id : undefined;
-        if (!leaseId)
-            return undefined;
-        return { projectId, linearIssueId, leaseId };
-    }
-    withIssueSessionLease(projectId, linearIssueId, leaseId, fn) {
-        return this.transaction(() => {
-            if (!this.hasActiveIssueSessionLease(projectId, linearIssueId, leaseId)) {
-                return undefined;
-            }
-            return fn();
-        });
-    }
-    upsertIssueWithLease(lease, params) {
-        return this.withIssueSessionLease(lease.projectId, lease.linearIssueId, lease.leaseId, () => this.upsertIssue(params));
-    }
-    upsertIssueRespectingActiveLease(projectId, linearIssueId, params) {
-        const lease = this.getActiveIssueSessionLease(projectId, linearIssueId);
-        if (!lease) {
-            return this.upsertIssue(params);
-        }
-        return this.upsertIssueWithLease(lease, params);
-    }
-    finishRunWithLease(lease, runId, params) {
-        return this.withIssueSessionLease(lease.projectId, lease.linearIssueId, lease.leaseId, () => {
-            this.finishRun(runId, params);
-            return true;
-        }) ?? false;
-    }
-    finishRunRespectingActiveLease(projectId, linearIssueId, runId, params) {
-        const lease = this.getActiveIssueSessionLease(projectId, linearIssueId);
-        if (!lease) {
-            this.finishRun(runId, params);
-            return true;
-        }
-        return this.finishRunWithLease(lease, runId, params);
-    }
-    updateRunThreadWithLease(lease, runId, params) {
-        return this.withIssueSessionLease(lease.projectId, lease.linearIssueId, lease.leaseId, () => {
-            this.updateRunThread(runId, params);
-            return true;
-        }) ?? false;
-    }
-    consumeIssueSessionEventsWithLease(lease, eventIds, runId) {
-        return this.withIssueSessionLease(lease.projectId, lease.linearIssueId, lease.leaseId, () => {
-            this.consumeIssueSessionEvents(lease.projectId, lease.linearIssueId, eventIds, runId);
-            return true;
-        }) ?? false;
-    }
-    clearPendingIssueSessionEventsWithLease(lease) {
-        return this.withIssueSessionLease(lease.projectId, lease.linearIssueId, lease.leaseId, () => {
-            this.clearPendingIssueSessionEvents(lease.projectId, lease.linearIssueId);
-            return true;
-        }) ?? false;
-    }
-    clearPendingIssueSessionEventsRespectingActiveLease(projectId, linearIssueId) {
-        const lease = this.getActiveIssueSessionLease(projectId, linearIssueId);
-        if (!lease) {
-            this.clearPendingIssueSessionEvents(projectId, linearIssueId);
-            return true;
-        }
-        return this.clearPendingIssueSessionEventsWithLease(lease);
-    }
-    setIssueSessionLastWakeReasonWithLease(lease, lastWakeReason) {
-        return this.withIssueSessionLease(lease.projectId, lease.linearIssueId, lease.leaseId, () => {
-            this.setIssueSessionLastWakeReason(lease.projectId, lease.linearIssueId, lastWakeReason);
-            return true;
-        }) ?? false;
-    }
-    setIssueSessionLastWakeReason(projectId, linearIssueId, lastWakeReason) {
-        this.connection.prepare(`
-      UPDATE issue_sessions
-      SET last_wake_reason = ?, updated_at = ?
-      WHERE project_id = ? AND linear_issue_id = ?
-    `).run(lastWakeReason ?? null, isoNow(), projectId, linearIssueId);
+        return this.issues.getIssueByPrNumber(prNumber);
     }
     setBranchOwner(projectId, linearIssueId, owner) {
-        this.connection.prepare(`
-      UPDATE issues
-      SET branch_owner = ?, branch_ownership_changed_at = ?, updated_at = ?
-      WHERE project_id = ? AND linear_issue_id = ?
-    `).run(owner, isoNow(), isoNow(), projectId, linearIssueId);
-    }
-    setBranchOwnerWithLease(lease, owner) {
-        return this.withIssueSessionLease(lease.projectId, lease.linearIssueId, lease.leaseId, () => {
-            this.setBranchOwner(lease.projectId, lease.linearIssueId, owner);
-            return true;
-        }) ?? false;
-    }
-    setBranchOwnerRespectingActiveLease(projectId, linearIssueId, owner) {
-        const lease = this.getActiveIssueSessionLease(projectId, linearIssueId);
-        if (!lease) {
-            this.setBranchOwner(projectId, linearIssueId, owner);
-            return true;
-        }
-        return this.setBranchOwnerWithLease(lease, owner);
-    }
-    releaseIssueSessionLeaseRespectingActiveLease(projectId, linearIssueId) {
-        const lease = this.getActiveIssueSessionLease(projectId, linearIssueId);
-        this.releaseIssueSessionLease(projectId, linearIssueId, lease?.leaseId);
+        this.issues.setBranchOwner(projectId, linearIssueId, owner);
     }
     replaceIssueDependencies(params) {
-        const now = isoNow();
-        this.connection
-            .prepare("DELETE FROM issue_dependencies WHERE project_id = ? AND linear_issue_id = ?")
-            .run(params.projectId, params.linearIssueId);
-        if (params.blockers.length === 0) {
-            return;
-        }
-        const insert = this.connection.prepare(`
-      INSERT INTO issue_dependencies (
-        project_id,
-        linear_issue_id,
-        blocker_linear_issue_id,
-        blocker_issue_key,
-        blocker_title,
-        blocker_current_linear_state,
-        blocker_current_linear_state_type,
-        updated_at
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-    `);
-        for (const blocker of params.blockers) {
-            insert.run(params.projectId, params.linearIssueId, blocker.blockerLinearIssueId, blocker.blockerIssueKey ?? null, blocker.blockerTitle ?? null, blocker.blockerCurrentLinearState ?? null, blocker.blockerCurrentLinearStateType ?? null, now);
-        }
+        this.issues.replaceIssueDependencies(params);
     }
     listIssueDependencies(projectId, linearIssueId) {
-        const rows = this.connection.prepare(`
-      SELECT
-        d.project_id,
-        d.linear_issue_id,
-        d.blocker_linear_issue_id,
-        COALESCE(blockers.issue_key, d.blocker_issue_key) AS blocker_issue_key,
-        COALESCE(blockers.title, d.blocker_title) AS blocker_title,
-        COALESCE(blockers.current_linear_state, d.blocker_current_linear_state) AS blocker_current_linear_state,
-        COALESCE(blockers.current_linear_state_type, d.blocker_current_linear_state_type) AS blocker_current_linear_state_type,
-        d.updated_at
-      FROM issue_dependencies d
-      LEFT JOIN issues blockers
-        ON blockers.project_id = d.project_id
-       AND blockers.linear_issue_id = d.blocker_linear_issue_id
-      WHERE d.project_id = ? AND d.linear_issue_id = ?
-      ORDER BY COALESCE(blockers.issue_key, d.blocker_issue_key, d.blocker_linear_issue_id) ASC
-    `).all(projectId, linearIssueId);
-        return rows.map((row) => ({
-            projectId: String(row.project_id),
-            linearIssueId: String(row.linear_issue_id),
-            blockerLinearIssueId: String(row.blocker_linear_issue_id),
-            ...(row.blocker_issue_key !== null && row.blocker_issue_key !== undefined ? { blockerIssueKey: String(row.blocker_issue_key) } : {}),
-            ...(row.blocker_title !== null && row.blocker_title !== undefined ? { blockerTitle: String(row.blocker_title) } : {}),
-            ...(row.blocker_current_linear_state !== null && row.blocker_current_linear_state !== undefined
-                ? { blockerCurrentLinearState: String(row.blocker_current_linear_state) }
-                : {}),
-            ...(row.blocker_current_linear_state_type !== null && row.blocker_current_linear_state_type !== undefined
-                ? { blockerCurrentLinearStateType: String(row.blocker_current_linear_state_type) }
-                : {}),
-            updatedAt: String(row.updated_at),
-        }));
+        return this.issues.listIssueDependencies(projectId, linearIssueId);
     }
     listDependents(projectId, blockerLinearIssueId) {
-        const rows = this.connection.prepare(`
-      SELECT project_id, linear_issue_id
-      FROM issue_dependencies
-      WHERE project_id = ? AND blocker_linear_issue_id = ?
-      ORDER BY linear_issue_id ASC
-    `).all(projectId, blockerLinearIssueId);
-        return rows.map((row) => ({
-            projectId: String(row.project_id),
-            linearIssueId: String(row.linear_issue_id),
-        }));
+        return this.issues.listDependents(projectId, blockerLinearIssueId);
     }
     getLatestGitHubCiSnapshot(projectId, linearIssueId) {
-        const issue = this.getIssue(projectId, linearIssueId);
-        if (!issue?.lastGitHubCiSnapshotJson)
-            return undefined;
-        try {
-            return JSON.parse(issue.lastGitHubCiSnapshotJson);
-        }
-        catch {
-            return undefined;
-        }
+        return this.issues.getLatestGitHubCiSnapshot(projectId, linearIssueId);
     }
     countUnresolvedBlockers(projectId, linearIssueId) {
-        const row = this.connection.prepare(`
-      SELECT COUNT(*) AS count
-      FROM issue_dependencies d
-      LEFT JOIN issues blockers
-        ON blockers.project_id = d.project_id
-       AND blockers.linear_issue_id = d.blocker_linear_issue_id
-      WHERE d.project_id = ? AND d.linear_issue_id = ?
-        AND (
-          COALESCE(blockers.current_linear_state_type, d.blocker_current_linear_state_type, '') != 'completed'
-          AND LOWER(TRIM(COALESCE(blockers.current_linear_state, d.blocker_current_linear_state, ''))) != 'done'
-        )
-    `).get(projectId, linearIssueId);
-        return Number(row?.count ?? 0);
+        return this.issues.countUnresolvedBlockers(projectId, linearIssueId);
     }
     listIssuesReadyForExecution() {
-        return this.listIssues()
+        return this.issues.listIssues()
             .filter((issue) => isIssueSessionReadyForExecution({
             factoryState: issue.factoryState,
             sessionState: deriveIssueSessionState({
@@ -828,8 +169,8 @@ export class PatchRelayDatabase {
                 factoryState: issue.factoryState,
             }),
             activeRunId: issue.activeRunId,
-            blockedByCount: this.countUnresolvedBlockers(issue.projectId, issue.linearIssueId),
-            hasPendingWake: this.peekIssueSessionWake(issue.projectId, issue.linearIssueId) !== undefined,
+            blockedByCount: this.issues.countUnresolvedBlockers(issue.projectId, issue.linearIssueId),
+            hasPendingWake: this.issueSessions.peekIssueSessionWake(issue.projectId, issue.linearIssueId) !== undefined,
             hasLegacyPendingRun: issue.pendingRunType !== undefined,
             prNumber: issue.prNumber,
             prState: issue.prState,
@@ -847,229 +188,35 @@ export class PatchRelayDatabase {
      * advancement based on stored PR metadata (missed GitHub webhooks).
      */
     listIdleNonTerminalIssues() {
-        const rows = this.connection
-            .prepare(`SELECT * FROM issues
-         WHERE factory_state NOT IN ('done', 'escalated', 'failed', 'awaiting_input')
-         AND active_run_id IS NULL
-         AND pending_run_type IS NULL
-         AND pr_number IS NOT NULL`)
-            .all();
-        return rows.map(mapIssueRow);
+        return this.issues.listIdleNonTerminalIssues();
     }
     /**
      * Issues in delegated state with dependencies but no pending/active run.
      * Candidates for unblocking when their blockers complete.
      */
     listBlockedDelegatedIssues() {
-        const rows = this.connection
-            .prepare(`SELECT DISTINCT i.* FROM issues i
-         JOIN issue_dependencies d ON d.project_id = i.project_id AND d.linear_issue_id = i.linear_issue_id
-         WHERE i.factory_state = 'delegated'
-         AND i.active_run_id IS NULL
-         AND i.pending_run_type IS NULL`)
-            .all();
-        return rows.map(mapIssueRow);
+        return this.issues.listBlockedDelegatedIssues();
     }
     /**
      * Issues waiting in the merge queue with no active or pending run.
      * Used by the queue health monitor to probe GitHub for stuck PRs.
      */
     listAwaitingQueueIssues() {
-        const rows = this.connection
-            .prepare(`SELECT * FROM issues
-         WHERE factory_state = 'awaiting_queue'
-         AND active_run_id IS NULL
-         AND pending_run_type IS NULL
-         AND pr_number IS NOT NULL`)
-            .all();
-        return rows.map(mapIssueRow);
+        return this.issues.listAwaitingQueueIssues();
     }
     listIssuesByState(projectId, state) {
-        const rows = this.connection
-            .prepare("SELECT * FROM issues WHERE project_id = ? AND factory_state = ? ORDER BY pr_number ASC")
-            .all(projectId, state);
-        return rows.map(mapIssueRow);
-    }
-    // ─── Runs ─────────────────────────────────────────────────────────
-    createRun(params) {
-        const now = isoNow();
-        const result = this.connection.prepare(`
-      INSERT INTO runs (issue_id, project_id, linear_issue_id, run_type, status, source_head_sha, prompt_text, started_at)
-      VALUES (?, ?, ?, ?, 'queued', ?, ?, ?)
-    `).run(params.issueId, params.projectId, params.linearIssueId, params.runType, params.sourceHeadSha ?? null, params.promptText ?? null, now);
-        const run = this.getRun(Number(result.lastInsertRowid));
-        const issue = this.getIssue(params.projectId, params.linearIssueId);
-        if (issue) {
-            this.syncIssueSessionFromIssue(issue, { lastRunType: run.runType });
-        }
-        return run;
-    }
-    getRun(id) {
-        const row = this.connection.prepare("SELECT * FROM runs WHERE id = ?").get(id);
-        return row ? mapRunRow(row) : undefined;
-    }
-    getRunByThreadId(threadId) {
-        const row = this.connection.prepare("SELECT * FROM runs WHERE thread_id = ?").get(threadId);
-        return row ? mapRunRow(row) : undefined;
-    }
-    listRunsForIssue(projectId, linearIssueId) {
-        const rows = this.connection
-            .prepare("SELECT * FROM runs WHERE project_id = ? AND linear_issue_id = ? ORDER BY id")
-            .all(projectId, linearIssueId);
-        return rows.map(mapRunRow);
-    }
-    getLatestRunForIssue(projectId, linearIssueId) {
-        const row = this.connection
-            .prepare("SELECT * FROM runs WHERE project_id = ? AND linear_issue_id = ? ORDER BY id DESC LIMIT 1")
-            .get(projectId, linearIssueId);
-        return row ? mapRunRow(row) : undefined;
-    }
-    listActiveRuns() {
-        const rows = this.connection
-            .prepare("SELECT * FROM runs WHERE status IN ('queued', 'running')")
-            .all();
-        return rows.map(mapRunRow);
-    }
-    listRunningRuns() {
-        const rows = this.connection
-            .prepare("SELECT * FROM runs WHERE status IN ('running', 'queued')")
-            .all();
-        return rows.map(mapRunRow);
-    }
-    updateRunThread(runId, params) {
-        this.connection.prepare(`
-      UPDATE runs SET
-        thread_id = ?,
-        parent_thread_id = COALESCE(?, parent_thread_id),
-        turn_id = COALESCE(?, turn_id),
-        status = 'running'
-      WHERE id = ?
-        AND ended_at IS NULL
-        AND status IN ('queued', 'running')
-    `).run(params.threadId, params.parentThreadId ?? null, params.turnId ?? null, runId);
-        const run = this.getRun(runId);
-        if (!run)
-            return;
-        const issue = this.getIssue(run.projectId, run.linearIssueId);
-        if (issue) {
-            this.syncIssueSessionFromIssue(issue);
-        }
-    }
-    updateRunTurnId(runId, turnId) {
-        this.connection.prepare("UPDATE runs SET turn_id = ? WHERE id = ?").run(turnId, runId);
-    }
-    finishRun(runId, params) {
-        const now = isoNow();
-        this.connection.prepare(`
-      UPDATE runs SET
-        status = ?,
-        thread_id = COALESCE(?, thread_id),
-        turn_id = COALESCE(?, turn_id),
-        failure_reason = COALESCE(?, failure_reason),
-        summary_json = COALESCE(?, summary_json),
-        report_json = COALESCE(?, report_json),
-        ended_at = ?
-      WHERE id = ?
-    `).run(params.status, params.threadId ?? null, params.turnId ?? null, params.failureReason ?? null, params.summaryJson ?? null, params.reportJson ?? null, now, runId);
-        const run = this.getRun(runId);
-        if (!run)
-            return;
-        const issue = this.getIssue(run.projectId, run.linearIssueId);
-        if (issue) {
-            this.syncIssueSessionFromIssue(issue, {
-                summaryText: extractLatestAssistantSummary(this.getRun(runId) ?? run),
-                lastRunType: run.runType,
-            });
-        }
-    }
-    // ─── Thread Events (kept for extended history) ────────────────────
-    saveThreadEvent(params) {
-        this.connection.prepare(`
-      INSERT INTO run_thread_events (run_id, thread_id, turn_id, method, event_json, created_at)
-      VALUES (?, ?, ?, ?, ?, ?)
-    `).run(params.runId, params.threadId, params.turnId ?? null, params.method, params.eventJson, isoNow());
-    }
-    listThreadEvents(runId) {
-        const rows = this.connection
-            .prepare("SELECT * FROM run_thread_events WHERE run_id = ? ORDER BY id")
-            .all(runId);
-        return rows.map((row) => ({
-            id: Number(row.id),
-            runId: Number(row.run_id),
-            threadId: String(row.thread_id),
-            ...(row.turn_id !== null ? { turnId: String(row.turn_id) } : {}),
-            method: String(row.method),
-            eventJson: String(row.event_json),
-            createdAt: String(row.created_at),
-        }));
+        return this.issues.listIssuesByState(projectId, state);
     }
     // ─── View builders ──────────────────────────────────────────────
     issueToTrackedIssue(issue) {
-        const session = this.getIssueSession(issue.projectId, issue.linearIssueId);
-        const blockedBy = this.listIssueDependencies(issue.projectId, issue.linearIssueId);
-        const unresolvedBlockedBy = blockedBy.filter((entry) => !isResolvedLinearState(entry.blockerCurrentLinearStateType, entry.blockerCurrentLinearState));
-        const pendingWake = this.peekIssueSessionWake(issue.projectId, issue.linearIssueId);
-        const failureContext = parseGitHubFailureContext(issue.lastGitHubFailureContextJson);
-        const blockedByKeys = unresolvedBlockedBy.map((entry) => entry.blockerIssueKey ?? entry.blockerLinearIssueId);
-        const waitingReason = derivePatchRelayWaitingReason({
-            ...(issue.activeRunId !== undefined ? { activeRunId: issue.activeRunId } : {}),
-            blockedByKeys,
-            factoryState: issue.factoryState,
-            pendingRunType: issue.pendingRunType,
-            prNumber: issue.prNumber,
-            prHeadSha: issue.prHeadSha,
-            prReviewState: issue.prReviewState,
-            prCheckStatus: issue.prCheckStatus,
-            lastBlockingReviewHeadSha: issue.lastBlockingReviewHeadSha,
-            latestFailureCheckName: issue.lastGitHubFailureCheckName,
-        });
-        const latestRun = this.getLatestRunForIssue(issue.projectId, issue.linearIssueId);
-        const latestEvent = this.listIssueSessionEvents(issue.projectId, issue.linearIssueId, { limit: 1 }).at(-1);
-        const statusNote = deriveIssueStatusNote({
+        return buildTrackedIssueRecord({
             issue,
-            sessionSummary: session?.summaryText,
-            latestRun,
-            latestEvent,
-            failureSummary: failureContext?.summary,
-            blockedByKeys,
-            waitingReason,
+            session: this.issueSessions.getIssueSession(issue.projectId, issue.linearIssueId),
+            blockedBy: this.issues.listIssueDependencies(issue.projectId, issue.linearIssueId),
+            hasPendingWake: this.issueSessions.peekIssueSessionWake(issue.projectId, issue.linearIssueId) !== undefined,
+            latestRun: this.runs.getLatestRunForIssue(issue.projectId, issue.linearIssueId),
+            latestEvent: this.issueSessions.listIssueSessionEvents(issue.projectId, issue.linearIssueId, { limit: 1 }).at(-1),
         });
-        return {
-            id: issue.id,
-            projectId: issue.projectId,
-            linearIssueId: issue.linearIssueId,
-            ...(issue.issueKey ? { issueKey: issue.issueKey } : {}),
-            ...(issue.title ? { title: issue.title } : {}),
-            ...(issue.url ? { issueUrl: issue.url } : {}),
-            ...(statusNote ? { statusNote } : {}),
-            ...(issue.currentLinearState ? { currentLinearState: issue.currentLinearState } : {}),
-            ...(session?.sessionState ? { sessionState: session.sessionState } : {}),
-            factoryState: issue.factoryState,
-            blockedByCount: unresolvedBlockedBy.length,
-            blockedByKeys,
-            readyForExecution: isIssueSessionReadyForExecution({
-                sessionState: session?.sessionState,
-                factoryState: issue.factoryState,
-                activeRunId: issue.activeRunId,
-                blockedByCount: unresolvedBlockedBy.length,
-                hasPendingWake: pendingWake !== undefined,
-                hasLegacyPendingRun: issue.pendingRunType !== undefined,
-                ...(issue.prNumber !== undefined ? { prNumber: issue.prNumber } : {}),
-                ...(issue.prState ? { prState: issue.prState } : {}),
-                ...(issue.prReviewState ? { prReviewState: issue.prReviewState } : {}),
-                ...(issue.prCheckStatus ? { prCheckStatus: issue.prCheckStatus } : {}),
-                ...(issue.lastGitHubFailureSource ? { latestFailureSource: issue.lastGitHubFailureSource } : {}),
-            }),
-            ...(issue.lastGitHubFailureSource ? { latestFailureSource: issue.lastGitHubFailureSource } : {}),
-            ...(issue.lastGitHubFailureHeadSha ? { latestFailureHeadSha: issue.lastGitHubFailureHeadSha } : {}),
-            ...(issue.lastGitHubFailureCheckName ? { latestFailureCheckName: issue.lastGitHubFailureCheckName } : {}),
-            ...(failureContext?.stepName ? { latestFailureStepName: failureContext.stepName } : {}),
-            ...(failureContext?.summary ? { latestFailureSummary: failureContext.summary } : {}),
-            ...(waitingReason ? { waitingReason } : {}),
-            ...(issue.activeRunId !== undefined ? { activeRunId: issue.activeRunId } : {}),
-            ...(issue.agentSessionId ? { activeAgentSessionId: issue.agentSessionId } : {}),
-            updatedAt: issue.updatedAt,
-        };
     }
     getTrackedIssue(projectId, linearIssueId) {
         const issue = this.getIssue(projectId, linearIssueId);
@@ -1080,42 +227,10 @@ export class PatchRelayDatabase {
         return issue ? this.issueToTrackedIssue(issue) : undefined;
     }
     listIssues() {
-        const rows = this.connection
-            .prepare("SELECT * FROM issues ORDER BY updated_at DESC")
-            .all();
-        return rows.map(mapIssueRow);
+        return this.issues.listIssues();
     }
     listIssuesWithAgentSessions() {
-        const rows = this.connection
-            .prepare("SELECT * FROM issues WHERE agent_session_id IS NOT NULL ORDER BY updated_at DESC")
-            .all();
-        return rows.map(mapIssueRow);
-    }
-    findLatestAgentSessionIdForIssue(linearIssueId) {
-        const row = this.connection.prepare(`
-      SELECT COALESCE(
-        json_extract(payload_json, '$.agentSession.id'),
-        json_extract(payload_json, '$.data.agentSession.id'),
-        json_extract(payload_json, '$.agentSessionId'),
-        json_extract(payload_json, '$.data.agentSessionId')
-      ) AS agent_session_id
-      FROM webhook_events
-      WHERE COALESCE(
-        json_extract(payload_json, '$.agentSession.issueId'),
-        json_extract(payload_json, '$.data.agentSession.issueId'),
-        json_extract(payload_json, '$.agentSession.issue.id'),
-        json_extract(payload_json, '$.data.agentSession.issue.id')
-      ) = ?
-        AND COALESCE(
-          json_extract(payload_json, '$.agentSession.id'),
-          json_extract(payload_json, '$.data.agentSession.id'),
-          json_extract(payload_json, '$.agentSessionId'),
-          json_extract(payload_json, '$.data.agentSessionId')
-        ) IS NOT NULL
-      ORDER BY id DESC
-      LIMIT 1
-    `).get(linearIssueId);
-        return row?.agent_session_id != null ? String(row.agent_session_id) : undefined;
+        return this.issues.listIssuesWithAgentSessions();
     }
     // ─── Issue overview for query service ─────────────────────────────
     getIssueOverview(issueKey) {
@@ -1123,212 +238,14 @@ export class PatchRelayDatabase {
         if (!issue)
             return undefined;
         const tracked = this.issueToTrackedIssue(issue);
-        const activeRun = issue.activeRunId ? this.getRun(issue.activeRunId) : undefined;
+        const activeRun = issue.activeRunId ? this.runs.getRunById(issue.activeRunId) : undefined;
         return {
             issue: tracked,
             ...(activeRun ? { activeRun } : {}),
         };
     }
-    syncIssueSessionFromIssue(issue, options) {
-        const tracked = this.issueToTrackedIssue(issue);
-        const existing = this.getIssueSession(issue.projectId, issue.linearIssueId);
-        const latestRun = this.getLatestRunForIssue(issue.projectId, issue.linearIssueId);
-        const latestRunType = options?.lastRunType ?? latestRun?.runType ?? existing?.lastRunType;
-        const summaryText = this.resolveIssueSessionSummary(issue, latestRun, existing?.summaryText, options?.summaryText);
-        const activeThreadId = issue.threadId ?? existing?.activeThreadId;
-        const threadGeneration = activeThreadId && activeThreadId !== existing?.activeThreadId
-            ? (existing?.threadGeneration ?? 0) + 1
-            : (existing?.threadGeneration ?? (activeThreadId ? 1 : 0));
-        const sessionState = deriveIssueSessionState({
-            ...(issue.activeRunId !== undefined ? { activeRunId: issue.activeRunId } : {}),
-            factoryState: issue.factoryState,
-        });
-        const lastWakeReason = options?.lastWakeReason
-            ?? deriveIssueSessionWakeReason({
-                pendingRunType: issue.pendingRunType,
-                factoryState: issue.factoryState,
-                prNumber: issue.prNumber,
-                prState: issue.prState,
-                prReviewState: issue.prReviewState,
-                prCheckStatus: issue.prCheckStatus,
-                latestFailureSource: issue.lastGitHubFailureSource,
-            })
-            ?? existing?.lastWakeReason;
-        const now = isoNow();
-        if (existing) {
-            this.connection.prepare(`
-        UPDATE issue_sessions SET
-          issue_key = ?,
-          repo_id = ?,
-          branch_name = ?,
-          worktree_path = ?,
-          pr_number = ?,
-          pr_head_sha = ?,
-          pr_author_login = ?,
-          session_state = ?,
-          waiting_reason = ?,
-          summary_text = ?,
-          active_thread_id = ?,
-          thread_generation = ?,
-          active_run_id = ?,
-          last_run_type = ?,
-          last_wake_reason = ?,
-          ci_repair_attempts = ?,
-          queue_repair_attempts = ?,
-          review_fix_attempts = ?,
-          updated_at = ?
-        WHERE project_id = ? AND linear_issue_id = ?
-      `).run(issue.issueKey ?? null, issue.projectId, issue.branchName ?? null, issue.worktreePath ?? null, issue.prNumber ?? null, issue.prHeadSha ?? null, issue.prAuthorLogin ?? null, sessionState, tracked.waitingReason ?? null, summaryText ?? null, activeThreadId ?? null, threadGeneration, issue.activeRunId ?? null, latestRunType ?? null, lastWakeReason ?? null, issue.ciRepairAttempts, issue.queueRepairAttempts, issue.reviewFixAttempts, now, issue.projectId, issue.linearIssueId);
-            return;
-        }
-        this.connection.prepare(`
-      INSERT INTO issue_sessions (
-        project_id, linear_issue_id, issue_key, repo_id, branch_name, worktree_path,
-        pr_number, pr_head_sha, pr_author_login, session_state, waiting_reason, summary_text,
-        active_thread_id, thread_generation, active_run_id, last_run_type, last_wake_reason,
-        ci_repair_attempts, queue_repair_attempts, review_fix_attempts,
-        created_at, updated_at
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-    `).run(issue.projectId, issue.linearIssueId, issue.issueKey ?? null, issue.projectId, issue.branchName ?? null, issue.worktreePath ?? null, issue.prNumber ?? null, issue.prHeadSha ?? null, issue.prAuthorLogin ?? null, sessionState, tracked.waitingReason ?? null, summaryText ?? null, activeThreadId ?? null, threadGeneration, issue.activeRunId ?? null, latestRunType ?? null, lastWakeReason ?? null, issue.ciRepairAttempts, issue.queueRepairAttempts, issue.reviewFixAttempts, now, now);
-    }
-    resolveIssueSessionSummary(issue, latestRun, existingSummaryText, explicitSummaryText) {
-        if (explicitSummaryText?.trim()) {
-            return explicitSummaryText;
-        }
-        const latestSummary = extractLatestAssistantSummary(latestRun);
-        if (latestRun && (latestRun.status === "queued" || latestRun.status === "running")) {
-            return latestSummary;
-        }
-        if (this.shouldKeepPreviousIssueSummary(issue, latestRun)) {
-            return this.findLatestCompletedRunSummary(issue.projectId, issue.linearIssueId)
-                ?? existingSummaryText
-                ?? latestSummary;
-        }
-        return latestSummary ?? existingSummaryText;
-    }
-    shouldKeepPreviousIssueSummary(issue, latestRun) {
-        if (!latestRun || latestRun.status !== "failed") {
-            return false;
-        }
-        if (latestRun.summaryJson || latestRun.reportJson) {
-            return false;
-        }
-        return issue.factoryState === "pr_open"
-            || issue.factoryState === "awaiting_queue"
-            || issue.factoryState === "done";
-    }
-    findLatestCompletedRunSummary(projectId, linearIssueId) {
-        const runs = this.listRunsForIssue(projectId, linearIssueId);
-        for (let index = runs.length - 1; index >= 0; index -= 1) {
-            const run = runs[index];
-            if (!run || run.status !== "completed") {
-                continue;
-            }
-            const summary = extractLatestAssistantSummary(run);
-            if (summary?.trim()) {
-                return summary;
-            }
-        }
-        return undefined;
-    }
 }
 // ─── Row mappers ──────────────────────────────────────────────────
-function mapIssueRow(row) {
-    return {
-        id: Number(row.id),
-        projectId: String(row.project_id),
-        linearIssueId: String(row.linear_issue_id),
-        ...(row.issue_key !== null ? { issueKey: String(row.issue_key) } : {}),
-        ...(row.title !== null ? { title: String(row.title) } : {}),
-        ...(row.description !== null && row.description !== undefined ? { description: String(row.description) } : {}),
-        ...(row.url !== null ? { url: String(row.url) } : {}),
-        ...(row.priority !== null && row.priority !== undefined ? { priority: Number(row.priority) } : {}),
-        ...(row.estimate !== null && row.estimate !== undefined ? { estimate: Number(row.estimate) } : {}),
-        ...(row.current_linear_state !== null ? { currentLinearState: String(row.current_linear_state) } : {}),
-        ...(row.current_linear_state_type !== null && row.current_linear_state_type !== undefined
-            ? { currentLinearStateType: String(row.current_linear_state_type) }
-            : {}),
-        factoryState: String(row.factory_state ?? "delegated"),
-        ...(row.pending_run_type !== null && row.pending_run_type !== undefined ? { pendingRunType: String(row.pending_run_type) } : {}),
-        ...(row.pending_run_context_json !== null && row.pending_run_context_json !== undefined ? { pendingRunContextJson: String(row.pending_run_context_json) } : {}),
-        ...(row.branch_name !== null ? { branchName: String(row.branch_name) } : {}),
-        ...(row.branch_owner !== null && row.branch_owner !== undefined && String(row.branch_owner) === "patchrelay"
-            ? { branchOwner: "patchrelay" }
-            : { branchOwner: "patchrelay" }),
-        ...(row.branch_ownership_changed_at !== null && row.branch_ownership_changed_at !== undefined
-            ? { branchOwnershipChangedAt: String(row.branch_ownership_changed_at) }
-            : {}),
-        ...(row.worktree_path !== null ? { worktreePath: String(row.worktree_path) } : {}),
-        ...(row.thread_id !== null ? { threadId: String(row.thread_id) } : {}),
-        ...(row.active_run_id !== null ? { activeRunId: Number(row.active_run_id) } : {}),
-        ...(row.status_comment_id !== null && row.status_comment_id !== undefined ? { statusCommentId: String(row.status_comment_id) } : {}),
-        ...(row.agent_session_id !== null ? { agentSessionId: String(row.agent_session_id) } : {}),
-        updatedAt: String(row.updated_at),
-        ...(row.pr_number !== null && row.pr_number !== undefined ? { prNumber: Number(row.pr_number) } : {}),
-        ...(row.pr_url !== null && row.pr_url !== undefined ? { prUrl: String(row.pr_url) } : {}),
-        ...(row.pr_state !== null && row.pr_state !== undefined ? { prState: String(row.pr_state) } : {}),
-        ...(row.pr_head_sha !== null && row.pr_head_sha !== undefined ? { prHeadSha: String(row.pr_head_sha) } : {}),
-        ...(row.pr_author_login !== null && row.pr_author_login !== undefined ? { prAuthorLogin: String(row.pr_author_login) } : {}),
-        ...(row.pr_review_state !== null && row.pr_review_state !== undefined ? { prReviewState: String(row.pr_review_state) } : {}),
-        ...(row.pr_check_status !== null && row.pr_check_status !== undefined ? { prCheckStatus: String(row.pr_check_status) } : {}),
-        ...(row.last_blocking_review_head_sha !== null && row.last_blocking_review_head_sha !== undefined
-            ? { lastBlockingReviewHeadSha: String(row.last_blocking_review_head_sha) }
-            : {}),
-        ...(row.last_github_failure_source !== null && row.last_github_failure_source !== undefined
-            ? { lastGitHubFailureSource: String(row.last_github_failure_source) }
-            : {}),
-        ...(row.last_github_failure_head_sha !== null && row.last_github_failure_head_sha !== undefined
-            ? { lastGitHubFailureHeadSha: String(row.last_github_failure_head_sha) }
-            : {}),
-        ...(row.last_github_failure_signature !== null && row.last_github_failure_signature !== undefined
-            ? { lastGitHubFailureSignature: String(row.last_github_failure_signature) }
-            : {}),
-        ...(row.last_github_failure_check_name !== null && row.last_github_failure_check_name !== undefined
-            ? { lastGitHubFailureCheckName: String(row.last_github_failure_check_name) }
-            : {}),
-        ...(row.last_github_failure_check_url !== null && row.last_github_failure_check_url !== undefined
-            ? { lastGitHubFailureCheckUrl: String(row.last_github_failure_check_url) }
-            : {}),
-        ...(row.last_github_failure_context_json !== null && row.last_github_failure_context_json !== undefined
-            ? { lastGitHubFailureContextJson: String(row.last_github_failure_context_json) }
-            : {}),
-        ...(row.last_github_failure_at !== null && row.last_github_failure_at !== undefined
-            ? { lastGitHubFailureAt: String(row.last_github_failure_at) }
-            : {}),
-        ...(row.last_github_ci_snapshot_head_sha !== null && row.last_github_ci_snapshot_head_sha !== undefined
-            ? { lastGitHubCiSnapshotHeadSha: String(row.last_github_ci_snapshot_head_sha) }
-            : {}),
-        ...(row.last_github_ci_snapshot_gate_check_name !== null && row.last_github_ci_snapshot_gate_check_name !== undefined
-            ? { lastGitHubCiSnapshotGateCheckName: String(row.last_github_ci_snapshot_gate_check_name) }
-            : {}),
-        ...(row.last_github_ci_snapshot_gate_check_status !== null && row.last_github_ci_snapshot_gate_check_status !== undefined
-            ? { lastGitHubCiSnapshotGateCheckStatus: String(row.last_github_ci_snapshot_gate_check_status) }
-            : {}),
-        ...(row.last_github_ci_snapshot_json !== null && row.last_github_ci_snapshot_json !== undefined
-            ? { lastGitHubCiSnapshotJson: String(row.last_github_ci_snapshot_json) }
-            : {}),
-        ...(row.last_github_ci_snapshot_settled_at !== null && row.last_github_ci_snapshot_settled_at !== undefined
-            ? { lastGitHubCiSnapshotSettledAt: String(row.last_github_ci_snapshot_settled_at) }
-            : {}),
-        ...(row.last_queue_signal_at !== null && row.last_queue_signal_at !== undefined
-            ? { lastQueueSignalAt: String(row.last_queue_signal_at) }
-            : {}),
-        ...(row.last_queue_incident_json !== null && row.last_queue_incident_json !== undefined
-            ? { lastQueueIncidentJson: String(row.last_queue_incident_json) }
-            : {}),
-        ...(row.last_attempted_failure_head_sha !== null && row.last_attempted_failure_head_sha !== undefined
-            ? { lastAttemptedFailureHeadSha: String(row.last_attempted_failure_head_sha) }
-            : {}),
-        ...(row.last_attempted_failure_signature !== null && row.last_attempted_failure_signature !== undefined
-            ? { lastAttemptedFailureSignature: String(row.last_attempted_failure_signature) }
-            : {}),
-        ciRepairAttempts: Number(row.ci_repair_attempts ?? 0),
-        queueRepairAttempts: Number(row.queue_repair_attempts ?? 0),
-        reviewFixAttempts: Number(row.review_fix_attempts ?? 0),
-        zombieRecoveryAttempts: Number(row.zombie_recovery_attempts ?? 0),
-        ...(row.last_zombie_recovery_at !== null && row.last_zombie_recovery_at !== undefined ? { lastZombieRecoveryAt: String(row.last_zombie_recovery_at) } : {}),
-    };
-}
 function mapIssueSessionRow(row) {
     return {
         id: Number(row.id),
@@ -1392,6 +309,3 @@ function mapRunRow(row) {
         ...(row.ended_at !== null ? { endedAt: String(row.ended_at) } : {}),
     };
 }
-function isResolvedLinearState(stateType, stateName) {
-    return stateType === "completed" || stateName?.trim().toLowerCase() === "done";
-}