@overdeck/desktop 0.45.22 → 0.45.24

package/server/{rally-i_goYmiA.js → rally-CyWT_lNO.js}

@@ -1,6 +1,6 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { jr as init_errors, kr as TrackerError } from "./config-yaml-ig8Nwtiw.js";
-import { a as TrackerAuthError, n as init_rally_api, o as init_interface, r as IssueNotFoundError, t as RallyRestApi } from "./rally-api-DqKqIMNR.js";
+import { fr as TrackerError, mr as init_errors } from "./config-yaml-DySPNmKN.js";
+import { a as TrackerAuthError, n as init_rally_api, o as init_interface, r as IssueNotFoundError, t as RallyRestApi } from "./rally-api-C8e_1JRi.js";
 import { Effect } from "effect";
 //#region ../../lib/tracker/rally.ts
 /**
@@ -504,4 +504,4 @@ var init_rally = __esmMin((() => {
 //#endregion
 export { init_rally as n, RallyTracker as t };
 
-//# sourceMappingURL=rally-i_goYmiA.js.map
+//# sourceMappingURL=rally-CyWT_lNO.js.map

package/server/{rally-api-DqKqIMNR.js → rally-api-C8e_1JRi.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { jr as init_errors, kr as TrackerError } from "./config-yaml-ig8Nwtiw.js";
+import { fr as TrackerError, mr as init_errors } from "./config-yaml-DySPNmKN.js";
 import { Data, Effect } from "effect";
 //#region ../../lib/tracker/interface.ts
 /**
@@ -162,4 +162,4 @@ var init_rally_api = __esmMin((() => {
 //#endregion
 export { TrackerAuthError as a, NotImplementedError as i, init_rally_api as n, init_interface as o, IssueNotFoundError as r, RallyRestApi as t };
 
-//# sourceMappingURL=rally-api-DqKqIMNR.js.map
+//# sourceMappingURL=rally-api-C8e_1JRi.js.map

package/server/{rally-api-xHazRk0d.js → rally-api-ClOSd-Tt.js}

@@ -1,3 +1,3 @@
-import { n as init_rally_api, t as RallyRestApi } from "./rally-api-DqKqIMNR.js";
+import { n as init_rally_api, t as RallyRestApi } from "./rally-api-C8e_1JRi.js";
 init_rally_api();
 export { RallyRestApi };

package/server/{rally-client-COYz1vYR.js → rally-client-lc-nokqr.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { a as init_tracker_config, r as getRallyConfig } from "./tracker-config-DdT-nUAM.js";
+import { a as init_tracker_config, r as getRallyConfig } from "./tracker-config-G6latr8C.js";
 import { a as RateLimited, c as TrackerNotConfigured, d as init_typed_errors, r as IssueNotFound, s as TrackerApiError } from "./typed-errors-2BTMxkZq.js";
 import { Context, Effect, Layer } from "effect";
 //#region services/rally-client.ts
@@ -46,7 +46,7 @@ function makeRallyClientImpl(config) {
 	let tracker = null;
 	async function getTracker() {
 		if (!tracker) {
-			const { RallyTracker } = await import("./rally-OSJXdiHK.js");
+			const { RallyTracker } = await import("./rally-zhhtXuDP.js");
 			tracker = new RallyTracker({
 				apiKey: config.apiKey,
 				server: config.server,
@@ -106,7 +106,7 @@ var init_rally_client = __esmMin((() => {
 	RallyClientLive = Layer.effect(RallyClient, Effect.gen(function* () {
 		const config = getRallyConfig();
 		if (!config) return yield* Effect.fail(new TrackerNotConfigured({ tracker: "rally" }));
-		const { RallyTracker } = yield* Effect.promise(() => import("./rally-OSJXdiHK.js"));
+		const { RallyTracker } = yield* Effect.promise(() => import("./rally-zhhtXuDP.js"));
 		const tracker = new RallyTracker({
 			apiKey: config.apiKey,
 			server: config.server,
@@ -158,4 +158,4 @@ var init_rally_client = __esmMin((() => {
 //#endregion
 export { init_rally_client as i, RallyClientLive as n, RallyClientOptionalLive as r, RallyClient as t };
 
-//# sourceMappingURL=rally-client-COYz1vYR.js.map
+//# sourceMappingURL=rally-client-lc-nokqr.js.map

package/server/{rally-client-CGWEHaPd.js → rally-client-sgtVqzNU.js}

@@ -1,3 +1,3 @@
-import { i as init_rally_client, n as RallyClientLive, r as RallyClientOptionalLive, t as RallyClient } from "./rally-client-COYz1vYR.js";
+import { i as init_rally_client, n as RallyClientLive, r as RallyClientOptionalLive, t as RallyClient } from "./rally-client-lc-nokqr.js";
 init_rally_client();
 export { RallyClient, RallyClientLive, RallyClientOptionalLive };

package/server/rally-zhhtXuDP.js

@@ -0,0 +1,3 @@
+import { n as init_rally, t as RallyTracker } from "./rally-CyWT_lNO.js";
+init_rally();
+export { RallyTracker };

package/server/{reap-terminal-sessions-CaMkFOIH.js → reap-terminal-sessions-7KeHv1R1.js}

@@ -1,4 +1,4 @@
 import { r as isRoleTerminal } from "./review-status-source-CxuEjLGg.js";
-import { i as selectAwaitingTestWorkSessions, o as selectMergedWorkSessions, s as selectNonMergedTerminalAdvancingSessions, t as init_reap_terminal_sessions } from "./reap-terminal-sessions-DG9eiMVz.js";
+import { i as selectAwaitingTestWorkSessions, o as selectMergedWorkSessions, s as selectNonMergedTerminalAdvancingSessions, t as init_reap_terminal_sessions } from "./reap-terminal-sessions-BtHPo6Xc.js";
 init_reap_terminal_sessions();
 export { isRoleTerminal, selectAwaitingTestWorkSessions, selectMergedWorkSessions, selectNonMergedTerminalAdvancingSessions };

package/server/{reap-terminal-sessions-DG9eiMVz.js → reap-terminal-sessions-BtHPo6Xc.js}

@@ -128,4 +128,4 @@ var init_reap_terminal_sessions = __esmMin((() => {
 //#endregion
 export { selectMergedAdvancingSessions as a, sessionsToReapForRole as c, selectAwaitingTestWorkSessions as i, isAwaitingTestReapable as n, selectMergedWorkSessions as o, isWorkReapable as r, selectNonMergedTerminalAdvancingSessions as s, init_reap_terminal_sessions as t };
 
-//# sourceMappingURL=reap-terminal-sessions-DG9eiMVz.js.map
+//# sourceMappingURL=reap-terminal-sessions-BtHPo6Xc.js.map

package/server/rebuild-stack-CFvcBHsS.js

@@ -0,0 +1,4 @@
+import "./stack-health-DxSdG9cW.js";
+import { n as rebuildWorkspaceStack, t as init_rebuild_stack } from "./rebuild-stack-lwtsW0GO.js";
+init_rebuild_stack();
+export { rebuildWorkspaceStack };

package/server/{rebuild-stack-JUm0jqYP.js → rebuild-stack-lwtsW0GO.js}

@@ -1,12 +1,12 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Hn as init_projects, In as getProjectSync, nr as resolveProjectFromIssueSync } from "./config-yaml-ig8Nwtiw.js";
-import { a as init_stack_health, c as init_docker_stats, l as recordDockerContainerLifecycleSnapshot, n as collectDockerContainerLifecycleSnapshot } from "./stack-health-C-ifC7b0.js";
-import { n as init_issue_closed, r as isIssueClosed } from "./issue-closed-DtmJM0D0.js";
-import { n as reconcileTraefikNetworks, t as init_traefik_connect } from "./traefik-connect-C6mJckNs.js";
-import { n as ensureDevcontainerSync, r as init_ensure_devcontainer } from "./ensure-devcontainer-V5JWaAva.js";
+import { Tn as init_projects, yn as getProjectSync, zn as resolveProjectFromIssueSync } from "./config-yaml-DySPNmKN.js";
+import { d as init_docker_stats, f as recordDockerContainerLifecycleSnapshot, n as collectDockerContainerLifecycleSnapshot, o as hasIssueToken, r as composeProjectNameForWorkspace, s as init_stack_health } from "./stack-health-DxSdG9cW.js";
+import { n as init_issue_closed, r as isIssueClosed } from "./issue-closed-CDJk4pIp.js";
+import { n as reconcileTraefikNetworks, t as init_traefik_connect } from "./traefik-connect-Df2uXPsQ.js";
+import { n as ensureDevcontainerSync, r as init_ensure_devcontainer } from "./ensure-devcontainer-DNi-ono3.js";
 import { dirname, join } from "node:path";
 import { Effect } from "effect";
-import { existsSync, readFileSync, rmSync } from "node:fs";
+import { existsSync, rmSync } from "node:fs";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 //#region ../../lib/workspace/rebuild-stack.ts
@@ -27,32 +27,6 @@ import { promisify } from "node:util";
 * the result, not the error channel, to preserve the existing API contract
 * where callers branch on `success`).
 */
-function declaredComposeProjectName(content, featureFolder) {
-	const templatedMatch = content.match(/COMPOSE_PROJECT_NAME="([^$"]*)\$\{FEATURE_FOLDER\}"/);
-	if (templatedMatch) return `${templatedMatch[1]}${featureFolder}`;
-	return content.match(/COMPOSE_PROJECT_NAME="([^"]+)"/)?.[1] ?? null;
-}
-/**
-* Derive the canonical `COMPOSE_PROJECT_NAME` for a workspace, refusing the
-* rebuild if the workspace declares a name that does not match — a mismatch
-* means `docker compose down` would target the wrong stack.
-*/
-function composeProjectNameForWorkspace(workspacePath, issueId) {
-	const featureFolder = `feature-${issueId.toLowerCase()}`;
-	const fallback = `overdeck-${featureFolder}`;
-	for (const devPath of [join(workspacePath, ".devcontainer", "dev"), join(workspacePath, "dev")]) {
-		if (!existsSync(devPath)) continue;
-		try {
-			const declared = declaredComposeProjectName(readFileSync(devPath, "utf-8"), featureFolder);
-			if (!declared) continue;
-			if (!declared.endsWith(featureFolder)) throw new Error(`Refusing workspace rebuild: ${devPath} declares COMPOSE_PROJECT_NAME=${declared}, expected a name ending in ${featureFolder}`);
-			return declared;
-		} catch (err) {
-			if (err?.message?.startsWith("Refusing workspace rebuild:")) throw err;
-		}
-	}
-	return fallback;
-}
 function findDevcontainerComposeFile(workspacePath) {
 	const devcontainerDir = join(workspacePath, ".devcontainer");
 	for (const file of COMPOSE_FILES) {
@@ -61,7 +35,7 @@ function findDevcontainerComposeFile(workspacePath) {
 	}
 	return null;
 }
-var execFileAsync, COMPOSE_FILES, dockerCompose, EXTERNAL_WORKSPACE_NETWORK, ensureExternalNetwork, rebuildWorkspaceStack;
+var execFileAsync, COMPOSE_FILES, dockerCompose, EXTERNAL_WORKSPACE_NETWORK, ensureExternalNetwork, removeStaleIssueContainers, rebuildWorkspaceStack;
 var init_rebuild_stack = __esmMin((() => {
 	init_docker_stats();
 	init_projects();
@@ -92,6 +66,21 @@ var init_rebuild_stack = __esmMin((() => {
 		"create",
 		EXTERNAL_WORKSPACE_NETWORK
 	], { timeout: 3e4 }).then(() => void 0).catch(() => void 0));
+	removeStaleIssueContainers = (issueId, composeProjectName) => Effect.promise(async () => {
+		const containers = await Effect.runPromise(collectDockerContainerLifecycleSnapshot());
+		let removed = 0;
+		for (const container of containers) {
+			if (container.composeProject === composeProjectName) continue;
+			if (!hasIssueToken(container.name, issueId)) continue;
+			if (container.state?.toLowerCase() === "running" || /^up\b/i.test(container.status)) continue;
+			if (await execFileAsync("docker", [
+				"rm",
+				"-f",
+				container.id
+			], { timeout: 3e4 }).then(() => true).catch(() => false)) removed += 1;
+		}
+		return removed;
+	});
 	rebuildWorkspaceStack = (issueId, options = {}) => {
 		const progress = options.onProgress ?? (() => {});
 		const normalizedIssueId = issueId.toLowerCase();
@@ -163,6 +152,8 @@ var init_rebuild_stack = __esmMin((() => {
 				"--build"
 			], dirname(composeFile));
 			recordDockerContainerLifecycleSnapshot(yield* collectDockerContainerLifecycleSnapshot());
+			progress("Removing stale containers from previous stack projects...");
+			yield* removeStaleIssueContainers(normalizedIssueId, composeProjectName);
 			progress("Connecting traefik to workspace network...");
 			yield* Effect.promise(() => reconcileTraefikNetworks());
 			return {
@@ -182,6 +173,6 @@ var init_rebuild_stack = __esmMin((() => {
 	};
 }));
 //#endregion
-export { init_rebuild_stack as n, rebuildWorkspaceStack as r, composeProjectNameForWorkspace as t };
+export { rebuildWorkspaceStack as n, removeStaleIssueContainers as r, init_rebuild_stack as t };
 
-//# sourceMappingURL=rebuild-stack-JUm0jqYP.js.map
+//# sourceMappingURL=rebuild-stack-lwtsW0GO.js.map

package/server/{reconstruct-cache-wU79aCee.js → reconstruct-cache-C3Ui7ojV.js}

@@ -1,8 +1,8 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Bt as resolveProjectForIssue, Hn as init_projects, It as readIssueRecord, Kn as listProjectsSync, Nt as init_record } from "./config-yaml-ig8Nwtiw.js";
-import { c as listAllAgentsSync, o as init_agents, r as backfillAgentsSync } from "./agents-DXdHmRTC.js";
-import { i as listRunningAgents, s as init_agents$1 } from "./queries-ZABd5aXP.js";
-import { a as gatherProjectLensSignalsForProjects, i as gatherProjectLensSignals, n as init_pipeline_membership, o as init_pipeline_membership_gather, r as resolvePipelineMembership } from "./pipeline-membership-1LGRjo-k.js";
+import { Ft as resolveProjectForIssue, Ot as init_record, Tn as init_projects, jt as readIssueRecord, kn as listProjectsSync } from "./config-yaml-DySPNmKN.js";
+import { c as listAllAgentsSync, o as init_agents, r as backfillAgentsSync } from "./agents-EbI0zCJl.js";
+import { b as init_agents$1, i as listRunningAgents } from "./queries-CjNIf-Ub.js";
+import { a as gatherProjectLensSignalsForProjects, i as gatherProjectLensSignals, n as init_pipeline_membership, o as init_pipeline_membership_gather, r as resolvePipelineMembership } from "./pipeline-membership-mY3GprlK.js";
 import { Effect } from "effect";
 //#region ../../lib/reconstruct/enumerate-in-flight.ts
 async function enumerateInFlightIssuesFromSources(projects, gather = gatherProjectLensSignals) {
@@ -138,7 +138,7 @@ async function loadInFlightIssueIds(projects) {
 	return enumerateInFlightIssuesFromSources(projects);
 }
 async function fetchPrState(issueId) {
-	const { fetchIssuePullRequest } = await import("./pull-requests-By_BteaL.js");
+	const { fetchIssuePullRequest } = await import("./pull-requests-7N8WKseP.js");
 	const result = await fetchIssuePullRequest(issueId);
 	if (!result.pr) return {
 		hasPr: false,
@@ -269,4 +269,4 @@ __esmMin((() => {
 }))();
 export { reconstructCache, reconstructCacheAuto };
 
-//# sourceMappingURL=reconstruct-cache-wU79aCee.js.map
+//# sourceMappingURL=reconstruct-cache-C3Ui7ojV.js.map

package/server/record-CN0pj4_5.js

@@ -0,0 +1,3 @@
+import { Dt as getProjectConfigFromWorkspacePath, Ft as resolveProjectForIssue, Nt as readIssueRecordSync, Ot as init_record, Pt as readRecordContinueViewSync, vt as appendSessionEntry, zt as writeRecordTieredExecutionOverride } from "./config-yaml-DySPNmKN.js";
+init_record();
+export { appendSessionEntry, getProjectConfigFromWorkspacePath, readIssueRecordSync, readRecordContinueViewSync, resolveProjectForIssue, writeRecordTieredExecutionOverride };

package/server/{record-update-D3N6WMFR.js → record-update-bLJxAXH4.js}

@@ -1,3 +1,3 @@
-import { n as updateIssueRecord, t as init_record_update } from "./record-update-Crz74r-6.js";
+import { n as updateIssueRecord, t as init_record_update } from "./record-update-dE1Aw83j.js";
 init_record_update();
 export { updateIssueRecord };

package/server/record-update-dE1Aw83j.js

@@ -0,0 +1,310 @@
+import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
+import { At as queueIssueRecordCommit, Br as getOverdeckHome, Dt as getProjectConfigFromWorkspacePath, Ft as resolveProjectForIssue, Ht as flushAutoCommits, Nt as readIssueRecordSync, Ot as init_record, Rt as writeIssueRecordSync, St as ensureIssueRecordSync, Tn as init_projects, Ut as init_auto_commit, Vr as init_paths, kn as listProjectsSync, nn as init_state_read_home, rn as resolveStateReadHomeSync, tn as STATE_BRANCH, wt as getIssueRecordPath } from "./config-yaml-DySPNmKN.js";
+import { dirname, join, relative } from "node:path";
+import { Effect } from "effect";
+import { hostname } from "node:os";
+import { mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+//#region ../../lib/pan-dir/fs-lock.ts
+/** Cross-process per-issue record locking (PAN-2648 CD-2). */
+function safeSegment(value) {
+	return value.trim().toLowerCase().replace(/[^a-z0-9._-]+/g, "-");
+}
+function recordLockPath(project, issueId) {
+	const configuredKey = listProjectsSync().find(({ config }) => config.path === project.path)?.key;
+	const projectKey = safeSegment(configuredKey ?? project.name ?? project.path) || "unknown-project";
+	return join(getOverdeckHome(), "locks", "records", projectKey, `${issueId.toUpperCase()}.lock`);
+}
+function isPidDead(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 sweepRecordTmpFiles(recordPath) {
+	try {
+		const dir = dirname(recordPath);
+		const base = recordPath.slice(dir.length + 1);
+		const entries = await readdir(dir);
+		await Promise.all(entries.filter((entry) => entry.startsWith(`${base}.`) && entry.endsWith(".tmp")).map((entry) => rm(join(dir, entry), { force: true })));
+	} catch {}
+}
+async function readOwner(lockPath) {
+	try {
+		const owner = JSON.parse(await readFile(join(lockPath, "owner.json"), "utf8"));
+		return {
+			description: `${owner.writerId ?? "unknown writer"} pid=${owner.pid ?? "unknown"} acquiredAt=${owner.acquiredAt ?? "unknown"}`,
+			pid: owner.pid
+		};
+	} catch {
+		return { description: "unknown writer" };
+	}
+}
+async function acquireRecordLock(lockPath, options) {
+	await mkdir(dirname(lockPath), {
+		recursive: true,
+		mode: 448
+	});
+	const delays = options.retryDelaysMs ?? RECORD_LOCK_RETRY_DELAYS_MS;
+	let lastOwner = "unknown writer";
+	for (let attempt = 0; attempt <= delays.length; attempt += 1) {
+		try {
+			await mkdir(lockPath, { mode: 448 });
+			const owner = {
+				writerId: options.writerId,
+				pid: process.pid,
+				acquiredAt: (/* @__PURE__ */ new Date()).toISOString()
+			};
+			try {
+				await writeFile(join(lockPath, "owner.json"), JSON.stringify(owner, null, 2), "utf8");
+			} catch (error) {
+				try {
+					await rm(lockPath, {
+						recursive: true,
+						force: true
+					});
+				} catch {}
+				throw error;
+			}
+			await sweepRecordTmpFiles(options.recordPath);
+			return owner;
+		} catch (error) {
+			if (error.code !== "EEXIST") throw error;
+			const owner = await readOwner(lockPath);
+			lastOwner = owner.description;
+			if (isPidDead(owner.pid)) {
+				await rm(lockPath, {
+					recursive: true,
+					force: true
+				});
+				continue;
+			}
+		}
+		const delay = delays[attempt];
+		if (delay === void 0) break;
+		await new Promise((resolve) => setTimeout(resolve, delay));
+	}
+	throw new RecordLockError(lockPath, lastOwner);
+}
+async function releaseRecordLock(lockPath) {
+	await rm(lockPath, {
+		recursive: true,
+		force: true
+	});
+}
+async function withRecordFsLock(project, issueId, options, operation) {
+	const lockPath = recordLockPath(project, issueId);
+	await acquireRecordLock(lockPath, options);
+	try {
+		return await operation();
+	} finally {
+		await releaseRecordLock(lockPath);
+	}
+}
+var RECORD_LOCK_RETRY_DELAYS_MS, RecordLockError;
+var init_fs_lock = __esmMin((() => {
+	init_paths();
+	init_projects();
+	RECORD_LOCK_RETRY_DELAYS_MS = [
+		5,
+		10,
+		20,
+		40,
+		80,
+		160,
+		320,
+		360
+	];
+	RecordLockError = class extends Error {
+		constructor(lockPath, owner) {
+			super(`The per-issue record lock at ${lockPath} is held by ${owner}. Retry the command after that writer finishes.`);
+			this.lockPath = lockPath;
+			this.owner = owner;
+			this.name = "RecordLockError";
+		}
+	};
+}));
+//#endregion
+//#region ../../lib/pan-dir/record-update.ts
+/** The single locked read-modify-write door for per-issue records. */
+function updateIssueRecordForWorkspace(workspacePath, issueId, mutator, options = {}) {
+	return updateIssueRecord(resolveProjectForIssue(issueId) ?? getProjectConfigFromWorkspacePath(workspacePath), issueId, mutator, options);
+}
+async function git(gitRoot, args) {
+	return (await execFileAsync("git", args, {
+		cwd: gitRoot,
+		encoding: "utf8",
+		timeout: 3e4,
+		maxBuffer: 16 * 1024 * 1024,
+		env: {
+			...process.env,
+			HUSKY: "0"
+		}
+	})).stdout.trim();
+}
+function gitFailureMessage(error) {
+	if (error && typeof error === "object") {
+		const failure = error;
+		return failure.stderr?.trim() || failure.stdout?.trim() || failure.message;
+	}
+	return String(error);
+}
+function isRemoteRefRaceError(message) {
+	return /non-fast-forward|fetch first|stale info|cannot lock ref.*expected|failed to update ref/i.test(message);
+}
+async function abortRebase(gitRoot) {
+	try {
+		await git(gitRoot, ["rebase", "--abort"]);
+	} catch {}
+}
+async function replayConflictedRecord(project, issueId, mutator, gitRoot, recordPath) {
+	const relativeRecordPath = relative(gitRoot, recordPath).replace(/\\/g, "/");
+	const conflicts = (await git(gitRoot, [
+		"diff",
+		"--name-only",
+		"--diff-filter=U"
+	])).split("\n").map((path) => path.trim()).filter(Boolean);
+	if (conflicts.length !== 1 || conflicts[0] !== relativeRecordPath) throw new Error(`state rebase conflicted outside ${relativeRecordPath}: ${conflicts.join(", ") || "unknown conflict"}`);
+	await git(gitRoot, [
+		"restore",
+		`--source=origin/${STATE_BRANCH}`,
+		"--worktree",
+		"--",
+		relativeRecordPath
+	]);
+	const remoteRecord = readIssueRecordSync(project, issueId);
+	if (!remoteRecord) throw new Error(`Remote ${issueId} state record is unreadable`);
+	writeIssueRecordSync(project, issueId, await mutator(remoteRecord) ?? remoteRecord);
+	await git(gitRoot, [
+		"add",
+		"--",
+		relativeRecordPath
+	]);
+	await git(gitRoot, [
+		"-c",
+		"core.editor=true",
+		"rebase",
+		"--continue"
+	]);
+}
+async function restoreRetryableRecord(project, issueId, original, recordPath) {
+	const stateHome = resolveStateReadHomeSync(project);
+	const gitRoot = stateHome.root;
+	const relativeRecordPath = relative(gitRoot, recordPath).replace(/\\/g, "/");
+	await abortRebase(gitRoot);
+	let restored = structuredClone(original);
+	const branch = stateHome.migrated ? STATE_BRANCH : await git(gitRoot, ["branch", "--show-current"]);
+	try {
+		await git(gitRoot, [
+			"fetch",
+			"origin",
+			branch
+		]);
+		restored = JSON.parse(await git(gitRoot, ["show", `origin/${branch}:${relativeRecordPath}`]));
+	} catch {}
+	writeIssueRecordSync(project, issueId, restored);
+	await git(gitRoot, [
+		"add",
+		"--",
+		relativeRecordPath
+	]);
+	try {
+		await git(gitRoot, [
+			"diff",
+			"--cached",
+			"--quiet",
+			"--",
+			relativeRecordPath
+		]);
+		return;
+	} catch {}
+	await git(gitRoot, [
+		"commit",
+		"-m",
+		`chore(records): restore ${issueId} after failed state push`,
+		"--",
+		relativeRecordPath
+	]);
+}
+async function reconcileStatePush(project, issueId, mutator, recordPath) {
+	const gitRoot = resolveStateReadHomeSync(project).root;
+	for (let attempt = 0; attempt < MAX_STATE_PUSH_RECONCILIATIONS; attempt += 1) {
+		await git(gitRoot, [
+			"fetch",
+			"origin",
+			STATE_BRANCH
+		]);
+		try {
+			await git(gitRoot, ["rebase", `origin/${STATE_BRANCH}`]);
+		} catch (error) {
+			try {
+				await replayConflictedRecord(project, issueId, mutator, gitRoot, recordPath);
+			} catch (replayError) {
+				await abortRebase(gitRoot);
+				throw new Error(`Failed to reconcile ${issueId} state after push race: ${gitFailureMessage(replayError)}`, { cause: error });
+			}
+		}
+		try {
+			await git(gitRoot, [
+				"push",
+				"origin",
+				STATE_BRANCH
+			]);
+			const record = readIssueRecordSync(project, issueId);
+			if (!record) throw new Error(`Reconciled ${issueId} state record is unreadable`);
+			return record;
+		} catch (error) {
+			const message = gitFailureMessage(error);
+			if (!isRemoteRefRaceError(message)) throw new Error(`Failed to push reconciled ${issueId} state: ${message}`, { cause: error });
+		}
+	}
+	throw new Error(`Failed to push ${issueId} state after ${MAX_STATE_PUSH_RECONCILIATIONS} reconciliation attempts`);
+}
+async function updateIssueRecord(project, issueId, mutator, options = {}) {
+	const normalizedIssueId = issueId.toUpperCase();
+	const recordPath = getIssueRecordPath(project, normalizedIssueId);
+	return withRecordFsLock(project, normalizedIssueId, {
+		writerId: options.writerId ?? process.env.OVERDECK_AGENT_ID ?? `process-${process.pid}@${hostname()}`,
+		recordPath
+	}, async () => {
+		const current = readIssueRecordSync(project, normalizedIssueId) ?? ensureIssueRecordSync(project, normalizedIssueId);
+		const original = structuredClone(current);
+		const next = await mutator(current) ?? current;
+		const path = writeIssueRecordSync(project, normalizedIssueId, next);
+		if (options.autoCommit === false) return readIssueRecordSync(project, normalizedIssueId) ?? next;
+		try {
+			const commitRoot = queueIssueRecordCommit(project, normalizedIssueId, path);
+			const flushed = await Effect.runPromise(flushAutoCommits(commitRoot));
+			if (flushed.pushed === false) {
+				if (resolveStateReadHomeSync(project).migrated && isRemoteRefRaceError(flushed.reason ?? "")) return await reconcileStatePush(project, normalizedIssueId, mutator, path);
+				throw new Error(`Failed to push ${normalizedIssueId} state: ${flushed.reason ?? "unknown push failure"}`);
+			}
+			if (!flushed.committed && !["no diff", "no pending"].includes(flushed.reason ?? "")) throw new Error(`Failed to commit ${normalizedIssueId} state: ${flushed.reason ?? "unknown commit failure"}`);
+			return readIssueRecordSync(project, normalizedIssueId) ?? next;
+		} catch (error) {
+			try {
+				await restoreRetryableRecord(project, normalizedIssueId, original, path);
+			} catch (restoreError) {
+				throw new Error(`Failed to persist ${normalizedIssueId} state and restore retryability: ${gitFailureMessage(restoreError)}`, { cause: error });
+			}
+			throw error;
+		}
+	});
+}
+var execFileAsync, MAX_STATE_PUSH_RECONCILIATIONS;
+var init_record_update = __esmMin((() => {
+	init_state_read_home();
+	init_auto_commit();
+	init_fs_lock();
+	init_record();
+	execFileAsync = promisify(execFile);
+	MAX_STATE_PUSH_RECONCILIATIONS = 3;
+}));
+//#endregion
+export { isPidDead as a, init_fs_lock as i, updateIssueRecord as n, updateIssueRecordForWorkspace as r, init_record_update as t };
+
+//# sourceMappingURL=record-update-dE1Aw83j.js.map

package/server/{recovery-trip-DkzJSej9.js → recovery-trip-BvRWfUXM.js}

@@ -1,4 +1,4 @@
-import { r as updateIssueRecordForWorkspace, t as init_record_update } from "./record-update-Crz74r-6.js";
+import { r as updateIssueRecordForWorkspace, t as init_record_update } from "./record-update-dE1Aw83j.js";
 //#region ../../lib/cloister/recovery-trip.ts
 init_record_update();
 async function recordRecoveryFailure(workspacePath, issue, recoveryPath, obligationGeneration, threshold = 25, now = /* @__PURE__ */ new Date()) {
@@ -41,4 +41,4 @@ async function recordRecoveryFailure(workspacePath, issue, recoveryPath, obligat
 //#endregion
 export { recordRecoveryFailure as t };
 
-//# sourceMappingURL=recovery-trip-DkzJSej9.js.map
+//# sourceMappingURL=recovery-trip-BvRWfUXM.js.map

package/server/{release-engine-DMINVN8S.js → release-engine-Cx48W7z8.js}

@@ -1,8 +1,8 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Hn as init_projects, In as getProjectSync, kn as findProjectByPathSync } from "./config-yaml-ig8Nwtiw.js";
-import { c as init_review_status, y as setReviewStatusSync } from "./review-status-DFRjDFef.js";
-import { i as init_merge_set, r as getMergeSetSync } from "./merge-set-DiISXcC-.js";
-import { i as withComponentStateSync, n as init_release_set, r as upsertReleaseSetSync } from "./release-set-DeUSOEHy.js";
+import { Tn as init_projects, fn as findProjectByPathSync, yn as getProjectSync } from "./config-yaml-DySPNmKN.js";
+import { b as setReviewStatusSync, l as init_review_status } from "./review-status-kZj_KyCk.js";
+import { i as init_merge_set, r as getMergeSetSync } from "./merge-set-DJ8-UErs.js";
+import { i as withComponentStateSync, n as init_release_set, r as upsertReleaseSetSync } from "./release-set-CQfuN9-v.js";
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
 //#region ../../lib/release/release-plan.ts
@@ -303,4 +303,4 @@ __esmMin((() => {
 }))();
 export { runRelease };
 
-//# sourceMappingURL=release-engine-DMINVN8S.js.map
+//# sourceMappingURL=release-engine-Cx48W7z8.js.map

package/server/{release-set-DeUSOEHy.js → release-set-CQfuN9-v.js}

@@ -1,6 +1,6 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { fr as init_issue_id, gr as resolveIssueIdSync } from "./config-yaml-ig8Nwtiw.js";
-import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-D4iNWMA5.js";
+import { $n as resolveIssueIdSync, Yn as init_issue_id } from "./config-yaml-DySPNmKN.js";
+import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-BEqFxlJc.js";
 import "effect";
 //#region ../../lib/overdeck/release-sync.ts
 function isoFromMillis(value) {
@@ -122,4 +122,4 @@ var init_release_set = __esmMin((() => {
 //#endregion
 export { withComponentStateSync as i, init_release_set as n, upsertReleaseSetSync as r, getReleaseSetSync as t };
 
-//# sourceMappingURL=release-set-DeUSOEHy.js.map
+//# sourceMappingURL=release-set-CQfuN9-v.js.map

package/server/{remote-b-c5bOce.js → remote-C_2hasl7.js}

@@ -1,5 +1,5 @@
-import "./workspace-metadata-tiSRIWJP.js";
-import { C as init_fly_provider, S as createFlyProvider, s as init_remote_agents } from "./remote-agents-Ct_WOyke.js";
+import "./workspace-metadata-_WygnyoX.js";
+import { C as init_fly_provider, S as createFlyProvider, s as init_remote_agents } from "./remote-agents-By1ige5O.js";
 import { Effect } from "effect";
 //#region ../../lib/remote/index.ts
 init_fly_provider();
@@ -52,4 +52,4 @@ function createFlyProviderFromConfig(remoteConfig, tierOverride) {
 //#endregion
 export { getRemoteProvider as n, isRemoteAvailable as r, createFlyProviderFromConfig as t };
 
-//# sourceMappingURL=remote-b-c5bOce.js.map
+//# sourceMappingURL=remote-C_2hasl7.js.map

package/server/{remote-Dr5kGYSZ.js → remote-ChgimyYa.js}

@@ -1,4 +1,4 @@
-import { a as loadWorkspaceMetadataSync, i as listWorkspaceMetadataSync, n as deleteWorkspaceMetadataSync, o as saveWorkspaceMetadataSync, r as findRemoteWorkspaceMetadataSync, t as WORKSPACES_DIR } from "./workspace-metadata-tiSRIWJP.js";
-import { S as createFlyProvider, d as killRemoteAgent, g as refreshHostHeartbeatForEphemeralVms, h as pollRemoteAgentStatus, m as loadRemoteAgentState, o as getRemoteAgentOutput, p as listRemoteAgents, r as checkRemoteSpendCap, u as isRemoteAgentRunning, v as sendToRemoteAgent, x as FlyProvider, y as spawnRemoteAgent } from "./remote-agents-Ct_WOyke.js";
-import { n as getRemoteProvider, r as isRemoteAvailable, t as createFlyProviderFromConfig } from "./remote-b-c5bOce.js";
+import { a as loadWorkspaceMetadataSync, i as listWorkspaceMetadataSync, n as deleteWorkspaceMetadataSync, o as saveWorkspaceMetadataSync, r as findRemoteWorkspaceMetadataSync, t as WORKSPACES_DIR } from "./workspace-metadata-_WygnyoX.js";
+import { S as createFlyProvider, d as killRemoteAgent, g as refreshHostHeartbeatForEphemeralVms, h as pollRemoteAgentStatus, m as loadRemoteAgentState, o as getRemoteAgentOutput, p as listRemoteAgents, r as checkRemoteSpendCap, u as isRemoteAgentRunning, v as sendToRemoteAgent, x as FlyProvider, y as spawnRemoteAgent } from "./remote-agents-By1ige5O.js";
+import { n as getRemoteProvider, r as isRemoteAvailable, t as createFlyProviderFromConfig } from "./remote-C_2hasl7.js";
 export { FlyProvider, WORKSPACES_DIR, checkRemoteSpendCap, createFlyProvider, createFlyProviderFromConfig, deleteWorkspaceMetadataSync, findRemoteWorkspaceMetadataSync, getRemoteAgentOutput, getRemoteProvider, isRemoteAgentRunning, isRemoteAvailable, killRemoteAgent, listRemoteAgents, listWorkspaceMetadataSync, loadRemoteAgentState, loadWorkspaceMetadataSync, pollRemoteAgentStatus, refreshHostHeartbeatForEphemeralVms, saveWorkspaceMetadataSync, sendToRemoteAgent, spawnRemoteAgent };

package/server/{remote-agents-Ct_WOyke.js → remote-agents-By1ige5O.js}

@@ -1,9 +1,9 @@
 import { n as __esmMin, o as __toESM } from "./rolldown-runtime-DNCzzKnI.js";
-import { Bt as resolveProjectForIssue, Nt as init_record, _r as require_dist, jr as init_errors } from "./config-yaml-ig8Nwtiw.js";
-import { w as init_tmux, y as getManagedTmuxSocketName } from "./tmux-L5LgvGLp.js";
-import { n as init_launcher_generator, t as generateLauncherScriptSync } from "./launcher-generator-COgR2By1.js";
-import { a as init_claude_permissions, i as getClaudePermissionFlagsSync, n as buildClaudeUserSettingsSync, r as getClaudePermissionFlagsStringSync } from "./claude-permissions-nSFKH78M.js";
-import { c as isStateMigrated, o as init_state_home } from "./state-home-CONQvZR0.js";
+import { Ft as resolveProjectForIssue, Ot as init_record, er as require_dist, mr as init_errors } from "./config-yaml-DySPNmKN.js";
+import { w as init_tmux, y as getManagedTmuxSocketName } from "./tmux-R7N7y-Mh.js";
+import { n as init_launcher_generator, t as generateLauncherScriptSync } from "./launcher-generator-BBWG_SiS.js";
+import { a as init_claude_permissions, i as getClaudePermissionFlagsSync, n as buildClaudeUserSettingsSync, r as getClaudePermissionFlagsStringSync } from "./claude-permissions-DNWEVV6z.js";
+import { c as isStateMigrated, o as init_state_home } from "./state-home-Cn_Qu8IX.js";
 import { Data, Effect, Stream } from "effect";
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "fs";
 import { join } from "path";
@@ -1232,4 +1232,4 @@ var init_remote_agents = __esmMin((() => {
 //#endregion
 export { init_fly_provider as C, createFlyProvider as S, saveRemoteAgentState as _, generatePushDaemonScript as a, writeRemoteFile as b, installEphemeralWatchdog as c, killRemoteAgent as d, listActiveRemoteAgentStates as f, refreshHostHeartbeatForEphemeralVms as g, pollRemoteAgentStatus as h, generateEphemeralWatchdogScript as i, installPushDaemon as l, loadRemoteAgentState as m, checkRemoteDurabilityPreflight as n, getRemoteAgentOutput as o, listRemoteAgents as p, checkRemoteSpendCap as r, init_remote_agents as s, assertFlyRemoteStateSupported as t, isRemoteAgentRunning as u, sendToRemoteAgent as v, FlyProvider as x, spawnRemoteAgent as y };
 
-//# sourceMappingURL=remote-agents-Ct_WOyke.js.map
+//# sourceMappingURL=remote-agents-By1ige5O.js.map