@overdeck/desktop 0.45.16 → 0.45.18

package/server/{linear-client-By7hjwuN.js → linear-client-WrYrUIAH.js}

@@ -1,3 +1,3 @@
-import { i as init_linear_client, n as LinearClientLive, r as LinearClientOptionalLive, t as LinearClient } from "./linear-client-D9cSQfvD.js";
+import { i as init_linear_client, n as LinearClientLive, r as LinearClientOptionalLive, t as LinearClient } from "./linear-client-CDH2D6Qy.js";
 init_linear_client();
 export { LinearClient, LinearClientLive, LinearClientOptionalLive };

package/server/memory-fts-worker.js

@@ -1,4 +1,4 @@
-import { a as runMemoryFtsTransactionSync, i as runMemoryFtsStatementSync, n as getMemoryFtsDatabaseSync, r as init_fts_operations, t as closeMemoryFtsDatabasesInProcess } from "./fts-operations-DvCSimfU.js";
+import { a as runMemoryFtsTransactionSync, i as runMemoryFtsStatementSync, n as getMemoryFtsDatabaseSync, r as init_fts_operations, t as closeMemoryFtsDatabasesInProcess } from "./fts-operations-Bj8yutnR.js";
 import { parentPort } from "node:worker_threads";
 //#region ../../lib/memory/fts-worker.ts
 init_fts_operations();

package/server/{merge-BN8FGJ2q.js → merge-BsDgUxFz.js}

@@ -1,5 +1,5 @@
-import { C as inArray, _ as integer, a as EventBus, b as and, d as getOverdeckDatabaseSync, f as init_infra, h as text, m as sqliteTable, p as init_sqlite_core, r as Db, s as Forge, v as init_drizzle_orm, x as eq } from "./infra-Ba9mS6e6.js";
-import { n as init_issues, t as IssueId } from "./issues-CBAsuoAO.js";
+import { C as inArray, _ as integer, a as EventBus, b as and, d as getOverdeckDatabaseSync, f as init_infra, h as text, m as sqliteTable, p as init_sqlite_core, r as Db, s as Forge, v as init_drizzle_orm, x as eq } from "./infra-_Kx1m9pm.js";
+import { n as init_issues, t as IssueId } from "./issues-DIEHt9sq.js";
 import { Context, Effect, Layer, Schema } from "effect";
 import { HttpApiEndpoint, HttpApiGroup } from "effect/unstable/httpapi";
 //#region ../../lib/overdeck/merge.ts
@@ -700,4 +700,4 @@ function getAllActiveQueues() {
 //#endregion
 export { UatNotPromotable as A, readyForMerge as B, RepoMergeStatus as C, UatMember as D, UatGenerationNotFound as E, enqueueMerge as F, getAllActiveQueues as I, getCurrentMerge as L, UatStatus as M, WorkspaceType as N, UatMemberRole as O, dequeueMerge as P, getQueueForProject as R, RepoKey as S, UatGenerationFilter as T, NotReadyForMerge as _, ForgeMergeFailed as a, QueueView as b, MergeInProgress as c, MergeSet as d, MergeSetNotFound as f, MergeWriterLive as g, MergeWriter as h, AutoMergeStatus as i, UatResolution as j, UatName as k, MergeResolver as l, MergeSetStatus as m, AutoMergeFilter as n, GateStatus as o, MergeSetRepo as p, AutoMergeNotFound as r, MergeApi as s, AutoMerge as t, MergeResolverLive as u, ProjectKey as v, UatGeneration as w, RebaseStatus as x, QueueEntryStatus as y, markMergeProcessing as z };
 
-//# sourceMappingURL=merge-BN8FGJ2q.js.map
+//# sourceMappingURL=merge-BsDgUxFz.js.map

package/server/{merge-BLcEZNXz.js → merge-Dervs4BF.js}

@@ -1,2 +1,2 @@
-import { A as UatNotPromotable, B as readyForMerge, C as RepoMergeStatus, D as UatMember, E as UatGenerationNotFound, F as enqueueMerge, I as getAllActiveQueues, L as getCurrentMerge, M as UatStatus, N as WorkspaceType, O as UatMemberRole, P as dequeueMerge, R as getQueueForProject, S as RepoKey, T as UatGenerationFilter, _ as NotReadyForMerge, a as ForgeMergeFailed, b as QueueView, c as MergeInProgress, d as MergeSet, f as MergeSetNotFound, g as MergeWriterLive, h as MergeWriter, i as AutoMergeStatus, j as UatResolution, k as UatName, l as MergeResolver, m as MergeSetStatus, n as AutoMergeFilter, o as GateStatus, p as MergeSetRepo, r as AutoMergeNotFound, s as MergeApi, t as AutoMerge, u as MergeResolverLive, v as ProjectKey, w as UatGeneration, x as RebaseStatus, y as QueueEntryStatus, z as markMergeProcessing } from "./merge-BN8FGJ2q.js";
+import { A as UatNotPromotable, B as readyForMerge, C as RepoMergeStatus, D as UatMember, E as UatGenerationNotFound, F as enqueueMerge, I as getAllActiveQueues, L as getCurrentMerge, M as UatStatus, N as WorkspaceType, O as UatMemberRole, P as dequeueMerge, R as getQueueForProject, S as RepoKey, T as UatGenerationFilter, _ as NotReadyForMerge, a as ForgeMergeFailed, b as QueueView, c as MergeInProgress, d as MergeSet, f as MergeSetNotFound, g as MergeWriterLive, h as MergeWriter, i as AutoMergeStatus, j as UatResolution, k as UatName, l as MergeResolver, m as MergeSetStatus, n as AutoMergeFilter, o as GateStatus, p as MergeSetRepo, r as AutoMergeNotFound, s as MergeApi, t as AutoMerge, u as MergeResolverLive, v as ProjectKey, w as UatGeneration, x as RebaseStatus, y as QueueEntryStatus, z as markMergeProcessing } from "./merge-BsDgUxFz.js";
 export { AutoMerge, AutoMergeFilter, AutoMergeNotFound, AutoMergeStatus, ForgeMergeFailed, GateStatus, MergeApi, MergeInProgress, MergeResolver, MergeResolverLive, MergeSet, MergeSetNotFound, MergeSetRepo, MergeSetStatus, MergeWriter, MergeWriterLive, NotReadyForMerge, ProjectKey, QueueEntryStatus, QueueView, RebaseStatus, RepoKey, RepoMergeStatus, UatGeneration, UatGenerationFilter, UatGenerationNotFound, UatMember, UatMemberRole, UatName, UatNotPromotable, UatResolution, UatStatus, WorkspaceType, dequeueMerge, enqueueMerge, getAllActiveQueues, getCurrentMerge, getQueueForProject, markMergeProcessing, readyForMerge };

package/server/{merge-agent-B3u2szOL.js → merge-agent-D6DNhe9j.js}

@@ -1,15 +1,14 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Fn as init_projects, Jr as init_paths, Vn as loadProjectsConfigSync, br as VcsError, f as loadConfigSync, fr as GitError, jr as OVERDECK_HOME, t as init_config_yaml, xr as init_errors } from "./config-yaml-cNOZcEww.js";
+import { Fn as init_projects, Mr as OVERDECK_HOME, Sr as init_errors, Vn as loadProjectsConfigSync, Yr as init_paths, f as loadConfigSync, pr as GitError, t as init_config_yaml, xr as VcsError } from "./config-yaml-CqaAyn8y.js";
 import { a as init_activity_logger, n as emitActivityEntrySync, r as emitActivityTtsSync } from "./activity-logger-pcbf-e30.js";
-import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-Ba9mS6e6.js";
-import { L as sessionExists, O as listSessionNames, P as sendKeys, i as capturePane, w as killSession, x as init_tmux } from "./tmux-C3g9VFcg.js";
-import { c as init_review_status, f as markWorkspaceStuck, s as getReviewStatusSync, y as setReviewStatusSync } from "./review-status-Dc1l4dVz.js";
-import { i as resolveGitHubIssueSync, n as init_tracker_utils } from "./tracker-utils--z8FLSWn.js";
-import { n as recordFeatureRegistryLifecycle, t as init_feature_registry_population } from "./feature-registry-population-CqZSnqQi.js";
-import { r as verifyMergedBeforeLifecycle, t as init_merge_verification } from "./merge-verification-D4wTChdX.js";
-import { n as restoreTrackedBeadsExport, t as init_beads_restore } from "./beads-restore-BUItPOjI.js";
-import { n as init_validation, r as runQualityGates } from "./validation-CsPVsoA0.js";
-import { i as init_git_utils, t as cleanupStaleLocks } from "./git-utils-Dr0L7mFk.js";
+import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-_Kx1m9pm.js";
+import { F as sendKeys, R as sessionExists, S as init_tmux, T as killSession, i as capturePane, k as listSessionNames } from "./tmux-U55cNGFG.js";
+import { c as init_review_status, f as markWorkspaceStuck, s as getReviewStatusSync, y as setReviewStatusSync } from "./review-status-DANr0t-v.js";
+import { i as resolveGitHubIssueSync, n as init_tracker_utils } from "./tracker-utils-CghXMF3q.js";
+import { n as recordFeatureRegistryLifecycle, t as init_feature_registry_population } from "./feature-registry-population-Ca2UaV0U.js";
+import { r as verifyMergedBeforeLifecycle, t as init_merge_verification } from "./merge-verification-BBIXUEqa.js";
+import { i as runQualityGates, n as init_validation } from "./validation-4-z2Cw4z.js";
+import { i as init_git_utils, t as cleanupStaleLocks } from "./git-utils-GxlL0tmt.js";
 import { Data, Effect } from "effect";
 import { appendFileSync, existsSync, mkdirSync } from "fs";
 import { basename, dirname, join, relative } from "path";
@@ -311,8 +310,41 @@ function parseStatusPath(line) {
 * Respects .gitignore (no -f), unstages excluded paths, and leaves excluded
 * paths dirty so the sync can proceed. Returns success=false on git errors.
 */
-async function autoCommitWorkspaceChangesBeforeSync(projectPath) {
+async function autoCommitWorkspaceChangesBeforeSync(projectPath, issueId) {
 	try {
+		for (const operationHead of [
+			"MERGE_HEAD",
+			"REBASE_HEAD",
+			"CHERRY_PICK_HEAD",
+			"REVERT_HEAD"
+		]) try {
+			await execAsync(`git rev-parse -q --verify ${operationHead}`, {
+				cwd: projectPath,
+				encoding: "utf-8"
+			});
+			return {
+				success: false,
+				committed: false,
+				reason: `Refusing to auto-commit while ${operationHead} exists; finish or abort the in-progress Git operation first`
+			};
+		} catch {}
+		try {
+			const { stdout: conflictMarkers } = await execAsync("git grep -n -I -E '^(<<<<<<<( |$)|=======$|>>>>>>>( |$))' -- .", {
+				cwd: projectPath,
+				encoding: "utf-8"
+			});
+			if (conflictMarkers.trim()) return {
+				success: false,
+				committed: false,
+				reason: `Refusing to auto-commit conflict markers in: ${[...new Set(conflictMarkers.trim().split("\n").map((line) => line.split(":", 1)[0]))].join(", ")}`
+			};
+		} catch (error) {
+			if (error?.code !== 1) return {
+				success: false,
+				committed: false,
+				reason: `Failed to scan for conflict markers: ${error.message}`
+			};
+		}
 		const { stdout: statusOut } = await execAsync("git status --porcelain", {
 			cwd: projectPath,
 			encoding: "utf-8"
@@ -339,7 +371,7 @@ async function autoCommitWorkspaceChangesBeforeSync(projectPath) {
 			committed: false,
 			reason: "only excluded/ignored changes remain"
 		};
-		await execAsync("git commit -m \"chore: auto-commit before sync with main\"", {
+		await execAsync(`git commit -m "${issueId ? `chore: auto-commit before sync with main (${issueId})` : "chore: auto-commit before sync with main"}"`, {
 			cwd: projectPath,
 			encoding: "utf-8"
 		});
@@ -394,7 +426,7 @@ async function notifyTldrDaemon(projectPath, _sourceBranch) {
 			return;
 		}
 		console.log(`[merge-agent] Found ${changedFiles.length} changed source files to reindex`);
-		const { getTldrDaemonServiceSync } = await import("./tldr-daemon-CgZQ3jmZ.js");
+		const { getTldrDaemonServiceSync } = await import("./tldr-daemon-DhGwd88s.js");
 		const tldrService = getTldrDaemonServiceSync(projectPath, venvPath);
 		if (!(await tldrService.getStatus()).running) {
 			console.log(`[merge-agent] TLDR daemon not running, skipping notification`);
@@ -424,7 +456,7 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 	}
 	const run = (async () => {
 		try {
-			const { findSpecByIssue } = await import("./specs-RzcDgozr.js");
+			const { findSpecByIssue } = await import("./specs-VwcFtEDi.js");
 			const spec = await Effect.runPromise(findSpecByIssue(projectPath, issueId));
 			if (spec && (spec.status === "completed" || spec.status === "cancelled")) {
 				console.log(`[merge-agent] ${issueId} is closed out (spec ${spec.status}) — skipping post-merge lifecycle`);
@@ -486,7 +518,7 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 		}
 		console.log(`[merge-agent] Running post-merge verify handoff for ${issueId}`);
 		try {
-			const { cleanupMergedLabels } = await import("./label-cleanup-htK6fBRU.js");
+			const { cleanupMergedLabels } = await import("./label-cleanup-Btny6Gyo.js");
 			const ghResolved = resolveGitHubIssueSync(issueId);
 			const labelCtx = ghResolved.isGitHub ? {
 				issueId,
@@ -535,21 +567,8 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 			console.warn(`[merge-agent] Async post-merge release trigger failed for ${issueId}: ${err instanceof Error ? err.message : String(err)}`);
 		});
 		try {
-			const { compactBeads } = await import("./compact-beads-N00E4EVa.js");
-			const beadsResult = await Effect.runPromise(compactBeads({
-				issueId,
-				projectPath
-			}));
-			if (beadsResult.success && !beadsResult.skipped) {
-				console.log(`[merge-agent] ✓ ${beadsResult.details?.join("; ")}`);
-				logActivity("beads_compaction_complete", beadsResult.details?.join("; ") || "Beads compacted");
-			}
-		} catch (err) {
-			console.warn(`[merge-agent] Beads compaction failed: ${err}`);
-		}
-		try {
-			const { setAgentPaused, getAgentState } = await import("./agents-CEcaxSkR.js");
-			const { killSession, sessionExists } = await import("./tmux-By8E_Yv_.js");
+			const { setAgentPaused, getAgentState } = await import("./agents-BA15AQqo.js");
+			const { killSession, sessionExists } = await import("./tmux-C-rgxRDA.js");
 			const issueLower = issueId.toLowerCase();
 			const reason = "awaiting close-out (verify on main)";
 			for (const agentId of [`agent-${issueLower}`, `planning-${issueLower}`]) {
@@ -574,8 +593,8 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 			console.warn(`[merge-agent] Could not pause or kill agent sessions: ${err}`);
 		}
 		try {
-			const { killAllReviewerSessions } = await import("./review-agent-u5q3ip7H.js");
-			const { resolveProjectFromIssueSync } = await import("./projects-CrBE6IhN.js");
+			const { killAllReviewerSessions } = await import("./review-agent-CpSHLzed.js");
+			const { resolveProjectFromIssueSync } = await import("./projects-Dc9aoVoG.js");
 			const projectKey = resolveProjectFromIssueSync(issueId)?.projectKey;
 			if (projectKey) {
 				const { killed } = await Effect.runPromise(killAllReviewerSessions(projectKey, issueId));
@@ -589,7 +608,7 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 		}
 		await killPostMergeRoleSessions(issueId);
 		try {
-			const { createResetMarker } = await import("./cli-D9cUTbBr.js");
+			const { createResetMarker } = await import("./cli-BFgrSWKV.js");
 			const timestamp = (/* @__PURE__ */ new Date()).toISOString();
 			const marker = await createResetMarker({
 				projectId: basename(projectPath),
@@ -604,8 +623,8 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 			console.warn(`[merge-agent] Memory reset marker creation failed (non-fatal): ${err}`);
 		}
 		try {
-			const { findWorkspacePath } = await import("./archive-planning-CoyIbgGK.js");
-			const { stopWorkspaceDocker } = await import("./workspace-manager-BO-6k3sP.js");
+			const { findWorkspacePath } = await import("./archive-planning-D-QsBufn.js");
+			const { stopWorkspaceDocker } = await import("./workspace-manager-B1mYn0lN.js");
 			const issueLower = issueId.toLowerCase();
 			const workspacePath = findWorkspacePath(projectPath, issueLower);
 			if (workspacePath) {
@@ -636,7 +655,7 @@ async function triggerPostMergeReleaseIfConfigured(issueId, projectPath) {
 		console.log(`[merge-agent] Release already started or completed for ${issueId} (${currentStatus}), skipping`);
 		return;
 	}
-	const { resolveProjectFromIssueSync, getProjectSync } = await import("./projects-CrBE6IhN.js");
+	const { resolveProjectFromIssueSync, getProjectSync } = await import("./projects-Dc9aoVoG.js");
 	const resolved = resolveProjectFromIssueSync(issueId);
 	if (!(resolved ? getProjectSync(resolved.projectKey) : null)?.release) {
 		setReviewStatusSync(issueId, {
@@ -646,7 +665,7 @@ async function triggerPostMergeReleaseIfConfigured(issueId, projectPath) {
 		console.log(`[merge-agent] No release config for ${issueId}; marked release skipped`);
 		return;
 	}
-	const { runRelease } = await import("./release-engine-CBLQXDlH.js");
+	const { runRelease } = await import("./release-engine-BYzmIBf9.js");
 	try {
 		await runRelease(issueId, projectPath);
 	} catch (err) {
@@ -665,11 +684,11 @@ async function triggerPostMergeReleaseIfConfigured(issueId, projectPath) {
 async function transitionIssueToVerifyingOnMain(issueId, projectPath) {
 	const [effectModule, issueLifecycleModule, githubModule, linearModule, rallyModule, errorsModule] = await Promise.all([
 		import("effect"),
-		import("./issue-lifecycle-CdMUauyb.js"),
-		import("./github-client-Do3k-N1W.js"),
-		import("./linear-client-By7hjwuN.js"),
-		import("./rally-client-CzFymP7P.js"),
-		import("./typed-errors-CrN1AByg.js")
+		import("./issue-lifecycle-YNTy3OT3.js"),
+		import("./github-client-D6CNsftm.js"),
+		import("./linear-client-WrYrUIAH.js"),
+		import("./rally-client-b5PT1x5L.js"),
+		import("./typed-errors-CH4roFIj.js")
 	]);
 	const { Effect, Layer } = effectModule;
 	const { IssueLifecycle, IssueLifecycleLive } = issueLifecycleModule;
@@ -1129,10 +1148,9 @@ async function scanForConflictMarkers(projectPath) {
 async function syncMainIntoWorkspace(projectPath, issueId) {
 	console.log(`[sync-main] Starting sync of main into workspace for ${issueId}`);
 	logActivity("sync_main_start", `Starting sync for ${issueId}`);
-	await Effect.runPromise(restoreTrackedBeadsExport(projectPath));
 	console.log(`[sync-main] Checking for uncommitted changes...`);
 	logActivity("sync_main_auto_commit", `Auto-committing uncommitted changes before sync`);
-	const autoCommit = await autoCommitWorkspaceChangesBeforeSync(projectPath);
+	const autoCommit = await autoCommitWorkspaceChangesBeforeSync(projectPath, issueId);
 	if (!autoCommit.success) {
 		const message = autoCommit.reason || "Failed to auto-commit uncommitted changes";
 		console.error(`[sync-main] ${message}`);
@@ -1326,7 +1344,6 @@ var init_merge_agent = __esmMin((() => {
 	init_config_yaml();
 	init_paths();
 	init_tracker_utils();
-	init_beads_restore();
 	init_validation();
 	init_projects();
 	init_git_utils();
@@ -1345,11 +1362,7 @@ var init_merge_agent = __esmMin((() => {
 		".claude/skills/",
 		".overdeck/"
 	];
-	SYNC_MAIN_MAIN_PREFERRED_PATHS = [
-		".pan/continues",
-		".pan/specs",
-		".beads"
-	];
+	SYNC_MAIN_MAIN_PREFERRED_PATHS = [".pan/continues", ".pan/specs"];
 	__dirname = dirname(fileURLToPath(import.meta.url));
 	MERGE_HISTORY_DIR = join(join(OVERDECK_HOME, "specialists"), "merge-agent");
 	MERGE_HISTORY_FILE = join(MERGE_HISTORY_DIR, "history.jsonl");
@@ -1401,4 +1414,4 @@ var init_merge_agent = __esmMin((() => {
 //#endregion
 export { init_operations as C, gitPush as S, listGitOperationsSync as T, scanGitPatterns as _, init_merge_agent as a, triggerPostMergeReleaseIfConfigured as b, isSyncMainMainPreferredPath as c, parseAgentOutput as d, postMergeLifecycle as f, scanForConflictMarkers as g, salvageStrandedMerge as h, captureTmuxOutput as i, logMergeHistory as l, runProjectQualityGates as m, GIT_PATTERNS as n, isAutoCommitExcludedPath as o, resetPostMergeState as p, autoCommitWorkspaceChangesBeforeSync as r, isMergeAgentRunning as s, AUTO_COMMIT_EXCLUDED_PATHS as t, notifyTldrDaemon as u, sendMessageToAgent as v, init_git_activity as w, MainDivergedError as x, syncMainIntoWorkspace as y };
 
-//# sourceMappingURL=merge-agent-B3u2szOL.js.map
+//# sourceMappingURL=merge-agent-D6DNhe9j.js.map

package/server/{merge-agent-ejC7Wos8.js → merge-agent-DMQTJMP0.js}

@@ -1,3 +1,3 @@
-import { _ as scanGitPatterns, a as init_merge_agent, b as triggerPostMergeReleaseIfConfigured, c as isSyncMainMainPreferredPath, d as parseAgentOutput, f as postMergeLifecycle, g as scanForConflictMarkers, h as salvageStrandedMerge, i as captureTmuxOutput, l as logMergeHistory, m as runProjectQualityGates, n as GIT_PATTERNS, o as isAutoCommitExcludedPath, p as resetPostMergeState, r as autoCommitWorkspaceChangesBeforeSync, s as isMergeAgentRunning, t as AUTO_COMMIT_EXCLUDED_PATHS, u as notifyTldrDaemon, v as sendMessageToAgent, y as syncMainIntoWorkspace } from "./merge-agent-B3u2szOL.js";
+import { _ as scanGitPatterns, a as init_merge_agent, b as triggerPostMergeReleaseIfConfigured, c as isSyncMainMainPreferredPath, d as parseAgentOutput, f as postMergeLifecycle, g as scanForConflictMarkers, h as salvageStrandedMerge, i as captureTmuxOutput, l as logMergeHistory, m as runProjectQualityGates, n as GIT_PATTERNS, o as isAutoCommitExcludedPath, p as resetPostMergeState, r as autoCommitWorkspaceChangesBeforeSync, s as isMergeAgentRunning, t as AUTO_COMMIT_EXCLUDED_PATHS, u as notifyTldrDaemon, v as sendMessageToAgent, y as syncMainIntoWorkspace } from "./merge-agent-D6DNhe9j.js";
 init_merge_agent();
 export { AUTO_COMMIT_EXCLUDED_PATHS, GIT_PATTERNS, autoCommitWorkspaceChangesBeforeSync, captureTmuxOutput, isAutoCommitExcludedPath, isMergeAgentRunning, isSyncMainMainPreferredPath, logMergeHistory, notifyTldrDaemon, parseAgentOutput, postMergeLifecycle, resetPostMergeState, runProjectQualityGates, salvageStrandedMerge, scanForConflictMarkers, scanGitPatterns, sendMessageToAgent, syncMainIntoWorkspace, triggerPostMergeReleaseIfConfigured };

package/server/{merge-batch-DyqlgYGp.js → merge-batch-Bv6Z5K2H.js}

@@ -44,4 +44,4 @@ async function shipMergeBatch(issueIds, deps) {
 //#endregion
 export { shipMergeBatch };
 
-//# sourceMappingURL=merge-batch-DyqlgYGp.js.map
+//# sourceMappingURL=merge-batch-Bv6Z5K2H.js.map

package/server/{merge-blockers-cq-aS2KG.js → merge-blockers-WWWi6Ur2.js}

@@ -1,4 +1,4 @@
-import { c as init_review_status_sync, r as getAllReviewStatusesFromDb } from "./review-status-sync-CAr-hfnJ.js";
+import { c as init_review_status_sync, r as getAllReviewStatusesFromDb } from "./review-status-sync-BjTUJ5fx.js";
 //#region ../../lib/cloister/merge-blockers.ts
 init_review_status_sync();
 /**
@@ -38,4 +38,4 @@ function getMergeBlockersPayload() {
 //#endregion
 export { getMergeBlockersPayload as t };
 
-//# sourceMappingURL=merge-blockers-cq-aS2KG.js.map
+//# sourceMappingURL=merge-blockers-WWWi6Ur2.js.map

package/server/merge-ops-h9OCnIVz.js

@@ -0,0 +1,2 @@
+import { c as triggerMerge } from "./workspaces-CGuzW1Ia.js";
+export { triggerMerge };

package/server/{merge-rebase-Dl7yIxtV.js → merge-rebase-Czth9ggm.js}

@@ -1,4 +1,4 @@
-import { fr as GitError, gr as MergeConflictError, xr as init_errors } from "./config-yaml-cNOZcEww.js";
+import { Sr as init_errors, _r as MergeConflictError, pr as GitError } from "./config-yaml-CqaAyn8y.js";
 import { Effect } from "effect";
 import { existsSync } from "fs";
 import { join } from "path";
@@ -131,4 +131,4 @@ function rebaseFeatureBranch(workspacePath, featureBranch, baseBranch, issueId)
 //#endregion
 export { rebaseFeatureBranch };
 
-//# sourceMappingURL=merge-rebase-Dl7yIxtV.js.map
+//# sourceMappingURL=merge-rebase-Czth9ggm.js.map

package/server/{merge-set-CZ9Nbay0.js → merge-set-DNc4zBqd.js}

@@ -1,6 +1,6 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Fn as init_projects, kn as getProjectSync, nr as init_issue_id, or as resolveIssueIdSync, qn as resolveProjectFromIssueSync } from "./config-yaml-cNOZcEww.js";
-import { T as upsertMergeSet, i as getMergeSetFromDb, o as init_merge_sync } from "./merge-sync-D7jWLgCC.js";
+import { Fn as init_projects, kn as getProjectSync, qn as resolveProjectFromIssueSync, rr as init_issue_id, sr as resolveIssueIdSync } from "./config-yaml-CqaAyn8y.js";
+import { T as upsertMergeSet, i as getMergeSetFromDb, o as init_merge_sync } from "./merge-sync-B2KSk54U.js";
 import "effect";
 import { join } from "path";
 //#region ../../lib/project-repos.ts
@@ -136,4 +136,4 @@ var init_merge_set = __esmMin((() => {
 //#endregion
 export { upsertMergeSetSync as a, init_merge_set as i, ensureMergeSetForIssueSync as n, withRepoArtifactUrlSync as o, getMergeSetSync as r, withRepoStateSync as s, buildMergeSetForIssueSync as t };
 
-//# sourceMappingURL=merge-set-CZ9Nbay0.js.map
+//# sourceMappingURL=merge-set-DNc4zBqd.js.map

package/server/{merge-set-Dy0D0r3i.js → merge-set-vuE3MEVt.js}

@@ -1,3 +1,3 @@
-import { a as upsertMergeSetSync, i as init_merge_set, n as ensureMergeSetForIssueSync, o as withRepoArtifactUrlSync, r as getMergeSetSync, s as withRepoStateSync } from "./merge-set-CZ9Nbay0.js";
+import { a as upsertMergeSetSync, i as init_merge_set, n as ensureMergeSetForIssueSync, o as withRepoArtifactUrlSync, r as getMergeSetSync, s as withRepoStateSync } from "./merge-set-DNc4zBqd.js";
 init_merge_set();
 export { ensureMergeSetForIssueSync, getMergeSetSync, upsertMergeSetSync, withRepoArtifactUrlSync, withRepoStateSync };

package/server/{merge-sync-D7jWLgCC.js → merge-sync-B2KSk54U.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-Ba9mS6e6.js";
+import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-_Kx1m9pm.js";
 //#region ../../lib/overdeck/merge-sync.ts
 function isoFromMillis(value) {
 	return value == null ? void 0 : new Date(value).toISOString();
@@ -401,4 +401,4 @@ var init_merge_sync = __esmMin((() => {
 //#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 };
 
-//# sourceMappingURL=merge-sync-D7jWLgCC.js.map
+//# sourceMappingURL=merge-sync-B2KSk54U.js.map

package/server/{merge-sync-CG9kDCdT.js → merge-sync-B9nHdUGx.js}

@@ -1,3 +1,3 @@
-import { b as resetProcessingToQueued, o as init_merge_sync } from "./merge-sync-D7jWLgCC.js";
+import { b as resetProcessingToQueued, o as init_merge_sync } from "./merge-sync-B2KSk54U.js";
 init_merge_sync();
 export { resetProcessingToQueued };

package/server/{merge-train-CH33XJOH.js → merge-train-DJgr81tF.js}

@@ -1,4 +1,4 @@
-import { l as isMergeTrainEnabled, o as init_merge_sync } from "./merge-sync-D7jWLgCC.js";
+import { l as isMergeTrainEnabled, o as init_merge_sync } from "./merge-sync-B2KSk54U.js";
 //#region ../../lib/cloister/merge-train-reconciler.ts
 init_merge_sync();
 /**
@@ -62,9 +62,9 @@ async function reconcileStaleSiblings(mergedIssueId, deps) {
 */
 async function runMergeTrainReconcile(mergedIssueId, opts = {}) {
 	if (!(opts.enabled ?? isMergeTrainEnabled)()) return [];
-	return reconcileStaleSiblings(mergedIssueId, opts.deps ?? (await import("./merge-train-deps-JoVdGnOg.js")).buildRealReconcileDeps());
+	return reconcileStaleSiblings(mergedIssueId, opts.deps ?? (await import("./merge-train-deps-B2OWS0k9.js")).buildRealReconcileDeps());
 }
 //#endregion
 export { runMergeTrainReconcile };
 
-//# sourceMappingURL=merge-train-CH33XJOH.js.map
+//# sourceMappingURL=merge-train-DJgr81tF.js.map

package/server/{merge-train-deps-JoVdGnOg.js → merge-train-deps-B2OWS0k9.js}

@@ -1,6 +1,6 @@
-import { Fn as init_projects, qn as resolveProjectFromIssueSync } from "./config-yaml-cNOZcEww.js";
-import { W as spawnRun, t as init_agents } from "./agents-B9GwfCyp.js";
-import { c as init_review_status_sync, r as getAllReviewStatusesFromDb } from "./review-status-sync-CAr-hfnJ.js";
+import { Fn as init_projects, qn as resolveProjectFromIssueSync } from "./config-yaml-CqaAyn8y.js";
+import { X as spawnRun, s as init_agents } from "./queries-C0LCGG21.js";
+import { c as init_review_status_sync, r as getAllReviewStatusesFromDb } from "./review-status-sync-BjTUJ5fx.js";
 import { join } from "path";
 import { exec } from "child_process";
 import { promisify } from "util";
@@ -66,4 +66,4 @@ function buildRealReconcileDeps() {
 //#endregion
 export { buildRealReconcileDeps };
 
-//# sourceMappingURL=merge-train-deps-JoVdGnOg.js.map
+//# sourceMappingURL=merge-train-deps-B2OWS0k9.js.map

package/server/{merge-verification-D4wTChdX.js → merge-verification-BBIXUEqa.js}

@@ -1,7 +1,7 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Fn as init_projects, qn as resolveProjectFromIssueSync } from "./config-yaml-cNOZcEww.js";
-import { i as resolveGitHubIssueSync, n as init_tracker_utils } from "./tracker-utils--z8FLSWn.js";
-import { _ as listPullRequestsForHead, f as init_github_app, p as isGitHubAppConfigured } from "./github-app-u9-SX7Gc.js";
+import { Fn as init_projects, qn as resolveProjectFromIssueSync } from "./config-yaml-CqaAyn8y.js";
+import { i as resolveGitHubIssueSync, n as init_tracker_utils } from "./tracker-utils-CghXMF3q.js";
+import { _ as listPullRequestsForHead, f as init_github_app, p as isGitHubAppConfigured } from "./github-app-tUbb8Ldr.js";
 import { Effect } from "effect";
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
@@ -121,4 +121,4 @@ var init_merge_verification = __esmMin((() => {
 //#endregion
 export { shouldSkipDispatchAsMerged as n, verifyMergedBeforeLifecycle as r, init_merge_verification as t };
 
-//# sourceMappingURL=merge-verification-D4wTChdX.js.map
+//# sourceMappingURL=merge-verification-BBIXUEqa.js.map

package/server/{multipart-parser-Csn8U-K9.js → multipart-parser-9DhuAkPd.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { a as File, i as init_esm_min, n as FormData, t as init_from } from "./from-NSJypkI8.js";
+import { a as File, i as init_esm_min, n as FormData, t as init_from } from "./from-B2tOYhYV.js";
 //#region ../../../node_modules/.bun/node-fetch@3.3.2/node_modules/node-fetch/src/utils/multipart-parser.js
 function _fileName(headerValue) {
 	const m = headerValue.match(/\bfilename=("(.*?)"|([^()<>@,;:\\"/[\]?={}\s\t]+))($|;\s)/i);
@@ -293,4 +293,4 @@ __esmMin((() => {
 }))();
 export { toFormData };
 
-//# sourceMappingURL=multipart-parser-Csn8U-K9.js.map
+//# sourceMappingURL=multipart-parser-9DhuAkPd.js.map

package/server/node_modules/.package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@overdeck/desktop-server",
-  "version": "0.45.16",
+  "version": "0.45.18",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
@@ -23,9 +23,9 @@
       }
     },
     "node_modules/@effect/platform-node/node_modules/@effect/platform-node-shared": {
-      "version": "4.0.0-beta.97",
-      "resolved": "https://registry.npmjs.org/@effect/platform-node-shared/-/platform-node-shared-4.0.0-beta.97.tgz",
-      "integrity": "sha512-sAlygOlDLLERk7fC24f7Aa4G3wkEbGyyMEileHTHU2fThiPYSGMqNRK1LLnNr17m2+JR7BHbycwXkJkM18BAQw==",
+      "version": "4.0.0-beta.98",
+      "resolved": "https://registry.npmjs.org/@effect/platform-node-shared/-/platform-node-shared-4.0.0-beta.98.tgz",
+      "integrity": "sha512-iySXaffnCJX1sNAIp79ghhIeui9E5qwUQyqd1VLPkB9UNO4vdpd9B5fTEXwe7S/GusL4jsk9vSvX38XJgRFG1w==",
       "license": "MIT",
       "dependencies": {
         "@types/ws": "^8.18.1",
@@ -35,7 +35,7 @@
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "effect": "^4.0.0-beta.97"
+        "effect": "^4.0.0-beta.98"
       }
     },
     "node_modules/@google-cloud/common": {
@@ -2042,9 +2042,9 @@
       }
     },
     "node_modules/toml": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/toml/-/toml-4.1.2.tgz",
-      "integrity": "sha512-m0vXfHODcw3gk+KONAOlVQ5yNHc3yS3B1ybM3HS1vqDoS0RWTDDVBVVTYi8hH0k+2OM1vmo9fb1WX9EVqjqfHA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/toml/-/toml-4.3.0.tgz",
+      "integrity": "sha512-lVb8X9BsPVuH0M4BKeS91tXAmJvCjQ5UIyAbQFaxkKGyUFK2RPkhwaFSQH8vbpl1d23eu/IBH+dwVMHWaq9A5A==",
       "license": "MIT",
       "engines": {
         "node": ">=20"
@@ -2218,9 +2218,9 @@
       "license": "ISC"
     },
     "node_modules/ws": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz",
-      "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==",
+      "version": "8.21.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.1.tgz",
+      "integrity": "sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"

package/server/node_modules/@effect/platform-node/node_modules/@effect/platform-node-shared/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@effect/platform-node-shared",
   "type": "module",
-  "version": "4.0.0-beta.97",
+  "version": "4.0.0-beta.98",
   "license": "MIT",
   "description": "Unified interfaces for common platform-specific services",
   "homepage": "https://effect.website",
@@ -46,12 +46,12 @@
     "provenance": true
   },
   "peerDependencies": {
-    "effect": "^4.0.0-beta.97"
+    "effect": "^4.0.0-beta.98"
   },
   "devDependencies": {
     "@types/node": "^26.1.1",
     "tar": "^7.5.19",
-    "effect": "^4.0.0-beta.97"
+    "effect": "^4.0.0-beta.98"
   },
   "dependencies": {
     "@types/ws": "^8.18.1",

package/server/node_modules/toml/README.md

@@ -60,6 +60,14 @@ try {
 }
 ```
 
+### Nesting Depth Limit
+
+To guard against stack overflow on maliciously deep input, arrays and inline tables may nest at most 500 levels deep by default; input past the limit throws a normal parse error. Adjust the limit with the `maxDepth` option:
+
+```javascript
+toml.parse(someTomlString, { maxDepth: 100 });
+```
+
 ### Date/Time Values
 
 Offset date-times are returned as JavaScript `Date` objects. Local date-times, local dates, and local times are returned as strings since they have no timezone information and can't be losslessly represented as `Date`:
@@ -78,6 +86,52 @@ typeof data.ld             // "string"
 typeof data.lt             // "string"
 ```
 
+#### Temporal Support
+
+Pass `useTemporal: true` to have date/time values returned as
+[Temporal](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Temporal)
+objects instead:
+
+| TOML type        | Returned as               |
+| ---------------- | ------------------------- |
+| Offset date-time | `Temporal.ZonedDateTime`  |
+| Local date-time  | `Temporal.PlainDateTime`  |
+| Local date       | `Temporal.PlainDate`      |
+| Local time       | `Temporal.PlainTime`      |
+
+```javascript
+const data = toml.parse(`
+odt = 1979-05-27T00:32:00-07:00
+ldt = 1979-05-27T07:32:00
+ld  = 1979-05-27
+lt  = 07:32:00
+`, { useTemporal: true });
+
+data.odt.toString()  // "1979-05-27T00:32:00-07:00[-07:00]"
+data.ldt.toString()  // "1979-05-27T07:32:00"
+data.ld.toString()   // "1979-05-27"
+data.lt.toString()   // "07:32:00"
+```
+
+Offset date-times become `Temporal.ZonedDateTime` values whose time zone is
+the original UTC offset (`Z` maps to the `UTC` time zone), so the offset
+written in the TOML document is preserved — unlike the default `Date`
+representation, which loses it. Fractional seconds beyond nanosecond
+precision are truncated, as permitted by the TOML spec.
+
+`useTemporal` requires a runtime with the `Temporal` global. On runtimes
+that don't provide it yet, pass an implementation such as
+[`@js-temporal/polyfill`](https://www.npmjs.com/package/@js-temporal/polyfill)
+via the `temporal` option:
+
+```javascript
+const { Temporal } = require('@js-temporal/polyfill');
+const data = toml.parse(someTomlString, { useTemporal: true, temporal: Temporal });
+```
+
+Once `Temporal` is broadly available, Temporal output is expected to become
+the default behavior in a future major version.
+
 ### Special Float Values
 
 `inf` and `nan` are returned as JavaScript `Infinity` and `NaN`:

package/server/node_modules/toml/index.d.ts

@@ -1,3 +1,44 @@
 declare module 'toml' {
-  export function parse(input: string): any;
+  /**
+   * A minimal structural subset of the `Temporal` global, used to supply an
+   * alternate implementation (e.g. from `@js-temporal/polyfill`) on runtimes
+   * without native Temporal support.
+   */
+  export interface TemporalLike {
+    ZonedDateTime: { from(item: string): any };
+    PlainDateTime: { from(item: string): any };
+    PlainDate: { from(item: string): any };
+    PlainTime: { from(item: string): any };
+  }
+
+  export interface ParseOptions {
+    /**
+     * Maximum nesting depth for arrays and inline tables. Parsing input nested
+     * deeper than this throws a parse error rather than overflowing the stack.
+     * Defaults to 500.
+     */
+    maxDepth?: number;
+
+    /**
+     * When true, date/time values are returned as Temporal objects instead of
+     * the default representations:
+     *
+     * - Offset date-time: `Temporal.ZonedDateTime` (instead of `Date`)
+     * - Local date-time:  `Temporal.PlainDateTime` (instead of `string`)
+     * - Local date:       `Temporal.PlainDate` (instead of `string`)
+     * - Local time:       `Temporal.PlainTime` (instead of `string`)
+     *
+     * Requires a global `Temporal` object, or an implementation passed via
+     * the `temporal` option.
+     */
+    useTemporal?: boolean;
+
+    /**
+     * The Temporal implementation to use when `useTemporal` is set. Defaults
+     * to the global `Temporal` object if one is available.
+     */
+    temporal?: TemporalLike;
+  }
+
+  export function parse(input: string, options?: ParseOptions): any;
 }

package/server/node_modules/toml/index.js

@@ -2,9 +2,9 @@ var parser = require('./lib/parser');
 var compiler = require('./lib/compiler');
 
 module.exports = {
-  parse: function(input) {
+  parse: function(input, options) {
     var str = input.toString();
-    var nodes = parser.parse(str);
-    return compiler.compile(nodes, str);
+    var nodes = parser.parse(str, options);
+    return compiler.compile(nodes, str, options);
   }
 };