@overdeck/desktop 0.45.23 → 0.46.0

package/server/{merge-agent-XrB80vfT.js → merge-agent-DdMVSV2Y.js}

@@ -1,25 +1,29 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Tn as init_projects, Vr as init_paths, ar as GitError, f as loadConfigSync, jn as loadProjectsConfigSync, mr as init_errors, pr as VcsError, t as init_config_yaml, wr as OVERDECK_HOME } from "./config-yaml-DvyMuOle.js";
-import { a as init_activity_logger, n as emitActivityEntrySync, r as emitActivityTtsSync } from "./activity-logger-DDlOIAML.js";
-import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-CzaSOgul.js";
-import { D as killSession, H as sessionExists, M as listSessionNames, i as capturePane, w as init_tmux, z as sendKeys } from "./tmux-ftABRAmc.js";
-import { b as setReviewStatusSync, c as getReviewStatusSync, l as init_review_status, p as markWorkspaceStuck } from "./review-status-A7quS5KJ.js";
-import { i as resolveGitHubIssueSync, n as init_tracker_utils } from "./tracker-utils-tnxxqROg.js";
-import { n as recordFeatureRegistryLifecycle, t as init_feature_registry_population } from "./feature-registry-population-B0pmAz0a.js";
-import { r as verifyMergedBeforeLifecycle, t as init_merge_verification } from "./merge-verification-CSizH3HY.js";
-import { i as init_git_utils, t as cleanupStaleLocks } from "./git-utils-BVa07a4a.js";
-import { i as runQualityGates, n as init_validation } from "./validation-B5JxoPUS.js";
+import { Er as GitError, Fr as init_errors, Gn as init_projects, Gr as OVERDECK_HOME, Pr as VcsError, Zn as loadProjectsConfigSync, ci as init_paths, f as loadConfigSync, gr as init_issue_id, t as init_config_yaml, vr as parseIssueIdSync } from "./config-yaml-CmOPzmBb.js";
+import { i as emitActivityTtsSync, o as init_activity_logger, r as emitActivityEntrySync } from "./activity-logger-CyteR4JO.js";
+import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-BjuxvjdS.js";
+import { D as killSession, H as sessionExists, M as listSessionNames, i as capturePane, w as init_tmux, z as sendKeys } from "./tmux-B1Wbxz5o.js";
+import { S as setReviewStatusSync, T as init_pipeline, f as init_review_status, g as markWorkspaceStuck, u as getReviewStatusSync, w as capturePipelineStageForIssue } from "./review-status-yljtTd-q.js";
+import { n as resolveGitHubIssueSync, t as init_tracker_utils } from "./tracker-utils-L0FKtjq2.js";
+import { l as resolveWorkspaceRepoRootsSync, r as init_project_repos } from "./project-repos-C0nuoBGv.js";
+import { n as recordFeatureRegistryLifecycle, t as init_feature_registry_population } from "./feature-registry-population--YUXU999.js";
+import { a as init_git_utils, t as cleanupStaleLocks } from "./git-utils-ameCgDdy.js";
+import { i as verifyMergedBeforeLifecycle, n as init_merge_verification } from "./merge-verification-x3JO8Dtz.js";
+import { n as init_merged_docker_cleanup_worker, t as enqueueMergedDockerCleanup } from "./merged-docker-cleanup-worker-CTpC27Bs.js";
+import { i as runQualityGates, n as init_validation } from "./validation-VZgJxmqc.js";
+import { dirname, resolve } from "node:path";
 import { Data, Effect } from "effect";
 import { appendFileSync, existsSync, mkdirSync } from "fs";
-import { basename, dirname, join, relative } from "path";
+import { basename as basename$1, dirname as dirname$1, join as join$1, relative as relative$1 } from "path";
 import { fileURLToPath } from "url";
-import { writeFile } from "fs/promises";
+import { mkdir, readFile, unlink, writeFile } from "node:fs/promises";
+import { writeFile as writeFile$1 } from "fs/promises";
 import { exec, execFile, spawn } from "child_process";
 import { promisify } from "util";
 //#region ../../lib/cloister/merge-agent-step0.ts
 async function shouldRestartForPostMerge(repoRoot, dependencies = {}) {
 	if ((await (dependencies.computeStaleness ?? (async () => {
-		const [{ getBuildInfo }, { computeBuildStaleness }] = await Promise.all([import("./build-info-DgTqZkL5.js"), import("./staleness-Cbl_w4Bw.js")]);
+		const [{ getBuildInfo }, { computeBuildStaleness }] = await Promise.all([import("./build-info-BP160gU7.js"), import("./staleness-BQ-0gMYK.js")]);
 		return computeBuildStaleness({
 			repoRoot,
 			buildCommit: getBuildInfo().buildCommit
@@ -28,15 +32,89 @@ async function shouldRestartForPostMerge(repoRoot, dependencies = {}) {
 		(dependencies.log ?? console.log)("Running build already contains origin/main build inputs — skipping deploy restart");
 		return false;
 	}
-	const reason = await (dependencies.getBlockReason ?? (async () => (await import("./deploy-window-CM6W1-c6.js")).getDeployBlockReason()))();
-	if (reason) {
-		(dependencies.log ?? console.log)(`Deploy window unsafe (${reason}) — deferring deploy to the staleness patrol`);
+	const assessment = await (dependencies.getWindowAssessment ?? (async () => (await import("./deploy-window-jOiPRHL0.js")).getDeployWindowAssessment()))();
+	if (assessment.reason) {
+		await (dependencies.recordIntent ?? (await import("./deploy-queue-9SrhZR63.js")).recordDeployIntent)({
+			requestedBy: "merge-step0",
+			reason: assessment.reason,
+			blockedBy: assessment.verifyingIssues
+		});
+		(dependencies.log ?? console.log)(`Deploy window unsafe (${assessment.reason}) — deferring deploy to the staleness patrol`);
 		return false;
 	}
 	return true;
 }
 var init_merge_agent_step0 = __esmMin((() => {}));
 //#endregion
+//#region ../../lib/cloister/post-merge-lifecycle-lock.ts
+function isProcessAlive(pid) {
+	try {
+		process.kill(pid, 0);
+		return true;
+	} catch {
+		return false;
+	}
+}
+function isMissing(error) {
+	return error?.code === "ENOENT";
+}
+function isAlreadyExists(error) {
+	return error?.code === "EEXIST";
+}
+async function acquirePostMergeLifecycleLock(issueId) {
+	const parsedIssueId = parseIssueIdSync(issueId.trim());
+	if (!parsedIssueId) throw new Error(`Invalid issue ID for post-merge lifecycle lock: ${issueId}`);
+	const lockDir = resolve(OVERDECK_HOME, "locks", "post-merge-lifecycle");
+	const lockPath = resolve(lockDir, `${parsedIssueId.normalized.toUpperCase()}.lock`);
+	if (dirname(lockPath) !== lockDir) throw new Error(`Post-merge lifecycle lock escaped its lock directory: ${issueId}`);
+	await mkdir(lockDir, { recursive: true });
+	for (let attempt = 0; attempt < 2; attempt += 1) try {
+		await writeFile(lockPath, String(process.pid), {
+			flag: "wx",
+			mode: 384
+		});
+		let released = false;
+		return async () => {
+			if (released) return;
+			released = true;
+			try {
+				await unlink(lockPath);
+			} catch (error) {
+				if (!isMissing(error)) throw error;
+			}
+		};
+	} catch (error) {
+		if (!isAlreadyExists(error)) throw error;
+		let ownerPid;
+		try {
+			ownerPid = Number.parseInt((await readFile(lockPath, "utf-8")).trim(), 10);
+		} catch (readError) {
+			if (isMissing(readError)) continue;
+			return null;
+		}
+		if (!Number.isInteger(ownerPid) || ownerPid <= 0 || isProcessAlive(ownerPid)) return null;
+		try {
+			await unlink(lockPath);
+		} catch (unlinkError) {
+			if (!isMissing(unlinkError)) return null;
+		}
+	}
+	return null;
+}
+async function withPostMergeLifecycleLock(issueId, run) {
+	const release = await acquirePostMergeLifecycleLock(issueId);
+	if (!release) throw new Error(`postMergeLifecycle already running in another process for ${issueId}`);
+	try {
+		return await run();
+	} finally {
+		await release();
+	}
+}
+var init_post_merge_lifecycle_lock = __esmMin((() => {
+	init_issue_id();
+	init_paths();
+}));
+//#endregion
 //#region ../../lib/cloister/sync-main-git.ts
 function killCommandTree(child) {
 	if (!child?.pid) return;
@@ -206,6 +284,59 @@ var init_sync_main_git = __esmMin((() => {
 	execDetached = exec;
 }));
 //#endregion
+//#region ../../lib/cloister/sync-main-workspace.ts
+async function syncMainAcrossWorkspaceRepos(projectPath, issueId, signal, syncRepo, logActivity) {
+	console.log(`[sync-main] Starting sync of main into workspace for ${issueId}`);
+	logActivity("sync_main_start", `Starting sync for ${issueId}`);
+	const roots = resolveWorkspaceRepoRootsSync(issueId, projectPath);
+	const repos = [];
+	let failedRepoKey;
+	for (const root of roots) {
+		if (failedRepoKey) {
+			repos.push({
+				repoKey: root.repoKey,
+				success: false,
+				skipped: true,
+				reason: `[${root.repoKey}] Skipped because sync failed in ${failedRepoKey}`
+			});
+			continue;
+		}
+		if (root.isPolyrepo) {
+			console.log(`[sync-main] [${root.repoKey}] Syncing origin/${root.targetBranch}`);
+			logActivity("sync_main_repo_start", `[${root.repoKey}] Syncing origin/${root.targetBranch}`);
+		}
+		const result = await syncRepo(root.dir, issueId, root.targetBranch, signal);
+		const prefixPaths = (paths) => root.isPolyrepo && paths ? paths.map((path) => `${root.repoKey}/${path}`) : paths;
+		const repoResult = {
+			...result,
+			repoKey: root.repoKey
+		};
+		if (result.changedFiles !== void 0) repoResult.changedFiles = prefixPaths(result.changedFiles);
+		if (result.conflictFiles !== void 0) repoResult.conflictFiles = prefixPaths(result.conflictFiles);
+		if (result.reason && root.isPolyrepo) repoResult.reason = `[${root.repoKey}] ${result.reason}`;
+		repos.push(repoResult);
+		if (!result.success) failedRepoKey = root.repoKey;
+	}
+	const completedRepos = repos.filter((repo) => !repo.skipped);
+	const changedFiles = completedRepos.flatMap((repo) => repo.changedFiles ?? []);
+	const conflictFiles = completedRepos.flatMap((repo) => repo.conflictFiles ?? []);
+	const countedRepos = completedRepos.filter((repo) => repo.commitCount !== void 0);
+	const failedRepo = completedRepos.find((repo) => !repo.success);
+	const aggregate = {
+		success: !failedRepo,
+		repos
+	};
+	if (completedRepos.length > 0 && completedRepos.every((repo) => repo.alreadyUpToDate === true)) aggregate.alreadyUpToDate = true;
+	if (countedRepos.length > 0) aggregate.commitCount = countedRepos.reduce((sum, repo) => sum + (repo.commitCount ?? 0), 0);
+	if (completedRepos.some((repo) => repo.changedFiles !== void 0)) aggregate.changedFiles = changedFiles;
+	if (completedRepos.some((repo) => repo.conflictFiles !== void 0)) aggregate.conflictFiles = conflictFiles;
+	if (failedRepo?.reason) aggregate.reason = failedRepo.reason;
+	return aggregate;
+}
+var init_sync_main_workspace = __esmMin((() => {
+	init_project_repos();
+}));
+//#endregion
 //#region ../../lib/overdeck/git-activity.ts
 function overdeckDb() {
 	return getOverdeckDatabaseSync();
@@ -569,7 +700,7 @@ async function autoCommitWorkspaceChangesBeforeSync(projectPath, issueId, signal
 async function notifyTldrDaemon(projectPath, _sourceBranch) {
 	try {
 		console.log(`[merge-agent] Notifying TLDR daemon to reindex changed files...`);
-		const venvPath = join(projectPath, ".venv");
+		const venvPath = join$1(projectPath, ".venv");
 		if (!existsSync(venvPath)) {
 			console.log(`[merge-agent] No .venv found, skipping TLDR notification`);
 			return;
@@ -599,7 +730,7 @@ async function notifyTldrDaemon(projectPath, _sourceBranch) {
 			return;
 		}
 		console.log(`[merge-agent] Found ${changedFiles.length} changed source files to reindex`);
-		const { getTldrDaemonServiceSync } = await import("./tldr-daemon-DL566HbH.js");
+		const { getTldrDaemonServiceSync } = await import("./tldr-daemon-BKOYB616.js");
 		const tldrService = getTldrDaemonServiceSync(projectPath, venvPath);
 		if (!(await tldrService.getStatus()).running) {
 			console.log(`[merge-agent] TLDR daemon not running, skipping notification`);
@@ -618,7 +749,8 @@ function shellQuote(value) {
 	return `'${value.replace(/'/g, `'"'"'`)}'`;
 }
 async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
-	if (_completedPostMerge.has(issueId)) {
+	if (_completedPostMerge.has(issueId) || getReviewStatusSync(issueId)?.mergeStep === "merged") {
+		_completedPostMerge.add(issueId);
 		console.log(`[merge-agent] postMergeLifecycle already completed for ${issueId}, skipping`);
 		return;
 	}
@@ -627,9 +759,14 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 		console.log(`[merge-agent] postMergeLifecycle already running for ${issueId}, joining in-flight run`);
 		return inFlight;
 	}
-	const run = (async () => {
+	const run = withPostMergeLifecycleLock(issueId, async () => {
+		if (_completedPostMerge.has(issueId) || getReviewStatusSync(issueId)?.mergeStep === "merged") {
+			_completedPostMerge.add(issueId);
+			console.log(`[merge-agent] postMergeLifecycle completed while waiting for ${issueId}, skipping`);
+			return;
+		}
 		try {
-			const { findSpecByIssue } = await import("./specs-nN45DG2X.js");
+			const { findSpecByIssue } = await import("./specs-Bt7WJDoC.js");
 			const spec = await Effect.runPromise(findSpecByIssue(projectPath, issueId));
 			if (spec && (spec.status === "completed" || spec.status === "cancelled")) {
 				console.log(`[merge-agent] ${issueId} is closed out (spec ${spec.status}) — skipping post-merge lifecycle`);
@@ -646,6 +783,7 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 		try {
 			setReviewStatusSync(issueId, {
 				mergeStatus: "merged",
+				mergeStep: "post-merge-cleanup",
 				readyForMerge: false,
 				...options?.markReviewPassed ? { reviewStatus: "passed" } : {}
 			});
@@ -653,17 +791,32 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 		} catch (err) {
 			console.warn(`[merge-agent] Could not set mergeStatus: ${err.message}`);
 		}
+		let dockerRetryReason = null;
+		try {
+			const { teardownWorkspaceDockerByNamePromise } = await import("./docker-BMVTSFL5.js");
+			const teardown = await teardownWorkspaceDockerByNamePromise(issueId.toLowerCase());
+			if (teardown.networkRemoved) {
+				console.log(`[merge-agent] ✓ Removed Docker stack/network: ${teardown.steps.join("; ")}`);
+				logActivity("docker_cleanup", `Removed Docker stack/network for ${issueId}: ${teardown.steps.join("; ")}`);
+			} else dockerRetryReason = teardown.steps.join("; ") || "network remained after teardown";
+		} catch (err) {
+			dockerRetryReason = err instanceof Error ? err.message : String(err);
+		}
+		if (dockerRetryReason) {
+			enqueueMergedDockerCleanup(issueId, { mergeVerified: true });
+			console.warn(`[merge-agent] Docker cleanup queued for retry (non-fatal): ${dockerRetryReason}`);
+		}
 		if (!options?.skipDeploy) {
-			const pendingFile = join(OVERDECK_HOME, "pending-post-merge.json");
+			const pendingFile = join$1(OVERDECK_HOME, "pending-post-merge.json");
 			let repoRoot = __dirname.includes("/src/") ? __dirname.replace(/\/src\/.*$/, "") : __dirname.replace(/\/dist\/.*$/, "").replace(/\/lib\/.*$/, "");
 			const wsMatch = repoRoot.match(/^(.+)\/workspaces\/feature-[^/]+$/);
 			if (wsMatch) {
 				repoRoot = wsMatch[1];
 				console.log(`[merge-agent] Resolved workspace repoRoot to main repo: ${repoRoot}`);
 			}
-			const deployScript = join(repoRoot, "scripts", "post-merge-deploy.sh");
+			const deployScript = join$1(repoRoot, "scripts", "post-merge-deploy.sh");
 			if (await shouldRestartForPostMerge(repoRoot)) try {
-				await writeFile(pendingFile, JSON.stringify({
+				await writeFile$1(pendingFile, JSON.stringify({
 					issueId,
 					projectPath,
 					sourceBranch: sourceBranch ?? "",
@@ -691,7 +844,7 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 		}
 		console.log(`[merge-agent] Running post-merge verify handoff for ${issueId}`);
 		try {
-			const { cleanupMergedLabels } = await import("./label-cleanup-BKPJm4Hv.js");
+			const { cleanupMergedLabels } = await import("./label-cleanup-Dv7AV_R1.js");
 			const ghResolved = resolveGitHubIssueSync(issueId);
 			const labelCtx = ghResolved.isGitHub ? {
 				issueId,
@@ -725,7 +878,8 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 			console.warn(`[merge-agent] Could not transition issue to verifying_on_main: ${message}`);
 			try {
 				setReviewStatusSync(issueId, {
-					mergeStatus: "failed",
+					mergeStatus: "merged",
+					mergeStep: "post-merge-cleanup",
 					readyForMerge: false,
 					mergeNotes: `Post-merge verifying_on_main transition failed: ${message}`
 				});
@@ -740,8 +894,8 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 			console.warn(`[merge-agent] Async post-merge release trigger failed for ${issueId}: ${err instanceof Error ? err.message : String(err)}`);
 		});
 		try {
-			const { setAgentPaused, getAgentState } = await import("./agents-FlIgQ3ql.js");
-			const { killSession, sessionExists } = await import("./tmux-DoThH6aj.js");
+			const { setAgentPaused, getAgentState } = await import("./agents-BKKkxKgK.js");
+			const { killSession, sessionExists } = await import("./tmux-DQ6jB76i.js");
 			const issueLower = issueId.toLowerCase();
 			const reason = "awaiting close-out (verify on main)";
 			for (const agentId of [`agent-${issueLower}`, `planning-${issueLower}`]) {
@@ -766,8 +920,8 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 			console.warn(`[merge-agent] Could not pause or kill agent sessions: ${err}`);
 		}
 		try {
-			const { killAllReviewerSessions } = await import("./review-agent-DJRO8EG8.js");
-			const { resolveProjectFromIssueSync } = await import("./projects-9SkRpES9.js");
+			const { killAllReviewerSessions } = await import("./review-agent-CD4RCI0Y.js");
+			const { resolveProjectFromIssueSync } = await import("./projects-B03Wr-xc.js");
 			const projectKey = resolveProjectFromIssueSync(issueId)?.projectKey;
 			if (projectKey) {
 				const { killed } = await Effect.runPromise(killAllReviewerSessions(projectKey, issueId));
@@ -781,10 +935,10 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 		}
 		await killPostMergeRoleSessions(issueId);
 		try {
-			const { createResetMarker } = await import("./cli-BsVIHwzC.js");
+			const { createResetMarker } = await import("./cli-DmXETsw-.js");
 			const timestamp = (/* @__PURE__ */ new Date()).toISOString();
 			const marker = await createResetMarker({
-				projectId: basename(projectPath),
+				projectId: basename$1(projectPath),
 				scope: "workspace",
 				scopeId: `feature-${issueId.toLowerCase()}`,
 				reason: "post-merge cleanup",
@@ -795,28 +949,19 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 		} catch (err) {
 			console.warn(`[merge-agent] Memory reset marker creation failed (non-fatal): ${err}`);
 		}
-		try {
-			const { findWorkspacePath } = await import("./archive-planning-zkJb3BeM.js");
-			const { stopWorkspaceDocker } = await import("./workspace-manager-ZTdJAy9M.js");
-			const issueLower = issueId.toLowerCase();
-			const workspacePath = findWorkspacePath(projectPath, issueLower);
-			if (workspacePath) {
-				const dockerResult = await Effect.runPromise(stopWorkspaceDocker(workspacePath, issueLower));
-				if (dockerResult.containersFound) {
-					console.log(`[merge-agent] ✓ Stopped Docker containers: ${dockerResult.steps.join("; ")}`);
-					logActivity("docker_cleanup", `Stopped Docker for ${issueId}: ${dockerResult.steps.join("; ")}`);
-				}
-			}
-		} catch (err) {
-			console.warn(`[merge-agent] Docker cleanup failed (non-fatal): ${err}`);
-		}
 		await notifyTldrDaemon(projectPath, sourceBranch ?? "");
 		await maybeSpawnPostMergeKnowledgeRetro(issueId, projectPath);
+		setReviewStatusSync(issueId, {
+			mergeStatus: "merged",
+			mergeStep: "merged",
+			readyForMerge: false
+		});
 		_completedPostMerge.add(issueId);
+		capturePipelineStageForIssue(issueId, "merged");
 		console.log(`[merge-agent] Post-merge handoff completed for ${issueId}. Awaiting close-out (verify on main).`);
 		announceMerge("completed", issueId);
 		logActivity("merge_complete", `Merged ${issueId}. Awaiting close-out (verify on main).`);
-	})().finally(() => {
+	}).finally(() => {
 		_postMergeInFlight.delete(issueId);
 	});
 	_postMergeInFlight.set(issueId, run);
@@ -828,7 +973,7 @@ async function triggerPostMergeReleaseIfConfigured(issueId, projectPath) {
 		console.log(`[merge-agent] Release already started or completed for ${issueId} (${currentStatus}), skipping`);
 		return;
 	}
-	const { resolveProjectFromIssueSync, getProjectSync } = await import("./projects-9SkRpES9.js");
+	const { resolveProjectFromIssueSync, getProjectSync } = await import("./projects-B03Wr-xc.js");
 	const resolved = resolveProjectFromIssueSync(issueId);
 	if (!(resolved ? getProjectSync(resolved.projectKey) : null)?.release) {
 		setReviewStatusSync(issueId, {
@@ -838,7 +983,7 @@ async function triggerPostMergeReleaseIfConfigured(issueId, projectPath) {
 		console.log(`[merge-agent] No release config for ${issueId}; marked release skipped`);
 		return;
 	}
-	const { runRelease } = await import("./release-engine-DZpmGGzb.js");
+	const { runRelease } = await import("./release-engine-lPUp-MTd.js");
 	try {
 		await runRelease(issueId, projectPath);
 	} catch (err) {
@@ -857,10 +1002,10 @@ async function triggerPostMergeReleaseIfConfigured(issueId, projectPath) {
 async function transitionIssueToVerifyingOnMain(issueId, projectPath) {
 	const [effectModule, issueLifecycleModule, githubModule, linearModule, rallyModule, errorsModule] = await Promise.all([
 		import("effect"),
-		import("./issue-lifecycle-Dy4vd0Oa.js"),
-		import("./github-client-B4QsdE-X.js"),
-		import("./linear-client-DqhDQO9k.js"),
-		import("./rally-client-CULK2XAY.js"),
+		import("./issue-lifecycle-9gk3fnXN.js"),
+		import("./github-client-Cj0yl_07.js"),
+		import("./linear-client-CY4O_Tu3.js"),
+		import("./rally-client-CxsA6ExK.js"),
 		import("./typed-errors-BHhE85Ul.js")
 	]);
 	const { Effect, Layer } = effectModule;
@@ -1091,7 +1236,7 @@ async function getConflictFiles(projectPath, signal) {
 		return [];
 	}
 }
-async function resolveMainPreferredSyncConflicts(projectPath, conflictFiles, signal) {
+async function resolveMainPreferredSyncConflicts(projectPath, conflictFiles, targetBranch, signal) {
 	if (conflictFiles.length === 0 || !conflictFiles.every(isSyncMainMainPreferredPath)) return {
 		success: false,
 		reason: "conflicts include non-pipeline-owned files"
@@ -1104,10 +1249,10 @@ async function resolveMainPreferredSyncConflicts(projectPath, conflictFiles, sig
 	try {
 		for (const path of SYNC_MAIN_MAIN_PREFERRED_PATHS) {
 			await run(`git rm -r --quiet --ignore-unmatch -- ${path}`);
-			await run(`git checkout origin/main -- ${path}`).catch((error) => {
+			await run(`git checkout origin/${targetBranch} -- ${path}`).catch((error) => {
 				if (isSyncGitTermination(error)) throw error;
 			});
-			await run(`git add -A -- ${path}`);
+			if ((await run(`git ls-files -- ${path}`)).stdout.trim()) await run(`git add -A -- ${path}`);
 		}
 		const remainingConflicts = await getConflictFiles(projectPath, signal);
 		if (remainingConflicts.length > 0) return {
@@ -1344,11 +1489,9 @@ async function collectSyncMergeStats(projectPath, signal) {
 *
 * Auto-commits any uncommitted changes before merging (with safety verification).
 */
-async function syncMainIntoWorkspace(projectPath, issueId, signal) {
-	console.log(`[sync-main] Starting sync of main into workspace for ${issueId}`);
-	logActivity("sync_main_start", `Starting sync for ${issueId}`);
+async function syncMainIntoRepo(repoDir, issueId, targetBranch, signal) {
 	const run = (command, timeout = SYNC_GIT_STATUS_TIMEOUT_MS) => runSyncGitCommand(command, {
-		cwd: projectPath,
+		cwd: repoDir,
 		timeout,
 		signal
 	});
@@ -1356,7 +1499,7 @@ async function syncMainIntoWorkspace(projectPath, issueId, signal) {
 	try {
 		console.log(`[sync-main] Checking for uncommitted changes...`);
 		logActivity("sync_main_auto_commit", `Auto-committing uncommitted changes before sync`);
-		const autoCommit = await autoCommitWorkspaceChangesBeforeSync(projectPath, issueId, signal);
+		const autoCommit = await autoCommitWorkspaceChangesBeforeSync(repoDir, issueId, signal);
 		if (!autoCommit.success) {
 			const message = autoCommit.reason || "Failed to auto-commit uncommitted changes";
 			console.error(`[sync-main] ${message}`);
@@ -1380,7 +1523,7 @@ async function syncMainIntoWorkspace(projectPath, issueId, signal) {
 			}
 		}
 		try {
-			const lockCleanup = await Effect.runPromise(cleanupStaleLocks(projectPath, {
+			const lockCleanup = await Effect.runPromise(cleanupStaleLocks(repoDir, {
 				signal,
 				processProbeTimeoutMs: SYNC_GIT_STATUS_TIMEOUT_MS
 			}));
@@ -1407,21 +1550,21 @@ async function syncMainIntoWorkspace(projectPath, issueId, signal) {
 				reason: message
 			};
 		}
-		console.log(`[sync-main] Fetching origin/main...`);
+		console.log(`[sync-main] Fetching origin/${targetBranch}...`);
 		try {
-			await run("git fetch origin main", SYNC_GIT_FETCH_TIMEOUT_MS);
+			await run(`git fetch origin ${targetBranch}`, SYNC_GIT_FETCH_TIMEOUT_MS);
 		} catch (error) {
 			if (isSyncGitTermination(error)) throw error;
 			return {
 				success: false,
-				reason: `Failed to fetch origin/main: ${error.message}`
+				reason: `Failed to fetch origin/${targetBranch}: ${error.message}`
 			};
 		}
 		let mergeOutput = "";
 		let hasConflicts = false;
 		try {
 			mergeStarted = true;
-			const result = await run("git merge origin/main", SYNC_GIT_MERGE_TIMEOUT_MS);
+			const result = await run(`git merge origin/${targetBranch}`, SYNC_GIT_MERGE_TIMEOUT_MS);
 			mergeStarted = false;
 			mergeOutput = (result.stdout || "") + (result.stderr || "");
 		} catch (error) {
@@ -1431,7 +1574,7 @@ async function syncMainIntoWorkspace(projectPath, issueId, signal) {
 		}
 		if (mergeOutput.includes("Already up to date") || mergeOutput.includes("Already up-to-date")) {
 			console.log(`[sync-main] Already up to date`);
-			logActivity("sync_main_noop", `${issueId} already up to date with main`);
+			logActivity("sync_main_noop", `${issueId} already up to date with ${targetBranch}`);
 			return {
 				success: true,
 				alreadyUpToDate: true
@@ -1439,25 +1582,25 @@ async function syncMainIntoWorkspace(projectPath, issueId, signal) {
 		}
 		if (!hasConflicts) {
 			console.log(`[sync-main] Clean merge completed`);
-			logActivity("sync_main_success", `Clean merge of main into ${issueId}`);
+			logActivity("sync_main_success", `Clean merge of ${targetBranch} into ${issueId}`);
 			return {
 				success: true,
-				...await collectSyncMergeStats(projectPath, signal)
+				...await collectSyncMergeStats(repoDir, signal)
 			};
 		}
-		const conflictFiles = await getConflictFiles(projectPath, signal);
-		if ((await resolveMainPreferredSyncConflicts(projectPath, conflictFiles, signal)).success) {
+		const conflictFiles = await getConflictFiles(repoDir, signal);
+		if ((await resolveMainPreferredSyncConflicts(repoDir, conflictFiles, targetBranch, signal)).success) {
 			mergeStarted = false;
-			console.log(`[sync-main] Auto-resolved ${conflictFiles.length} pipeline-owned conflict(s) with origin/main`);
-			logActivity("sync_main_auto_resolved_conflicts", `Auto-resolved ${conflictFiles.length} pipeline-owned conflict(s) in ${issueId} with origin/main`);
+			console.log(`[sync-main] Auto-resolved ${conflictFiles.length} pipeline-owned conflict(s) with origin/${targetBranch}`);
+			logActivity("sync_main_auto_resolved_conflicts", `Auto-resolved ${conflictFiles.length} pipeline-owned conflict(s) in ${issueId} with origin/${targetBranch}`);
 			return {
 				success: true,
-				...await collectSyncMergeStats(projectPath, signal)
+				...await collectSyncMergeStats(repoDir, signal)
 			};
 		}
 		console.log(`[sync-main] ${conflictFiles.length} conflict(s); aborting merge for manual resolution`);
 		logActivity("sync_main_conflicts", `${conflictFiles.length} conflict(s) in ${issueId}: ${conflictFiles.join(", ")}`);
-		await ensureSyncGitQuiescent(projectPath, true);
+		await ensureSyncGitQuiescent(repoDir, true);
 		mergeStarted = false;
 		return {
 			success: false,
@@ -1466,13 +1609,16 @@ async function syncMainIntoWorkspace(projectPath, issueId, signal) {
 		};
 	} catch (error) {
 		if (!isSyncGitTermination(error)) throw error;
-		await ensureSyncGitQuiescent(projectPath, mergeStarted);
+		await ensureSyncGitQuiescent(repoDir, mergeStarted);
 		return {
 			success: false,
 			reason: error instanceof SyncGitCommandTimeoutError ? error.message : "Sync-main cancelled after reaching its preparation deadline"
 		};
 	}
 }
+async function syncMainIntoWorkspace(projectPath, issueId, signal) {
+	return syncMainAcrossWorkspaceRepos(projectPath, issueId, signal, syncMainIntoRepo, logActivity);
+}
 /**
 * Look up and run quality gates for the project at projectPath.
 * Returns empty array if no quality gates are configured.
@@ -1489,8 +1635,8 @@ async function runProjectQualityGates(projectPath, phase) {
 			console.log(`[merge-agent] No quality gates configured for ${projectPath}`);
 			return [];
 		}
-		const repoRelPath = relative(project.path, projectPath);
-		const matchedRepo = project.workspace?.repos?.find((repo) => repoRelPath === repo.path || projectPath === join(project.path, repo.path));
+		const repoRelPath = relative$1(project.path, projectPath);
+		const matchedRepo = project.workspace?.repos?.find((repo) => repoRelPath === repo.path || projectPath === join$1(project.path, repo.path));
 		const repoIdentifiers = matchedRepo ? new Set([matchedRepo.path, matchedRepo.name]) : new Set(repoRelPath && !repoRelPath.startsWith("..") ? [repoRelPath] : []);
 		let gatesToRun = project.quality_gates;
 		if (repoRelPath && !repoRelPath.startsWith("..")) {
@@ -1515,7 +1661,11 @@ var init_merge_agent = __esmMin((() => {
 	init_activity_logger();
 	init_config_yaml();
 	init_merge_agent_step0();
+	init_pipeline();
+	init_merged_docker_cleanup_worker();
+	init_post_merge_lifecycle_lock();
 	init_sync_main_git();
+	init_sync_main_workspace();
 	init_paths();
 	init_tracker_utils();
 	init_validation();
@@ -1541,9 +1691,9 @@ var init_merge_agent = __esmMin((() => {
 		".overdeck/"
 	];
 	SYNC_MAIN_MAIN_PREFERRED_PATHS = [".pan/continues", ".pan/specs"];
-	__dirname = dirname(fileURLToPath(import.meta.url));
-	MERGE_HISTORY_DIR = join(join(OVERDECK_HOME, "specialists"), "merge-agent");
-	MERGE_HISTORY_FILE = join(MERGE_HISTORY_DIR, "history.jsonl");
+	__dirname = dirname$1(fileURLToPath(import.meta.url));
+	MERGE_HISTORY_DIR = join$1(join$1(OVERDECK_HOME, "specialists"), "merge-agent");
+	MERGE_HISTORY_FILE = join$1(MERGE_HISTORY_DIR, "history.jsonl");
 	_completedPostMerge = /* @__PURE__ */ new Set();
 	_postMergeInFlight = /* @__PURE__ */ new Map();
 	GIT_PATTERNS = [
@@ -1592,4 +1742,4 @@ var init_merge_agent = __esmMin((() => {
 //#endregion
 export { init_operations as C, gitPush as S, listGitOperationsSync as T, scanGitPatterns as _, init_merge_agent as a, triggerPostMergeReleaseIfConfigured as b, isSyncMainMainPreferredPath as c, parseAgentOutput as d, postMergeLifecycle as f, scanForConflictMarkers as g, salvageStrandedMerge as h, captureTmuxOutput as i, logMergeHistory as l, runProjectQualityGates as m, GIT_PATTERNS as n, isAutoCommitExcludedPath as o, resetPostMergeState as p, autoCommitWorkspaceChangesBeforeSync as r, isMergeAgentRunning as s, AUTO_COMMIT_EXCLUDED_PATHS as t, notifyTldrDaemon as u, sendMessageToAgent as v, init_git_activity as w, MainDivergedError as x, syncMainIntoWorkspace as y };
 
-//# sourceMappingURL=merge-agent-XrB80vfT.js.map
+//# sourceMappingURL=merge-agent-DdMVSV2Y.js.map

package/server/{merge-agent-BQM3a8z5.js → merge-agent-DrXa1CpW.js}

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

package/server/{merge-batch-Bwoyr8Je.js → merge-batch-C5q1c1GX.js}

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