@overdeck/desktop 0.47.1 → 0.48.0

package/server/deacon-event-client-C93rvOT7.js

@@ -0,0 +1,237 @@
+import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
+import { i as ensureInternalTokenSync, s as init_internal_token, t as INTERNAL_TOKEN_HEADER } from "./internal-token-AvXePaQT.js";
+//#region ../../lib/cloister/deacon-event-client.ts
+function internalDashboardOrigin() {
+	const port = Number.parseInt(process.env["API_PORT"] ?? process.env["PORT"] ?? "3011", 10);
+	return process.env["OVERDECK_INTERNAL_DASHBOARD_URL"] ?? `http://127.0.0.1:${port}`;
+}
+function createDeaconEventClient(options = {}) {
+	const dashboardUrl = options.dashboardUrl ?? internalDashboardOrigin();
+	const fetchImpl = options.fetchImpl ?? fetch;
+	const warn = options.warn ?? ((message) => console.warn(message));
+	const batchSize = options.batchSize ?? DEFAULT_BATCH_SIZE;
+	const debounceMs = options.debounceMs ?? DEFAULT_DEBOUNCE_MS;
+	const maxBufferSize = options.maxBufferSize ?? DEFAULT_MAX_BUFFER_SIZE;
+	const baseRetryMs = options.baseRetryMs ?? DEFAULT_BASE_RETRY_MS;
+	const maxRetryMs = options.maxRetryMs ?? DEFAULT_MAX_RETRY_MS;
+	const appendOnceTimeoutMs = options.appendOnceTimeoutMs ?? DEFAULT_APPEND_ONCE_TIMEOUT_MS;
+	const queue = [];
+	let timer = null;
+	let inFlight = false;
+	let retryMs = baseRetryMs;
+	let dropped = 0;
+	const schedule = (delayMs) => {
+		if (timer) clearTimeout(timer);
+		timer = setTimeout(() => {
+			timer = null;
+			flushNow();
+		}, delayMs);
+	};
+	const enqueue = (event) => {
+		while (queue.length >= maxBufferSize) {
+			queue.shift();
+			dropped++;
+		}
+		if (dropped > 0) {
+			warn(`[deacon-event-client] buffer overflow: dropped ${dropped} oldest event${dropped === 1 ? "" : "s"}`);
+			dropped = 0;
+		}
+		queue.push(event);
+		if (queue.length >= batchSize) schedule(0);
+		else if (!timer) schedule(debounceMs);
+	};
+	async function flushNow() {
+		if (inFlight || queue.length === 0) return;
+		inFlight = true;
+		const batch = queue.slice(0, batchSize);
+		try {
+			const token = options.token ?? ensureInternalTokenSync();
+			const response = await fetchImpl(new URL("/api/internal/events", dashboardUrl), {
+				method: "POST",
+				headers: {
+					"content-type": "application/json",
+					origin: dashboardUrl,
+					[INTERNAL_TOKEN_HEADER]: token
+				},
+				body: JSON.stringify({ events: batch })
+			});
+			if (!response.ok) throw new Error(`HTTP ${response.status}`);
+			queue.splice(0, batch.length);
+			retryMs = baseRetryMs;
+			if (queue.length > 0) schedule(queue.length >= batchSize ? 0 : debounceMs);
+		} catch (error) {
+			warn(`[deacon-event-client] failed to flush events: ${error instanceof Error ? error.message : String(error)}; retrying in ${retryMs}ms`);
+			schedule(retryMs);
+			retryMs = Math.min(retryMs * 2, maxRetryMs);
+		} finally {
+			inFlight = false;
+		}
+	}
+	async function fetchJson(url, signal) {
+		const token = options.token ?? ensureInternalTokenSync();
+		const response = await fetchImpl(url, {
+			signal,
+			headers: {
+				[INTERNAL_TOKEN_HEADER]: token,
+				origin: dashboardUrl
+			}
+		});
+		if (!response.ok) throw new Error(`HTTP ${response.status}`);
+		return response.json();
+	}
+	async function fetchLatestSequence(signal) {
+		const body = await fetchJson(new URL("/api/internal/events/latest", dashboardUrl), signal);
+		return typeof body.latestSequence === "number" && Number.isFinite(body.latestSequence) && body.latestSequence >= 0 ? body.latestSequence : 0;
+	}
+	function parseStreamFrame(frame) {
+		const dataLines = [];
+		for (const line of frame.split(/\r?\n/)) {
+			if (!line.startsWith("data:")) continue;
+			dataLines.push(line.slice(5).replace(/^\s/, ""));
+		}
+		if (dataLines.length === 0) return null;
+		try {
+			const parsed = JSON.parse(dataLines.join("\n"));
+			if (!parsed || typeof parsed !== "object") return null;
+			const record = parsed;
+			if (typeof record.sequence !== "number" || typeof record.type !== "string" || typeof record.timestamp !== "string") return null;
+			return {
+				sequence: record.sequence,
+				type: record.type,
+				timestamp: record.timestamp,
+				payload: record.payload
+			};
+		} catch {
+			return null;
+		}
+	}
+	return {
+		append(event) {
+			enqueue(event);
+			return 0;
+		},
+		appendAsync(event) {
+			enqueue(event);
+			return Promise.resolve(0);
+		},
+		async appendOnce(event, idempotencyKey) {
+			const controller = new AbortController();
+			const deadline = setTimeout(() => controller.abort(), appendOnceTimeoutMs);
+			try {
+				const token = options.token ?? ensureInternalTokenSync();
+				const response = await fetchImpl(new URL("/api/internal/events/append-once", dashboardUrl), {
+					method: "POST",
+					headers: {
+						"content-type": "application/json",
+						origin: dashboardUrl,
+						[INTERNAL_TOKEN_HEADER]: token
+					},
+					body: JSON.stringify({
+						event,
+						idempotencyKey
+					}),
+					signal: controller.signal
+				});
+				if (!response.ok) return "failed";
+				const body = await response.json();
+				return body.outcome === "appended" || body.outcome === "duplicate" ? body.outcome : "failed";
+			} catch {
+				return "failed";
+			} finally {
+				clearTimeout(deadline);
+			}
+		},
+		subscribe(fn) {
+			let active = true;
+			let cursor = -1;
+			let pollTimer = null;
+			let connectInFlight = false;
+			let reconnectMs = baseRetryMs;
+			let abortController = null;
+			const clearPollTimer = () => {
+				if (pollTimer) clearTimeout(pollTimer);
+				pollTimer = null;
+			};
+			const schedulePoll = (delayMs) => {
+				if (!active) return;
+				clearPollTimer();
+				pollTimer = setTimeout(() => {
+					pollTimer = null;
+					connect();
+				}, delayMs);
+			};
+			const connect = async () => {
+				if (!active || connectInFlight) return;
+				connectInFlight = true;
+				abortController?.abort();
+				abortController = new AbortController();
+				try {
+					if (cursor < 0) cursor = await fetchLatestSequence(abortController.signal);
+					const url = new URL("/api/internal/events/stream", dashboardUrl);
+					url.searchParams.set("since", String(cursor));
+					const response = await fetchImpl(url, {
+						signal: abortController.signal,
+						headers: {
+							[INTERNAL_TOKEN_HEADER]: options.token ?? ensureInternalTokenSync(),
+							origin: dashboardUrl
+						}
+					});
+					if (!response.ok) throw new Error(`HTTP ${response.status}`);
+					if (!response.body) throw new Error("missing response body");
+					reconnectMs = baseRetryMs;
+					const reader = response.body.getReader();
+					const decoder = new TextDecoder();
+					let buffer = "";
+					while (active) {
+						const { value, done } = await reader.read();
+						if (done) break;
+						buffer += decoder.decode(value, { stream: true });
+						let frameEnd = buffer.indexOf("\n\n");
+						while (frameEnd >= 0) {
+							const frame = buffer.slice(0, frameEnd);
+							buffer = buffer.slice(frameEnd + 2);
+							const event = parseStreamFrame(frame);
+							if (event) {
+								fn(event);
+								if (event.sequence > cursor) cursor = event.sequence;
+							}
+							frameEnd = buffer.indexOf("\n\n");
+						}
+					}
+					if (!active) return;
+					schedulePoll(debounceMs);
+				} catch (error) {
+					if (!active) return;
+					warn(`[deacon-event-client] failed to subscribe to events: ${error instanceof Error ? error.message : String(error)}; retrying in ${reconnectMs}ms`);
+					schedulePoll(reconnectMs);
+					reconnectMs = Math.min(reconnectMs * 2, maxRetryMs);
+				} finally {
+					connectInFlight = false;
+				}
+			};
+			connect();
+			return () => {
+				active = false;
+				clearPollTimer();
+				abortController?.abort();
+				abortController = null;
+			};
+		},
+		flushNow,
+		bufferedCount: () => queue.length
+	};
+}
+var DEFAULT_BATCH_SIZE, DEFAULT_DEBOUNCE_MS, DEFAULT_MAX_BUFFER_SIZE, DEFAULT_BASE_RETRY_MS, DEFAULT_MAX_RETRY_MS, DEFAULT_APPEND_ONCE_TIMEOUT_MS;
+var init_deacon_event_client = __esmMin((() => {
+	init_internal_token();
+	DEFAULT_BATCH_SIZE = 50;
+	DEFAULT_DEBOUNCE_MS = 250;
+	DEFAULT_MAX_BUFFER_SIZE = 1e3;
+	DEFAULT_BASE_RETRY_MS = 1e3;
+	DEFAULT_MAX_RETRY_MS = 3e4;
+	DEFAULT_APPEND_ONCE_TIMEOUT_MS = 1e4;
+}));
+//#endregion
+export { init_deacon_event_client as n, createDeaconEventClient as t };
+
+//# sourceMappingURL=deacon-event-client-C93rvOT7.js.map

package/server/deacon-event-client-Ck5Ei7Mn.js

@@ -0,0 +1,3 @@
+import { n as init_deacon_event_client, t as createDeaconEventClient } from "./deacon-event-client-C93rvOT7.js";
+init_deacon_event_client();
+export { createDeaconEventClient };

package/server/{deacon-nudge-log-DPHsO14z.js → deacon-nudge-log-BND_97Wo.js}

@@ -1,6 +1,6 @@
-import { Hr as CONFIG_FILE, li as init_paths } from "./config-yaml-CxdwhAIA.js";
+import { Jr as CONFIG_FILE, hi as init_paths } from "./config-yaml-BSCqwmX0.js";
 import { t as require_toml } from "./toml-CeLDATih.js";
-import { n as init_build_info, t as getBuildInfo } from "./build-info-D0q_i8WM.js";
+import { n as init_build_info, t as getBuildInfo } from "./build-info-CJg813Hm.js";
 import { dirname, join, relative, resolve, sep } from "node:path";
 import { homedir } from "node:os";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, statSync } from "node:fs";
@@ -13,6 +13,7 @@ function getDashboardIdentity() {
 	return {
 		repoRoot: resolve(cwd()),
 		mode: process.env.OVERDECK_DISABLE_DEACON === "1" ? "peer" : "primary",
+		pid: process.pid,
 		...getBuildInfo()
 	};
 }
@@ -78,4 +79,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-DPHsO14z.js.map
+//# sourceMappingURL=deacon-nudge-log-BND_97Wo.js.map

package/server/{deacon-pending-lifecycle-2ZflPxgo.js → deacon-pending-lifecycle-CD3YsiQK.js}

@@ -1,4 +1,4 @@
-import { n as settlePendingLifecycleClaim, t as claimPendingLifecycleFile } from "./pending-lifecycle-claim-DQUHIDfX.js";
+import { n as settlePendingLifecycleClaim, t as claimPendingLifecycleFile } from "./pending-lifecycle-claim-DJlA1rTR.js";
 //#region ../../lib/cloister/deacon-pending-lifecycle.ts
 async function processPendingLifecycleForPatrol(pendingFile) {
 	const claim = await claimPendingLifecycleFile(pendingFile);
@@ -18,7 +18,7 @@ async function processPendingLifecycleForPatrol(pendingFile) {
 	}
 	console.log(`[deacon] Processing pending post-merge lifecycle for ${pending.issueId} (age: ${Math.round(age / 1e3)}s)`);
 	try {
-		const { postMergeLifecycle } = await import("./merge-agent-C1-9zbP_.js");
+		const { postMergeLifecycle } = await import("./merge-agent-DWd0KfiS.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}`;
@@ -30,4 +30,4 @@ async function processPendingLifecycleForPatrol(pendingFile) {
 //#endregion
 export { processPendingLifecycleForPatrol };
 
-//# sourceMappingURL=deacon-pending-lifecycle-2ZflPxgo.js.map
+//# sourceMappingURL=deacon-pending-lifecycle-CD3YsiQK.js.map

package/server/deacon-swarm-DgWADWd_.js

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

package/server/{deacon-swarm-DwGUgSVp.js → deacon-swarm-rqrl4TMs.js}

@@ -1,15 +1,15 @@
-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-CxdwhAIA.js";
-import { a as updateIssueRecordForWorkspace, i as updateIssueRecord, r as init_record_update } from "./record-update-DaOKS7Wb.js";
-import { A as listPaneValues, E as isPaneDead, H as sessionExists, M as listSessionNames, i as capturePane, w as init_tmux } from "./tmux-CfDHob9M.js";
-import { C as setReviewStatusSync, d as getReviewStatusSync, p as init_review_status } from "./review-status-CwhA9wmd.js";
-import { A as spawnTierSupervisor, D as init_tier_supervisor, Dt as getCachedMemoryVerdict, E as deliverCommitForReview, Hr as init_agent_runtime, 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, Vr as getAgentRuntimeSnapshot, 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 } from "./queries-DCX27GRr.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-C0NV7y6C.js";
-import { c as init_control_settings, d as isDeaconGloballyPausedSync } from "./control-settings-qYYHrIqy.js";
-import { i as createActiveSlice, l as init_dag, n as blockingParentCount, o as getDispatchableItems } from "./dag-5QlmH0oC.js";
-import { a as loadCloisterConfigSync, r as init_config } from "./config-ktAVnp4s.js";
-import { r as init_swarm_readiness, t as analyzeSwarmReadiness } from "./swarm-readiness-MNE5O8hn.js";
-import { t as recordRecoveryFailure } from "./recovery-trip-D-wM9EfB.js";
-import { join } from "node:path";
+import { D as resolveTieredExecutionEnabled, K as getProjectConfigFromWorkspacePath, Nt as isStatePlaneOnlyStatus, Q as readIssueRecordSync, Sn as resolveProjectFromIssueSync, T as init_tier_table, W as getIssueRecordPathForWorkspace, Z as readIssueRecordForWorkspaceSync, cn as init_projects, et as resolveProjectForIssue, f as loadConfigSync, fn as listProjectsSync, kt as init_state_plane, nn as getProjectSync, q as init_record, t as init_config_yaml } from "./config-yaml-BSCqwmX0.js";
+import { a as updateIssueRecordForWorkspace, i as updateIssueRecord, r as init_record_update } from "./record-update-CZh46a2f.js";
+import { C as init_tmux, T as isPaneDead, V as sessionExists, j as listSessionNames, k as listPaneValues, r as capturePane } from "./tmux-CImZaX4q.js";
+import { C as setReviewStatusSync, d as getReviewStatusSync, p as init_review_status } from "./review-status-CKLk5aZ-.js";
+import { A as spawnTierSupervisor, Bt as tryReserveSwarmSlot, D as init_tier_supervisor, Dt as init_termination, E as deliverCommitForReview, Et as spawnRun, Ft as init_concurrency, Ht as getCachedMemoryVerdict, I as init_slot_reconcile, L as listSlotAssignments, Lt as releaseSwarmSlot, M as broadcastCommit, N as init_tier_feed, O as loadPrdDraft, Ot as stopAgent, Pt as getConcurrencyLimits, R as reconcileSlotState, U as detectPendingOperatorDecision, Ut as init_memory_verdict_cache, W as init_pending_decision_gate, _r as getAgentResumeGateBlockReason, ai as init_agent_runtime, bn as resolveTier, br as getAgentStateSync, dt as init_messaging, ft as messageAgent, gr as getAgentDir, hr as decideResumeGate, ii as getAgentRuntimeSnapshot, j as supervisorAgentId, jt as countRunningSwarmSlotsForIssue, k as shouldSupervise, ln as defaultRunWorkspace, un as init_spawn_prep, wt as init_spawn, xr as init_agent_state, yn as init_resolve_tier } from "./queries-DVpl1vsU.js";
+import { C as init_specs, S as findSpecByIssue, b as subItemsOf, f as readPlanSync, i as findPlanSync, n as applyStatusOverrides, s as init_io, y as init_types } from "./io-mxOWMZ7I.js";
+import { c as init_control_settings, d as isDeaconGloballyPausedSync } from "./control-settings-DVf6pKyv.js";
+import { i as createActiveSlice, l as init_dag, n as blockingParentCount, o as getDispatchableItems } from "./dag-BYiFMqpU.js";
+import { a as loadCloisterConfigSync, r as init_config } from "./config-DvM8jtQK.js";
+import { r as init_swarm_readiness, t as analyzeSwarmReadiness } from "./swarm-readiness-vTw1kqGa.js";
+import { i as recordRecoveryFailure, r as init_recovery_trip, t as acknowledgeRecoveryTrip } from "./recovery-trip-CSNWSLDn.js";
+import { basename, join } from "node:path";
 import { Effect } from "effect";
 import { existsSync, readdirSync } from "fs";
 import { join as join$1 } from "path";
@@ -488,7 +488,7 @@ async function defaultRequestIssueReview(issueId, workspacePath) {
 		autoRequeueCount: 0,
 		reviewRequestedAt: (/* @__PURE__ */ new Date()).toISOString()
 	});
-	const { spawnReviewRoleForIssue } = await import("./review-agent-UpAM4DmT.js");
+	const { spawnReviewRoleForIssue } = await import("./review-agent-CD3RQ-tc.js");
 	return Effect.runPromise(spawnReviewRoleForIssue({
 		issueId,
 		workspace: workspacePath,
@@ -707,6 +707,7 @@ async function fireTieredCommitHooks(options, deps = defaultDeps$1) {
 }
 //#endregion
 //#region ../../lib/cloister/redrive-gate.ts
+init_recovery_trip();
 /**
 * PAN-2543 shared autonomous re-drive gate.
 *
@@ -715,6 +716,7 @@ async function fireTieredCommitHooks(options, deps = defaultDeps$1) {
 * Callers still reserve their role-specific concurrency slot after admission.
 */
 init_agent_state();
+init_pending_decision_gate();
 function decideAutonomousRedrive(state, context = {}) {
 	const gateDecision = decideResumeGate(getAgentResumeGateBlockReason(state), "autonomous", context);
 	if (gateDecision.decision !== "proceed") return {
@@ -732,11 +734,20 @@ function decideAutonomousRedrive(state, context = {}) {
 		gateDecision
 	};
 }
-function decideAgentAutonomousRedrive(state, agentDir, owesRework) {
-	return decideAutonomousRedrive(state, {
+async function decideAgentAutonomousRedrive(state, agentDir, owesRework, deps = {}) {
+	const admission = decideAutonomousRedrive(state, {
 		hasCompletedHandoff: existsSync$1(join(agentDir, "completed")) || existsSync$1(join(agentDir, "completed.processed")),
 		owesRework
 	});
+	if (admission.decision === "defer") return admission;
+	const agentId = basename(agentDir);
+	const pendingDecision = await (deps.detectPendingOperatorDecision ?? detectPendingOperatorDecision)(agentId);
+	if (pendingDecision) return {
+		decision: "defer",
+		reason: `agent is waiting on an operator decision (${pendingDecision.reason})`,
+		needsYou: true
+	};
+	return admission;
 }
 //#endregion
 //#region ../../lib/cloister/swarm-failed-slot.ts
@@ -776,16 +787,26 @@ async function archiveFailedSwarmSlot(issueId, workspacePath, slot, deps, now =
 async function requeueFailedSwarmSlots(issueId, workspacePath, classified, doc, reconciled, deps, blockedSlotIndexes = /* @__PURE__ */ new Set()) {
 	let nextDoc = doc;
 	const actions = [];
+	const decideAgentRedrive = deps.decideAgentAutonomousRedrive ?? decideAgentAutonomousRedrive;
+	const decideUnownedRedrive = deps.decideAutonomousRedrive ?? decideAutonomousRedrive;
+	const recordFailure = deps.recordRecoveryFailure ?? recordRecoveryFailure;
+	const acknowledgeTrip = deps.acknowledgeRecoveryTrip ?? acknowledgeRecoveryTrip;
 	for (const slot of classified.filter((candidate) => candidate.lifecycle === "failed")) {
 		if (blockedSlotIndexes.has(slot.slotIndex)) {
 			actions.push(`[swarm] skipped requeue slot ${slot.slotIndex} (item ${slot.itemId}) for ${issueId}: failed-merge block — awaiting operator recovery`);
 			continue;
 		}
-		const admission = decideAutonomousRedrive(slot.agentId ? getAgentStateSync(slot.agentId) ?? {} : {}, { owesRework: true });
+		const pendingDecisionRecoveryPath = "swarm-slot-pending-operator-decision";
+		const pendingDecisionGeneration = `${slot.itemId}:${slot.agentId ?? `slot-${slot.slotIndex}`}`;
+		const admission = slot.agentId ? await decideAgentRedrive(getAgentStateSync(slot.agentId) ?? {}, getAgentDir(slot.agentId), true) : decideUnownedRedrive({}, { owesRework: true });
 		if (admission.decision === "defer") {
+			if (admission.needsYou) {
+				if ((await recordFailure(workspacePath, issueId, pendingDecisionRecoveryPath, pendingDecisionGeneration, 1)).emitNeedsYou) actions.push(`[swarm] needs-you ${issueId}: failed slot ${slot.slotIndex} ${admission.reason}`);
+			}
 			actions.push(`[swarm] deferred failed slot ${slot.slotIndex}: ${admission.reason}`);
 			continue;
 		}
+		await acknowledgeTrip(workspacePath, issueId, pendingDecisionRecoveryPath, pendingDecisionGeneration);
 		const attempt = await archiveFailedSwarmSlot(issueId, workspacePath, slot, deps);
 		await deps.applyTaskOperationToPlanFile(issueId, {
 			type: "unblock",
@@ -806,7 +827,7 @@ async function requeueFailedSwarmSlots(issueId, workspacePath, classified, doc,
 			}
 		};
 		actions.push(`[swarm] archived failed slot ${slot.slotIndex} (item ${slot.itemId}) for ${issueId}`);
-		const failure = await recordRecoveryFailure(workspacePath, issueId, "swarm-slot-requeue", slot.itemId);
+		const failure = await recordFailure(workspacePath, issueId, "swarm-slot-requeue", slot.itemId);
 		if (failure.emitNeedsYou) actions.push(`[swarm] needs-you ${issueId}: slot item ${slot.itemId} failed ${failure.trip.tripCount} times`);
 	}
 	return {
@@ -1473,4 +1494,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-DwGUgSVp.js.map
+//# sourceMappingURL=deacon-swarm-rqrl4TMs.js.map

package/server/deacon.js

@@ -1,216 +1,18 @@
-import { ln as init_auto_commit, sn as flushAllPendingAutoCommits } from "./config-yaml-CxdwhAIA.js";
-import { o as init_activity_logger, s as setActivityEventStoreProvider } from "./activity-logger-CyteR4JO.js";
-import { d as getReviewStatusSync, p as init_review_status } from "./review-status-CwhA9wmd.js";
-import { b as init_agents, tr as getAgentState } from "./queries-DCX27GRr.js";
-import { r as setCloisterEventStoreProvider, t as getCloisterService } from "./service-BzFG0Us_.js";
-import { i as ensureInternalTokenSync, s as init_internal_token, t as INTERNAL_TOKEN_HEADER } from "./internal-token-BG6yQKNL.js";
-import { F as setAgentStoppedNotifier, I as setMergeReadyNotifier, M as runPatrol, P as setAgentStatusChangedNotifier, j as resetPatrolHeartbeatForStartup } from "./deacon-B1LD5cJU.js";
-import { t as emitReviewStatusChanged } from "./review-status-emit-BPJwYcRy.js";
+import { St as init_auto_commit, bt as flushAllPendingAutoCommits } from "./config-yaml-BSCqwmX0.js";
+import { c as init_activity_logger, l as setActivityEventStoreProvider } from "./activity-logger-Co5qljIj.js";
+import { d as getReviewStatusSync, p as init_review_status } from "./review-status-CKLk5aZ-.js";
+import { b as init_agents, vr as getAgentState } from "./queries-DVpl1vsU.js";
+import { r as setCloisterEventStoreProvider, t as getCloisterService } from "./service-BFFkGsG4.js";
+import { i as ensureInternalTokenSync, s as init_internal_token } from "./internal-token-AvXePaQT.js";
+import { F as setAgentStoppedNotifier, I as setMergeReadyNotifier, M as runPatrol, P as setAgentStatusChangedNotifier, j as resetPatrolHeartbeatForStartup } from "./deacon-HdEh0Esp.js";
+import { t as emitReviewStatusChanged } from "./review-status-emit-CJ7UmEVU.js";
+import { n as init_deacon_event_client, t as createDeaconEventClient } from "./deacon-event-client-C93rvOT7.js";
 import { Effect } from "effect";
 import { randomUUID } from "node:crypto";
-//#region ../../lib/cloister/deacon-event-client.ts
+//#region deacon-main.ts
 init_activity_logger();
 init_agents();
-init_internal_token();
-const DEFAULT_BATCH_SIZE = 50;
-const DEFAULT_DEBOUNCE_MS = 250;
-const DEFAULT_MAX_BUFFER_SIZE = 1e3;
-const DEFAULT_BASE_RETRY_MS = 1e3;
-const DEFAULT_MAX_RETRY_MS = 3e4;
-function internalDashboardOrigin() {
-	const port = Number.parseInt(process.env["API_PORT"] ?? process.env["PORT"] ?? "3011", 10);
-	return process.env["OVERDECK_INTERNAL_DASHBOARD_URL"] ?? `http://127.0.0.1:${port}`;
-}
-function createDeaconEventClient(options = {}) {
-	const dashboardUrl = options.dashboardUrl ?? internalDashboardOrigin();
-	const fetchImpl = options.fetchImpl ?? fetch;
-	const warn = options.warn ?? ((message) => console.warn(message));
-	const batchSize = options.batchSize ?? DEFAULT_BATCH_SIZE;
-	const debounceMs = options.debounceMs ?? DEFAULT_DEBOUNCE_MS;
-	const maxBufferSize = options.maxBufferSize ?? DEFAULT_MAX_BUFFER_SIZE;
-	const baseRetryMs = options.baseRetryMs ?? DEFAULT_BASE_RETRY_MS;
-	const maxRetryMs = options.maxRetryMs ?? DEFAULT_MAX_RETRY_MS;
-	const queue = [];
-	let timer = null;
-	let inFlight = false;
-	let retryMs = baseRetryMs;
-	let dropped = 0;
-	const schedule = (delayMs) => {
-		if (timer) clearTimeout(timer);
-		timer = setTimeout(() => {
-			timer = null;
-			flushNow();
-		}, delayMs);
-	};
-	const enqueue = (event) => {
-		while (queue.length >= maxBufferSize) {
-			queue.shift();
-			dropped++;
-		}
-		if (dropped > 0) {
-			warn(`[deacon-event-client] buffer overflow: dropped ${dropped} oldest event${dropped === 1 ? "" : "s"}`);
-			dropped = 0;
-		}
-		queue.push(event);
-		if (queue.length >= batchSize) schedule(0);
-		else if (!timer) schedule(debounceMs);
-	};
-	async function flushNow() {
-		if (inFlight || queue.length === 0) return;
-		inFlight = true;
-		const batch = queue.slice(0, batchSize);
-		try {
-			const token = options.token ?? ensureInternalTokenSync();
-			const response = await fetchImpl(new URL("/api/internal/events", dashboardUrl), {
-				method: "POST",
-				headers: {
-					"content-type": "application/json",
-					origin: dashboardUrl,
-					[INTERNAL_TOKEN_HEADER]: token
-				},
-				body: JSON.stringify({ events: batch })
-			});
-			if (!response.ok) throw new Error(`HTTP ${response.status}`);
-			queue.splice(0, batch.length);
-			retryMs = baseRetryMs;
-			if (queue.length > 0) schedule(queue.length >= batchSize ? 0 : debounceMs);
-		} catch (error) {
-			warn(`[deacon-event-client] failed to flush events: ${error instanceof Error ? error.message : String(error)}; retrying in ${retryMs}ms`);
-			schedule(retryMs);
-			retryMs = Math.min(retryMs * 2, maxRetryMs);
-		} finally {
-			inFlight = false;
-		}
-	}
-	async function fetchJson(url, signal) {
-		const token = options.token ?? ensureInternalTokenSync();
-		const response = await fetchImpl(url, {
-			signal,
-			headers: {
-				[INTERNAL_TOKEN_HEADER]: token,
-				origin: dashboardUrl
-			}
-		});
-		if (!response.ok) throw new Error(`HTTP ${response.status}`);
-		return response.json();
-	}
-	async function fetchLatestSequence(signal) {
-		const body = await fetchJson(new URL("/api/internal/events/latest", dashboardUrl), signal);
-		return typeof body.latestSequence === "number" && Number.isFinite(body.latestSequence) && body.latestSequence >= 0 ? body.latestSequence : 0;
-	}
-	function parseStreamFrame(frame) {
-		const dataLines = [];
-		for (const line of frame.split(/\r?\n/)) {
-			if (!line.startsWith("data:")) continue;
-			dataLines.push(line.slice(5).replace(/^\s/, ""));
-		}
-		if (dataLines.length === 0) return null;
-		try {
-			const parsed = JSON.parse(dataLines.join("\n"));
-			if (!parsed || typeof parsed !== "object") return null;
-			const record = parsed;
-			if (typeof record.sequence !== "number" || typeof record.type !== "string" || typeof record.timestamp !== "string") return null;
-			return {
-				sequence: record.sequence,
-				type: record.type,
-				timestamp: record.timestamp,
-				payload: record.payload
-			};
-		} catch {
-			return null;
-		}
-	}
-	return {
-		append(event) {
-			enqueue(event);
-			return 0;
-		},
-		appendAsync(event) {
-			enqueue(event);
-			return Promise.resolve(0);
-		},
-		subscribe(fn) {
-			let active = true;
-			let cursor = -1;
-			let pollTimer = null;
-			let connectInFlight = false;
-			let reconnectMs = baseRetryMs;
-			let abortController = null;
-			const clearPollTimer = () => {
-				if (pollTimer) clearTimeout(pollTimer);
-				pollTimer = null;
-			};
-			const schedulePoll = (delayMs) => {
-				if (!active) return;
-				clearPollTimer();
-				pollTimer = setTimeout(() => {
-					pollTimer = null;
-					connect();
-				}, delayMs);
-			};
-			const connect = async () => {
-				if (!active || connectInFlight) return;
-				connectInFlight = true;
-				abortController?.abort();
-				abortController = new AbortController();
-				try {
-					if (cursor < 0) cursor = await fetchLatestSequence(abortController.signal);
-					const url = new URL("/api/internal/events/stream", dashboardUrl);
-					url.searchParams.set("since", String(cursor));
-					const response = await fetchImpl(url, {
-						signal: abortController.signal,
-						headers: {
-							[INTERNAL_TOKEN_HEADER]: options.token ?? ensureInternalTokenSync(),
-							origin: dashboardUrl
-						}
-					});
-					if (!response.ok) throw new Error(`HTTP ${response.status}`);
-					if (!response.body) throw new Error("missing response body");
-					reconnectMs = baseRetryMs;
-					const reader = response.body.getReader();
-					const decoder = new TextDecoder();
-					let buffer = "";
-					while (active) {
-						const { value, done } = await reader.read();
-						if (done) break;
-						buffer += decoder.decode(value, { stream: true });
-						let frameEnd = buffer.indexOf("\n\n");
-						while (frameEnd >= 0) {
-							const frame = buffer.slice(0, frameEnd);
-							buffer = buffer.slice(frameEnd + 2);
-							const event = parseStreamFrame(frame);
-							if (event) {
-								fn(event);
-								if (event.sequence > cursor) cursor = event.sequence;
-							}
-							frameEnd = buffer.indexOf("\n\n");
-						}
-					}
-					if (!active) return;
-					schedulePoll(debounceMs);
-				} catch (error) {
-					if (!active) return;
-					warn(`[deacon-event-client] failed to subscribe to events: ${error instanceof Error ? error.message : String(error)}; retrying in ${reconnectMs}ms`);
-					schedulePoll(reconnectMs);
-					reconnectMs = Math.min(reconnectMs * 2, maxRetryMs);
-				} finally {
-					connectInFlight = false;
-				}
-			};
-			connect();
-			return () => {
-				active = false;
-				clearPollTimer();
-				abortController?.abort();
-				abortController = null;
-			};
-		},
-		flushNow,
-		bufferedCount: () => queue.length
-	};
-}
-//#endregion
-//#region deacon-main.ts
+init_deacon_event_client();
 init_review_status();
 init_internal_token();
 init_auto_commit();
@@ -315,7 +117,7 @@ async function shutdown(signal) {
 		console.error("[deacon-child] Cloister stop failed:", err);
 	}
 	try {
-		const { killAllGateProcessGroups } = await import("./validation-Cf7aaV5A.js");
+		const { killAllGateProcessGroups } = await import("./validation-5G_wQtea.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-B06RFIr2.js → dead-end-trip-DSF23CLX.js}

@@ -1,7 +1,8 @@
-import { Gn as init_projects, ar as resolveProjectFromIssueSync } from "./config-yaml-CxdwhAIA.js";
-import { t as recordRecoveryFailure } from "./recovery-trip-D-wM9EfB.js";
+import { Sn as resolveProjectFromIssueSync, cn as init_projects } from "./config-yaml-BSCqwmX0.js";
+import { i as recordRecoveryFailure, r as init_recovery_trip } from "./recovery-trip-CSNWSLDn.js";
 //#region ../../lib/cloister/dead-end-trip.ts
 init_projects();
+init_recovery_trip();
 async function recordDeadEndNeedsYou(issueId, recoveryPath, generation, message) {
 	const project = resolveProjectFromIssueSync(issueId);
 	if (!project) return void 0;
@@ -10,4 +11,4 @@ async function recordDeadEndNeedsYou(issueId, recoveryPath, generation, message)
 //#endregion
 export { recordDeadEndNeedsYou as t };
 
-//# sourceMappingURL=dead-end-trip-B06RFIr2.js.map
+//# sourceMappingURL=dead-end-trip-DSF23CLX.js.map