@overdeck/desktop 0.45.21 → 0.45.23

package/server/deacon-swarm-9jRLS5Ke.js

@@ -0,0 +1,2 @@
+import { r as coordinateSwarmSlots } from "./deacon-swarm-DftYRDo8.js";
+export { coordinateSwarmSlots };

package/server/{deacon-swarm-DmA3rJ7k.js → deacon-swarm-DftYRDo8.js}

@@ -1,14 +1,14 @@
-import { $n as resolveProjectFromIssueSync, At as init_record, C as init_tier_table, Dt as getIssueRecordPathForWorkspace, Ft as readIssueRecordSync, Lt as resolveProjectForIssue, Nn as getProjectSync, Pt as readIssueRecordForWorkspaceSync, T as resolveTieredExecutionEnabled, Un as listProjectsSync, dn as init_state_plane, f as loadConfigSync, fn as isStatePlaneOnlyStatus, kt as getProjectConfigFromWorkspacePath, t as init_config_yaml, zn as init_projects } from "./config-yaml-Ciyp2mYe.js";
-import { n as updateIssueRecord, r as updateIssueRecordForWorkspace, t as init_record_update } from "./record-update-RviRDSNs.js";
-import { E as isPaneDead, V as sessionExists, i as capturePane, j as listSessionNames, k as listPaneValues, w as init_tmux } from "./tmux-y1blSxks.js";
-import { c as init_review_status, s as getReviewStatusSync, y as setReviewStatusSync } from "./review-status-CCgPVK1h.js";
-import { $ as stopAgent, At as init_spawn_prep, C as init_slot_reconcile, En as decideResumeGate, I as init_messaging, L as messageAgent, Mn as init_agent_state, On as getAgentResumeGateBlockReason, Q as init_termination, Rt as init_resolve_tier, T as reconcileSlotState, Y as init_spawn, Z as spawnRun, _ as spawnTierSupervisor, at as getConcurrencyLimits, b as init_tier_feed, ct as releaseSwarmSlot, dt as tryReserveSwarmSlot, g as shouldSupervise, h as loadPrdDraft, jn as getAgentStateSync, kt as defaultRunWorkspace, m as init_tier_supervisor, mr as init_agent_runtime, mt as init_memory_verdict_cache, nt as countRunningSwarmSlotsForIssue, ot as init_concurrency, p as deliverCommitForReview, pr as getAgentRuntimeSnapshot, pt as getCachedMemoryVerdict, v as supervisorAgentId, w as listSlotAssignments, y as broadcastCommit, zt as resolveTier } from "./queries-B5hl7lMQ.js";
-import { C as init_specs, d as readPlanSync, i as findPlanSync, n as applyStatusOverrides, o as init_io, v as init_types, x as findSpecByIssue, y as subItemsOf } from "./io-BiM-7Zsx.js";
-import { s as init_control_settings, u as isDeaconGloballyPausedSync } from "./control-settings-D_79A6gp.js";
-import { i as createActiveSlice, l as init_dag, n as blockingParentCount, o as getDispatchableItems } from "./dag-DIji6O2b.js";
-import { a as loadCloisterConfigSync, r as init_config } from "./config-G1TOMJZA.js";
-import { r as init_swarm_readiness, t as analyzeSwarmReadiness } from "./swarm-readiness-C9P2iPap.js";
-import { t as recordRecoveryFailure } from "./recovery-trip-l1Hsi37x.js";
+import { D as resolveTieredExecutionEnabled, Dt as getProjectConfigFromWorkspacePath, Ft as resolveProjectForIssue, Mt as readIssueRecordForWorkspaceSync, Nt as readIssueRecordSync, Ot as init_record, T as init_tier_table, Tn as init_projects, Tt as getIssueRecordPathForWorkspace, Xt as isStatePlaneOnlyStatus, Yt as init_state_plane, f as loadConfigSync, kn as listProjectsSync, t as init_config_yaml, yn as getProjectSync, zn as resolveProjectFromIssueSync } from "./config-yaml-DvyMuOle.js";
+import { n as updateIssueRecord, r as updateIssueRecordForWorkspace, t as init_record_update } from "./record-update-Dq0t2uBG.js";
+import { A as listPaneValues, E as isPaneDead, H as sessionExists, M as listSessionNames, i as capturePane, w as init_tmux } from "./tmux-ftABRAmc.js";
+import { b as setReviewStatusSync, c as getReviewStatusSync, l as init_review_status } from "./review-status-A7quS5KJ.js";
+import { A as spawnTierSupervisor, D as init_tier_supervisor, Dr as init_agent_runtime, Dt as init_memory_verdict_cache, E as deliverCommitForReview, Er as getAgentRuntimeSnapshot, Et as getCachedMemoryVerdict, Gn as init_agent_state, Ht as defaultRunWorkspace, I as init_slot_reconcile, L as listSlotAssignments, M as broadcastCommit, N as init_tier_feed, O as loadPrdDraft, Qt as resolveTier, R as reconcileSlotState, Ut as init_spawn_prep, Vn as getAgentResumeGateBlockReason, Wn as getAgentStateSync, X as messageAgent, Y as init_messaging, Zt as init_resolve_tier, ct as init_spawn, dt as init_termination, ft as stopAgent, ht as countRunningSwarmSlotsForIssue, j as supervisorAgentId, k as shouldSupervise, ut as spawnRun, vt as getConcurrencyLimits, wt as tryReserveSwarmSlot, xt as releaseSwarmSlot, yt as init_concurrency, zn as decideResumeGate } from "./queries-6d7Cdtm7.js";
+import { C as init_specs, d as readPlanSync, i as findPlanSync, n as applyStatusOverrides, o as init_io, v as init_types, x as findSpecByIssue, y as subItemsOf } from "./io-B3_AHDfr.js";
+import { s as init_control_settings, u as isDeaconGloballyPausedSync } from "./control-settings-aP1ANIlI.js";
+import { i as createActiveSlice, l as init_dag, n as blockingParentCount, o as getDispatchableItems } from "./dag-CdOjJVDT.js";
+import { a as loadCloisterConfigSync, r as init_config } from "./config-DjLOdbgT.js";
+import { r as init_swarm_readiness, t as analyzeSwarmReadiness } from "./swarm-readiness-CQ_fwUWF.js";
+import { t as recordRecoveryFailure } from "./recovery-trip-BJtIQuag.js";
 import { join } from "node:path";
 import { Effect } from "effect";
 import { existsSync, readdirSync } from "fs";
@@ -132,7 +132,7 @@ function commandFailure(error) {
 //#region ../../lib/pan-dir/task-door.ts
 init_swarm_readiness();
 init_slot_reconcile();
-/** Single task-mutation write door over the immutable vBRIEF specification. */
+/** Single task-mutation write door over the immutable xBRIEF specification. */
 init_record_update();
 var TaskStatusChangeError = class extends Error {
 	constructor(message, details) {
@@ -187,9 +187,9 @@ async function applyTaskStatusChange(project, issueId, operation) {
 	let result;
 	await updateIssueRecord(project, normalizedIssueId, (record) => {
 		const planPath = findPlanSync(join(project.path, "workspaces", `feature-${normalizedIssueId.toLowerCase()}`));
-		if (!planPath) throw new Error(`The vBRIEF for ${normalizedIssueId} is missing or unreadable. Return the issue to planning before changing task state.`);
+		if (!planPath) throw new Error(`The xBRIEF for ${normalizedIssueId} is missing or unreadable. Return the issue to planning before changing task state.`);
 		const item = applyStatusOverrides(readPlanSync(planPath), record.statusOverrides ?? {}).plan.items.find(({ id }) => id === operation.itemId);
-		if (!item) throw new Error(`Task ${operation.itemId} does not exist in the immutable vBRIEF for ${normalizedIssueId}. Return the issue to planning to change scope.`);
+		if (!item) throw new Error(`Task ${operation.itemId} does not exist in the immutable xBRIEF for ${normalizedIssueId}. Return the issue to planning to change scope.`);
 		const currentStatus = item.status;
 		const currentSequence = record.tasks?.sequence ?? 0;
 		const existingClaim = record.tasks?.claims[operation.itemId];
@@ -488,7 +488,7 @@ async function defaultRequestIssueReview(issueId, workspacePath) {
 		autoRequeueCount: 0,
 		reviewRequestedAt: (/* @__PURE__ */ new Date()).toISOString()
 	});
-	const { spawnReviewRoleForIssue } = await import("./review-agent-CSswH985.js");
+	const { spawnReviewRoleForIssue } = await import("./review-agent-DJRO8EG8.js");
 	return Effect.runPromise(spawnReviewRoleForIssue({
 		issueId,
 		workspace: workspacePath,
@@ -1437,7 +1437,7 @@ function promptForDispatchItem(issueId, doc, item) {
 		"Do not implement this item yet. Summarize the blocking parent outputs into a concise context update for the implementation slot.",
 		`Blocking parents: ${parentIds.join(", ") || "(none)"}`,
 		"",
-		"Persist the synthesis context on the vBRIEF item metadata as synthesisContext, commit it, then stop."
+		"Persist the synthesis context on the xBRIEF item metadata as synthesisContext, commit it, then stop."
 	].join("\n");
 }
 function itemRequiresSynthesis(doc, item) {
@@ -1472,4 +1472,4 @@ function registeredSlotCapacityAvailable(issueId, selectedCount, liveSlotCount =
 //#endregion
 export { gcMergedSlots as _, getFailedMergeBlock as a, resolveSwarmPolicy as b, isSwarmAdvanceCoolingDown as c, recordStalledSlotRecovery as d, recordSwarmAdvanceFailure as f, decideAgentAutonomousRedrive as g, registeredSlotCapacityAvailable as h, dispatchNextWave as i, mergeReadySlots as l, recordSwarmFinalizedAt as m, classifyInFlightSlots as n, getFailedMergeBlocks as o, recordSwarmAdvanceSuccess as p, coordinateSwarmSlots as r, getSwarmFinalizedAt as s, allocateSlotIndex as t, recordFailedMergeBlock as u, gcOrphanedSlots as v, listFeatureWorkspaces as y };
 
-//# sourceMappingURL=deacon-swarm-DmA3rJ7k.js.map
+//# sourceMappingURL=deacon-swarm-DftYRDo8.js.map

package/server/deacon.js

@@ -1,11 +1,11 @@
-import { an as init_auto_commit, rn as flushAllPendingAutoCommits } from "./config-yaml-Ciyp2mYe.js";
+import { Ut as init_auto_commit, Vt as flushAllPendingAutoCommits } from "./config-yaml-DvyMuOle.js";
 import { a as init_activity_logger, o as setActivityEventStoreProvider } from "./activity-logger-DDlOIAML.js";
-import { c as init_review_status, s as getReviewStatusSync } from "./review-status-CCgPVK1h.js";
-import { kn as getAgentState, s as init_agents } from "./queries-B5hl7lMQ.js";
-import { r as setCloisterEventStoreProvider, t as getCloisterService } from "./service-CqAY8Kmk.js";
-import { i as ensureInternalTokenSync, s as init_internal_token, t as INTERNAL_TOKEN_HEADER } from "./internal-token-DhfFiwW7.js";
-import { F as setAgentStatusChangedNotifier, I as setAgentStoppedNotifier, L as setMergeReadyNotifier, M as resetPatrolHeartbeatForStartup, N as runPatrol } from "./deacon-1s7bM5zn.js";
-import { t as enrichReviewStatus } from "./review-status-enrichment-DtDRGpst.js";
+import { c as getReviewStatusSync, l as init_review_status } from "./review-status-A7quS5KJ.js";
+import { Hn as getAgentState, b as init_agents } from "./queries-6d7Cdtm7.js";
+import { r as setCloisterEventStoreProvider, t as getCloisterService } from "./service-DCpB_SGd.js";
+import { i as ensureInternalTokenSync, s as init_internal_token, t as INTERNAL_TOKEN_HEADER } from "./internal-token-Bb4XeV2x.js";
+import { F as setAgentStatusChangedNotifier, I as setAgentStoppedNotifier, L as setMergeReadyNotifier, M as resetPatrolHeartbeatForStartup, N as runPatrol } from "./deacon-pRnyD5w9.js";
+import { t as enrichReviewStatus } from "./review-status-enrichment-tbOn_A_u.js";
 import { Effect } from "effect";
 import { randomUUID } from "node:crypto";
 //#region ../../lib/cloister/deacon-event-client.ts
@@ -320,7 +320,7 @@ async function shutdown(signal) {
 		console.error("[deacon-child] Cloister stop failed:", err);
 	}
 	try {
-		const { killAllGateProcessGroups } = await import("./validation-CUWamZ4X.js");
+		const { killAllGateProcessGroups } = await import("./validation-CIi6pnI2.js");
 		const reaped = killAllGateProcessGroups();
 		if (reaped > 0) console.log(`[deacon-child] reaped ${reaped} in-flight gate process group(s)`);
 	} catch (err) {

package/server/{deploy-patrol-DmM6F-yw.js → deploy-patrol-Bjsho_ha.js}

@@ -1,12 +1,12 @@
-import { Rr as OVERDECK_HOME, ti as init_paths } from "./config-yaml-Ciyp2mYe.js";
-import { n as init_build_info, t as getBuildInfo } from "./build-info-27NlbKhV.js";
+import { Vr as init_paths, wr as OVERDECK_HOME } from "./config-yaml-DvyMuOle.js";
+import { n as init_build_info, t as getBuildInfo } from "./build-info-BT096lEl.js";
 import { a as init_activity_logger, n as emitActivityEntrySync, r as emitActivityTtsSync } from "./activity-logger-DDlOIAML.js";
-import { a as loadCloisterConfigSync, r as init_config } from "./config-G1TOMJZA.js";
-import { i as init_staleness, r as computeBuildStaleness } from "./staleness-BbsGxmF2.js";
-import { n as init_deploy_window, t as getDeployBlockReason } from "./deploy-window-jw4S_Y-c.js";
+import { a as loadCloisterConfigSync, r as init_config } from "./config-DjLOdbgT.js";
+import { i as init_staleness, r as computeBuildStaleness } from "./staleness-Bpy41ngS.js";
+import { n as init_deploy_window, t as getDeployBlockReason } from "./deploy-window-DeP_OIRk.js";
 import { join } from "node:path";
 import { mkdir, open, writeFile } from "node:fs/promises";
-import { spawn } from "node:child_process";
+import { execFile, spawn } from "node:child_process";
 //#region ../../lib/cloister/deploy-patrol.ts
 init_activity_logger();
 init_build_info();
@@ -16,6 +16,10 @@ init_paths();
 init_config();
 const OBSERVATION_INTERVAL_MS = 1800 * 1e3;
 const DEPLOY_SPAWN_COOLDOWN_MS = 600 * 1e3;
+const DEPLOY_PATROL_INITIATOR = "deploy-patrol";
+const CI_WORKFLOW_FILE = "ci.yml";
+const CI_RUN_FIELDS = "databaseId,status,conclusion,headSha,attempt,createdAt";
+const SYSTEMD_ENV_NAME_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
 const state = {
 	lastObservedBehind: null,
 	lastObservationAt: 0,
@@ -24,6 +28,81 @@ const state = {
 	lastDeploySpawnAt: 0,
 	unknownObserved: false
 };
+function reloadEnvironment(request, env) {
+	return {
+		...env,
+		OVERDECK_AGENT_ID: request.initiator
+	};
+}
+function execGh(args, cwd) {
+	return new Promise((resolve, reject) => {
+		execFile("gh", [...args], {
+			cwd,
+			encoding: "utf8",
+			timeout: 3e4
+		}, (error, stdout) => {
+			if (error) reject(error);
+			else resolve(stdout);
+		});
+	});
+}
+async function getDeployCiState(repoRoot, sha, runGh = execGh) {
+	try {
+		const run = JSON.parse(await runGh([
+			"run",
+			"list",
+			"--branch",
+			"main",
+			"--commit",
+			sha,
+			"--workflow",
+			CI_WORKFLOW_FILE,
+			"--limit",
+			"10",
+			"--json",
+			CI_RUN_FIELDS
+		], repoRoot)).find((candidate) => candidate.headSha === sha);
+		const tip = shortSha(sha);
+		if (!run) return {
+			status: "pending",
+			reason: `Automatic deployment deferred because CI has not started for origin/main ${tip}.`
+		};
+		if (run.status !== "completed") return {
+			status: "pending",
+			reason: `Automatic deployment deferred because CI is ${run.status} for origin/main ${tip}.`
+		};
+		if (run.conclusion !== "success") return {
+			status: "red",
+			reason: `Automatic deployment blocked because CI concluded ${run.conclusion || "without a result"} for origin/main ${tip}.`
+		};
+		return { status: "green" };
+	} catch (error) {
+		return {
+			status: "unknown",
+			reason: `Automatic deployment deferred because CI status for origin/main ${shortSha(sha)} could not be read: ${error instanceof Error ? error.message : String(error)}`
+		};
+	}
+}
+function buildSystemdReloadArgs(request, now, logPath, env = process.env) {
+	const setenvArgs = Object.entries(reloadEnvironment(request, env)).filter(([name, value]) => value !== void 0 && SYSTEMD_ENV_NAME_RE.test(name)).flatMap(([name, value]) => ["--setenv", `${name}=${value}`]);
+	return [
+		"--user",
+		"--unit",
+		`overdeck-auto-deploy-${now}`,
+		"--collect",
+		"--quiet",
+		"--property=Restart=on-failure",
+		"--property=RestartSec=10s",
+		"--property=StartLimitBurst=2",
+		"--property=StartLimitIntervalSec=300s",
+		`--property=StandardOutput=append:${logPath}`,
+		`--property=StandardError=append:${logPath}`,
+		`--property=WorkingDirectory=${request.cwd}`,
+		...setenvArgs,
+		request.command,
+		...request.args
+	];
+}
 function shortSha(sha) {
 	return sha?.slice(0, 8) || "unknown";
 }
@@ -46,19 +125,45 @@ async function waitForChildSpawn(child) {
 		child.once("error", onError);
 	});
 }
+async function waitForChildExit(child) {
+	return new Promise((resolve, reject) => {
+		child.once("error", reject);
+		child.once("close", (code) => resolve(code ?? 1));
+	});
+}
 async function spawnDetachedReload(request, now) {
 	const logsDir = join(OVERDECK_HOME, "logs");
+	const logPath = join(logsDir, "auto-deploy.log");
 	await mkdir(logsDir, { recursive: true });
 	await writeFile(join(OVERDECK_HOME, "dashboard-restarting.json"), JSON.stringify({
 		reason: "auto-deploy",
 		trigger: "deacon",
 		timestamp: now
 	}, null, 2), "utf8");
-	const log = await open(join(logsDir, "auto-deploy.log"), "a");
+	const log = await open(logPath, "a");
 	try {
+		if (process.platform === "linux") {
+			let systemdFailure = null;
+			try {
+				const exitCode = await waitForChildExit(spawn("systemd-run", buildSystemdReloadArgs(request, now, logPath), {
+					cwd: request.cwd,
+					stdio: [
+						"ignore",
+						log.fd,
+						log.fd
+					]
+				}));
+				if (exitCode === 0) return;
+				systemdFailure = `systemd-run exited ${exitCode}`;
+			} catch (error) {
+				systemdFailure = error instanceof Error ? error.message : String(error);
+			}
+			await log.appendFile(`[auto-deploy] WARNING: ${systemdFailure}; falling back to an unsupervised detached reload.\n`, "utf8");
+		}
 		await waitForChildSpawn(spawn(request.command, [...request.args], {
 			cwd: request.cwd,
 			detached: request.detached,
+			env: reloadEnvironment(request, process.env),
 			stdio: [
 				"ignore",
 				log.fd,
@@ -77,6 +182,16 @@ function clearState() {
 	state.lastDeploySpawnAt = 0;
 	state.unknownObserved = false;
 }
+function emitDeferral(reason, now, emitEntry) {
+	if (state.lastDeferralReason === reason && now - state.lastDeferralAt < OBSERVATION_INTERVAL_MS) return;
+	emitEntry({
+		source: "deploy-script",
+		level: "warn",
+		message: reason
+	});
+	state.lastDeferralReason = reason;
+	state.lastDeferralAt = now;
+}
 async function runDeployPatrol(context) {
 	const now = (context.now ?? Date.now)();
 	const emitEntry = context.emitEntry ?? emitActivityEntrySync;
@@ -112,19 +227,20 @@ async function runDeployPatrol(context) {
 		state.lastObservationAt = now;
 	}
 	if (!context.config.auto_deploy) return;
-	if (staleness.originMainLastCommitAt !== null && now - staleness.originMainLastCommitAt < context.config.debounce_minutes * 60 * 1e3) return;
+	if (staleness.originMainLastBuildInputCommitAt !== null && now - staleness.originMainLastBuildInputCommitAt < context.config.debounce_minutes * 60 * 1e3) return;
 	if (state.lastDeploySpawnAt > 0 && now - state.lastDeploySpawnAt < DEPLOY_SPAWN_COOLDOWN_MS) return;
+	if (!staleness.originMainSha) {
+		emitDeferral("Automatic deployment deferred because the origin/main commit is unknown.", now, emitEntry);
+		return;
+	}
+	const ciState = await (context.getCiState ?? ((sha) => getDeployCiState(context.repoRoot, sha)))(staleness.originMainSha);
+	if (ciState.status !== "green") {
+		emitDeferral(ciState.reason ?? `Automatic deployment deferred because CI is ${ciState.status} for origin/main ${shortSha(staleness.originMainSha)}.`, now, emitEntry);
+		return;
+	}
 	const blockReason = await (context.getBlockReason ?? getDeployBlockReason)();
 	if (blockReason) {
-		if (state.lastDeferralReason !== blockReason || now - state.lastDeferralAt >= OBSERVATION_INTERVAL_MS) {
-			emitEntry({
-				source: "deploy-script",
-				level: "warn",
-				message: blockReason
-			});
-			state.lastDeferralReason = blockReason;
-			state.lastDeferralAt = now;
-		}
+		emitDeferral(blockReason, now, emitEntry);
 		return;
 	}
 	const reloadRequest = {
@@ -136,7 +252,8 @@ async function runDeployPatrol(context) {
 			"120000"
 		],
 		cwd: context.repoRoot,
-		detached: true
+		detached: true,
+		initiator: DEPLOY_PATROL_INITIATOR
 	};
 	await (context.spawnReload ?? ((request) => spawnDetachedReload(request, now)))(reloadRequest);
 	state.lastDeploySpawnAt = now;
@@ -168,4 +285,4 @@ async function runScheduledDeployPatrol() {
 //#endregion
 export { runScheduledDeployPatrol };
 
-//# sourceMappingURL=deploy-patrol-DmM6F-yw.js.map
+//# sourceMappingURL=deploy-patrol-Bjsho_ha.js.map

package/server/{deploy-window-ClLq1RYf.js → deploy-window-CM6W1-c6.js}

@@ -1,3 +1,3 @@
-import { n as init_deploy_window, t as getDeployBlockReason } from "./deploy-window-jw4S_Y-c.js";
+import { n as init_deploy_window, t as getDeployBlockReason } from "./deploy-window-DeP_OIRk.js";
 init_deploy_window();
 export { getDeployBlockReason };

package/server/{deploy-window-jw4S_Y-c.js → deploy-window-DeP_OIRk.js}

@@ -1,12 +1,12 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { ei as getOverdeckHome, ti as init_paths } from "./config-yaml-Ciyp2mYe.js";
-import { V as sessionExists, w as init_tmux } from "./tmux-y1blSxks.js";
-import { c as init_review_status, u as loadReviewStatuses } from "./review-status-CCgPVK1h.js";
-import { i as getFlywheelActiveRunId, s as init_control_settings } from "./control-settings-D_79A6gp.js";
-import { n as readDevSupervisorMarker, t as init_dev_supervisor } from "./dev-supervisor-Do2Stz49.js";
+import { Br as getOverdeckHome, Vr as init_paths } from "./config-yaml-DvyMuOle.js";
+import { H as sessionExists, w as init_tmux } from "./tmux-ftABRAmc.js";
+import { d as loadReviewStatuses, l as init_review_status } from "./review-status-A7quS5KJ.js";
+import { i as getFlywheelActiveRunId, s as init_control_settings } from "./control-settings-aP1ANIlI.js";
+import { n as readDevSupervisorMarker, t as init_dev_supervisor } from "./dev-supervisor-BpMoHlkR.js";
 import { join } from "node:path";
 import { Data, Effect } from "effect";
-import { access, readFile } from "node:fs/promises";
+import { access, open, readFile, unlink } from "node:fs/promises";
 //#region ../../lib/restart-lock.ts
 function restartLockPath() {
 	return join(getOverdeckHome(), "restart.lock");
@@ -28,12 +28,79 @@ async function readHolderFromPath(path) {
 		return null;
 	}
 }
+function isProcessAlive(pid) {
+	try {
+		process.kill(pid, 0);
+		return true;
+	} catch (error) {
+		return isErrnoException(error) && error.code === "EPERM";
+	}
+}
+function isStale(holder, now) {
+	return now - holder.ts > STALE_LOCK_MS || !isProcessAlive(holder.pid);
+}
+async function writeLockFile(path, holder) {
+	const file = await open(path, "wx", 384);
+	try {
+		await file.writeFile(`${JSON.stringify(holder)}\n`, "utf8");
+	} finally {
+		await file.close();
+	}
+}
+async function unlinkIfExists(path) {
+	try {
+		await unlink(path);
+	} catch (error) {
+		if (!isErrnoException(error) || error.code !== "ENOENT") throw error;
+	}
+}
+function matchesHolder(actual, expected) {
+	return actual?.pid === expected.pid && actual.ts === expected.ts && actual.caller === expected.caller;
+}
+async function acquireStaleBreaker(path) {
+	const breakerPath = `${path}.break`;
+	for (let attempt = 0; attempt < 2; attempt += 1) {
+		const holder = {
+			pid: process.pid,
+			ts: Date.now(),
+			caller: "stale restart lock breaker"
+		};
+		try {
+			await writeLockFile(breakerPath, holder);
+			let released = false;
+			return { async release() {
+				if (released) return;
+				released = true;
+				if (matchesHolder(await readHolderFromPath(breakerPath), holder)) await unlinkIfExists(breakerPath);
+			} };
+		} catch (error) {
+			if (!isErrnoException(error) || error.code !== "EEXIST") throw error;
+			const existing = await readHolderFromPath(breakerPath);
+			if (!existing || !isStale(existing, Date.now())) return null;
+			await unlinkIfExists(breakerPath);
+		}
+	}
+	return null;
+}
 async function readRestartLockHolderPromise() {
-	return readHolderFromPath(restartLockPath());
+	const path = restartLockPath();
+	const observed = await readHolderFromPath(path);
+	if (!observed || isProcessAlive(observed.pid)) return observed;
+	const breaker = await acquireStaleBreaker(path);
+	if (!breaker) return observed;
+	try {
+		const current = await readHolderFromPath(path);
+		if (!matchesHolder(current, observed)) return current;
+		await unlinkIfExists(path);
+		return null;
+	} finally {
+		await breaker.release();
+	}
 }
-var RestartLockError, readRestartLockHolder;
+var STALE_LOCK_MS, RestartLockError, readRestartLockHolder;
 var init_restart_lock = __esmMin((() => {
 	init_paths();
+	STALE_LOCK_MS = 300 * 1e3;
 	RestartLockError = class extends Data.TaggedError("RestartLockError") {};
 	readRestartLockHolder = () => Effect.tryPromise({
 		try: () => readRestartLockHolderPromise(),
@@ -51,7 +118,7 @@ async function getDeployBlockReason(dependencies = {}) {
 		...defaultDependencies,
 		...dependencies
 	};
-	const verifyingIssues = Object.entries(deps.loadReviewStatuses()).filter(([, status]) => status.verificationStatus === "running").map(([issueId]) => issueId).sort();
+	const verifyingIssues = Object.entries(deps.loadReviewStatuses()).filter(([, status]) => status.verificationStatus === "running" && status.mergeStatus !== "merged").map(([issueId]) => issueId).sort();
 	if (verifyingIssues.length > 0) return `Deployment deferred because verification is in flight for ${verifyingIssues.join(", ")}.`;
 	const activeFlywheelRunId = deps.getFlywheelActiveRunId();
 	if (activeFlywheelRunId) return `Deployment deferred because flywheel run ${activeFlywheelRunId} owns deployment.`;
@@ -89,4 +156,4 @@ var init_deploy_window = __esmMin((() => {
 //#endregion
 export { init_deploy_window as n, getDeployBlockReason as t };
 
-//# sourceMappingURL=deploy-window-jw4S_Y-c.js.map
+//# sourceMappingURL=deploy-window-DeP_OIRk.js.map

package/server/{dev-supervisor-Do2Stz49.js → dev-supervisor-BpMoHlkR.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { ei as getOverdeckHome, ti as init_paths } from "./config-yaml-Ciyp2mYe.js";
+import { Br as getOverdeckHome, Vr as init_paths } from "./config-yaml-DvyMuOle.js";
 import { existsSync, readFileSync, unlinkSync } from "fs";
 import { join } from "path";
 //#region ../../lib/dev-supervisor.ts
@@ -71,4 +71,4 @@ var init_dev_supervisor = __esmMin((() => {
 //#endregion
 export { readDevSupervisorMarker as n, init_dev_supervisor as t };
 
-//# sourceMappingURL=dev-supervisor-Do2Stz49.js.map
+//# sourceMappingURL=dev-supervisor-BpMoHlkR.js.map

package/server/{devcontainer-renderer-D8ylupco.js → devcontainer-renderer-CtUgrVKW.js}

@@ -1,6 +1,6 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Or as init_errors } from "./config-yaml-Ciyp2mYe.js";
-import { n as init_workspace_config, r as replacePlaceholdersSync } from "./workspace-config-BAAsAv-o.js";
+import { mr as init_errors } from "./config-yaml-DvyMuOle.js";
+import { n as init_workspace_config, r as replacePlaceholdersSync } from "./workspace-config-cEGcO6UT.js";
 import "effect";
 import { chmodSync, copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, symlinkSync, writeFileSync } from "fs";
 import { basename, dirname, join } from "path";
@@ -166,4 +166,4 @@ var init_devcontainer_renderer = __esmMin((() => {
 //#endregion
 export { renderDevcontainerSync as a, processTemplatesSync as i, createWorkspacePlaceholdersSync as n, sanitizeComposeFileSync as o, init_devcontainer_renderer as r, DEVCONTAINER_DIRNAME as t };
 
-//# sourceMappingURL=devcontainer-renderer-D8ylupco.js.map
+//# sourceMappingURL=devcontainer-renderer-CtUgrVKW.js.map

package/server/dist-Bd3vn0Hw.js

@@ -0,0 +1,3 @@
+import { t as require_dist } from "./dist-DyRx4cI7.js";
+export default require_dist();
+export {};

package/server/{dist-yfR7G1BL.js → dist-DyRx4cI7.js}

@@ -1238,4 +1238,4 @@ var require_dist = /* @__PURE__ */ __commonJSMin(((exports) => {
 //#endregion
 export { require_dist$1 as n, require_src as r, require_dist as t };
 
-//# sourceMappingURL=dist-yfR7G1BL.js.map
+//# sourceMappingURL=dist-DyRx4cI7.js.map

package/server/{docker-ClwPQaba.js → docker-BK7HIcBj.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { r as init_devcontainer_renderer, t as DEVCONTAINER_DIRNAME } from "./devcontainer-renderer-D8ylupco.js";
+import { r as init_devcontainer_renderer, t as DEVCONTAINER_DIRNAME } from "./devcontainer-renderer-CtUgrVKW.js";
 import { existsSync, readFileSync } from "fs";
 import { join } from "path";
 import { exec } from "child_process";
@@ -195,4 +195,4 @@ var init_docker = __esmMin((() => {
 //#endregion
 export { teardownWorkspaceDockerByNamePromise as i, init_docker as n, stopWorkspaceDockerPromise as r, getContainersReferencingWorkspacePathPromise as t };
 
-//# sourceMappingURL=docker-ClwPQaba.js.map
+//# sourceMappingURL=docker-BK7HIcBj.js.map

package/server/{dod-BLphkhjs.js → dod-BrSfUHm0.js}

@@ -63,4 +63,4 @@ function acceptFlagFor(row) {
 //#endregion
 export { acceptFlagFor as n, DOD_ROWS as t };
 
-//# sourceMappingURL=dod-BLphkhjs.js.map
+//# sourceMappingURL=dod-BrSfUHm0.js.map

package/server/{ensure-devcontainer-BA3bICoY.js → ensure-devcontainer-DRqaAkBR.js}

@@ -1,3 +1,3 @@
-import { n as ensureDevcontainerSync, r as init_ensure_devcontainer, t as ensureDevcontainer } from "./ensure-devcontainer-CFpQatOc.js";
+import { n as ensureDevcontainerSync, r as init_ensure_devcontainer, t as ensureDevcontainer } from "./ensure-devcontainer-DseivYEy.js";
 init_ensure_devcontainer();
 export { ensureDevcontainer, ensureDevcontainerSync };

package/server/{ensure-devcontainer-CFpQatOc.js → ensure-devcontainer-DseivYEy.js}

@@ -1,7 +1,7 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { $n as resolveProjectFromIssueSync, Nn as getProjectSync, zn as init_projects } from "./config-yaml-Ciyp2mYe.js";
-import { a as renderDevcontainerSync, r as init_devcontainer_renderer } from "./devcontainer-renderer-D8ylupco.js";
-import { a as stepSkipped, i as stepOk, n as init_types, r as stepFailed } from "./types-BjaZ1oqH.js";
+import { Tn as init_projects, yn as getProjectSync, zn as resolveProjectFromIssueSync } from "./config-yaml-DvyMuOle.js";
+import { a as renderDevcontainerSync, r as init_devcontainer_renderer } from "./devcontainer-renderer-CtUgrVKW.js";
+import { a as stepSkipped, i as stepOk, n as init_types, r as stepFailed } from "./types-BBNjPcqU.js";
 import { Effect } from "effect";
 import { existsSync } from "fs";
 import { basename, join } from "path";
@@ -107,4 +107,4 @@ var init_ensure_devcontainer = __esmMin((() => {
 //#endregion
 export { ensureDevcontainerSync as n, init_ensure_devcontainer as r, ensureDevcontainer as t };
 
-//# sourceMappingURL=ensure-devcontainer-CFpQatOc.js.map
+//# sourceMappingURL=ensure-devcontainer-DseivYEy.js.map

package/server/{esm-shims-BZw-fTQ6.js → esm-shims-CbI3BVkl.js}

@@ -12,4 +12,4 @@ var init_esm_shims = __esmMin((() => {
 //#endregion
 export { __filename as n, init_esm_shims as r, __dirname as t };
 
-//# sourceMappingURL=esm-shims-BZw-fTQ6.js.map
+//# sourceMappingURL=esm-shims-CbI3BVkl.js.map

package/server/{event-store-DABarGNz.js → event-store-Cr5PQwFC.js}

@@ -1,3 +1,3 @@
-import { a as init_event_store, i as initEventStore, n as getEventStore, o as openEventDb, r as getSharedDb, t as createEventStore } from "./event-store-BVnON3vf.js";
+import { a as init_event_store, i as initEventStore, n as getEventStore, o as openEventDb, r as getSharedDb, t as createEventStore } from "./event-store-tdiY5eDZ.js";
 init_event_store();
 export { createEventStore, getEventStore, getSharedDb, initEventStore, openEventDb };

package/server/{event-store-BVnON3vf.js → event-store-tdiY5eDZ.js}

@@ -1,7 +1,7 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { ei as getOverdeckHome, ti as init_paths } from "./config-yaml-Ciyp2mYe.js";
+import { Br as getOverdeckHome, Vr as init_paths } from "./config-yaml-DvyMuOle.js";
 import { a as init_activity_logger, o as setActivityEventStoreProvider } from "./activity-logger-DDlOIAML.js";
-import { A as init_paths$1, d as getOverdeckDatabaseSync, f as init_infra, k as getOverdeckDatabasePath } from "./infra-DN2wSxle.js";
+import { A as init_paths$1, d as getOverdeckDatabaseSync, f as init_infra, k as getOverdeckDatabasePath } from "./infra-CzaSOgul.js";
 import { existsSync } from "node:fs";
 import { EventEmitter } from "node:events";
 import { mkdir } from "node:fs/promises";
@@ -236,4 +236,4 @@ var init_event_store = __esmMin((() => {
 //#endregion
 export { init_event_store as a, initEventStore as i, getEventStore as n, openEventDb as o, getSharedDb as r, createEventStore as t };
 
-//# sourceMappingURL=event-store-BVnON3vf.js.map
+//# sourceMappingURL=event-store-tdiY5eDZ.js.map

package/server/{events-CmERlnwn.js → events-CC1dgUpx.js}

@@ -1,6 +1,6 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Or as init_errors, Un as listProjectsSync, cr as extractPrefixSync, lr as init_issue_id, zn as init_projects } from "./config-yaml-Ciyp2mYe.js";
-import { d as init_cost_sync, f as insertCostEventSync } from "./cost-sync-DzHP6zaR.js";
+import { Jn as extractPrefixSync, Tn as init_projects, Yn as init_issue_id, kn as listProjectsSync, mr as init_errors } from "./config-yaml-DvyMuOle.js";
+import { d as init_cost_sync, f as insertCostEventSync } from "./cost-sync-C0VdGme1.js";
 import "effect";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "fs";
 import { join } from "path";
@@ -245,4 +245,4 @@ var init_events = __esmMin((() => {
 //#endregion
 export { readEventsFromLineSync as a, tailEventsSync as c, init_events as i, init_wal as l, deduplicateEventsSync as n, readEventsSync as o, getLastEventMetadataSync as r, replaceEventsFileSync as s, appendCostEventSync as t };
 
-//# sourceMappingURL=events-CmERlnwn.js.map
+//# sourceMappingURL=events-CC1dgUpx.js.map

package/server/{events-LGeUehYW.js → events-CvvGK6LT.js}

@@ -1,3 +1,3 @@
-import { i as init_events, o as readEventsSync } from "./events-CmERlnwn.js";
+import { i as init_events, o as readEventsSync } from "./events-CC1dgUpx.js";
 init_events();
 export { readEventsSync };