@overdeck/desktop 0.45.23 → 0.46.0

package/server/{deacon-nudge-log-Bjg8U4Y9.js → deacon-nudge-log-BNBebzeL.js}

@@ -1,6 +1,6 @@
-import { Vr as init_paths, xr as CONFIG_FILE } from "./config-yaml-DvyMuOle.js";
+import { Hr as CONFIG_FILE, ci as init_paths } from "./config-yaml-CmOPzmBb.js";
 import { t as require_toml } from "./toml-CeLDATih.js";
-import { n as init_build_info, t as getBuildInfo } from "./build-info-BT096lEl.js";
+import { n as init_build_info, t as getBuildInfo } from "./build-info-CuFfxZxp.js";
 import { dirname, join, relative, resolve, sep } from "node:path";
 import { homedir } from "node:os";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, statSync } from "node:fs";
@@ -78,4 +78,4 @@ function recordDeaconNudge(nudge) {
 //#endregion
 export { shouldRefuseHostDashboardPort as a, readHostDashboardApiPort as i, getDashboardIdentity as n, isNonPrimaryCheckoutRoot as r, recordDeaconNudge as t };
 
-//# sourceMappingURL=deacon-nudge-log-Bjg8U4Y9.js.map
+//# sourceMappingURL=deacon-nudge-log-BNBebzeL.js.map

package/server/deacon-pending-lifecycle-Cpk0k7Hi.js

@@ -0,0 +1,33 @@
+import { n as settlePendingLifecycleClaim, t as claimPendingLifecycleFile } from "./pending-lifecycle-claim-DEteYdS9.js";
+//#region ../../lib/cloister/deacon-pending-lifecycle.ts
+async function processPendingLifecycleForPatrol(pendingFile) {
+	const claim = await claimPendingLifecycleFile(pendingFile);
+	if (!claim) return null;
+	let pending;
+	try {
+		pending = JSON.parse(claim.raw);
+	} catch (error) {
+		await claim.discard();
+		throw error;
+	}
+	const age = Date.now() - (pending.timestamp ?? 0);
+	if (age >= 3600 * 1e3) {
+		await claim.discard();
+		console.log(`[deacon] Discarded stale pending post-merge claim (age: ${Math.round(age / 6e4)}m)`);
+		return null;
+	}
+	console.log(`[deacon] Processing pending post-merge lifecycle for ${pending.issueId} (age: ${Math.round(age / 1e3)}s)`);
+	try {
+		const { postMergeLifecycle } = await import("./merge-agent-DrXa1CpW.js");
+		await postMergeLifecycle(pending.issueId, pending.projectPath, pending.sourceBranch, { skipDeploy: true });
+		await settlePendingLifecycleClaim(claim, pending.issueId, true);
+		return `Processed pending post-merge lifecycle for ${pending.issueId}`;
+	} catch (error) {
+		await settlePendingLifecycleClaim(claim, pending.issueId, false);
+		throw error;
+	}
+}
+//#endregion
+export { processPendingLifecycleForPatrol };
+
+//# sourceMappingURL=deacon-pending-lifecycle-Cpk0k7Hi.js.map

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

@@ -1,14 +1,14 @@
-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 { D as resolveTieredExecutionEnabled, Gn as init_projects, Nt as getProjectConfigFromWorkspacePath, Pt as init_record, Rt as readIssueRecordForWorkspaceSync, T as init_tier_table, Vt as resolveProjectForIssue, Yn as listProjectsSync, ar as resolveProjectFromIssueSync, f as loadConfigSync, gn as isStatePlaneOnlyStatus, hn as init_state_plane, jt as getIssueRecordPathForWorkspace, t as init_config_yaml, zn as getProjectSync, zt as readIssueRecordSync } from "./config-yaml-CmOPzmBb.js";
+import { a as updateIssueRecordForWorkspace, i as updateIssueRecord, r as init_record_update } from "./record-update-Z0QCxmMp.js";
+import { A as listPaneValues, E as isPaneDead, H as sessionExists, M as listSessionNames, i as capturePane, w as init_tmux } from "./tmux-B1Wbxz5o.js";
+import { S as setReviewStatusSync, f as init_review_status, u as getReviewStatusSync } from "./review-status-yljtTd-q.js";
+import { A as spawnTierSupervisor, Br as init_agent_runtime, D as init_tier_supervisor, Dt as getCachedMemoryVerdict, E as deliverCommitForReview, I as init_slot_reconcile, Jt as init_spawn_prep, L as listSlotAssignments, M as broadcastCommit, N as init_tier_feed, O as loadPrdDraft, Ot as init_memory_verdict_cache, Qn as decideResumeGate, R as reconcileSlotState, St as releaseSwarmSlot, Tt as tryReserveSwarmSlot, X as messageAgent, Y as init_messaging, bt as init_concurrency, dt as spawnRun, er as getAgentResumeGateBlockReason, ft as init_termination, gt as countRunningSwarmSlotsForIssue, in as resolveTier, ir as init_agent_state, j as supervisorAgentId, k as shouldSupervise, lt as init_spawn, pt as stopAgent, qt as defaultRunWorkspace, rn as init_resolve_tier, rr as getAgentStateSync, yt as getConcurrencyLimits, zr as getAgentRuntimeSnapshot } from "./queries-DHJm7bTd.js";
+import { S 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-VHvc0Ssp.js";
+import { s as init_control_settings, u as isDeaconGloballyPausedSync } from "./control-settings-C7DUehE1.js";
+import { i as createActiveSlice, l as init_dag, n as blockingParentCount, o as getDispatchableItems } from "./dag-ombYYt4s.js";
+import { a as loadCloisterConfigSync, r as init_config } from "./config-B2IMcBxx.js";
+import { r as init_swarm_readiness, t as analyzeSwarmReadiness } from "./swarm-readiness-BV14DF5N.js";
+import { t as recordRecoveryFailure } from "./recovery-trip-eJe26h-f.js";
 import { join } from "node:path";
 import { Effect } from "effect";
 import { existsSync, readdirSync } from "fs";
@@ -488,7 +488,7 @@ async function defaultRequestIssueReview(issueId, workspacePath) {
 		autoRequeueCount: 0,
 		reviewRequestedAt: (/* @__PURE__ */ new Date()).toISOString()
 	});
-	const { spawnReviewRoleForIssue } = await import("./review-agent-DJRO8EG8.js");
+	const { spawnReviewRoleForIssue } = await import("./review-agent-CD4RCI0Y.js");
 	return Effect.runPromise(spawnReviewRoleForIssue({
 		issueId,
 		workspace: workspacePath,
@@ -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-DftYRDo8.js.map
+//# sourceMappingURL=deacon-swarm-DBxUaO-A.js.map

package/server/deacon-swarm-I2JfX5Tg.js

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

package/server/deacon.js

@@ -1,11 +1,11 @@
-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 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 { ln as init_auto_commit, sn as flushAllPendingAutoCommits } from "./config-yaml-CmOPzmBb.js";
+import { o as init_activity_logger, s as setActivityEventStoreProvider } from "./activity-logger-CyteR4JO.js";
+import { f as init_review_status, u as getReviewStatusSync } from "./review-status-yljtTd-q.js";
+import { b as init_agents, tr as getAgentState } from "./queries-DHJm7bTd.js";
+import { r as setCloisterEventStoreProvider, t as getCloisterService } from "./service-Br9rpBNA.js";
+import { i as ensureInternalTokenSync, s as init_internal_token, t as INTERNAL_TOKEN_HEADER } from "./internal-token-DvMTQSOS.js";
+import { F as setAgentStoppedNotifier, I as setMergeReadyNotifier, M as runPatrol, P as setAgentStatusChangedNotifier, j as resetPatrolHeartbeatForStartup } from "./deacon-hi9KLPLT.js";
+import { t as emitReviewStatusChanged } from "./review-status-emit-CUExtHd5.js";
 import { Effect } from "effect";
 import { randomUUID } from "node:crypto";
 //#region ../../lib/cloister/deacon-event-client.ts
@@ -284,16 +284,11 @@ setAgentStatusChangedNotifier((state, previousStatus, hasLiveTmuxSession) => {
 setMergeReadyNotifier((issueId) => {
 	const status = getReviewStatusSync(issueId);
 	if (!status) return;
-	(async () => {
-		try {
-			append(domainEvent("review.status_changed", {
-				issueId,
-				status: await Effect.runPromise(enrichReviewStatus(issueId, status))
-			}));
-		} catch (err) {
-			console.error("[deacon-child] Failed to append merge-ready event:", err);
-		}
-	})();
+	try {
+		emitReviewStatusChanged((event) => append(event), issueId, status);
+	} catch (err) {
+		console.error("[deacon-child] Failed to append merge-ready event:", err);
+	}
 });
 process.on("message", (message) => {
 	if (!message || typeof message !== "object") return;
@@ -320,7 +315,7 @@ async function shutdown(signal) {
 		console.error("[deacon-child] Cloister stop failed:", err);
 	}
 	try {
-		const { killAllGateProcessGroups } = await import("./validation-CIi6pnI2.js");
+		const { killAllGateProcessGroups } = await import("./validation-DEaTZafj.js");
 		const reaped = killAllGateProcessGroups();
 		if (reaped > 0) console.log(`[deacon-child] reaped ${reaped} in-flight gate process group(s)`);
 	} catch (err) {

package/server/dead-end-trip-CQcP70ND.js

@@ -0,0 +1,13 @@
+import { Gn as init_projects, ar as resolveProjectFromIssueSync } from "./config-yaml-CmOPzmBb.js";
+import { t as recordRecoveryFailure } from "./recovery-trip-eJe26h-f.js";
+//#region ../../lib/cloister/dead-end-trip.ts
+init_projects();
+async function recordDeadEndNeedsYou(issueId, recoveryPath, generation, message) {
+	const project = resolveProjectFromIssueSync(issueId);
+	if (!project) return void 0;
+	return (await recordRecoveryFailure(project.projectPath, issueId, recoveryPath, generation, 1)).emitNeedsYou ? message : void 0;
+}
+//#endregion
+export { recordDeadEndNeedsYou as t };
+
+//# sourceMappingURL=dead-end-trip-CQcP70ND.js.map

package/server/delivery-Da0zEMY4.js

@@ -0,0 +1,3 @@
+import { It as init_delivery, Mt as deliverAgentMessage } from "./queries-DHJm7bTd.js";
+init_delivery();
+export { deliverAgentMessage };

package/server/{deploy-patrol-Bjsho_ha.js → deploy-patrol-Df-Tmaq0.js}

@@ -1,15 +1,18 @@
-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-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 { Gr as OVERDECK_HOME, ci as init_paths } from "./config-yaml-CmOPzmBb.js";
+import { n as init_build_info, t as getBuildInfo } from "./build-info-CuFfxZxp.js";
+import { i as emitActivityTtsSync, o as init_activity_logger, r as emitActivityEntrySync } from "./activity-logger-CyteR4JO.js";
+import { a as loadCloisterConfigSync, r as init_config } from "./config-B2IMcBxx.js";
+import { i as init_staleness, r as computeBuildStaleness } from "./staleness-D47CUJok.js";
+import { t as recordDeadEndNeedsYou } from "./dead-end-trip-CQcP70ND.js";
+import { a as recordDeployIntent, i as readPendingDeploy, n as init_deploy_queue, r as markPendingDeployEscalated, t as clearPendingDeploy } from "./deploy-queue-UjKGYsDe.js";
+import { n as init_deploy_window, t as getDeployWindowAssessment } from "./deploy-window-rpqpWqHA.js";
 import { join } from "node:path";
 import { mkdir, open, writeFile } from "node:fs/promises";
 import { execFile, spawn } from "node:child_process";
 //#region ../../lib/cloister/deploy-patrol.ts
 init_activity_logger();
 init_build_info();
+init_deploy_queue();
 init_deploy_window();
 init_staleness();
 init_paths();
@@ -26,6 +29,8 @@ const state = {
 	lastDeferralReason: null,
 	lastDeferralAt: 0,
 	lastDeploySpawnAt: 0,
+	lastEscalationReason: null,
+	lastEscalationAt: 0,
 	unknownObserved: false
 };
 function reloadEnvironment(request, env) {
@@ -180,6 +185,8 @@ function clearState() {
 	state.lastDeferralReason = null;
 	state.lastDeferralAt = 0;
 	state.lastDeploySpawnAt = 0;
+	state.lastEscalationReason = null;
+	state.lastEscalationAt = 0;
 	state.unknownObserved = false;
 }
 function emitDeferral(reason, now, emitEntry) {
@@ -192,6 +199,30 @@ function emitDeferral(reason, now, emitEntry) {
 	state.lastDeferralReason = reason;
 	state.lastDeferralAt = now;
 }
+async function escalateOverdueQueue(queuedDeploy, blockReason, currentVerifyingIssues, context, now, emitEntry, emitTts) {
+	if (!queuedDeploy || queuedDeploy.escalated || now - Date.parse(queuedDeploy.requestedAt) <= context.config.queue_deadline_minutes * 6e4) return;
+	const ageMinutes = Math.floor((now - Date.parse(queuedDeploy.requestedAt)) / 6e4);
+	const message = `Queued dashboard deploy has waited ${ageMinutes} minutes; current block: ${blockReason} Stored verification blockers: ${queuedDeploy.blockedBy.length > 0 ? queuedDeploy.blockedBy.join(", ") : "none"}.`;
+	if (state.lastEscalationReason !== blockReason || now - state.lastEscalationAt >= OBSERVATION_INTERVAL_MS) {
+		emitEntry({
+			source: "deploy-script",
+			level: "error",
+			message
+		});
+		emitTts({
+			utterance: `Dashboard deploy has been queued for ${ageMinutes} minutes and needs attention.`,
+			priority: 1,
+			source: "deploy-script",
+			eventType: "deploy_queue_stuck"
+		});
+		state.lastEscalationReason = blockReason;
+		state.lastEscalationAt = now;
+	}
+	const currentVerifier = currentVerifyingIssues[0];
+	if (!currentVerifier) return;
+	await (context.recordNeedsYou ?? recordDeadEndNeedsYou)(currentVerifier, "deploy-queue", queuedDeploy.requestedAt, message);
+	await (context.markQueueEscalated ?? markPendingDeployEscalated)();
+}
 async function runDeployPatrol(context) {
 	const now = (context.now ?? Date.now)();
 	const emitEntry = context.emitEntry ?? emitActivityEntrySync;
@@ -200,19 +231,23 @@ async function runDeployPatrol(context) {
 		repoRoot: context.repoRoot,
 		buildCommit: getBuildInfo().buildCommit
 	})))();
+	const queuedDeploy = await (context.readQueue ?? readPendingDeploy)();
 	if (staleness.status === "unknown") {
+		const reason = `Automatic deployment cannot compare the running build with origin/main: ${staleness.reason ?? "build staleness is unknown"}`;
 		if (!state.unknownObserved) {
 			emitEntry({
 				source: "deploy-script",
 				level: "warn",
-				message: `Automatic deployment cannot compare the running build with origin/main: ${staleness.reason ?? "build staleness is unknown"}`
+				message: reason
 			});
 			state.unknownObserved = true;
 		}
+		await escalateOverdueQueue(queuedDeploy, reason, [], context, now, emitEntry, emitTts);
 		return;
 	}
 	if (staleness.status === "fresh") {
 		clearState();
+		await (context.clearQueue ?? clearPendingDeploy)();
 		return;
 	}
 	state.unknownObserved = false;
@@ -221,26 +256,42 @@ async function runDeployPatrol(context) {
 		emitEntry({
 			source: "deploy-script",
 			level: "warn",
-			message: `The running build ${shortSha(staleness.buildCommit)} is ${behind} build-input commit(s) behind origin/main ${shortSha(staleness.originMainSha)}. ${context.config.auto_deploy ? "Automatic deployment will start after the merge debounce and safety checks clear." : "Automatic deployment is disabled, so operator action is required."}`
+			message: `The running build ${shortSha(staleness.buildCommit)} is ${behind} build-input commit(s) behind origin/main ${shortSha(staleness.originMainSha)}. ${context.config.auto_deploy || queuedDeploy ? "Automatic deployment will start after the merge debounce and safety checks clear." : "Automatic deployment is disabled, so operator action is required."}`
 		});
 		state.lastObservedBehind = behind;
 		state.lastObservationAt = now;
 	}
-	if (!context.config.auto_deploy) 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 (!context.config.auto_deploy && !queuedDeploy) return;
+	if (staleness.originMainLastBuildInputCommitAt !== null && now - staleness.originMainLastBuildInputCommitAt < context.config.debounce_minutes * 60 * 1e3) {
+		await escalateOverdueQueue(queuedDeploy, "Automatic deployment deferred because the merge debounce has not elapsed.", [], context, now, emitEntry, emitTts);
+		return;
+	}
+	if (state.lastDeploySpawnAt > 0 && now - state.lastDeploySpawnAt < DEPLOY_SPAWN_COOLDOWN_MS) {
+		await escalateOverdueQueue(queuedDeploy, "Automatic deployment deferred because a recent deploy is still inside the spawn cooldown.", [], context, now, emitEntry, emitTts);
+		return;
+	}
 	if (!staleness.originMainSha) {
-		emitDeferral("Automatic deployment deferred because the origin/main commit is unknown.", now, emitEntry);
+		const reason = "Automatic deployment deferred because the origin/main commit is unknown.";
+		emitDeferral(reason, now, emitEntry);
+		await escalateOverdueQueue(queuedDeploy, reason, [], context, now, emitEntry, emitTts);
 		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);
+		const reason = ciState.reason ?? `Automatic deployment deferred because CI is ${ciState.status} for origin/main ${shortSha(staleness.originMainSha)}.`;
+		emitDeferral(reason, now, emitEntry);
+		await escalateOverdueQueue(queuedDeploy, reason, [], context, now, emitEntry, emitTts);
 		return;
 	}
-	const blockReason = await (context.getBlockReason ?? getDeployBlockReason)();
-	if (blockReason) {
-		emitDeferral(blockReason, now, emitEntry);
+	const assessment = await (context.getWindowAssessment ?? getDeployWindowAssessment)();
+	if (assessment.reason) {
+		emitDeferral(assessment.reason, now, emitEntry);
+		if (context.config.auto_deploy) await (context.recordIntent ?? recordDeployIntent)({
+			requestedBy: DEPLOY_PATROL_INITIATOR,
+			reason: assessment.reason,
+			blockedBy: assessment.verifyingIssues
+		});
+		await escalateOverdueQueue(queuedDeploy, assessment.reason, assessment.verifyingIssues, context, now, emitEntry, emitTts);
 		return;
 	}
 	const reloadRequest = {
@@ -262,7 +313,7 @@ async function runDeployPatrol(context) {
 	emitEntry({
 		source: "deploy-script",
 		level: "info",
-		message: `Automatic deployment started for origin/main ${shortSha(staleness.originMainSha)}; the dashboard will rebuild and restart with a 120-second health timeout.`
+		message: `Automatic deployment started for origin/main ${shortSha(staleness.originMainSha)}; the dashboard will rebuild and restart with a 120-second health timeout.${queuedDeploy ? ` This was a queued deploy requested by ${queuedDeploy.requestedBy.join(", ")}.` : ""}`
 	});
 	emitTts({
 		utterance: "Automatic dashboard deployment started.",
@@ -285,4 +336,4 @@ async function runScheduledDeployPatrol() {
 //#endregion
 export { runScheduledDeployPatrol };
 
-//# sourceMappingURL=deploy-patrol-Bjsho_ha.js.map
+//# sourceMappingURL=deploy-patrol-Df-Tmaq0.js.map

package/server/deploy-queue-9SrhZR63.js

@@ -0,0 +1,3 @@
+import { a as recordDeployIntent, n as init_deploy_queue } from "./deploy-queue-UjKGYsDe.js";
+init_deploy_queue();
+export { recordDeployIntent };

package/server/deploy-queue-UjKGYsDe.js

@@ -0,0 +1,169 @@
+import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
+import { ci as init_paths, si as getOverdeckHome } from "./config-yaml-CmOPzmBb.js";
+import { dirname, join } from "node:path";
+import { mkdir, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
+//#region ../../lib/deploy/deploy-queue.ts
+function pendingDeployPath(options = {}) {
+	return join(options.overdeckHome ?? getOverdeckHome(), "pending-deploy.json");
+}
+function pendingDeployLockPath(options = {}) {
+	return join(options.overdeckHome ?? getOverdeckHome(), "pending-deploy.lock");
+}
+function isStringArray(value) {
+	return Array.isArray(value) && value.every((entry) => typeof entry === "string");
+}
+function isPendingDeploy(value) {
+	if (!value || typeof value !== "object") return false;
+	const candidate = value;
+	return typeof candidate.requestedAt === "string" && isStringArray(candidate.requestedBy) && typeof candidate.lastReason === "string" && isStringArray(candidate.blockedBy) && Number.isInteger(candidate.deferralCount) && candidate.deferralCount >= 1 && typeof candidate.escalated === "boolean";
+}
+function sortedUnion(values) {
+	return [...new Set(values)].sort();
+}
+function isProcessDead(pid) {
+	if (!pid || pid <= 0 || pid === process.pid) return false;
+	try {
+		process.kill(pid, 0);
+		return false;
+	} catch (error) {
+		return error.code === "ESRCH";
+	}
+}
+async function removeStaleLock(lockPath) {
+	try {
+		const owner = JSON.parse(await readFile(join(lockPath, "owner.json"), "utf8"));
+		const acquiredAt = owner.acquiredAt ? Date.parse(owner.acquiredAt) : NaN;
+		if (!isProcessDead(owner.pid) && Number.isFinite(acquiredAt) && Date.now() - acquiredAt <= STALE_LOCK_MS) return false;
+	} catch {
+		try {
+			const lockStat = await stat(lockPath);
+			if (Date.now() - lockStat.mtimeMs <= STALE_LOCK_MS) return false;
+		} catch {
+			return true;
+		}
+	}
+	await rm(lockPath, {
+		recursive: true,
+		force: true
+	});
+	return true;
+}
+async function publishQueueLock(lockPath) {
+	lockPublicationId += 1;
+	const tempPath = `${lockPath}.${process.pid}.${Date.now()}.${lockPublicationId}.tmp`;
+	await mkdir(tempPath);
+	try {
+		await writeFile(join(tempPath, "owner.json"), JSON.stringify({
+			pid: process.pid,
+			acquiredAt: (/* @__PURE__ */ new Date()).toISOString()
+		}));
+		try {
+			await rename(tempPath, lockPath);
+			return true;
+		} catch (error) {
+			const code = error.code;
+			if (code === "EEXIST" || code === "ENOTEMPTY") return false;
+			throw error;
+		}
+	} finally {
+		await rm(tempPath, {
+			recursive: true,
+			force: true
+		});
+	}
+}
+async function acquireQueueLock(options) {
+	const path = pendingDeployPath(options);
+	const lockPath = pendingDeployLockPath(options);
+	await mkdir(dirname(path), { recursive: true });
+	for (let attempt = 0; attempt <= LOCK_RETRY_DELAYS_MS.length; attempt += 1) {
+		if (await publishQueueLock(lockPath)) return lockPath;
+		if (await removeStaleLock(lockPath)) continue;
+		const delay = LOCK_RETRY_DELAYS_MS[attempt];
+		if (delay === void 0) break;
+		await new Promise((resolve) => setTimeout(resolve, delay));
+	}
+	throw new Error(`Timed out waiting for deploy queue lock ${lockPath}`);
+}
+async function withQueueLock(options, operation) {
+	const lockPath = await acquireQueueLock(options);
+	try {
+		return await operation();
+	} finally {
+		await rm(lockPath, {
+			recursive: true,
+			force: true
+		});
+	}
+}
+async function writePendingDeploy(record, options = {}) {
+	const path = pendingDeployPath(options);
+	await mkdir(dirname(path), { recursive: true });
+	const temp = `${path}.${process.pid}.tmp`;
+	await writeFile(temp, `${JSON.stringify(record, null, 2)}\n`);
+	await rename(temp, path);
+}
+async function readPendingDeploy(options = {}) {
+	try {
+		const parsed = JSON.parse(await readFile(pendingDeployPath(options), "utf8"));
+		return isPendingDeploy(parsed) ? parsed : null;
+	} catch {
+		return null;
+	}
+}
+async function recordDeployIntent(intent, options = {}) {
+	return withQueueLock(options, async () => {
+		const existing = await readPendingDeploy(options);
+		const record = existing ? {
+			...existing,
+			requestedBy: sortedUnion([...existing.requestedBy, intent.requestedBy]),
+			lastReason: intent.reason,
+			blockedBy: sortedUnion([...existing.blockedBy, ...intent.blockedBy]),
+			deferralCount: existing.deferralCount + 1
+		} : {
+			requestedAt: (/* @__PURE__ */ new Date()).toISOString(),
+			requestedBy: [intent.requestedBy],
+			lastReason: intent.reason,
+			blockedBy: sortedUnion(intent.blockedBy),
+			deferralCount: 1,
+			escalated: false
+		};
+		await writePendingDeploy(record, options);
+		return record;
+	});
+}
+async function clearPendingDeploy(options = {}) {
+	await withQueueLock(options, async () => {
+		await rm(pendingDeployPath(options), { force: true });
+	});
+}
+async function markPendingDeployEscalated(options = {}) {
+	await withQueueLock(options, async () => {
+		const existing = await readPendingDeploy(options);
+		if (!existing) return;
+		await writePendingDeploy({
+			...existing,
+			escalated: true
+		}, options);
+	});
+}
+var LOCK_RETRY_DELAYS_MS, STALE_LOCK_MS, lockPublicationId;
+var init_deploy_queue = __esmMin((() => {
+	init_paths();
+	LOCK_RETRY_DELAYS_MS = [
+		5,
+		10,
+		20,
+		40,
+		80,
+		160,
+		320,
+		360
+	];
+	STALE_LOCK_MS = 3e4;
+	lockPublicationId = 0;
+}));
+//#endregion
+export { recordDeployIntent as a, readPendingDeploy as i, init_deploy_queue as n, markPendingDeployEscalated as r, clearPendingDeploy as t };
+
+//# sourceMappingURL=deploy-queue-UjKGYsDe.js.map

package/server/deploy-window-jOiPRHL0.js

@@ -0,0 +1,3 @@
+import { n as init_deploy_window, t as getDeployWindowAssessment } from "./deploy-window-rpqpWqHA.js";
+init_deploy_window();
+export { getDeployWindowAssessment };

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

@@ -1,9 +1,9 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.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 { ci as init_paths, si as getOverdeckHome } from "./config-yaml-CmOPzmBb.js";
+import { H as sessionExists, w as init_tmux } from "./tmux-B1Wbxz5o.js";
+import { f as init_review_status, m as loadReviewStatuses } from "./review-status-yljtTd-q.js";
+import { i as getFlywheelActiveRunId, s as init_control_settings } from "./control-settings-C7DUehE1.js";
+import { n as readDevSupervisorMarker, t as init_dev_supervisor } from "./dev-supervisor-CC46Ig8q.js";
 import { join } from "node:path";
 import { Data, Effect } from "effect";
 import { access, open, readFile, unlink } from "node:fs/promises";
@@ -113,21 +113,45 @@ var init_restart_lock = __esmMin((() => {
 }));
 //#endregion
 //#region ../../lib/deploy/deploy-window.ts
-async function getDeployBlockReason(dependencies = {}) {
+function listVerifyingIssues(loadStatuses = loadReviewStatuses) {
+	return Object.entries(loadStatuses()).filter(([, status]) => status.verificationStatus === "running" && status.mergeStatus !== "merged").map(([issueId]) => issueId).sort();
+}
+async function getDeployWindowAssessment(dependencies = {}) {
 	const deps = {
 		...defaultDependencies,
 		...dependencies
 	};
-	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 verifyingIssues = listVerifyingIssues(deps.loadReviewStatuses);
+	if (verifyingIssues.length > 0) return {
+		reason: `Deployment deferred because verification is in flight for ${verifyingIssues.join(", ")}.`,
+		verifyingIssues
+	};
 	const activeFlywheelRunId = deps.getFlywheelActiveRunId();
-	if (activeFlywheelRunId) return `Deployment deferred because flywheel run ${activeFlywheelRunId} owns deployment.`;
-	if (await deps.isMergeAgentRunning()) return "Deployment deferred because a merge specialist session is active.";
-	if (await deps.pendingPostMergeExists()) return "Deployment deferred because the post-merge lifecycle is pending.";
+	if (activeFlywheelRunId) return {
+		reason: `Deployment deferred because flywheel run ${activeFlywheelRunId} owns deployment.`,
+		verifyingIssues
+	};
+	if (await deps.isMergeAgentRunning()) return {
+		reason: "Deployment deferred because a merge specialist session is active.",
+		verifyingIssues
+	};
+	if (await deps.pendingPostMergeExists()) return {
+		reason: "Deployment deferred because the post-merge lifecycle is pending.",
+		verifyingIssues
+	};
 	const restartLock = await deps.readRestartLockHolder();
-	if (restartLock) return `Deployment deferred because a restart is already in progress (pid ${restartLock.pid}, ${restartLock.caller}).`;
-	if (deps.readDevSupervisorMarker()) return "Deployment deferred because a pan dev session owns the dashboard.";
-	return null;
+	if (restartLock) return {
+		reason: `Deployment deferred because a restart is already in progress (pid ${restartLock.pid}, ${restartLock.caller}).`,
+		verifyingIssues
+	};
+	if (deps.readDevSupervisorMarker()) return {
+		reason: "Deployment deferred because a pan dev session owns the dashboard.",
+		verifyingIssues
+	};
+	return {
+		reason: null,
+		verifyingIssues
+	};
 }
 var defaultDependencies;
 var init_deploy_window = __esmMin((() => {
@@ -154,6 +178,6 @@ var init_deploy_window = __esmMin((() => {
 	};
 }));
 //#endregion
-export { init_deploy_window as n, getDeployBlockReason as t };
+export { init_deploy_window as n, listVerifyingIssues as r, getDeployWindowAssessment as t };
 
-//# sourceMappingURL=deploy-window-DeP_OIRk.js.map
+//# sourceMappingURL=deploy-window-rpqpWqHA.js.map

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

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Br as getOverdeckHome, Vr as init_paths } from "./config-yaml-DvyMuOle.js";
+import { ci as init_paths, si as getOverdeckHome } from "./config-yaml-CmOPzmBb.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-BpMoHlkR.js.map
+//# sourceMappingURL=dev-supervisor-CC46Ig8q.js.map

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

@@ -1,6 +1,6 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.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 { Fr as init_errors } from "./config-yaml-CmOPzmBb.js";
+import { n as init_workspace_config, r as replacePlaceholdersSync } from "./workspace-config-B123aZl-.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-CtUgrVKW.js.map
+//# sourceMappingURL=devcontainer-renderer-68CSCRnu.js.map

package/server/{dist-DyRx4cI7.js → dist-CJy72uEg.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-DyRx4cI7.js.map
+//# sourceMappingURL=dist-CJy72uEg.js.map

package/server/dist-DSlxIU1H.js

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