@overdeck/desktop 0.45.24 → 0.47.0

package/server/{merge-sync-VPV28g0g.js → merge-sync-kr4vqyjM.js}

@@ -1,6 +1,16 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-BEqFxlJc.js";
-//#region ../../lib/overdeck/merge-sync.ts
+import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-BDQDRopn.js";
+//#region ../../lib/overdeck/merge-sync-time.ts
+/**
+* merge-sync-time.ts — timestamp conversion shared by the merge-domain sync
+* accessors.
+*
+* overdeck.db stores INTEGER milliseconds; the domain types these modules
+* return predate that and use ISO strings. Both merge-sync.ts and
+* merge-sync-uat.ts need the conversion, and merge-sync.ts re-exports
+* merge-sync-uat.ts — so the helpers live here rather than in either module,
+* where the import would close a cycle.
+*/
 function isoFromMillis(value) {
 	return value == null ? void 0 : new Date(value).toISOString();
 }
@@ -15,153 +25,69 @@ function millisFromIso(value) {
 function nowMillis() {
 	return Date.now();
 }
-function readFlag(key) {
-	return getOverdeckDatabaseSync().prepare("SELECT value FROM app_settings WHERE key = ?").get(key)?.value === "true";
-}
-/** Drop-in for isFlywheelGloballyPaused() from app-settings.ts. */
-function isFlywheelGloballyPaused() {
-	return readFlag("flywheel.globally_paused");
-}
+var init_merge_sync_time = __esmMin((() => {}));
+//#endregion
+//#region ../../lib/overdeck/merge-sync-uat.ts
 /**
-* Drop-in for isMergeTrainEnabled() from app-settings.ts.
+* The repo list for a generation that stored no per-repo rows — every monorepo
+* generation, plus any row written before PAN-3093 added the child tables. The
+* single entry mirrors the generation's own branch/base/worktree so consumers
+* can loop `repos` uniformly instead of branching on project type.
 *
-* Reads 'flywheel.merge_train_enabled' — the single canonical key shared by the
-* control-settings.ts door and the merge-train engine (unified in PAN-1979).
+* `repoKey` is the project-root basename: a stable, non-empty display label for
+* the one repo involved, not an authoritative config key. Code that needs the
+* configured key resolves it through src/lib/project-repos.ts.
 */
-function isMergeTrainEnabled() {
-	return readFlag("flywheel.merge_train_enabled");
-}
-function rowToPendingAutoMerge(row) {
+function synthesizeSingleRepo(row) {
+	const trimmed = row.project_root.replace(/\/+$/, "");
 	return {
-		id: row.id,
-		issueId: row.issue_id,
-		prUrl: row.pr_url,
-		prNumber: void 0,
-		projectKey: row.project_key,
-		forge: row.forge ?? "github",
-		status: row.status,
-		scheduledMergeAt: isoFromMillisRequired(row.scheduled_merge_at),
-		scheduledAt: isoFromMillisRequired(row.scheduled_at),
-		mergedAt: isoFromMillis(row.merged_at),
-		failureReason: row.failure_reason ?? void 0,
-		cancelledAt: isoFromMillis(row.cancelled_at),
-		cancelledBy: row.cancelled_by ?? void 0
+		repoKey: trimmed.slice(trimmed.lastIndexOf("/") + 1) || row.project_root,
+		repoPath: row.project_root,
+		branch: row.name,
+		baseSha: row.base_sha,
+		targetBranch: "main",
+		worktreePath: row.worktree_path,
+		mergeOrder: 0,
+		promotedAt: null,
+		mergeSha: null
 	};
 }
-function truncateReason(reason) {
-	return reason.length > 1024 ? reason.slice(0, 1024) : reason;
-}
-/** Drop-in for listDuePendingAutoMerges() from pending-auto-merges-db.ts. */
-function listDuePendingAutoMerges(nowIso) {
-	const db = getOverdeckDatabaseSync();
-	const nowMs = millisFromIso(nowIso) ?? Date.now();
-	return db.prepare("SELECT * FROM pending_auto_merges WHERE status = 'pending' AND scheduled_merge_at <= ? ORDER BY scheduled_merge_at ASC, id ASC").all(nowMs).map(rowToPendingAutoMerge);
-}
-/** Drop-in for transitionToMerging() from pending-auto-merges-db.ts. */
-function transitionToMerging(id) {
-	return getOverdeckDatabaseSync().prepare("UPDATE pending_auto_merges SET status = 'merging' WHERE id = ? AND status = 'pending'").run(id).changes === 1;
-}
-/** Drop-in for markFailed() from pending-auto-merges-db.ts. */
-function markFailed(id, reason) {
-	return getOverdeckDatabaseSync().prepare("UPDATE pending_auto_merges SET status = 'failed', failure_reason = ? WHERE id = ? AND status = 'merging'").run(truncateReason(reason), id).changes === 1;
-}
-/** Drop-in for requeueToPending() from pending-auto-merges-db.ts. */
-function requeueToPending(id, nextScheduledMergeAt) {
-	const db = getOverdeckDatabaseSync();
-	const nextMs = millisFromIso(nextScheduledMergeAt);
-	if (nextMs == null) return false;
-	return db.prepare("UPDATE pending_auto_merges SET status = 'pending', scheduled_merge_at = ? WHERE id = ? AND status = 'merging'").run(nextMs, id).changes === 1;
-}
-/** Drop-in for markBlocked() from pending-auto-merges-db.ts. */
-function markBlocked(id, reason) {
-	return getOverdeckDatabaseSync().prepare("UPDATE pending_auto_merges SET status = 'blocked', failure_reason = ? WHERE id = ? AND status = 'pending'").run(truncateReason(reason), id).changes === 1;
-}
-/** Drop-in for markMerged() from pending-auto-merges-db.ts. */
-function markMerged(id) {
-	return getOverdeckDatabaseSync().prepare("UPDATE pending_auto_merges SET status = 'merged', merged_at = ? WHERE id = ? AND status = 'merging'").run(nowMillis(), id).changes === 1;
-}
-/** Drop-in for cancelPending() from pending-auto-merges-db.ts. */
-function cancelPending(id, cancelledBy) {
-	return getOverdeckDatabaseSync().prepare("UPDATE pending_auto_merges SET status = 'cancelled', cancelled_at = ?, cancelled_by = ? WHERE id = ? AND status IN ('pending','blocked','failed')").run(nowMillis(), cancelledBy, id).changes === 1;
-}
-/** Drop-in for getActionableAutoMerge() from pending-auto-merges-db.ts. */
-function getActionableAutoMerge(issueId) {
-	const row = getOverdeckDatabaseSync().prepare("SELECT * FROM pending_auto_merges WHERE issue_id = ? AND status IN ('pending','merging','blocked','failed') ORDER BY id DESC LIMIT 1").get(issueId);
-	return row ? rowToPendingAutoMerge(row) : null;
-}
-/** Drop-in for listActiveAutoMerges() from pending-auto-merges-db.ts. */
-function listActiveAutoMerges(limit = 100) {
-	return getOverdeckDatabaseSync().prepare("SELECT * FROM pending_auto_merges WHERE status IN ('pending','merging') ORDER BY scheduled_merge_at ASC, id ASC LIMIT ?").all(limit).map(rowToPendingAutoMerge);
-}
-/** Drop-in for listProblemAutoMerges() from pending-auto-merges-db.ts. */
-function listProblemAutoMerges(limit = 100) {
-	return getOverdeckDatabaseSync().prepare("SELECT * FROM pending_auto_merges WHERE status IN ('blocked','failed') ORDER BY scheduled_merge_at ASC, id ASC LIMIT ?").all(limit).map(rowToPendingAutoMerge);
-}
-/** Drop-in for scheduleAutoMergeWithResult() from pending-auto-merges-db.ts. */
-function scheduleAutoMergeWithResult(input) {
-	const db = getOverdeckDatabaseSync();
-	const existing = db.prepare("SELECT * FROM pending_auto_merges WHERE issue_id = ? AND status IN ('pending','merging') ORDER BY id DESC LIMIT 1").get(input.issueId);
-	if (existing) return {
-		entry: rowToPendingAutoMerge(existing),
-		created: false
-	};
-	const scheduledAtMs = millisFromIso(input.scheduledAt ?? (/* @__PURE__ */ new Date()).toISOString()) ?? nowMillis();
-	const scheduledMergeAtMs = millisFromIso(input.scheduledMergeAt) ?? nowMillis();
-	try {
-		const result = db.prepare(`
-      INSERT INTO pending_auto_merges (issue_id, pr_url, project_key, forge, status, scheduled_merge_at, scheduled_at)
-      VALUES (?, ?, ?, ?, 'pending', ?, ?)
-    `).run(input.issueId, input.prUrl, input.projectKey, input.forge ?? "github", scheduledMergeAtMs, scheduledAtMs);
+function rowToUatGeneration(row, memberRows, resolutionRows, repoRows = [], memberRepoRows = []) {
+	const memberReposByIssue = /* @__PURE__ */ new Map();
+	for (const mr of [...memberRepoRows].sort((a, b) => a.merge_order_in_repo - b.merge_order_in_repo)) {
+		const list = memberReposByIssue.get(mr.issue_id) ?? [];
+		list.push({
+			repoKey: mr.repo_key,
+			branch: mr.branch,
+			headSha: mr.head_sha,
+			mergeOrderInRepo: mr.merge_order_in_repo
+		});
+		memberReposByIssue.set(mr.issue_id, list);
+	}
+	const members = memberRows.filter((m) => m.role === "member").map((m) => {
+		const repos = memberReposByIssue.get(m.issue_id);
 		return {
-			entry: rowToPendingAutoMerge(db.prepare("SELECT * FROM pending_auto_merges WHERE id = ?").get(Number(result.lastInsertRowid))),
-			created: true
+			issueId: m.issue_id,
+			title: m.title ?? "",
+			branch: m.branch ?? "",
+			headSha: m.head_sha ?? "",
+			mergeOrder: m.merge_order ?? 0,
+			pr: m.pr ?? void 0,
+			prUrl: m.pr_url ?? void 0,
+			...repos && repos.length > 0 ? { repos } : {}
 		};
-	} catch {
-		const raced = db.prepare("SELECT * FROM pending_auto_merges WHERE issue_id = ? AND status IN ('pending','merging') ORDER BY id DESC LIMIT 1").get(input.issueId);
-		if (raced) return {
-			entry: rowToPendingAutoMerge(raced),
-			created: false
-		};
-		throw new Error(`[merge-sync] scheduleAutoMergeWithResult failed for ${input.issueId}`);
-	}
-}
-/** Drop-in for getAllActiveQueues() from merge-queue-db.ts. */
-function getAllActiveQueues() {
-	const rows = getOverdeckDatabaseSync().prepare("SELECT project_key, issue_id, status FROM merge_queue WHERE status IN ('queued', 'processing') ORDER BY project_key, position ASC").all();
-	const byProject = /* @__PURE__ */ new Map();
-	for (const row of rows) {
-		let entry = byProject.get(row.project_key);
-		if (!entry) {
-			entry = {
-				current: null,
-				queue: []
-			};
-			byProject.set(row.project_key, entry);
-		}
-		if (row.status === "processing") entry.current = row.issue_id;
-		else entry.queue.push(row.issue_id);
-	}
-	return [...byProject.entries()].map(([projectKey, data]) => ({
-		projectKey,
-		current: data.current,
-		queue: data.queue,
-		queueLength: data.queue.length
-	}));
-}
-/** Drop-in for resetProcessingToQueued() from merge-queue-db.ts. */
-function resetProcessingToQueued() {
-	return getOverdeckDatabaseSync().prepare("UPDATE merge_queue SET status = 'queued', started_at = NULL WHERE status = 'processing'").run().changes;
-}
-function rowToUatGeneration(row, memberRows, resolutionRows) {
-	const members = memberRows.filter((m) => m.role === "member").map((m) => ({
-		issueId: m.issue_id,
-		title: m.title ?? "",
-		branch: m.branch ?? "",
-		headSha: m.head_sha ?? "",
-		mergeOrder: m.merge_order ?? 0,
-		pr: m.pr ?? void 0,
-		prUrl: m.pr_url ?? void 0
-	}));
+	});
+	const repos = repoRows.length > 0 ? [...repoRows].sort((a, b) => a.merge_order - b.merge_order || a.repo_key.localeCompare(b.repo_key)).map((r) => ({
+		repoKey: r.repo_key,
+		repoPath: r.repo_path,
+		branch: r.branch,
+		baseSha: r.base_sha,
+		targetBranch: r.target_branch ?? "main",
+		worktreePath: r.worktree_path,
+		mergeOrder: r.merge_order,
+		promotedAt: isoFromMillis(r.promoted_at) ?? null,
+		mergeSha: r.merge_sha ?? null
+	})) : [synthesizeSingleRepo(row)];
 	const heldOut = memberRows.filter((m) => m.role === "held_out").map((m) => ({
 		issueId: m.issue_id,
 		branch: m.branch ?? void 0,
@@ -171,7 +97,9 @@ function rowToUatGeneration(row, memberRows, resolutionRows) {
 	const resolutions = resolutionRows.map((r) => ({
 		issueIds: JSON.parse(r.issue_ids),
 		files: JSON.parse(r.files),
-		commitSha: r.commit_sha
+		commitSha: r.commit_sha,
+		kind: r.kind ?? "conflict",
+		...r.note ? { note: r.note } : {}
 	}));
 	return {
 		name: row.name,
@@ -179,6 +107,7 @@ function rowToUatGeneration(row, memberRows, resolutionRows) {
 		projectRoot: row.project_root,
 		baseSha: row.base_sha,
 		status: row.status,
+		repos,
 		members,
 		heldOut,
 		resolutions,
@@ -194,6 +123,75 @@ function loadMembersForUat(db, uatName) {
 function loadResolutionsForUat(db, uatName) {
 	return db.prepare("SELECT * FROM uat_generation_resolutions WHERE uat_name = ?").all(uatName);
 }
+function loadReposForUat(db, uatName) {
+	return db.prepare("SELECT * FROM uat_generation_repos WHERE uat_name = ?").all(uatName);
+}
+function loadMemberReposForUat(db, uatName) {
+	return db.prepare("SELECT * FROM uat_generation_member_repos WHERE uat_name = ?").all(uatName);
+}
+/**
+* Load many generations with a FIXED number of statements: one per child table
+* with an `IN (…)` filter, grouped in memory.
+*
+* The per-generation loader below costs four synchronous SQLite round-trips
+* each, so listing G generations cost 1 + 4G statements on the Node event loop
+* — and these lists are read by the generations HTTP route, the minute
+* reconciler, and cleanup, which walks the full retained history.
+*/
+function loadUatGenerations(db, rows) {
+	if (rows.length === 0) return [];
+	const names = rows.map((r) => r.name);
+	const placeholders = names.map(() => "?").join(", ");
+	const childRows = (table) => db.prepare(`SELECT * FROM ${table} WHERE uat_name IN (${placeholders})`).all(...names);
+	const groupBy = (all) => {
+		const byName = /* @__PURE__ */ new Map();
+		for (const row of all) {
+			const list = byName.get(row.uat_name);
+			if (list) list.push(row);
+			else byName.set(row.uat_name, [row]);
+		}
+		return byName;
+	};
+	const members = groupBy(childRows("uat_generation_members"));
+	const resolutions = groupBy(childRows("uat_generation_resolutions"));
+	const repos = groupBy(childRows("uat_generation_repos"));
+	const memberRepos = groupBy(childRows("uat_generation_member_repos"));
+	return rows.map((row) => rowToUatGeneration(row, members.get(row.name) ?? [], resolutions.get(row.name) ?? [], repos.get(row.name) ?? [], memberRepos.get(row.name) ?? []));
+}
+/** Load one generation with every child table it owns. */
+function loadUatGeneration(db, row) {
+	return rowToUatGeneration(row, loadMembersForUat(db, row.name), loadResolutionsForUat(db, row.name), loadReposForUat(db, row.name), loadMemberReposForUat(db, row.name));
+}
+/**
+* Rewrite `uat_generation_repos` for a generation. Callers run this inside the
+* generation's write transaction, after the parent row exists, so a partial
+* write can never leave repo rows pointing at a missing generation.
+*/
+function writeUatGenerationRepoRows(db, name, repos) {
+	db.prepare("DELETE FROM uat_generation_repos WHERE uat_name = ?").run(name);
+	if (!repos || repos.length === 0) return;
+	const insertRepo = db.prepare(`
+    INSERT INTO uat_generation_repos
+      (uat_name, repo_key, repo_path, branch, base_sha, target_branch, worktree_path, merge_order, promoted_at, merge_sha)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `);
+	for (const r of repos) insertRepo.run(name, r.repoKey, r.repoPath, r.branch, r.baseSha, r.targetBranch ?? "main", r.worktreePath, r.mergeOrder, r.promotedAt ? millisFromIso(r.promotedAt) : null, r.mergeSha ?? null);
+}
+/**
+* Rewrite `uat_generation_member_repos` from an explicit member list. Only call
+* this when the caller supplied real members: the update path reconstructs
+* members from `uat_generation_members`, which carries no per-repo data, so
+* rebuilding from a reconstructed list would silently drop every contribution.
+*/
+function writeUatMemberRepoRows(db, name, members) {
+	db.prepare("DELETE FROM uat_generation_member_repos WHERE uat_name = ?").run(name);
+	const insertMemberRepo = db.prepare(`
+    INSERT INTO uat_generation_member_repos
+      (uat_name, issue_id, repo_key, branch, head_sha, merge_order_in_repo)
+    VALUES (?, ?, ?, ?, ?, ?)
+  `);
+	for (const m of members) for (const mr of m.repos ?? []) insertMemberRepo.run(name, m.issueId, mr.repoKey, mr.branch, mr.headSha, mr.mergeOrderInRepo);
+}
 /** Drop-in for insertUatGenerationSync() from uat-generations-db.ts. */
 function insertUatGenerationSync(gen) {
 	const db = getOverdeckDatabaseSync();
@@ -201,6 +199,8 @@ function insertUatGenerationSync(gen) {
 	const createdAt = gen.createdAt ?? new Date(nowMs).toISOString();
 	const createdAtMs = millisFromIso(createdAt) ?? nowMs;
 	db.transaction(() => {
+		db.prepare("DELETE FROM uat_generation_member_repos WHERE uat_name = ?").run(gen.name);
+		db.prepare("DELETE FROM uat_generation_repos WHERE uat_name = ?").run(gen.name);
 		db.prepare("DELETE FROM uat_generation_members WHERE uat_name = ?").run(gen.name);
 		db.prepare("DELETE FROM uat_generation_resolutions WHERE uat_name = ?").run(gen.name);
 		db.prepare(`
@@ -216,10 +216,12 @@ function insertUatGenerationSync(gen) {
 		for (const m of gen.members) insertMember.run(gen.name, m.issueId, "member", m.title, m.branch, m.headSha, m.mergeOrder, m.pr ?? null, m.prUrl ?? null, null);
 		for (const h of gen.heldOut) insertMember.run(gen.name, h.issueId, "held_out", null, h.branch ?? null, h.headSha ?? null, null, null, null, h.reason);
 		const insertResolution = db.prepare(`
-      INSERT INTO uat_generation_resolutions (uat_name, issue_ids, files, commit_sha)
-      VALUES (?, ?, ?, ?)
+      INSERT INTO uat_generation_resolutions (uat_name, issue_ids, files, commit_sha, kind, note)
+      VALUES (?, ?, ?, ?, ?, ?)
     `);
-		for (const r of gen.resolutions) insertResolution.run(gen.name, JSON.stringify(r.issueIds), JSON.stringify(r.files), r.commitSha);
+		for (const r of gen.resolutions) insertResolution.run(gen.name, JSON.stringify(r.issueIds), JSON.stringify(r.files), r.commitSha, r.kind ?? "conflict", r.note ?? null);
+		writeUatGenerationRepoRows(db, gen.name, gen.repos);
+		writeUatMemberRepoRows(db, gen.name, gen.members);
 	})();
 	return {
 		...gen,
@@ -232,7 +234,7 @@ function getUatGenerationSync(name) {
 	const db = getOverdeckDatabaseSync();
 	const row = db.prepare("SELECT * FROM uat_generations WHERE name = ?").get(name);
 	if (!row) return null;
-	return rowToUatGeneration(row, loadMembersForUat(db, name), loadResolutionsForUat(db, name));
+	return loadUatGeneration(db, row);
 }
 /** Drop-in for listUatGenerationsSync() from uat-generations-db.ts. */
 function listUatGenerationsSync(options = {}) {
@@ -249,12 +251,16 @@ function listUatGenerationsSync(options = {}) {
 	}
 	const whereSql = where.length > 0 ? `WHERE ${where.join(" AND ")}` : "";
 	const limitSql = options.limit ? `LIMIT ${Math.max(1, Math.floor(options.limit))}` : "";
-	return db.prepare(`SELECT * FROM uat_generations ${whereSql} ORDER BY created_at DESC, name DESC ${limitSql}`).all(...params).map((row) => rowToUatGeneration(row, loadMembersForUat(db, row.name), loadResolutionsForUat(db, row.name)));
+	return loadUatGenerations(db, db.prepare(`SELECT * FROM uat_generations ${whereSql} ORDER BY created_at DESC, name DESC ${limitSql}`).all(...params));
 }
 /** Drop-in for listUatGenerationNamesSync() from uat-generations-db.ts. */
 function listUatGenerationNamesSync() {
 	return getOverdeckDatabaseSync().prepare("SELECT name FROM uat_generations").all().map((r) => r.name);
 }
+/** Drop-in for updateUatGenerationStatusSync() from uat-generations-db.ts. */
+function updateUatGenerationStatusSync(name, status) {
+	if (getOverdeckDatabaseSync().prepare("UPDATE uat_generations SET status = ?, updated_at = ? WHERE name = ?").run(status, nowMillis(), name).changes === 0) throw new Error(`[merge-sync] uat generation not found: ${name}`);
+}
 /** Drop-in for updateUatGenerationSync() from uat-generations-db.ts. */
 function updateUatGenerationSync(name, patch) {
 	const db = getOverdeckDatabaseSync();
@@ -302,17 +308,45 @@ function updateUatGenerationSync(name, patch) {
 			}));
 			for (const m of members) insertMember.run(name, m.issueId, "member", m.title, m.branch, m.headSha, m.mergeOrder, m.pr ?? null, m.prUrl ?? null, null);
 			for (const h of heldOut) insertMember.run(name, h.issueId, "held_out", null, h.branch ?? null, h.headSha ?? null, null, null, null, h.reason);
+			if (patch.members !== void 0) writeUatMemberRepoRows(db, name, patch.members);
 		}
+		if (patch.repos !== void 0) writeUatGenerationRepoRows(db, name, patch.repos);
 		if (patch.resolutions !== void 0) {
 			db.prepare("DELETE FROM uat_generation_resolutions WHERE uat_name = ?").run(name);
 			const insertRes = db.prepare(`
-        INSERT INTO uat_generation_resolutions (uat_name, issue_ids, files, commit_sha)
-        VALUES (?, ?, ?, ?)
+        INSERT INTO uat_generation_resolutions (uat_name, issue_ids, files, commit_sha, kind, note)
+        VALUES (?, ?, ?, ?, ?, ?)
       `);
-			for (const r of patch.resolutions) insertRes.run(name, JSON.stringify(r.issueIds), JSON.stringify(r.files), r.commitSha);
+			for (const r of patch.resolutions) insertRes.run(name, JSON.stringify(r.issueIds), JSON.stringify(r.files), r.commitSha, r.kind ?? "conflict", r.note ?? null);
 		}
 	})();
 }
+/**
+* Record that one member repo's merge landed on its target branch (PAN-3093).
+* Promote publishes repos one at a time, so this per-repo stamp is what makes a
+* partially-published generation resumable: a retry skips every repo that
+* already carries a `promoted_at`.
+*/
+function markUatGenerationRepoPromotedSync(name, repoKey, promotedAt, mergeSha) {
+	const db = getOverdeckDatabaseSync();
+	if (db.prepare("UPDATE uat_generation_repos SET promoted_at = ?, merge_sha = COALESCE(?, merge_sha) WHERE uat_name = ? AND repo_key = ?").run(millisFromIso(promotedAt), mergeSha ?? null, name, repoKey).changes === 0) throw new Error(`[merge-sync] uat generation repo not found: ${name} / ${repoKey}`);
+	db.prepare("UPDATE uat_generations SET updated_at = ? WHERE name = ?").run(nowMillis(), name);
+}
+/**
+* Does this project have a terminal generation that still owns artifacts?
+*
+* The idle reconciler tick asks only this, and generation rows are retained as
+* an audit trail — hydrating every promoted/failed/invalidated row plus its four
+* child tables to answer a yes/no question means the cost of an idle minute
+* grows with history forever, on the event loop.
+*/
+function hasUncleanedTerminalUatGenerationSync(projectRoot) {
+	return getOverdeckDatabaseSync().prepare(`SELECT 1 FROM uat_generations
+      WHERE project_root = ?
+        AND status IN ('promoted', 'failed', 'invalidated')
+        AND cleaned_at IS NULL
+      LIMIT 1`).get(projectRoot) !== void 0;
+}
 /** Drop-in for setUatGenerationStackStartedAtSync() from uat-generations-db.ts. */
 function setUatGenerationStackStartedAtSync(name, startedAt) {
 	if (getOverdeckDatabaseSync().prepare("UPDATE uat_generations SET stack_started_at = ?, updated_at = ? WHERE name = ?").run(startedAt ? millisFromIso(startedAt) : null, nowMillis(), name).changes === 0) throw new Error(`[merge-sync] uat generation not found: ${name}`);
@@ -320,7 +354,172 @@ function setUatGenerationStackStartedAtSync(name, startedAt) {
 /** Drop-in for listUatGenerationsWithStacksSync() from uat-generations-db.ts. */
 function listUatGenerationsWithStacksSync() {
 	const db = getOverdeckDatabaseSync();
-	return db.prepare("SELECT * FROM uat_generations WHERE stack_started_at IS NOT NULL ORDER BY stack_started_at ASC").all().map((row) => rowToUatGeneration(row, loadMembersForUat(db, row.name), loadResolutionsForUat(db, row.name)));
+	return loadUatGenerations(db, db.prepare("SELECT * FROM uat_generations WHERE stack_started_at IS NOT NULL ORDER BY stack_started_at ASC").all());
+}
+var init_merge_sync_uat = __esmMin((() => {
+	init_infra();
+	init_merge_sync_time();
+}));
+//#endregion
+//#region ../../lib/overdeck/merge-sync.ts
+function readFlag(key) {
+	return getOverdeckDatabaseSync().prepare("SELECT value FROM app_settings WHERE key = ?").get(key)?.value === "true";
+}
+/** Drop-in for isFlywheelGloballyPaused() from app-settings.ts. */
+function isFlywheelGloballyPaused() {
+	return readFlag("flywheel.globally_paused");
+}
+/**
+* Drop-in for isMergeTrainEnabled() from app-settings.ts (PAN-1696).
+*
+* Reads 'merge_train.enabled' (new key), falling back to
+* 'flywheel.merge_train_enabled' (legacy) when the new key is absent.
+*/
+function isMergeTrainEnabled() {
+	const newRow = getOverdeckDatabaseSync().prepare("SELECT value FROM app_settings WHERE key = ?").get("merge_train.enabled");
+	if (newRow?.value === "true" || newRow?.value === "false") return newRow.value === "true";
+	return readFlag("flywheel.merge_train_enabled");
+}
+/**
+* PAN-1696: Check if merge train is enabled for a project, respecting the
+* per-project override in projects.yaml if set, otherwise falling back to
+* the global merge_train.enabled flag.
+*
+* @param project - ProjectConfig from projects.yaml with merge_train field. If not set, uses global.
+* @returns true if merge train is enabled for this project, false otherwise.
+*/
+function isMergeTrainEnabledForProject(project) {
+	if (project?.merge_train === "enabled") return true;
+	if (project?.merge_train === "disabled") return false;
+	return isMergeTrainEnabled();
+}
+function rowToPendingAutoMerge(row) {
+	return {
+		id: row.id,
+		issueId: row.issue_id,
+		prUrl: row.pr_url,
+		prNumber: void 0,
+		projectKey: row.project_key,
+		forge: row.forge ?? "github",
+		status: row.status,
+		scheduledMergeAt: isoFromMillisRequired(row.scheduled_merge_at),
+		scheduledAt: isoFromMillisRequired(row.scheduled_at),
+		mergedAt: isoFromMillis(row.merged_at),
+		failureReason: row.failure_reason ?? void 0,
+		cancelledAt: isoFromMillis(row.cancelled_at),
+		cancelledBy: row.cancelled_by ?? void 0
+	};
+}
+function truncateReason(reason) {
+	return reason.length > 1024 ? reason.slice(0, 1024) : reason;
+}
+/** Drop-in for listDuePendingAutoMerges() from pending-auto-merges-db.ts. */
+function listDuePendingAutoMerges(nowIso) {
+	const db = getOverdeckDatabaseSync();
+	const nowMs = millisFromIso(nowIso) ?? Date.now();
+	return db.prepare("SELECT * FROM pending_auto_merges WHERE status = 'pending' AND scheduled_merge_at <= ? ORDER BY scheduled_merge_at ASC, id ASC").all(nowMs).map(rowToPendingAutoMerge);
+}
+/** Drop-in for transitionToMerging() from pending-auto-merges-db.ts. */
+function transitionToMerging(id) {
+	return getOverdeckDatabaseSync().prepare("UPDATE pending_auto_merges SET status = 'merging' WHERE id = ? AND status = 'pending'").run(id).changes === 1;
+}
+/** Drop-in for markFailed() from pending-auto-merges-db.ts. */
+function markFailed(id, reason) {
+	return getOverdeckDatabaseSync().prepare("UPDATE pending_auto_merges SET status = 'failed', failure_reason = ? WHERE id = ? AND status = 'merging'").run(truncateReason(reason), id).changes === 1;
+}
+/** Drop-in for requeueToPending() from pending-auto-merges-db.ts. */
+function requeueToPending(id, nextScheduledMergeAt) {
+	const db = getOverdeckDatabaseSync();
+	const nextMs = millisFromIso(nextScheduledMergeAt);
+	if (nextMs == null) return false;
+	return db.prepare("UPDATE pending_auto_merges SET status = 'pending', scheduled_merge_at = ? WHERE id = ? AND status = 'merging'").run(nextMs, id).changes === 1;
+}
+/** Drop-in for markBlocked() from pending-auto-merges-db.ts. */
+function markBlocked(id, reason) {
+	return getOverdeckDatabaseSync().prepare("UPDATE pending_auto_merges SET status = 'blocked', failure_reason = ? WHERE id = ? AND status = 'pending'").run(truncateReason(reason), id).changes === 1;
+}
+/** Atomically stop an in-progress auto-merge after its retry circuit breaker opens. */
+function markMergingBlocked(id, reason) {
+	return getOverdeckDatabaseSync().prepare("UPDATE pending_auto_merges SET status = 'blocked', failure_reason = ? WHERE id = ? AND status = 'merging'").run(truncateReason(reason), id).changes === 1;
+}
+/** Drop-in for markMerged() from pending-auto-merges-db.ts. */
+function markMerged(id) {
+	return getOverdeckDatabaseSync().prepare("UPDATE pending_auto_merges SET status = 'merged', merged_at = ? WHERE id = ? AND status IN ('pending','blocked','failed','merging')").run(nowMillis(), id).changes === 1;
+}
+/** Drop-in for cancelPending() from pending-auto-merges-db.ts. */
+function cancelPending(id, cancelledBy) {
+	return getOverdeckDatabaseSync().prepare("UPDATE pending_auto_merges SET status = 'cancelled', cancelled_at = ?, cancelled_by = ? WHERE id = ? AND status IN ('pending','blocked','failed')").run(nowMillis(), cancelledBy, id).changes === 1;
+}
+/** Drop-in for getActionableAutoMerge() from pending-auto-merges-db.ts. */
+function getActionableAutoMerge(issueId) {
+	const row = getOverdeckDatabaseSync().prepare("SELECT * FROM pending_auto_merges WHERE issue_id = ? AND status IN ('pending','merging','blocked','failed') ORDER BY id DESC LIMIT 1").get(issueId);
+	return row ? rowToPendingAutoMerge(row) : null;
+}
+function countActionableAutoMerges(issueId) {
+	return getOverdeckDatabaseSync().prepare("SELECT COUNT(*) AS n FROM pending_auto_merges WHERE issue_id = ? AND status IN ('pending','merging','blocked','failed')").get(issueId)?.n ?? 0;
+}
+/** Drop-in for listActiveAutoMerges() from pending-auto-merges-db.ts. */
+function listActiveAutoMerges(limit = 100) {
+	return getOverdeckDatabaseSync().prepare("SELECT * FROM pending_auto_merges WHERE status IN ('pending','merging') ORDER BY scheduled_merge_at ASC, id ASC LIMIT ?").all(limit).map(rowToPendingAutoMerge);
+}
+/** Drop-in for listProblemAutoMerges() from pending-auto-merges-db.ts. */
+function listProblemAutoMerges(limit = 100) {
+	return getOverdeckDatabaseSync().prepare("SELECT * FROM pending_auto_merges WHERE status IN ('blocked','failed') ORDER BY scheduled_merge_at ASC, id ASC LIMIT ?").all(limit).map(rowToPendingAutoMerge);
+}
+/** Drop-in for scheduleAutoMergeWithResult() from pending-auto-merges-db.ts. */
+function scheduleAutoMergeWithResult(input) {
+	const db = getOverdeckDatabaseSync();
+	const existing = db.prepare("SELECT * FROM pending_auto_merges WHERE issue_id = ? AND status IN ('pending','merging') ORDER BY id DESC LIMIT 1").get(input.issueId);
+	if (existing) return {
+		entry: rowToPendingAutoMerge(existing),
+		created: false
+	};
+	const scheduledAtMs = millisFromIso(input.scheduledAt ?? (/* @__PURE__ */ new Date()).toISOString()) ?? nowMillis();
+	const scheduledMergeAtMs = millisFromIso(input.scheduledMergeAt) ?? nowMillis();
+	try {
+		const result = db.prepare(`
+      INSERT INTO pending_auto_merges (issue_id, pr_url, project_key, forge, status, scheduled_merge_at, scheduled_at)
+      VALUES (?, ?, ?, ?, 'pending', ?, ?)
+    `).run(input.issueId, input.prUrl, input.projectKey, input.forge ?? "github", scheduledMergeAtMs, scheduledAtMs);
+		return {
+			entry: rowToPendingAutoMerge(db.prepare("SELECT * FROM pending_auto_merges WHERE id = ?").get(Number(result.lastInsertRowid))),
+			created: true
+		};
+	} catch {
+		const raced = db.prepare("SELECT * FROM pending_auto_merges WHERE issue_id = ? AND status IN ('pending','merging') ORDER BY id DESC LIMIT 1").get(input.issueId);
+		if (raced) return {
+			entry: rowToPendingAutoMerge(raced),
+			created: false
+		};
+		throw new Error(`[merge-sync] scheduleAutoMergeWithResult failed for ${input.issueId}`);
+	}
+}
+/** Drop-in for getAllActiveQueues() from merge-queue-db.ts. */
+function getAllActiveQueues() {
+	const rows = getOverdeckDatabaseSync().prepare("SELECT project_key, issue_id, status FROM merge_queue WHERE status IN ('queued', 'processing') ORDER BY project_key, position ASC").all();
+	const byProject = /* @__PURE__ */ new Map();
+	for (const row of rows) {
+		let entry = byProject.get(row.project_key);
+		if (!entry) {
+			entry = {
+				current: null,
+				queue: []
+			};
+			byProject.set(row.project_key, entry);
+		}
+		if (row.status === "processing") entry.current = row.issue_id;
+		else entry.queue.push(row.issue_id);
+	}
+	return [...byProject.entries()].map(([projectKey, data]) => ({
+		projectKey,
+		current: data.current,
+		queue: data.queue,
+		queueLength: data.queue.length
+	}));
+}
+/** Drop-in for resetProcessingToQueued() from merge-queue-db.ts. */
+function resetProcessingToQueued() {
+	return getOverdeckDatabaseSync().prepare("UPDATE merge_queue SET status = 'queued', started_at = NULL WHERE status = 'processing'").run().changes;
 }
 function rowToMergeSetRepos(rows) {
 	return rows.map((r) => ({
@@ -388,6 +587,48 @@ function upsertMergeSet(mergeSet) {
 		for (const repo of set.repos) insertRepo.run(set.issueId, repo.repoKey, repo.repoPath, repo.forge, repo.sourceBranch, repo.targetBranch, repo.artifactUrl ?? null, repo.artifactId ?? null, repo.reviewStatus, repo.testStatus, repo.rebaseStatus, repo.verificationStatus, repo.mergeStatus, repo.mergeOrder, repo.required ? 1 : 0);
 	})(mergeSet);
 }
+function patchMergeSetRepos(issueId, patches) {
+	const db = getOverdeckDatabaseSync();
+	const effective = patches.filter(({ patch }) => Object.values(patch).some((value) => value !== void 0));
+	if (effective.length === 0) return true;
+	try {
+		db.transaction(() => {
+			for (const { repoKey, expected, patch } of effective) {
+				const assignments = [];
+				const values = [];
+				if (patch.artifactUrl !== void 0) {
+					assignments.push("artifact_url = ?");
+					values.push(patch.artifactUrl);
+				}
+				if (patch.artifactId !== void 0) {
+					assignments.push("artifact_id = ?");
+					values.push(patch.artifactId);
+				}
+				if (patch.mergeStatus !== void 0) {
+					assignments.push("merge_status = ?");
+					values.push(patch.mergeStatus);
+				}
+				if (db.prepare(`
+          UPDATE merge_set_repos SET ${assignments.join(", ")}
+          WHERE issue_id = ? AND repo_key = ? AND source_branch = ? AND target_branch = ?
+            AND artifact_url IS ? AND artifact_id IS ?
+        `).run(...values, issueId, repoKey, expected.sourceBranch, expected.targetBranch, expected.artifactUrl ?? null, expected.artifactId ?? null).changes !== 1) throw MERGE_SET_REPO_CAS_FAILED;
+			}
+			db.prepare("UPDATE merge_sets SET updated_at = ? WHERE issue_id = ?").run(nowMillis(), issueId);
+		})();
+		return true;
+	} catch (error) {
+		if (error === MERGE_SET_REPO_CAS_FAILED) return false;
+		throw error;
+	}
+}
+function patchMergeSetRepo(issueId, repoKey, expected, patch) {
+	return patchMergeSetRepos(issueId, [{
+		repoKey,
+		expected,
+		patch
+	}]);
+}
 /** Drop-in for getMergeSetFromDb() from merge-set-db.ts. */
 function getMergeSetFromDb(issueId) {
 	const db = getOverdeckDatabaseSync();
@@ -395,10 +636,25 @@ function getMergeSetFromDb(issueId) {
 	if (!row) return null;
 	return rowToMergeSet(row, loadReposForMergeSet(db, issueId));
 }
+/** Drop-in for getAllMergeSetsFromDb() from merge-set-db.ts. */
+function getAllMergeSetsFromDb(projectKey) {
+	const db = getOverdeckDatabaseSync();
+	return (projectKey ? db.prepare("SELECT issue_id, project_key, project_path, workspace_type, status, created_at, updated_at FROM merge_sets WHERE project_key = ? ORDER BY updated_at DESC").all(projectKey) : db.prepare("SELECT issue_id, project_key, project_path, workspace_type, status, created_at, updated_at FROM merge_sets ORDER BY updated_at DESC").all()).map((row) => rowToMergeSet(row, loadReposForMergeSet(db, row.issue_id)));
+}
+/** Drop-in for deleteMergeSet() from merge-set-db.ts. */
+function deleteMergeSet(issueId) {
+	const db = getOverdeckDatabaseSync();
+	db.prepare("DELETE FROM merge_set_repos WHERE issue_id = ?").run(issueId);
+	db.prepare("DELETE FROM merge_sets WHERE issue_id = ?").run(issueId);
+}
+var MERGE_SET_REPO_CAS_FAILED;
 var init_merge_sync = __esmMin((() => {
 	init_infra();
+	init_merge_sync_time();
+	init_merge_sync_uat();
+	MERGE_SET_REPO_CAS_FAILED = /* @__PURE__ */ new Error("merge-set-repo-cas-failed");
 }));
 //#endregion
-export { transitionToMerging as C, setUatGenerationStackStartedAtSync as S, upsertMergeSet as T, markFailed as _, getUatGenerationSync as a, resetProcessingToQueued as b, isFlywheelGloballyPaused as c, listDuePendingAutoMerges as d, listProblemAutoMerges as f, markBlocked as g, listUatGenerationsWithStacksSync as h, getMergeSetFromDb as i, isMergeTrainEnabled as l, listUatGenerationsSync as m, getActionableAutoMerge as n, init_merge_sync as o, listUatGenerationNamesSync as p, getAllActiveQueues as r, insertUatGenerationSync as s, cancelPending as t, listActiveAutoMerges as u, markMerged as v, updateUatGenerationSync as w, scheduleAutoMergeWithResult as x, requeueToPending as y };
+export { listUatGenerationsSync as A, scheduleAutoMergeWithResult as C, hasUncleanedTerminalUatGenerationSync as D, getUatGenerationSync as E, updateUatGenerationSync as F, markUatGenerationRepoPromotedSync as M, setUatGenerationStackStartedAtSync as N, insertUatGenerationSync as O, updateUatGenerationStatusSync as P, resetProcessingToQueued as S, upsertMergeSet as T, markMerged as _, getAllActiveQueues as a, patchMergeSetRepos as b, init_merge_sync as c, isMergeTrainEnabledForProject as d, listActiveAutoMerges as f, markFailed as g, markBlocked as h, getActionableAutoMerge as i, listUatGenerationsWithStacksSync as j, listUatGenerationNamesSync as k, isFlywheelGloballyPaused as l, listProblemAutoMerges as m, countActionableAutoMerges as n, getAllMergeSetsFromDb as o, listDuePendingAutoMerges as p, deleteMergeSet as r, getMergeSetFromDb as s, cancelPending as t, isMergeTrainEnabled as u, markMergingBlocked as v, transitionToMerging as w, requeueToPending as x, patchMergeSetRepo as y };
 
-//# sourceMappingURL=merge-sync-VPV28g0g.js.map
+//# sourceMappingURL=merge-sync-kr4vqyjM.js.map