patchrelay 0.36.7 → 0.36.8

package/dist/db.js

@@ -1,13 +1,14 @@
 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 { extractLatestAssistantSummary, } from "./issue-session-events.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 { buildTrackedIssueRecord } from "./tracked-issue-projector.js";
 function parseObjectJson(raw) {
     if (!raw)
         return undefined;
@@ -90,6 +91,9 @@ export class PatchRelayDatabase {
     linearInstallations;
     operatorFeed;
     repositories;
+    webhookEvents;
+    issueSessions;
+    runs;
     constructor(databasePath, wal) {
         this.connection = new SqliteConnection(databasePath);
         this.connection.pragma("foreign_keys = ON");
@@ -99,6 +103,9 @@ 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.issueSessions = new IssueSessionStore(this.connection, mapIssueSessionRow, mapIssueSessionEventRow, (projectId, linearIssueId) => this.getIssue(projectId, linearIssueId), deriveImplicitReactiveWake, (fn) => this.transaction(fn), (params) => this.upsertIssue(params), (runId, params) => this.runs.finishRun(runId, params), (runId, params) => this.runs.updateRunThread(runId, params), (projectId, linearIssueId, owner) => this.setBranchOwner(projectId, linearIssueId, owner));
+        this.runs = new RunStore(this.connection, mapRunRow, (id) => this.runs.getRunById(id), (projectId, linearIssueId) => this.getIssue(projectId, linearIssueId), (issue, options) => this.syncIssueSessionFromIssue(issue, options));
     }
     runMigrations() {
         runPatchRelayMigrations(this.connection);
@@ -106,46 +113,6 @@ 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();
@@ -451,254 +418,6 @@ export class PatchRelayDatabase {
         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);
-    }
     setBranchOwner(projectId, linearIssueId, owner) {
         this.connection.prepare(`
       UPDATE issues
@@ -706,24 +425,6 @@ export class PatchRelayDatabase {
       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);
-    }
     replaceIssueDependencies(params) {
         const now = isoNow();
         this.connection
@@ -829,7 +530,7 @@ export class PatchRelayDatabase {
             }),
             activeRunId: issue.activeRunId,
             blockedByCount: this.countUnresolvedBlockers(issue.projectId, issue.linearIssueId),
-            hasPendingWake: this.peekIssueSessionWake(issue.projectId, issue.linearIssueId) !== undefined,
+            hasPendingWake: this.issueSessions.peekIssueSessionWake(issue.projectId, issue.linearIssueId) !== undefined,
             hasLegacyPendingRun: issue.pendingRunType !== undefined,
             prNumber: issue.prNumber,
             prState: issue.prState,
@@ -890,186 +591,16 @@ export class PatchRelayDatabase {
             .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),
-        }));
-    }
     // ─── 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.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);
@@ -1091,39 +622,13 @@ export class PatchRelayDatabase {
             .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;
-    }
     // ─── Issue overview for query service ─────────────────────────────
     getIssueOverview(issueKey) {
         const issue = this.getIssueByKey(issueKey);
         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 } : {}),
@@ -1131,8 +636,8 @@ export class PatchRelayDatabase {
     }
     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 existing = this.issueSessions.getIssueSession(issue.projectId, issue.linearIssueId);
+        const latestRun = this.runs.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;
@@ -1218,7 +723,7 @@ export class PatchRelayDatabase {
             || issue.factoryState === "done";
     }
     findLatestCompletedRunSummary(projectId, linearIssueId) {
-        const runs = this.listRunsForIssue(projectId, linearIssueId);
+        const runs = this.runs.listRunsForIssue(projectId, linearIssueId);
         for (let index = runs.length - 1; index >= 0; index -= 1) {
             const run = runs[index];
             if (!run || run.status !== "completed") {
@@ -1392,6 +897,3 @@ function mapRunRow(row) {
         ...(row.ended_at !== null ? { endedAt: String(row.ended_at) } : {}),
     };
 }
-function isResolvedLinearState(stateType, stateName) {
-    return stateType === "completed" || stateName?.trim().toLowerCase() === "done";
-}